mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-24 17:40:37 +00:00
Compare commits
123 Commits
haskell-up
...
staging-ne
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1edc097bd2 | ||
|
|
acb4abd4e7 | ||
|
|
89448b2f04 | ||
|
|
860764791e | ||
|
|
3a5370418d | ||
|
|
4a407333f0 | ||
|
|
477164bab6 | ||
|
|
0712e4c80c | ||
|
|
e07672624f | ||
|
|
0c9d1fd9ea | ||
|
|
8cf990d70a | ||
|
|
3255983a75 | ||
|
|
9b863e4cd0 | ||
|
|
e2cffc0a5c | ||
|
|
5e4f499882 | ||
|
|
b76019df47 | ||
|
|
b6afca8e77 | ||
|
|
fd10d5017a | ||
|
|
bceeca55de | ||
|
|
10061cf0f7 | ||
|
|
dae023c345 | ||
|
|
242d36d7b7 | ||
|
|
9bd9d121dc | ||
|
|
905f8f74bd | ||
|
|
da6063cbe1 | ||
|
|
a76040f2df | ||
|
|
fae658c82c | ||
|
|
8c1d4dd32e | ||
|
|
805b05500e | ||
|
|
9599335283 | ||
|
|
e4f1329ede | ||
|
|
f11b773a1e | ||
|
|
16611dafa6 | ||
|
|
d6f70286e7 | ||
|
|
cb79c550fc | ||
|
|
80b2f9ec36 | ||
|
|
88449c0e01 | ||
|
|
551d54cfc4 | ||
|
|
8e24e33451 | ||
|
|
640664d98d | ||
|
|
54f8f8a829 | ||
|
|
1a310691f9 | ||
|
|
036b92ec81 | ||
|
|
e64b9b7373 | ||
|
|
a0f7233e07 | ||
|
|
1870911b32 | ||
|
|
6510f521d2 | ||
|
|
63a0f8d361 | ||
|
|
588fe9a6f2 | ||
|
|
335f0738cb | ||
|
|
2836fbbd41 | ||
|
|
596a0d7dc0 | ||
|
|
aebf3d0f9f | ||
|
|
87906566c7 | ||
|
|
1a12318a59 | ||
|
|
a515e75f6b | ||
|
|
c5a79bf94d | ||
|
|
33b11c7a18 | ||
|
|
2e373d58f2 | ||
|
|
39d8a34f31 | ||
|
|
bb590c3739 | ||
|
|
23a6f403f9 | ||
|
|
43970c9823 | ||
|
|
8dbada257e | ||
|
|
a6c44bb0e5 | ||
|
|
4cb9d58ac0 | ||
|
|
f3c9b412ad | ||
|
|
4a02d63a72 | ||
|
|
a8123e72b1 | ||
|
|
c6b4f51ed2 | ||
|
|
11666f06dc | ||
|
|
1ce8afeba2 | ||
|
|
3d238b4d3b | ||
|
|
1ea2a247f0 | ||
|
|
f82c92cf1f | ||
|
|
2ffb4d3f41 | ||
|
|
aa7157b3f1 | ||
|
|
391874228d | ||
|
|
c9b84ce04d | ||
|
|
f73579b2d5 | ||
|
|
9494ab4bd9 | ||
|
|
3addee54fd | ||
|
|
dace4d93f1 | ||
|
|
f107f71070 | ||
|
|
8751b9fd7c | ||
|
|
e25fe7a968 | ||
|
|
0ede4d7c4f | ||
|
|
9494ef5d2c | ||
|
|
962224d36a | ||
|
|
60bf249d13 | ||
|
|
9ff109fb87 | ||
|
|
5a59a1d155 | ||
|
|
c2c67711a3 | ||
|
|
cc1c0d2189 | ||
|
|
86c123c30b | ||
|
|
66c61c3c1e | ||
|
|
c73eaa6a58 | ||
|
|
a718e78415 | ||
|
|
87024b4b71 | ||
|
|
07b25d7bda | ||
|
|
10d1260d3a | ||
|
|
a69f1b2463 | ||
|
|
6e3f8c5fd1 | ||
|
|
3dc4b3fbc7 | ||
|
|
7bd1ed1622 | ||
|
|
cf6603d435 | ||
|
|
e20dc30419 | ||
|
|
ffe6ce2a14 | ||
|
|
ea1d43ed8a | ||
|
|
1f22863ccd | ||
|
|
6f7c0ea9c6 | ||
|
|
9b6be193ad | ||
|
|
6f508907ef | ||
|
|
f412c70cf7 | ||
|
|
2f7a8a8ae4 | ||
|
|
7abf4cd10e | ||
|
|
e4d9d6766f | ||
|
|
59c4d804cb | ||
|
|
f7cfbad134 | ||
|
|
def7d4d5df | ||
|
|
93c5137c1c | ||
|
|
573018d964 | ||
|
|
320f4f3e95 |
3
.gitignore
vendored
3
.gitignore
vendored
@@ -27,6 +27,9 @@ tags
|
||||
.mypy_cache
|
||||
__pycache__
|
||||
|
||||
/AGENTS.md
|
||||
/CLAUDE.md
|
||||
|
||||
/pkgs/development/libraries/qt-5/*/tmp/
|
||||
/pkgs/desktops/kde-5/*/tmp/
|
||||
/pkgs/development/mobile/androidenv/xml/*
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash
|
||||
#!nix-shell -p jq git
|
||||
# shellcheck shell=bash
|
||||
#
|
||||
# Usage: eval-pkg-sets.sh [extra flags for nix-* commands ...]
|
||||
#
|
||||
# Must be executed in a git checkout of Nixpkgs.
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
NIXPKGS="$(git rev-parse --show-toplevel)"
|
||||
PKGSETS="$(nix-env --readonly-mode --json --drv-path -f "$NIXPKGS" -qaP -A haskell.compiler "$@" \
|
||||
| jq -r 'to_entries | unique_by(.value.drvPath) .[] .key | sub("^haskell.compiler";"haskell.packages")')"
|
||||
|
||||
trap 'exit 1' SIGINT SIGTERM
|
||||
|
||||
set +e
|
||||
|
||||
badsets=""
|
||||
for set in $PKGSETS; do
|
||||
# Confirm an equivalent package set to haskell.compiler.$entry exists and is usable
|
||||
if ! nix-instantiate --readonly-mode -A "$set.ghc" "$@" > /dev/null 2>&1; then
|
||||
echo "Skipping $set... ($set.ghc does not evaluate)"
|
||||
else
|
||||
echo "Evaluating $set..."
|
||||
|
||||
if ! nix-env --readonly-mode -f "$NIXPKGS" -qaP --drv-path -A "$set" "$@" > /dev/null; then
|
||||
badsets+="$set "
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
if [ -n "$badsets" ]; then
|
||||
echo "Found potential eval issues in the following sets:" >&2
|
||||
# shellcheck disable=SC2086
|
||||
printf '%s\n' $badsets
|
||||
exit 1
|
||||
fi
|
||||
@@ -33,7 +33,7 @@ fi
|
||||
|
||||
# Stackage solver to use, LTS or Nightly
|
||||
# (should be capitalized like the display name)
|
||||
SOLVER=Nightly
|
||||
SOLVER=LTS
|
||||
# Stackage solver verson, if any. Use latest if empty
|
||||
VERSION=
|
||||
TMP_TEMPLATE=update-stackage.XXXXXXX
|
||||
@@ -105,7 +105,6 @@ sed -r \
|
||||
-e '/ hledger-ui /d' \
|
||||
-e '/ hledger-web /d' \
|
||||
-e '/ spacecookie /d' \
|
||||
-e '/ hnix-store-core /d' \
|
||||
< "${tmpfile_new}" >> $stackage_config
|
||||
# Explanations:
|
||||
# cabal2nix, distribution-nixpkgs, jailbreak-cabal, language-nix: These are our packages and we know what we are doing.
|
||||
|
||||
@@ -116,6 +116,8 @@ in
|
||||
packages = [ pkgs.xdg-desktop-portal ] ++ cfg.extraPortals;
|
||||
in
|
||||
mkIf cfg.enable {
|
||||
programs.fuse.enable = true;
|
||||
|
||||
warnings = lib.optional (cfg.configPackages == [ ] && cfg.config == { }) ''
|
||||
xdg-desktop-portal 1.17 reworked how portal implementations are loaded, you
|
||||
should either set `xdg.portal.config` or `xdg.portal.configPackages`
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "opera";
|
||||
version = "0-unstable-2026-07-13";
|
||||
version = "0-unstable-2026-07-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "opera-libretro";
|
||||
rev = "1edda8a2a6c6b9ae259d5c7cd7d54dcba9ee7e32";
|
||||
hash = "sha256-dc7xRjFxfSL2q9u1N0QH2j+oPbRGng2Z3U3J484lXiU=";
|
||||
rev = "74dd2a8c6319678ffce9f31bdf36279db5681762";
|
||||
hash = "sha256-NHXOfKItLkQJ0/jH1gLBpLFqOKBB8qgH5gMw7j1YoLw=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "prboom";
|
||||
version = "0-unstable-2026-07-07";
|
||||
version = "0-unstable-2026-07-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "libretro-prboom";
|
||||
rev = "31563d6e65faa6b9b7e975754d2062370bba4342";
|
||||
hash = "sha256-eFRzbVTL5ARf650D0ZAEFGNTxjAy1CjBiAhwSQR8vJ4=";
|
||||
rev = "c5b09532fa633e015ac75c0a2acfec049f65ded3";
|
||||
hash = "sha256-13oL/U3uwNejqTIbKmITRbK8Eddg9YH5CMDIDXA6zKs=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "snes9x2005" + lib.optionalString withBlarggAPU "-plus";
|
||||
version = "0-unstable-2026-04-20";
|
||||
version = "0-unstable-2026-07-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "snes9x2005";
|
||||
rev = "b60356971fc9caae02cd0853676dced886a08be7";
|
||||
hash = "sha256-6IuEFyJEoCHluSAXbk5qRTXku1XJCZ6p04BhdjqZqJQ=";
|
||||
rev = "deb49d80d1836e3e737480a326e31a54c46c04ae";
|
||||
hash = "sha256-UMW+YTzcSZ5CWSyRBYc8y1cDh/CU3Am11rkjSXlyxZA=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -92,8 +92,8 @@ rec {
|
||||
thunderbird-140 = common {
|
||||
applicationName = "Thunderbird ESR";
|
||||
|
||||
version = "140.12.1esr";
|
||||
sha512 = "24e795483ba7bc112c0debe1becdaf79cc2de95703b9ee726d0216bfc1db7b33c169503f83ac867e5998a8d1d0284a6ef12c7d35d98b10d6432497c2db237477";
|
||||
version = "140.13.0esr";
|
||||
sha512 = "778d2fc2837ba367e90c4336f3873da5a0823c182e2f50aa9373cd1ee9ee2b5310372ad9d33e1e11978791b67de4a6952d3036ff7d57b257a06f49c8cd4a830e";
|
||||
|
||||
updateScript = callPackage ./update.nix {
|
||||
attrPath = "thunderbirdPackages.thunderbird-140";
|
||||
|
||||
@@ -9,12 +9,14 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "airspyhf";
|
||||
version = "1.6.8-unstable-2025-07-12";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "airspy";
|
||||
repo = "airspyhf";
|
||||
rev = "87cf12a30f3a0f10f313aab8e54999ca69b753af";
|
||||
# Not clear why upstream won't tag releases. See:
|
||||
# https://github.com/airspy/airspyhf/commit/c0bb66dd8976651c53884ccec3d70a108f1e50e1#r193607536
|
||||
rev = "c0bb66dd8976651c53884ccec3d70a108f1e50e1";
|
||||
hash = "sha256-7bXBv4YTOaWRFI6Svb9/lSBEAssUgJMqxKM5zHk1swM=";
|
||||
};
|
||||
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "copilot-language-server";
|
||||
version = "1.521.0";
|
||||
version = "1.526.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-js-${finalAttrs.version}.zip";
|
||||
hash = "sha256-uHt22/756jxh34HhIbMEu3nGebbTF1325ylWuKzZzEI=";
|
||||
hash = "sha256-T1DYN/mVqISYtNGD1KBitXPgEIcrKQMqxquC7CywDo4=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
buildGo126Module (finalAttrs: {
|
||||
pname = "crush";
|
||||
version = "0.81.0";
|
||||
version = "0.86.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charmbracelet";
|
||||
repo = "crush";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-FOvkCQxDW1dipzIzgQz2uvHIv6bm/TVV1WwhrvmBDWg=";
|
||||
hash = "sha256-dUeXU65A9/d365a9Z+eUoHOR0RnJV9SAYsks+Vtz9js=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4gHvyEqiFhEvZ90lJbXeI/1fMMo6L19P/PD5Eu5YUmI=";
|
||||
vendorHash = "sha256-9WkkosPMwXsj32a5Zj4ZxphuB7aVteKq/YTzxP9Xmf0=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -8,17 +8,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "datafusion-cli";
|
||||
version = "54.0.0";
|
||||
version = "54.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "datafusion-cli-source";
|
||||
owner = "apache";
|
||||
repo = "datafusion";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-BWpHiLCn7idvzI2rlsre8l23TbxQU1Ma6bCjAMxQ6m8=";
|
||||
hash = "sha256-zeR6eyU4Cc5gHiE331ap8wuyYEj7s7BgqB+oOKwMfZw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Sj/biBiJPIYwxpL+Fua0k47vOu6gyyAhcKb4ZSUli6k=";
|
||||
cargoHash = "sha256-XXR1Turs+QwONZHq38MZHbcjv5DYZH9iqeuBl20gy3U=";
|
||||
|
||||
buildAndTestSubdir = "datafusion-cli";
|
||||
|
||||
|
||||
@@ -15,16 +15,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dcp";
|
||||
version = "0.25.5";
|
||||
version = "0.25.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "dcp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-umcrTAPWAInbjdZYhY0xEbI7heGwr+8FGMI7BIWSdD0=";
|
||||
hash = "sha256-MjBnJRdlGF2efEH0TcJjM3JVEByRzeqAZ13sR9EL0Ik=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-hcuVUUr3kr3iBmSEhHy365LIWGGLFTYnBRa5jnt7kPw=";
|
||||
vendorHash = "sha256-eJAMl1vGX2JANdYe8SWWLsNImd3raEEYvSfvwwfV4Xk=";
|
||||
|
||||
# This is required so we:
|
||||
# - Delete an inconsistent vendor directory from upstream
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "filebeat";
|
||||
version = "8.19.17";
|
||||
version = "8.19.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elastic";
|
||||
repo = "beats";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Xpth1SoXMXCUh/DFf3wA+Ql6SedtUB7tCYzDElpX5Lc=";
|
||||
hash = "sha256-3hvP+4U3PWlOsaLHO1MZuIpcB6YzPv2dMPlC68esiHE=";
|
||||
};
|
||||
|
||||
proxyVendor = true; # darwin/linux hash mismatch
|
||||
|
||||
vendorHash = "sha256-Wxk+eI0XfBpQqqUNuskyr+/bTRqT38hszdkz/LJweQo=";
|
||||
vendorHash = "sha256-e++Y5mhwms/uJnZCUyZNifoYqGH4TGEugSFHSGl0AQE=";
|
||||
|
||||
subPackages = [ "filebeat" ];
|
||||
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
fetchurl,
|
||||
glib,
|
||||
libxml2,
|
||||
pcre,
|
||||
zlib,
|
||||
libjpeg,
|
||||
giflib,
|
||||
@@ -53,7 +52,6 @@ stdenv.mkDerivation {
|
||||
++ [
|
||||
glib
|
||||
libxml2
|
||||
pcre
|
||||
zlib
|
||||
libjpeg
|
||||
giflib
|
||||
|
||||
@@ -18,16 +18,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "gitoxide";
|
||||
version = "0.55.0";
|
||||
version = "0.56.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GitoxideLabs";
|
||||
repo = "gitoxide";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-UtdXlIvX82UUhc4RWZZTBV5kz4YqfOTd4D/pGhDUfSI=";
|
||||
hash = "sha256-2zNXe+niwH8oDZEx6It7APggOtL7vrnRGKO4OoteTIw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Kv0NKA3OdHBn2M8DmcGyjcN2acGJYOdbczOb/nRsvDs=";
|
||||
cargoHash = "sha256-u9O4y6W0TuwdedNaQ127Bz4d3Olw9RzV/+AzxAstJQE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -18,11 +18,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gtkwave";
|
||||
version = "3.3.127";
|
||||
version = "3.3.128";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gtkwave/gtkwave-gtk3-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "sha256-8Z2i20Oye7zGaXJYQ0UZRaaMOkziMlYuNB1vY7gLVeQ=";
|
||||
sha256 = "sha256-gX4Zf8GAj4qsNUPCwvloPLATaMkRkrjq5a9YBw7x0fg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -4,14 +4,14 @@ Date: Wed, 4 Feb 2026 15:36:17 +0800
|
||||
Subject: [PATCH 1/2] nix: use terracotta from nix
|
||||
|
||||
---
|
||||
.../hmcl/terracotta/TerracottaBundle.java | 21 +++----------------
|
||||
1 file changed, 3 insertions(+), 18 deletions(-)
|
||||
.../hmcl/terracotta/TerracottaBundle.java | 19 ++-----------------
|
||||
1 file changed, 2 insertions(+), 17 deletions(-)
|
||||
|
||||
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/terracotta/TerracottaBundle.java b/HMCL/src/main/java/org/jackhuang/hmcl/terracotta/TerracottaBundle.java
|
||||
index 727edde9b..5b6e8b02f 100644
|
||||
index ecc99f3..b46ada0 100644
|
||||
--- a/HMCL/src/main/java/org/jackhuang/hmcl/terracotta/TerracottaBundle.java
|
||||
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/terracotta/TerracottaBundle.java
|
||||
@@ -139,26 +139,11 @@ public final class TerracottaBundle {
|
||||
@@ -147,26 +147,11 @@ public final class TerracottaBundle {
|
||||
}
|
||||
|
||||
public Path locate(String file) {
|
||||
@@ -33,20 +33,13 @@ index 727edde9b..5b6e8b02f 100644
|
||||
- return AbstractTerracottaProvider.Status.LEGACY_VERSION;
|
||||
- }
|
||||
- } catch (IOException e) {
|
||||
- Logger.LOG.warning("Cannot determine whether legacy versions exist.", e);
|
||||
- LOG.warning("Cannot determine whether legacy versions exist.", e);
|
||||
- }
|
||||
- return AbstractTerracottaProvider.Status.NOT_EXIST;
|
||||
+ return AbstractTerracottaProvider.Status.READY;
|
||||
}
|
||||
|
||||
private boolean isLocalBundleValid() throws IOException { // FIXME: Make control flow clearer.
|
||||
@@ -188,4 +173,4 @@ public final class TerracottaBundle {
|
||||
}
|
||||
return true;
|
||||
}
|
||||
-}
|
||||
+}
|
||||
\ No newline at end of file
|
||||
--
|
||||
2.52.0
|
||||
|
||||
|
||||
@@ -50,13 +50,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hmcl";
|
||||
version = "3.15.3";
|
||||
version = "3.16.2";
|
||||
|
||||
src = fetchurl {
|
||||
# HMCL has built-in keys, such as the Microsoft OAuth secret and the CurseForge API key.
|
||||
# See https://github.com/HMCL-dev/HMCL/blob/refs/tags/release-3.6.12/.github/workflows/gradle.yml#L26-L28
|
||||
url = "https://github.com/HMCL-dev/HMCL/releases/download/v${finalAttrs.version}/HMCL-${finalAttrs.version}.jar";
|
||||
hash = "sha256-/7RLhSHCnxtKxmusjnrfUEweYXzOoKcQO3G9+loBofk=";
|
||||
hash = "sha256-kvQDDZwA2sy8UQLZG4FqGmSh0sDcEuSg5CM6uy0DzCc=";
|
||||
};
|
||||
|
||||
# - HMCL prompts users to download prebuilt Terracotta binary for
|
||||
@@ -71,12 +71,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
terracottaBundleJava = fetchurl {
|
||||
name = "hmcl-terracotta-bundle-java-${finalAttrs.version}";
|
||||
url = "https://raw.githubusercontent.com/HMCL-dev/HMCL/v${finalAttrs.version}/${finalAttrs.terracottaBundleJavaPath}";
|
||||
hash = "sha256-1o/CUDeywtDlhAxqInk77aUwGCCYeZ84VMIyouN49uU=";
|
||||
hash = "sha256-dZHRim/7VNW0/nA6I8r3t5zGfzIMxG2lzdZ//dzv2Gs=";
|
||||
};
|
||||
macOSProviderJava = fetchurl {
|
||||
name = "hmcl-macos-provider-java-${finalAttrs.version}";
|
||||
url = "https://raw.githubusercontent.com/HMCL-dev/HMCL/v${finalAttrs.version}/${finalAttrs.macOSProviderJavaPath}";
|
||||
hash = "sha256-+Zji2B8ksT7P+IObyrM9q7vHPJVl5ZtH+v/J8Mfr0Q4=";
|
||||
hash = "sha256-7vI2U8vx3GYwlshoHJF/J8n2RS6TZ/cvoAivqYtW23Q=";
|
||||
};
|
||||
terracottaBundleJavaPath = "HMCL/src/main/java/org/jackhuang/hmcl/terracotta/TerracottaBundle.java";
|
||||
macOSProviderJavaPath = "HMCL/src/main/java/org/jackhuang/hmcl/terracotta/provider/MacOSProvider.java";
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "ketch";
|
||||
version = "0.10.0";
|
||||
version = "0.12.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
@@ -16,10 +16,10 @@ buildGoModule (finalAttrs: {
|
||||
owner = "1broseidon";
|
||||
repo = "ketch";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-m6KEPbNd13eJsNigJyGGlV2dt0bcZTZcDBCBh/l5rjY=";
|
||||
hash = "sha256-qp4EwQBrN0ic/gUAvBAirz03kL7Vjhs1LbKBd+uXmHA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-UsTR7+GSuxUQ0aBq8fv1M18LegeDqf/XoiyASQKe5EI=";
|
||||
vendorHash = "sha256-Kk7fY27y1ziJEMpwRUoGfslGYYQdayLDuuRvNyfiAy8=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kloak";
|
||||
version = "0.8.5-1";
|
||||
version = "0.8.6-1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Whonix";
|
||||
repo = "kloak";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-fDmqA00b5ESS9LW2QIeEx3wWb0lhgkqoBYcw1XYDI7k=";
|
||||
hash = "sha256-zaoKVPocL8iaX6hhZh0Q+cgYg3JLWBcMgGU0nLlNcjo=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -68,7 +68,7 @@ haskellPackages.mkDerivation {
|
||||
hashable
|
||||
isocline
|
||||
lens
|
||||
lsp
|
||||
lsp_2_8_0_0
|
||||
mtl
|
||||
network
|
||||
network-simple
|
||||
|
||||
84
pkgs/by-name/li/librevna/package.nix
Normal file
84
pkgs/by-name/li/librevna/package.nix
Normal file
@@ -0,0 +1,84 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
apple-sdk_14,
|
||||
git,
|
||||
pkg-config,
|
||||
qt6,
|
||||
libusb1,
|
||||
udev,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "librevna";
|
||||
version = "1.6.5";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jankae";
|
||||
repo = "LibreVNA";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-uPVnjhbFXP1Z+pJuWDX4xqQGcmbJI8ElHq8fVXN0Qcc=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/Software/PC_Application/LibreVNA-GUI";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace resources/librevna.desktop \
|
||||
--replace-fail Exec=/opt/LibreVNA-GUI Exec=$out/bin/LibreVNA-GUI
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
git
|
||||
pkg-config
|
||||
qt6.qmake
|
||||
qt6.qtsvg
|
||||
qt6.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qt6.qtbase
|
||||
libusb1
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isLinux udev
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_14;
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
installPhase =
|
||||
if stdenv.hostPlatform.isDarwin then
|
||||
''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/{Applications,bin}
|
||||
mv LibreVNA-GUI.app $out/Applications
|
||||
ln -s $out/Applications/LibreVNA-GUI.app/Contents/MacOS/LibreVNA-GUI $out/bin/LibreVNA-GUI
|
||||
|
||||
runHook postInstall
|
||||
''
|
||||
else
|
||||
''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 LibreVNA-GUI -t $out/bin
|
||||
install -Dm644 ../51-vna.rules -t $out/etc/udev/rules.d
|
||||
install -Dm644 resources/librevna.desktop -t $out/share/applications
|
||||
install -Dm644 resources/librevna.png -t $out/share/pixmaps
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/jankae/LibreVNA/releases/tag/v${finalAttrs.version}";
|
||||
homepage = "https://github.com/jankae/LibreVNA/";
|
||||
description = "100kHz to 6GHz 2 port USB based VNA";
|
||||
mainProgram = "LibreVNA-GUI";
|
||||
license = lib.licenses.gpl3Only;
|
||||
platforms = lib.platforms.unix;
|
||||
|
||||
maintainers = with lib.maintainers; [
|
||||
dunxen
|
||||
];
|
||||
};
|
||||
})
|
||||
@@ -14,16 +14,16 @@ buildGoLatestModule (finalAttrs: {
|
||||
__structuredAttrs = true;
|
||||
|
||||
pname = "matcha";
|
||||
version = "0.43.0";
|
||||
version = "0.44.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "floatpane";
|
||||
repo = "matcha";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-x+k1/k7pwJ0MW0t31ieaOkbP8LtqDSmHOBrNEGA0K6Q=";
|
||||
hash = "sha256-y1YEnqTCmf+CMKpv3wN4SZsN+lUuv3T8pKmM+zu1Ipw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-5smWIw8ofG61ugHxFbmQ9r9vcxi098/UmxUE15lx4wE=";
|
||||
vendorHash = "sha256-cg6R4WtDORwZlo+P16rN6qc0zZMOPtnr4VyQKV9Q2nM=";
|
||||
proxyVendor = true;
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "matomo";
|
||||
version = "5.10.0";
|
||||
version = "5.12.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://builds.matomo.org/matomo-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-i7nRQRY2gAzMQmRNGaksq4B516MsQuXQZbzlEUWEsQw=";
|
||||
hash = "sha256-yiQUXb9yGgJ8PFOL1tyXtXEmgCviaqCtN0DwxKcGZV0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -14,19 +14,19 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "matrix-synapse";
|
||||
version = "1.156.0";
|
||||
version = "1.157.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "element-hq";
|
||||
repo = "synapse";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-x3EVmNPqcxtvt6ZaPsDCCcr7Z0LIO257s2gO3HCNmKA=";
|
||||
hash = "sha256-yDfBtcBvIoWUfD8bqwGgeMvq4XHrr9ptVB6yKJWFX0c=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit pname version src;
|
||||
hash = "sha256-N/JWRFz9OKcxigjp86AVVZGK63MdZmEzwHhBgBuWZcY=";
|
||||
hash = "sha256-KM3j2O7J4Sad6jKF2Ca4qkRLj3w7+/UCnK6T6x8kMfs=";
|
||||
};
|
||||
|
||||
build-system =
|
||||
|
||||
@@ -27,10 +27,10 @@
|
||||
#
|
||||
# Ensure you also check ../mattermostLatest/package.nix.
|
||||
regex = "^v(11\\.7\\.[0-9]+)$";
|
||||
version = "11.7.6";
|
||||
srcHash = "sha256-oMjfSX45+sEQwNpNVDTOlCBUK7OSBCCKpaUMMrRzdQM=";
|
||||
version = "11.7.7";
|
||||
srcHash = "sha256-dV+U+2yYX4IrM/EMaBAMwhW9WJh976WGDWFNOqnkTE8=";
|
||||
vendorHash = "sha256-XaXqQN20c3DhW2/L0zhTA8dLeRp4MyBxUKpiMVwp/7s=";
|
||||
npmDepsHash = "sha256-F7o+AVM1WiuHKDQaqHbxDjWT1vAiddh4/D8EktxncAs=";
|
||||
npmDepsHash = "sha256-8ZEe2TM2bevzdn04YIcVICWFSaa8HZTVS4gKn6aFcqM=";
|
||||
},
|
||||
...
|
||||
}:
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "metals";
|
||||
version = "1.6.7";
|
||||
version = "1.6.8";
|
||||
|
||||
deps = stdenv.mkDerivation {
|
||||
name = "metals-deps-${finalAttrs.version}";
|
||||
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
outputHashMode = "recursive";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = "sha256-2ly1vO+06EalQjEekRwm/g2wfdbq26IcEQscfM14Gvc=";
|
||||
outputHash = "sha256-LdZ6I7zOUTHgS/TTo0T6Dh+Kb3YpgJg8gK0UngsA7Gs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
mkDerivation,
|
||||
lib,
|
||||
fetchFromCodeberg,
|
||||
fetchFromGitHub,
|
||||
aeson,
|
||||
base,
|
||||
bytestring,
|
||||
@@ -26,7 +26,7 @@
|
||||
mkDerivation rec {
|
||||
pname = "mkjson";
|
||||
version = "0.4.0";
|
||||
src = fetchFromCodeberg {
|
||||
src = fetchFromGitHub {
|
||||
owner = "mfussenegger";
|
||||
repo = "mkjson";
|
||||
rev = "${version}";
|
||||
|
||||
@@ -1,19 +1,2 @@
|
||||
{
|
||||
haskell,
|
||||
haskellPackages,
|
||||
lib,
|
||||
}:
|
||||
let
|
||||
inherit (haskell.lib.compose) justStaticExecutables overrideCabal;
|
||||
|
||||
# The mkjson-doctest suite depends on specific RNG results not provided by the
|
||||
# GHC in Nixpkgs as of this writing.
|
||||
overrides = {
|
||||
testTargets = [ "mkjson-test" ];
|
||||
};
|
||||
raw-pkg = haskellPackages.callPackage ./generated.nix { };
|
||||
in
|
||||
lib.pipe raw-pkg [
|
||||
(overrideCabal overrides)
|
||||
justStaticExecutables
|
||||
]
|
||||
{ haskell, haskellPackages }:
|
||||
haskell.lib.justStaticExecutables (haskellPackages.callPackage ./generated.nix { })
|
||||
|
||||
@@ -185,7 +185,7 @@ pythonPackages.buildPythonApplication (finalAttrs: {
|
||||
nativeCheckInputs =
|
||||
with pythonPackages;
|
||||
[
|
||||
pytestCheckHook
|
||||
pytest9_0CheckHook
|
||||
writableTmpDirAsHomeHook
|
||||
]
|
||||
++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies
|
||||
|
||||
@@ -1,111 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchurl,
|
||||
raspberrypifw,
|
||||
pcre,
|
||||
boost,
|
||||
freetype,
|
||||
zlib,
|
||||
}:
|
||||
|
||||
let
|
||||
ffmpeg = stdenv.mkDerivation rec {
|
||||
pname = "ffmpeg";
|
||||
version = "1.1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.ffmpeg.org/releases/ffmpeg-${version}.tar.bz2";
|
||||
sha256 = "03s1zsprz5p6gjgwwqcf7b6cvzwwid6l8k7bamx9i0f1iwkgdm0j";
|
||||
};
|
||||
|
||||
configurePlatforms = [ ];
|
||||
configureFlags = [
|
||||
"--arch=${stdenv.hostPlatform.parsed.cpu.name}"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isAarch32 [
|
||||
# TODO be better with condition
|
||||
"--cpu=arm1176jzf-s"
|
||||
]
|
||||
++ [
|
||||
"--disable-muxers"
|
||||
"--enable-muxer=spdif"
|
||||
"--enable-muxer=adts"
|
||||
"--disable-encoders"
|
||||
"--enable-encoder=ac3"
|
||||
"--enable-encoder=aac"
|
||||
"--disable-decoder=mpeg_xvmc"
|
||||
"--disable-devices"
|
||||
"--disable-ffprobe"
|
||||
"--disable-ffplay"
|
||||
"--disable-ffserver"
|
||||
"--disable-ffmpeg"
|
||||
"--enable-shared"
|
||||
"--disable-doc"
|
||||
"--enable-postproc"
|
||||
"--enable-gpl"
|
||||
"--enable-protocol=http"
|
||||
"--enable-pthreads"
|
||||
"--disable-runtime-cpudetect"
|
||||
"--enable-pic"
|
||||
"--disable-armv5te"
|
||||
"--disable-neon"
|
||||
"--enable-armv6t2"
|
||||
"--enable-armv6"
|
||||
"--enable-hardcoded-tables"
|
||||
"--disable-runtime-cpudetect"
|
||||
"--disable-debug"
|
||||
"--arch=${stdenv.hostPlatform.parsed.cpu.name}"
|
||||
"--target_os=${stdenv.hostPlatform.parsed.kernel.name}"
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
"--cross-prefix=${stdenv.cc.targetPrefix}"
|
||||
"--enable-cross-compile"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.ffmpeg.org/";
|
||||
description = "Complete, cross-platform solution to record, convert and stream audio and video";
|
||||
};
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "omxplayer";
|
||||
version = "0-unstable-2013-03-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "huceke";
|
||||
repo = "omxplayer";
|
||||
rev = "fbee325dc20441138d04d8d2022ad85956302e97";
|
||||
sha256 = "0fkvv8il7ffqxki2gp8cxa5shh6sz9jsy5vv3f4025g4gss6afkg";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i 1d Makefile
|
||||
export INCLUDES="-I${raspberrypifw}/include/interface/vcos/pthreads -I${raspberrypifw}/include/interface/vmcs_host/linux/"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp omxplayer.bin $out/bin
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
raspberrypifw
|
||||
ffmpeg
|
||||
pcre
|
||||
boost
|
||||
freetype
|
||||
zlib
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/huceke/omxplayer";
|
||||
description = "Commandline OMX player for the Raspberry Pi";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.arm;
|
||||
};
|
||||
}
|
||||
@@ -14,7 +14,6 @@
|
||||
libGL,
|
||||
glib,
|
||||
libxml2,
|
||||
pcre,
|
||||
zlib,
|
||||
boost,
|
||||
jpegSupport ? true,
|
||||
@@ -99,7 +98,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
++ lib.optional curlSupport curl
|
||||
++ lib.optionals colladaSupport [
|
||||
collada-dom
|
||||
pcre
|
||||
]
|
||||
++ lib.optional opencascadeSupport opencascade-occt
|
||||
++ lib.optional ffmpegSupport ffmpeg
|
||||
|
||||
@@ -118,6 +118,7 @@ pythonPackages.buildPythonApplication (finalAttrs: {
|
||||
"drf-spectacular-sidecar"
|
||||
"python-dotenv"
|
||||
"gotenberg-client"
|
||||
"nltk"
|
||||
"redis"
|
||||
"scikit-learn"
|
||||
"tika-client"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
python312Packages,
|
||||
python313Packages,
|
||||
fetchFromGitHub,
|
||||
|
||||
chromaprint,
|
||||
@@ -12,15 +12,17 @@
|
||||
gst_all_1,
|
||||
|
||||
writableTmpDirAsHomeHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
let
|
||||
pythonPackages = python312Packages;
|
||||
# A few more tests fail with python314Pacakges, indicating the code isn't
|
||||
# ready for it yet.
|
||||
pythonPackages = python313Packages;
|
||||
pyqt5 = if enablePlayback then pythonPackages.pyqt5-multimedia else pythonPackages.pyqt5;
|
||||
in
|
||||
pythonPackages.buildPythonApplication (finalAttrs: {
|
||||
pname = "picard";
|
||||
# nix-update --commit picard --version-regex 'release-(.*)'
|
||||
version = "2.13.3";
|
||||
pyproject = true;
|
||||
strictDeps = true;
|
||||
@@ -45,7 +47,7 @@ pythonPackages.buildPythonApplication (finalAttrs: {
|
||||
++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform qt5.qtwayland) [
|
||||
qt5.qtwayland
|
||||
]
|
||||
++ lib.optionals (pyqt5.multimediaEnabled) [
|
||||
++ lib.optionals pyqt5.multimediaEnabled [
|
||||
qt5.qtmultimedia.bin
|
||||
gst_all_1.gst-libav
|
||||
gst_all_1.gst-plugins-base
|
||||
@@ -59,7 +61,7 @@ pythonPackages.buildPythonApplication (finalAttrs: {
|
||||
"pyobjc-framework-Cocoa"
|
||||
];
|
||||
|
||||
propagatedBuildInputs =
|
||||
dependencies =
|
||||
with pythonPackages;
|
||||
[
|
||||
charset-normalizer
|
||||
@@ -104,10 +106,17 @@ pythonPackages.buildPythonApplication (finalAttrs: {
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
|
||||
''
|
||||
+ lib.optionalString (pyqt5.multimediaEnabled) ''
|
||||
+ lib.optionalString pyqt5.multimediaEnabled ''
|
||||
makeWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"release-(.*)"
|
||||
];
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://picard.musicbrainz.org";
|
||||
changelog = "https://picard.musicbrainz.org/changelog";
|
||||
|
||||
@@ -36,7 +36,9 @@ buildGoModule (finalAttrs: {
|
||||
homepage = "https://github.com/jedisct1/piknik";
|
||||
changelog = "https://github.com/jedisct1/piknik/blob/${finalAttrs.src.rev}/ChangeLog";
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [
|
||||
sheeeng
|
||||
];
|
||||
mainProgram = "piknik";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
{
|
||||
version = "1.82.2";
|
||||
version = "1.83.0";
|
||||
hashes = {
|
||||
linux-aarch_64 = "sha256-RVdT8rpH1WHd5vQb+o3BP81ipuwFZ/Bv8Hr8BC7shwA=";
|
||||
linux-ppcle_64 = "sha256-Jcjpo21XWjCeCMcWmjM5tPtQYwd5JZ0pUsfFXMAF95Q=";
|
||||
linux-s390_64 = "sha256-Oe9brWzFO1aP3xcVhR8Uq40nJFTzyxDAtp0+3ErynjI=";
|
||||
linux-x86_32 = "sha256-AlnBc3VBeV+jMn6T0QFWurd+0hywSihi7snop81bO2E=";
|
||||
linux-x86_64 = "sha256-5SKpbtVprxNAXhzqODcPZ+I7U81RSjELWQKQ71/lYF4=";
|
||||
osx-aarch_64 = "sha256-LNFM4zTJiLO5XHWT/iaipbQWgN2HwyjNxTMps/XlzYo=";
|
||||
osx-x86_64 = "sha256-LNFM4zTJiLO5XHWT/iaipbQWgN2HwyjNxTMps/XlzYo=";
|
||||
windows-x86_32 = "sha256-yrbPXrPSn+iaI16zCPh1rteFh1Q18sQuR9UWo+xMToQ=";
|
||||
windows-x86_64 = "sha256-vfdo65O6o8ctW+qVdcWuH5sQDXypn4ktNHMCv6uJ0gw=";
|
||||
linux-aarch_64 = "sha256-Nwnk4Upg8VZCVbR/bpJDct/wI6GGaTICK+Sh711ZVEM=";
|
||||
linux-ppcle_64 = "sha256-xUwugnrRQQqEkupYFh7SPtqtNmXmNCjAE+msHskmPXY=";
|
||||
linux-s390_64 = "sha256-hj+QMaSxtX+hs6G5qCxf7ON2bDvpEGovt9iuVFwsXAQ=";
|
||||
linux-x86_32 = "sha256-qJ034I7Im1pEn5u6W16y662y4+d7ZpB9EQtd7hkSCG4=";
|
||||
linux-x86_64 = "sha256-oZrnSqTLA+HQEmlWKsYWXsMqhIp769AyrqmguVaXGLo=";
|
||||
osx-aarch_64 = "sha256-w+3q+DtvfVzsqm9PfeMq6WyUn0jJorp0NngnH6HQh3I=";
|
||||
osx-x86_64 = "sha256-w+3q+DtvfVzsqm9PfeMq6WyUn0jJorp0NngnH6HQh3I=";
|
||||
windows-x86_32 = "sha256-fwDjhD8Jhy7M7qPSc8vJSUA8H/OhWeOyV/69uuZX+9Y=";
|
||||
windows-x86_64 = "sha256-MER2cr8kaMO3zVTLujYr4jPX8jcbBqbHf9/Fxb0CbJY=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -18,13 +18,13 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "qdmr";
|
||||
version = "0.14.1";
|
||||
version = "0.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hmatuschek";
|
||||
repo = "qdmr";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-epttTJbqOtkacIu7IfBCAG1aGk02+0Ncalo7wRz+44k=";
|
||||
hash = "sha256-RFGjL31o+aiy7O7UgZWjGSMBqG97b5BtwVr6HQD3Ioo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -38,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libusb1
|
||||
libxslt
|
||||
kdePackages.qtlocation
|
||||
kdePackages.qtmultimedia
|
||||
kdePackages.qtserialport
|
||||
kdePackages.qttools
|
||||
kdePackages.qtbase
|
||||
|
||||
87
pkgs/by-name/si/silo/package.nix
Normal file
87
pkgs/by-name/si/silo/package.nix
Normal file
@@ -0,0 +1,87 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
let
|
||||
# The web client verifies that the server version is a valid datetime string:
|
||||
#
|
||||
# Example:
|
||||
# versionToTimestamp "2026-04-17T00-00-00Z"
|
||||
# => "2026-04-17T00:00:00Z"
|
||||
versionToTimestamp =
|
||||
version:
|
||||
let
|
||||
splitTS = builtins.elemAt (builtins.split "(.*)(T.*)" version) 1;
|
||||
in
|
||||
builtins.concatStringsSep "" [
|
||||
(builtins.elemAt splitTS 0)
|
||||
(builtins.replaceStrings [ "-" ] [ ":" ] (builtins.elemAt splitTS 1))
|
||||
];
|
||||
|
||||
# CopyrightYear will be printed to the CLI UI.
|
||||
# Example:
|
||||
# versionToYear "2026-04-17T00-00-00Z"
|
||||
# => "2026"
|
||||
versionToYear = version: builtins.elemAt (lib.splitString "-" version) 0;
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
__structuredAttrs = true;
|
||||
|
||||
pname = "silo";
|
||||
version = "2026-06-18T00-00-00Z";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pgsty";
|
||||
repo = "minio";
|
||||
tag = "RELEASE.${finalAttrs.version}";
|
||||
hash = "sha256-TwuqWof8FozryQoZt1lybw7z8z8E3Ose4jbKZ0To2lk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rewz3Sez/01iWGCEhMVmcVnIxxjgBzmeUyMqFi6s4mc=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
# nixpkgs go_1_26 pinned to 1.26.3; pgsty/minio's go.mod says go 1.26.4.
|
||||
# Step down to 1.26.3 to use the available toolchain. If pgsty/minio
|
||||
# genuinely needs 1.26.4 features, we can replace this with one of:
|
||||
# - Go toolchain auto-switch: prePatch GOTOOLCHAIN=go1.26.4+auto
|
||||
# (fails inside Nix sandbox since GOPROXY=off blocks toolchain download)
|
||||
# - Override go: buildGoModule.override { go = go_1_26.overrideAttrs ... }
|
||||
# (compile go 1.26.4 from source, ~5–10 min)
|
||||
# - Wait for nixpkgs to bump go_1_26 past 1.26.4
|
||||
postPatch = ''
|
||||
substituteInPlace go.mod \
|
||||
--replace-fail "go 1.26.4" "go 1.26.3"
|
||||
'';
|
||||
|
||||
tags = [ "kqueue" ];
|
||||
|
||||
ldflags =
|
||||
let
|
||||
t = "github.com/minio/minio/cmd";
|
||||
in
|
||||
[
|
||||
"-s"
|
||||
"-w"
|
||||
"-X ${t}.Version=${versionToTimestamp finalAttrs.version}"
|
||||
"-X ${t}.ReleaseTag=RELEASE.${finalAttrs.version}"
|
||||
"-X ${t}.CommitID=${finalAttrs.src.rev}"
|
||||
"-X ${t}.CopyrightYear=${versionToYear finalAttrs.version}"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
ln -s "$out/bin/minio" "$out/bin/silo"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Community-maintained fork of MinIO packaged as silo";
|
||||
homepage = "https://github.com/pgsty/minio";
|
||||
changelog = "https://github.com/pgsty/minio/releases/tag/${finalAttrs.src.tag}";
|
||||
maintainers = with lib.maintainers; [ randoneering ];
|
||||
license = lib.licenses.agpl3Plus;
|
||||
mainProgram = "silo";
|
||||
};
|
||||
})
|
||||
@@ -1,19 +1,19 @@
|
||||
# Generated by ./update.sh - do not update manually!
|
||||
# Last updated: 2026-05-14
|
||||
# Last updated: 2026-07-23
|
||||
{ fetchurl }:
|
||||
{
|
||||
aarch64-darwin = {
|
||||
version = "4.49.89";
|
||||
version = "4.51.180";
|
||||
src = fetchurl {
|
||||
url = "https://downloads.slack-edge.com/desktop-releases/mac/arm64/4.49.89/Slack-4.49.89-macOS.dmg";
|
||||
hash = "sha256-u5NppmmRyC+6HaPIcSSGOOdVRiZdT9GE1eHvad6rYdY=";
|
||||
url = "https://downloads.slack-edge.com/desktop-releases/mac/arm64/4.51.180/Slack-4.51.180-macOS.dmg";
|
||||
hash = "sha256-6QhuZWEwQiW8ZyYTJRLMZq5MayBgX9xlBLdhttiTaoA=";
|
||||
};
|
||||
};
|
||||
x86_64-linux = {
|
||||
version = "4.49.89";
|
||||
version = "4.51.180";
|
||||
src = fetchurl {
|
||||
url = "https://downloads.slack-edge.com/desktop-releases/linux/x64/4.49.89/slack-desktop-4.49.89-amd64.deb";
|
||||
hash = "sha256-Shf4/igTudAwg0ve8iGjpLIS8AL/k90RDN92JyAMGy8=";
|
||||
url = "https://downloads.slack-edge.com/desktop-releases/linux/x64/4.51.180/slack-desktop-4.51.180-amd64.deb";
|
||||
hash = "sha256-qkXhUXlHAzdwEqmtePCyFSw2iFLghSZ65ona+1wwjqE=";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "smfh";
|
||||
version = "1.6";
|
||||
version = "1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "feel-co";
|
||||
repo = "smfh";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-mP/ln+GkafKSnK4LIrAZY45OZYErQFehHUKmBRhHJY4=";
|
||||
hash = "sha256-vKJWHujoGfTV61gjDglzu4ZMJ1phsUGNKELLEeF3QMg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-6kybKx2aZ0pTr0yXPawqTnJVntL1NNCkgEvRFQEwtCk=";
|
||||
cargoHash = "sha256-CvXZtq0o+cYrXP7FSBJLi23wtU9dsUOAOWDsht5cK+k=";
|
||||
|
||||
meta = {
|
||||
description = "Sleek Manifest File Handler";
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "telemt";
|
||||
version = "3.4.23";
|
||||
version = "3.4.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "telemt";
|
||||
repo = "telemt";
|
||||
tag = version;
|
||||
hash = "sha256-8rKEMQPgIrvtLoM+LcSoXiYaMmCtb4OObnDUYagy+Ak=";
|
||||
hash = "sha256-A9+PWpVyHgQOFb/OsLc8vl4kq8J9reW1/5Hn4yTdJeI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-wjw+FE1yQ+zc2Ta3h7B3Wtejf6bGobstTKDCjFphU+M=";
|
||||
cargoHash = "sha256-ZaaT3S3Qy7HBI2dETy8JtvWttJWnkhRNA3wWz44pTpQ=";
|
||||
|
||||
checkFlags = [
|
||||
# flaky: races between MiddleClientWriterCancelled and TrafficBudgetWaitCancelled observation paths
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "temporal-cli";
|
||||
version = "1.8.0";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "temporalio";
|
||||
repo = "cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Z5Ba4oVQR6g/HyaBd/0iLIWq6Ht2SJAdylTVaErRFL0=";
|
||||
hash = "sha256-RswHPnaWN3bLerhttVb/3G//cyz9Fr+x/B4h+/SSSqA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-9lO9uhy1n85QYyoh27cKhdlcuL4GT98aCNWwe8tOwoQ=";
|
||||
|
||||
@@ -13,16 +13,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "tpnote";
|
||||
version = "1.26.6";
|
||||
version = "1.26.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getreu";
|
||||
repo = "tp-note";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ELRR2nIbkbD/WWS93lyHHYoPY/KLUBO9+/13UUFhA6Y=";
|
||||
hash = "sha256-dg6IFozGnvCOHbqZ9p0Eu7CPAv7W1Yf+MqAAFxghBEg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-gFfESz0yn9AJ4QCujaUyXrFnxyHzqi3IX5Gg0Gma0DQ=";
|
||||
cargoHash = "sha256-Lu4NBYxplYk5Y3IbfiCv61whW9Dk6fIScZUIB5yBdCk=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -17,11 +17,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xfsprogs";
|
||||
version = "7.0.1";
|
||||
version = "7.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/xfsprogs-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-SoyoOnrLjNksmX1jtprmTxcAVrNmopJKdT5H1LtLiwY=";
|
||||
hash = "sha256-Bj7cMbqOhclcf6+b5GWgSJi7p8bmIv3ZsUbu1MpUFeg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkYaziPlugin {
|
||||
pname = "diff.yazi";
|
||||
version = "0-unstable-2026-07-01";
|
||||
version = "0-unstable-2026-07-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yazi-rs";
|
||||
repo = "plugins";
|
||||
rev = "65559fd3edc33cb0fd24ec92874c763fa5f68e3e";
|
||||
hash = "sha256-SLfwFGOcmlZIUqlSSMk7dEEUZQbKqPMidknS3vtFzPo=";
|
||||
rev = "bbac5e75b22a2893ef7cdd2bd6814b15f2abb91e";
|
||||
hash = "sha256-lio4pvrqK575q7M+GtRr/5EdA4h2J/7gIvXK8c5rq1U=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkYaziPlugin {
|
||||
pname = "gvfs.yazi";
|
||||
version = "0-unstable-2026-07-13";
|
||||
version = "0-unstable-2026-07-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "boydaihungst";
|
||||
repo = "gvfs.yazi";
|
||||
rev = "c5a0bb924eceeeb8b44bfc00aba0a97ba0287fa3";
|
||||
hash = "sha256-hSHEN/F4uc1FFScB5lLRAKryLwP+O7I9vgEgobGbQyw=";
|
||||
rev = "364b0a811d722a1fdb3c2bde36aa640591437967";
|
||||
hash = "sha256-bQDcT04m1WvMRCiVIyer4WHgjYMaamMfolmH49lVSig=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkYaziPlugin {
|
||||
pname = "restore.yazi";
|
||||
version = "0-unstable-2026-04-04";
|
||||
version = "0-unstable-2026-07-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "boydaihungst";
|
||||
repo = "restore.yazi";
|
||||
rev = "0e0870460b9b74c5ae98b7f96c7c26a9a274ce6d";
|
||||
hash = "sha256-rDsyMF5IEBHx+fJ0oYTCCQAlTSquUcOkFLC4Lmbuz6k=";
|
||||
rev = "7bfcfcbda078b7e51d1ff9a62db9c654a3952fa4";
|
||||
hash = "sha256-pmyS1rU5C6U9LloGoDFB8s6GwoMqG1Jve5OFooI64tU=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -4,8 +4,25 @@
|
||||
fetchpatch,
|
||||
python3Packages,
|
||||
qt6,
|
||||
linkFarm,
|
||||
hunspellDictsChromium,
|
||||
dictionaries ? [
|
||||
hunspellDictsChromium.en-us
|
||||
hunspellDictsChromium.en-gb
|
||||
hunspellDictsChromium.de-de
|
||||
hunspellDictsChromium.fr-fr
|
||||
hunspellDictsChromium.sv-se
|
||||
],
|
||||
}:
|
||||
|
||||
let
|
||||
qtwebengineDictionaries = linkFarm "zapzap-qtwebengine-dictionaries" (
|
||||
map (d: {
|
||||
name = d.dictFileName;
|
||||
path = d;
|
||||
}) dictionaries
|
||||
);
|
||||
in
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "zapzap";
|
||||
version = "7.0";
|
||||
@@ -55,7 +72,12 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
|
||||
dontWrapQtApps = true;
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
|
||||
makeWrapperArgs+=(
|
||||
"''${qtWrapperArgs[@]}"
|
||||
${lib.optionalString (dictionaries != [ ]) ''
|
||||
--set-default QTWEBENGINE_DICTIONARIES_PATH "${qtwebengineDictionaries}"
|
||||
''}
|
||||
)
|
||||
'';
|
||||
|
||||
# has no tests
|
||||
|
||||
3
pkgs/by-name/zf/zfstools/Gemfile
Normal file
3
pkgs/by-name/zf/zfstools/Gemfile
Normal file
@@ -0,0 +1,3 @@
|
||||
source "http://rubygems.org"
|
||||
|
||||
gem "getoptlong"
|
||||
14
pkgs/by-name/zf/zfstools/Gemfile.lock
generated
Normal file
14
pkgs/by-name/zf/zfstools/Gemfile.lock
generated
Normal file
@@ -0,0 +1,14 @@
|
||||
GEM
|
||||
remote: http://rubygems.org/
|
||||
specs:
|
||||
getoptlong (0.2.1)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
x86_64-linux
|
||||
|
||||
DEPENDENCIES
|
||||
getoptlong
|
||||
|
||||
BUNDLED WITH
|
||||
2.6.9
|
||||
12
pkgs/by-name/zf/zfstools/gemset.nix
generated
Normal file
12
pkgs/by-name/zf/zfstools/gemset.nix
generated
Normal file
@@ -0,0 +1,12 @@
|
||||
{
|
||||
getoptlong = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "http://rubygems.org" ];
|
||||
sha256 = "198vy9dxyzibqdbw9jg8p2ljj9iknkyiqlyl229vz55rjxrz08zx";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.2.1";
|
||||
};
|
||||
}
|
||||
@@ -1,25 +1,31 @@
|
||||
{
|
||||
lib,
|
||||
bundlerEnv,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
ruby,
|
||||
zfs,
|
||||
freebsd,
|
||||
makeWrapper,
|
||||
}:
|
||||
let
|
||||
rubyEnv = bundlerEnv {
|
||||
name = "zfstools-gems";
|
||||
gemdir = ./.;
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zfstools";
|
||||
version = "0.3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "16lvw3xbmxp2pr8nixqn7lf4504zaaxvbbdnjkv4dggwd4lsdjyg";
|
||||
rev = "v${finalAttrs.version}";
|
||||
repo = "zfstools";
|
||||
owner = "bdrewery";
|
||||
repo = "zfstools";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-z8umKWn8vUb2lLattbtSn4BCHD0W92hRvuL2uvrgm5o=";
|
||||
};
|
||||
|
||||
buildInputs = [ ruby ];
|
||||
buildInputs = [ rubyEnv.wrappedRuby ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
@@ -36,9 +42,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
inherit (finalAttrs) version;
|
||||
inherit (finalAttrs.src.meta) homepage;
|
||||
description = "OpenSolaris-compatible auto-snapshotting script for ZFS";
|
||||
homepage = "https://github.com/bdrewery/zfstools";
|
||||
longDescription = ''
|
||||
zfstools is an OpenSolaris-like and compatible auto snapshotting script
|
||||
for ZFS, which also supports auto snapshotting mysql databases.
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"commit": "6debb08ec29f31bffb358dd022a8fce4a3ceb839",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/6debb08ec29f31bffb358dd022a8fce4a3ceb839.tar.gz",
|
||||
"sha256": "1h30jg3qbyqbsa3g59pm7kvv56g7bvkwsvzpv8v7zgrcwf2cmi5p",
|
||||
"msg": "Update from Hackage at 2026-07-15T08:37:28Z"
|
||||
"commit": "3a3b69bdd8114e4503dc8cb9909a3b0ea32e6be6",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/3a3b69bdd8114e4503dc8cb9909a3b0ea32e6be6.tar.gz",
|
||||
"sha256": "1qjd5gp9d4r4y6qjf52m7w9dzy9nq622aqv72ma8d4xlrxrrachp",
|
||||
"msg": "Update from Hackage at 2026-04-24T19:35:23Z"
|
||||
}
|
||||
|
||||
@@ -12,11 +12,6 @@ pkgs.haskell.packages.ghc98.override {
|
||||
# https://github.com/avh4/elm-format/blob/e7e5da37716acbfb4954a88128b5cc72b2c911d9/package/nix/generate_derivation.sh
|
||||
elm-format = justStaticExecutables (
|
||||
overrideCabal (drv: {
|
||||
# jailbreak required due to optparse-applicative bounds
|
||||
# optparse-applicative >=0.17.0.0 && <0.19
|
||||
# upstream PR https://github.com/avh4/elm-format/pull/841
|
||||
jailbreak = true;
|
||||
|
||||
postPatch = ''
|
||||
mkdir -p ./generated
|
||||
cat <<EOHS > ./generated/Build_elm_format.hs
|
||||
@@ -40,14 +35,8 @@ pkgs.haskell.packages.ghc98.override {
|
||||
inherit elmPkgs;
|
||||
|
||||
# Needed for elm-format
|
||||
|
||||
avh4-lib = self.callPackage ./elm-format/avh4-lib.nix { };
|
||||
# jailbreak required due to optparse-applicative bounds
|
||||
# optparse-applicative >=0.17.0.0 && <0.19
|
||||
# upstream PR https://github.com/avh4/elm-format/pull/841
|
||||
elm-format-lib = pkgs.haskell.lib.doJailbreak (
|
||||
self.callPackage ./elm-format/elm-format-lib.nix { }
|
||||
);
|
||||
elm-format-lib = self.callPackage ./elm-format/elm-format-lib.nix { };
|
||||
elm-format-test-lib = self.callPackage ./elm-format/elm-format-test-lib.nix { };
|
||||
elm-format-markdown = self.callPackage ./elm-format/elm-format-markdown.nix { };
|
||||
};
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
import ./common-hadrian.nix {
|
||||
version = "9.12.4.20260614";
|
||||
url = "https://downloads.haskell.org/~ghc/9.12.5-rc2/ghc-9.12.4.20260614-src.tar.gz";
|
||||
sha256 = "3ab5987e18dafff3bc8d62ea6934e2edc0dd2151454af044790cd1074070fd4b";
|
||||
}
|
||||
@@ -855,6 +855,16 @@ stdenv.mkDerivation (
|
||||
preInstall = ''
|
||||
pushd _build/bindist/*
|
||||
|
||||
''
|
||||
# the bindist configure script uses different env variables than the GHC configure script
|
||||
# see https://github.com/NixOS/nixpkgs/issues/267250 krank:ignore-line
|
||||
# https://gitlab.haskell.org/ghc/ghc/-/issues/24211 krank:ignore-line
|
||||
+ lib.optionalString (stdenv.targetPlatform.linker == "cctools") ''
|
||||
export InstallNameToolCmd=$INSTALL_NAME_TOOL
|
||||
export OtoolCmd=$OTOOL
|
||||
''
|
||||
# Replicate configurePhase
|
||||
+ ''
|
||||
$configureScript "''${configureFlags[@]}"
|
||||
'';
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import ./common-hadrian.nix {
|
||||
version = "10.1.20260513";
|
||||
rev = "38b76b2f1d918f10d2f9d3e57bd0459dfe671d4f";
|
||||
sha256 = "sha256-b0AZsWVmGi6EaWEtPWPOQAxvTlxG2aBwegw5l5HBPDo=";
|
||||
version = "9.15.20260322";
|
||||
rev = "44f118f09dcde49f64d03e427312df4732f2d4a4";
|
||||
sha256 = "sha256-xby7HKyK5P1Y5DjKbVe62piDCY4Ujb4pbv8AJ7sQ0HI=";
|
||||
}
|
||||
|
||||
@@ -21,6 +21,7 @@ in
|
||||
ncurses,
|
||||
binutils,
|
||||
buildEnv,
|
||||
pkgsBuildBuild,
|
||||
libunwind,
|
||||
fetchpatch,
|
||||
libx11,
|
||||
@@ -177,6 +178,7 @@ stdenv.mkDerivation (
|
||||
]
|
||||
else
|
||||
[ "nixpkgs_world" ];
|
||||
nativeBuildInputs = optional (stdenv.hostPlatform != stdenv.targetPlatform) pkgsBuildBuild.ocaml;
|
||||
buildInputs =
|
||||
optional (lib.versionOlder version "4.07") ncurses
|
||||
++ optionals useX11 [
|
||||
|
||||
@@ -46,6 +46,7 @@ mkCoqDerivation {
|
||||
|
||||
releaseRev = v: "v${v}";
|
||||
|
||||
release."3.5".hash = "sha256-ur6XGhTUQ1XdcyC6RERYaTwyzL58mWwdihY/yemjfQg=";
|
||||
release."3.4".hash = "sha256-AnyiM5B7JJZI5LR0vSi6baVIx9SibYRiho7UBg1uV5w=";
|
||||
release."3.3".hash = "sha256-Zn9245fr0OhgaXjWlIO1QwSxrQYetj7qPHwZAXTdqNc=";
|
||||
release."3.2".hash = "sha256-4HOFFQzKbHIq+ktjJaS5b2Qr8WL1eQ26YxF4vt1FdWM=";
|
||||
@@ -72,7 +73,7 @@ mkCoqDerivation {
|
||||
lib.switch
|
||||
[ coq.coq-version mathcomp.version ]
|
||||
[
|
||||
(case (range "8.16" "9.1") (isGe "2.0") "3.4")
|
||||
(case (range "8.16" "9.1") (isGe "2.0") "3.5")
|
||||
(case (range "8.12" "8.20") (range "1.12" "1.19") "2.4")
|
||||
]
|
||||
null;
|
||||
|
||||
@@ -33,7 +33,7 @@ mkCoqDerivation {
|
||||
lib.switch
|
||||
[ coq.coq-version mathcomp.version ]
|
||||
[
|
||||
(case (range "9.0" "9.2") (range "2.6.0" "2.6.0") "2.5.0") # also works on MC 2.4 and 2.5 but breaks validsdp
|
||||
(case (range "9.0" "9.3") (range "2.6.0" "2.6.0") "2.5.0") # also works on MC 2.4 and 2.5 but breaks validsdp
|
||||
(case (range "8.18" "9.1") (range "2.1.0" "2.5.0") "2.4.0")
|
||||
(case (range "8.17" "9.0") (range "2.1.0" "2.3.0") "2.3.0")
|
||||
(case (range "8.17" "8.20") (isGe "2.1.0") "2.2.0")
|
||||
|
||||
@@ -34,7 +34,7 @@ mkCoqDerivation {
|
||||
lib.switch
|
||||
[ coq.coq-version mathcomp-character.version ]
|
||||
[
|
||||
(case (range "9.1" "9.2") (range "2.5" "2.6") "2.4.0")
|
||||
(case (range "9.1" "9.3") (range "2.5" "2.6") "2.4.0")
|
||||
(case (range "9.0" "9.1") (range "2.5" "2.5") "2.3.0")
|
||||
(case (range "8.16" "9.1") (range "2.2.0" "2.4.0") "2.2.0")
|
||||
(case (range "8.16" "9.0") (range "2.1.0" "2.3.0") "2.1.0")
|
||||
|
||||
@@ -32,7 +32,6 @@
|
||||
[ coq.coq-version mathcomp-boot.version ]
|
||||
[
|
||||
(case (range "8.20" "9.1") (range "2.3.0" "2.5.0") "0.3.1")
|
||||
(case (range "8.18" "9.1") (range "2.3.0" "2.4.0") "0.2.4")
|
||||
(case (range "8.18" "8.20") (range "2.3.0" "2.3.0") "0.2.3")
|
||||
(case (range "8.18" "8.20") (range "2.1.0" "2.2.0") "0.2.2")
|
||||
# This is the original dependency:
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
uhd,
|
||||
icu,
|
||||
airspy,
|
||||
airspyhf,
|
||||
hackrf,
|
||||
libbladeRF,
|
||||
rtl-sdr,
|
||||
@@ -79,7 +80,7 @@ mkDerivation (finalAttrs: {
|
||||
python.pkgs.pybind11
|
||||
];
|
||||
cmakeFlags = [
|
||||
(if (gnuradio.hasFeature "python-support") then "-DENABLE_PYTHON=ON" else "-DENABLE_PYTHON=OFF")
|
||||
(lib.cmakeBool "ENABLE_PYTHON" (gnuradio.hasFeature "python-support"))
|
||||
]
|
||||
++ finalAttrs.finalPackage.passthru.enabledFeaturesCmakeFlags;
|
||||
nativeBuildInputs = [
|
||||
@@ -95,6 +96,7 @@ mkDerivation (finalAttrs: {
|
||||
# Other features don't have dependencies but can still be disabled in the
|
||||
# `features` argument.
|
||||
airspy = [ airspy ];
|
||||
airspyhf = [ airspyhf ];
|
||||
bladerf = [ libbladeRF ];
|
||||
hackrf = [ hackrf ];
|
||||
rtl = [ rtl-sdr ];
|
||||
|
||||
@@ -35,10 +35,10 @@
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "cabal2nix";
|
||||
version = "2.21.3-unstable-2026-06-23";
|
||||
version = "2.21.3-unstable-2026-03-30";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/NixOS/cabal2nix/archive/bb97bf4294097812718ab9a3f244c9d58c833ae1.tar.gz";
|
||||
sha256 = "0bp5m83hzcsr3ga9zz5kq1jjs0n44mlh93x5j55avgw1rxvpfw32";
|
||||
url = "https://github.com/NixOS/cabal2nix/archive/41239bcc0622a0975c6705a03a44dfeffeb56f23.tar.gz";
|
||||
sha256 = "01qj6cvaif0810v83r6izcj1bbfpcqqxw4wybq04qsq92sqybpw2";
|
||||
};
|
||||
postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot";
|
||||
isLibrary = true;
|
||||
@@ -106,5 +106,5 @@ mkDerivation {
|
||||
'';
|
||||
homepage = "https://github.com/nixos/cabal2nix#readme";
|
||||
description = "Convert Cabal files into Nix build instructions";
|
||||
license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
|
||||
license = lib.licensesSpdx."BSD-3-Clause";
|
||||
}
|
||||
|
||||
@@ -18,10 +18,10 @@
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "distribution-nixpkgs";
|
||||
version = "1.7.1.1-unstable-2026-06-23";
|
||||
version = "1.7.1.1-unstable-2026-03-30";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/NixOS/cabal2nix/archive/bb97bf4294097812718ab9a3f244c9d58c833ae1.tar.gz";
|
||||
sha256 = "0bp5m83hzcsr3ga9zz5kq1jjs0n44mlh93x5j55avgw1rxvpfw32";
|
||||
url = "https://github.com/NixOS/cabal2nix/archive/41239bcc0622a0975c6705a03a44dfeffeb56f23.tar.gz";
|
||||
sha256 = "01qj6cvaif0810v83r6izcj1bbfpcqqxw4wybq04qsq92sqybpw2";
|
||||
};
|
||||
postUnpack = "sourceRoot+=/distribution-nixpkgs; echo source root reset to $sourceRoot";
|
||||
enableSeparateDataOutput = true;
|
||||
@@ -49,5 +49,5 @@ mkDerivation {
|
||||
];
|
||||
homepage = "https://github.com/NixOS/cabal2nix/tree/master/distribution-nixpkgs#readme";
|
||||
description = "Types and functions to manipulate the Nixpkgs distribution";
|
||||
license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
|
||||
license = lib.licensesSpdx."BSD-3-Clause";
|
||||
}
|
||||
|
||||
@@ -16,10 +16,10 @@
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "hackage-db";
|
||||
version = "2.1.3-unstable-2026-06-23";
|
||||
version = "2.1.3-unstable-2026-03-30";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/NixOS/cabal2nix/archive/bb97bf4294097812718ab9a3f244c9d58c833ae1.tar.gz";
|
||||
sha256 = "0bp5m83hzcsr3ga9zz5kq1jjs0n44mlh93x5j55avgw1rxvpfw32";
|
||||
url = "https://github.com/NixOS/cabal2nix/archive/41239bcc0622a0975c6705a03a44dfeffeb56f23.tar.gz";
|
||||
sha256 = "01qj6cvaif0810v83r6izcj1bbfpcqqxw4wybq04qsq92sqybpw2";
|
||||
};
|
||||
postUnpack = "sourceRoot+=/hackage-db; echo source root reset to $sourceRoot";
|
||||
isLibrary = true;
|
||||
@@ -38,5 +38,5 @@ mkDerivation {
|
||||
];
|
||||
homepage = "https://github.com/NixOS/cabal2nix/tree/master/hackage-db#readme";
|
||||
description = "Access cabal-install's Hackage database via Data.Map";
|
||||
license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
|
||||
license = lib.licensesSpdx."BSD-3-Clause";
|
||||
}
|
||||
|
||||
@@ -14,10 +14,10 @@
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "language-nix";
|
||||
version = "2.3.0-unstable-2026-06-23";
|
||||
version = "2.3.0-unstable-2026-03-30";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/NixOS/cabal2nix/archive/bb97bf4294097812718ab9a3f244c9d58c833ae1.tar.gz";
|
||||
sha256 = "0bp5m83hzcsr3ga9zz5kq1jjs0n44mlh93x5j55avgw1rxvpfw32";
|
||||
url = "https://github.com/NixOS/cabal2nix/archive/41239bcc0622a0975c6705a03a44dfeffeb56f23.tar.gz";
|
||||
sha256 = "01qj6cvaif0810v83r6izcj1bbfpcqqxw4wybq04qsq92sqybpw2";
|
||||
};
|
||||
postUnpack = "sourceRoot+=/language-nix; echo source root reset to $sourceRoot";
|
||||
libraryHaskellDepends = [
|
||||
@@ -39,5 +39,5 @@ mkDerivation {
|
||||
];
|
||||
homepage = "https://github.com/NixOS/cabal2nix/tree/master/language-nix#readme";
|
||||
description = "Data types and functions to represent the Nix language";
|
||||
license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
|
||||
license = lib.licensesSpdx."BSD-3-Clause";
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -37,21 +37,4 @@ self: super: {
|
||||
unix = null;
|
||||
xhtml = null;
|
||||
Win32 = null;
|
||||
|
||||
# core pkgs on later GHCs that we can reasonably provide a stub
|
||||
# or Hackage released version for (though they may not build).
|
||||
Cabal-syntax = self.Cabal-syntax_3_6_0_0;
|
||||
semaphore-compat = self.semaphore-compat_2_0_1;
|
||||
os-string = self.os-string_2_0_11;
|
||||
file-io = self.file-io_0_2_0;
|
||||
# Would need 2.25.*, but let's not bother
|
||||
haddock-api = self.haddock-api_2_29_1;
|
||||
haddock-library = self.haddock-library_1_11_0;
|
||||
|
||||
# core pkgs on later GHCs we can't provide at all
|
||||
system-cxx-std-lib = null;
|
||||
ghc-experimental = null;
|
||||
ghc-internal = null;
|
||||
ghc-platform = null;
|
||||
ghc-toolchain = null;
|
||||
}
|
||||
|
||||
@@ -65,16 +65,54 @@ in
|
||||
xhtml = null;
|
||||
Win32 = null;
|
||||
|
||||
# Become core packages in GHC >= 9.12
|
||||
file-io = doDistribute self.file-io_0_2_0;
|
||||
haddock-api = markBroken self.haddock-api_2_29_1; # no compatible release available
|
||||
haddock-library = doJailbreak (doDistribute self.haddock-library_1_11_0);
|
||||
|
||||
ghc-exactprint = doDistribute self.ghc-exactprint_1_10_0_0;
|
||||
|
||||
# “Unfortunately we are unable to support GHC 9.10.”
|
||||
apply-refact = dontDistribute (markBroken super.apply-refact);
|
||||
|
||||
stack =
|
||||
# Setup.hs depends on Cabal-syntax >= 3.14
|
||||
overrideCabal
|
||||
(drv: {
|
||||
setupHaskellDepends = drv.setupHaskellDepends or [ ] ++ [
|
||||
self.Cabal-syntax_3_14_2_0
|
||||
self.Cabal_3_14_2_0
|
||||
];
|
||||
# We need to tell GHC to ignore the Cabal core libraries while
|
||||
# compiling Setup.hs since it depends on Cabal >= 3.14.
|
||||
# ATTN: This override assumes we are using GHC 9.10.3 since we need
|
||||
# to give an exact Cabal version at the GHC (!) command line.
|
||||
# FIXME(@sternenseemann): make direct argument to generic-builder.nix
|
||||
env = drv.env or { } // {
|
||||
setupCompileFlags = lib.concatStringsSep " " [
|
||||
"-hide-package"
|
||||
"Cabal-syntax-3.12.1.0"
|
||||
"-hide-package"
|
||||
"Cabal-3.12.1.0"
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
# Stack itself depends on Cabal >= 3.14 which also needs to be updated for deps
|
||||
(
|
||||
super.stack.overrideScope (
|
||||
sself: ssuper:
|
||||
let
|
||||
upgradeCabal =
|
||||
drv:
|
||||
lib.pipe drv [
|
||||
(addBuildDepends [ sself.Cabal_3_14_2_0 ])
|
||||
(appendConfigureFlags [ "--constraint=Cabal>=3.14" ])
|
||||
];
|
||||
in
|
||||
{
|
||||
pantry = upgradeCabal ssuper.pantry_0_11_2;
|
||||
rio-prettyprint = upgradeCabal ssuper.rio-prettyprint;
|
||||
hackage-security = upgradeCabal ssuper.hackage-security;
|
||||
hpack = upgradeCabal sself.hpack_0_39_1;
|
||||
stack = upgradeCabal ssuper.stack;
|
||||
}
|
||||
)
|
||||
);
|
||||
|
||||
#
|
||||
# Version upgrades
|
||||
#
|
||||
@@ -86,6 +124,10 @@ in
|
||||
# Jailbreaks
|
||||
#
|
||||
floskell = doJailbreak super.floskell; # base <4.20
|
||||
# 2025-04-09: filepath <1.5
|
||||
haddock-library =
|
||||
assert super.haddock-library.version == "1.11.0";
|
||||
doJailbreak super.haddock-library;
|
||||
tree-sitter = doJailbreak super.tree-sitter; # containers <0.7, filepath <1.5
|
||||
|
||||
#
|
||||
|
||||
@@ -73,6 +73,7 @@ with haskellLib;
|
||||
#
|
||||
|
||||
extensions = doDistribute self.extensions_0_1_1_0;
|
||||
ghc-exactprint = doDistribute self.ghc-exactprint_1_12_0_0;
|
||||
|
||||
#
|
||||
# Jailbreaks
|
||||
@@ -86,6 +87,15 @@ with haskellLib;
|
||||
'';
|
||||
}) super.cpphs;
|
||||
cabal-install-parsers = doJailbreak super.cabal-install-parsers; # base, Cabal-syntax, etc.
|
||||
ghc-exactprint_1_12_0_0 = addBuildDepends [
|
||||
# cabal2nix drops conditional block: impl (ghc >= 9.12)
|
||||
self.Diff
|
||||
self.extra
|
||||
self.ghc-paths
|
||||
self.silently
|
||||
self.syb
|
||||
self.HUnit
|
||||
] super.ghc-exactprint_1_12_0_0;
|
||||
timezone-series = doJailbreak super.timezone-series; # time <1.14
|
||||
timezone-olson = doJailbreak super.timezone-olson; # time <1.14
|
||||
cabal-plan = doJailbreak super.cabal-plan; # base <4.21
|
||||
@@ -112,6 +122,9 @@ with haskellLib;
|
||||
'';
|
||||
}) super.alex;
|
||||
|
||||
# https://github.com/sjakobi/newtype-generics/pull/28/files
|
||||
newtype-generics = warnAfterVersion "0.6.2" (doJailbreak super.newtype-generics);
|
||||
|
||||
# Test failure because of GHC bug:
|
||||
# https://gitlab.haskell.org/ghc/ghc/-/issues/25937
|
||||
# https://github.com/sol/interpolate/issues/20
|
||||
|
||||
@@ -81,6 +81,13 @@ with haskellLib;
|
||||
#
|
||||
|
||||
ghc-exactprint = doDistribute self.ghc-exactprint_1_14_0_0;
|
||||
hedgehog = doDistribute self.hedgehog_1_7;
|
||||
hie-bios = doDistribute (dontCheck self.hie-bios_0_19_0); # Tests access homeless-shelter.
|
||||
lifted-async = doDistribute self.lifted-async_0_11_0;
|
||||
parallel = doDistribute self.parallel_3_3_0_0;
|
||||
tagged = doDistribute self.tagged_0_8_10;
|
||||
unordered-containers = doDistribute self.unordered-containers_0_2_21;
|
||||
HTTP = doDistribute self.HTTP_4000_5_0;
|
||||
|
||||
#
|
||||
# Jailbreaks
|
||||
@@ -127,6 +134,9 @@ with haskellLib;
|
||||
] super.serialise
|
||||
);
|
||||
|
||||
# https://github.com/sjakobi/newtype-generics/pull/28/files
|
||||
newtype-generics = warnAfterVersion "0.6.2" (doJailbreak super.newtype-generics);
|
||||
|
||||
# haskell-debugger only works with ghc 9.14+
|
||||
haskell-debugger-view = doDistribute (unmarkBroken super.haskell-debugger-view);
|
||||
haskell-debugger = doDistribute (doJailbreak super.haskell-debugger); # hie-bios < 0.18, random >=1.3.1
|
||||
@@ -137,6 +147,7 @@ with haskellLib;
|
||||
self.extra
|
||||
self.ghc-paths
|
||||
self.silently
|
||||
self.syb
|
||||
self.HUnit
|
||||
] super.ghc-exactprint_1_14_0_0;
|
||||
|
||||
|
||||
@@ -49,21 +49,14 @@ self: super: {
|
||||
unix = null;
|
||||
# GHC only bundles the xhtml library if haddock is enabled, check if this is
|
||||
# still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463
|
||||
xhtml = if self.ghc.hasHaddock or true then null else doDistribute self.xhtml_3000_4_1_0;
|
||||
xhtml = if self.ghc.hasHaddock or true then null else doDistribute self.xhtml_3000_4_0_0;
|
||||
Win32 = null;
|
||||
|
||||
# Becomes a core package in GHC >= 9.8
|
||||
semaphore-compat = doDistribute self.semaphore-compat_2_0_1;
|
||||
semaphore-compat = doDistribute self.semaphore-compat_1_0_0;
|
||||
|
||||
# Becomes a core package in GHC >= 9.10
|
||||
os-string = doDistribute self.os-string_2_0_11;
|
||||
|
||||
# Become core packages in GHC >= 9.12
|
||||
haddock-library = doDistribute (doJailbreak self.haddock-library_1_11_0);
|
||||
haddock-api = doDistribute (doJailbreak self.haddock-api_2_27_0);
|
||||
|
||||
# Becomes a core package in GHC >= 9.12, but needs unix >= 2.8
|
||||
file-io = null;
|
||||
os-string = doDistribute self.os-string_2_0_10;
|
||||
|
||||
# Become core packages in GHC >= 9.10, no release compatible with GHC < 9.10 is available
|
||||
ghc-experimental = null;
|
||||
@@ -145,6 +138,7 @@ self: super: {
|
||||
# https://github.com/kowainik/relude/issues/436
|
||||
relude = dontCheck super.relude;
|
||||
|
||||
haddock-library = doJailbreak super.haddock-library;
|
||||
path = self.path_0_9_5;
|
||||
|
||||
haskell-language-server =
|
||||
|
||||
@@ -64,10 +64,10 @@ in
|
||||
iserv-proxy = addBuildDepend self.libiserv super.iserv-proxy;
|
||||
|
||||
# Becomes a core package in GHC >= 9.8
|
||||
semaphore-compat = doDistribute self.semaphore-compat_2_0_1;
|
||||
semaphore-compat = doDistribute self.semaphore-compat_1_0_0;
|
||||
|
||||
# Becomes a core package in GHC >= 9.10
|
||||
os-string = doDistribute self.os-string_2_0_11;
|
||||
os-string = doDistribute self.os-string_2_0_10;
|
||||
|
||||
# Become core packages in GHC >= 9.10, no release compatible with GHC < 9.10 is available
|
||||
ghc-experimental = null;
|
||||
@@ -76,11 +76,6 @@ in
|
||||
ghc-toolchain = null;
|
||||
ghc-platform = null;
|
||||
|
||||
# Become core packages in GHC >= 9.12
|
||||
file-io = doDistribute self.file-io_0_2_0;
|
||||
haddock-api = doDistribute (doJailbreak self.haddock-api_2_29_1);
|
||||
haddock-library = doJailbreak (doDistribute self.haddock-library_1_11_0);
|
||||
|
||||
# Needs base-orphans for GHC < 9.8 / base < 4.19
|
||||
some = addBuildDepend self.base-orphans super.some;
|
||||
|
||||
@@ -110,6 +105,9 @@ in
|
||||
cabal-install-solver = doJailbreak super.cabal-install-solver;
|
||||
cabal-install = doJailbreak super.cabal-install;
|
||||
|
||||
# Forbids base >= 4.18, fix proposed: https://github.com/sjakobi/newtype-generics/pull/25
|
||||
newtype-generics = warnAfterVersion "0.6.2" (doJailbreak super.newtype-generics);
|
||||
|
||||
# Jailbreaks for servant <0.20
|
||||
servant-lucid = doJailbreak super.servant-lucid;
|
||||
|
||||
@@ -210,6 +208,7 @@ in
|
||||
ghc-lib = doDistribute self.ghc-lib_9_8_5_20250214;
|
||||
ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_5_20250214;
|
||||
ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_8_0_2;
|
||||
haddock-library = doJailbreak super.haddock-library;
|
||||
inherit
|
||||
(
|
||||
let
|
||||
@@ -228,16 +227,13 @@ in
|
||||
self.retrie
|
||||
self.floskell
|
||||
self.markdown-unlit
|
||||
self.stan
|
||||
self.trial
|
||||
] super.haskell-language-server;
|
||||
hls-plugin-api = super.hls-plugin-api;
|
||||
hlint = self.hlint_3_8;
|
||||
lsp-types = super.lsp-types;
|
||||
ormolu = doJailbreak self.ormolu_0_7_4_0;
|
||||
ormolu = self.ormolu_0_7_4_0;
|
||||
retrie = doJailbreak (unmarkBroken super.retrie);
|
||||
stan = super.stan;
|
||||
stylish-haskell = doJailbreak self.stylish-haskell_0_14_6_0;
|
||||
stylish-haskell = self.stylish-haskell_0_14_6_0;
|
||||
}
|
||||
)
|
||||
apply-refact
|
||||
@@ -250,7 +246,6 @@ in
|
||||
lsp-types
|
||||
ormolu
|
||||
retrie
|
||||
stan
|
||||
stylish-haskell
|
||||
;
|
||||
}
|
||||
|
||||
@@ -64,7 +64,7 @@ in
|
||||
Win32 = null;
|
||||
|
||||
# Becomes a core package in GHC >= 9.10
|
||||
os-string = doDistribute self.os-string_2_0_11;
|
||||
os-string = doDistribute self.os-string_2_0_10;
|
||||
|
||||
# Become core packages in GHC >= 9.10, no release compatible with GHC < 9.10 is available
|
||||
ghc-experimental = null;
|
||||
@@ -73,11 +73,6 @@ in
|
||||
ghc-toolchain = null;
|
||||
ghc-platform = null;
|
||||
|
||||
# Become core packages in GHC >= 9.12
|
||||
file-io = doDistribute self.file-io_0_2_0;
|
||||
haddock-api = markBroken self.haddock-api_2_29_1; # no compatible release available
|
||||
haddock-library = doJailbreak (doDistribute self.haddock-library_1_11_0);
|
||||
|
||||
#
|
||||
# Version upgrades
|
||||
#
|
||||
@@ -111,6 +106,7 @@ in
|
||||
# A given major version of ghc-exactprint only supports one version of GHC.
|
||||
ghc-exactprint = doDistribute super.ghc-exactprint_1_8_0_0;
|
||||
|
||||
haddock-library = doJailbreak super.haddock-library;
|
||||
ghc-lib = doDistribute self.ghc-lib_9_8_5_20250214;
|
||||
ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_5_20250214;
|
||||
ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_8_0_2;
|
||||
@@ -132,16 +128,13 @@ in
|
||||
self.retrie
|
||||
self.floskell
|
||||
self.markdown-unlit
|
||||
self.stan
|
||||
self.trial
|
||||
] super.haskell-language-server;
|
||||
hls-plugin-api = super.hls-plugin-api;
|
||||
hlint = self.hlint_3_8;
|
||||
lsp-types = super.lsp-types;
|
||||
ormolu = doJailbreak self.ormolu_0_7_4_0;
|
||||
ormolu = self.ormolu_0_7_4_0;
|
||||
retrie = doJailbreak (unmarkBroken super.retrie);
|
||||
stan = super.stan;
|
||||
stylish-haskell = doJailbreak self.stylish-haskell_0_14_6_0;
|
||||
stylish-haskell = self.stylish-haskell_0_14_6_0;
|
||||
}
|
||||
)
|
||||
apply-refact
|
||||
@@ -154,7 +147,6 @@ in
|
||||
lsp-types
|
||||
ormolu
|
||||
retrie
|
||||
stan
|
||||
stylish-haskell
|
||||
;
|
||||
}
|
||||
|
||||
@@ -2409,6 +2409,7 @@ broken-packages:
|
||||
- HackMail # failure in job https://hydra.nixos.org/build/233215224 at 2023-09-02
|
||||
- hactor # failure in job https://hydra.nixos.org/build/233254977 at 2023-09-02
|
||||
- hactors # failure in job https://hydra.nixos.org/build/233218599 at 2023-09-02
|
||||
- haddock-api # failure in job https://hydra.nixos.org/build/233216515 at 2023-09-02
|
||||
- haddock-leksah # failure in job https://hydra.nixos.org/build/233206878 at 2023-09-02
|
||||
- haddock-test # failure in job https://hydra.nixos.org/build/233246641 at 2023-09-02
|
||||
- hadoop-formats # failure in job https://hydra.nixos.org/build/233224647 at 2023-09-02
|
||||
@@ -2627,6 +2628,7 @@ broken-packages:
|
||||
- hasql-explain-tests # failure in job https://hydra.nixos.org/build/233247034 at 2023-09-02
|
||||
- hasql-generate # failure in job https://hydra.nixos.org/build/324107360 at 2026-03-15
|
||||
- hasql-generic # failure in job https://hydra.nixos.org/build/233204654 at 2023-09-02
|
||||
- hasql-mapping # failure in job https://hydra.nixos.org/build/324107379 at 2026-03-15
|
||||
- hasql-migration # failure in job https://hydra.nixos.org/build/295094132 at 2025-04-22
|
||||
- hasql-mover # failure in job https://hydra.nixos.org/build/295094128 at 2025-04-22
|
||||
- hasql-pipes # failure in job https://hydra.nixos.org/build/295094119 at 2025-04-22
|
||||
@@ -2771,6 +2773,7 @@ broken-packages:
|
||||
- hGelf # failure in job https://hydra.nixos.org/build/233203909 at 2023-09-02
|
||||
- hgeometric # failure in job https://hydra.nixos.org/build/233197856 at 2023-09-02
|
||||
- hgis # failure in job https://hydra.nixos.org/build/233200418 at 2023-09-02
|
||||
- hgmp # failure in job https://hydra.nixos.org/build/307519217 at 2025-09-19
|
||||
- hgom # failure in job https://hydra.nixos.org/build/233255569 at 2023-09-02
|
||||
- hgopher # failure in job https://hydra.nixos.org/build/233222066 at 2023-09-02
|
||||
- HGraphStorage # failure in job https://hydra.nixos.org/build/233217988 at 2023-09-02
|
||||
@@ -3293,6 +3296,7 @@ broken-packages:
|
||||
- ihaskell-parsec # failure in job https://hydra.nixos.org/build/233244271 at 2023-09-02
|
||||
- ihaskell-plot # failure in job https://hydra.nixos.org/build/233255936 at 2023-09-02
|
||||
- ihaskell-widgets # failure in job https://hydra.nixos.org/build/265955663 at 2024-07-14
|
||||
- ihp-pglistener # failure in job https://hydra.nixos.org/build/325267877 at 2026-04-12
|
||||
- illuminate # failure in job https://hydra.nixos.org/build/233219478 at 2023-09-02
|
||||
- image-type # failure in job https://hydra.nixos.org/build/233251466 at 2023-09-02
|
||||
- imagemagick # failure in job https://hydra.nixos.org/build/233598237 at 2023-09-02
|
||||
@@ -4083,6 +4087,7 @@ broken-packages:
|
||||
- mixpanel-client # failure in job https://hydra.nixos.org/build/233220132 at 2023-09-02
|
||||
- mkcabal # failure in job https://hydra.nixos.org/build/233202466 at 2023-09-02
|
||||
- ml-w # failure in job https://hydra.nixos.org/build/233251342 at 2023-09-02
|
||||
- mlkem # failure in job https://hydra.nixos.org/build/315098220 at 2025-11-29
|
||||
- mltool # failure in job https://hydra.nixos.org/build/233203849 at 2023-09-02
|
||||
- mm2 # failure in job https://hydra.nixos.org/build/233260048 at 2023-09-02
|
||||
- mmsyn2 # failure in job https://hydra.nixos.org/build/233201519 at 2023-09-02
|
||||
@@ -4974,6 +4979,7 @@ broken-packages:
|
||||
- postgresql-simple-interval # failure in job https://hydra.nixos.org/build/307611243 at 2025-09-19
|
||||
- postgresql-simple-named # failure in job https://hydra.nixos.org/build/233202481 at 2023-09-02
|
||||
- postgresql-simple-opts # failure in job https://hydra.nixos.org/build/252718901 at 2024-03-16
|
||||
- postgresql-simple-postgresql-types # failure in job https://hydra.nixos.org/build/327522032 at 2026-04-30
|
||||
- postgresql-simple-sop # failure in job https://hydra.nixos.org/build/233249757 at 2023-09-02
|
||||
- postgresql-simple-url # failure in job https://hydra.nixos.org/build/295096191 at 2025-04-22
|
||||
- postgresql-tx # failure in job https://hydra.nixos.org/build/252717914 at 2024-03-16
|
||||
@@ -5231,6 +5237,7 @@ broken-packages:
|
||||
- Range # failure in job https://hydra.nixos.org/build/233235824 at 2023-09-02
|
||||
- rangemin # failure in job https://hydra.nixos.org/build/233244031 at 2023-09-02
|
||||
- rank-product # failure in job https://hydra.nixos.org/build/233239589 at 2023-09-02
|
||||
- rapid # failure in job https://hydra.nixos.org/build/307521428 at 2025-09-19
|
||||
- rapid-term # failure in job https://hydra.nixos.org/build/233251731 at 2023-09-02
|
||||
- Rasenschach # failure in job https://hydra.nixos.org/build/234445901 at 2023-09-13
|
||||
- rating-chgk-info # failure in job https://hydra.nixos.org/build/233598034 at 2023-09-02
|
||||
@@ -7438,6 +7445,7 @@ broken-packages:
|
||||
- yesod-links # failure in job https://hydra.nixos.org/build/233257763 at 2023-09-02
|
||||
- yesod-lucid # failure in job https://hydra.nixos.org/build/233231687 at 2023-09-02
|
||||
- yesod-media-simple # failure in job https://hydra.nixos.org/build/307611606 at 2025-09-19
|
||||
- yesod-middleware-csp # failure in job https://hydra.nixos.org/build/295098382 at 2025-04-22
|
||||
- yesod-paginate # failure in job https://hydra.nixos.org/build/233218563 at 2023-09-02
|
||||
- yesod-pagination # failure in job https://hydra.nixos.org/build/233204022 at 2023-09-02
|
||||
- yesod-pnotify # failure in job https://hydra.nixos.org/build/233258047 at 2023-09-02
|
||||
|
||||
@@ -27,18 +27,19 @@
|
||||
default-package-overrides:
|
||||
- chs-cabal == 0.1.1.2 # matches Cabal 3.12 (GHC 9.10)
|
||||
- clash-lib-hedgehog < 1.9 # needs to match clash-lib from Stackage
|
||||
# 2026-01-23: dataframe >= 0.3.3.7 uses random-1.3, which breaks dependency coherence on 25.11, whose default version is random-1.2
|
||||
# TODO: when (likely in 25.x) Stackage bumps random to 1.3, review
|
||||
- dataframe == 0.3.3.6
|
||||
# 2025-12-26: Needs to match egison-pattern-src from Stackage LTS
|
||||
- egison-pattern-src-th-mode < 0.2.2
|
||||
- extensions == 0.1.0.2 # matches Cabal 3.12 (GHC 9.10)
|
||||
# 2026-06-29: needs to match futhark-0.26.3
|
||||
- futhark-manifest == 1.8.0.0
|
||||
# 2026-01-30: Needs to match hasql from Stackage LTS 24
|
||||
- hasql-notifications < 0.2.5.0
|
||||
# 2026-07-19: ghcide/haskell-debugger don't yet support hie-bios 0.20
|
||||
- hie-bios < 0.20
|
||||
# 2026-02-04: as requested by ghcide >= 2.13
|
||||
- hie-bios < 0.18.0
|
||||
- hiedb < 0.8.0
|
||||
# 2025-09-13: hnix 0.17.0 doesn't support hnix-store-core >= 0.8
|
||||
# https://github.com/haskell-nix/hnix/pull/1112
|
||||
# Note: When removing this, also remove hnix-store-core from maintainers/scripts/haskell/update-stackage.sh
|
||||
- hnix-store-core < 0.7
|
||||
- hnix-store-remote < 0.7
|
||||
# 2025-08-03: need to match stackage version of hosc
|
||||
@@ -50,6 +51,10 @@ default-package-overrides:
|
||||
# liquidhaskell(-boot) support one GHC at a time, so we choose the one matching the current GHC (9.10)
|
||||
- liquidhaskell == 0.9.10.*
|
||||
- liquidhaskell-boot == 0.9.10.*
|
||||
# 2025-03-07: HLS and many other pkgs don't support lsp >= 2.8 (yet)
|
||||
- lsp < 2.8
|
||||
- lsp-test < 0.18
|
||||
- lsp-types < 2.4
|
||||
# Needs to match microlens == 0.4.* in Stackage LTS 24
|
||||
- microlens-pro < 0.2.0.4
|
||||
# 2026-04-06: 4.0.10 merely adjusts to dependencies that are incompatible with our LTS
|
||||
@@ -59,8 +64,6 @@ default-package-overrides:
|
||||
- pandoc-crossref == 0.3.21
|
||||
# 2025-12-19: Needs to match Stackage version of rhine
|
||||
- rhine-bayes < 1.6
|
||||
# 2026-06-24: compatibility with mighttpd2-4.0.9
|
||||
- wai-app-file-cgi < 3.2
|
||||
# 2026-02-08: compatibility with crypton-x509* in Stackage LTS 24
|
||||
- x509-ocsp < 0.4.1.0
|
||||
# keep-sorted end
|
||||
@@ -74,7 +77,6 @@ extra-packages:
|
||||
- Cabal == 3.14.*
|
||||
- Cabal == 3.16.* # version required for cabal-install and other packages
|
||||
- cabal-add == 0.1 # 2025-09-09: Only needed for hls 2.11 can be removed once we are past it.
|
||||
- Cabal-syntax == 3.6.* # required for the GHC 9.0.2 package set
|
||||
- Cabal-syntax == 3.10.*
|
||||
- Cabal-syntax == 3.12.*
|
||||
- Cabal-syntax == 3.14.*
|
||||
@@ -87,7 +89,7 @@ extra-packages:
|
||||
- ghc-exactprint == 1.6.* # 2023-03-30: needed for GHC == 9.4
|
||||
- ghc-exactprint == 1.7.* # 2025-03-09: needed for GHC == 9.6
|
||||
- ghc-exactprint == 1.8.* # 2024-05-20: needed for GHC == 9.8
|
||||
- ghc-exactprint == 1.10.* # 2024-08-27: needed for GHC == 9.10
|
||||
- ghc-exactprint == 1.9.* # 2024-08-27: needed for GHC == 9.10
|
||||
- ghc-exactprint == 1.12.* # 2025-10-15: needed for GHC == 9.12
|
||||
- ghc-lib == 9.6.* # 2022-02-17: preserve for GHC 9.4
|
||||
- ghc-lib == 9.8.* # 2025-12-11: preserve for GHC 9.6, 9.8
|
||||
@@ -98,7 +100,7 @@ extra-packages:
|
||||
- ghc-lib-parser-ex == 9.8.* # 2024-12-26: preserve for GHC 9.6, 9.8
|
||||
- ghc-tags == 1.7.* # 2023-02-18: preserve for ghc-lib == 9.6.*
|
||||
- ghc-tags == 1.8.* # 2023-02-18: preserve for ghc-lib == 9.8.*
|
||||
- haddock-api == 2.27.* # 2026-05-22: latest version compatible with GHC 9.4
|
||||
- ghc-typelits-natnormalise < 0.8 # 2025-09-15: Stackage is stuck at 0.7.10
|
||||
- happy == 1.20.* # for ghc-lib-parser == 9.6.*
|
||||
- hashable < 1.5 # 2025-07-30: hashable >= 1.5 requires GHC >= 9.6
|
||||
- hasql < 1.7 # 2025-01-19: Needed for building postgrest
|
||||
@@ -110,25 +112,21 @@ extra-packages:
|
||||
- hlint == 3.6.* # 2025-04-14: needed for hls with ghc-lib-parser 9.6
|
||||
- hlint == 3.8.* # 2025-09-21: needed for hls with ghc-lib-parser 9.8
|
||||
- hpack == 0.39.1 # 2026-03-15: to match upstream stack-3.9.3
|
||||
- insert-ordered-containers < 0.3 # 2026-05-25: Needed for building postgrest
|
||||
- language-javascript == 0.7.0.0 # required by purescript
|
||||
- lawful-conversions < 0.2 # 2026-05-25: Needed for building postgrest
|
||||
- network-run == 0.4.0 # 2024-10-20: for GHC 9.10/network == 3.1.*
|
||||
- ormolu == 0.7.2.0 # 2023-11-13: for ghc-lib-parser 9.6 compat
|
||||
- ormolu == 0.7.4.0 # 2023-09-21: for ghc-lib-parser 9.8 compat
|
||||
- path == 0.9.5 # 2025-09-21: Pin for hls on ghc 9.4
|
||||
- postgresql-binary < 0.14 # 2025-01-19: Needed for building postgrest
|
||||
- shake-cabal < 0.2.2.3 # 2023-07-01: last version to support Cabal 3.6.*
|
||||
- ShellCheck == 0.10.0 # 2026-05-30: pinned by haskell-ci
|
||||
- ShellCheck == 0.9.0 # 2024-03-21: pinned by haskell-ci
|
||||
- simple-get-opt < 0.5 # 2025-05-01: for crux-0.7.2
|
||||
- stylish-haskell == 0.14.5.0 # 2025-04-14: needed for hls with ghc-lib 9.6
|
||||
- stylish-haskell == 0.14.6.0 # 2025-09-21: needed for hls with ghc-lib 9.8
|
||||
- stylish-haskell == 0.15.0.1 # 2025-04-14: needed for hls with ghc-lib 9.10
|
||||
- swagger2 < 2.9 # 2026-05-25: Needed for building postgrest
|
||||
- tar == 0.6.3.0 # 2025-08-17: last version to not require file-io and directory-ospath-streaming (for GHC < 9.6)
|
||||
- text-builder < 1 # 2025-08-27: Needed for building postgrest
|
||||
- text-builder-dev < 0.4 # 2025-08-27: Needed for building postgrest
|
||||
- validation == 1.1.5 # 2026-06-10: Needed for building geojson 4.1
|
||||
# keep-sorted end
|
||||
|
||||
# keep-sorted start skip_lines=1 case=no
|
||||
@@ -143,14 +141,11 @@ package-maintainers:
|
||||
- basic-sop
|
||||
- commutative-semigroups
|
||||
- generics-sop
|
||||
- ghcide
|
||||
- ghcjs-base
|
||||
- ghcjs-dom
|
||||
- ghcjs-dom-javascript
|
||||
- ghcjs-dom-jsaddle
|
||||
- haskell-debugger
|
||||
- hie-bios
|
||||
- hiedb
|
||||
- jsaddle
|
||||
- jsaddle-clib
|
||||
- jsaddle-dom
|
||||
@@ -161,9 +156,6 @@ package-maintainers:
|
||||
- large-records
|
||||
- lens-sop
|
||||
- linux-namespaces
|
||||
- lsp
|
||||
- lsp-test
|
||||
- lsp-types
|
||||
- monoidal-containers
|
||||
- proto-lens-arbitrary
|
||||
- proto3-suite
|
||||
@@ -385,6 +377,7 @@ package-maintainers:
|
||||
- Agda
|
||||
- agda2hs
|
||||
- irc-client
|
||||
- lambdabot
|
||||
- shake
|
||||
nomeata:
|
||||
- cabal-plan-bounds
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -136,8 +136,6 @@ dont-distribute-packages:
|
||||
- ast-monad-json
|
||||
- astview
|
||||
- async-ajax
|
||||
- atelier-db
|
||||
- atelier-testing
|
||||
- aterm-utils
|
||||
- atlassian-connect-core
|
||||
- atmos-dimensional-tf
|
||||
@@ -191,12 +189,6 @@ dont-distribute-packages:
|
||||
- babylon
|
||||
- backblaze-b2-hs
|
||||
- backdropper
|
||||
- baikai
|
||||
- baikai-claude
|
||||
- baikai-effectful
|
||||
- baikai-kit
|
||||
- baikai-openai
|
||||
- baikai-trace-otel
|
||||
- balkon
|
||||
- ballast
|
||||
- bamboo
|
||||
@@ -221,7 +213,6 @@ dont-distribute-packages:
|
||||
- battleships
|
||||
- bayes-stack
|
||||
- bbi
|
||||
- bcp47-orphans
|
||||
- bdcs
|
||||
- bdcs-api
|
||||
- beam-th
|
||||
@@ -457,9 +448,6 @@ dont-distribute-packages:
|
||||
- claferIG
|
||||
- claferwiki
|
||||
- clash
|
||||
- clash-protocols
|
||||
- clash-protocols-base
|
||||
- clash-vexriscv
|
||||
- classify-frog
|
||||
- classy-effects
|
||||
- classy-effects-th
|
||||
@@ -604,7 +592,6 @@ dont-distribute-packages:
|
||||
- CPBrainfuck
|
||||
- cprng-aes
|
||||
- cprng-aes-effect
|
||||
- cql
|
||||
- cql-io-tinylog
|
||||
- cqrs-example
|
||||
- cqrs-memory
|
||||
@@ -652,7 +639,6 @@ dont-distribute-packages:
|
||||
- dahdit-network
|
||||
- dahdit-test
|
||||
- daino
|
||||
- danecheck
|
||||
- Dangerous
|
||||
- dapi
|
||||
- darcs-benchmark
|
||||
@@ -663,6 +649,7 @@ dont-distribute-packages:
|
||||
- darcswatch
|
||||
- darkplaces-demo
|
||||
- darkplaces-rcon-util
|
||||
- dash-haskell
|
||||
- data-basic
|
||||
- data-cycle
|
||||
- data-default-extra
|
||||
@@ -677,11 +664,6 @@ dont-distribute-packages:
|
||||
- datadog-tracing
|
||||
- datafix
|
||||
- dataflow
|
||||
- dataframe
|
||||
- dataframe-huggingface
|
||||
- dataframe-lazy
|
||||
- dataframe-parquet
|
||||
- dataframe-parquet-th
|
||||
- datasets
|
||||
- date-conversions
|
||||
- dbjava
|
||||
@@ -707,7 +689,6 @@ dont-distribute-packages:
|
||||
- ddci-core
|
||||
- dde
|
||||
- debug
|
||||
- decidable
|
||||
- decimal-arithmetic
|
||||
- dedukti
|
||||
- DeepArrow
|
||||
@@ -748,8 +729,6 @@ dont-distribute-packages:
|
||||
- dhscanner-kbapi
|
||||
- dhscanner-kbgen
|
||||
- dia-functions
|
||||
- diagnostician-html
|
||||
- diagnostician-terminal
|
||||
- diagrams-html5
|
||||
- diagrams-reflex
|
||||
- diagrams-wx
|
||||
@@ -783,7 +762,6 @@ dont-distribute-packages:
|
||||
- DMuCheck
|
||||
- DnaProteinAlignment
|
||||
- dnf-repo
|
||||
- dnsbase
|
||||
- dobutokO-poetry
|
||||
- dobutokO-poetry-general
|
||||
- dobutokO-poetry-general-languages
|
||||
@@ -843,12 +821,10 @@ dont-distribute-packages:
|
||||
- EditTimeReport
|
||||
- effect-monad
|
||||
- effective-aspects-mzv
|
||||
- eigen-hhlo
|
||||
- ekg-carbon
|
||||
- elasticsearch-interchange
|
||||
- electrs-client
|
||||
- elerea-examples
|
||||
- eliminators
|
||||
- elliptic-curve
|
||||
- elsa
|
||||
- ema-extra
|
||||
@@ -877,9 +853,6 @@ dont-distribute-packages:
|
||||
- ersatz-viz
|
||||
- esotericbot
|
||||
- EsounD
|
||||
- esqueleto
|
||||
- esqueleto-compat
|
||||
- esqueleto-postgis
|
||||
- esqueleto-streaming
|
||||
- estreps
|
||||
- Etage-Graph
|
||||
@@ -919,11 +892,6 @@ dont-distribute-packages:
|
||||
- every-bit-counts
|
||||
- exact-kantorovich
|
||||
- exference
|
||||
- exinst-aeson
|
||||
- exinst-base
|
||||
- exinst-bytes
|
||||
- exinst-cereal
|
||||
- exinst-serialise
|
||||
- exist-instances
|
||||
- existential
|
||||
- expand
|
||||
@@ -1084,7 +1052,6 @@ dont-distribute-packages:
|
||||
- functor
|
||||
- functor-combo
|
||||
- functor-monad
|
||||
- functor-products
|
||||
- funflow
|
||||
- funflow-nix
|
||||
- funion
|
||||
@@ -1298,6 +1265,7 @@ dont-distribute-packages:
|
||||
- hackage2twitter
|
||||
- hackmanager
|
||||
- haddock
|
||||
- haddocset
|
||||
- hadoop-tools
|
||||
- haggis
|
||||
- hails-bin
|
||||
@@ -1311,7 +1279,6 @@ dont-distribute-packages:
|
||||
- halma-gui
|
||||
- halma-telegram-bot
|
||||
- hamusic
|
||||
- hanalyze
|
||||
- hans-pcap
|
||||
- happlets-lib-gtk
|
||||
- HAppS-Data
|
||||
@@ -1359,10 +1326,9 @@ dont-distribute-packages:
|
||||
- haskell-admin-health
|
||||
- haskell-admin-managed-functions
|
||||
- haskell-aliyun
|
||||
- haskell-bee-redis
|
||||
- haskell-bee-stm
|
||||
- haskell-bitmex-client
|
||||
- haskell-debugger
|
||||
- haskell-docs
|
||||
- haskell-eigen-util
|
||||
- haskell-ftp
|
||||
- haskell-lsp
|
||||
@@ -1370,7 +1336,6 @@ dont-distribute-packages:
|
||||
- haskell-opentimestamps
|
||||
- haskell-opentimestamps-client
|
||||
- haskell-pdf-presenter
|
||||
- haskell-pgmq
|
||||
- haskell-platform-test
|
||||
- haskell-reflect
|
||||
- haskell-src-exts-observe
|
||||
@@ -1418,7 +1383,6 @@ dont-distribute-packages:
|
||||
- haskoin-crypto
|
||||
- haskoin-protocol
|
||||
- haskoin-script
|
||||
- haskoin-wallet
|
||||
- haskoon
|
||||
- haskoon-httpspec
|
||||
- haskoon-salvia
|
||||
@@ -1437,6 +1401,7 @@ dont-distribute-packages:
|
||||
- hasloGUI
|
||||
- hasql-postgres
|
||||
- hasql-postgres-options
|
||||
- hasql-postgresql-types
|
||||
- hasql-queue
|
||||
- hasql-streams-core
|
||||
- hasql-streams-example
|
||||
@@ -1457,7 +1422,6 @@ dont-distribute-packages:
|
||||
- Hayoo
|
||||
- hback
|
||||
- hbayes
|
||||
- hbayesian
|
||||
- hbb
|
||||
- hbf
|
||||
- hbro
|
||||
@@ -1473,6 +1437,7 @@ dont-distribute-packages:
|
||||
- hdbi-tests
|
||||
- hdiff
|
||||
- hdirect
|
||||
- hdocs
|
||||
- hdph
|
||||
- heart-app
|
||||
- heatitup
|
||||
@@ -1585,8 +1550,8 @@ dont-distribute-packages:
|
||||
- hmeap-utils
|
||||
- hmep
|
||||
- HMock
|
||||
- hMPC
|
||||
- hmt-diagrams
|
||||
- hnix-store-db
|
||||
- HNM
|
||||
- hnormalise
|
||||
- hob
|
||||
@@ -1691,7 +1656,6 @@ dont-distribute-packages:
|
||||
- hspec-pg-transact
|
||||
- hspec-setup
|
||||
- hspec-shouldbe
|
||||
- hspec-webdriver
|
||||
- hspecVariant
|
||||
- hsprocess
|
||||
- hsql-mysql
|
||||
@@ -1702,7 +1666,6 @@ dont-distribute-packages:
|
||||
- hsqml-demo-morris
|
||||
- hsqml-morris
|
||||
- hsreadability
|
||||
- hsrs
|
||||
- hssourceinfo
|
||||
- hssqlppp-th
|
||||
- hstar
|
||||
@@ -1726,7 +1689,6 @@ dont-distribute-packages:
|
||||
- http-response-decoder
|
||||
- http-tower-hs
|
||||
- http2-client-grpc
|
||||
- http2-client-grpc-effectful
|
||||
- http2-grpc-proto-lens
|
||||
- http2-grpc-proto3-wire
|
||||
- http3
|
||||
@@ -1785,7 +1747,6 @@ dont-distribute-packages:
|
||||
- hylotab
|
||||
- hyloutils
|
||||
- hyperbole
|
||||
- hyperbole-oauth2
|
||||
- hyperpublic
|
||||
- ide-backend
|
||||
- ide-backend-server
|
||||
@@ -1794,11 +1755,9 @@ dont-distribute-packages:
|
||||
- ideas-statistics
|
||||
- identicon-style-squares
|
||||
- idna
|
||||
- idnaparse
|
||||
- iException
|
||||
- ige-mac-integration
|
||||
- igrf
|
||||
- ihaskell-dataframe
|
||||
- ihaskell-inline-r
|
||||
- ihaskell-rlangqq
|
||||
- ihaskell-symtegration
|
||||
@@ -1851,9 +1810,7 @@ dont-distribute-packages:
|
||||
- IORefCAS
|
||||
- ipatch
|
||||
- ipc
|
||||
- ipedb
|
||||
- ipld-cid
|
||||
- ipldm
|
||||
- ipprint
|
||||
- iptadmin
|
||||
- irc-fun-bot
|
||||
@@ -1972,9 +1929,6 @@ dont-distribute-packages:
|
||||
- keid-geometry
|
||||
- keid-resource-gltf
|
||||
- keid-sound-openal
|
||||
- keiro-core
|
||||
- keiro-dsl
|
||||
- keiro-migrations
|
||||
- kerry
|
||||
- kevin
|
||||
- key-vault
|
||||
@@ -1987,13 +1941,6 @@ dont-distribute-packages:
|
||||
- KiCS-debugger
|
||||
- KiCS-prophecy
|
||||
- kif-parser
|
||||
- kind-integer
|
||||
- kind-rational
|
||||
- kioku-cli
|
||||
- kioku-core
|
||||
- kioku-migrate
|
||||
- kioku-migrations
|
||||
- kiroku-store-migrations
|
||||
- kit
|
||||
- kmeans-par
|
||||
- kmeans-vector
|
||||
@@ -2116,7 +2063,6 @@ dont-distribute-packages:
|
||||
- list-t-attoparsec
|
||||
- list-t-html-parser
|
||||
- list-tuple
|
||||
- list-witnesses
|
||||
- listenbrainz-client
|
||||
- liszt
|
||||
- lit
|
||||
@@ -2212,7 +2158,6 @@ dont-distribute-packages:
|
||||
- manifold-random
|
||||
- Map
|
||||
- marionetta
|
||||
- marionette-effectful
|
||||
- markdown-pap
|
||||
- markdown2svg
|
||||
- markov-processes
|
||||
@@ -2251,6 +2196,8 @@ dont-distribute-packages:
|
||||
- meta-par-accelerate
|
||||
- MetaObject
|
||||
- metaplug
|
||||
- metar
|
||||
- metar-http
|
||||
- Metrics
|
||||
- metro
|
||||
- metro-socket
|
||||
@@ -2276,7 +2223,6 @@ dont-distribute-packages:
|
||||
- minirotate
|
||||
- mismi-kernel
|
||||
- mismi-s3-core
|
||||
- miso-css
|
||||
- miss
|
||||
- miss-porcelain
|
||||
- missing-py2
|
||||
@@ -2315,12 +2261,6 @@ dont-distribute-packages:
|
||||
- mongrel2-handler
|
||||
- monky
|
||||
- Monocle
|
||||
- monoidmap
|
||||
- monoidmap-aeson
|
||||
- monoidmap-examples
|
||||
- monoidmap-hashable
|
||||
- monoidmap-internal
|
||||
- monoidmap-quickcheck
|
||||
- monomer
|
||||
- monomer-flatpak-example
|
||||
- monomer-hagrid
|
||||
@@ -2409,7 +2349,6 @@ dont-distribute-packages:
|
||||
- mysql-simple-typed
|
||||
- myTestlll
|
||||
- mywatch
|
||||
- n-tuple
|
||||
- n2o-web
|
||||
- NaCl
|
||||
- nakadi-client
|
||||
@@ -2477,7 +2416,6 @@ dont-distribute-packages:
|
||||
- nonlinear-optimization-ad
|
||||
- nonlinear-optimization-backprop
|
||||
- NoSlow
|
||||
- nostr
|
||||
- not-gloss
|
||||
- not-gloss-examples
|
||||
- notmuch-web
|
||||
@@ -2523,7 +2461,6 @@ dont-distribute-packages:
|
||||
- ogma-language-fret-cs
|
||||
- ogma-language-fret-reqs
|
||||
- ois-input-manager
|
||||
- okf-cli
|
||||
- olwrapper
|
||||
- om-kubernetes
|
||||
- online-csv
|
||||
@@ -2545,7 +2482,6 @@ dont-distribute-packages:
|
||||
- optimal-blocks
|
||||
- optimusprime
|
||||
- optparse-enum
|
||||
- orbits
|
||||
- orchid
|
||||
- orchid-demo
|
||||
- order-maintenance
|
||||
@@ -2624,16 +2560,11 @@ dont-distribute-packages:
|
||||
- persistent-hssqlppp
|
||||
- persistent-iproute
|
||||
- persistent-map
|
||||
- persistent-pagination
|
||||
- persistent-postgresql
|
||||
- persistent-protobuf
|
||||
- persistent-sql-lifted
|
||||
- persistent-typed-db
|
||||
- persona-idp
|
||||
- peyotls
|
||||
- peyotls-codec
|
||||
- pg-entity
|
||||
- pg-migrate-test-support
|
||||
- pgmq-config
|
||||
- pgmq-effectful
|
||||
- pgmq-hasql
|
||||
@@ -2689,10 +2620,6 @@ dont-distribute-packages:
|
||||
- plugins-auto
|
||||
- pms-application-service
|
||||
- pms-domain-service
|
||||
- pms-infra-agent-process
|
||||
- pms-infra-agent-serial
|
||||
- pms-infra-agent-server
|
||||
- pms-infra-agent-socket
|
||||
- pms-infra-cmdrun
|
||||
- pms-infra-filesystem
|
||||
- pms-infra-procspawn
|
||||
@@ -2744,7 +2671,6 @@ dont-distribute-packages:
|
||||
- poseidon
|
||||
- poseidon-postgis
|
||||
- postgresql-common-persistent
|
||||
- postgresql-migration-persistent
|
||||
- postgresql-pure
|
||||
- postgresql-simple-ltree
|
||||
- postgresql-simple-queue
|
||||
@@ -2851,10 +2777,7 @@ dont-distribute-packages:
|
||||
- queuelike
|
||||
- quic-simple
|
||||
- quick-process
|
||||
- quickcheck-groups
|
||||
- quickcheck-monoid-subclasses
|
||||
- quickcheck-poly
|
||||
- quickcheck-quid
|
||||
- quickcheck-regex
|
||||
- quickcheck-relaxng
|
||||
- quicktest
|
||||
@@ -3053,7 +2976,6 @@ dont-distribute-packages:
|
||||
- rv
|
||||
- s-expression
|
||||
- S3
|
||||
- safe-coloured-text-layout-gen
|
||||
- safe-coupling
|
||||
- safe-failure-cme
|
||||
- safe-plugins
|
||||
@@ -3210,17 +3132,6 @@ dont-distribute-packages:
|
||||
- shibuya-kafka-adapter
|
||||
- shibuya-metrics
|
||||
- shibuya-pgmq-adapter
|
||||
- shikumi
|
||||
- shikumi-cache
|
||||
- shikumi-cache-postgres
|
||||
- shikumi-cache-redis
|
||||
- shikumi-compile
|
||||
- shikumi-eval
|
||||
- shikumi-okf
|
||||
- shikumi-optimize
|
||||
- shikumi-tools
|
||||
- shikumi-trace
|
||||
- shikumi-trace-otel
|
||||
- shine-varying
|
||||
- short-vec
|
||||
- short-vec-lens
|
||||
@@ -3259,9 +3170,6 @@ dont-distribute-packages:
|
||||
- SimpleLog
|
||||
- SimpleServer
|
||||
- simseq
|
||||
- singleton-nats
|
||||
- singletons-base
|
||||
- singletons-default
|
||||
- singletons-presburger
|
||||
- siphon
|
||||
- siren-json
|
||||
@@ -3572,7 +3480,6 @@ dont-distribute-packages:
|
||||
- toxcore-c
|
||||
- toysolver
|
||||
- tpb
|
||||
- tpdb
|
||||
- trace-embrace
|
||||
- tracing-control
|
||||
- trajectory
|
||||
@@ -3637,7 +3544,6 @@ dont-distribute-packages:
|
||||
- type-sub-th
|
||||
- TypeClass
|
||||
- typed-encoding-encoding
|
||||
- typed-fsm
|
||||
- typed-streams
|
||||
- typedflow
|
||||
- TypeIlluminator
|
||||
@@ -3671,8 +3577,6 @@ dont-distribute-packages:
|
||||
- uniqueness-periods-vector-filters
|
||||
- uniqueness-periods-vector-general
|
||||
- uniqueness-periods-vector-properties
|
||||
- units
|
||||
- units-defs
|
||||
- unitym-servant
|
||||
- unitym-yesod
|
||||
- universal
|
||||
@@ -3772,7 +3676,6 @@ dont-distribute-packages:
|
||||
- waldo
|
||||
- warp-grpc
|
||||
- warp-quic
|
||||
- warp-s2n-tls
|
||||
- warped
|
||||
- warpZ-tls
|
||||
- WashNGo
|
||||
@@ -3791,9 +3694,7 @@ dont-distribute-packages:
|
||||
- WebBits-multiplate
|
||||
- WebCont
|
||||
- webcrank-wai
|
||||
- webdriver
|
||||
- webdriver-w3c
|
||||
- webdriver-wrapper
|
||||
- webify
|
||||
- webserver
|
||||
- websnap
|
||||
|
||||
@@ -38,7 +38,6 @@ self: super: {
|
||||
Cabal-syntax = doDistribute self.Cabal-syntax_3_16_1_0;
|
||||
containers = doDistribute self.containers_0_8;
|
||||
exceptions = doDistribute self.exceptions_0_10_12;
|
||||
file-io = markBroken self.file-io_0_2_0;
|
||||
filepath = doDistribute self.filepath_1_5_5_0;
|
||||
ghc-bignum = null;
|
||||
ghc-boot = null;
|
||||
@@ -50,14 +49,12 @@ self: super: {
|
||||
ghc-platform = null;
|
||||
ghc-prim = null;
|
||||
ghci = null;
|
||||
haddock-api = markBroken self.haddock-api_2_29_1; # depends on ghc
|
||||
haddock-library = markBroken self.haddock-library_1_11_0; # depends on ghc
|
||||
haskeline = doDistribute self.haskeline_0_8_4_1;
|
||||
hpc = markBroken self.hpc_0_7_0_2;
|
||||
integer-gmp = markBroken self.integer-gmp_1_1;
|
||||
libiserv = null;
|
||||
mtl = doDistribute self.mtl_2_3_2;
|
||||
os-string = doDistribute self.os-string_2_0_11;
|
||||
os-string = doDistribute self.os-string_2_0_10;
|
||||
parsec = doDistribute self.parsec_3_1_18_0;
|
||||
pretty = markBroken self.pretty_1_1_3_6;
|
||||
rts = null;
|
||||
@@ -66,10 +63,10 @@ self: super: {
|
||||
system-cxx-std-lib = null;
|
||||
template-haskell = null;
|
||||
terminfo = doDistribute self.terminfo_0_4_1_7;
|
||||
time = doDistribute self.time_1_16;
|
||||
time = doDistribute self.time_1_15;
|
||||
transformers = doDistribute self.transformers_0_6_3_0;
|
||||
unix = markBroken self.unix_2_8_8_0;
|
||||
xhtml = markBroken self.xhtml_3000_4_1_0;
|
||||
xhtml = markBroken self.xhtml_3000_4_0_0;
|
||||
|
||||
# MicroHs replacements for widely used libraries
|
||||
array = self.array-mhs;
|
||||
|
||||
@@ -130,10 +130,6 @@ builtins.intersectAttrs super {
|
||||
# Tests access homeless-shelter.
|
||||
hie-bios = dontCheck super.hie-bios;
|
||||
|
||||
# The test suite depends on an impure cabal-install installation in
|
||||
# $HOME, which we don't have in our build sandbox.
|
||||
cabal-install-parsers = dontCheck super.cabal-install-parsers;
|
||||
|
||||
###########################################
|
||||
### END HASKELL-LANGUAGE-SERVER SECTION ###
|
||||
###########################################
|
||||
@@ -1132,6 +1128,13 @@ builtins.intersectAttrs super {
|
||||
];
|
||||
}) super.lsp-test;
|
||||
|
||||
lsp_2_8_0_0 = doDistribute (
|
||||
super.lsp_2_8_0_0.override {
|
||||
lsp-types = self.lsp-types_2_4_0_0;
|
||||
}
|
||||
);
|
||||
lsp-types_2_4_0_0 = doDistribute super.lsp-types_2_4_0_0;
|
||||
|
||||
# the test suite attempts to run the binaries built in this package
|
||||
# through $PATH but they aren't in $PATH
|
||||
dhall-lsp-server = dontCheck super.dhall-lsp-server;
|
||||
@@ -1272,8 +1275,6 @@ builtins.intersectAttrs super {
|
||||
ln -sf git-annex git-remote-tor-annex
|
||||
PATH+=":$PWD"
|
||||
|
||||
checkFlagsArray+=("-J$NIX_BUILD_CORES")
|
||||
|
||||
echo checkFlags: $checkFlags ''${checkFlagsArray:+"''${checkFlagsArray[@]}"}
|
||||
|
||||
# Doesn't use Cabal's test mechanism
|
||||
@@ -1659,15 +1660,6 @@ builtins.intersectAttrs super {
|
||||
(disableCabalFlag "icu")
|
||||
];
|
||||
|
||||
# Tests spawn ghc with -fplugin and need this package's in-place package db.
|
||||
# The trailing colon keeps GHC's default package db in the package path.
|
||||
# https://hydra.nixos.org/build/329190094
|
||||
ghc-typelits-natnormalise = overrideCabal (drv: {
|
||||
preCheck = (drv.preCheck or "") + ''
|
||||
export NIX_GHC_PACKAGE_PATH_FOR_TEST=$PWD/dist/package.conf.inplace/:$packageConfDir:
|
||||
'';
|
||||
}) super.ghc-typelits-natnormalise;
|
||||
|
||||
# based on https://github.com/gibiansky/IHaskell/blob/aafeabef786154d81ab7d9d1882bbcd06fc8c6c4/release.nix
|
||||
ihaskell = overrideCabal (drv: {
|
||||
# ihaskell's cabal file forces building a shared executable, which we need
|
||||
|
||||
36909
pkgs/development/haskell-modules/hackage-packages.nix
generated
36909
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@@ -1,85 +0,0 @@
|
||||
diff -rN -u old-darcs.net/darcs.cabal new-darcs.net/darcs.cabal
|
||||
--- old-darcs.net/darcs.cabal 2025-09-13 02:45:32.790227974 +0200
|
||||
+++ new-darcs.net/darcs.cabal 2025-09-13 02:45:32.791227985 +0200
|
||||
@@ -124,7 +124,7 @@
|
||||
|
||||
custom-setup
|
||||
setup-depends: base >= 4.10 && < 4.21,
|
||||
- Cabal >= 2.4 && < 3.13,
|
||||
+ Cabal >= 2.4 && < 3.15,
|
||||
process >= 1.2.3.0 && < 1.7,
|
||||
filepath >= 1.4.1 && < 1.5.0.0,
|
||||
directory >= 1.2.7 && < 1.4
|
||||
--- old-darcs.net/Setup.hs 2026-06-22 14:55:26.775706597 +0200
|
||||
+++ new-darcs.net/Setup.hs 2026-06-22 14:56:31.996746207 +0200
|
||||
--- tmp2.hs 2026-06-22 14:55:26.775706597 +0200
|
||||
+++ /home/lukas/tmp.hs 2026-06-22 15:25:23.957579360 +0200
|
||||
--- tmp2.hs 2026-06-22 14:55:26.775706597 +0200
|
||||
+++ /home/lukas/tmp.hs 2026-06-22 15:28:17.448848236 +0200
|
||||
@@ -2,6 +2,7 @@
|
||||
-- portions copyright (c) 2008 David Roundy
|
||||
-- portions copyright (c) 2007-2009 Judah Jacobson
|
||||
{-# OPTIONS_GHC -Wall #-}
|
||||
+{-# LANGUAGE CPP #-}
|
||||
import Distribution.Simple
|
||||
( defaultMainWithHooks, UserHooks(..), simpleUserHooks )
|
||||
import Distribution.PackageDescription ( PackageDescription )
|
||||
@@ -25,8 +26,17 @@
|
||||
import System.IO ( openFile, IOMode(..) )
|
||||
import System.Process (callProcess, runProcess)
|
||||
import Data.List( isInfixOf )
|
||||
+#if MIN_VERSION_Cabal_syntax(3,14,0)
|
||||
+import Distribution.Utils.Path ( (</>), interpretSymbolicPathCWD, makeRelativePathEx )
|
||||
+#else
|
||||
import System.FilePath ( (</>) )
|
||||
|
||||
+-- Shims so we can use the Cabal >= 3.14 API
|
||||
+interpretSymbolicPathCWD, makeRelativePathEx :: FilePath -> FilePath
|
||||
+interpretSymbolicPathCWD = id
|
||||
+makeRelativePathEx = id
|
||||
+#endif
|
||||
+
|
||||
import qualified Control.Exception as Exception
|
||||
|
||||
catchAny :: IO a -> (Exception.SomeException -> IO a) -> IO a
|
||||
@@ -73,22 +83,26 @@
|
||||
|
||||
buildManpage :: LocalBuildInfo -> IO ()
|
||||
buildManpage lbi = do
|
||||
- have_darcs_exe_dir <- doesDirectoryExist (buildDir lbi </> "darcs")
|
||||
+ have_darcs_exe_dir <- doesDirectoryExist
|
||||
+ $ interpretSymbolicPathCWD (buildDir lbi </> makeRelativePathEx "darcs")
|
||||
when have_darcs_exe_dir $ do
|
||||
- let darcs = buildDir lbi </> "darcs/darcs"
|
||||
- manpage = buildDir lbi </> "darcs/darcs.1"
|
||||
+ let darcs = interpretSymbolicPathCWD
|
||||
+ $ buildDir lbi </> makeRelativePathEx "darcs/darcs"
|
||||
+ manpage = interpretSymbolicPathCWD
|
||||
+ $ buildDir lbi </> makeRelativePathEx "darcs/darcs.1"
|
||||
manpageHandle <- openFile manpage WriteMode
|
||||
void $ runProcess darcs ["help","manpage"]
|
||||
Nothing Nothing Nothing (Just manpageHandle) Nothing
|
||||
|
||||
installManpage :: PackageDescription -> LocalBuildInfo -> Verbosity -> CopyDest -> IO ()
|
||||
installManpage pkg lbi verbosity copy = do
|
||||
- have_manpage <- doesFileExist (buildDir lbi </> "darcs" </> "darcs.1")
|
||||
+ have_manpage <- doesFileExist
|
||||
+ $ interpretSymbolicPathCWD (buildDir lbi </> makeRelativePathEx "darcs/darcs.1")
|
||||
when have_manpage $
|
||||
copyFiles
|
||||
verbosity
|
||||
(mandir (absoluteInstallDirs pkg lbi copy) </> "man1")
|
||||
- [(buildDir lbi </> "darcs", "darcs.1")]
|
||||
+ [(interpretSymbolicPathCWD (buildDir lbi </> makeRelativePathEx "darcs"), "darcs.1")]
|
||||
|
||||
-- ---------------------------------------------------------------------
|
||||
-- version module
|
||||
@@ -124,7 +138,7 @@
|
||||
|
||||
generateVersionModule :: Verbosity -> LocalBuildInfo -> String -> String -> IO ()
|
||||
generateVersionModule verbosity lbi version state = do
|
||||
- let dir = autogenPackageModulesDir lbi
|
||||
+ let dir = interpretSymbolicPathCWD (autogenPackageModulesDir lbi)
|
||||
createDirectoryIfMissingVerbose verbosity True dir
|
||||
ctx <- context verbosity
|
||||
hash <- weakhash verbosity
|
||||
@@ -1,29 +0,0 @@
|
||||
--- old-darcs.net/darcs.cabal 1970-01-01 01:00:01.000000000 +0100
|
||||
+++ new-darcs.net/darcs.cabal 2026-06-22 16:10:41.137461887 +0200
|
||||
@@ -416,7 +416,7 @@
|
||||
build-depends: unix >= 2.7.1.0 && < 2.9,
|
||||
directory >= 1.2.7 && < 1.4
|
||||
|
||||
- build-depends: base >= 4.10 && < 4.21,
|
||||
+ build-depends: base >= 4.10 && < 4.22,
|
||||
safe >= 0.3.20 && < 0.4,
|
||||
stm >= 2.1 && < 2.6,
|
||||
binary >= 0.5 && < 0.11,
|
||||
@@ -436,7 +436,7 @@
|
||||
base16-bytestring >= 1.0 && < 1.1,
|
||||
utf8-string >= 1 && < 1.1,
|
||||
vector >= 0.11 && < 0.14,
|
||||
- tar >= 0.5 && < 0.7,
|
||||
+ tar >= 0.5 && < 0.8,
|
||||
data-ordlist == 0.4.*
|
||||
|
||||
if impl(ghc < 8.10)
|
||||
@@ -462,7 +462,7 @@
|
||||
network >= 2.6 && < 3.3,
|
||||
conduit >= 1.3.0 && < 1.4,
|
||||
http-conduit >= 2.3 && < 2.4,
|
||||
- http-types >= 0.12.1 && < 0.12.5,
|
||||
+ http-types >= 0.12.1 && < 0.13,
|
||||
exceptions >= 0.6 && < 0.11,
|
||||
terminal-size >= 0.3.4 && < 0.4
|
||||
|
||||
@@ -15,8 +15,8 @@ mkDerivation {
|
||||
version = "0.19.0.0";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/hercules-ci/optparse-applicative.git";
|
||||
sha256 = "sha256-tO0V+TKS+ng6OJ8BztKwmV0tV4TnUXOD01ocTyO0sq0=";
|
||||
rev = "0.19.0.0-fork-1";
|
||||
sha256 = "068rsq9j0afrywbcqf6vg4ivfxbb68ab7f0lvg1na81mfn7sfakk";
|
||||
rev = "b55bb38a2aea0cf776aec707cdce7c7418146077";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
libraryHaskellDepends = [
|
||||
|
||||
@@ -31,14 +31,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "drf-spectacular";
|
||||
version = "0.29.0";
|
||||
version = "0.30.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tfranzel";
|
||||
repo = "drf-spectacular";
|
||||
tag = version;
|
||||
hash = "sha256-7Eq0Z/BR/tvGS6RRRoy3jOyBQkc58QETHWy47S6tSD8=";
|
||||
hash = "sha256-CuN3ZmFQBLUlRteXVcWF/oE9vvLcaFAoEbkF3hHQLgQ=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
fetchFromGitHub,
|
||||
buildPythonPackage,
|
||||
click,
|
||||
defusedxml,
|
||||
joblib,
|
||||
regex,
|
||||
setuptools,
|
||||
@@ -23,49 +24,53 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "nltk";
|
||||
version = "3.9.4";
|
||||
version = "3.10.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nltk";
|
||||
repo = "nltk";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-kDfMiqXgLq91zzDjv/qDn0XwQkYRn2sITI6E4pgWe/8=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-1iflqb3cOyaviW3IostFCuJtZ9KBZI0n9dfKfqqbcO0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# In the nix store we trust
|
||||
substituteInPlace nltk/pathsec.py \
|
||||
--replace-fail 'if not (target == scoped_root or target.is_relative_to(scoped_root)):' 'if not (target == scoped_root or target.is_relative_to(scoped_root) or target.is_relative_to("/nix/store")):'
|
||||
--replace-fail 'if not (target == scoped_root or target.is_relative_to(scoped_root)):' \
|
||||
'if not (target == scoped_root or target.is_relative_to(scoped_root) or target.is_relative_to("/nix/store")):' \
|
||||
--replace-fail ' "/usr/share/nltk_data", ' ' "/usr/share/nltk_data", "/nix/store", '
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
click
|
||||
defusedxml
|
||||
joblib
|
||||
regex
|
||||
tqdm
|
||||
];
|
||||
|
||||
# Use new passthru function to pass dependencies required for testing
|
||||
preInstallCheck = ''
|
||||
export NLTK_DATA=${
|
||||
nltk.dataDir (
|
||||
d: with d; [
|
||||
averaged-perceptron-tagger-eng
|
||||
averaged-perceptron-tagger-rus
|
||||
bcp47
|
||||
brown
|
||||
cess-cat
|
||||
cess-esp
|
||||
conll2007
|
||||
floresta
|
||||
gutenberg
|
||||
ieer
|
||||
inaugural
|
||||
indian
|
||||
large-grammars
|
||||
nombank-1-0
|
||||
omw-1-4
|
||||
omw-2-0
|
||||
pl196x
|
||||
porter-test
|
||||
ptb
|
||||
@@ -114,9 +119,10 @@ buildPythonPackage (finalAttrs: {
|
||||
};
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/nltk/nltk/blob/${finalAttrs.src.tag}/ChangeLog";
|
||||
description = "Natural Language Processing ToolKit";
|
||||
mainProgram = "nltk";
|
||||
homepage = "http://nltk.org/";
|
||||
homepage = "https://nltk.org/";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.bengsparks ];
|
||||
};
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
{
|
||||
buildPythonPackage,
|
||||
lib,
|
||||
fetchPypi,
|
||||
poetry-core,
|
||||
requests,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pinecone-plugin-assistant";
|
||||
version = "3.0.3";
|
||||
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "pinecone_plugin_assistant";
|
||||
inherit version;
|
||||
hash = "sha256-U/VI7eYKldef9I14ZaPQr9Zlztnnd1gnLmK6DGxjvSY=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
requests
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"packaging"
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.pinecone.io/";
|
||||
maintainers = with lib.maintainers; [ codgician ];
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.unix;
|
||||
description = "Assistant plugin for Pinecone SDK";
|
||||
};
|
||||
}
|
||||
@@ -1,31 +0,0 @@
|
||||
{
|
||||
buildPythonPackage,
|
||||
lib,
|
||||
fetchPypi,
|
||||
poetry-core,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pinecone-plugin-interface";
|
||||
version = "0.0.7";
|
||||
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "pinecone_plugin_interface";
|
||||
inherit version;
|
||||
hash = "sha256-uOZnXkGEczOqE5I8xE2qP4VnbXFXMkaC3BZAWIqYKEY=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.pinecone.io/";
|
||||
maintainers = with lib.maintainers; [ bot-wxt1221 ];
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.unix;
|
||||
description = "Plugin interface for the Pinecone python client";
|
||||
};
|
||||
}
|
||||
@@ -1,47 +1,50 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
certifi,
|
||||
buildPackages,
|
||||
fetchFromGitHub,
|
||||
hatchling,
|
||||
httpx,
|
||||
msgspec,
|
||||
orjson,
|
||||
pinecone-plugin-assistant,
|
||||
pinecone-plugin-interface,
|
||||
python-dateutil,
|
||||
typing-extensions,
|
||||
urllib3,
|
||||
rustPlatform,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pinecone";
|
||||
version = "8.1.2";
|
||||
version = "9.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pinecone-io";
|
||||
repo = "pinecone-python-client";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-VfoSW17Bx/eFlnSxUiQZsfY/y210/sKIF5df/kb2kTc=";
|
||||
hash = "sha256-yWGW9qx4zb4FnDLXvtXREYXRO7e5Jk/KJoaQlpKMwpg=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit pname version src;
|
||||
hash = "sha256-I3pIy9by+OHo6iU6OZp3VvJJPZOmJ/CYhkzoV8xHoMY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with rustPlatform; [
|
||||
cargoSetupHook
|
||||
maturinBuildHook
|
||||
];
|
||||
|
||||
env.PROTOC = "${lib.getExe buildPackages.protobuf}";
|
||||
|
||||
dependencies = [
|
||||
certifi
|
||||
httpx
|
||||
msgspec
|
||||
orjson
|
||||
pinecone-plugin-assistant
|
||||
pinecone-plugin-interface
|
||||
python-dateutil
|
||||
typing-extensions
|
||||
urllib3
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pinecone" ];
|
||||
|
||||
meta = {
|
||||
description = "Pinecone python client";
|
||||
description = "Pinecone Python SDK";
|
||||
homepage = "https://www.pinecone.io/";
|
||||
changelog = "https://github.com/pinecone-io/pinecone-python-client/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/pinecone-io/python-sdk/releases/tag/${src.tag}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ happysalada ];
|
||||
};
|
||||
|
||||
@@ -26,6 +26,13 @@ buildPythonPackage rec {
|
||||
hash = "sha256-HhEtWYWdxJZOMS3dqB2VdQS7aSdpkRhq7EZCJ55n2OE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix cross compilation by using PKG_CONFIG env variable instead
|
||||
# of hardcoded binary name
|
||||
# https://github.com/libfuse/pyfuse3/pull/148
|
||||
./fix_cross_parse_pkg_config.patch
|
||||
];
|
||||
|
||||
build-system = [
|
||||
cython
|
||||
setuptools
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
From a37b18ea421eb20391d0b900844f0c04054247e6 Mon Sep 17 00:00:00 2001
|
||||
From: Jonas Heinrich <onny@project-insanity.org>
|
||||
Date: Thu, 9 Jul 2026 14:40:16 +0200
|
||||
Subject: [PATCH] Fix cross-compilaton by using PKG_CONFIG env variable
|
||||
|
||||
---
|
||||
util/build_backend.py | 8 +++++---
|
||||
1 file changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/util/build_backend.py b/util/build_backend.py
|
||||
index 0ec6b21..95e4ee3 100644
|
||||
--- a/util/build_backend.py
|
||||
+++ b/util/build_backend.py
|
||||
@@ -15,11 +15,13 @@
|
||||
def pkg_config(pkg, cflags=True, ldflags=False, min_ver=None):
|
||||
"""Frontend to pkg-config"""
|
||||
|
||||
+ PKG_CONFIG = os.environ.get('PKG_CONFIG', 'pkg-config').split()
|
||||
+
|
||||
if min_ver:
|
||||
- cmd = ['pkg-config', pkg, '--atleast-version', min_ver]
|
||||
+ cmd = PKG_CONFIG + [pkg, '--atleast-version', min_ver]
|
||||
|
||||
if subprocess.call(cmd) != 0:
|
||||
- cmd = ['pkg-config', '--modversion', pkg]
|
||||
+ cmd = PKG_CONFIG + ['--modversion', pkg]
|
||||
proc = subprocess.Popen(cmd, stdout=subprocess.PIPE)
|
||||
version = proc.communicate()[0].strip()
|
||||
if not version:
|
||||
@@ -29,7 +31,7 @@ def pkg_config(pkg, cflags=True, ldflags=False, min_ver=None):
|
||||
'%s version too old (found: %s, required: %s)' % (pkg, version, min_ver)
|
||||
)
|
||||
|
||||
- cmd = ['pkg-config', pkg]
|
||||
+ cmd = PKG_CONFIG + [pkg]
|
||||
if cflags:
|
||||
cmd.append('--cflags')
|
||||
if ldflags:
|
||||
@@ -17,7 +17,7 @@ let
|
||||
in
|
||||
with lib.versions;
|
||||
lib.switch rocq-core.rocq-version [
|
||||
(case (range "9.0" "9.2") "1.10.3")
|
||||
(case (range "9.0" "9.3") "1.10.3")
|
||||
(case (range "9.0" "9.1") "1.10.2")
|
||||
(case (range "9.0" "9.1") "1.10.0")
|
||||
(case (range "9.0" "9.1") "1.9.1")
|
||||
|
||||
@@ -25,7 +25,7 @@ mkRocqDerivation {
|
||||
in
|
||||
with lib.versions;
|
||||
lib.switch rocq-core.rocq-version [
|
||||
(case (range "9.0" "9.2") "1.0.4")
|
||||
(case (range "9.0" "9.3") "1.0.4")
|
||||
] null;
|
||||
|
||||
propagatedBuildInputs = [ mathcomp-boot ];
|
||||
|
||||
@@ -29,7 +29,7 @@ mkRocqDerivation {
|
||||
lib.switch
|
||||
[ rocq-core.rocq-version mathcomp-boot.version ]
|
||||
[
|
||||
(case (range "9.2" "9.2") (range "2.5" "2.6") "2.2.4") # also compiles on Rocq 9.0 and 9.1 (but requires graph-theory update)
|
||||
(case (range "9.2" "9.3") (range "2.5" "2.6") "2.2.4") # also compiles on Rocq 9.0 and 9.1 (but requires graph-theory update)
|
||||
(case (range "9.0" "9.1") (range "2.3" "2.5") "2.2.2")
|
||||
]
|
||||
null;
|
||||
|
||||
@@ -35,7 +35,7 @@ mkRocqDerivation {
|
||||
lib.switch
|
||||
[ rocq-core.version mathcomp.version ]
|
||||
[
|
||||
(case (range "9.0" "9.2") (isGe "2.6.0") "2.0.6")
|
||||
(case (range "9.0" "9.3") (isGe "2.6.0") "2.0.6")
|
||||
(case (range "9.0" "9.2") (isEq "2.5.0") "2.0.5")
|
||||
]
|
||||
null;
|
||||
|
||||
@@ -35,7 +35,7 @@ let
|
||||
inherit (lib.versions) range;
|
||||
in
|
||||
lib.switch rocq-core.rocq-version [
|
||||
(case (range "9.2" "9.2") "2.6.0") # also compiles on Rocq 9.0 and 9.1
|
||||
(case (range "9.2" "9.3") "2.6.0") # also compiles on Rocq 9.0 and 9.1
|
||||
(case (range "9.0" "9.1") "2.5.0")
|
||||
] null;
|
||||
release = {
|
||||
|
||||
@@ -15,10 +15,12 @@ mkRocqDerivation {
|
||||
in
|
||||
with lib.versions;
|
||||
lib.switch rocq-core.rocq-version [
|
||||
(case (range "9.0" "9.3") "1.1.1")
|
||||
(case (range "9.0" "9.2") "1.1.0")
|
||||
] null;
|
||||
|
||||
release = {
|
||||
"1.1.1".hash = "sha256-TIUbrMRoPkLx3QcBGTAEdnzqt4HcKOHaQwJWUtBXUQA=";
|
||||
"1.1.0".hash = "sha256-CWMbGErC5bu20Yu9eskgslLkzmSof6klNlOYEkQjUjc=";
|
||||
};
|
||||
releaseRev = v: "v${v}";
|
||||
|
||||
@@ -17,7 +17,7 @@ let
|
||||
in
|
||||
with lib.versions;
|
||||
lib.switch rocq-core.rocq-version [
|
||||
(case (range "9.0" "9.2") "3.7.1")
|
||||
(case (range "9.0" "9.3") "3.7.1")
|
||||
(case (range "9.0" "9.1") "3.4.5")
|
||||
(case (range "9.0" "9.1") "2.0.7")
|
||||
] rocq-core.ocamlPackages.elpi.version;
|
||||
@@ -37,11 +37,13 @@ let
|
||||
in
|
||||
with lib.versions;
|
||||
lib.switch rocq-core.rocq-version [
|
||||
(case (range "9.0" "9.3") "3.5.0")
|
||||
(case (range "9.0" "9.2") "3.4.0")
|
||||
(case (range "9.0" "9.1") "3.2.0")
|
||||
(case (range "9.0" "9.1") "2.6.0")
|
||||
(case "9.0" "2.5.2")
|
||||
] null;
|
||||
release."3.5.0".sha256 = "sha256-k6kbkFRngQmKUP0owiFOxJzdJVRte5IlZWG4Tpqd3YU=";
|
||||
release."3.4.0".sha256 = "sha256-8x2Sa/+pUpXEqB+NdyfOyw6Yyzp6Q1k5LnhrjG/qJNM=";
|
||||
release."3.3.0".sha256 = "sha256-wcsUpw7S+H9CaXuz+W3g22IFWO2cLllJ4xm2qLTG0nM=";
|
||||
release."3.2.0".sha256 = "sha256-FyYG/8lEyt1L/paMez8jYAnnUE+sxIp4Da5MztmwJ/c=";
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user