diff --git a/pkgs/by-name/be/beidconnect/package.nix b/pkgs/by-name/be/beidconnect/package.nix index 5acd92acefab..00550fd21155 100644 --- a/pkgs/by-name/be/beidconnect/package.nix +++ b/pkgs/by-name/be/beidconnect/package.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "beidconnect"; - version = "2.10"; + version = "2.11"; src = fetchFromGitHub { owner = "Fedict"; repo = "fts-beidconnect"; rev = finalAttrs.version; - hash = "sha256-xkBldXOlgLMgrvzm7ajXzJ92mpXrxHD1RX4DeBxU3kk="; + hash = "sha256-4eKO2yw2Ipfu1PvebgOR+BihsLlnWIJejGWqjztPA2I="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/bu/buck2/package.nix b/pkgs/by-name/bu/buck2/package.nix index d4890b3460e4..38e5a37c2d70 100644 --- a/pkgs/by-name/bu/buck2/package.nix +++ b/pkgs/by-name/bu/buck2/package.nix @@ -108,13 +108,28 @@ stdenv.mkDerivation { dontConfigure = true; dontStrip = true; - unpackPhase = "unzstd ${buck2-src} -o ./buck2 && unzstd ${rust-project-src} -o ./rust-project"; - buildPhase = "chmod +x ./buck2 && chmod +x ./rust-project"; - checkPhase = "./buck2 --version && ./rust-project --version"; + unpackPhase = '' + runHook preUnpack + unzstd ${buck2-src} -o ./buck2 + unzstd ${rust-project-src} -o ./rust-project + runHook postUnpack + ''; + buildPhase = '' + runHook preBuild + chmod +x ./buck2 && chmod +x ./rust-project + runHook postBuild + ''; + checkPhase = '' + runHook preCheck + ./buck2 --version && ./rust-project --version + runHook postCheck + ''; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D buck2 $out/bin/buck2 install -D rust-project $out/bin/rust-project + runHook postInstall ''; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd buck2 \ @@ -149,7 +164,11 @@ stdenv.mkDerivation { mit ]; mainProgram = "buck2"; - maintainers = with lib.maintainers; [ thoughtpolice ]; + maintainers = with lib.maintainers; [ + thoughtpolice + lf- + _9999years + ]; platforms = [ "x86_64-linux" "aarch64-linux" diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index 2514fcaf8e94..028cc53b3dac 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -6,13 +6,13 @@ "packages": { "": { "dependencies": { - "@anthropic-ai/claude-code": "^1.0.43" + "@anthropic-ai/claude-code": "^1.0.44" } }, "node_modules/@anthropic-ai/claude-code": { - "version": "1.0.43", - "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.43.tgz", - "integrity": "sha512-VnuRK4s/R9ZRTkwH4gUjsp4SiBQXq7Y0B47OtgeXIZYVQYkhTW8m+E0IisFzXXFIyTQrE0SodGCpvgLhAYzGCg==", + "version": "1.0.44", + "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.44.tgz", + "integrity": "sha512-GCX0KeMcyhLlfs/dLWlMiHShAMmjt8d7xcVUS53z7VnV6s3cIIrRPsKQ/xX/Q9rFm5dSVmRnzU88Ku28fb3QKQ==", "hasInstallScript": true, "license": "SEE LICENSE IN README.md", "bin": { diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index fe7124de6bb5..b81187ca9982 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "claude-code"; - version = "1.0.43"; + version = "1.0.44"; nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz"; - hash = "sha256-MPnctLow88Muzd9h5c6w/u0tO4Umrl6YJcp/1/BTFD4="; + hash = "sha256-Dnooy0KNfhirTu7hv6DfwL7SHwf++CKtG8VHptNhcxU="; }; - npmDepsHash = "sha256-jwT+W/oithQ0AHpFmmD3E6XIBZ5VdCHz61RstOhVFHQ="; + npmDepsHash = "sha256-Q3m4q0g/H5ZWmnMXSipRt3FUFu+SgDAJutVelQsv9ls="; postPatch = '' cp ${./package-lock.json} package-lock.json @@ -28,9 +28,11 @@ buildNpmPackage rec { # `claude-code` tries to auto-update by default, this disables that functionality. # https://docs.anthropic.com/en/docs/agents-and-tools/claude-code/overview#environment-variables + # The DEV=true env var causes claude to crash with `TypeError: window.WebSocket is not a constructor` postInstall = '' wrapProgram $out/bin/claude \ - --set DISABLE_AUTOUPDATER 1 + --set DISABLE_AUTOUPDATER 1 \ + --unset DEV ''; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix b/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix index 13029e572d73..c8151f256549 100644 --- a/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix +++ b/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "jawiki-all-titles-in-ns0"; - version = "0-unstable-2025-06-01"; + version = "0-unstable-2025-07-01"; src = fetchFromGitHub { owner = "musjj"; repo = "jawiki-archive"; - rev = "044d308be473f2e57eb011fbd3f771bf5ac46e05"; - hash = "sha256-gVTr1IZqeq8mjktoOW4nZVQWePjMirCKpM4Hbb4xW1A="; + rev = "38c36995d4e80adfc41e4937c406717a29f3b315"; + hash = "sha256-i+Q6tMxSrA3xeDabUijDcO0L/bZhOFzRn7ErDW/iiiY="; }; installPhase = '' diff --git a/pkgs/by-name/oi/oils-for-unix/package.nix b/pkgs/by-name/oi/oils-for-unix/package.nix index 21409f1658e8..866783505019 100644 --- a/pkgs/by-name/oi/oils-for-unix/package.nix +++ b/pkgs/by-name/oi/oils-for-unix/package.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { pname = "oils-for-unix"; - version = "0.29.0"; + version = "0.33.0"; src = fetchurl { url = "https://oils.pub/download/oils-for-unix-${version}.tar.gz"; - hash = "sha256-NP21Px29K4dC73TNOkbYer/NoY0NZF8pdixP3bmis6w="; + hash = "sha256-GwqJAx0cTUMCxR4lPX+80diwEx/L1xM3I5E3Z2Cuk4Y="; }; postPatch = '' diff --git a/pkgs/by-name/ph/phpactor/package.nix b/pkgs/by-name/ph/phpactor/package.nix index 1e6842e12424..1ca6d5454213 100644 --- a/pkgs/by-name/ph/phpactor/package.nix +++ b/pkgs/by-name/ph/phpactor/package.nix @@ -21,6 +21,8 @@ php.buildComposerProject2 (finalAttrs: { nativeBuildInputs = [ installShellFiles ]; + php = php.withExtensions ({ all, ... }: with all; [ mbstring ]); + postInstall = '' installShellCompletion --cmd phpactor \ --bash <(php $out/bin/phpactor completion bash) diff --git a/pkgs/by-name/sh/showmethekey/package.nix b/pkgs/by-name/sh/showmethekey/package.nix index 73511b76a335..75d7335e7366 100644 --- a/pkgs/by-name/sh/showmethekey/package.nix +++ b/pkgs/by-name/sh/showmethekey/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "showmethekey"; - version = "1.18.3"; + version = "1.18.4"; src = fetchFromGitHub { owner = "AlynxZhou"; repo = "showmethekey"; tag = "v${version}"; - hash = "sha256-vVcP+m6rZgNti/NEk4fQpZ8bkv4z13NIZN1p/eVmBI4="; + hash = "sha256-Wj7r4rnY8+QGWtk9h88gk3LxkNLIKUA/46lkyPK86h0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/to/touying/package.nix b/pkgs/by-name/to/touying/package.nix new file mode 100644 index 000000000000..f11132f83bf6 --- /dev/null +++ b/pkgs/by-name/to/touying/package.nix @@ -0,0 +1 @@ +{ python3Packages }: with python3Packages; toPythonApplication touying diff --git a/pkgs/by-name/ty/typescript-go/package.nix b/pkgs/by-name/ty/typescript-go/package.nix index f00ae7fdae9a..334caa0e95e8 100644 --- a/pkgs/by-name/ty/typescript-go/package.nix +++ b/pkgs/by-name/ty/typescript-go/package.nix @@ -7,13 +7,13 @@ buildGoModule { pname = "typescript-go"; - version = "0-unstable-2025-06-26"; + version = "0-unstable-2025-07-08"; src = fetchFromGitHub { owner = "microsoft"; repo = "typescript-go"; - rev = "ff49e725dff18d63dd932de7646e35a8efbb54ff"; - hash = "sha256-L5MFedjlAP7EiC3T5FDdLCs06HwJ03qGIp/2ZT6QKWY="; + rev = "bc8d29cb2f6248c9f6fbbc9a7625634c070b8f67"; + hash = "sha256-XpqQxL2aC0xfRVrPAj7gERIHI1Po3d5DGOrY9raNB14="; fetchSubmodules = false; }; diff --git a/pkgs/development/coq-modules/Cheerios/default.nix b/pkgs/development/coq-modules/Cheerios/default.nix index 92a1525463b6..f96d85ac4fda 100644 --- a/pkgs/development/coq-modules/Cheerios/default.nix +++ b/pkgs/development/coq-modules/Cheerios/default.nix @@ -11,16 +11,13 @@ mkCoqDerivation { owner = "uwplse"; inherit version; defaultVersion = + let + case = case: out: { inherit case out; }; + in with lib.versions; lib.switch coq.version [ - { - case = range "8.14" "9.0"; - out = "20230107"; - } - { - case = range "8.6" "8.16"; - out = "20200201"; - } + (case (range "8.14" "9.1") "20230107") + (case (range "8.6" "8.16") "20200201") ] null; release."20230107".rev = "bad8ad2476e14df6b5a819b7aaddc27a7c53fb69"; release."20230107".sha256 = "sha256-G7a+6h4VDk7seKvFr6wy7vYqYmhUje78TYCj98wXrr8="; diff --git a/pkgs/development/coq-modules/CoLoR/default.nix b/pkgs/development/coq-modules/CoLoR/default.nix index c8817db4d3dc..73877bca1884 100644 --- a/pkgs/development/coq-modules/CoLoR/default.nix +++ b/pkgs/development/coq-modules/CoLoR/default.nix @@ -11,28 +11,16 @@ mkCoqDerivation { owner = "fblanqui"; inherit version; defaultVersion = + let + case = case: out: { inherit case out; }; + in with lib.versions; lib.switch coq.version [ - { - case = range "8.14" "9.0"; - out = "1.8.5"; - } - { - case = range "8.12" "8.16"; - out = "1.8.2"; - } - { - case = range "8.10" "8.11"; - out = "1.7.0"; - } - { - case = range "8.8" "8.9"; - out = "1.6.0"; - } - { - case = range "8.6" "8.7"; - out = "1.4.0"; - } + (case (range "8.14" "9.1") "1.8.5") + (case (range "8.12" "8.16") "1.8.2") + (case (range "8.10" "8.11") "1.7.0") + (case (range "8.8" "8.9") "1.6.0") + (case (range "8.6" "8.7") "1.4.0") ] null; release."1.8.5".sha256 = "sha256-zKAyj6rKAasDF+iKExmpVHMe2WwgAwv2j1mmiVAl7ys="; diff --git a/pkgs/development/coq-modules/ElmExtraction/default.nix b/pkgs/development/coq-modules/ElmExtraction/default.nix index 3116eb98b251..5213e23bfc60 100644 --- a/pkgs/development/coq-modules/ElmExtraction/default.nix +++ b/pkgs/development/coq-modules/ElmExtraction/default.nix @@ -16,6 +16,15 @@ mkCoqDerivation { inherit version; defaultVersion = + let + case = coq: mc: out: { + cases = [ + coq + mc + ]; + inherit out; + }; + in with versions; switch [ @@ -23,13 +32,7 @@ mkCoqDerivation { metacoq.version ] [ - { - cases = [ - (range "8.17" "9.0") - (range "1.3.1" "1.3.4") - ]; - out = "0.1.1"; - } + (case (range "8.17" "9.1") (range "1.3.1" "1.3.4") "0.1.1") ] null; diff --git a/pkgs/development/coq-modules/ExtLib/default.nix b/pkgs/development/coq-modules/ExtLib/default.nix index 82e23cc0a6dd..a87b41b6078a 100644 --- a/pkgs/development/coq-modules/ExtLib/default.nix +++ b/pkgs/development/coq-modules/ExtLib/default.nix @@ -10,40 +10,19 @@ mkCoqDerivation { pname = "coq-ext-lib"; inherit version; defaultVersion = + let + case = case: out: { inherit case out; }; + in with lib.versions; lib.switch coq.coq-version [ - { - case = range "8.14" "9.0"; - out = "0.13.0"; - } - { - case = range "8.11" "8.19"; - out = "0.12.0"; - } - { - case = range "8.8" "8.16"; - out = "0.11.6"; - } - { - case = range "8.8" "8.14"; - out = "0.11.4"; - } - { - case = range "8.8" "8.13"; - out = "0.11.3"; - } - { - case = "8.7"; - out = "0.9.7"; - } - { - case = "8.6"; - out = "0.9.5"; - } - { - case = "8.5"; - out = "0.9.4"; - } + (case (range "8.14" "9.1") "0.13.0") + (case (range "8.11" "8.19") "0.12.0") + (case (range "8.8" "8.16") "0.11.6") + (case (range "8.8" "8.14") "0.11.4") + (case (range "8.8" "8.13") "0.11.3") + (case ("8.7") "0.9.7") + (case ("8.6") "0.9.5") + (case ("8.5") "0.9.4") ] null; release."0.13.0".sha256 = "sha256-vqVSu+nyGjRVXe2tnE6MPl0kcg4LHfgFwRCpTQAP/is="; release."0.12.2".sha256 = "sha256-lSTlbpkSuAY6B9cqofXSlDk2VchtqfZpRQ0+y/BAbEY="; diff --git a/pkgs/development/coq-modules/ITree/default.nix b/pkgs/development/coq-modules/ITree/default.nix index 390f670d2ae4..1307fa022010 100644 --- a/pkgs/development/coq-modules/ITree/default.nix +++ b/pkgs/development/coq-modules/ITree/default.nix @@ -12,20 +12,14 @@ mkCoqDerivation { owner = "DeepSpec"; inherit version; defaultVersion = + let + case = case: out: { inherit case out; }; + in with lib.versions; lib.switch coq.version [ - { - case = range "8.14" "9.0"; - out = "5.2.1"; - } - { - case = isEq "8.13"; - out = "5.2.0+20241009"; - } - { - case = range "8.10" "8.16"; - out = "4.0.0"; - } + (case (range "8.14" "9.1") "5.2.1") + (case (isEq "8.13") "5.2.0+20241009") + (case (range "8.10" "8.16") "4.0.0") ] null; release."5.2.1".sha256 = "sha256-3ExKHXIA8EnzAPzSbdB9FTN2OcLCVS5WtmrHOiN9UiQ="; release."5.2.0+20241009".sha256 = "sha256-eg47YgnIonCq7XOUgh9uzoKsuFCvsOSTZhgFLNNcPD0="; diff --git a/pkgs/development/coq-modules/InfSeqExt/default.nix b/pkgs/development/coq-modules/InfSeqExt/default.nix index 42b6aa0b6f42..bcdb616c00af 100644 --- a/pkgs/development/coq-modules/InfSeqExt/default.nix +++ b/pkgs/development/coq-modules/InfSeqExt/default.nix @@ -11,16 +11,13 @@ mkCoqDerivation { owner = "DistributedComponents"; inherit version; defaultVersion = + let + case = case: out: { inherit case out; }; + in with lib.versions; lib.switch coq.version [ - { - case = range "8.9" "9.0"; - out = "20230107"; - } - { - case = range "8.5" "8.16"; - out = "20200131"; - } + (case (range "8.9" "9.1") "20230107") + (case (range "8.5" "8.16") "20200131") ] null; release."20230107".rev = "601e89ec019501c48c27fcfc14b9a3c70456e408"; release."20230107".sha256 = "sha256-YMBzVIsLkIC+w2TeyHrKe29eWLIxrH3wIMZqhik8p9I="; diff --git a/pkgs/development/coq-modules/MenhirLib/default.nix b/pkgs/development/coq-modules/MenhirLib/default.nix index 4e3f0ec0b4cb..467ed819e93c 100644 --- a/pkgs/development/coq-modules/MenhirLib/default.nix +++ b/pkgs/development/coq-modules/MenhirLib/default.nix @@ -13,16 +13,13 @@ let domain = "gitlab.inria.fr"; inherit version; defaultVersion = + let + case = case: out: { inherit case out; }; + in with lib.versions; lib.switch coq.coq-version [ - { - case = range "8.12" "9.0"; - out = "20240715"; - } - { - case = range "8.7" "8.11"; - out = "20200624"; - } + (case (range "8.12" "9.1") "20240715") + (case (range "8.7" "8.11") "20200624") ] null; release = { "20240715".sha256 = "sha256-9CSxAIm0aEXkwF+aj8u/bqLG30y5eDNz65EnohJPjzI="; # coq 8.9 - 8.20 diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index bb85278f28cc..8df53c6bb914 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -16,87 +16,29 @@ in owner = "QuickChick"; inherit version; defaultVersion = + let + case = coq: mc: out: { + cases = [ + coq + mc + ]; + inherit out; + }; + in lib.switch [ coq.coq-version mathcomp-boot.version ] [ - { - cases = [ - (lib.versions.range "8.15" "9.0") - lib.pred.true - ]; - out = "2.0.4"; - } - { - cases = [ - (lib.versions.range "8.13" "8.17") - lib.pred.true - ]; - out = "1.6.5"; - } - { - cases = [ - "8.13" - lib.pred.true - ]; - out = "1.5.0"; - } - { - cases = [ - "8.12" - lib.pred.true - ]; - out = "1.4.0"; - } - { - cases = [ - "8.11" - lib.pred.true - ]; - out = "1.3.2"; - } - { - cases = [ - "8.10" - lib.pred.true - ]; - out = "1.2.1"; - } - { - cases = [ - "8.9" - lib.pred.true - ]; - out = "1.1.0"; - } - { - cases = [ - "8.8" - lib.pred.true - ]; - out = "20190311"; - } - { - cases = [ - "8.7" - lib.versions.isLe - "1.8" - ]; - out = "1.0.0"; - } - { - cases = [ - "8.6" - lib.pred.true - ]; - out = "20171102"; - } - { - cases = [ - "8.5" - lib.pred.true - ]; - out = "20170512"; - } + (case (lib.versions.range "8.15" "9.0") lib.pred.true "2.0.4") + (case (lib.versions.range "8.13" "8.17") lib.pred.true "1.6.5") + (case "8.13" lib.pred.true "1.5.0") + (case "8.12" lib.pred.true "1.4.0") + (case "8.11" lib.pred.true "1.3.2") + (case "8.10" lib.pred.true "1.2.1") + (case "8.9" lib.pred.true "1.1.0") + (case "8.8" lib.pred.true "20190311") + (case "8.7" (lib.versions.isLe "1.8") "1.0.0") + (case "8.6" lib.pred.true "20171102") + (case "8.5" lib.pred.true "20170512") ] null; release."2.0.4".sha256 = "sha256-WD8B+n8gyGctHMO+M8201Ca3Uw8zCWYsOatSNGCf0/s="; diff --git a/pkgs/development/coq-modules/StructTact/default.nix b/pkgs/development/coq-modules/StructTact/default.nix index 594eb183b7b0..93fd3d92d270 100644 --- a/pkgs/development/coq-modules/StructTact/default.nix +++ b/pkgs/development/coq-modules/StructTact/default.nix @@ -11,20 +11,14 @@ mkCoqDerivation { owner = "uwplse"; inherit version; defaultVersion = + let + case = case: out: { inherit case out; }; + in with lib.versions; lib.switch coq.coq-version [ - { - case = range "8.9" "9.0"; - out = "20230107"; - } - { - case = range "8.6" "8.16"; - out = "20210328"; - } - { - case = range "8.5" "8.13"; - out = "20181102"; - } + (case (range "8.9" "9.1") "20230107") + (case (range "8.6" "8.16") "20210328") + (case (range "8.5" "8.13") "20181102") ] null; release."20230107".rev = "2f2ff253be29bb09f36cab96d036419b18a95b00"; release."20230107".sha256 = "sha256-4mWdnWD8m1ddgqWHqzjqclhinXJaB/YoLlmLeeL0yZA="; diff --git a/pkgs/development/coq-modules/autosubst/default.nix b/pkgs/development/coq-modules/autosubst/default.nix index 440eadea3bff..7c1bf542cb39 100644 --- a/pkgs/development/coq-modules/autosubst/default.nix +++ b/pkgs/development/coq-modules/autosubst/default.nix @@ -18,20 +18,14 @@ mkCoqDerivation { inherit version; defaultVersion = + let + case = case: out: { inherit case out; }; + in with lib.versions; lib.switch coq.coq-version [ - { - case = range "8.14" "9.0"; - out = "1.9"; - } - { - case = range "8.14" "8.18"; - out = "1.8"; - } - { - case = range "8.10" "8.13"; - out = "1.7"; - } + (case (range "8.14" "9.1") "1.9") + (case (range "8.14" "8.18") "1.8") + (case (range "8.10" "8.13") "1.7") ] null; propagatedBuildInputs = [ diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix index 97af73c3542f..3a6ce9bd4a31 100644 --- a/pkgs/development/coq-modules/bignums/default.nix +++ b/pkgs/development/coq-modules/bignums/default.nix @@ -2,6 +2,8 @@ lib, mkCoqDerivation, coq, + rocqPackages_9_0, + rocqPackages_9_1, rocqPackages, stdlib, version ? null, @@ -60,16 +62,25 @@ # this is just a wrapper for rocPackages.bignums for Rocq >= 9.0 lib.optionalAttrs (coq.version != null && (coq.version == "dev" || lib.versions.isGe "9.0" coq.version)) - { - configurePhase = '' - echo no configuration - ''; - buildPhase = '' - echo building nothing - ''; - installPhase = '' - echo installing nothing - ''; - propagatedBuildInputs = o.propagatedBuildInputs ++ [ rocqPackages.bignums ]; - } + ( + let + case = case: out: { inherit case out; }; + rp = lib.switch coq.coq-version [ + (case (lib.versions.isEq "9.0") rocqPackages_9_0) + (case (lib.versions.isEq "9.1") rocqPackages_9_1) + ] rocqPackages; + in + { + configurePhase = '' + echo no configuration + ''; + buildPhase = '' + echo building nothing + ''; + installPhase = '' + echo installing nothing + ''; + propagatedBuildInputs = o.propagatedBuildInputs ++ [ rp.bignums ]; + } + ) ) diff --git a/pkgs/development/coq-modules/ceres/default.nix b/pkgs/development/coq-modules/ceres/default.nix index 3bf17cb6cf4d..670db7ebef8f 100644 --- a/pkgs/development/coq-modules/ceres/default.nix +++ b/pkgs/development/coq-modules/ceres/default.nix @@ -14,16 +14,13 @@ mkCoqDerivation { inherit version; defaultVersion = + let + case = case: out: { inherit case out; }; + in with lib.versions; lib.switch coq.version [ - { - case = range "8.14" "9.0"; - out = "0.4.1"; - } - { - case = range "8.8" "8.16"; - out = "0.4.0"; - } + (case (range "8.14" "9.1") "0.4.1") + (case (range "8.8" "8.16") "0.4.0") ] null; release."0.4.1".sha256 = "sha256-9vyk8/8IVsqNyhw3WPzl8w3L9Wu7gfaMVa3n2nWjFiA="; release."0.4.0".sha256 = "sha256:0zwp3pn6fdj0qdig734zdczrls886al06mxqhhabms0jvvqijmbi"; diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index f6308faaf34c..0dc2c1726ab5 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -3,6 +3,8 @@ mkCoqDerivation, which, coq, + rocqPackages_9_0, + rocqPackages_9_1, rocqPackages, stdlib, version ? null, @@ -16,17 +18,18 @@ let else ( let + case = case: out: { inherit case out; }; in with lib.versions; lib.switch coq.coq-version [ - (case "8.11" "1.11.4") - (case "8.12" "1.12.0") - (case (range "8.13" "8.14") "1.13.7") - (case "8.15" "1.15.0") - (case (range "8.16" "8.17") "1.17.0") + (case (range "8.20" "9.1") "2.0.7") (case (range "8.18" "8.19") "1.18.1") - (case (range "8.20" "9.0") "2.0.7") + (case (range "8.16" "8.17") "1.17.0") + (case "8.15" "1.15.0") + (case (range "8.13" "8.14") "1.13.7") + (case "8.12" "1.12.0") + (case "8.11" "1.11.4") ] { } ); elpi = coq.ocamlPackages.elpi.override { version = default-elpi-version; }; @@ -44,6 +47,7 @@ let in with lib.versions; lib.switch coq.coq-version [ + (case (range "8.20" "9.1") "2.6.0") (case (range "8.20" "9.0") "2.5.2") (case "8.19" "2.0.1") (case "8.18" "2.0.0") @@ -55,6 +59,7 @@ let (case "8.12" "1.8.3_8.12") (case "8.11" "1.6.3_8.11") ] null; + release."2.6.0".sha256 = "sha256-23BHq1NFUkI3ayXnGUwiGFySLyY3EuH4RyMgAhQqI4g="; release."2.5.2".sha256 = "sha256-lLzjPrbVB3rrqox528YiheUb0u89R84Xmrgkn0oplOs="; release."2.5.0".sha256 = "sha256-Z5xjO83X/ZoTQlWnVupGXPH3HuJefr57Kv128I0dltg="; release."2.4.0".sha256 = "sha256-W2+vVGExLLux8e0nSZESSoMVvrLxhL6dmXkb+JuKiqc="; @@ -138,6 +143,13 @@ let o: # this is just a wrapper for rocPackages.rocq-elpi for Rocq >= 9.0 if coq.version != null && (coq.version == "dev" || lib.versions.isGe "9.0" coq.version) then + let + case = case: out: { inherit case out; }; + rp = lib.switch coq.coq-version [ + (case "9.0" rocqPackages_9_0) + (case "9.1" rocqPackages_9_1) + ] rocqPackages; + in { configurePhase = '' echo no configuration @@ -148,7 +160,7 @@ let installPhase = '' echo installing nothing ''; - propagatedBuildInputs = o.propagatedBuildInputs ++ [ rocqPackages.rocq-elpi ]; + propagatedBuildInputs = o.propagatedBuildInputs ++ [ rp.rocq-elpi ]; } else lib.optionalAttrs (o.version != null && (o.version == "dev" || lib.versions.isGe "2.5.0" o.version)) diff --git a/pkgs/development/coq-modules/coq-record-update/default.nix b/pkgs/development/coq-modules/coq-record-update/default.nix index 2ca54c4b8a15..c1e125b509ac 100644 --- a/pkgs/development/coq-modules/coq-record-update/default.nix +++ b/pkgs/development/coq-modules/coq-record-update/default.nix @@ -10,12 +10,12 @@ mkCoqDerivation { owner = "tchajed"; inherit version; defaultVersion = + let + case = case: out: { inherit case out; }; + in with lib.versions; lib.switch coq.coq-version [ - { - case = range "8.10" "9.0"; - out = "0.3.4"; - } + (case (range "8.10" "9.0") "0.3.4") ] null; release."0.3.4".sha256 = "sha256-AhEcugUiVIsgbq884Lur/bQIuGw8prk+3AlNkP1omcw="; release."0.3.3".sha256 = "sha256-HDIPeFHiC9EwhiOH7yMGJ9d2zJMhboTpRGf9kWcB9Io="; diff --git a/pkgs/development/coq-modules/coqeal/default.nix b/pkgs/development/coq-modules/coqeal/default.nix index c1810a3730c8..1c7498e04dbc 100644 --- a/pkgs/development/coq-modules/coqeal/default.nix +++ b/pkgs/development/coq-modules/coqeal/default.nix @@ -30,7 +30,7 @@ let lib.switch [ coq.coq-version mathcomp.version ] [ - (case (range "8.20" "9.0") (isGe "2.3.0") "2.1.0") + (case (range "8.20" "9.1") (isGe "2.3.0") "2.1.0") (case (range "8.16" "8.20") (isGe "2.1.0") "2.0.3") (case (range "8.16" "8.20") (isGe "2.0.0") "2.0.1") (case (range "8.16" "8.17") (isGe "2.0.0") "2.0.0") diff --git a/pkgs/development/coq-modules/deriving/default.nix b/pkgs/development/coq-modules/deriving/default.nix index bfa2e99a481e..7d16303e3c3e 100644 --- a/pkgs/development/coq-modules/deriving/default.nix +++ b/pkgs/development/coq-modules/deriving/default.nix @@ -26,7 +26,7 @@ mkCoqDerivation { lib.switch [ coq.coq-version ssreflect.version ] [ - (case (range "8.17" "9.0") (range "2.0.0" "2.4.0") "0.2.2") + (case (range "8.17" "9.1") (range "2.0.0" "2.4.0") "0.2.2") (case (range "8.17" "9.0") (range "2.0.0" "2.3.0") "0.2.1") (case (range "8.17" "8.20") (range "2.0.0" "2.2.0") "0.2.0") (case (range "8.11" "8.20") (isLe "2.0.0") "0.1.1") diff --git a/pkgs/development/coq-modules/extructures/default.nix b/pkgs/development/coq-modules/extructures/default.nix index cfb2e819e22a..d6432001f6b8 100644 --- a/pkgs/development/coq-modules/extructures/default.nix +++ b/pkgs/development/coq-modules/extructures/default.nix @@ -26,7 +26,7 @@ lib.switch [ coq.coq-version mathcomp-boot.version ] [ - (case (range "8.17" "9.0") (range "2.0.0" "2.4.0") "0.5.0") + (case (range "8.17" "9.1") (range "2.0.0" "2.4.0") "0.5.0") (case (range "8.17" "8.20") (range "2.0.0" "2.3.0") "0.4.0") (case (range "8.11" "8.20") (range "1.12.0" "1.19.0") "0.3.1") (case (range "8.11" "8.14") (isLe "1.12.0") "0.3.0") diff --git a/pkgs/development/coq-modules/gaia/default.nix b/pkgs/development/coq-modules/gaia/default.nix index a716a1ad0363..7fbebdc5e2ce 100644 --- a/pkgs/development/coq-modules/gaia/default.nix +++ b/pkgs/development/coq-modules/gaia/default.nix @@ -35,7 +35,7 @@ mkCoqDerivation { lib.switch [ coq.coq-version mathcomp.version ] [ - (case (range "8.16" "9.0") (range "2.0" "2.4") "2.3") + (case (range "8.16" "9.1") (range "2.0" "2.4") "2.3") (case (range "8.16" "9.0") (range "2.0" "2.3") "2.2") (case (range "8.10" "8.18") (range "1.12.0" "1.18.0") "1.17") (case (range "8.10" "8.12") "1.11.0" "1.11") diff --git a/pkgs/development/coq-modules/hierarchy-builder/default.nix b/pkgs/development/coq-modules/hierarchy-builder/default.nix index cf37bf147d4c..cde093329011 100644 --- a/pkgs/development/coq-modules/hierarchy-builder/default.nix +++ b/pkgs/development/coq-modules/hierarchy-builder/default.nix @@ -2,6 +2,8 @@ lib, mkCoqDerivation, coq, + rocqPackages_9_0, + rocqPackages_9_1, rocqPackages, stdlib, coq-elpi, @@ -19,7 +21,7 @@ let in with lib.versions; lib.switch coq.coq-version [ - (case (range "8.20" "9.0") "1.9.1") + (case (range "8.20" "9.1") "1.9.1") (case (range "8.19" "8.20") "1.8.0") (case (range "8.18" "8.20") "1.7.1") (case (range "8.16" "8.18") "1.6.0") @@ -77,16 +79,25 @@ hb.overrideAttrs ( // lib.optionalAttrs (coq.version != null && (coq.version == "dev" || lib.versions.isGe "9.0" coq.version)) - { - configurePhase = '' - echo no configuration - ''; - buildPhase = '' - echo building nothing - ''; - installPhase = '' - echo installing nothing - ''; - propagatedBuildInputs = o.propagatedBuildInputs ++ [ rocqPackages.hierarchy-builder ]; - } + ( + let + case = case: out: { inherit case out; }; + rp = lib.switch coq.coq-version [ + (case "9.0" rocqPackages_9_0) + (case "9.1" rocqPackages_9_1) + ] rocqPackages; + in + { + configurePhase = '' + echo no configuration + ''; + buildPhase = '' + echo building nothing + ''; + installPhase = '' + echo installing nothing + ''; + propagatedBuildInputs = o.propagatedBuildInputs ++ [ rp.hierarchy-builder ]; + } + ) ) diff --git a/pkgs/development/coq-modules/iris/default.nix b/pkgs/development/coq-modules/iris/default.nix index b58ea00f12da..c3b1581df8ed 100644 --- a/pkgs/development/coq-modules/iris/default.nix +++ b/pkgs/development/coq-modules/iris/default.nix @@ -17,7 +17,7 @@ mkCoqDerivation { in with lib.versions; lib.switch coq.coq-version [ - (case (range "8.19" "9.0") "4.3.0") + (case (range "8.19" "9.1") "4.3.0") (case (range "8.18" "8.19") "4.2.0") (case (range "8.16" "8.18") "4.1.0") (case (range "8.13" "8.17") "4.0.0") diff --git a/pkgs/development/coq-modules/json/default.nix b/pkgs/development/coq-modules/json/default.nix index 06f18199fcf1..cc4ba6775cde 100644 --- a/pkgs/development/coq-modules/json/default.nix +++ b/pkgs/development/coq-modules/json/default.nix @@ -19,7 +19,7 @@ inherit (lib.versions) range; in lib.switch coq.coq-version [ - (case (range "8.14" "9.0") "0.2.0") + (case (range "8.14" "9.1") "0.2.0") (case (range "8.14" "8.20") "0.1.3") ] null; release = { diff --git a/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix b/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix index 0bd7cd8a9fb9..73272224ffda 100644 --- a/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix +++ b/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix @@ -32,7 +32,7 @@ mkCoqDerivation { lib.switch [ coq.coq-version mathcomp-algebra.version ] [ - (case (range "8.20" "9.0") (isGe "2.4") "1.2.5") + (case (range "8.20" "9.1") (isGe "2.4") "1.2.5") (case (range "8.16" "9.0") (isGe "2.0") "1.2.4") (case (range "8.16" "8.18") (isGe "2.0") "1.2.2") (case (range "8.16" "8.19") (isGe "1.15") "1.1.1") diff --git a/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/pkgs/development/coq-modules/mathcomp-analysis/default.nix index 11d0a480696f..1fe217d0b9ed 100644 --- a/pkgs/development/coq-modules/mathcomp-analysis/default.nix +++ b/pkgs/development/coq-modules/mathcomp-analysis/default.nix @@ -58,7 +58,7 @@ let lib.switch [ coq.coq-version mathcomp.version ] [ - (case (range "8.20" "9.0") (range "2.1.0" "2.4.0") "1.12.0") + (case (range "8.20" "9.1") (range "2.1.0" "2.4.0") "1.12.0") (case (range "8.19" "8.20") (range "2.1.0" "2.3.0") "1.9.0") (case (range "8.17" "8.20") (range "2.0.0" "2.2.0") "1.1.0") (case (range "8.17" "8.19") (range "1.17.0" "1.19.0") "0.7.0") diff --git a/pkgs/development/coq-modules/mathcomp-bigenough/default.nix b/pkgs/development/coq-modules/mathcomp-bigenough/default.nix index 8e50d9a4ea86..cd92a0257510 100644 --- a/pkgs/development/coq-modules/mathcomp-bigenough/default.nix +++ b/pkgs/development/coq-modules/mathcomp-bigenough/default.nix @@ -27,7 +27,7 @@ mkCoqDerivation { in with lib.versions; lib.switch coq.coq-version [ - (case (range "8.10" "9.0") "1.0.2") + (case (range "8.10" "9.1") "1.0.2") (case (range "8.5" "8.14") "1.0.0") ] null; diff --git a/pkgs/development/coq-modules/mathcomp-finmap/default.nix b/pkgs/development/coq-modules/mathcomp-finmap/default.nix index 11b177e80910..01c1c02fd63c 100644 --- a/pkgs/development/coq-modules/mathcomp-finmap/default.nix +++ b/pkgs/development/coq-modules/mathcomp-finmap/default.nix @@ -29,7 +29,7 @@ mkCoqDerivation { lib.switch [ coq.coq-version mathcomp-boot.version ] [ - (case (range "8.20" "9.0") (range "2.3" "2.4") "2.2.0") + (case (range "8.20" "9.1") (range "2.3" "2.4") "2.2.0") (case (range "8.16" "9.0") (range "2.0" "2.3") "2.1.0") (case (range "8.16" "8.18") (range "2.0" "2.1") "2.0.0") (case (range "8.13" "8.20") (range "1.12" "1.19") "1.5.2") diff --git a/pkgs/development/coq-modules/mathcomp-real-closed/default.nix b/pkgs/development/coq-modules/mathcomp-real-closed/default.nix index 522000b7c379..811946457893 100644 --- a/pkgs/development/coq-modules/mathcomp-real-closed/default.nix +++ b/pkgs/development/coq-modules/mathcomp-real-closed/default.nix @@ -32,87 +32,30 @@ mkCoqDerivation { }; defaultVersion = + let + case = coq: mc: out: { + cases = [ + coq + mc + ]; + inherit out; + }; + in with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { - cases = [ - (range "8.18" "9.0") - (isGe "2.2.0") - ]; - out = "2.0.3"; - } - { - cases = [ - (range "8.17" "9.0") - (range "2.1.0" "2.3.0") - ]; - out = "2.0.2"; - } - { - cases = [ - (range "8.17" "8.20") - (range "2.0.0" "2.2.0") - ]; - out = "2.0.1"; - } - { - cases = [ - (range "8.16" "8.19") - (range "2.0.0" "2.2.0") - ]; - out = "2.0.0"; - } - { - cases = [ - (range "8.13" "8.19") - (range "1.13.0" "1.19.0") - ]; - out = "1.1.4"; - } - { - cases = [ - (isGe "8.13") - (range "1.12.0" "1.18.0") - ]; - out = "1.1.3"; - } - { - cases = [ - (isGe "8.10") - (range "1.12.0" "1.18.0") - ]; - out = "1.1.2"; - } - { - cases = [ - (isGe "8.7") - "1.11.0" - ]; - out = "1.1.1"; - } - { - cases = [ - (isGe "8.7") - (range "1.9.0" "1.10.0") - ]; - out = "1.0.4"; - } - { - cases = [ - (isGe "8.7") - "1.8.0" - ]; - out = "1.0.3"; - } - { - cases = [ - (isGe "8.7") - "1.7.0" - ]; - out = "1.0.1"; - } + (case (range "8.18" "9.1") (isGe "2.2.0") "2.0.3") + (case (range "8.17" "9.0") (range "2.1.0" "2.3.0") "2.0.2") + (case (range "8.17" "8.20") (range "2.0.0" "2.2.0") "2.0.1") + (case (range "8.16" "8.19") (range "2.0.0" "2.2.0") "2.0.0") + (case (range "8.13" "8.19") (range "1.13.0" "1.19.0") "1.1.4") + (case (isGe "8.13") (range "1.12.0" "1.18.0") "1.1.3") + (case (isGe "8.10") (range "1.12.0" "1.18.0") "1.1.2") + (case (isGe "8.7") "1.11.0" "1.1.1") + (case (isGe "8.7") (range "1.9.0" "1.10.0") "1.0.4") + (case (isGe "8.7") "1.8.0" "1.0.3") + (case (isGe "8.7") "1.7.0" "1.0.1") ] null; diff --git a/pkgs/development/coq-modules/mathcomp-tarjan/default.nix b/pkgs/development/coq-modules/mathcomp-tarjan/default.nix index e5f1b9ee1b9e..27fbe39d0976 100644 --- a/pkgs/development/coq-modules/mathcomp-tarjan/default.nix +++ b/pkgs/development/coq-modules/mathcomp-tarjan/default.nix @@ -31,7 +31,7 @@ mkCoqDerivation { lib.switch [ coq.coq-version mathcomp-ssreflect.version ] [ - (case (range "8.16" "9.0") (range "2.0.0" "2.4.0") "1.0.3") + (case (range "8.16" "9.1") (range "2.0.0" "2.4.0") "1.0.3") (case (range "8.16" "9.0") (range "2.0.0" "2.3.0") "1.0.2") (case (range "8.12" "8.18") (range "1.12.0" "1.17.0") "1.0.1") (case (range "8.10" "8.16") (range "1.12.0" "1.17.0") "1.0.0") diff --git a/pkgs/development/coq-modules/mathcomp-word/default.nix b/pkgs/development/coq-modules/mathcomp-word/default.nix index 0041eca094ad..1a0816e82352 100644 --- a/pkgs/development/coq-modules/mathcomp-word/default.nix +++ b/pkgs/development/coq-modules/mathcomp-word/default.nix @@ -69,7 +69,7 @@ mkCoqDerivation { lib.switch [ coq.coq-version mathcomp.version ] [ - (case (range "8.16" "9.0") (isGe "2.0") "3.2") + (case (range "8.16" "9.1") (isGe "2.0") "3.2") (case (range "8.12" "8.20") (range "1.12" "1.19") "2.4") ] null; diff --git a/pkgs/development/coq-modules/mathcomp-zify/default.nix b/pkgs/development/coq-modules/mathcomp-zify/default.nix index e1d1a9fdec83..38546c55d36d 100644 --- a/pkgs/development/coq-modules/mathcomp-zify/default.nix +++ b/pkgs/development/coq-modules/mathcomp-zify/default.nix @@ -33,7 +33,7 @@ mkCoqDerivation { lib.switch [ coq.coq-version mathcomp-algebra.version ] [ - (case (range "8.16" "9.0") (isGe "2.0.0") "1.5.0+2.0+8.16") + (case (range "8.16" "9.1") (isGe "2.0.0") "1.5.0+2.0+8.16") (case (range "8.13" "8.20") (range "1.12" "1.19.0") "1.3.0+1.12+8.13") (case (range "8.13" "8.16") (range "1.12" "1.17.0") "1.1.0+1.12+8.13") ] diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index f988a6284376..ddef4adc8b06 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -35,7 +35,7 @@ let inherit (lib.versions) range; in lib.switch coq.coq-version [ - (case (range "8.20" "9.0") "2.4.0") + (case (range "8.20" "9.1") "2.4.0") (case (range "8.19" "9.0") "2.3.0") (case (range "8.17" "8.20") "2.2.0") (case (range "8.17" "8.18") "2.1.0") diff --git a/pkgs/development/coq-modules/multinomials/default.nix b/pkgs/development/coq-modules/multinomials/default.nix index bf6a7eaef0f3..71a90d0dead1 100644 --- a/pkgs/development/coq-modules/multinomials/default.nix +++ b/pkgs/development/coq-modules/multinomials/default.nix @@ -33,7 +33,7 @@ mkCoqDerivation { lib.switch [ coq.coq-version mathcomp.version ] [ - (case (range "8.18" "9.0") (range "2.1.0" "2.4.0") "2.4.0") + (case (range "8.18" "9.1") (range "2.1.0" "2.4.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") (case (range "8.16" "8.18") "2.1.0" "2.1.0") diff --git a/pkgs/development/coq-modules/paco/default.nix b/pkgs/development/coq-modules/paco/default.nix index 9712333929f4..e9263d78e392 100644 --- a/pkgs/development/coq-modules/paco/default.nix +++ b/pkgs/development/coq-modules/paco/default.nix @@ -11,32 +11,17 @@ mkCoqDerivation { owner = "snu-sf"; inherit version; defaultVersion = + let + case = case: out: { inherit case out; }; + in with lib.versions; lib.switch coq.coq-version [ - { - case = range "8.14" "9.0"; - out = "4.2.3"; - } - { - case = isEq "8.13"; - out = "4.2.2"; - } - { - case = range "8.12" "8.17"; - out = "4.1.2"; - } - { - case = range "8.9" "8.13"; - out = "4.1.1"; - } - { - case = range "8.6" "8.13"; - out = "4.0.2"; - } - { - case = isEq "8.5"; - out = "1.2.8"; - } + (case (range "8.14" "9.1") "4.2.3") + (case (isEq "8.13") "4.2.2") + (case (range "8.12" "8.17") "4.1.2") + (case (range "8.9" "8.13") "4.1.1") + (case (range "8.6" "8.13") "4.0.2") + (case (isEq "8.5") "1.2.8") ] null; release."4.2.3".sha256 = "sha256-ldUjNd5daUu2B3v4tk20/iXFgyUuW4XHlbubTInpwcs="; release."4.2.2".sha256 = "sha256-qr6o45Q90FK+kkBUJ+W7QhiA0YQRb1RUwwXUpTTFt8A="; diff --git a/pkgs/development/coq-modules/parsec/default.nix b/pkgs/development/coq-modules/parsec/default.nix index b797fc71e7d6..56c37cca8e00 100644 --- a/pkgs/development/coq-modules/parsec/default.nix +++ b/pkgs/development/coq-modules/parsec/default.nix @@ -21,24 +21,15 @@ mkCoqDerivation { inherit version; defaultVersion = + let + case = case: out: { inherit case out; }; + in with lib.versions; lib.switch coq.version [ - { - case = range "8.14" "9.0"; - out = "0.2.0"; - } - { - case = range "8.14" "8.20"; - out = "0.1.2"; - } - { - case = range "8.12" "8.16"; - out = "0.1.1"; - } - { - case = range "8.12" "8.13"; - out = "0.1.0"; - } + (case (range "8.14" "9.1") "0.2.0") + (case (range "8.14" "8.20") "0.1.2") + (case (range "8.12" "8.16") "0.1.1") + (case (range "8.12" "8.13") "0.1.0") ] null; release."0.2.0".sha256 = "sha256-hM6LVFQ2VQ42QeHu8Ex+oz1VvJUr+g8/nZN+bYHEljQ="; release."0.1.2".sha256 = "sha256-QN0h1CsX86DQBDsluXLtNUvMh3r60/0iDSbYam67AhA="; diff --git a/pkgs/development/coq-modules/parseque/default.nix b/pkgs/development/coq-modules/parseque/default.nix index 386a248f91dc..7d2fd5b2832e 100644 --- a/pkgs/development/coq-modules/parseque/default.nix +++ b/pkgs/development/coq-modules/parseque/default.nix @@ -1,6 +1,8 @@ { lib, mkCoqDerivation, + rocqPackages_9_0, + rocqPackages_9_1, rocqPackages, which, coq, @@ -41,16 +43,25 @@ with lib; # this is just a wrapper for rocPackages.parseque for Rocq >= 9.0 lib.optionalAttrs (coq.version != null && (coq.version == "dev" || lib.versions.isGe "9.0" coq.version)) - { - configurePhase = '' - echo no configuration - ''; - buildPhase = '' - echo building nothing - ''; - installPhase = '' - echo installing nothing - ''; - propagatedBuildInputs = [ rocqPackages.parseque ]; - } + ( + let + case = case: out: { inherit case out; }; + rp = lib.switch coq.coq-version [ + (case "9.0" rocqPackages_9_0) + (case "9.1" rocqPackages_9_1) + ] rocqPackages; + in + { + configurePhase = '' + echo no configuration + ''; + buildPhase = '' + echo building nothing + ''; + installPhase = '' + echo installing nothing + ''; + propagatedBuildInputs = [ rp.parseque ]; + } + ) ) diff --git a/pkgs/development/coq-modules/reglang/default.nix b/pkgs/development/coq-modules/reglang/default.nix index adbb2bfbae98..47a255a8cdcf 100644 --- a/pkgs/development/coq-modules/reglang/default.nix +++ b/pkgs/development/coq-modules/reglang/default.nix @@ -33,7 +33,7 @@ mkCoqDerivation { lib.switch [ coq.coq-version mathcomp.version ] [ - (case (range "8.16" "9.0") (range "2.0.0" "2.4.0") "1.2.2") + (case (range "8.16" "9.1") (range "2.0.0" "2.4.0") "1.2.2") (case (range "8.16" "9.0") (range "2.0.0" "2.3.0") "1.2.1") (case (range "8.16" "8.18") (range "2.0.0" "2.1.0") "1.2.0") (case (range "8.10" "8.20") (isLt "2.0.0") "1.1.3") diff --git a/pkgs/development/coq-modules/simple-io/default.nix b/pkgs/development/coq-modules/simple-io/default.nix index cc8c427619fb..fe20ceffd2d6 100644 --- a/pkgs/development/coq-modules/simple-io/default.nix +++ b/pkgs/development/coq-modules/simple-io/default.nix @@ -18,7 +18,7 @@ in with lib.versions; lib.switch coq.coq-version [ - (case (range "8.17" "9.0") "1.10.0") + (case (range "8.17" "9.1") "1.10.0") (case (range "8.11" "8.19") "1.8.0") (case (range "8.7" "8.13") "1.3.0") ] null; diff --git a/pkgs/development/coq-modules/stdlib/default.nix b/pkgs/development/coq-modules/stdlib/default.nix index 50f12e763836..5ce07d4757bf 100644 --- a/pkgs/development/coq-modules/stdlib/default.nix +++ b/pkgs/development/coq-modules/stdlib/default.nix @@ -1,5 +1,7 @@ { coq, + rocqPackages_9_0, + rocqPackages_9_1, rocqPackages, mkCoqDerivation, lib, @@ -52,5 +54,14 @@ ''; } else - { propagatedBuildInputs = [ rocqPackages.stdlib ]; } + let + case = case: out: { inherit case out; }; + rp = lib.switch coq.coq-version [ + (case "9.0" rocqPackages_9_0) + (case "9.1" rocqPackages_9_1) + ] rocqPackages; + in + { + propagatedBuildInputs = [ rp.stdlib ]; + } ) diff --git a/pkgs/development/coq-modules/stdpp/default.nix b/pkgs/development/coq-modules/stdpp/default.nix index 3f64dc57f47c..ae198228f8b3 100644 --- a/pkgs/development/coq-modules/stdpp/default.nix +++ b/pkgs/development/coq-modules/stdpp/default.nix @@ -17,7 +17,7 @@ mkCoqDerivation { in with lib.versions; lib.switch coq.coq-version [ - (case (range "8.19" "9.0") "1.11.0") + (case (range "8.19" "9.1") "1.11.0") (case (range "8.18" "8.19") "1.10.0") (case (range "8.16" "8.18") "1.9.0") (case (range "8.13" "8.17") "1.8.0") diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index e1d1413a7054..471cdca203a4 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -16,9 +16,10 @@ let version, hash, patches ? [ ], + postPatch ? "", knownVulnerabilities ? [ ], }: - stdenv.mkDerivation rec { + stdenv.mkDerivation { pname = "libressl"; inherit version; @@ -55,9 +56,11 @@ let inherit patches; - postPatch = '' - patchShebangs tests/ - ''; + postPatch = + '' + patchShebangs tests/ + '' + + postPatch; doCheck = !(stdenv.hostPlatform.isPower64 || stdenv.hostPlatform.isRiscV); preCheck = '' @@ -152,5 +155,16 @@ in libressl_4_1 = generic { version = "4.1.0"; hash = "sha256-D3HBa9NL2qzNy5al2UpJIb+2EuxuDrp6gNiFTu/Yu2E="; + # Fixes build on loongarch64 + # https://github.com/libressl/portable/pull/1184 + postPatch = '' + mkdir -p include/arch/loongarch64 + cp ${ + fetchurl { + url = "https://github.com/libressl/portable/raw/refs/tags/v4.1.0/include/arch/loongarch64/opensslconf.h"; + hash = "sha256-68dw5syUy1z6GadCMR4TR9+0UQX6Lw/CbPWvjHGAhgo="; + } + } include/arch/loongarch64/opensslconf.h + ''; }; } diff --git a/pkgs/development/ocaml-modules/lua-ml/default.nix b/pkgs/development/ocaml-modules/lua-ml/default.nix index 1ea40e57d002..45c0637e5de3 100644 --- a/pkgs/development/ocaml-modules/lua-ml/default.nix +++ b/pkgs/development/ocaml-modules/lua-ml/default.nix @@ -1,49 +1,25 @@ { - stdenv, lib, fetchFromGitHub, - ocaml, - findlib, - ocamlbuild, - opaline, + buildDunePackage, }: +buildDunePackage rec { + pname = "lua-ml"; + version = "0.9.4"; -if lib.versionOlder ocaml.version "4.07" then - throw "lua-ml is not available for OCaml ${ocaml.version}" -else + minimalOCamlVersion = "4.07"; - stdenv.mkDerivation rec { - pname = "lua-ml"; - name = "ocaml${ocaml.version}-${pname}-${version}"; - version = "0.9.2"; + src = fetchFromGitHub { + owner = "lindig"; + repo = "lua-ml"; + tag = version; + hash = "sha256-kMBTHzmlrRWNpWwG321jYcM61rE1J3YQkygSrfnZ6Wc="; + }; - src = fetchFromGitHub { - owner = "lindig"; - repo = pname; - rev = version; - sha256 = "sha256-xkjsjKD89W7Y5XK8kfL/ZErYKS14z0u0QCARN0DbTC8="; - }; - - nativeBuildInputs = [ - opaline - ocaml - findlib - ocamlbuild - ]; - - strictDeps = true; - - buildFlags = [ "lib" ]; - - installPhase = '' - opaline -prefix $out -libdir $OCAMLFIND_DESTDIR - ''; - - meta = { - description = "Embeddable Lua 2.5 interpreter implemented in OCaml"; - inherit (src.meta) homepage; - inherit (ocaml.meta) platforms; - license = lib.licenses.bsd2; - maintainers = [ lib.maintainers.vbgl ]; - }; - } + meta = { + description = "Embeddable Lua 2.5 interpreter implemented in OCaml"; + inherit (src.meta) homepage; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/python-modules/touying/default.nix b/pkgs/development/python-modules/touying/default.nix new file mode 100644 index 000000000000..95b88db5dd8d --- /dev/null +++ b/pkgs/development/python-modules/touying/default.nix @@ -0,0 +1,55 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + jinja2, + pillow, + python-pptx, + typst, +}: + +buildPythonPackage rec { + pname = "touying"; + version = "0.13.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "touying-typ"; + repo = "touying-exporter"; + tag = version; + hash = "sha256-gcr3KS2Qm8CMA+8AeC0hbGi9Gjj5sMr6gJkuoZWUEGY="; + }; + + build-system = [ + setuptools + ]; + + pythonRemoveDeps = [ + "argparse" + ]; + dependencies = [ + jinja2 + pillow + python-pptx + typst + ]; + + pythonImportsCheck = [ "touying" ]; + + # no tests + doCheck = false; + + meta = { + description = "Export presentation slides in various formats for Touying"; + changelog = "https://github.com/touying-typ/touying-exporter/releases/tag/${version}"; + homepage = "https://github.com/touying-typ/touying-exporter"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + mainProgram = "touying"; + }; +} diff --git a/pkgs/development/rocq-modules/hierarchy-builder/default.nix b/pkgs/development/rocq-modules/hierarchy-builder/default.nix index bb9efa9727cc..07868dd4656b 100644 --- a/pkgs/development/rocq-modules/hierarchy-builder/default.nix +++ b/pkgs/development/rocq-modules/hierarchy-builder/default.nix @@ -17,7 +17,7 @@ let in with lib.versions; lib.switch rocq-core.rocq-version [ - (case (range "9.0" "9.0") "1.9.1") + (case (range "9.0" "9.1") "1.9.1") ] null; release."1.9.1".sha256 = "sha256-AiS0ezMyfIYlXnuNsVLz1GlKQZzJX+ilkrKkbo0GrF0="; releaseRev = v: "v${v}"; diff --git a/pkgs/development/rocq-modules/rocq-elpi/default.nix b/pkgs/development/rocq-modules/rocq-elpi/default.nix index ea6ce3f6595e..a8e27e5e1f60 100644 --- a/pkgs/development/rocq-modules/rocq-elpi/default.nix +++ b/pkgs/development/rocq-modules/rocq-elpi/default.nix @@ -15,8 +15,9 @@ let let case = case: out: { inherit case out; }; in + with lib.versions; lib.switch rocq-core.rocq-version [ - (case ("9.0") "2.0.7") + (case (range "9.0" "9.1") "2.0.7") ] { }; elpi = rocq-core.ocamlPackages.elpi.override { version = default-elpi-version; }; propagatedBuildInputs_wo_elpi = [ @@ -32,9 +33,12 @@ let let case = case: out: { inherit case out; }; in + with lib.versions; lib.switch rocq-core.rocq-version [ + (case (range "9.0" "9.1") "2.6.0") (case ("9.0") "2.5.2") ] null; + release."2.6.0".sha256 = "sha256-23BHq1NFUkI3ayXnGUwiGFySLyY3EuH4RyMgAhQqI4g="; release."2.5.2".sha256 = "sha256-lLzjPrbVB3rrqox528YiheUb0u89R84Xmrgkn0oplOs="; releaseRev = v: "v${v}"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 08cb87d71ec5..7f4f9de12a4d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18054,6 +18054,8 @@ self: super: with self; { total-connect-client = callPackage ../development/python-modules/total-connect-client { }; + touying = callPackage ../development/python-modules/touying { }; + towncrier = callPackage ../development/python-modules/towncrier { inherit (pkgs) git; }; tox = callPackage ../development/python-modules/tox { };