diff options
Diffstat (limited to 'pkgs/development')
36 files changed, 381 insertions, 151 deletions
diff --git a/pkgs/development/compilers/jetbrains-jdk/17.nix b/pkgs/development/compilers/jetbrains-jdk/17.nix new file mode 100644 index 000000000000..76d4079baafb --- /dev/null +++ b/pkgs/development/compilers/jetbrains-jdk/17.nix @@ -0,0 +1,156 @@ +{ lib +, stdenv +, fetchFromGitHub +, jetbrains +, openjdk17 +, openjdk17-bootstrap +, git +, autoconf +, unzip +, rsync +, debugBuild ? false +, withJcef ? true + +, libXdamage +, libXxf86vm +, libXrandr +, libXi +, libXcursor +, libXrender +, libX11 +, libXext +, libxcb +, nss +, nspr +, libdrm +, mesa +, wayland +, udev +}: + +assert debugBuild -> withJcef; + +let + arch = { + "aarch64-linux" = "aarch64"; + "x86_64-linux" = "x64"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + cpu = stdenv.hostPlatform.parsed.cpu.name; +in +openjdk17.overrideAttrs (oldAttrs: rec { + pname = "jetbrains-jdk" + lib.optionalString withJcef "-jcef"; + javaVersion = "17.0.11"; + build = "1207.24"; + # To get the new tag: + # git clone https://github.com/jetbrains/jetbrainsruntime + # cd jetbrainsruntime + # git reset --hard [revision] + # git log --simplify-by-decoration --decorate=short --pretty=short | grep "jbr-" --color=never | cut -d "(" -f2 | cut -d ")" -f1 | awk '{print $2}' | sort -t "-" -k 2 -g | tail -n 1 | tr -d "," + openjdkTag = "jbr-17.0.8+7"; + version = "${javaVersion}-b${build}"; + + src = fetchFromGitHub { + owner = "JetBrains"; + repo = "JetBrainsRuntime"; + rev = "jb${version}"; + hash = "sha256-a7cJF2iCW/1GK0/GmVbaY5pYcn3YtZy5ngFkyAGRhu0="; + }; + + BOOT_JDK = openjdk17-bootstrap.home; + # run `git log -1 --pretty=%ct` in jdk repo for new value on update + SOURCE_DATE_EPOCH = 1715809405; + + patches = [ ]; + + dontConfigure = true; + + buildPhase = '' + runHook preBuild + + ${lib.optionalString withJcef "cp -r ${jetbrains.jcef} jcef_linux_${arch}"} + + sed \ + -e "s/OPENJDK_TAG=.*/OPENJDK_TAG=${openjdkTag}/" \ + -e "s/SOURCE_DATE_EPOCH=.*//" \ + -e "s/export SOURCE_DATE_EPOCH//" \ + -i jb/project/tools/common/scripts/common.sh + sed -i "s/STATIC_CONF_ARGS/STATIC_CONF_ARGS \$configureFlags/" jb/project/tools/linux/scripts/mkimages_${arch}.sh + sed \ + -e "s/create_image_bundle \"jb/#/" \ + -e "s/echo Creating /exit 0 #/" \ + -i jb/project/tools/linux/scripts/mkimages_${arch}.sh + + patchShebangs . + ./jb/project/tools/linux/scripts/mkimages_${arch}.sh ${build} ${if debugBuild then "fd" else (if withJcef then "jcef" else "nomod")} + + runHook postBuild + ''; + + installPhase = + let + buildType = if debugBuild then "fastdebug" else "release"; + debugSuffix = if debugBuild then "-fastdebug" else ""; + jcefSuffix = if debugBuild || !withJcef then "" else "_jcef"; + jbrsdkDir = "jbrsdk${jcefSuffix}-${javaVersion}-linux-${arch}${debugSuffix}-b${build}"; + in + '' + runHook preInstall + + mv build/linux-${cpu}-server-${buildType}/images/jdk/man build/linux-${cpu}-server-${buildType}/images/${jbrsdkDir} + rm -rf build/linux-${cpu}-server-${buildType}/images/jdk + mv build/linux-${cpu}-server-${buildType}/images/${jbrsdkDir} build/linux-${cpu}-server-${buildType}/images/jdk + '' + oldAttrs.installPhase + "runHook postInstall"; + + postInstall = lib.optionalString withJcef '' + chmod +x $out/lib/openjdk/lib/chrome-sandbox + ''; + + dontStrip = debugBuild; + + postFixup = '' + # Build the set of output library directories to rpath against + LIBDIRS="${lib.makeLibraryPath [ + libXdamage libXxf86vm libXrandr libXi libXcursor libXrender libX11 libXext libxcb + nss nspr libdrm mesa wayland udev + ]}" + for output in $outputs; do + if [ "$output" = debug ]; then continue; fi + LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS" + done + # Add the local library paths to remove dependencies on the bootstrap + for output in $outputs; do + if [ "$output" = debug ]; then continue; fi + OUTPUTDIR=$(eval echo \$$output) + BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) + echo "$BINLIBS" | while read i; do + patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true + patchelf --shrink-rpath "$i" || true + done + done + ''; + + nativeBuildInputs = [ git autoconf unzip rsync ] ++ oldAttrs.nativeBuildInputs; + + meta = with lib; { + description = "An OpenJDK fork to better support Jetbrains's products."; + longDescription = '' + JetBrains Runtime is a runtime environment for running IntelliJ Platform + based products on Windows, Mac OS X, and Linux. JetBrains Runtime is + based on OpenJDK project with some modifications. These modifications + include: Subpixel Anti-Aliasing, enhanced font rendering on Linux, HiDPI + support, ligatures, some fixes for native crashes not presented in + official build, and other small enhancements. + JetBrains Runtime is not a certified build of OpenJDK. Please, use at + your own risk. + ''; + homepage = "https://confluence.jetbrains.com/display/JBR/JetBrains+Runtime"; + inherit (openjdk17.meta) license platforms mainProgram; + maintainers = with maintainers; [ edwtjo ]; + + broken = stdenv.isDarwin; + }; + + passthru = oldAttrs.passthru // { + home = "${jetbrains.jdk}/lib/openjdk"; + }; +}) diff --git a/pkgs/development/compilers/jwasm/default.nix b/pkgs/development/compilers/jwasm/default.nix deleted file mode 100644 index a8ffc3164a66..000000000000 --- a/pkgs/development/compilers/jwasm/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "jwasm"; - version = "2.17"; - - src = fetchFromGitHub { - owner = "Baron-von-Riedesel"; - repo = "JWasm"; - rev = "v${finalAttrs.version}"; - hash = "sha256-22eNtHXF+RQT4UbXIVjn1JP/s6igp5O1oQT7sVl7c1U="; - }; - - outputs = [ "out" "doc" ]; - - dontConfigure = true; - - preBuild = '' - cp ${if stdenv.cc.isClang then "CLUnix.mak" else "GccUnix.mak"} Makefile - substituteInPlace Makefile \ - --replace "/usr/local/bin" "${placeholder "out"}/bin" - ''; - - postInstall = '' - install -Dpm644 $src/Html/License.html \ - $src/Html/Manual.html \ - $src/Html/Readme.html \ - -t $doc/share/doc/jwasm/ - ''; - - meta = with lib; { - homepage = "https://github.com/Baron-von-Riedesel/JWasm/"; - description = "MASM-compatible x86 assembler"; - changelog = "https://github.com/Baron-von-Riedesel/JWasm/releases/tag/v${finalAttrs.version}"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; - broken = stdenv.isDarwin; - }; -}) -# TODO: generalize for Windows builds diff --git a/pkgs/development/embedded/platformio/chrootenv.nix b/pkgs/development/embedded/platformio/chrootenv.nix index 6e99c78dfdfe..50be791a951e 100644 --- a/pkgs/development/embedded/platformio/chrootenv.nix +++ b/pkgs/development/embedded/platformio/chrootenv.nix @@ -11,6 +11,7 @@ let git xdg-user-dirs ncurses + udev ]) ++ (with python.pkgs; [ python setuptools diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index ba5b3d6ddd51..60f11fd23d84 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -189,6 +189,7 @@ in rec { fullName = "Afrikaans"; filename = "aspell"; sha256 = "00p6k2ndi0gzfr5fkbvx4hkcpj223pidjvmxg0r384arrap00q4x"; + meta.license = lib.licenses.lgpl21Only; }; am = buildOfficialDict { @@ -197,6 +198,7 @@ in rec { fullName = "Amharic"; filename = "aspell6"; sha256 = "11ylp7gjq94wfacyawvp391lsq26rl1b84f268rjn7l7z0hxs9xz"; + meta.license = lib.licenses.publicDomain; }; ar = buildOfficialDict { @@ -205,6 +207,7 @@ in rec { fullName = "Arabic"; filename = "aspell6"; sha256 = "1avw40bp8yi5bnkq64ihm2rldgw34lk89yz281q9bmndh95a47h4"; + meta.license = lib.licenses.gpl2Only; }; ast = buildOfficialDict { @@ -213,6 +216,7 @@ in rec { fullName = "Asturian"; filename = "aspell6"; sha256 = "14hg85mxcyvdigf96yvslk7f3v9ngdsxn85qpgwkg31k3k83xwj3"; + meta.license = lib.licenses.gpl2Only; }; az = buildOfficialDict { @@ -221,6 +225,7 @@ in rec { fullName = "Azerbaijani"; filename = "aspell6"; sha256 = "1hs4h1jscpxf9f9iyk6mvjqsnhkf0yslkbjhjkasqqcx8pn7cc86"; + meta.license = lib.licenses.gpl2Only; }; be = buildOfficialDict { @@ -229,6 +234,7 @@ in rec { fullName = "Belarusian"; filename = "aspell5"; sha256 = "1svls9p7rsfi3hs0afh0cssj006qb4v1ik2yzqgj8hm10c6as2sm"; + meta.license = lib.licenses.gpl2Only; }; bg = buildOfficialDict { @@ -237,6 +243,7 @@ in rec { fullName = "Bulgarian"; filename = "aspell6"; sha256 = "1alacmgpfk0yrgq83y23d16fhav1bxmb98kg8d2a5r9bvh2h0mvl"; + meta.license = lib.licenses.gpl2Only; }; bn = buildOfficialDict { @@ -245,6 +252,7 @@ in rec { fullName = "Bengali"; filename = "aspell6"; sha256 = "1nc02jd67iggirwxnhdvlvaqm0xfyks35c4psszzj3dhzv29qgxh"; + meta.license = lib.licenses.gpl2Only; }; br = buildOfficialDict { @@ -253,6 +261,7 @@ in rec { fullName = "Breton"; filename = "aspell"; sha256 = "0fradnm8424bkq9a9zhpl2132dk7y95xmw45sy1c0lx6rinjl4n2"; + meta.license = lib.licenses.gpl2Only; }; ca = buildOfficialDict { @@ -261,6 +270,7 @@ in rec { fullName = "Catalan"; filename = "aspell6"; sha256 = "1fb5y5kgvk25nlsfvc8cai978hg66x3pbp9py56pldc7vxzf9npb"; + meta.license = lib.licenses.gpl2Only; }; cs = buildOfficialDict { @@ -269,6 +279,7 @@ in rec { fullName = "Czech"; filename = "aspell6"; sha256 = "0rihj4hsw96pd9casvmpvw3r8040pfa28p1h73x4vyn20zwr3h01"; + meta.license = lib.licenses.gpl2Only; }; csb = buildOfficialDict { @@ -277,6 +288,7 @@ in rec { fullName = "Kashubian"; filename = "aspell6"; sha256 = "1612ypkm684wjvc7n081i87mlrrzif9simc7kyn177hfsl3ssrn1"; + meta.license = lib.licenses.gpl2Only; }; cy = buildOfficialDict { @@ -285,6 +297,7 @@ in rec { fullName = "Welsh"; filename = "aspell"; sha256 = "15vq601lzz1gi311xym4bv9lv1k21xcfn50jmzamw7h6f36rsffm"; + meta.license = lib.licenses.gpl2Only; }; da = buildOfficialDict { @@ -293,6 +306,7 @@ in rec { fullName = "Danish"; filename = "aspell5"; sha256 = "1hfkmiyhgrx5lgrb2mffjbdn1hivrm73wcg7x0iid74p2yb0fjpp"; + meta.license = lib.licenses.gpl2Only; }; de = buildOfficialDict { @@ -301,6 +315,7 @@ in rec { fullName = "German"; filename = "aspell6"; sha256 = "0wamclvp66xfmv5wff96v6gdlnfv4y8lx3f8wvxyzm5imwgms4n2"; + meta.license = lib.licenses.gpl2Plus; }; de-alt = buildOfficialDict { @@ -309,6 +324,7 @@ in rec { fullName = "German - Old Spelling"; filename = "aspell6"; sha256 = "0wwc2l29svv3fv041fh6vfa5m3hi9q9pkbxibzq1ysrsfin3rl9n"; + meta.license = lib.licenses.gpl2Only; }; el = buildOfficialDict { @@ -317,6 +333,7 @@ in rec { fullName = "Greek"; filename = "aspell6"; sha256 = "1ljcc30zg2v2h3w5h5jr5im41mw8jbsgvvhdd2cii2yzi8d0zxja"; + meta.license = lib.licenses.gpl2Only; }; en = buildOfficialDict { @@ -325,6 +342,13 @@ in rec { fullName = "English"; filename = "aspell6"; sha256 = "1cwzqkm8gr1w51rpckwlvb43sb0b5nbwy7s8ns5vi250515773sc"; + # some parts are under a custom free license others are just stated to be"public domain" + # see the Copyright file in the source for further information + meta.license = with lib.licenses; [ + free + publicDomain + bsdOriginalUC + ]; }; eo = buildOfficialDict { @@ -333,6 +357,7 @@ in rec { fullName = "Esperanto"; filename = "aspell6"; sha256 = "09vf0mbiicbmyb4bwb7v7lgpabnylg0wy7m3hlhl5rjdda6x3lj1"; + meta.license = lib.licenses.gpl2Only; }; es = buildOfficialDict { @@ -341,6 +366,7 @@ in rec { fullName = "Spanish"; filename = "aspell6"; sha256 = "1k5g328ac1hdpp6fsg57d8md6i0aqcwlszp3gbmp5706wyhpydmd"; + meta.license = lib.licenses.gpl2Only; }; et = buildOfficialDict { @@ -349,6 +375,7 @@ in rec { fullName = "Estonian"; filename = "aspell6"; sha256 = "0jdjfa2fskirhnb70fy86xryp9r6gkl729ib8qcjmsma7nm5gs5i"; + meta.license = lib.licenses.lgpl21Only; }; fa = buildOfficialDict { @@ -357,6 +384,7 @@ in rec { fullName = "Persian"; filename = "aspell6"; sha256 = "0nz1ybwv56q7nl9ip12hfmdch1vyyq2j55bkjcns13lshzm2cba8"; + meta.license = lib.licenses.gpl2Only; }; fi = buildOfficialDict { @@ -365,6 +393,7 @@ in rec { fullName = "Finnish"; filename = "aspell6"; sha256 = "07d5s08ba4dd89cmwy9icc01i6fjdykxlb9ravmhdrhi8mxz1mzq"; + meta.license = lib.licenses.gpl2Only; }; fo = buildOfficialDict { @@ -373,6 +402,7 @@ in rec { fullName = "Faroese"; filename = "aspell5"; sha256 = "022yz5lll20xrzizcyb7wksm3fgwklnvgnir5la5qkxv770dvq7p"; + meta.license = lib.licenses.gpl2Only; }; fr = buildOfficialDict { @@ -381,6 +411,7 @@ in rec { fullName = "French"; filename = "aspell"; sha256 = "14ffy9mn5jqqpp437kannc3559bfdrpk7r36ljkzjalxa53i0hpr"; + meta.license = lib.licenses.gpl2Only; }; fy = buildOfficialDict { @@ -389,6 +420,7 @@ in rec { fullName = "Frisian"; filename = "aspell6"; sha256 = "1almi6n4ni91d0rzrk8ig0473m9ypbwqmg56hchz76j51slwyirl"; + meta.license = lib.licenses.gpl2Only; }; ga = buildOfficialDict { @@ -397,6 +429,7 @@ in rec { fullName = "Irish"; filename = "aspell5"; sha256 = "0y869mmvfb3bzadfgajwa2rfb0xfhi6m9ydwgxkb9v2claydnps5"; + meta.license = lib.licenses.gpl2Only; }; gd = buildOfficialDict { @@ -405,6 +438,7 @@ in rec { fullName = "Scottish Gaelic"; filename = "aspell5"; sha256 = "0a89irv5d65j5m9sb0k36851x5rs0wij12gb2m6hv2nsfn5a05p3"; + meta.license = lib.licenses.gpl2Only; }; gl = buildOfficialDict { @@ -413,6 +447,7 @@ in rec { fullName = "Galician"; filename = "aspell6"; sha256 = "12pwghmy18fcdvf9hvhb4q6shi339hb1kwxpkz0bhw0yjxjwzkdk"; + meta.license = lib.licenses.gpl2Only; }; grc = buildOfficialDict { @@ -421,6 +456,7 @@ in rec { fullName = "Ancient Greek"; filename = "aspell6"; sha256 = "1zxr8958v37v260fkqd4pg37ns5h5kyqm54hn1hg70wq5cz8h512"; + meta.license = lib.licenses.gpl3Only; }; gu = buildOfficialDict { @@ -429,6 +465,7 @@ in rec { fullName = "Gujarati"; filename = "aspell6"; sha256 = "04c38jnl74lpj2jhjz4zpqbs2623vwc71m6wc5h4b1karid14b23"; + meta.license = lib.licenses.gpl2Only; }; gv = buildOfficialDict { @@ -437,6 +474,7 @@ in rec { fullName = "Manx Gaelic"; filename = "aspell"; sha256 = "1rknf4yaw9s29c77sdzg98nhnmjwpicdb69igmz1n768npz2drmv"; + meta.license = lib.licenses.gpl2Only; }; he = buildOfficialDict { @@ -445,6 +483,7 @@ in rec { fullName = "Hebrew"; filename = "aspell6"; sha256 = "13bhbghx5b8g0119g3wxd4n8mlf707y41vlf59irxjj0kynankfn"; + meta.license = lib.licenses.gpl2Only; }; hi = buildOfficialDict { @@ -453,6 +492,7 @@ in rec { fullName = "Hindi"; filename = "aspell6"; sha256 = "0drs374qz4419zx1lf2k281ydxf2750jk5ailafj1x0ncz27h1ys"; + meta.license = lib.licenses.gpl2Only; }; hil = buildOfficialDict { @@ -461,6 +501,7 @@ in rec { fullName = "Hiligaynon"; filename = "aspell5"; sha256 = "1s482fsfhzic9qa80al4418q3ni3gfn2bkwkd2y46ydrs17kf2jp"; + meta.license = lib.licenses.gpl2Only; }; hr = buildOfficialDict { @@ -469,6 +510,7 @@ in rec { fullName = "Croatian"; filename = "aspell"; sha256 = "09aafyf1vqhaxvcf3jfzf365k394b5pf0iivsr2ix5npah1h7i1a"; + meta.license = lib.licenses.lgpl21Only; }; hsb = buildOfficialDict { @@ -477,6 +519,7 @@ in rec { fullName = "Upper Sorbian"; filename = "aspell6"; sha256 = "0bi2vhz7n1vmg43wbbh935pmzihv80iyz9z65j94lxf753j2m7wd"; + meta.license = lib.licenses.gpl2Only; }; hu = buildOfficialDict { @@ -485,6 +528,7 @@ in rec { fullName = "Hungarian"; filename = "aspell6"; sha256 = "1d9nybip2k1dz69zly3iv0npbi3yxgfznh1py364nxzrbjsafd9k"; + meta.license = lib.licenses.gpl2Only; }; hus = buildOfficialDict { @@ -493,6 +537,7 @@ in rec { fullName = "Huastec"; filename = "aspell6"; sha256 = "09glipfpkz9xch17z11zw1yn2z7jx1f2svfmjn9l6wm1s5qz6a3d"; + meta.license = lib.licenses.gpl3Only; }; hy = buildOfficialDict { @@ -501,6 +546,7 @@ in rec { fullName = "Armenian"; filename = "aspell6"; sha256 = "1w5wq8lfl2xp1nid30b1j5qmya4vjyidq0vpr4y3gf53jc08vsid"; + meta.license = lib.licenses.gpl2Only; }; ia = buildOfficialDict { @@ -509,6 +555,7 @@ in rec { fullName = "Interlingua"; filename = "aspell"; sha256 = "0bqcpgsa72pga24fv4fkw38b4qqdvqsw97jvzvw7q03dc1cwp5sp"; + meta.license = lib.licenses.lgpl21Only; }; id = buildOfficialDict { @@ -517,6 +564,7 @@ in rec { fullName = "Indonesian"; filename = "aspell5"; sha256 = "023knfg0q03f7y5w6xnwa1kspnrcvcnky8xvdms93n2850414faj"; + meta.license = lib.licenses.gpl2Only; }; is = buildOfficialDict { @@ -525,6 +573,7 @@ in rec { fullName = "Icelandic"; filename = "aspell"; sha256 = "1mp3248lhbr13cj7iq9zs7h5ix0dcwlprp5cwrkcwafrv8lvsd9h"; + meta.license = lib.licenses.gpl2Only; }; it = buildOfficialDict { @@ -533,6 +582,7 @@ in rec { fullName = "Italian"; filename = "aspell6"; sha256 = "1gdf7bc1a0kmxsmphdqq8pl01h667mjsj6hihy6kqy14k5qdq69v"; + meta.license = lib.licenses.gpl2Plus; }; kn = buildOfficialDict { @@ -541,6 +591,7 @@ in rec { fullName = "Kannada"; filename = "aspell6"; sha256 = "10sk0wx4x4ds1403kf9dqxv9yjvh06w8qqf4agx57y0jlws0n0fb"; + meta.license = lib.licenses.gpl3Only; }; ku = buildOfficialDict { @@ -549,6 +600,7 @@ in rec { fullName = "Kurdi"; filename = "aspell5"; sha256 = "09va98krfbgdaxl101nmd85j3ysqgg88qgfcl42c07crii0pd3wn"; + meta.license = lib.licenses.gpl2Only; }; ky = buildOfficialDict { @@ -557,6 +609,7 @@ in rec { fullName = "Kirghiz"; filename = "aspell6"; sha256 = "0kzv2syjnnn6pnwx0d578n46hg2l0j62977al47y6wabnhjjy3z1"; + meta.license = lib.licenses.gpl2Only; }; la = buildOfficialDict { @@ -565,6 +618,7 @@ in rec { fullName = "Latin"; filename = "aspell6"; sha256 = "1199inwi16dznzl087v4skn66fl7h555hi2palx6s1f3s54b11nl"; + meta.license = lib.licenses.gpl2Only; }; lt = buildOfficialDict { @@ -573,6 +627,7 @@ in rec { fullName = "Lithuanian"; filename = "aspell6"; sha256 = "1asjck911l96q26zj36lmz0jp4b6pivvrf3h38zgc8lc85p3pxgn"; + meta.license = lib.licenses.bsd3; }; lv = buildOfficialDict { @@ -581,6 +636,7 @@ in rec { fullName = "Latvian"; filename = "aspell6"; sha256 = "12pvs584a6437ijndggdqpp5s7d0w607cimpkxsjwasnx83f4c1w"; + meta.license = lib.licenses.gpl2Only; }; mg = buildOfficialDict { @@ -589,6 +645,7 @@ in rec { fullName = "Malagasy"; filename = "aspell5"; sha256 = "0hdhbk9b5immjp8l5h4cy82gwgsqzcqbb0qsf7syw333w4rgi0ji"; + meta.license = lib.licenses.gpl2Only; }; mi = buildOfficialDict { @@ -597,6 +654,7 @@ in rec { fullName = "Maori"; filename = "aspell"; sha256 = "12bxplpd348yx8d2q8qvahi9dlp7qf28qmanzhziwc7np8rixvmy"; + meta.license = lib.licenses.lgpl21Only; }; mk = buildOfficialDict { @@ -605,6 +663,7 @@ in rec { fullName = "Macedonian"; filename = "aspell"; sha256 = "0wcr9n882xi5b7a7ln1hnhq4vfqd5gpqqp87v01j0gb7zf027z0m"; + meta.license = lib.licenses.gpl2Only; }; ml = buildOfficialDict { @@ -613,6 +672,7 @@ in rec { fullName = "Malayalam"; filename = "aspell6"; sha256 = "1zcn4114gwia085fkz77qk13z29xrbp53q2qvgj2cvcbalg5bkg4"; + meta.license = lib.licenses.gpl3Only; }; mn = buildOfficialDict { @@ -621,6 +681,7 @@ in rec { fullName = "Mongolian"; filename = "aspell6"; sha256 = "150j9y5c9pw80fwp5rzl5q31q9vjbxixaqljkfwxjb5q93fnw6rg"; + meta.license = lib.licenses.gpl2Only; }; mr = buildOfficialDict { @@ -629,6 +690,7 @@ in rec { fullName = "Marathi"; filename = "aspell6"; sha256 = "0cvgb2l40sppqbi842ivpznsh2xzp1d4hxc371dll8z0pr05m8yk"; + meta.license = lib.licenses.gpl2Only; }; ms = buildOfficialDict { @@ -637,6 +699,7 @@ in rec { fullName = "Malay"; filename = "aspell"; sha256 = "0vr4vhipcfhsxqfs8dim2ph7iiixn22gmlmlb375bx5hgd9y7i1w"; + meta.license = lib.licenses.fdl12Only; }; mt = buildOfficialDict { @@ -645,6 +708,7 @@ in rec { fullName = "Maltese"; filename = "aspell"; sha256 = "1d2rl1nlfjq6rfywblvx8m88cyy2x0mzc0mshzbgw359c2nwl3z0"; + meta.license = lib.licenses.lgpl21Only; }; nb = buildOfficialDict { @@ -653,6 +717,7 @@ in rec { fullName = "Norwegian Bokmal"; filename = "aspell"; sha256 = "12i2bmgdnlkzfinb20j2a0j4a20q91a9j8qpq5vgabbvc65nwx77"; + meta.license = lib.licenses.gpl2Only; }; nds = buildOfficialDict { @@ -661,6 +726,7 @@ in rec { fullName = "Low Saxon"; filename = "aspell6"; sha256 = "1nkjhwzn45dizi89d19q4bqyd87cim8xyrgr655fampgkn31wf6f"; + meta.license = lib.licenses.lgpl21Only; }; nl = buildOfficialDict { @@ -673,6 +739,11 @@ in rec { postInstall = '' echo "add nl.rws" > $out/lib/aspell/nederlands.multi ''; + # from the Copyright file: + # > The nl-aspell package includes the GPL COPYRIGHT file but no explicit copyright + # > notice. Since he was using autoconf this could have been added automatically. + # wtf whatever + meta.license = lib.licenses.free; }; nn = buildOfficialDict { @@ -681,6 +752,7 @@ in rec { fullName = "Norwegian Nynorsk"; filename = "aspell"; sha256 = "0w2k5l5rbqpliripgqwiqixz5ghnjf7i9ggbrc4ly4vy1ia10rmc"; + meta.license = lib.licenses.gpl2Only; }; ny = buildOfficialDict { @@ -689,6 +761,7 @@ in rec { fullName = "Chichewa"; filename = "aspell5"; sha256 = "0gjb92vcg60sfgvrm2f6i89sfkgb179ahvwlgs649fx3dc7rfvqp"; + meta.license = lib.licenses.gpl2Only; }; or = buildOfficialDict { @@ -697,6 +770,7 @@ in rec { fullName = "Oriya"; filename = "aspell6"; sha256 = "0kzj9q225z0ccrlbkijsrafy005pbjy14qcnxb6p93ciz1ls7zyn"; + meta.license = lib.licenses.gpl2Only; }; pa = buildOfficialDict { @@ -705,6 +779,7 @@ in rec { fullName = "Punjabi"; filename = "aspell6"; sha256 = "0if93zk10pyrs38wwj3vpcdm01h51m5z9gm85h3jxrpgqnqspwy7"; + meta.license = lib.licenses.gpl2Only; }; pl = buildOfficialDict { @@ -713,6 +788,12 @@ in rec { fullName = "Polish"; filename = "aspell6"; sha256 = "0kap4kh6bqbb22ypja1m5z3krc06vv4n0hakiiqmv20anzy42xq1"; + meta.license = with lib.licenses; [ + gpl2Only + lgpl21Only + mpl11 + cc-sa-10 + ]; }; pt_BR = buildOfficialDict { @@ -721,6 +802,11 @@ in rec { fullName = "Brazilian Portuguese"; filename = "aspell6"; sha256 = "1xqlpk21s93c6blkdnpk7l62q9fxjvzdv2x86chl8p2x1gdrj3gb"; + meta.license = with lib.licenses; [ + lgpl21Only + lgpl21Plus + gpl3Plus + ]; }; pt_PT = buildOfficialDict { @@ -729,6 +815,11 @@ in rec { fullName = "Portuguese"; filename = "aspell6"; sha256 = "0ld0d0ily4jqifjfsxfv4shbicz6ymm2gk56fq9gbzra1j4qnw75"; + meta.license = with lib.licenses; [ + lgpl21Plus + gpl3Plus + mpl11 + ]; }; qu = buildOfficialDict { @@ -737,6 +828,7 @@ in rec { fullName = "Quechua"; filename = "aspell6"; sha256 = "009z0zsvzq7r3z3m30clyibs94v77b92h5lmzmzxlns2p0lpd5w0"; + meta.license = lib.licenses.gpl2Only; }; ro = buildOfficialDict { @@ -745,6 +837,7 @@ in rec { fullName = "Romanian"; filename = "aspell5"; sha256 = "0gb8j9iy1acdl11jq76idgc2lbc1rq3w04favn8cyh55d1v8phsk"; + meta.license = lib.licenses.gpl2Only; }; ru = buildOfficialDict { @@ -753,6 +846,7 @@ in rec { fullName = "Russian"; filename = "aspell6"; sha256 = "0ip6nq43hcr7vvzbv4lwwmlwgfa60hrhsldh9xy3zg2prv6bcaaw"; + meta.license = lib.licenses.free; }; rw = buildOfficialDict { @@ -761,6 +855,7 @@ in rec { fullName = "Kinyarwanda"; filename = "aspell"; sha256 = "10gh8g747jbrvfk2fn3pjxy1nhcfdpwgmnvkmrp4nd1k1qp101il"; + meta.license = lib.licenses.gpl2Only; }; sc = buildOfficialDict { @@ -769,6 +864,7 @@ in rec { fullName = "Sardinian"; filename = "aspell5"; sha256 = "0hl7prh5rccsyljwrv3m1hjcsphyrrywk2qvnj122irbf4py46jr"; + meta.license = lib.licenses.gpl2Only; }; sk = buildOfficialDict { @@ -777,6 +873,11 @@ in rec { fullName = "Slovak"; filename = "aspell6"; sha256 = "19k0m1v5pcf7xr4lxgjkzqkdlks8nyb13bvi1n7521f3i4lhma66"; + meta.license = with lib.licenses; [ + lgpl21Only + gpl2Only + mpl11 + ]; }; sl = buildOfficialDict { @@ -785,6 +886,7 @@ in rec { fullName = "Slovenian"; filename = "aspell"; sha256 = "1l9kc5g35flq8kw9jhn2n0bjb4sipjs4qkqzgggs438kywkx2rp5"; + meta.license = lib.licenses.gpl2Only; }; sr = buildOfficialDict { @@ -793,6 +895,7 @@ in rec { fullName = "Serbian"; filename = "aspell6"; sha256 = "12cj01p4nj80cpf7m3s4jsaf0rsfng7s295j9jfchcq677xmhpkh"; + meta.license = lib.licenses.lgpl21Only; }; sv = buildOfficialDict { @@ -801,6 +904,7 @@ in rec { fullName = "Swedish"; filename = "aspell"; sha256 = "02jwkjhr32kvyibnyzgx3smbnm576jwdzg3avdf6zxwckhy5fw4v"; + meta.license = lib.licenses.lgpl21Only; }; sw = buildOfficialDict { @@ -809,6 +913,7 @@ in rec { fullName = "Swahili"; filename = "aspell"; sha256 = "15zjh7hdj2b4dgm5bc12w1ims9q357p1q3gjalspnyn5gl81zmby"; + meta.license = lib.licenses.lgpl21Only; }; ta = buildOfficialDict { @@ -817,6 +922,7 @@ in rec { fullName = "Tamil"; filename = "aspell6"; sha256 = "0sj8ygjsyvnr93cs6324y7az7k2vyw7rjxdc9vnm7z60lbqm5xaj"; + meta.license = lib.licenses.gpl2Only; }; te = buildOfficialDict { @@ -825,6 +931,7 @@ in rec { fullName = "Telugu"; filename = "aspell6"; sha256 = "0pgcgxz7dz34zxp9sb85jjzbg3ky6il5wmhffz6ayrbsfn5670in"; + meta.license = lib.licenses.gpl2Only; }; tet = buildOfficialDict { @@ -833,6 +940,7 @@ in rec { fullName = "Tetum"; filename = "aspell5"; sha256 = "17n0y4fhjak47j9qnqf4m4z6zra6dn72rwhp7ig0hhlgqk4ldmcx"; + meta.license = lib.licenses.gpl2Only; }; tk = buildOfficialDict { @@ -841,6 +949,7 @@ in rec { fullName = "Turkmen"; filename = "aspell5"; sha256 = "02vad4jqhr0xpzqi5q5z7z0xxqccbn8j0c5dhpnm86mnr84l5wl6"; + meta.license = lib.licenses.gpl2Only; }; tl = buildOfficialDict { @@ -849,6 +958,7 @@ in rec { fullName = "Tagalog"; filename = "aspell5"; sha256 = "1kca6k7qnpfvvwjnq5r1n242payqsjy96skmw78m7ww6d0n5vdj8"; + meta.license = lib.licenses.gpl2Only; }; tn = buildOfficialDict { @@ -857,6 +967,7 @@ in rec { fullName = "Setswana"; filename = "aspell5"; sha256 = "0q5x7c6z88cn0kkpk7q1craq34g4g03v8x3xcj5a5jia3l7c5821"; + meta.license = lib.licenses.gpl2Only; }; tr = buildOfficialDict { @@ -865,6 +976,7 @@ in rec { fullName = "Turkish"; filename = "aspell"; sha256 = "0jpvpm96ga7s7rmsm6rbyrrr22b2dicxv2hy7ysv5y7bbq757ihb"; + meta.license = lib.licenses.gpl2Only; }; uk = buildOfficialDict { @@ -873,6 +985,10 @@ in rec { fullName = "Ukrainian"; filename = "aspell6"; sha256 = "137i4njvnslab6l4s291s11xijr5jsy75lbdph32f9y183lagy9m"; + meta.license = with lib.licenses; [ + lgpl2Plus + gpl2Plus + ]; }; uz = buildOfficialDict { @@ -881,6 +997,7 @@ in rec { fullName = "Uzbek"; filename = "aspell6"; sha256 = "0sg3wlyply1idpq5ypyj7kgnaadaiskci1sqs811yhg2gzyc3092"; + meta.license = lib.licenses.gpl2Only; }; vi = buildOfficialDict { @@ -889,6 +1006,7 @@ in rec { fullName = "Vietnamese"; filename = "aspell6"; sha256 = "05vwgvf1cj45azhflywx69javqdvqd1f20swrc2d3c32pd9mvn1w"; + meta.license = lib.licenses.gpl2Only; }; wa = buildOfficialDict { @@ -897,6 +1015,7 @@ in rec { fullName = "Walloon"; filename = "aspell"; sha256 = "1r1zwz7xkx40dga9vf5wc9ja3jwk1dkpcr1kaa7wryvslf5al5ss"; + meta.license = lib.licenses.gpl2Only; }; yi = buildOfficialDict { @@ -905,6 +1024,7 @@ in rec { fullName = "Yiddish"; filename = "aspell6"; sha256 = "0mi842l4038bx3ll2wx9nz44nqrg1x46h5b02zigi1hbbddd6ycq"; + meta.license = lib.licenses.gpl2Only; }; zu = buildOfficialDict { @@ -913,6 +1033,7 @@ in rec { fullName = "Zulu"; filename = "aspell"; sha256 = "15k7gaxrnqnssdyk9l6g27dq317dqp9jz5yzafd25ri01g6mb8iz"; + meta.license = lib.licenses.lgpl21Only; }; ### Jargons @@ -937,6 +1058,7 @@ in rec { meta = { homepage = "https://mrsatterly.com/spelling.html"; + license = lib.licenses.wtfpl; # as a comment the source file }; }; @@ -945,13 +1067,13 @@ in rec { fullName = "English Scientific Jargon"; src1 = fetchurl { - url = "http://jpetrie.net/wp-content/uploads/custom_scientific_US.txt"; - sha256 = "1nf4py2mg0mlv9s5a7had2wn29z2v6bcca0fs6rbpdn4nqc4s7dm"; + url = "https://web.archive.org/web/20180806094650if_/http://jpetrie.net/wp-content/uploads/custom_scientific_US.txt"; + hash = "sha256-I5d/jf/5v9Nptu2H9qfvMBzSwJYoQOTEzJfQTxKoWN8="; }; src2 = fetchurl { - url = "http://jpetrie.net/wp-content/uploads/custom_scientific_UK.txt"; - sha256 = "0f88il1ds6qazy1ghxviqcwsywrbf6pzl2lmzf4f3qvhdfb6f1y0"; + url = "https://web.archive.org/web/20180131231829if_/http://jpetrie.net/wp-content/uploads/custom_scientific_UK.txt"; + hash = "sha256-oT4nUiev5q4QjHeuF8jNVBcyyHE9fdH9+uDMkZsOWp8="; }; langInputs = [ en ]; @@ -965,7 +1087,9 @@ in rec { installPhase = "aspell-install en_US-science en_GB-science"; meta = { - homepage = "http://www.jpetrie.net/scientific-word-list-for-spell-checkersspelling-dictionaries/"; + homepage = "https://web.archive.org/web/20210425104207/http://www.jpetrie.net/scientific-word-list-for-spell-checkersspelling-dictionaries/"; + # no license is given so we have to assume it is unfree + license = lib.licenses.unfree; }; }; diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index 9a9b774ad265..e7915ad65214 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -11,6 +11,7 @@ , config , guiSupport ? false , libX11 +, enableShared ? !stdenv.hostPlatform.isStatic # dlib has a build system that forces the user to choose between either shared or static libraries. See https://github.com/davisking/dlib/issues/923#issuecomment-2175865174 , sse4Support ? stdenv.hostPlatform.sse4_1Support , avxSupport ? stdenv.hostPlatform.avxSupport , cudaSupport ? config.cudaSupport @@ -32,6 +33,7 @@ ''; cmakeFlags = [ + (lib.cmakeBool "BUILD_SHARED_LIBS" enableShared) (lib.cmakeBool "USE_SSE4_INSTRUCTIONS" sse4Support) (lib.cmakeBool "USE_AVX_INSTRUCTIONS" avxSupport) (lib.cmakeBool "DLIB_USE_CUDA" cudaSupport) diff --git a/pkgs/development/misc/avr/libc/default.nix b/pkgs/development/misc/avr/libc/default.nix index 654f2382ca3f..c2b35ed72204 100644 --- a/pkgs/development/misc/avr/libc/default.nix +++ b/pkgs/development/misc/avr/libc/default.nix @@ -2,11 +2,12 @@ stdenv.mkDerivation rec { pname = "avr-libc"; - version = "2.1.0"; + version = "2.2.0"; + tag_version = builtins.replaceStrings ["."] ["_"] version; src = fetchurl { - url = "https://download.savannah.gnu.org/releases/avr-libc/avr-libc-${version}.tar.bz2"; - sha256 = "1s2lnqsbr1zs7dvsbyyckay52lm8mbjjaqf3cyx5qpcbq3jwx10b"; + url = "https://github.com/avrdudes/avr-libc/releases/download/avr-libc-${tag_version}-release/avr-libc-${version}.tar.bz2"; + hash = "sha256-Bxjv1PVCeId9ploLIDtAIHOzDgTf6piObyqINa0HHTU="; }; nativeBuildInputs = [ automake autoconf ]; diff --git a/pkgs/development/ocaml-modules/uri/default.nix b/pkgs/development/ocaml-modules/uri/default.nix index a5c89c76db27..f8e8efdaae67 100644 --- a/pkgs/development/ocaml-modules/uri/default.nix +++ b/pkgs/development/ocaml-modules/uri/default.nix @@ -11,7 +11,7 @@ buildDunePackage rec { src = fetchurl { url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; - sha256 = "0szifda6yism5vn5jdizkha3ad0xk6zw4xgfl8g77dnv83ci7h65"; + sha256 = "cdabaf6ef5cd2161e59cc7b74c6e4a68ecb80a9f4e96002e338e1b6bf17adec4"; }; checkInputs = [ ounit ]; diff --git a/pkgs/development/python-modules/aiowatttime/default.nix b/pkgs/development/python-modules/aiowatttime/default.nix index 74e85adc6913..9932f9f82220 100644 --- a/pkgs/development/python-modules/aiowatttime/default.nix +++ b/pkgs/development/python-modules/aiowatttime/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aiowatttime"; - version = "2023.12.0"; + version = "2024.06.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-sodgFveVE2Z894z36AzXF6c3iI4UhaqMJK+H6CjsvGA="; + hash = "sha256-c5L+Nx+CoWEc6Bs61GOHPBelExe5I7EOlMQ+QV6nktI="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 079dd1dd2ce8..4811bda0370f 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -366,7 +366,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.128"; + version = "1.34.129"; pyproject = true; disabled = pythonOlder "3.7"; @@ -374,7 +374,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-9N/yCKnPAHl6bCsYR6so0LkxqGpBvwDI5PVbN/tmEaU="; + hash = "sha256-CXHgszlO4agOSfTcLoUI3JqHi/kbNNlbsx6Mw0CdFvk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index dd41a6f1810c..ee72f50008bf 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.34.128"; + version = "1.34.129"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-AOWRCzr7dkIiCNerbD87LUEl4yA+Fb9HwP9fnjjwDBk="; + hash = "sha256-Ub/NAA2bafFkucZMYhUYmvx6hgm8Jj+Tmr0QcEzah6Q="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/clustershell/default.nix b/pkgs/development/python-modules/clustershell/default.nix index 5617813d7443..284e5a0eb53a 100644 --- a/pkgs/development/python-modules/clustershell/default.nix +++ b/pkgs/development/python-modules/clustershell/default.nix @@ -69,10 +69,9 @@ buildPythonPackage rec { rm tests/TaskDistantPdshMixin.py rm tests/TaskDistantPdshTest.py rm tests/TaskRLimitsTest.py + rm tests/TreeGatewayTest.py nosetests -v \ - -e test_channel_ctl_shell_remote1 \ - -e test_channel_ctl_shell_remote2 \ -e test_fromall_grouplist \ -e test_rank_placeholder \ -e test_engine_on_the_fly_launch \ @@ -92,9 +91,6 @@ buildPythonPackage rec { -e testClushConfigSetRlimit \ -e testTimerInvalidateInHandler \ -e testTimerSetNextFireInHandler \ - -e test_channel_ctl_shell_mlocal1 \ - -e test_channel_ctl_shell_mlocal2 \ - -e test_channel_ctl_shell_mlocal3 \ -e test_node_placeholder \ tests/*.py ''; diff --git a/pkgs/development/python-modules/dnf-plugins-core/default.nix b/pkgs/development/python-modules/dnf-plugins-core/default.nix index 4ad92ba66406..8c518bfe4f93 100644 --- a/pkgs/development/python-modules/dnf-plugins-core/default.nix +++ b/pkgs/development/python-modules/dnf-plugins-core/default.nix @@ -23,7 +23,7 @@ in buildPythonPackage rec { pname = "dnf-plugins-core"; - version = "4.7.0"; + version = "4.8.0"; format = "other"; outputs = [ @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "rpm-software-management"; repo = "dnf-plugins-core"; rev = "refs/tags/${version}"; - hash = "sha256-AQnnXjkUajztbyoKzKhxiKxZsb2o2+7C15fsrxGkWcM="; + hash = "sha256-8RkTSO+F5fc3T8r79PRoW5KfEG2DmIzN2ylC9Np6LrQ="; }; patches = [ ./fix-python-install-dir.patch ]; diff --git a/pkgs/development/python-modules/dunamai/default.nix b/pkgs/development/python-modules/dunamai/default.nix index 6631ac27fda1..2ac7229c325b 100644 --- a/pkgs/development/python-modules/dunamai/default.nix +++ b/pkgs/development/python-modules/dunamai/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dunamai"; - version = "1.19.2"; + version = "1.20.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mtkennerly"; repo = "dunamai"; rev = "refs/tags/v${version}"; - hash = "sha256-oLJlBytdp9uVdKEdYDMz/IYnPP7XVnCUcThKO3IiW10="; + hash = "sha256-K7G5BiUm8QTRbw0W3ebTld7CAZI8sYSnRsD7vQhCptE="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/google-generativeai/default.nix b/pkgs/development/python-modules/google-generativeai/default.nix index 2d8673ad3fdf..13f9386eb135 100644 --- a/pkgs/development/python-modules/google-generativeai/default.nix +++ b/pkgs/development/python-modules/google-generativeai/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "google-generativeai"; - version = "0.6.0"; + version = "0.7.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "google"; repo = "generative-ai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-LPT7pyI1crgLCMHZmjGLFvDwuLwdPNGojgvli6qUOy8="; + hash = "sha256-cK5Go5mFy+dC5/B4aMLDjZytNZn79r+ZvOEwAW0FPrI="; }; pythonRelaxDeps = [ "google-ai-generativelanguage" ]; diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index 9bc64d3700be..64694b89471c 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "0.46.0"; + version = "0.47.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "griffe"; rev = "refs/tags/${version}"; - hash = "sha256-ZvOH2MF9MH7FB5DDQ70rYB7fgqoffbqZhKgpWYtChck="; + hash = "sha256-NkS8cD0G/nbquQfMVcdbTLnJx26PQnqWB8UnBTNIBdE="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/gvm-tools/default.nix b/pkgs/development/python-modules/gvm-tools/default.nix index 35cd9afd4403..8e1e2124c103 100644 --- a/pkgs/development/python-modules/gvm-tools/default.nix +++ b/pkgs/development/python-modules/gvm-tools/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "gvm-tools"; - version = "24.3.0"; + version = "24.6.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = "gvm-tools"; rev = "refs/tags/v${version}"; - hash = "sha256-LLXMdT1q6IWsbsRjflpGN5pcjUCXWzdFK3gMw4mBm0U="; + hash = "sha256-R8wpkzL2QxGdvc6vWtrbIGEiryc+QQ3OitdxMcpH+F4="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/hdate/default.nix b/pkgs/development/python-modules/hdate/default.nix index 0a005cba2ac6..214aa83fbbc0 100644 --- a/pkgs/development/python-modules/hdate/default.nix +++ b/pkgs/development/python-modules/hdate/default.nix @@ -3,7 +3,7 @@ astral, buildPythonPackage, fetchFromGitHub, - poetry-core, + pdm-backend, pythonRelaxDepsHook, pytestCheckHook, pythonOlder, @@ -12,26 +12,25 @@ buildPythonPackage rec { pname = "hdate"; - version = "0.10.8"; + version = "0.10.9"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "py-libhdate"; repo = "py-libhdate"; rev = "refs/tags/v${version}"; - hash = "sha256-SANCZl+1ghUuuxZAl6oycvo7hB7mIagjVEmwzarsspk="; + hash = "sha256-Cni8GegB8GAhtIKKCgSn3QavE/Gi9Rcm9v0grToMyq4="; }; - build-system = [ - poetry-core - pythonRelaxDepsHook - ]; - pythonRelaxDeps = [ "astral" - "pytz" + ]; + + build-system = [ + pdm-backend + pythonRelaxDepsHook ]; dependencies = [ @@ -49,7 +48,7 @@ buildPythonPackage rec { description = "Python module for Jewish/Hebrew date and Zmanim"; homepage = "https://github.com/py-libhdate/py-libhdate"; changelog = "https://github.com/py-libhdate/py-libhdate/releases/tag/v${version}"; - license = with licenses; [ gpl3Plus ]; + license = licenses.gpl3Plus; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index b8caf2c9bcfe..1f4ff0ea627f 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "oauthenticator"; - version = "16.3.0"; + version = "16.3.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QMddGJUfafXoBxMCjlx1lH45a4Bab3AP4j8Px7JxYaQ="; + hash = "sha256-gFhhOCcmorkrLxrup9fICh5ueCrc64fxfuZXTQG1tMk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 6d238e872403..9d594dbede78 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.1.20240616"; + version = "0.10.1.20240618"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fVmEBr9omsCeRAsaPUZ07y1in/bx7JeGHIPwrBxGpY8="; + hash = "sha256-+wJoH/vCwNPmQlQfikDmnqbNQlMLA315N+U4Yvy/mMw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyorthanc/default.nix b/pkgs/development/python-modules/pyorthanc/default.nix index 0c33fc231974..a65d8d6b983b 100644 --- a/pkgs/development/python-modules/pyorthanc/default.nix +++ b/pkgs/development/python-modules/pyorthanc/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, - pythonRelaxDepsHook, poetry-core, httpx, pydicom, @@ -11,30 +10,25 @@ buildPythonPackage rec { pname = "pyorthanc"; - version = "1.16.1"; + version = "1.18.0"; disabled = pythonOlder "3.8"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "gacou54"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6l3L0YUAqedyRjlQ6K3SaAMdGK2C0AeKpJj6MyXi4RA="; + hash = "sha256-ObZjTiEB4a7ForsugzKZDdIsTEWOX1zbv53ZJ4AllHE="; }; - nativeBuildInputs = [ - pythonRelaxDepsHook - poetry-core - ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ httpx pydicom ]; - pythonRelaxDeps = [ "httpx" ]; - doCheck = false; # requires orthanc server (not in Nixpkgs) pythonImportsCheck = [ "pyorthanc" ]; diff --git a/pkgs/development/python-modules/python-gvm/default.nix b/pkgs/development/python-modules/python-gvm/default.nix index 6d7923023689..098bc746f553 100644 --- a/pkgs/development/python-modules/python-gvm/default.nix +++ b/pkgs/development/python-modules/python-gvm/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "python-gvm"; - version = "24.3.0"; + version = "24.6.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = "python-gvm"; rev = "refs/tags/v${version}"; - hash = "sha256-GIEsP8+RJMIehsBbZWpIRXCdqxm042lPbYTHY7/fknM="; + hash = "sha256-4Wa8O6kt4FsQk6VvE1dCdl9hQReO3YCf/4hTGcGaQxE="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 2d05f0d7eb3b..e681e1f6d555 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.9.2"; + version = "0.9.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-wkOmwZ4pE5AqZkAUyxgBHywCcJlcMauzJ8OO3Po2u4s="; + hash = "sha256-tCT43wbDScL/aoQFmLPkrw59a88f4qpNeNa0Q27H9wA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 698964e471fe..2ba8856349ac 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1170"; + version = "3.0.1171"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-O0bxsvQYJaKEkgdglWH8q4NddA1LFpAU05HHHf8yhVE="; + hash = "sha256-8ZjC4gfTVLuH8b90xzURHhowFS/vdXBjWP64ZoiM7/E="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/timm/default.nix b/pkgs/development/python-modules/timm/default.nix index be58f447dba4..a02c90152435 100644 --- a/pkgs/development/python-modules/timm/default.nix +++ b/pkgs/development/python-modules/timm/default.nix @@ -5,6 +5,7 @@ fetchFromGitHub, pdm-backend, huggingface-hub, + numpy, pyyaml, safetensors, torch, @@ -16,22 +17,23 @@ buildPythonPackage rec { pname = "timm"; - version = "1.0.3"; + version = "1.0.7"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "huggingface"; repo = "pytorch-image-models"; rev = "refs/tags/v${version}"; - hash = "sha256-h2J1v2zXUMGRKBBqq+RnxrXKOzlD5RRrVoODWSuj9Ms="; + hash = "sha256-0o88gOZvHXblGPwyRIz2D3sD7wdg0J0knrAFlognEOY="; }; build-system = [ pdm-backend ]; dependencies = [ huggingface-hub + numpy pyyaml safetensors torch diff --git a/pkgs/development/python-modules/tskit/default.nix b/pkgs/development/python-modules/tskit/default.nix index 82f8e6b6a5f8..0299fea08e5a 100644 --- a/pkgs/development/python-modules/tskit/default.nix +++ b/pkgs/development/python-modules/tskit/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchPypi, - setuptools-scm, + setuptools, pythonOlder, numpy, jsonschema, @@ -11,20 +11,21 @@ buildPythonPackage rec { pname = "tskit"; - version = "0.5.6"; - format = "pyproject"; + version = "0.5.7"; + pyproject = true; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-3f4hPxywY822mCF3IwooBezX38fM1zAm4Th4q//SzkY="; + hash = "sha256-yD+2W1tzzi+5wFoZrqNe+jJLpWyx6ZILBgKivDE+wiM="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ - numpy + dependencies = [ jsonschema + numpy svgwrite ]; @@ -34,11 +35,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "tskit" ]; - meta = with lib; { + meta = { description = "Tree sequence toolkit"; mainProgram = "tskit"; homepage = "https://github.com/tskit-dev/tskit"; - license = licenses.mit; - maintainers = with maintainers; [ alxsimon ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ alxsimon ]; }; } diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index b192152f66bc..204637733d55 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "9.1.1"; + version = "9.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-LluMl5NdyI4aobxNoLtBv5BU4sAq/EhqvqNAxhOA5Og="; + hash = "sha256-vENcbkWXSdhHv3QYjhu8j2UmzmEFHaSD0xDb2pbxqMM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 614f78d54853..3b925694c93c 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.138"; + version = "3.2.140"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-xgEVUZF6d/vmqaKVTxt0MtppqDBhPEzQcY37WVOR/EE="; + hash = "sha256-CqmXUz58eBMNrgfTDP/7M03R8vw9ys9/devRfFvWbBw="; }; patches = [ ./flake8-compat-5.x.patch ]; diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index 2bbd0135d615..fa5881a1cb0c 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.17.4"; + version = "2.17.5"; dontConfigure = true; dontBuild = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - hash = "sha256-4BfIu81e/XR23Kp8+b6/KRbuji2Od53a1urcyjXX1q8="; + hash = "sha256-Ay+8NOYq1sBIDhCoju2/L8Ghegmxz5NmtpBLb0hqH/E="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/dprint/default.nix b/pkgs/development/tools/dprint/default.nix index af428be72e8d..e2d35dd403d5 100644 --- a/pkgs/development/tools/dprint/default.nix +++ b/pkgs/development/tools/dprint/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "dprint"; - version = "0.46.2"; + version = "0.46.3"; src = fetchCrate { inherit pname version; - sha256 = "sha256-P7q2WLTGydC652N4jvTiF7hm4HRmSWnRv9+AuxRoC5Y="; + sha256 = "sha256-IyhKxCqLyboEZINalI6bd///sUxWvmWlQVrzMA2sNdU="; }; - cargoHash = "sha256-xmMFqqADIwIII+arW9gZyf95yXOkBMDRDOaG0Nay7hQ="; + cargoHash = "sha256-46t6Y2UuRCAnvOhEPLgYN+fHHtJYxuflRT3DClLTDQk="; buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; diff --git a/pkgs/development/tools/hclfmt/default.nix b/pkgs/development/tools/hclfmt/default.nix index 3fd10b5e082a..730d44272b32 100644 --- a/pkgs/development/tools/hclfmt/default.nix +++ b/pkgs/development/tools/hclfmt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hclfmt"; - version = "2.20.1"; + version = "2.21.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "hcl"; rev = "v${version}"; - hash = "sha256-+4K6k32azx/66eag9c6lUN8TUJ1ICx4Q8zpnTJWqgQ0="; + hash = "sha256-izbctn5OqaDunQLovgCGTgqMzC9i227zXlXUNCEExvA="; }; - vendorHash = "sha256-L5OabeDUXbrwFOgWRhi9FPTWK+xbL54ZM7cYhS15Jis="; + vendorHash = "sha256-F2i7ph9GL9Xo43da6jHPn9P9FdWC6eSgqCyHPBxdFJY="; # The code repository includes other tools which are not useful. Only build # hclfmt. diff --git a/pkgs/development/tools/jbang/default.nix b/pkgs/development/tools/jbang/default.nix index a21d26def2c3..e76caa4c58d8 100644 --- a/pkgs/development/tools/jbang/default.nix +++ b/pkgs/development/tools/jbang/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { cp -r . $out wrapProgram $out/bin/jbang \ --set JAVA_HOME ${jdk} \ - --set PATH ${lib.makeBinPath [ coreutils jdk curl ]} + --set PATH ${lib.makeBinPath [ (placeholder "out") coreutils jdk curl ]} runHook postInstall ''; diff --git a/pkgs/development/tools/operator-sdk/default.nix b/pkgs/development/tools/operator-sdk/default.nix index fa9379ab62ee..b334654dd924 100644 --- a/pkgs/development/tools/operator-sdk/default.nix +++ b/pkgs/development/tools/operator-sdk/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "operator-sdk"; - version = "1.34.2"; + version = "1.35.0"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-vVa1ljPRSHSo7bVqPkRt/jbuSlzLmnVaLnyreskwOrM="; + hash = "sha256-KalG1DLhvXEjNAOeP79BMYvI74j6nKnDkOYubIJ0Shs="; }; - vendorHash = "sha256-YspUrnSS6d8Ta8dmUjx9A5D/V5Bqm08DQJrRBaIGyQg="; + vendorHash = "sha256-TuDbQoC9at3yQikGTfsAKJ5kc/naqLqfHEwXLOv+12A="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/development/tools/twilio-cli/default.nix b/pkgs/development/tools/twilio-cli/default.nix index 7a5a3e4bad08..fe0544b67137 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.20.1"; + version = "5.21.0"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - hash = "sha256-tS30wEXUhzPUPh5gY+UZF274/EOfwMGU19glXUrDuw0="; + hash = "sha256-rtI89baKJS4itwTcHY9IjKeskQO6mz/c746wdVy4cG4="; }; buildInputs = [ nodejs-slim ]; diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 12ad864a3a40..28820426e109 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.1.13"; + version = "1.1.14"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-pg6nL+brc1B7GyBt8Y/FFqdBKt8uTw9KhNqITYbdi5A="; + hash = "sha256-JKUAmUW/Lh78RUZBOk1cXLpMrhxskXW6BO+WcYanWFs="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-18iAnXEELi+YvRVs1PP1MqZPeROVVl4T+qu2izyE4s0="; + hash = "sha256-kBkzOLG8O4OvjwKHiDiYFEvAe3QtDJDdoGKvMzSY5wA="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - hash = "sha256-NeYGWYG3kRevI0CIShe4AHJzLRDV9cFbiaP7lpZO18A="; + hash = "sha256-zDngJ0zTRCQqufNmGRjwzi+77K4TpP6C/2lVqA4yEI0="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-QC6dsWjRYiuBIojxPvs8NFMSU6ZbXbZ9Q/+u+45NmPc="; + hash = "sha256-LCfBxZMR+DI9HDvk3ZCJGFPtev+4U9AcxY/qDYbpOuA="; }; }; updateScript = writeShellScript "update-bun" '' @@ -92,7 +92,7 @@ stdenvNoCC.mkDerivation rec { lgpl21Only # javascriptcore and webkit ]; mainProgram = "bun"; - maintainers = with maintainers; [ DAlperin jk thilobillerbeck cdmistman coffeeispower ]; + maintainers = with maintainers; [ DAlperin jk thilobillerbeck cdmistman coffeeispower diogomdp ]; platforms = builtins.attrNames passthru.sources; # Broken for Musl at 2024-01-13, tracking issue: # https://github.com/NixOS/nixpkgs/issues/280716 diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index f1a970485107..c8de1418333a 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -13,16 +13,16 @@ }: rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.44.2"; + version = "1.44.3"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - hash = "sha256-Q76j1cbRL52jmmkpTZMkpP3/FCeGZqKYAN819mQY9BE="; + hash = "sha256-KSCHVoKZiInxsnM+2sgyl87Wz9K9mjGjT4356m3+haY="; }; - cargoHash = "sha256-UtnHOzlko5RUAbohwU755BDLSF/Rx20vabaKokEsRLU="; + cargoHash = "sha256-/ZxCM8/xLccOzzU5gfX0eC/DJwgqFngXM3cg+F/ZFAM="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index f328190773ae..e04421421180 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.2.71"; + version = "0.2.72"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-d2qoTRWuUh7Kn0uqT3fIlB8BbFJmyVEIlfInS3m+etc="; + hash = "sha256-v2+xDeErVkgiGavPpBtKg7+BBhiKZdmbo2NIFL7iXvw="; }; vendorHash = "sha256-iRZrjkWQxuUW/YM5TygFt+g8suM5iLGsWsCt4QQOX3M="; @@ -35,14 +35,12 @@ buildGoModule rec { ''; # We override checkPhase to be able to test ./... while using subPackages - # Temporary fix for https://github.com/superfly/flyctl/issues/3642. We - # should go back to buildGoDir instead of go test once that is resolved. checkPhase = '' runHook preCheck # We do not set trimpath for tests, in case they reference test assets export GOFLAGS=''${GOFLAGS//-trimpath/} - go test ./... + buildGoDir test ./... runHook postCheck ''; |