diff options
Diffstat (limited to 'pkgs/development')
117 files changed, 516 insertions, 324 deletions
diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 3205f5b22dcda..06ce12d642e3a 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -1,6 +1,5 @@ { stdenv , lib -, abc-verifier , bash , bison , boost @@ -77,13 +76,27 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "yosys"; - version = "0.38"; + version = "0.42"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; rev = "refs/tags/${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-mzMBhnIEgToez6mGFOvO7zBA+rNivZ9OnLQsjBBDamA="; + hash = "sha256-P0peg81wxCG0Bw2EJEX5WuDYU7GmRqgRw2SyWK/CGNI="; + fetchSubmodules = true; + leaveDotGit = true; + postFetch = '' + # set up git hashes as if we used the tarball + + pushd $out + git rev-parse HEAD > .gitcommit + cd $out/abc + git rev-parse HEAD > .gitcommit + popd + + # remove .git now that we are through with it + find "$out" -name .git -print0 | xargs -0 rm -rf + ''; }; enableParallelBuilding = true; @@ -109,25 +122,13 @@ in stdenv.mkDerivation (finalAttrs: { substituteInPlace ./Makefile \ --replace-fail 'echo UNKNOWN' 'echo ${builtins.substring 0 10 finalAttrs.src.rev}' - # https://github.com/YosysHQ/yosys/pull/4199 - substituteInPlace ./tests/various/clk2fflogic_effects.sh \ - --replace-fail 'tail +3' 'tail -n +3' - chmod +x ./misc/yosys-config.in patchShebangs tests ./misc/yosys-config.in ''; - preBuild = let - shortAbcRev = builtins.substring 0 7 abc-verifier.rev; - in '' + preBuild = '' chmod -R u+w . make config-${if stdenv.cc.isClang or false then "clang" else "gcc"} - echo 'ABCEXTERNAL = ${abc-verifier}/bin/abc' >> Makefile.conf - - if ! grep -q "ABCREV = ${shortAbcRev}" Makefile; then - echo "ERROR: yosys isn't compatible with the provided abc (${shortAbcRev}), failing." - exit 1 - fi if ! grep -q "YOSYS_VER := $version" Makefile; then echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (allegedly ${finalAttrs.version}), failing." @@ -150,16 +151,6 @@ in stdenv.mkDerivation (finalAttrs: { doCheck = true; nativeCheckInputs = [ verilog ]; - # Internally, yosys knows to use the specified hardcoded ABCEXTERNAL binary. - # But other tools (like mcy or symbiyosys) can't know how yosys was built, so - # they just assume that 'yosys-abc' is available -- but it's not installed - # when using ABCEXTERNAL - # - # add a symlink to fake things so that both variants work the same way. this - # is also needed at build time for the test suite. - postBuild = "ln -sfv ${abc-verifier}/bin/abc ./yosys-abc"; - postInstall = "ln -sfv ${abc-verifier}/bin/abc $out/bin/yosys-abc"; - setupHook = ./setup-hook.sh; passthru = { diff --git a/pkgs/development/compilers/yosys/fix-clang-build.patch b/pkgs/development/compilers/yosys/fix-clang-build.patch index 843ffd6d65af5..7f93594d0c1d7 100644 --- a/pkgs/development/compilers/yosys/fix-clang-build.patch +++ b/pkgs/development/compilers/yosys/fix-clang-build.patch @@ -1,14 +1,3 @@ ---- a/Makefile -+++ b/Makefile -@@ -215,7 +215,7 @@ ABC_ARCHFLAGS += "-DABC_NO_RLIMIT" - endif - - ifeq ($(CONFIG),clang) --CXX = clang -+CXX = clang++ - LD = clang++ - CXXFLAGS += -std=$(CXXSTD) -Os - ABCMKARGS += ARCHFLAGS="-DABC_USE_STDINT_H -Wno-c++11-narrowing $(ABC_ARCHFLAGS)" --- a/tests/cxxrtl/run-test.sh +++ b/tests/cxxrtl/run-test.sh @@ -5,7 +5,7 @@ set -ex diff --git a/pkgs/development/coq-modules/Cheerios/default.nix b/pkgs/development/coq-modules/Cheerios/default.nix index 49134a9f31f4b..ae8baba36c069 100644 --- a/pkgs/development/coq-modules/Cheerios/default.nix +++ b/pkgs/development/coq-modules/Cheerios/default.nix @@ -5,7 +5,7 @@ mkCoqDerivation { owner = "uwplse"; inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.14" "8.19"; out = "20230107"; } + { case = range "8.14" "8.20"; out = "20230107"; } { case = range "8.6" "8.16"; out = "20200201"; } ] null; release."20230107".rev = "bad8ad2476e14df6b5a819b7aaddc27a7c53fb69"; diff --git a/pkgs/development/coq-modules/CoLoR/default.nix b/pkgs/development/coq-modules/CoLoR/default.nix index 6e59dda15a6a4..779900d22671a 100644 --- a/pkgs/development/coq-modules/CoLoR/default.nix +++ b/pkgs/development/coq-modules/CoLoR/default.nix @@ -5,7 +5,7 @@ mkCoqDerivation { owner = "fblanqui"; inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - {case = range "8.14" "8.19"; out = "1.8.5"; } + {case = range "8.14" "8.20"; 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"; } diff --git a/pkgs/development/coq-modules/ITree/default.nix b/pkgs/development/coq-modules/ITree/default.nix index 3eaa6eec67a49..dc768e2db460c 100644 --- a/pkgs/development/coq-modules/ITree/default.nix +++ b/pkgs/development/coq-modules/ITree/default.nix @@ -5,7 +5,7 @@ mkCoqDerivation rec { owner = "DeepSpec"; inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.13" "8.19"; out = "5.1.2"; } + { case = range "8.13" "8.20"; out = "5.1.2"; } { case = range "8.10" "8.16"; out = "4.0.0"; } ] null; release."5.1.2".sha256 = "sha256-uKJIjNXGWl0YS0WH52Rnr9Jz98Eo2k0X0qWB9hUYJMk="; diff --git a/pkgs/development/coq-modules/InfSeqExt/default.nix b/pkgs/development/coq-modules/InfSeqExt/default.nix index a6f3a8b6aaa66..cae401d8fdbf3 100644 --- a/pkgs/development/coq-modules/InfSeqExt/default.nix +++ b/pkgs/development/coq-modules/InfSeqExt/default.nix @@ -5,7 +5,7 @@ mkCoqDerivation { owner = "DistributedComponents"; inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.9" "8.19"; out = "20230107"; } + { case = range "8.9" "8.20"; out = "20230107"; } { case = range "8.5" "8.16"; out = "20200131"; } ] null; release."20230107".rev = "601e89ec019501c48c27fcfc14b9a3c70456e408"; diff --git a/pkgs/development/coq-modules/LibHyps/default.nix b/pkgs/development/coq-modules/LibHyps/default.nix index 4a5c2df5104e6..63b4acdb86dbf 100644 --- a/pkgs/development/coq-modules/LibHyps/default.nix +++ b/pkgs/development/coq-modules/LibHyps/default.nix @@ -4,7 +4,7 @@ mkCoqDerivation { pname = "LibHyps"; owner = "Matafou"; inherit version; - defaultVersion = if (lib.versions.range "8.11" "8.19") coq.version then "2.0.8" else null; + defaultVersion = if (lib.versions.range "8.11" "8.20") coq.version then "2.0.8" else null; release = { "2.0.8".sha256 = "sha256-u8T7ZWfgYNFBsIPss0uUS0oBvdlwPp3t5yYIMjYzfLc="; }; diff --git a/pkgs/development/coq-modules/StructTact/default.nix b/pkgs/development/coq-modules/StructTact/default.nix index 447de89e806da..117f26cc6d88f 100644 --- a/pkgs/development/coq-modules/StructTact/default.nix +++ b/pkgs/development/coq-modules/StructTact/default.nix @@ -5,7 +5,7 @@ mkCoqDerivation { owner = "uwplse"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.9" "8.19"; out = "20230107"; } + { case = range "8.9" "8.20"; out = "20230107"; } { case = range "8.6" "8.16"; out = "20210328"; } { case = range "8.5" "8.13"; out = "20181102"; } ] null; diff --git a/pkgs/development/coq-modules/aac-tactics/default.nix b/pkgs/development/coq-modules/aac-tactics/default.nix index 59a9c9ba11642..1dd396a826848 100644 --- a/pkgs/development/coq-modules/aac-tactics/default.nix +++ b/pkgs/development/coq-modules/aac-tactics/default.nix @@ -5,6 +5,7 @@ mkCoqDerivation { releaseRev = v: "v${v}"; + release."8.20.0".sha256 = "sha256-VQzeINIZAfP3Qyh29uPqcNVlNJfIzzRLtN0Cm4EuGCk="; release."8.19.1".sha256 = "sha256-W/V57h+rjb3m0ktCG83PquMHfXiv6H1Nhvw9sVEPLqM="; release."8.19.0".sha256 = "sha256-IeCBd8gcu4bAXH5I/XIT7neQIILi+EWR6qqAA4GzQD0="; release."8.18.0".sha256 = "sha256-Vpe79qCyFLOdOtFFvLKR0N+MMpGD661Q01yx4gxRhZo="; @@ -25,6 +26,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = "8.20"; out = "8.20.0"; } { case = "8.19"; out = "8.19.1"; } { case = "8.18"; out = "8.18.0"; } { case = "8.17"; out = "8.17.0"; } diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix index 8ee47ec85f533..3ff2f16700b7a 100644 --- a/pkgs/development/coq-modules/bignums/default.nix +++ b/pkgs/development/coq-modules/bignums/default.nix @@ -5,10 +5,11 @@ mkCoqDerivation { owner = "coq"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.13" "8.19"; out = "9.0.0+coq${coq.coq-version}"; } + { case = range "8.13" "8.20"; out = "9.0.0+coq${coq.coq-version}"; } { case = range "8.6" "8.17"; out = "${coq.coq-version}.0"; } ] null; + release."9.0.0+coq8.20".sha256 = "sha256-pkvyDaMXRalc6Uu1eBTuiqTpRauRrzu946c6TavyTKY="; release."9.0.0+coq8.19".sha256 = "sha256-02uL+qWbUveHe67zKfc8w3U0iN3X2DKBsvP3pKpW8KQ="; release."9.0.0+coq8.18".sha256 = "sha256-vLeJ0GNKl4M84Uj2tAwlrxJOSR6VZoJQvdlDhxJRge8="; release."9.0.0+coq8.17".sha256 = "sha256-Mn85LqxJKPDIfpxRef9Uh5POwOKlTQ7jsMVz1wnQwuY="; diff --git a/pkgs/development/coq-modules/ceres/default.nix b/pkgs/development/coq-modules/ceres/default.nix index 410b43ee10b09..2bff5224573c4 100644 --- a/pkgs/development/coq-modules/ceres/default.nix +++ b/pkgs/development/coq-modules/ceres/default.nix @@ -8,7 +8,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.14" "8.19"; out = "0.4.1"; } + { case = range "8.14" "8.20"; out = "0.4.1"; } { case = range "8.8" "8.16"; out = "0.4.0"; } ] null; release."0.4.1".sha256 = "sha256-9vyk8/8IVsqNyhw3WPzl8w3L9Wu7gfaMVa3n2nWjFiA="; diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix index f4459ef29b784..4ec805e8f028f 100644 --- a/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -5,6 +5,7 @@ mkCoqDerivation rec { owner = "coq-ext-lib"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.14" "8.20"; out = "0.12.1"; } { 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"; } @@ -13,6 +14,7 @@ mkCoqDerivation rec { { case = "8.6"; out = "0.9.5"; } { case = "8.5"; out = "0.9.4"; } ] null; + release."0.12.1".sha256 = "sha256-YIHyiRUHPy/LGM2DMTRKRwP7j6OSBYKpu6wO2mZOubo="; release."0.12.0".sha256 = "sha256-9szpnWoS83bDc+iLqElfgz0LNRo9hSRQwUFIgpTca4c="; release."0.11.8".sha256 = "sha256-uUBKJb7XjRnyb7rCisZrDcaDdsp1Bv1lXDIU3Ce8e5k="; release."0.11.7".sha256 = "sha256-HkxUny0mxDDT4VouBBh8btwxGZgsb459kBufTLLnuEY="; diff --git a/pkgs/development/coq-modules/coq-record-update/default.nix b/pkgs/development/coq-modules/coq-record-update/default.nix index b9a295617b8c2..c189168f76e9a 100644 --- a/pkgs/development/coq-modules/coq-record-update/default.nix +++ b/pkgs/development/coq-modules/coq-record-update/default.nix @@ -5,7 +5,7 @@ owner = "tchajed"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.10" "8.19"; out = "0.3.4"; } + { case = range "8.10" "8.20"; out = "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/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix index 1bd886941ec60..f9a4d6e7956df 100644 --- a/pkgs/development/coq-modules/coqprime/default.nix +++ b/pkgs/development/coq-modules/coqprime/default.nix @@ -6,7 +6,7 @@ mkCoqDerivation { owner = "thery"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.14" "8.19"; out = "8.18"; } + { case = range "8.14" "8.20"; out = "8.18"; } { case = range "8.12" "8.16"; out = "8.15"; } { case = range "8.10" "8.11"; out = "8.10"; } { case = range "8.8" "8.9"; out = "8.8"; } diff --git a/pkgs/development/coq-modules/corn/default.nix b/pkgs/development/coq-modules/corn/default.nix index aee2f35d9e183..d1c54da398926 100644 --- a/pkgs/development/coq-modules/corn/default.nix +++ b/pkgs/development/coq-modules/corn/default.nix @@ -4,7 +4,7 @@ mkCoqDerivation rec { pname = "corn"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = (range "8.17" "8.19"); out = "8.19.0"; } + { case = (range "8.17" "8.20"); out = "8.19.0"; } { case = (range "8.14" "8.18"); out = "8.18.0"; } { case = (range "8.11" "8.17"); out = "8.16.0"; } { case = (range "8.7" "8.15"); out = "8.13.0"; } diff --git a/pkgs/development/coq-modules/deriving/default.nix b/pkgs/development/coq-modules/deriving/default.nix index 704b4f8123b03..23e74f825cb2a 100644 --- a/pkgs/development/coq-modules/deriving/default.nix +++ b/pkgs/development/coq-modules/deriving/default.nix @@ -9,7 +9,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch [coq.coq-version ssreflect.version] [ { cases = [(range "8.17" "8.19") (isGe "2.0.0")] ; out = "0.2.0"; } - { cases = [(range "8.11" "8.19") (isLe "2.0.0")] ; out = "0.1.1"; } + { cases = [(range "8.11" "8.20") (isLe "2.0.0")] ; out = "0.1.1"; } ] null; releaseRev = v: "v${v}"; diff --git a/pkgs/development/coq-modules/extructures/default.nix b/pkgs/development/coq-modules/extructures/default.nix index 3cd742fdd3377..57e7caa038333 100644 --- a/pkgs/development/coq-modules/extructures/default.nix +++ b/pkgs/development/coq-modules/extructures/default.nix @@ -10,7 +10,7 @@ inherit version; defaultVersion = with lib.versions; lib.switch [coq.coq-version ssreflect.version] [ { cases = [(range "8.17" "8.19") (isGe "2.0.0") ]; out = "0.4.0"; } - { cases = [(range "8.11" "8.19") (range "1.12.0" "1.19.0") ]; out = "0.3.1"; } + { cases = [(range "8.11" "8.20") (range "1.12.0" "1.19.0") ]; out = "0.3.1"; } { cases = [(range "8.11" "8.14") (isLe "1.12.0") ]; out = "0.3.0"; } { cases = [(range "8.10" "8.12") (isLe "1.12.0") ]; out = "0.2.2"; } ] null; diff --git a/pkgs/development/coq-modules/math-classes/default.nix b/pkgs/development/coq-modules/math-classes/default.nix index 102e52e59e167..5466147f01de8 100644 --- a/pkgs/development/coq-modules/math-classes/default.nix +++ b/pkgs/development/coq-modules/math-classes/default.nix @@ -5,7 +5,7 @@ mkCoqDerivation { pname = "math-classes"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.17" "8.19"; out = "8.19.0"; } + { case = range "8.17" "8.20"; out = "8.19.0"; } { case = range "8.12" "8.18"; out = "8.18.0"; } { case = range "8.12" "8.17"; out = "8.17.0"; } { case = range "8.6" "8.16"; out = "8.15.0"; } diff --git a/pkgs/development/coq-modules/mathcomp-bigenough/default.nix b/pkgs/development/coq-modules/mathcomp-bigenough/default.nix index 35f8748f63c0b..25b4a5a2d010a 100644 --- a/pkgs/development/coq-modules/mathcomp-bigenough/default.nix +++ b/pkgs/development/coq-modules/mathcomp-bigenough/default.nix @@ -12,7 +12,7 @@ mkCoqDerivation { }; inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.10" "8.19"; out = "1.0.1"; } + { case = range "8.10" "8.20"; out = "1.0.1"; } { case = range "8.5" "8.14"; out = "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 7120d9558566f..d910cfa8d0554 100644 --- a/pkgs/development/coq-modules/mathcomp-finmap/default.nix +++ b/pkgs/development/coq-modules/mathcomp-finmap/default.nix @@ -9,7 +9,7 @@ mkCoqDerivation { defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (range "8.16" "8.19") (isGe "2.0") ]; out = "2.1.0"; } { cases = [ (range "8.16" "8.18") (range "2.0" "2.1") ]; out = "2.0.0"; } - { cases = [ (range "8.13" "8.19") (range "1.12" "1.19") ]; out = "1.5.2"; } + { cases = [ (range "8.13" "8.20") (range "1.12" "1.19") ]; out = "1.5.2"; } { cases = [ (isGe "8.10") (range "1.11" "1.17") ]; out = "1.5.1"; } { cases = [ (range "8.7" "8.11") "1.11.0" ]; out = "1.5.0"; } { cases = [ (isEq "8.11") (range "1.8" "1.10") ]; out = "1.4.0+coq-8.11"; } diff --git a/pkgs/development/coq-modules/mathcomp-real-closed/default.nix b/pkgs/development/coq-modules/mathcomp-real-closed/default.nix index 28ff7a56786f2..ccac363bf2b2e 100644 --- a/pkgs/development/coq-modules/mathcomp-real-closed/default.nix +++ b/pkgs/development/coq-modules/mathcomp-real-closed/default.nix @@ -21,7 +21,7 @@ mkCoqDerivation { defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (isGe "8.16") (isGe "2.0.0") ]; out = "2.0.0"; } - { cases = [ (isGe "8.13") (range "1.13.0" "1.19.0") ]; out = "1.1.4"; } + { 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"; } diff --git a/pkgs/development/coq-modules/mathcomp-word/default.nix b/pkgs/development/coq-modules/mathcomp-word/default.nix index 98fdefa6d1176..d6a91944053e5 100644 --- a/pkgs/development/coq-modules/mathcomp-word/default.nix +++ b/pkgs/development/coq-modules/mathcomp-word/default.nix @@ -30,7 +30,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (range "8.16" "8.19") (isGe "2.0") ]; out = "3.2"; } - { cases = [ (range "8.12" "8.19") (range "1.12" "1.19") ]; out = "2.4"; } + { cases = [ (range "8.12" "8.20") (range "1.12" "1.19") ]; out = "2.4"; } ] null; propagatedBuildInputs = [ mathcomp.algebra mathcomp.ssreflect mathcomp.fingroup ]; diff --git a/pkgs/development/coq-modules/mathcomp-zify/default.nix b/pkgs/development/coq-modules/mathcomp-zify/default.nix index 8b9b8d6661063..b65d54bc3360a 100644 --- a/pkgs/development/coq-modules/mathcomp-zify/default.nix +++ b/pkgs/development/coq-modules/mathcomp-zify/default.nix @@ -10,7 +10,7 @@ mkCoqDerivation rec { defaultVersion = with lib.versions; lib.switch [ coq.coq-version mathcomp-algebra.version ] [ { cases = [ (range "8.16" "8.19") (isGe "2.0.0") ]; out = "1.5.0+2.0+8.16"; } - { cases = [ (range "8.13" "8.19") (range "1.12" "1.19.0") ]; out = "1.3.0+1.12+8.13"; } + { cases = [ (range "8.13" "8.20") (range "1.12" "1.19.0") ]; out = "1.3.0+1.12+8.13"; } { cases = [ (range "8.13" "8.16") (range "1.12" "1.17.0") ]; out = "1.1.0+1.12+8.13"; } ] null; diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 7f132768ff88b..242841b8fa17f 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -20,7 +20,7 @@ let withDoc = single && (args.withDoc or false); defaultVersion = let inherit (lib.versions) range; in lib.switch coq.coq-version [ - { case = range "8.19" "8.19"; out = "1.19.0"; } + { case = range "8.19" "8.20"; out = "1.19.0"; } { case = range "8.17" "8.18"; out = "1.18.0"; } { case = range "8.15" "8.18"; out = "1.17.0"; } { case = range "8.16" "8.19"; out = "2.2.0"; } diff --git a/pkgs/development/coq-modules/paco/default.nix b/pkgs/development/coq-modules/paco/default.nix index afbcc6669bdb3..80432fa1494ca 100644 --- a/pkgs/development/coq-modules/paco/default.nix +++ b/pkgs/development/coq-modules/paco/default.nix @@ -5,7 +5,7 @@ mkCoqDerivation { owner = "snu-sf"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.13" "8.19"; out = "4.2.0"; } + { case = range "8.13" "8.20"; out = "4.2.0"; } { 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"; } diff --git a/pkgs/development/coq-modules/paramcoq/default.nix b/pkgs/development/coq-modules/paramcoq/default.nix index a17e19acae871..f8749c8979506 100644 --- a/pkgs/development/coq-modules/paramcoq/default.nix +++ b/pkgs/development/coq-modules/paramcoq/default.nix @@ -4,10 +4,11 @@ mkCoqDerivation { pname = "paramcoq"; inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.10" "8.19"; out = "1.1.3+coq${coq.coq-version}"; } + { case = range "8.10" "8.20"; out = "1.1.3+coq${coq.coq-version}"; } { case = range "8.7" "8.13"; out = "1.1.2+coq${coq.coq-version}"; } ] null; displayVersion = { paramcoq = "..."; }; + release."1.1.3+coq8.20".sha256 = "sha256-34xDOz/2xO39fnQW6Zb9CI2EKFuJZjrAdOpMEmwuzY0="; release."1.1.3+coq8.19".sha256 = "sha256-5NVsdLXaoz6qrr5ra5YfoHeuK4pEf8JX/X9+SZA0U+U="; release."1.1.3+coq8.18".sha256 = "sha256-hNBaj9hB+OzwXsOX+TOXtDLjA5oP4EmEgseLwxFxW+I="; release."1.1.3+coq8.17".sha256 = "sha256-m8QGGuwj1lHzDprf4LHgAuzwfoblxtDIHunHBdpmiuM="; diff --git a/pkgs/development/coq-modules/parsec/default.nix b/pkgs/development/coq-modules/parsec/default.nix index 764c65ee3e6b3..9b5d827eecd51 100644 --- a/pkgs/development/coq-modules/parsec/default.nix +++ b/pkgs/development/coq-modules/parsec/default.nix @@ -11,7 +11,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.14" "8.19"; out = "0.1.2"; } + { 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"; } ] null; diff --git a/pkgs/development/coq-modules/reglang/default.nix b/pkgs/development/coq-modules/reglang/default.nix index 325b909d45e47..51d9590490f0c 100644 --- a/pkgs/development/coq-modules/reglang/default.nix +++ b/pkgs/development/coq-modules/reglang/default.nix @@ -14,7 +14,7 @@ mkCoqDerivation { defaultVersion = with lib.versions; lib.switch [ coq.coq-version mathcomp.version ] [ { cases = [ (range "8.16" "8.19") (isGe "2.0.0") ]; out = "1.2.1"; } { cases = [ (range "8.16" "8.18") (range "2.0.0" "2.1.0") ]; out = "1.2.0"; } - { cases = [ (range "8.10" "8.19") (isLt "2.0.0") ]; out = "1.1.3"; } + { cases = [ (range "8.10" "8.20") (isLt "2.0.0") ]; out = "1.1.3"; } ] null; diff --git a/pkgs/development/coq-modules/zorns-lemma/default.nix b/pkgs/development/coq-modules/zorns-lemma/default.nix index edd28fd3b05f2..438f4f9fa933b 100644 --- a/pkgs/development/coq-modules/zorns-lemma/default.nix +++ b/pkgs/development/coq-modules/zorns-lemma/default.nix @@ -18,7 +18,7 @@ inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.12" "8.19"; out = "10.2.0"; } + { case = range "8.12" "8.20"; out = "10.2.0"; } { case = range "8.10" "8.16"; out = "9.0.0"; } { case = "8.9"; out = "8.9.0"; } { case = "8.8"; out = "8.8.0"; } diff --git a/pkgs/development/interpreters/lune/default.nix b/pkgs/development/interpreters/lune/default.nix index d919e5c848990..5403a2573c33e 100644 --- a/pkgs/development/interpreters/lune/default.nix +++ b/pkgs/development/interpreters/lune/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , pkg-config , darwin +, cmake }: let @@ -11,20 +12,21 @@ let in rustPlatform.buildRustPackage rec { pname = "lune"; - version = "0.8.0"; + version = "0.8.6"; src = fetchFromGitHub { owner = "filiptibell"; repo = "lune"; rev = "v${version}"; - hash = "sha256-ZVETw+GdkrR2V8RrHAWBR+avAuN0158DlJkYBquju8E="; + hash = "sha256-03ckR2FpSlaAZlhjyX3ob+7W5Pq8OLri7jT+XIM7oeQ="; fetchSubmodules = true; }; - cargoHash = "sha256-zOjDT8Sn/p3YaG+dWyYxSWUOo11p9/WG3EyNagZRtQQ="; + cargoHash = "sha256-xEUq3Cc15bUAXpUoZw8tNQo6tW3/VXeuOtjIW4zrh1Q="; nativeBuildInputs = [ pkg-config + cmake # required for libz-ng-sys ]; buildInputs = lib.optionals stdenv.isDarwin [ @@ -39,6 +41,7 @@ rustPlatform.buildRustPackage rec { checkFlags = [ # require internet access + "--skip=tests::net_socket_basic" "--skip=tests::net_request_codes" "--skip=tests::net_request_compression" "--skip=tests::net_request_methods" diff --git a/pkgs/development/libraries/alglib/default.nix b/pkgs/development/libraries/alglib/default.nix index b2e13cdc06651..1bd2ad6fe3e1b 100644 --- a/pkgs/development/libraries/alglib/default.nix +++ b/pkgs/development/libraries/alglib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "alglib3"; - version = "4.01.0"; + version = "4.02.0"; src = fetchurl { url = "https://www.alglib.net/translator/re/alglib-${version}.cpp.gpl.tgz"; - sha256 = "sha256-lejqQbMskjRvSaaUdZ54bF86EIe0AaklnvWSwO6kvvs="; + sha256 = "sha256-U7/ukBXdwC8GkpevFfSfbgbiyOf7CkDv0PUAL8BnAag="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/blaze/default.nix b/pkgs/development/libraries/blaze/default.nix index ad68b6df4d595..70d7cdff13b40 100644 --- a/pkgs/development/libraries/blaze/default.nix +++ b/pkgs/development/libraries/blaze/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://bitbucket.org/blaze-lib/blaze"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ Madouura ]; - platforms = platforms.linux; + platforms = platforms.unix; }; }) diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix index 816139a1693d0..4cf38eda39ca6 100644 --- a/pkgs/development/libraries/quarto/default.nix +++ b/pkgs/development/libraries/quarto/default.nix @@ -19,10 +19,10 @@ stdenv.mkDerivation (final: { pname = "quarto"; - version = "1.4.555"; + version = "1.4.557"; src = fetchurl { url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${final.version}/quarto-${final.version}-linux-amd64.tar.gz"; - sha256 = "sha256-uBKKgRsM7kUDeF0kMYbo6RjmiU6wq4EEcE94qqMSzt8="; + sha256 = "sha256-RcEkmPMcfNGDmu2bQwUHvlHgM/ySQQwDgf/NpTQMxcI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 335e8b2431cef..0e9011778d2de 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -125,8 +125,8 @@ rec { }; wlroots_0_17 = generic { - version = "0.17.3"; - hash = "sha256-jth6BKci3sVDC86o+gSHKyDWnibVcNmipm7nn0S6LTg="; + version = "0.17.4"; + hash = "sha256-AzmXf+HMX/6VAr0LpfHwfmDB9dRrrLQHt7l35K98MVo="; extraNativeBuildInputs = [ hwdata ]; diff --git a/pkgs/development/ocaml-modules/reason-native/cli.nix b/pkgs/development/ocaml-modules/reason-native/cli.nix index ee5e7d2774d22..c6c5abfb7f9a3 100644 --- a/pkgs/development/ocaml-modules/reason-native/cli.nix +++ b/pkgs/development/ocaml-modules/reason-native/cli.nix @@ -1,7 +1,10 @@ -{ re, reason, pastel, ... }: +{ lib, buildDunePackage, re, reason, pastel, src }: + +buildDunePackage { + inherit src; -{ pname = "cli"; + version = "0.0.1-alpha-unstable-2024-05-07"; nativeBuildInputs = [ reason @@ -11,4 +14,11 @@ re pastel ]; + + meta = { + downloadPage = "https://github.com/reasonml/reason-native"; + homepage = "https://reason-native.com/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; } diff --git a/pkgs/development/ocaml-modules/reason-native/console.nix b/pkgs/development/ocaml-modules/reason-native/console.nix index a39ba9a7e3ec3..38d95a0c0f396 100644 --- a/pkgs/development/ocaml-modules/reason-native/console.nix +++ b/pkgs/development/ocaml-modules/reason-native/console.nix @@ -1,21 +1,24 @@ -{ buildDunePackage, callPackage, reason, console, ... }: +{ lib, buildDunePackage, callPackage, reason, console, src }: + +buildDunePackage { + inherit src; -{ pname = "console"; + version = "0.1.0-unstable-2024-05-07"; nativeBuildInputs = [ reason ]; passthru.tests = { - console = callPackage ./tests/console { - inherit buildDunePackage reason console; - }; + console = callPackage ./tests/console { }; }; meta = { description = "Library providing a web-influenced polymorphic console API for native Console.log(anything) with runtime printing"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/console"; homepage = "https://reason-native.com/docs/console/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/default.nix b/pkgs/development/ocaml-modules/reason-native/default.nix index 024783cf61845..b44e63080e5c5 100644 --- a/pkgs/development/ocaml-modules/reason-native/default.nix +++ b/pkgs/development/ocaml-modules/reason-native/default.nix @@ -1,43 +1,47 @@ -{ newScope, lib, fetchFromGitHub, callPackage, buildDunePackage, atdgen, junit, qcheck-core, re, reason, reason-native, fetchpatch }: +{ + lib, + newScope, + fetchFromGitHub, + atdgen, + buildDunePackage, + junit, + ppxlib, + qcheck-core, + re, + reason, +}: -let - generic = (somePath: - let - prepkg = import somePath { - inherit callPackage cli buildDunePackage atdgen junit qcheck-core re reason fetchpatch; - inherit (reason-native) console file-context-printer fp pastel rely; - }; - in - buildDunePackage - ({ - version = "2022-08-31-a0ddab6"; - src = fetchFromGitHub { - owner = "reasonml"; - repo = "reason-native"; - rev = "a0ddab6ab25237961e32d8732b0a222ec2372d4a"; - hash = "sha256-s2N5OFTwIbKXcv05gQRaBMCHO1Mj563yhryPeo8jMh8="; - }; - duneVersion = "3"; - meta = with lib; { - description = "Libraries for building and testing native Reason programs"; - downloadPage = "https://github.com/reasonml/reason-native"; - homepage = "https://reason-native.com/"; - license = licenses.mit; - maintainers = with maintainers; [ ]; - } // (prepkg.meta or {}); - } // prepkg) - ); - cli = generic ./cli.nix; # Used only by Rely. -in - lib.makeScope newScope (self: with self; { - console = generic ./console.nix; - dir = generic ./dir.nix; - file-context-printer = generic ./file-context-printer.nix; - fp = generic ./fp.nix; - pastel = generic ./pastel.nix; - pastel-console = generic ./pastel-console.nix; - qcheck-rely = generic ./qcheck-rely.nix; - refmterr = generic ./refmterr.nix; - rely = generic ./rely.nix; - rely-junit-reporter = generic ./rely-junit-reporter.nix; - }) +lib.makeScope newScope (self: { + inherit lib buildDunePackage re reason ppxlib; + + # Upstream doesn't use tags, releases, or branches. + src = fetchFromGitHub { + owner = "reasonml"; + repo = "reason-native"; + rev = "20b1997b6451d9715dfdbeec86a9d274c7430ed8"; + hash = "sha256-96Ucq70eSy6pqh5ne9xoODWe/nPuriZnFAdx0OkLVCs="; + }; + + cli = self.callPackage ./cli.nix { }; + console = self.callPackage ./console.nix { }; + dir = self.callPackage ./dir.nix { }; + file-context-printer = self.callPackage ./file-context-printer.nix { }; + frame = self.callPackage ./frame.nix { }; + fp = self.callPackage ./fp.nix { }; + fs = self.callPackage ./fs.nix { }; + pastel = self.callPackage ./pastel.nix { }; + pastel-console = self.callPackage ./pastel-console.nix { }; + qcheck-rely = self.callPackage ./qcheck-rely.nix { + inherit qcheck-core; + }; + refmterr = self.callPackage ./refmterr.nix { + inherit atdgen; + }; + rely = self.callPackage ./rely.nix { }; + rely-junit-reporter = self.callPackage ./rely-junit-reporter.nix { + inherit atdgen junit; + }; + unicode-config = self.callPackage ./unicode-config.nix { }; + unicode = self.callPackage ./unicode.nix { }; + utf8 = self.callPackage ./utf8.nix { }; +}) diff --git a/pkgs/development/ocaml-modules/reason-native/dir.nix b/pkgs/development/ocaml-modules/reason-native/dir.nix index 8b09eafc36965..6cd04ece01f6b 100644 --- a/pkgs/development/ocaml-modules/reason-native/dir.nix +++ b/pkgs/development/ocaml-modules/reason-native/dir.nix @@ -1,7 +1,10 @@ -{ reason, fp, ... }: +{ lib, buildDunePackage, reason, fp, src }: + +buildDunePackage { + inherit src; -{ pname = "dir"; + version = "0.0.1-unstable-2024-05-07"; nativeBuildInputs = [ reason @@ -14,5 +17,7 @@ meta = { description = "Library that provides a consistent API for common system, user and application directories consistently on all platforms"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/dir"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix b/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix index a7c663493ef55..462b667921c1b 100644 --- a/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix +++ b/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix @@ -1,7 +1,10 @@ -{ reason, re, pastel, ... }: +{ lib, buildDunePackage, reason, re, pastel, src }: + +buildDunePackage { + inherit src; -{ pname = "file-context-printer"; + version = "0.0.3-unstable-2024-05-07"; nativeBuildInputs = [ reason @@ -16,5 +19,7 @@ description = "Utility for displaying snippets of files on the command line"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/file-context-printer"; homepage = "https://reason-native.com/docs/file-context-printer/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/fp.nix b/pkgs/development/ocaml-modules/reason-native/fp.nix index 7df1c84e55cf9..35a099771dc64 100644 --- a/pkgs/development/ocaml-modules/reason-native/fp.nix +++ b/pkgs/development/ocaml-modules/reason-native/fp.nix @@ -1,7 +1,10 @@ -{ reason, ... }: +{ lib, buildDunePackage, reason, src }: + +buildDunePackage { + inherit src; -{ pname = "fp"; + version = "0.0.1-unstable-2024-05-07"; nativeBuildInputs = [ reason @@ -10,5 +13,7 @@ meta = { description = "Library for creating and operating on file paths consistently on multiple platforms"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/fp"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/frame.nix b/pkgs/development/ocaml-modules/reason-native/frame.nix new file mode 100644 index 0000000000000..dc845db552498 --- /dev/null +++ b/pkgs/development/ocaml-modules/reason-native/frame.nix @@ -0,0 +1,24 @@ +{ lib, buildDunePackage, reason, re, pastel, src }: + +buildDunePackage { + inherit src; + + pname = "frame"; + version = "0.0.1-unstable-2024-05-07"; + + nativeBuildInputs = [ + reason + ]; + + propagatedBuildInputs = [ + pastel + re + ]; + + meta = { + description = "Reason Native text layout library"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/frame"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/ocaml-modules/reason-native/fs.nix b/pkgs/development/ocaml-modules/reason-native/fs.nix new file mode 100644 index 0000000000000..c553f6a6ad989 --- /dev/null +++ b/pkgs/development/ocaml-modules/reason-native/fs.nix @@ -0,0 +1,24 @@ +{ lib, buildDunePackage, fp, reason, src }: + +buildDunePackage { + inherit src; + + pname = "fs"; + version = "0.0.2-unstable-2024-05-07"; + + nativeBuildInputs = [ + reason + ]; + + propagatedBuildInputs = [ + fp + ]; + + meta = { + description = "Reason Native file system API"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/fs"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} + diff --git a/pkgs/development/ocaml-modules/reason-native/pastel-console.nix b/pkgs/development/ocaml-modules/reason-native/pastel-console.nix index 968b9f88af91a..1a424fad5401a 100644 --- a/pkgs/development/ocaml-modules/reason-native/pastel-console.nix +++ b/pkgs/development/ocaml-modules/reason-native/pastel-console.nix @@ -1,7 +1,10 @@ -{ reason, console, pastel, ... }: +{ lib, buildDunePackage, reason, console, pastel, src }: + +buildDunePackage { + inherit src; -{ pname = "pastel-console"; + version = "0.0.0-unstable-2024-05-07"; nativeBuildInputs = [ reason @@ -16,5 +19,7 @@ description = "Small library for pretty coloring to Console output"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/pastel-console"; homepage = "https://reason-native.com/docs/pastel/console"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/pastel.nix b/pkgs/development/ocaml-modules/reason-native/pastel.nix index 6d08243638cab..d8a4d7e0f9ca5 100644 --- a/pkgs/development/ocaml-modules/reason-native/pastel.nix +++ b/pkgs/development/ocaml-modules/reason-native/pastel.nix @@ -1,13 +1,17 @@ -{ reason, re, ... }: +{ lib, buildDunePackage, reason, re, src }: + +buildDunePackage { + inherit src; -{ pname = "pastel"; + version = "0.3.0-unstable-2024-05-07"; minimalOCamlVersion = "4.05"; nativeBuildInputs = [ reason ]; + propagatedBuildInputs = [ re ]; @@ -16,5 +20,7 @@ description = "Text formatting library that harnesses Reason JSX to provide intuitive terminal output. Like React but for CLI"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/pastel"; homepage = "https://reason-native.com/docs/pastel/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix b/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix index ac645791f46c2..4006df5d90c8b 100644 --- a/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix +++ b/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix @@ -1,23 +1,15 @@ -{ qcheck-core, reason, console, rely, fetchpatch, ... }: +{ lib, buildDunePackage, qcheck-core, reason, console, rely, src }: + +buildDunePackage { + inherit src; -{ pname = "qcheck-rely"; + version = "1.0.2-unstable-2024-05-07"; nativeBuildInputs = [ reason ]; - patches = [ - (fetchpatch { - url = "https://github.com/reasonml/reason-native/pull/269/commits/b42d66f5929a11739c13f849939007bf8610888b.patch"; - hash = "sha256-MMLl3eqF8xQZ2T+sIEuv2WpnGF6FZtatgH5fiF5hpP4="; - includes = [ - "src/qcheck-rely/QCheckRely.re" - "src/qcheck-rely/QCheckRely.rei" - ]; - }) - ]; - propagatedBuildInputs = [ qcheck-core console @@ -27,5 +19,7 @@ meta = { description = "Library containing custom Rely matchers allowing for easily using QCheck with Rely. QCheck is a 'QuickCheck inspired property-based testing for OCaml, and combinators to generate random values to run tests on'"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/qcheck-rely"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/refmterr.nix b/pkgs/development/ocaml-modules/reason-native/refmterr.nix index 17c595d9e107d..3f320fd2364d6 100644 --- a/pkgs/development/ocaml-modules/reason-native/refmterr.nix +++ b/pkgs/development/ocaml-modules/reason-native/refmterr.nix @@ -1,7 +1,10 @@ -{ atdgen, re, reason, pastel, ... }: +{ lib, buildDunePackage, atdgen, re, reason, pastel, src }: + +buildDunePackage { + inherit src; -{ pname = "refmterr"; + version = "3.3.0-unstable-2024-05-07"; nativeBuildInputs = [ atdgen @@ -18,5 +21,7 @@ description = "Error formatter tool for Reason and OCaml. Takes raw error output from compiler and converts to pretty output"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/refmterr"; homepage = "https://reason-native.com/docs/refmterr/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix b/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix index 25d9cc2c5f70f..46097c45ebdf9 100644 --- a/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix +++ b/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix @@ -1,7 +1,10 @@ -{ atdgen, junit, re, reason, pastel, rely, ... }: +{ lib, buildDunePackage, atdgen, junit, re, reason, pastel, rely, src }: + +buildDunePackage { + inherit src; -{ pname = "rely-junit-reporter"; + version = "1.0.0-unstable-2024-05-07"; nativeBuildInputs = [ reason @@ -22,5 +25,7 @@ description = "Tool providing JUnit Reporter for Rely Testing Framework"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/rely-junit-reporter"; homepage = "https://reason-native.com/docs/rely/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/rely.nix b/pkgs/development/ocaml-modules/reason-native/rely.nix index 40315a668ba90..e3ca4b9ad5e9c 100644 --- a/pkgs/development/ocaml-modules/reason-native/rely.nix +++ b/pkgs/development/ocaml-modules/reason-native/rely.nix @@ -1,7 +1,10 @@ -{ re, reason, cli, file-context-printer, pastel, ... }: +{ lib, buildDunePackage, re, reason, cli, file-context-printer, pastel, src }: + +buildDunePackage { + inherit src; -{ pname = "rely"; + version = "4.0.0-unstable-2024-05-07"; nativeBuildInputs = [ reason @@ -18,5 +21,7 @@ description = "Jest-inspired testing framework for native OCaml/Reason"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/rely"; homepage = "https://reason-native.com/docs/rely/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/tests/console/console-test.opam b/pkgs/development/ocaml-modules/reason-native/tests/console/console_test.opam index e69de29bb2d1d..e69de29bb2d1d 100644 --- a/pkgs/development/ocaml-modules/reason-native/tests/console/console-test.opam +++ b/pkgs/development/ocaml-modules/reason-native/tests/console/console_test.opam diff --git a/pkgs/development/ocaml-modules/reason-native/tests/console/console-test.re b/pkgs/development/ocaml-modules/reason-native/tests/console/console_test.re index 15685205e1bca..15685205e1bca 100644 --- a/pkgs/development/ocaml-modules/reason-native/tests/console/console-test.re +++ b/pkgs/development/ocaml-modules/reason-native/tests/console/console_test.re diff --git a/pkgs/development/ocaml-modules/reason-native/tests/console/default.nix b/pkgs/development/ocaml-modules/reason-native/tests/console/default.nix index fc7f1891339b5..b2bc31565f04a 100644 --- a/pkgs/development/ocaml-modules/reason-native/tests/console/default.nix +++ b/pkgs/development/ocaml-modules/reason-native/tests/console/default.nix @@ -1,20 +1,34 @@ -{ lib, buildDunePackage, reason, console }: +{ lib, buildDunePackage, reason, console, ppxlib }: -buildDunePackage rec { - pname = "console-test"; +buildDunePackage { + pname = "console_test"; version = "1"; - src = ./.; + src = lib.fileset.toSource { + root = ./.; + fileset = lib.fileset.unions [ + ./console_test.opam + ./console_test.re + ./dune + ./dune-project + ]; + }; duneVersion = "3"; + nativeBuildInputs = [ + reason + ]; + buildInputs = [ reason console + ppxlib ]; doInstallCheck = true; + postInstallCheck = '' - $out/bin/console-test | grep -q "{\"Hello fellow Nixer!\"}" > /dev/null + $out/bin/console_test | grep -q "{\"Hello fellow Nixer!\"}" > /dev/null ''; } diff --git a/pkgs/development/ocaml-modules/reason-native/tests/console/dune b/pkgs/development/ocaml-modules/reason-native/tests/console/dune index 49f2121385e28..3bf2eefb27dbd 100644 --- a/pkgs/development/ocaml-modules/reason-native/tests/console/dune +++ b/pkgs/development/ocaml-modules/reason-native/tests/console/dune @@ -1,4 +1,4 @@ (executable - (name console-test) - (public_name console-test) + (name console_test) + (public_name console_test) (libraries reason console.lib)) diff --git a/pkgs/development/ocaml-modules/reason-native/tests/console/dune-project b/pkgs/development/ocaml-modules/reason-native/tests/console/dune-project new file mode 100644 index 0000000000000..a26d6e273960e --- /dev/null +++ b/pkgs/development/ocaml-modules/reason-native/tests/console/dune-project @@ -0,0 +1 @@ +(lang dune 1.6) diff --git a/pkgs/development/ocaml-modules/reason-native/unicode-config.nix b/pkgs/development/ocaml-modules/reason-native/unicode-config.nix new file mode 100644 index 0000000000000..1b80ae2a71fd3 --- /dev/null +++ b/pkgs/development/ocaml-modules/reason-native/unicode-config.nix @@ -0,0 +1,19 @@ +{ lib, buildDunePackage, reason, src }: + +buildDunePackage { + inherit src; + + pname = "unicode-config"; + version = "0.0.0-unstable-2024-05-07"; + + nativeBuildInputs = [ + reason + ]; + + meta = { + description = "Configuration used to generate the @reason-native/unicode library"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/unicode-config"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/ocaml-modules/reason-native/unicode.nix b/pkgs/development/ocaml-modules/reason-native/unicode.nix new file mode 100644 index 0000000000000..544367424d0b7 --- /dev/null +++ b/pkgs/development/ocaml-modules/reason-native/unicode.nix @@ -0,0 +1,19 @@ +{ lib, buildDunePackage, reason, src }: + +buildDunePackage { + inherit src; + + pname = "unicode"; + version = "0.0.0-unstable-2024-05-07"; + + nativeBuildInputs = [ + reason + ]; + + meta = { + description = "Easy to use and well documented Unicode symbols"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/unicode"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/ocaml-modules/reason-native/utf8.nix b/pkgs/development/ocaml-modules/reason-native/utf8.nix new file mode 100644 index 0000000000000..40c874b5b41f7 --- /dev/null +++ b/pkgs/development/ocaml-modules/reason-native/utf8.nix @@ -0,0 +1,20 @@ +{ lib, buildDunePackage, reason, src }: + +buildDunePackage { + inherit src; + + pname = "utf8"; + version = "0.1.0-unstable-2024-05-07"; + + nativeBuildInputs = [ + reason + ]; + + meta = { + description = "Utf8 logic with minimal dependencies"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/utf8"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} + diff --git a/pkgs/development/python-modules/airtouch5py/default.nix b/pkgs/development/python-modules/airtouch5py/default.nix index f474e23457863..a848a97158ddf 100644 --- a/pkgs/development/python-modules/airtouch5py/default.nix +++ b/pkgs/development/python-modules/airtouch5py/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "airtouch5py"; - version = "0.2.8"; + version = "0.2.10"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "danzel"; repo = "airtouch5py"; rev = "refs/tags/${version}"; - hash = "sha256-MpwppyAWDiA3CZXCIUQ/vidzcxKXZJSlrFRhmrPMgCE="; + hash = "sha256-8QMyp/Y60V64k1V8Hze5FsgpfHr8ZT1Xj/kQDP7CtjI="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/anywidget/default.nix b/pkgs/development/python-modules/anywidget/default.nix index 03b41c11e2515..d10f0b369f623 100644 --- a/pkgs/development/python-modules/anywidget/default.nix +++ b/pkgs/development/python-modules/anywidget/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "anywidget"; - version = "0.9.12"; + version = "0.9.13"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JYVbJJbcZUE1a20mygyflSUgO7fPKBf4S5O/4/U8+B4="; + hash = "sha256-xlVFW/UfghgusjxZR9N8xB8LH/rK9+K3YxR6IzLLPwc="; }; # We do not need the jupyterlab build dependency, because we do not need to diff --git a/pkgs/development/python-modules/beanhub-cli/default.nix b/pkgs/development/python-modules/beanhub-cli/default.nix index 5573d7618a234..61d95d881245d 100644 --- a/pkgs/development/python-modules/beanhub-cli/default.nix +++ b/pkgs/development/python-modules/beanhub-cli/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "beanhub-cli"; - version = "1.1.3"; + version = "1.2.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "LaunchPlatform"; repo = "beanhub-cli"; rev = "refs/tags/${version}"; - hash = "sha256-vYBbaUVJAs+aIp6aQpJb62DEDxe/sQTzgOkjPq6ADoc="; + hash = "sha256-ZN384KN6+pkDDsCk825sr+LsArQ5Vaf09ASLN8IemhM="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/beanhub-extract/default.nix b/pkgs/development/python-modules/beanhub-extract/default.nix index 31ca5b48bca0d..b44a2e631c948 100644 --- a/pkgs/development/python-modules/beanhub-extract/default.nix +++ b/pkgs/development/python-modules/beanhub-extract/default.nix @@ -4,13 +4,15 @@ buildPythonPackage, pythonOlder, pytestCheckHook, + iso8601, poetry-core, + pytest-lazy-fixture, pytz, }: buildPythonPackage rec { pname = "beanhub-extract"; - version = "0.0.7"; + version = "0.1.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,14 +21,20 @@ buildPythonPackage rec { owner = "LaunchPlatform"; repo = "beanhub-extract"; rev = "refs/tags/${version}"; - hash = "sha256-Wt8ZCyCaERNXEd0/Q89QWUW/wGFSHAP2RZLhnv5xkgY="; + hash = "sha256-Uw9bSVOpiIALkgA77OrqAcDWcEafVSnp4iILa4Jkykc="; }; build-system = [ poetry-core ]; - dependencies = [ pytz ]; + dependencies = [ + iso8601 + pytz + ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-lazy-fixture + pytestCheckHook + ]; pythonImportsCheck = [ "beanhub_extract" ]; diff --git a/pkgs/development/python-modules/beanhub-import/default.nix b/pkgs/development/python-modules/beanhub-import/default.nix index 4d205ebb54a6c..230238b12d5b3 100644 --- a/pkgs/development/python-modules/beanhub-import/default.nix +++ b/pkgs/development/python-modules/beanhub-import/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "beanhub-import"; - version = "0.1.5"; + version = "0.3.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "LaunchPlatform"; repo = "beanhub-import"; rev = "refs/tags/${version}"; - hash = "sha256-BH+d7cKC83b7T2Z1Xlwpsv3KACo1vDn6v65tElhir/c="; + hash = "sha256-jDZUsV5yj4h7zUA5NB/4exhPj3f3put/bKXZmPz94OQ="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/changefinder/default.nix b/pkgs/development/python-modules/changefinder/default.nix index b7f49ccce54f7..fc34238f00ecc 100644 --- a/pkgs/development/python-modules/changefinder/default.nix +++ b/pkgs/development/python-modules/changefinder/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , setuptools +, nose , numpy , scipy , statsmodels @@ -24,6 +25,7 @@ buildPythonPackage { ]; propagatedBuildInputs = [ + nose # not actually required during runtime, but specified as required in `setup.py` numpy scipy statsmodels diff --git a/pkgs/development/python-modules/dask-jobqueue/default.nix b/pkgs/development/python-modules/dask-jobqueue/default.nix index de99d37cfb8f0..9bf5bd2cab788 100644 --- a/pkgs/development/python-modules/dask-jobqueue/default.nix +++ b/pkgs/development/python-modules/dask-jobqueue/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, cryptography, @@ -79,7 +78,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "dask_jobqueue" ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Deploy Dask on job schedulers like PBS, SLURM, and SGE"; homepage = "https://github.com/dask/dask-jobqueue"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/dask-yarn/default.nix b/pkgs/development/python-modules/dask-yarn/default.nix index 8d60496d6a155..a7ba751c3b869 100644 --- a/pkgs/development/python-modules/dask-yarn/default.nix +++ b/pkgs/development/python-modules/dask-yarn/default.nix @@ -11,7 +11,6 @@ grpcio, skein, pytestCheckHook, - stdenv, }: buildPythonPackage rec { @@ -84,6 +83,5 @@ buildPythonPackage rec { homepage = "https://yarn.dask.org/"; license = licenses.bsd3; maintainers = with maintainers; [ illustris ]; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/dbus-next/default.nix b/pkgs/development/python-modules/dbus-next/default.nix index 572fa905e82de..bbbabdc08375e 100644 --- a/pkgs/development/python-modules/dbus-next/default.nix +++ b/pkgs/development/python-modules/dbus-next/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchFromGitHub, @@ -49,6 +48,5 @@ buildPythonPackage rec { changelog = "https://github.com/altdesktop/python-dbus-next/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ sfrijters ]; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/ducc0/default.nix b/pkgs/development/python-modules/ducc0/default.nix index aa44378f6c793..d42085999e851 100644 --- a/pkgs/development/python-modules/ducc0/default.nix +++ b/pkgs/development/python-modules/ducc0/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchFromGitLab, @@ -36,7 +35,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "ducc0" ]; meta = with lib; { - broken = stdenv.isDarwin; homepage = "https://gitlab.mpcdf.mpg.de/mtr/ducc"; description = "Efficient algorithms for Fast Fourier transforms and more"; license = licenses.gpl2Plus; diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index a8784aacb5dc2..80c7f22cb33a4 100644 --- a/pkgs/development/python-modules/env-canada/default.nix +++ b/pkgs/development/python-modules/env-canada/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.7.0"; + version = "0.7.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "michaeldavie"; repo = "env_canada"; rev = "refs/tags/v${version}"; - hash = "sha256-ND1QObDdn6tBGNlnnVadNv6ibYYpOoo2HZEXIMlfwyc="; + hash = "sha256-GWNGLhnXr8NOrR5stOjHbk9X+BObs1sbG6lWn2apPQI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/freertos-gdb/default.nix b/pkgs/development/python-modules/freertos-gdb/default.nix new file mode 100644 index 0000000000000..cb240cec4807e --- /dev/null +++ b/pkgs/development/python-modules/freertos-gdb/default.nix @@ -0,0 +1,23 @@ +{ lib, pkg-config, fetchPypi, buildPythonPackage }: + +buildPythonPackage rec { + pname = "freertos-gdb"; + version = "1.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-o0ZoTy7OLVnrhSepya+MwaILgJSojs2hfmI86D9C3cs="; + }; + + # Project has no tests + doCheck = false; + + meta = with lib; { + description = "User-friendly view of FreeRTOS kernel objects in GDB"; + homepage = "https://github.com/espressif/freertos-gdb"; + license = licenses.asl20; + maintainers = with maintainers; [ + danc86 + ]; + }; +} diff --git a/pkgs/development/python-modules/mouseinfo/default.nix b/pkgs/development/python-modules/mouseinfo/default.nix index d33527b1ec543..9691fc36680b0 100644 --- a/pkgs/development/python-modules/mouseinfo/default.nix +++ b/pkgs/development/python-modules/mouseinfo/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, pyperclip, @@ -7,7 +6,7 @@ xlib, pillow, }: -buildPythonPackage rec { +buildPythonPackage { pname = "mouseinfo"; version = "0.1.3"; @@ -34,7 +33,6 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Application to display XY position and RGB color information for the pixel currently under the mouse. Works on Python 2 and 3"; homepage = "https://github.com/asweigart/mouseinfo"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/mozilla-django-oidc/default.nix b/pkgs/development/python-modules/mozilla-django-oidc/default.nix new file mode 100644 index 0000000000000..78c24b8b0b785 --- /dev/null +++ b/pkgs/development/python-modules/mozilla-django-oidc/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, djangorestframework +, django +, josepy +, requests +, cryptography +}: + +buildPythonPackage rec { + pname = "mozilla-django-oidc"; + version = "4.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mozilla"; + repo = "mozilla-django-oidc"; + rev = version; + hash = "sha256-72F1aLLIId+YClTrpOz3bL8LSq6ZhZjjtv8V/GJGkqs="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + djangorestframework + ]; + + checkPhase = '' + runHook preCheck + + PYTHONPATH=.:$PYTHONPATH DJANGO_SETTINGS_MODULE=tests.settings django-admin test + + runHook postCheck + ''; + + dependencies = [ + django + josepy + requests + cryptography + ]; + + meta = { + description = "Django OpenID Connect library"; + homepage = "https://github.com/mozilla/mozilla-django-oidc"; + changelog = "https://github.com/mozilla/mozilla-django-oidc/releases/tag/${src.rev}"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ felbinger ]; + }; +} diff --git a/pkgs/development/python-modules/netutils/default.nix b/pkgs/development/python-modules/netutils/default.nix index 50473f84651dc..e86e0c625573e 100644 --- a/pkgs/development/python-modules/netutils/default.nix +++ b/pkgs/development/python-modules/netutils/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, jinja2, @@ -66,6 +65,5 @@ buildPythonPackage rec { changelog = "https://github.com/networktocode/netutils/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/numba-scipy/default.nix b/pkgs/development/python-modules/numba-scipy/default.nix index 0eae5c9a9b98e..d144bf4c9610e 100644 --- a/pkgs/development/python-modules/numba-scipy/default.nix +++ b/pkgs/development/python-modules/numba-scipy/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchPypi, @@ -39,7 +38,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "numba_scipy" ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Extends Numba to make it aware of SciPy"; homepage = "https://github.com/numba/numba-scipy"; changelog = "https://github.com/numba/numba-scipy/blob/master/CHANGE_LOG"; diff --git a/pkgs/development/python-modules/omorfi/default.nix b/pkgs/development/python-modules/omorfi/default.nix index c73147faddfdd..ab78e6eda1205 100644 --- a/pkgs/development/python-modules/omorfi/default.nix +++ b/pkgs/development/python-modules/omorfi/default.nix @@ -2,7 +2,6 @@ buildPythonPackage, pkgs, lib, - stdenv, hfst, }: @@ -26,7 +25,5 @@ buildPythonPackage rec { homepage = "https://github.com/flammie/omorfi"; license = licenses.gpl3; maintainers = with maintainers; [ lurkki ]; - # Ofborg build error (hfst not found?) - broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index ac6fb58446fcd..88e876035d7b5 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "openai"; - version = "1.35.1"; + version = "1.35.5"; pyproject = true; disabled = pythonOlder "3.7.1"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-GOduJdMNVWK3Hl05mQI7kpgzugEX2MJKEqTyR/ldW9Q="; + hash = "sha256-vtqqINwO08olJuynsFtsW7Kp8ikZI6tsZHZWnjTfitM="; }; build-system = [ diff --git a/pkgs/development/python-modules/oslo-concurrency/default.nix b/pkgs/development/python-modules/oslo-concurrency/default.nix index ef4b6f2c4bc52..5aa9bc1a58b77 100644 --- a/pkgs/development/python-modules/oslo-concurrency/default.nix +++ b/pkgs/development/python-modules/oslo-concurrency/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchPypi, @@ -71,7 +70,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "oslo_concurrency" ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Oslo Concurrency library"; mainProgram = "lockutils-wrapper"; homepage = "https://github.com/openstack/oslo.concurrency"; diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix index 882131c7c60b9..736267272ef14 100644 --- a/pkgs/development/python-modules/oslo-log/default.nix +++ b/pkgs/development/python-modules/oslo-log/default.nix @@ -59,6 +59,5 @@ buildPythonPackage rec { homepage = "https://github.com/openstack/oslo.log"; license = licenses.asl20; maintainers = teams.openstack.members; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/persim/default.nix b/pkgs/development/python-modules/persim/default.nix index 6626c31c855b8..058b613fa2f4f 100644 --- a/pkgs/development/python-modules/persim/default.nix +++ b/pkgs/development/python-modules/persim/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchPypi, @@ -70,6 +69,5 @@ buildPythonPackage rec { changelog = "https://github.com/scikit-tda/persim/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ ]; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/pescea/default.nix b/pkgs/development/python-modules/pescea/default.nix index 979c19319c9de..aec7138b7795b 100644 --- a/pkgs/development/python-modules/pescea/default.nix +++ b/pkgs/development/python-modules/pescea/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, async-timeout, buildPythonPackage, @@ -49,7 +48,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "pescea" ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Python interface to Escea fireplaces"; homepage = "https://github.com/lazdavila/pescea"; license = licenses.gpl3Plus; diff --git a/pkgs/development/python-modules/power/default.nix b/pkgs/development/python-modules/power/default.nix index 97c490523f162..708f3e40a222e 100644 --- a/pkgs/development/python-modules/power/default.nix +++ b/pkgs/development/python-modules/power/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchPypi, @@ -19,7 +18,6 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - broken = stdenv.isDarwin; description = "Cross-platform system power status information"; homepage = "https://github.com/Kentzo/Power"; license = licenses.mit; diff --git a/pkgs/development/python-modules/proxy-py/default.nix b/pkgs/development/python-modules/proxy-py/default.nix index 6a09b16a5cd9c..aa940d50ed011 100644 --- a/pkgs/development/python-modules/proxy-py/default.nix +++ b/pkgs/development/python-modules/proxy-py/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, bash, buildPythonPackage, fetchFromGitHub, @@ -89,6 +88,5 @@ buildPythonPackage rec { changelog = "https://github.com/abhinavsingh/proxy.py/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/pydmd/default.nix b/pkgs/development/python-modules/pydmd/default.nix index f6a83e7c6ed90..577c25f8ec81d 100644 --- a/pkgs/development/python-modules/pydmd/default.nix +++ b/pkgs/development/python-modules/pydmd/default.nix @@ -58,7 +58,6 @@ let changelog = "https://github.com/PyDMD/PyDMD/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ yl3dy ]; - broken = stdenv.hostPlatform.isAarch64; }; }; in diff --git a/pkgs/development/python-modules/pylibjpeg/default.nix b/pkgs/development/python-modules/pylibjpeg/default.nix index d19fcc9039afa..468a00d8ef72f 100644 --- a/pkgs/development/python-modules/pylibjpeg/default.nix +++ b/pkgs/development/python-modules/pylibjpeg/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchFromGitHub, @@ -13,7 +12,7 @@ }: let - pylibjpeg-data = buildPythonPackage rec { + pylibjpeg-data = buildPythonPackage { pname = "pylibjpeg-data"; version = "1.0.0dev0"; pyproject = true; @@ -64,8 +63,5 @@ buildPythonPackage rec { changelog = "https://github.com/pydicom/pylibjpeg/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; - # several test failures of form - # "pydicom.errors.InvalidDicomError: File is missing DICOM File Meta Information header or the 'DICM' prefix is missing from the header. ..." - broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/pynetdicom/default.nix b/pkgs/development/python-modules/pynetdicom/default.nix index 5c63fcae29ab0..3339b77b98802 100644 --- a/pkgs/development/python-modules/pynetdicom/default.nix +++ b/pkgs/development/python-modules/pynetdicom/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, poetry-core, @@ -88,7 +87,5 @@ buildPythonPackage rec { changelog = "https://github.com/pydicom/pynetdicom/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; - # Tests are not passing on Darwin/Aarch64, thus it's assumed that it doesn't work - broken = stdenv.isDarwin || stdenv.isAarch64; }; } diff --git a/pkgs/development/python-modules/pyopenweathermap/default.nix b/pkgs/development/python-modules/pyopenweathermap/default.nix index a683857c12bff..6b316dd72cc75 100644 --- a/pkgs/development/python-modules/pyopenweathermap/default.nix +++ b/pkgs/development/python-modules/pyopenweathermap/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyopenweathermap"; - version = "0.0.10"; + version = "0.1.1"; pyproject = true; src = fetchFromGitHub { @@ -24,7 +24,7 @@ buildPythonPackage rec { repo = "pyopenweathermap"; # https://github.com/freekode/pyopenweathermap/issues/2 rev = "refs/tags/v${version}"; - hash = "sha256-wEcE4IYVvxEwW5Hhz+DqDIqbjd5/O1hEr7dGgiuMI00="; + hash = "sha256-OGalKlZP4pKKWKypjM5nVesvFAGLgvvRjMWzrEIp+VQ="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pysendfile/default.nix b/pkgs/development/python-modules/pysendfile/default.nix index 9bc9363e022e7..236d040cb9459 100644 --- a/pkgs/development/python-modules/pysendfile/default.nix +++ b/pkgs/development/python-modules/pysendfile/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchPypi, pythonOlder, @@ -32,6 +31,5 @@ buildPythonPackage rec { changelog = "https://github.com/giampaolo/pysendfile/blob/release-${version}/HISTORY.rst"; license = licenses.mit; maintainers = with maintainers; [ ]; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/pytest-annotate/default.nix b/pkgs/development/python-modules/pytest-annotate/default.nix index a7802b2cb7161..0064ba62fc712 100644 --- a/pkgs/development/python-modules/pytest-annotate/default.nix +++ b/pkgs/development/python-modules/pytest-annotate/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchPypi, pyannotate, @@ -32,7 +31,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "pytest_annotate" ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Generate PyAnnotate annotations from your pytest tests"; homepage = "https://github.com/kensho-technologies/pytest-annotate"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/python3-application/default.nix b/pkgs/development/python-modules/python3-application/default.nix index b761430a270e9..b61ff595564f3 100644 --- a/pkgs/development/python-modules/python3-application/default.nix +++ b/pkgs/development/python-modules/python3-application/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, isPy3k, buildPythonPackage, @@ -30,7 +29,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "application" ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Collection of modules that are useful when building python applications"; homepage = "https://github.com/AGProjects/python3-application"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/python-modules/pytikz-allefeld/default.nix b/pkgs/development/python-modules/pytikz-allefeld/default.nix index 31cc3dabb1b42..9f78f9d2f9fa1 100644 --- a/pkgs/development/python-modules/pytikz-allefeld/default.nix +++ b/pkgs/development/python-modules/pytikz-allefeld/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, fetchFromGitHub, buildPythonPackage, pythonOlder, @@ -11,7 +10,7 @@ texlive, }: -buildPythonPackage rec { +buildPythonPackage { pname = "pytikz-allefeld"; # "pytikz" on pypi is a different module version = "unstable-2022-11-01"; pyproject = true; @@ -54,6 +53,5 @@ buildPythonPackage rec { description = "Python interface to TikZ"; license = licenses.gpl3; maintainers = with maintainers; [ pbsds ]; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/pyttsx3/default.nix b/pkgs/development/python-modules/pyttsx3/default.nix index 6243ae776d27f..8650e0c54fe41 100644 --- a/pkgs/development/python-modules/pyttsx3/default.nix +++ b/pkgs/development/python-modules/pyttsx3/default.nix @@ -1,9 +1,7 @@ { - stdenv, lib, buildPythonPackage, fetchPypi, - espeak-ng, }: buildPythonPackage rec { @@ -22,7 +20,6 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - broken = stdenv.isDarwin; description = "Offline text-to-speech synthesis library"; homepage = "https://github.com/nateshmbhat/pyttsx3"; license = licenses.mpl20; diff --git a/pkgs/development/python-modules/ray/binary-hashes.nix b/pkgs/development/python-modules/ray/binary-hashes.nix index cf243178e17b0..802f7061a7c28 100644 --- a/pkgs/development/python-modules/ray/binary-hashes.nix +++ b/pkgs/development/python-modules/ray/binary-hashes.nix @@ -1,8 +1,11 @@ { cp310 = { - hash = "sha256-m8SBwbXXKU1ocvrBROAOoTlLfhMPtBJJ0WcNtJQVbYE="; + hash = "sha256-iSKDUwJTakE1nStvaMvJ5RwS7+a9JiurOe8wcRjs7Ik="; }; cp311 = { - hash = "sha256-4gO1dWWgCPKsn54ekpIW4NfXdvU0FEzMePZsEFI09wE="; + hash = "sha256-SQ7tIqb+XWqWqUYxAT8PTT9SBnl1us6soJiy9zLHJQI="; + }; + cp312 = { + hash = "sha256-ri2m867sokJjB3wB7yOEEQczRzMglzbCJ0vOomJDhGI="; }; } diff --git a/pkgs/development/python-modules/ray/default.nix b/pkgs/development/python-modules/ray/default.nix index f32bd388d5770..d0869e8afc080 100644 --- a/pkgs/development/python-modules/ray/default.nix +++ b/pkgs/development/python-modules/ray/default.nix @@ -53,13 +53,13 @@ let pname = "ray"; - version = "2.30.0"; + version = "2.31.0"; in buildPythonPackage rec { inherit pname version; format = "wheel"; - disabled = pythonOlder "3.10" || pythonAtLeast "3.12"; + disabled = pythonOlder "3.10" || pythonAtLeast "3.13"; src = let diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix index b7a4c9964c04a..b7f12332711e3 100644 --- a/pkgs/development/python-modules/ropper/default.nix +++ b/pkgs/development/python-modules/ropper/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchFromGitHub, @@ -38,6 +37,5 @@ buildPythonPackage rec { homepage = "https://scoding.de/ropper/"; license = licenses.bsd3; maintainers = with maintainers; [ bennofs ]; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/selectors2/default.nix b/pkgs/development/python-modules/selectors2/default.nix index 6bd80826b7a0a..b2b79711c259f 100644 --- a/pkgs/development/python-modules/selectors2/default.nix +++ b/pkgs/development/python-modules/selectors2/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchPypi, @@ -36,7 +35,6 @@ buildPythonPackage rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; homepage = "https://www.github.com/SethMichaelLarson/selectors2"; description = "Back-ported, durable, and portable selectors"; license = licenses.mit; diff --git a/pkgs/development/python-modules/sfepy/default.nix b/pkgs/development/python-modules/sfepy/default.nix index b97840fbae541..599e853e5f723 100644 --- a/pkgs/development/python-modules/sfepy/default.nix +++ b/pkgs/development/python-modules/sfepy/default.nix @@ -17,12 +17,9 @@ python, sympy, meshio, - mpi4py, - psutil, openssh, pyvista, pytest, - stdenv, }: buildPythonPackage rec { @@ -89,6 +86,5 @@ buildPythonPackage rec { description = "Simple Finite Elements in Python"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ wd15 ]; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/shiboken2/default.nix b/pkgs/development/python-modules/shiboken2/default.nix index abf29ffaff97e..926bc4d48cb43 100644 --- a/pkgs/development/python-modules/shiboken2/default.nix +++ b/pkgs/development/python-modules/shiboken2/default.nix @@ -59,6 +59,6 @@ stdenv.mkDerivation { ]; homepage = "https://wiki.qt.io/Qt_for_Python"; maintainers = with maintainers; [ gebner ]; - broken = stdenv.isDarwin || pythonAtLeast "3.12"; + broken = pythonAtLeast "3.12"; }; } diff --git a/pkgs/development/python-modules/sphinx-markdown-parser/default.nix b/pkgs/development/python-modules/sphinx-markdown-parser/default.nix index 85c8b23e68203..a8409208c4938 100644 --- a/pkgs/development/python-modules/sphinx-markdown-parser/default.nix +++ b/pkgs/development/python-modules/sphinx-markdown-parser/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, commonmark, fetchFromGitHub, @@ -16,7 +15,7 @@ yapf, }: -buildPythonPackage rec { +buildPythonPackage { pname = "sphinx-markdown-parser"; version = "0.2.4"; pyproject = true; @@ -62,6 +61,5 @@ buildPythonPackage rec { homepage = "https://github.com/clayrisser/sphinx-markdown-parser"; license = licenses.mit; maintainers = with maintainers; [ FlorianFranzen ]; - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/streamdeck/default.nix b/pkgs/development/python-modules/streamdeck/default.nix index 01587d491653a..ba23f550e0c27 100644 --- a/pkgs/development/python-modules/streamdeck/default.nix +++ b/pkgs/development/python-modules/streamdeck/default.nix @@ -33,6 +33,5 @@ buildPythonPackage rec { homepage = "https://github.com/abcminiuser/python-elgato-streamdeck"; license = licenses.mit; maintainers = with maintainers; [ majiir ]; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/streamz/default.nix b/pkgs/development/python-modules/streamz/default.nix index c993e187813df..651ebc559731b 100644 --- a/pkgs/development/python-modules/streamz/default.nix +++ b/pkgs/development/python-modules/streamz/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, pythonOlder, fetchPypi, @@ -79,7 +78,6 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Pipelines to manage continuous streams of data"; homepage = "https://github.com/python-streamz/streamz"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/testcontainers/default.nix b/pkgs/development/python-modules/testcontainers/default.nix index dd59406a7dfd0..4f3fbb94be090 100644 --- a/pkgs/development/python-modules/testcontainers/default.nix +++ b/pkgs/development/python-modules/testcontainers/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "testcontainers"; - version = "4.6.0"; + version = "4.7.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "testcontainers"; repo = "testcontainers-python"; rev = "refs/tags/testcontainers-v${version}"; - hash = "sha256-jTTpeIWZD61UZkQWW5q/c0vgViT76qjDXw4qXfNqDnA="; + hash = "sha256-DX2s3Z3QM8qzUr5nM+9erJG/XHkB96h8S4+KYDfcA8A="; }; postPatch = '' @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = { description = "Allows using docker containers for functional and integration testing"; homepage = "https://github.com/testcontainers/testcontainers-python"; + changelog = "https://github.com/testcontainers/testcontainers-python/releases/tag/testcontainers-v${version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ onny ]; }; diff --git a/pkgs/development/python-modules/unifi-discovery/default.nix b/pkgs/development/python-modules/unifi-discovery/default.nix index 1bfcce4e430e4..198b179498918 100644 --- a/pkgs/development/python-modules/unifi-discovery/default.nix +++ b/pkgs/development/python-modules/unifi-discovery/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "unifi-discovery"; - version = "1.1.8"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "unifi-discovery"; rev = "refs/tags/v${version}"; - hash = "sha256-gE/2awyhDACrc0nuTvTPOcK2lFbPIZAXDPRnVJtWFco="; + hash = "sha256-Ea+zxV2GUAaG/BxO103NhOLzzr/TNJaOsynDad2/2VA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/upb-lib/default.nix b/pkgs/development/python-modules/upb-lib/default.nix index a1170ed32ff34..0798fd1812811 100644 --- a/pkgs/development/python-modules/upb-lib/default.nix +++ b/pkgs/development/python-modules/upb-lib/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "upb-lib"; - version = "0.5.6"; + version = "0.5.7"; pyproject = true; disabled = pythonOlder "3.11"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gwww"; repo = "upb-lib"; rev = "refs/tags/${version}"; - hash = "sha256-e8LYywKA5lNZ4UYFZTwcfePDWB4cTNz38Tiy4xzOxOs="; + hash = "sha256-y06/XqdmGXTd2Qhr2iXnmIKCSpAetXwI1UXv555ewoc="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index dea16f654e2ee..7f4feb2ba9ad0 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -69,7 +69,8 @@ buildPythonPackage rec { description = "Vowpal Wabbit is a fast machine learning library for online learning, and this is the python wrapper for the project"; homepage = "https://github.com/JohnLangford/vowpal_wabbit"; license = licenses.bsd3; - broken = stdenv.isAarch64; maintainers = with maintainers; [ teh ]; + # Test again when new version is released + broken = stdenv.isLinux; }; } diff --git a/pkgs/development/python-modules/wrf-python/default.nix b/pkgs/development/python-modules/wrf-python/default.nix index 340f13059e222..fded65e33a4bc 100644 --- a/pkgs/development/python-modules/wrf-python/default.nix +++ b/pkgs/development/python-modules/wrf-python/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, fetchFromGitHub, pythonOlder, @@ -54,6 +53,5 @@ buildPythonPackage rec { homepage = "http://wrf-python.rtfd.org"; license = licenses.asl20; maintainers = with maintainers; [ mhaselsteiner ]; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 9eca09e730608..c8f5a7fd08920 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.148"; + version = "3.2.156"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-lmMmKdxNN1pnMETuO7WZ9oKIVK89Cf9/5n89xfwNRZ4="; + hash = "sha256-RcYDvxqAyvXFdVo3NqISNJ2aDCUsRwN73r3ilc3IjCk="; }; patches = [ ./flake8-compat-5.x.patch ]; diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix index c5e3b43eea061..0ed0ef816f092 100644 --- a/pkgs/development/tools/analysis/lcov/default.nix +++ b/pkgs/development/tools/analysis/lcov/default.nix @@ -16,9 +16,8 @@ let perlPackages.DevelCover perlPackages.GD perlPackages.JSONXS - perlPackages.MemoryProcess perlPackages.PathTools - ]; + ] ++ lib.optionals (!stdenv.isDarwin) [ perlPackages.MemoryProcess ]; in stdenv.mkDerivation rec { pname = "lcov"; diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 28aa1e39e89e1..3a97b63216b59 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "tfsec"; - version = "1.28.6"; + version = "1.28.9"; src = fetchFromGitHub { owner = "aquasecurity"; repo = "tfsec"; rev = "refs/tags/v${version}"; - hash = "sha256-Dc6eXw1qGr2KxRoG3Odfa07s2SYdnxVbJHeVQdETBIs="; + hash = "sha256-Dulbo5ZTw4+1XxjpnZ1aIsVPLVEqwQKdNMv+L9/j1wc="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { # "-extldflags '-fno-PIC -static'" ]; - vendorHash = "sha256-RxsoTNj/V1UgcMq7vbjGlkJCMEVyvfmSz2IPncs53hY="; + vendorHash = "sha256-Hu530cBJWGtvMmQ6gbROXf5JBfkOfc4nwznsKBTegUk="; subPackages = [ "cmd/tfsec" diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/development/tools/build-managers/scala-cli/sources.json index 27db1b9db55e1..676c8eebb07bf 100644 --- a/pkgs/development/tools/build-managers/scala-cli/sources.json +++ b/pkgs/development/tools/build-managers/scala-cli/sources.json @@ -1,21 +1,21 @@ { - "version": "1.3.2", + "version": "1.4.0", "assets": { "aarch64-darwin": { "asset": "scala-cli-aarch64-apple-darwin.gz", - "sha256": "0xs60pnqsxxkamcq0n0am4jbnx4lgnr91ngcwxk0ccfpqf24jpk8" + "sha256": "1k9yc868lh7yjvxf81pg9n1sdyb2c566i6qwrf7kxczn0s9sa12h" }, "aarch64-linux": { "asset": "scala-cli-aarch64-pc-linux.gz", - "sha256": "1419s6dnwk703mkp209m5fxqphx8g65h0b2kam3zs9z9rii3mjvs" + "sha256": "08chhm364m5lbl1wr5xiww3mmm8d31hfw07s4jdsrmpjvxx0yrhg" }, "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "0ms7yggldckkyayz8wksyg79kgk6xl13g47a2jc7q66syzr495yw" + "sha256": "1a1ng800aaydvp83wrvxdxw3x6zcdgl2g7fa3zz5h2ba208xjv62" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "1jy5xz8n79ck8gxcmy14ldsaj7dfrwrqgdfhp5h39hzvgcs1mjvl" + "sha256": "1cav0c0bhag64mic1c37l9zb21zyasshcyl3r12y939fmc9icnww" } } } diff --git a/pkgs/development/tools/fx/default.nix b/pkgs/development/tools/fx/default.nix deleted file mode 100644 index bcb458f0b6478..0000000000000 --- a/pkgs/development/tools/fx/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: - -buildGoModule rec { - pname = "fx"; - version = "34.0.0"; - - src = fetchFromGitHub { - owner = "antonmedv"; - repo = pname; - rev = version; - hash = "sha256-gVeeCJOqrEua5quID1n1928oHtP9gfIDe4erVn1y2Eo="; - }; - - nativeBuildInputs = [ installShellFiles ]; - - vendorHash = "sha256-otORAeD9+J6/10TDusEnFfRRxTb/52Zk7Ttaw46xnsU=/sTS1mJw="; - - postInstall = '' - installShellCompletion --cmd fx \ - --bash <($out/bin/fx --comp bash) \ - --fish <($out/bin/fx --comp fish) \ - --zsh <($out/bin/fx --comp zsh) - ''; - - meta = with lib; { - description = "Terminal JSON viewer"; - mainProgram = "fx"; - homepage = "https://github.com/antonmedv/fx"; - changelog = "https://github.com/antonmedv/fx/releases/tag/${src.rev}"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/development/tools/misc/hound/default.nix index b906456116c56..6e3124556f547 100644 --- a/pkgs/development/tools/misc/hound/default.nix +++ b/pkgs/development/tools/misc/hound/default.nix @@ -6,6 +6,7 @@ , git , openssh , nixosTests +, fetchpatch }: buildGoModule rec { @@ -19,6 +20,19 @@ buildGoModule rec { sha256 = "sha256-Qdk57zLjTXLdDEmB6K+sZAym5s0BekJJa/CpYeOBOcY="; }; + patches = [ + # add check config flag + # https://github.com/hound-search/hound/pull/485/files + (fetchpatch { + url = "https://github.com/MarcelCoding/hound/commit/b2f1cef335eff235394de336593687236a3b88bb.patch"; + hash = "sha256-3+EBvnA8JIx2P6YM+8LpojDIX7hNXJ0vwVN4oSAouZ4="; + }) + (fetchpatch { + url = "https://github.com/MarcelCoding/hound/commit/f917a457570ad8659d02fca4311cc91cadcadc00.patch"; + hash = "sha256-CGvcIoSbgiayli5B8JRjvGfLuH2fscNpNTEm7xwkfpo="; + }) + ]; + vendorHash = "sha256-0psvz4bnhGuwwSAXvQp0ju0GebxoUyY2Rjp/D43KF78="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index 6c2d5175c3f51..06161d95c4b2c 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -11,13 +11,13 @@ assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm o buildGoModule rec { pname = "open-policy-agent"; - version = "0.65.0"; + version = "0.66.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - hash = "sha256-nf/xQ5744cplTNYkwaUbGv7Dw0BGf52dWTjnTVa9qL8="; + hash = "sha256-fx7k6KvL0uy2NXLDLpCnN1ux9MGEO1CbX6TdLweVzag="; }; vendorHash = null; diff --git a/pkgs/development/tools/pnpm/fetch-deps/default.nix b/pkgs/development/tools/pnpm/fetch-deps/default.nix index 83972abf8b08a..eb8b847960c53 100644 --- a/pkgs/development/tools/pnpm/fetch-deps/default.nix +++ b/pkgs/development/tools/pnpm/fetch-deps/default.nix @@ -1,17 +1,17 @@ { + lib, stdenvNoCC, - fetchurl, callPackage, jq, moreutils, cacert, makeSetupHook, pnpm, + yq, }: { fetchDeps = { - src, hash ? "", pname, ... @@ -36,15 +36,22 @@ name = "${pname}-pnpm-deps"; nativeBuildInputs = [ + cacert jq moreutils pnpm - cacert + yq ]; installPhase = '' runHook preInstall + lockfileVersion="$(yq -r .lockfileVersion pnpm-lock.yaml)" + if [[ ''${lockfileVersion:0:1} -gt ${lib.versions.major pnpm.version} ]]; then + echo "ERROR: lockfileVersion $lockfileVersion in pnpm-lock.yaml is too new for the provided pnpm version ${lib.versions.major pnpm.version}!" + exit 1 + fi + export HOME=$(mktemp -d) pnpm config set store-dir $out # Some packages produce platform dependent outputs. We do not want to cache those in the global store diff --git a/pkgs/development/tools/pyenv/default.nix b/pkgs/development/tools/pyenv/default.nix index 9f761ef0be276..57485de36f676 100644 --- a/pkgs/development/tools/pyenv/default.nix +++ b/pkgs/development/tools/pyenv/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pyenv"; - version = "2.4.3"; + version = "2.4.4"; src = fetchFromGitHub { owner = "pyenv"; repo = "pyenv"; rev = "refs/tags/v${version}"; - hash = "sha256-jYBKTrpc3KI1iW/VCw4Udk4TS8dXFGg5WgbEWZ+vWqE="; + hash = "sha256-ujbJrF7QDd2DIsZGEoJrM3VA2WNpkJNe4BZVcPokXRg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/railway/default.nix b/pkgs/development/tools/railway/default.nix index c9e219f82bd47..100aba324db36 100644 --- a/pkgs/development/tools/railway/default.nix +++ b/pkgs/development/tools/railway/default.nix @@ -1,23 +1,23 @@ { lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, stdenv, CoreServices -, Security }: +, Security, SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "railway"; - version = "3.9.0"; + version = "3.9.3"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${version}"; - hash = "sha256-eMbeU9DflGXQRqoXnTlMmCJUsCvAywjmckDqxhT+LD8="; + hash = "sha256-8K+awKsSQotPqVJg7SkpPCjenU6a/cqEZogqwQAe0I8="; }; - cargoHash = "sha256-rYHvvGyD49+n7DHHd0CKCwd6w5WgWONWGxW2vXm7DL4="; + cargoHash = "sha256-2KNSPn0zrx5zwF9g29x3/L/ptza+NstBu4Lc1PR4ymE="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; + ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ]; OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 941460c35d451..6443cae2f58cd 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2024-06-11"; - cargoSha256 = "sha256-mo3TGaUI1gjJX64Di7+M40CzHkIuFAuXl27yJ9GPkPU="; + version = "2024-06-24"; + cargoSha256 = "sha256-w28YJmL4km+5LBKyo1QlVG376HZ2SyEXPu6SslSvVfg="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-/N0sZW3xiivMm5klk9zBtzMlO+uaxnUq35kI3bakLx8="; + sha256 = "sha256-jzZRTQjXhiwEdzo/SlxP72BUa7g0LVr7MEsaR7A/geg="; }; cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ]; diff --git a/pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix b/pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix index 963e134075ed7..49be63a2b99c2 100644 --- a/pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix +++ b/pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix @@ -9,20 +9,33 @@ runCommand "test-neovim-rust-analyzer" { } ''; + # NB. Wait for server done type calculations before sending `hover` request, + # otherwise it would return `{unknown}`. + # Ref: https://github.com/rust-lang/rust-analyzer/blob/7b11fdeb681c12002861b9804a388efde81c9647/docs/dev/lsp-extensions.md#server-status nvimConfig = /* lua */ '' + local caps = vim.lsp.protocol.make_client_capabilities() + caps["experimental"] = { serverStatusNotification = true } vim.lsp.buf_attach_client(vim.api.nvim_get_current_buf(), vim.lsp.start_client({ cmd = { "rust-analyzer" }, + capabilities = caps, handlers = { - ["$/progress"] = function(_, msg, ctx) - if msg.token == "rustAnalyzer/Indexing" and msg.value.kind == "end" then - vim.cmd("goto 23") -- let mut |var =... - vim.lsp.buf.hover() + ["experimental/serverStatus"] = function(_, msg, ctx) + if msg.health == "ok" then + if msg.quiescent then + vim.cmd("goto 23") -- let mut |var =... + vim.lsp.buf.hover() + end + else + print("error: server status is not ok: ") + vim.cmd("q") end end, ["textDocument/hover"] = function(_, msg, ctx) - -- Keep newlines. - io.write(msg.contents.value) - vim.cmd("q") + if msg then + -- Keep newlines. + io.write(msg.contents.value) + vim.cmd("q") + end end, }, on_error = function(code) diff --git a/pkgs/development/tools/twilio-cli/default.nix b/pkgs/development/tools/twilio-cli/default.nix index fe0544b671378..a37c79b34f248 100644 --- a/pkgs/development/tools/twilio-cli/default.nix +++ b/pkgs/development/tools/twilio-cli/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "twilio-cli"; - version = "5.21.0"; + version = "5.21.1"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - hash = "sha256-rtI89baKJS4itwTcHY9IjKeskQO6mz/c746wdVy4cG4="; + hash = "sha256-0hriMtxmqjQrR/gAdOk8RfyPQp2ZYCdyt/sMTUqC1/4="; }; buildInputs = [ nodejs-slim ]; diff --git a/pkgs/development/tools/wails/default.nix b/pkgs/development/tools/wails/default.nix index 9a158be022f39..8988424d7738a 100644 --- a/pkgs/development/tools/wails/default.nix +++ b/pkgs/development/tools/wails/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "wails"; - version = "2.8.2"; + version = "2.9.1"; src = fetchFromGitHub { owner = "wailsapp"; repo = pname; rev = "v${version}"; - hash = "sha256-oJ/kxYphBTXxt7Da1x4GW/a78YV+m32iC/4N3MDjU/A="; + hash = "sha256-dtfFeNK7ZfqriK4S0/+Wor1hUJv5kgnRWURVqt+RrNU="; } + "/v2"; vendorHash = "sha256-15Vo4AKmd9qOF0ea1klTlrXJOUs+IHvsNT2rw4R7ZiU="; |