diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-01-09 00:14:37 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-09 00:14:37 +0000 |
commit | fb50c4dbba6e718666f2c964402e58bf853c75bc (patch) | |
tree | 4cbad8db173331ec41befc1c5dd6484626521e44 /pkgs/development | |
parent | 43af53bc7f49b3c542604ddae08cbdb61a276c2b (diff) | |
parent | 4769274f53e6ccf1512da30c20e26952633f8b59 (diff) |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/development')
67 files changed, 835 insertions, 287 deletions
diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index f8de9f57b5d3b..f9ba2e1ac4170 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -34,12 +34,21 @@ stdenv.mkDerivation rec { hash = "sha256-UWgDjFojPBYgykrCrJyYvVWY+Gc5d4aRGjTWjc528AM="; }; + postPatch = lib.optionalString stdenv.cc.isClang '' + sed -i 's/gcc/clang/g' utils/*/DATS/atscc_util.dats + ''; + buildInputs = [ gmp ]; # Disable parallel build, errors: # *** No rule to make target 'patscc.dats', needed by 'patscc_dats.c'. Stop. enableParallelBuilding = false; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "CCOMP=${stdenv.cc.targetPrefix}cc" + ]; + setupHook = with lib; let hookFiles = @@ -55,7 +64,7 @@ stdenv.mkDerivation rec { description = "Functional programming language with dependent types"; homepage = "http://www.ats-lang.org"; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice ttuegel bbarker ]; }; } diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index f9a801284686e..642bcff6469e4 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -24,9 +24,11 @@ let sha256 = hash; }; }; + flutter2Patches = getPatches ./patches/flutter2; + flutter3Patches = getPatches ./patches/flutter3; in { - inherit mkFlutter; + inherit mkFlutter flutterDrv flutter2Patches flutter3Patches; stable = flutterDrv { pname = "flutter"; version = "3.3.8"; @@ -36,7 +38,7 @@ in x86_64-linux = "sha256-lFw+KaxzhuAMnu6ypczINqywzpiD+8Kd+C/UHJDrO9Y="; aarch64-linux = "sha256-snlFTY4oJ4ALGLc210USbI2Z///cx1IVYUWm7Vo5z2I="; }; - patches = getPatches ./patches/flutter3; + patches = flutter3Patches; }; v2 = flutterDrv { @@ -48,6 +50,6 @@ in x86_64-linux = "sha256-egrYd7B4XhkBiHPIFE2zopxKtQ58GqlogAKA/UeiXnI="; aarch64-linux = "sha256-vmerjXkUAUnI8FjK+62qLqgETmA+BLPEZXFxwYpI+KY="; }; - patches = getPatches ./patches/flutter2; + patches = flutter2Patches; }; } diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index a882824043b99..26d2e2aef4be5 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -875,17 +875,16 @@ self: super: builtins.intersectAttrs super { ]; cachix = super.cachix.override { - nix = pkgs.nixVersions.nix_2_10; - fsnotify = super.fsnotify_0_4_1_0; + nix = self.hercules-ci-cnix-store.passthru.nixPackage; + fsnotify = dontCheck super.fsnotify_0_4_1_0; hnix-store-core = super.hnix-store-core_0_6_1_0; }; - hercules-ci-agent = super.hercules-ci-agent.override { nix = pkgs.nixVersions.nix_2_10; }; - hercules-ci-cnix-expr = - addTestToolDepend pkgs.git ( - super.hercules-ci-cnix-expr.override { nix = pkgs.nixVersions.nix_2_10; } - ); - hercules-ci-cnix-store = super.hercules-ci-cnix-store.override { nix = pkgs.nixVersions.nix_2_10; }; + hercules-ci-agent = super.hercules-ci-agent.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; }; + hercules-ci-cnix-expr = addTestToolDepend pkgs.git (super.hercules-ci-cnix-expr.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; }); + hercules-ci-cnix-store = (super.hercules-ci-cnix-store.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; }).overrideAttrs (_: { + passthru.nixPackage = pkgs.nixVersions.nix_2_12; + }); # the testsuite fails because of not finding tsc without some help aeson-typescript = overrideCabal (drv: { diff --git a/pkgs/development/interpreters/luau/default.nix b/pkgs/development/interpreters/luau/default.nix index 783717624ab20..baed9801ebe87 100644 --- a/pkgs/development/interpreters/luau/default.nix +++ b/pkgs/development/interpreters/luau/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "luau"; - version = "0.555"; + version = "0.558"; src = fetchFromGitHub { owner = "Roblox"; repo = "luau"; rev = version; - sha256 = "sha256-p3BTtjTmg8sS0gOugPCO1oqqboppcXa0wLHmRqmf3AA="; + hash = "sha256-103TLfVmXBN3Vd31nbBu7RlxrG4DX6xn/vpveIdnm5E="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index f48bc87b55abc..a6dc3a95c9cda 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -311,7 +311,12 @@ in { minor = "3"; patch = "11"; }; - sha256 = "sha256-1QYXLKEQcSdBdddOnFgcMWZDLQF5sDZHDjuejSDq5YE="; # linux64 + sha256 = { + aarch64-linux = "sha256-CRddxlLtiV2Y6a1j0haBK/PufjmNkAqb+espBrqDArk="; + x86_64-linux = "sha256-1QYXLKEQcSdBdddOnFgcMWZDLQF5sDZHDjuejSDq5YE="; + aarch64-darwin = "sha256-ka11APGjlTHb76CzRaPc/5J/+ZcWVOjS6e98WuMR9X4="; + x86_64-darwin = "sha256-0z9AsgcJmHJYWv1xhzV1ym6mOKJ9gjvGISOMWuglQu0="; + }.${stdenv.system}; pythonVersion = "3.9"; inherit passthruFun; }; diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index 801099dd44b34..6fad25ee8d630 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -19,11 +19,9 @@ assert zlibSupport -> zlib != null; -with lib; - let - isPy3k = substring 0 1 pythonVersion == "3"; - isPy39OrNewer = versionAtLeast pythonVersion "3.9"; + isPy3k = (lib.versions.major pythonVersion) == "3"; + isPy39OrNewer = lib.versionAtLeast pythonVersion "3.9"; passthru = passthruFun { inherit self sourceVersion pythonVersion packageOverrides; implementation = "pypy"; @@ -54,25 +52,23 @@ in with passthru; stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl libX11 gdbm db - ] ++ optionals isPy3k [ + ] ++ lib.optionals isPy3k [ xz - ] ++ optionals (stdenv ? cc && stdenv.cc.libc != null) [ + ] ++ lib.optionals (stdenv ? cc && stdenv.cc.libc != null) [ stdenv.cc.libc - ] ++ optionals zlibSupport [ + ] ++ lib.optionals zlibSupport [ zlib - ] ++ optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ libunwind Security ]; - hardeningDisable = optional stdenv.isi686 "pic"; - # Remove bootstrap python from closure dontPatchShebangs = true; disallowedReferences = [ python ]; - C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" buildInputs; - LIBRARY_PATH = makeLibraryPath buildInputs; - LD_LIBRARY_PATH = makeLibraryPath (filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs); + C_INCLUDE_PATH = lib.makeSearchPathOutput "dev" "include" buildInputs; + LIBRARY_PATH = lib.makeLibraryPath buildInputs; + LD_LIBRARY_PATH = lib.makeLibraryPath (builtins.filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs); patches = [ ./dont_fetch_vendored_deps.patch @@ -96,14 +92,47 @@ in with passthru; stdenv.mkDerivation rec { substituteInPlace lib_pypy/pypy_tools/build_cffi_imports.py \ --replace "multiprocessing.cpu_count()" "$NIX_BUILD_CORES" - substituteInPlace "lib-python/${if isPy3k then "3/tkinter/tix.py" else "2.7/lib-tk/Tix.py"}" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" + substituteInPlace "lib-python/${if isPy3k then "3/tkinter/tix.py" else "2.7/lib-tk/Tix.py"}" \ + --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" ''; buildPhase = '' + runHook preBuild + ${pythonForPypy.interpreter} rpython/bin/rpython \ --make-jobs="$NIX_BUILD_CORES" \ -Ojit \ --batch pypy/goal/targetpypystandalone.py + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,include,lib,${executable}-c} + + cp -R {include,lib_pypy,lib-python,${executable}-c} $out/${executable}-c + cp lib${executable}-c${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/ + ln -s $out/${executable}-c/${executable}-c $out/bin/${executable} + ${lib.optionalString isPy39OrNewer "ln -s $out/bin/${executable} $out/bin/pypy3"} + + # other packages expect to find stuff according to libPrefix + ln -s $out/${executable}-c/include $out/include/${libPrefix} + ln -s $out/${executable}-c/lib-python/${if isPy3k then "3" else pythonVersion} $out/lib/${libPrefix} + + # Include a sitecustomize.py file + cp ${../sitecustomize.py} $out/lib/${libPrefix}/${sitePackages}/sitecustomize.py + + runHook postInstall + ''; + + preFixup = lib.optionalString (stdenv.isDarwin) '' + install_name_tool -change @rpath/lib${executable}-c.dylib $out/lib/lib${executable}-c.dylib $out/bin/${executable} + '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + mkdir -p $out/${executable}-c/pypy/bin + mv $out/bin/${executable} $out/${executable}-c/pypy/bin/${executable} + ln -s $out/${executable}-c/pypy/bin/${executable} $out/bin/${executable} ''; setupHook = python-setup-hook sitePackages; @@ -117,12 +146,12 @@ in with passthru; stdenv.mkDerivation rec { "test_shutil" # disable socket because it has two actual network tests that fail "test_socket" - ] ++ optionals (!isPy3k) [ + ] ++ lib.optionals (!isPy3k) [ # disable test_urllib2net, test_urllib2_localnet, and test_urllibnet because they require networking (example.com) "test_urllib2net" "test_urllibnet" "test_urllib2_localnet" - ] ++ optionals isPy3k [ + ] ++ lib.optionals isPy3k [ # disable asyncio due to https://github.com/NixOS/nix/issues/1238 "test_asyncio" # disable os due to https://github.com/NixOS/nixpkgs/issues/10496 @@ -140,30 +169,25 @@ in with passthru; stdenv.mkDerivation rec { export TERM="xterm"; export HOME="$TMPDIR"; - ${pythonForPypy.interpreter} ./pypy/test_all.py --pypy=./${executable}-c -k 'not (${concatStringsSep " or " disabledTests})' lib-python + ${pythonForPypy.interpreter} ./pypy/test_all.py --pypy=./${executable}-c -k 'not (${lib.concatStringsSep " or " disabledTests})' lib-python ''; - installPhase = '' - mkdir -p $out/{bin,include,lib,${executable}-c} - - cp -R {include,lib_pypy,lib-python,${executable}-c} $out/${executable}-c - cp lib${executable}-c${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/ - ln -s $out/${executable}-c/${executable}-c $out/bin/${executable} - ${optionalString isPy39OrNewer "ln -s $out/bin/${executable}-c $out/bin/pypy3"} - - # other packages expect to find stuff according to libPrefix - ln -s $out/${executable}-c/include $out/include/${libPrefix} - ln -s $out/${executable}-c/lib-python/${if isPy3k then "3" else pythonVersion} $out/lib/${libPrefix} - - ${lib.optionalString stdenv.isDarwin '' - install_name_tool -change @rpath/lib${executable}-c.dylib $out/lib/lib${executable}-c.dylib $out/bin/${executable} - ''} - - # verify cffi modules - $out/bin/${executable} -c ${if isPy3k then "'import tkinter;import sqlite3;import curses;import lzma'" else "'import Tkinter;import sqlite3;import curses'"} - - # Include a sitecustomize.py file - cp ${../sitecustomize.py} $out/lib/${libPrefix}/${sitePackages}/sitecustomize.py + # verify cffi modules + doInstallCheck = true; + installCheckPhase = let + modules = [ + "curses" + "sqlite3" + ] ++ lib.optionals (!isPy3k) [ + "Tkinter" + ] ++ lib.optionals isPy3k [ + "tkinter" + "lzma" + ]; + imports = lib.concatMapStringsSep "; " (x: "import ${x}") modules; + in '' + echo "Testing whether we can import modules" + $out/bin/${executable} -c '${imports}' ''; inherit passthru; @@ -174,7 +198,6 @@ in with passthru; stdenv.mkDerivation rec { description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})"; license = licenses.mit; platforms = [ "aarch64-linux" "x86_64-linux" "aarch64-darwin" "x86_64-darwin" ]; - broken = stdenv.isDarwin && stdenv.isAarch64; maintainers = with maintainers; [ andersk ]; }; } diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix index 7c5d94f474450..a25ab8a782210 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -12,6 +12,8 @@ , sqlite , tcl-8_5 , tk-8_5 +, tcl-8_6 +, tk-8_6 , zlib # For the Python package set , packageOverrides ? (self: super: {}) @@ -24,8 +26,6 @@ # This version of PyPy is primarily added to speed-up translation of # our PyPy source build when developing that expression. -with lib; - let isPy3k = majorVersion == "3"; passthru = passthruFun rec { @@ -48,11 +48,18 @@ let majorVersion = lib.versions.major pythonVersion; + downloadUrls = { + aarch64-linux = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-aarch64.tar.bz2"; + x86_64-linux = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-linux64.tar.bz2"; + aarch64-darwin = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-macos_arm64.tar.bz2"; + x86_64-darwin = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-macos_x86_64.tar.bz2"; + }; + in with passthru; stdenv.mkDerivation { inherit pname version; src = fetchurl { - url = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-linux64.tar.bz2"; + url = downloadUrls.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); inherit sha256; }; @@ -62,12 +69,16 @@ in with passthru; stdenv.mkDerivation { gdbm ncurses6 sqlite + zlib + ] ++ lib.optionals stdenv.isLinux [ tcl-8_5 tk-8_5 - zlib + ] ++ lib.optionals stdenv.isDarwin [ + tcl-8_6 + tk-8_6 ]; - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; installPhase = '' runHook preInstall @@ -75,10 +86,10 @@ in with passthru; stdenv.mkDerivation { mkdir -p $out echo "Moving files to $out" mv -t $out bin include lib - - mv $out/bin/libpypy*-c.so $out/lib/ - - rm $out/bin/*.debug + mv $out/bin/libpypy*-c${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/ + ${lib.optionalString stdenv.isLinux '' + rm $out/bin/*.debug + ''} echo "Removing bytecode" find . -name "__pycache__" -type d -depth -delete @@ -89,11 +100,32 @@ in with passthru; stdenv.mkDerivation { runHook postInstall ''; - preFixup = '' + preFixup = lib.optionalString stdenv.isLinux '' find $out/{lib,lib_pypy*} -name "*.so" \ -exec patchelf \ --replace-needed libtinfow.so.6 libncursesw.so.6 \ --replace-needed libgdbm.so.4 libgdbm_compat.so.4 {} \; + '' + lib.optionalString stdenv.isDarwin '' + install_name_tool \ + -change \ + @rpath/lib${libPrefix}-c.dylib \ + $out/lib/lib${libPrefix}-c.dylib \ + $out/bin/${executable} + install_name_tool \ + -change \ + @rpath/lib${libPrefix}-c.dylib \ + $out/lib/lib${libPrefix}-c.dylib \ + $out/bin/${libPrefix} + install_name_tool \ + -change \ + /opt/homebrew${lib.optionalString stdenv.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtcl8.6.dylib \ + ${tcl-8_6}/lib/libtcl8.6.dylib \ + $out/lib/${libPrefix}/_tkinter/*.so + install_name_tool \ + -change \ + /opt/homebrew${lib.optionalString stdenv.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtk8.6.dylib \ + ${tk-8_6}/lib/libtk8.6.dylib \ + $out/lib/${libPrefix}/_tkinter/*.so ''; doInstallCheck = true; @@ -104,12 +136,12 @@ in with passthru; stdenv.mkDerivation { "ssl" "sys" "curses" - ] ++ optionals (!isPy3k) [ + ] ++ lib.optionals (!isPy3k) [ "Tkinter" - ] ++ optionals isPy3k [ + ] ++ lib.optionals isPy3k [ "tkinter" ]; - imports = concatMapStringsSep "; " (x: "import ${x}") modules; + imports = lib.concatMapStringsSep "; " (x: "import ${x}") modules; in '' echo "Testing whether we can import modules" $out/bin/${executable} -c '${imports}' @@ -126,7 +158,7 @@ in with passthru; stdenv.mkDerivation { homepage = "http://pypy.org/"; description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})"; license = licenses.mit; - platforms = [ "x86_64-linux" ]; + platforms = lib.mapAttrsToList (arch: _: arch) downloadUrls; }; } diff --git a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix index 444d43309511a..a95e0c2f651e9 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix @@ -12,6 +12,8 @@ , sqlite , tcl-8_5 , tk-8_5 +, tcl-8_6 +, tk-8_6 , zlib # For the Python package set , packageOverrides ? (self: super: {}) @@ -24,8 +26,6 @@ # This version of PyPy is primarily added to speed-up translation of # our PyPy source build when developing that expression. -with lib; - let isPy3k = majorVersion == "3"; passthru = passthruFun { @@ -69,9 +69,13 @@ in with passthru; stdenv.mkDerivation { gdbm ncurses6 sqlite + zlib + ] ++ lib.optionals stdenv.isLinux [ tcl-8_5 tk-8_5 - zlib + ] ++ lib.optionals stdenv.isDarwin [ + tcl-8_6 + tk-8_6 ]; nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; @@ -108,10 +112,19 @@ in with passthru; stdenv.mkDerivation { @rpath/lib${executable}-c.dylib \ $out/lib/lib${executable}-c.dylib \ $out/bin/${executable} + install_name_tool \ + -change \ + /opt/homebrew${lib.optionalString stdenv.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtcl8.6.dylib \ + ${tcl-8_6}/lib/libtcl8.6.dylib \ + $out/lib_pypy/_tkinter/*.so + install_name_tool \ + -change \ + /opt/homebrew${lib.optionalString stdenv.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtk8.6.dylib \ + ${tk-8_6}/lib/libtk8.6.dylib \ + $out/lib_pypy/_tkinter/*.so ''; - # Native libraries are not working in darwin - doInstallCheck = !stdenv.isDarwin; + doInstallCheck = true; # Check whether importing of (extension) modules functions installCheckPhase = let @@ -119,12 +132,12 @@ in with passthru; stdenv.mkDerivation { "ssl" "sys" "curses" - ] ++ optionals (!isPy3k) [ + ] ++ lib.optionals (!isPy3k) [ "Tkinter" - ] ++ optionals isPy3k [ + ] ++ lib.optionals isPy3k [ "tkinter" ]; - imports = concatMapStringsSep "; " (x: "import ${x}") modules; + imports = lib.concatMapStringsSep "; " (x: "import ${x}") modules; in '' echo "Testing whether we can import modules" $out/bin/${executable} -c '${imports}' diff --git a/pkgs/development/libraries/audio/cubeb/default.nix b/pkgs/development/libraries/audio/cubeb/default.nix index 7fc7f87a20ae9..baad8a1efd645 100644 --- a/pkgs/development/libraries/audio/cubeb/default.nix +++ b/pkgs/development/libraries/audio/cubeb/default.nix @@ -1,14 +1,28 @@ { lib, stdenv, fetchFromGitHub , cmake , pkg-config +, alsa-lib , jack2 -, pulseaudio +, libpulseaudio , sndio , speexdsp -, lazyLoad ? true +, AudioUnit +, CoreAudio +, CoreServices +, lazyLoad ? !stdenv.isDarwin }: -stdenv.mkDerivation { +assert lib.assertMsg (stdenv.isDarwin -> !lazyLoad) "cubeb: lazyLoad is inert on Darwin"; + +let + backendLibs = [ + alsa-lib + jack2 + libpulseaudio + sndio + ]; + +in stdenv.mkDerivation { pname = "cubeb"; version = "unstable-2022-10-18"; @@ -24,12 +38,10 @@ stdenv.mkDerivation { pkg-config ]; - buildInputs = [ - jack2 - pulseaudio - sndio - speexdsp - ]; + buildInputs = [ speexdsp ] ++ ( + if stdenv.isDarwin then [ AudioUnit CoreAudio CoreServices ] + else backendLibs + ); cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" @@ -43,14 +55,14 @@ stdenv.mkDerivation { passthru = { # For downstream users when lazyLoad is true - backendLibs = [ jack2 pulseaudio sndio speexdsp ]; + backendLibs = lib.optionals lazyLoad backendLibs; }; meta = with lib; { description = "Cross platform audio library"; homepage = "https://github.com/mozilla/cubeb"; license = licenses.isc; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ zhaofengli ]; }; } diff --git a/pkgs/development/libraries/boost/1.81.nix b/pkgs/development/libraries/boost/1.81.nix new file mode 100644 index 0000000000000..2376255303e29 --- /dev/null +++ b/pkgs/development/libraries/boost/1.81.nix @@ -0,0 +1,14 @@ +{ callPackage, fetchurl, fetchpatch, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.81.0"; + + src = fetchurl { + urls = [ + "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" + "https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" + ]; + # SHA256 from http://www.boost.org/users/history/version_1_81_0.html + sha256 = "71feeed900fbccca04a3b4f2f84a7c217186f28a940ed8b7ed4725986baf99fa"; + }; +}) diff --git a/pkgs/development/libraries/boost/default.nix b/pkgs/development/libraries/boost/default.nix index d6eaa8dff8183..b0e310973cff6 100644 --- a/pkgs/development/libraries/boost/default.nix +++ b/pkgs/development/libraries/boost/default.nix @@ -16,8 +16,6 @@ let } ); in { - boost159 = makeBoost ./1.59.nix; - boost160 = makeBoost ./1.60.nix; boost165 = makeBoost ./1.65.nix; boost166 = makeBoost ./1.66.nix; boost167 = makeBoost ./1.67.nix; @@ -33,4 +31,5 @@ in { boost178 = makeBoost ./1.78.nix; boost179 = makeBoost ./1.79.nix; boost180 = makeBoost ./1.80.nix; + boost181 = makeBoost ./1.81.nix; } diff --git a/pkgs/development/libraries/clfft/default.nix b/pkgs/development/libraries/clfft/default.nix index db18bce72be80..8af7a57e65558 100644 --- a/pkgs/development/libraries/clfft/default.nix +++ b/pkgs/development/libraries/clfft/default.nix @@ -1,5 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fftw, fftwFloat, boost166, opencl-clhpp, ocl-icd }: +{ lib, stdenv, fetchFromGitHub, cmake, fftw, fftwFloat, boost, opencl-clhpp, ocl-icd, darwin }: +let + inherit (darwin.apple_sdk.frameworks) OpenCL; +in stdenv.mkDerivation rec { pname = "clfft"; version = "2.12.2"; @@ -7,15 +10,24 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "clMathLibraries"; repo = "clFFT"; - rev = "refs/tags/v${version}"; - sha256 = "134vb6214hn00qy84m4djg4hqs6hw19gkp8d0wlq8gb9m3mfx7na"; + rev = "v${version}"; + hash = "sha256-yp7u6qhpPYQpBw3d+VLg0GgMyZONVII8BsBCEoRZm4w="; }; sourceRoot = "source/src"; + postPatch = '' + sed -i '/-m64/d;/-m32/d' CMakeLists.txt + ''; + nativeBuildInputs = [ cmake ]; - buildInputs = [ fftw fftwFloat boost166 opencl-clhpp ocl-icd ]; + buildInputs = [ fftw fftwFloat boost ] + ++ lib.optionals stdenv.isLinux [ opencl-clhpp ocl-icd ] + ++ lib.optionals stdenv.isDarwin [ OpenCL ]; + + # https://github.com/clMathLibraries/clFFT/issues/237 + CXXFLAGS = "-std=c++98"; meta = with lib; { description = "Library containing FFT functions written in OpenCL"; @@ -25,7 +37,7 @@ stdenv.mkDerivation rec { ''; license = licenses.asl20; homepage = "http://clmathlibraries.github.io/clFFT/"; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = platforms.unix; maintainers = with maintainers; [ chessai ]; }; } diff --git a/pkgs/development/libraries/htmlcxx/default.nix b/pkgs/development/libraries/htmlcxx/default.nix index af9574d136fb7..41d24b81bf696 100644 --- a/pkgs/development/libraries/htmlcxx/default.nix +++ b/pkgs/development/libraries/htmlcxx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libiconv }: +{ lib, stdenv, fetchurl, autoreconfHook, libiconv }: stdenv.mkDerivation rec { pname = "htmlcxx"; @@ -9,6 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-XTj5OM9N+aKYpTRq8nGV//q/759GD8KgIjPLz6j8dcg="; }; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ libiconv ]; patches = [ ./ptrdiff.patch @@ -20,7 +21,5 @@ stdenv.mkDerivation rec { description = "A simple non-validating css1 and html parser for C++"; license = licenses.lgpl2; platforms = platforms.all; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix index b568d903def37..c461e168b20ca 100644 --- a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -9,13 +9,13 @@ nv-codec-headers = nv-codec-headers-11; }).overrideAttrs (old: rec { pname = "jellyfin-ffmpeg"; - version = "5.1.2-5"; + version = "5.1.2-6"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-ffmpeg"; rev = "v${version}"; - sha256 = "sha256-2mSixlrTgAVD2ZRGoi1+UEbhba7QEVvKmigwC9dLk2g="; + sha256 = "sha256-YPw29cnScchL4Y2CEatUjzqUW/U9kOdi29Dr577Qy5A="; }; buildInputs = old.buildInputs ++ [ chromaprint ]; diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index 19bb1ba2afa7d..3fd247dc4e82f 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, boost, cmake, gdal, libgeotiff, libtiff, LASzip2, fixDarwinDylibNames }: +{ lib, stdenv, fetchurl, fetchpatch, boost, cmake, gdal, libgeotiff, libtiff, LASzip2, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "libLAS"; @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws"; }; + patches = [ + (fetchpatch { + name = "aarch64-darwin.patch"; + url = "https://github.com/libLAS/libLAS/commit/ded463732db1f9baf461be6f3fe5b8bb683c41cd.patch"; + sha256 = "sha256-aWMpazeefDHE9OzuLR3FJ8+oXeGhEsk1igEm6j2DUnw="; + }) + ]; + nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ boost gdal libgeotiff libtiff LASzip2 ]; @@ -31,7 +39,5 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.michelk ]; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/development/libraries/libconfuse/default.nix b/pkgs/development/libraries/libconfuse/default.nix index 7545fe9617ccb..91a5a2f26f87d 100644 --- a/pkgs/development/libraries/libconfuse/default.nix +++ b/pkgs/development/libraries/libconfuse/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, flex }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, autoreconfHook +, flex +}: stdenv.mkDerivation rec { pname = "libconfuse"; @@ -11,6 +17,18 @@ stdenv.mkDerivation rec { owner = "martinh"; }; + patches = [ + (fetchpatch { + name = "CVE-2022-40320.patch"; + urls = [ + "https://sources.debian.org/data/main/libc/libconfuse/3.3-3/debian/patches/CVE-2022-40320.patch" + # files on sources.debian.org can disappear + "https://web.archive.org/web/20230107133212/https://sources.debian.org/data/main/libc/libconfuse/3.3-3/debian/patches/CVE-2022-40320.patch" + ]; + sha256 = "sha256-ftfE9JFz4nyRSOb2xHb9BAtgWn5Yv2WLm4RegDLtiBw="; + }) + ]; + postPatch = '' substituteInPlace tests/Makefile.am \ --replace 'TESTS += empty_string' "" \ diff --git a/pkgs/development/libraries/libfreefare/default.nix b/pkgs/development/libraries/libfreefare/default.nix index c8327d72e85a1..f1466dd5a9f53 100644 --- a/pkgs/development/libraries/libfreefare/default.nix +++ b/pkgs/development/libraries/libfreefare/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libnfc, openssl +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libnfc, openssl , libobjc ? null , IOKit, Security }: @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "0r5wfvwgf35lb1v65wavnwz2wlfyfdims6a9xpslf4lsm4a1v8xz"; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libnfc openssl ] ++ lib.optionals stdenv.isDarwin [ libobjc IOKit Security ]; meta = with lib; { @@ -21,7 +21,5 @@ stdenv.mkDerivation { homepage = "https://github.com/nfc-tools/libfreefare"; maintainers = with maintainers; [bobvanderlinden]; platforms = platforms.unix; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/development/libraries/libhdhomerun/default.nix b/pkgs/development/libraries/libhdhomerun/default.nix index d643b69fb467e..96b8e3c02937a 100644 --- a/pkgs/development/libraries/libhdhomerun/default.nix +++ b/pkgs/development/libraries/libhdhomerun/default.nix @@ -13,11 +13,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-HlT/78LUiTkRUB2jHmYrnQY+bBiv4stcZlMyUnelSpc="; }; - patchPhase = lib.optionalString stdenv.isDarwin '' - substituteInPlace Makefile --replace "gcc" "cc" - substituteInPlace Makefile --replace "-arch i386" "" + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile \ + --replace "-arch x86_64" "-arch ${stdenv.hostPlatform.darwinArch}" ''; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + ]; + installPhase = '' mkdir -p $out/{bin,lib,include/hdhomerun} install -Dm444 libhdhomerun${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib @@ -31,7 +35,5 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Only; platforms = platforms.unix; maintainers = [ maintainers.titanous ]; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/development/libraries/libsnark/default.nix b/pkgs/development/libraries/libsnark/default.nix index cbd6048f457cf..54360cad4ed9d 100644 --- a/pkgs/development/libraries/libsnark/default.nix +++ b/pkgs/development/libraries/libsnark/default.nix @@ -7,7 +7,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ openssl boost gmp ] ++ lib.optional stdenv.hostPlatform.isLinux procps; - cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DWITH_PROCPS=OFF" "-DWITH_SUPERCOP=OFF" ]; + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DWITH_PROCPS=OFF" ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin || !stdenv.hostPlatform.isx86) [ "-DWITH_SUPERCOP=OFF" ] + ++ lib.optionals (!stdenv.hostPlatform.isx86) [ "-DCURVE=ALT_BN128" ]; src = fetchFromGitHub { rev = "9e6b19ff15bc19fba5da1707ba18e7f160e5ed07"; @@ -22,7 +24,5 @@ stdenv.mkDerivation rec { homepage = "https://github.com/scipr-lab/libsnark"; license = licenses.mit; platforms = lib.platforms.linux ++ lib.platforms.darwin; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = (stdenv.isDarwin && stdenv.isAarch64) || (stdenv.isLinux && stdenv.isAarch64); }; } diff --git a/pkgs/development/libraries/libticables2/default.nix b/pkgs/development/libraries/libticables2/default.nix index 4601a66985e2f..d3f2e86a964f3 100644 --- a/pkgs/development/libraries/libticables2/default.nix +++ b/pkgs/development/libraries/libticables2/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch , pkg-config , autoreconfHook , glib @@ -15,6 +16,15 @@ stdenv.mkDerivation rec { sha256 = "08j5di0cgix9vcpdv7b8xhxdjkk9zz7fqfnv3l4apk3jdr8vcvqc"; }; + patches = [ + (fetchpatch { + name = "add-support-for-aarch64-macos-target-triple.patch"; + url = "https://github.com/debrouxl/tilibs/commit/ef41c51363b11521460f33e8c332db7b0a9ca085.patch"; + stripLen = 2; + sha256 = "sha256-oTR1ACEZI0fjErpnFXTCnfLT1mo10Ypy0q0D8NOPNsM="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config @@ -60,7 +70,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ siraben luc65r ]; platforms = with platforms; linux ++ darwin; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/development/libraries/physics/hepmc3/default.nix b/pkgs/development/libraries/physics/hepmc3/default.nix index 22e60b20aef99..027100379bc92 100644 --- a/pkgs/development/libraries/physics/hepmc3/default.nix +++ b/pkgs/development/libraries/physics/hepmc3/default.nix @@ -32,6 +32,11 @@ stdenv.mkDerivation rec { ] ++ lib.optional withPython python; + # error: invalid version number in 'MACOSX_DEPLOYMENT_TARGET=11.0' + preConfigure = lib.optionalString (stdenv.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' + MACOSX_DEPLOYMENT_TARGET=10.16 + ''; + cmakeFlags = [ "-DHEPMC3_ENABLE_PYTHON=${if withPython then "ON" else "OFF"}" ] ++ lib.optionals withPython [ @@ -57,7 +62,5 @@ stdenv.mkDerivation rec { homepage = "http://hepmc.web.cern.ch/hepmc/"; platforms = platforms.unix; maintainers = with maintainers; [ veprbl ]; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/development/libraries/python-qt/default.nix b/pkgs/development/libraries/python-qt/default.nix index 2be89b3b7534c..f4574a1704ef9 100644 --- a/pkgs/development/libraries/python-qt/default.nix +++ b/pkgs/development/libraries/python-qt/default.nix @@ -1,26 +1,43 @@ -{ lib, stdenv, fetchurl, python, qmake, +{ lib, stdenv, fetchFromGitHub, fetchpatch, python, qmake, qtwebengine, qtxmlpatterns, qttools, unzip }: stdenv.mkDerivation rec { - version = "3.2"; pname = "python-qt"; + version = "3.3.0"; - src = fetchurl { - url="mirror://sourceforge/pythonqt/PythonQt${version}.zip"; - sha256="13hzprk58m3yj39sj0xn6acg8796lll1256mpd81kw0z3yykyl8c"; + src = fetchFromGitHub { + owner = "MeVisLab"; + repo = "pythonqt"; + rev = "v${version}"; + hash = "sha256-zbQ6X4Q2/QChaw3GAz/aVBj2JjWEz52YuPuHbBz935k="; }; + patches = [ + (fetchpatch { + name = "remove-unneeded-pydebug-include.patch"; + url = "https://github.com/MeVisLab/pythonqt/commit/a93104dea4d9c79351276ec963e931ca617625ec.patch"; + includes = [ "src/PythonQt.cpp" ]; + hash = "sha256-Tc4+6dIdvrda/z3Nz1s9Xz+ZWJLV2BQh8i552UynSI0="; + }) + ]; + + # https://github.com/CsoundQt/CsoundQt/blob/develop/BUILDING.md#pythonqt + postPatch = '' + substituteInPlace build/python.prf \ + --replace "unix:PYTHON_VERSION=2.7" "unix:PYTHON_VERSION=${python.pythonVersion}" + ''; + hardeningDisable = [ "all" ]; nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns qttools unzip ]; buildInputs = [ python ]; - qmakeFlags = [ "PythonQt.pro" - "INCLUDEPATH+=${python}/include/python3.6" - "PYTHON_PATH=${python}/bin" - "PYTHON_LIB=${python}/lib"]; + qmakeFlags = [ + "PythonQt.pro" + "PYTHON_DIR=${python}" + ]; dontWrapQtApps = true; diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix index 2342da12a7977..f43a917665247 100644 --- a/pkgs/development/libraries/quarto/default.nix +++ b/pkgs/development/libraries/quarto/default.nix @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { pname = "quarto"; - version = "1.2.280"; + version = "1.2.313"; src = fetchurl { url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${version}/quarto-${version}-linux-amd64.tar.gz"; - sha256 = "sha256-mbChS3GL36ySWo2jDZGJIDZIkBJ/UDUmypJjP5HW6KE="; + sha256 = "sha256-l8i/s9OuG9Fz+i1PcdSqP9X8stY6LTUcIfdE2gaePac="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix index c0e0e34c5e39d..2df87e5920da3 100644 --- a/pkgs/development/libraries/s2n-tls/default.nix +++ b/pkgs/development/libraries/s2n-tls/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.3.31"; + version = "1.3.32"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jdjy5Th73Sd/8NvivB2g9dVRDW3DEvUSYXZ1o2U6Y88="; + sha256 = "sha256-LKJubTzV4B7aimKtnODUJJil3b55qKuDkCe7TLa8tjQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/vte/2.90.nix b/pkgs/development/libraries/vte/2.90.nix deleted file mode 100644 index 59f1a2cd673a6..0000000000000 --- a/pkgs/development/libraries/vte/2.90.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchurl, intltool, pkg-config, glib, gtk3, ncurses, gobject-introspection }: - -stdenv.mkDerivation rec { - pname = "vte"; - version = "0.36.3"; - - src = fetchurl { - url = "mirror://gnome/sources/vte/${lib.versions.majorMinor version}/vte-${version}.tar.xz"; - sha256 = "54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c"; - }; - - nativeBuildInputs = [ pkg-config intltool ]; - buildInputs = [ gobject-introspection glib gtk3 ncurses ]; - - configureFlags = [ "--enable-introspection" ]; - - enableParallelBuilding = true; - - postInstall = '' - substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses.out}/lib -lncurses" - ''; - - meta = with lib; { - homepage = "https://www.gnome.org/"; - description = "A library implementing a terminal emulator widget for GTK"; - longDescription = '' - VTE is a library (libvte) implementing a terminal emulator widget for - GTK, and a minimal sample application (vte) using that. Vte is - mainly used in gnome-terminal, but can also be used to embed a - console/terminal in games, editors, IDEs, etc. VTE supports Unicode and - character set conversion, as well as emulating any terminal known to - the system's terminfo database. - ''; - license = licenses.lgpl2; - maintainers = with maintainers; [ astsmtl antono ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index e925b68910278..cfff2e7f853dc 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -223,11 +223,6 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs . - '' + lib.optionalString stdenv.isDarwin '' - # It needs malloc_good_size. - sed 22i'#include <malloc/malloc.h>' -i Source/WTF/wtf/FastMalloc.h - # <CommonCrypto/CommonRandom.h> needs CCCryptorStatus. - sed 43i'#include <CommonCrypto/CommonCryptor.h>' -i Source/WTF/wtf/RandomDevice.cpp ''; postFixup = '' diff --git a/pkgs/development/python-modules/accuweather/default.nix b/pkgs/development/python-modules/accuweather/default.nix index c5040b0feacef..4e86352346a3e 100644 --- a/pkgs/development/python-modules/accuweather/default.nix +++ b/pkgs/development/python-modules/accuweather/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "accuweather"; - version = "0.4.0"; + version = "0.5.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bieniu"; repo = pname; - rev = version; - hash = "sha256-NnDpSOEIqPuPLIr0Ty6yjrs9WRKyhykcdyiRPB/cHEw="; + rev = "refs/tags/${version}"; + hash = "sha256-v4mFvW+p0g+5IeZT8o0Z60MafHyYZ62d4lNH27wlAeI="; }; postPatch = '' @@ -50,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper for getting weather data from AccuWeather servers"; homepage = "https://github.com/bieniu/accuweather"; + changelog = "https://github.com/bieniu/accuweather/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ jamiemagee ]; }; diff --git a/pkgs/development/python-modules/aioblescan/default.nix b/pkgs/development/python-modules/aioblescan/default.nix index 462a4088f660c..62cec7b2d0317 100644 --- a/pkgs/development/python-modules/aioblescan/default.nix +++ b/pkgs/development/python-modules/aioblescan/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioblescan"; - version = "0.2.13"; + version = "0.2.14"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,8 +15,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "frawau"; repo = pname; - rev = version; - hash = "sha256-n1FiBsuVpVJrIq6+kuMNugpEaUOFQ/Gk/QU7Hry4YrU="; + rev = "refs/tags/${version}"; + hash = "sha256-JeA9jX566OSRiejdnlifbcNGm0J0C+xzA6zXDUyZ6jc="; }; checkInputs = [ @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to listen for BLE advertized packets"; homepage = "https://github.com/frawau/aioblescan"; + changelog = "https://github.com/frawau/aioblescan/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/archspec/default.nix b/pkgs/development/python-modules/archspec/default.nix index ea48798b6898b..54c5d323ca89e 100644 --- a/pkgs/development/python-modules/archspec/default.nix +++ b/pkgs/development/python-modules/archspec/default.nix @@ -1,35 +1,49 @@ { lib , buildPythonPackage +, click , fetchFromGitHub +, jsonschema , poetry-core -, click -, six , pytestCheckHook -, jsonschema +, pythonOlder }: buildPythonPackage rec { pname = "archspec"; - version = "0.1.4"; + version = "0.2.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; fetchSubmodules = true; - sha256 = "sha256-ScigEpYNArveqi5tlqiA7LwsVs2RkjT+GChxhSy/ndw="; + hash = "sha256-Zu7/zx3FTVJVGpAdRDdnLBokeodspZg6ou/GBaqz4XY="; }; - nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ click six ]; - checkInputs = [ pytestCheckHook jsonschema ]; + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + click + ]; + + checkInputs = [ + pytestCheckHook + jsonschema + ]; - pythonImportsCheck = [ "archspec" ]; + pythonImportsCheck = [ + "archspec" + ]; meta = with lib; { - description = "A library for detecting, labeling, and reasoning about microarchitectures"; - homepage = "https://archspec.readthedocs.io/en/latest/"; + description = "Library for detecting, labeling, and reasoning about microarchitectures"; + homepage = "https://archspec.readthedocs.io/"; + changelog = "https://github.com/archspec/archspec/releases/tag/v0.2.0"; license = with licenses; [ mit asl20 ]; maintainers = with maintainers; [ atila ]; }; diff --git a/pkgs/development/python-modules/debuglater/default.nix b/pkgs/development/python-modules/debuglater/default.nix index 40da613a65cda..4c598e8794391 100644 --- a/pkgs/development/python-modules/debuglater/default.nix +++ b/pkgs/development/python-modules/debuglater/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "debuglater"; - version = "1.4.3"; + version = "1.4.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ploomber"; repo = pname; - rev = version; - hash = "sha256-0fnWXmrlZjlLFGbiLC7HuDgMEM6OJVn8ajjNRqFg3Lc="; + rev = "refs/tags/${version}"; + hash = "sha256-o9IAk3EN8ghEft7Y7Xx+sEjWMNgoyiZ0eiBqnCyXkm8="; }; propagatedBuildInputs = [ @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for post-mortem debugging of Python programs"; homepage = "https://github.com/ploomber/debuglater"; + changelog = "https://github.com/ploomber/debuglater/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/embrace/default.nix b/pkgs/development/python-modules/embrace/default.nix index c342c9be5a0bd..31593bef24fd2 100644 --- a/pkgs/development/python-modules/embrace/default.nix +++ b/pkgs/development/python-modules/embrace/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "embrace"; - version = "4.1.0"; + version = "4.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "~olly"; repo = "embrace-sql"; rev = "v${version}-release"; - hash = "sha256-R6Ug4f8KFZNzaNWqWZkLvOwtsawCuerzvHlysr7bd6M="; + hash = "sha256-otzpDMtC229qMXon+ydS39SBoMiXJmxn48/TQXjqu5U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/envisage/default.nix b/pkgs/development/python-modules/envisage/default.nix index 9f5cfc2d3e0cd..cf7ab6cbab036 100644 --- a/pkgs/development/python-modules/envisage/default.nix +++ b/pkgs/development/python-modules/envisage/default.nix @@ -2,6 +2,7 @@ , apptools , buildPythonPackage , fetchPypi +, fetchpatch , ipython , pytestCheckHook , pythonAtLeast @@ -22,6 +23,15 @@ buildPythonPackage rec { sha256 = "sha256-AATsUNcYLB4vtyvuooAMDZx8p5fayijb6yJoUKTCW40="; }; + patches = [ + # TODO: remove on next release + (fetchpatch { + name = "fix-mistake-in-menu-group-specification.patch"; + url = "https://github.com/enthought/envisage/commit/f23ea3864a5f6ffca665d47dec755992e062029b.patch"; + sha256 = "sha256-l4CWB4jRkSmoTDoV8CtP2w87Io2cLINKfOSaSPy7cXE="; + }) + ]; + # for the optional dependency ipykernel, only versions < 6 are # supported, so it's not included in the tests, and not propagated propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix index 9f70702883a01..ad9d74edbb68d 100644 --- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -33,9 +33,8 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = lib.optionals stdenv.isDarwin [ - "test_run_local_server" - ]; + # some tests require loopback networking + __darwinAllowLocalNetworking = true; pythonImportsCheck = [ "google_auth_oauthlib" diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index 1c2bc12ae3711..167099c30a60f 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.13.0"; + version = "2.14.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1BBOEdkh0jVBHtSVEnOsXtaCPF/GuXB90FCZeOmue9I="; + hash = "sha256-x0Ktu4o1I+eEJXUjMjowwxW7967DdjZWAfcs331qP7s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix index 2ab3a3a510015..6aef124fc7149 100644 --- a/pkgs/development/python-modules/internetarchive/default.nix +++ b/pkgs/development/python-modules/internetarchive/default.nix @@ -16,13 +16,15 @@ buildPythonPackage rec { pname = "internetarchive"; - version = "3.0.2"; + version = "3.2.0"; + + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3oVkZcLvaFIYTQi/1ZwMoBkEhls3OiezgwNKxrQSjrY="; + sha256 = "sha256-cB7nRDmO2NNaHjNkHCuXH0+15WZfxseS8DBdIqefSzk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyter-book/default.nix b/pkgs/development/python-modules/jupyter-book/default.nix index 7753f201a928a..44f88d56d9537 100644 --- a/pkgs/development/python-modules/jupyter-book/default.nix +++ b/pkgs/development/python-modules/jupyter-book/default.nix @@ -40,6 +40,10 @@ buildPythonPackage rec { substituteInPlace pyproject.toml \ --replace "jsonschema<4" "jsonschema" \ --replace "sphinx-external-toc~=0.2.3" "sphinx-external-toc" \ + --replace "sphinx-jupyterbook-latex~=0.4.6" "sphinx-jupyterbook-latex" \ + --replace "sphinx-thebe~=0.1.1" "sphinx-thebe" \ + --replace "sphinx>=4,<5" "sphinx" \ + --replace "sphinx_book_theme~=0.3.2" "sphinx_book_theme" \ --replace "myst-nb~=0.13.1" "myst-nb" \ --replace "docutils>=0.15,<0.18" "docutils" \ --replace "sphinx-design~=0.1.0" "sphinx-design" \ diff --git a/pkgs/development/python-modules/ld2410-ble/default.nix b/pkgs/development/python-modules/ld2410-ble/default.nix new file mode 100644 index 0000000000000..0e1ba94a84ad7 --- /dev/null +++ b/pkgs/development/python-modules/ld2410-ble/default.nix @@ -0,0 +1,56 @@ +{ lib +, async-timeout +, bleak +, bleak-retry-connector +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "ld2410-ble"; + version = "0.1.1"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "930913"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-D8Z3OXlXWsaN0Ck9gx//J9TCaQmirYDbaXK7aTpI7ns="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + async-timeout + bleak + bleak-retry-connector + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=ld2410_ble --cov-report=term-missing:skip-covered" "" + ''; + + pythonImportsCheck = [ + "ld2410_ble" + ]; + + meta = with lib; { + description = "Library for the LD2410B modules from HiLinks"; + homepage = "https://github.com/930913/ld2410-ble"; + changelog = "https://github.com/930913/ld2410-ble/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/mayavi/default.nix b/pkgs/development/python-modules/mayavi/default.nix index 55f8fca0c35ec..736fc1d879520 100644 --- a/pkgs/development/python-modules/mayavi/default.nix +++ b/pkgs/development/python-modules/mayavi/default.nix @@ -4,6 +4,7 @@ , envisage , fetchPypi , numpy +, packaging , pyface , pygments , pyqt5 @@ -15,14 +16,14 @@ buildPythonPackage rec { pname = "mayavi"; - version = "4.8.0"; + version = "4.8.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-TGBDYdn1+juBvhjVvxTzBlCw7jju1buhbMikQ5QXj2M="; + sha256 = "sha256-n0J+8spska542S02ibpr7KJMhGDicG2KHJuEKJrT/Z4="; }; postPatch = '' @@ -43,6 +44,7 @@ buildPythonPackage rec { apptools envisage numpy + packaging pyface pygments pyqt5 @@ -50,6 +52,8 @@ buildPythonPackage rec { vtk ]; + NIX_CFLAGS_COMPILE = "-Wno-error"; + # Needs X server doCheck = false; diff --git a/pkgs/development/python-modules/md-toc/default.nix b/pkgs/development/python-modules/md-toc/default.nix index fca694ca19b0b..079d731235419 100644 --- a/pkgs/development/python-modules/md-toc/default.nix +++ b/pkgs/development/python-modules/md-toc/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "md-toc"; - version = "8.1.7"; + version = "8.1.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "frnmst"; repo = pname; rev = version; - hash = "sha256-zC7//0q4jkj2yjex/Ea4fslCvPQbd8S1LmvL01kSZZk="; + hash = "sha256-2Q/NcsGupYV80byrKmuoxA0d6/z7Z+fmGB6bfzDRvqQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix index 8d05efbca088f..6b5f957485898 100644 --- a/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "0.8.2"; + version = "0.8.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "python"; rev = version; - hash = "sha256-TwvXH/n2do4GnkxStW8fk9MRm59t/eP0sOjGnl3fYkw="; + hash = "sha256-JGk6oJQ6mcLtn7SDtltsLPT+CxPZNRbq8bnY9pMcXHc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/posix_ipc/default.nix b/pkgs/development/python-modules/posix_ipc/default.nix index 9506e4fca4fc8..0df261793e405 100644 --- a/pkgs/development/python-modules/posix_ipc/default.nix +++ b/pkgs/development/python-modules/posix_ipc/default.nix @@ -1,22 +1,24 @@ { lib , buildPythonPackage , fetchPypi -, isPy3k +, pythonOlder }: buildPythonPackage rec { - pname = "posix_ipc"; - version = "1.1.0"; + pname = "posix-ipc"; + version = "1.1.1"; format = "setuptools"; - disabled = !isPy3k; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+GoVsys4Vzx44wXr2RANgZij2frMA/+v457cNYM3OOM="; + hash = "sha256-4kVroM+y7luhQSFFDo2CWzxKFGH8oHYSIKq2bUERy7c="; }; - pythonImportsCheckHook = [ "posix_ipc" ]; + pythonImportsCheckHook = [ + "posix_ipc" + ]; meta = with lib; { description = "POSIX IPC primitives (semaphores, shared memory and message queues)"; diff --git a/pkgs/development/python-modules/pulumi-aws/default.nix b/pkgs/development/python-modules/pulumi-aws/default.nix index d32379584b8ca..1a23ac33ed980 100644 --- a/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/pkgs/development/python-modules/pulumi-aws/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pulumi-aws"; # Version is independant of pulumi's. - version = "5.25.0"; + version = "5.26.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pulumi"; repo = "pulumi-aws"; rev = "refs/tags/v${version}"; - hash = "sha256-siIi3RWiQUddiuA4ce3D6Js9n7X294oD6zwSMsIH0OI="; + hash = "sha256-2sx8a+ga77asp5onfjcGLm+3hCHdCXzFNmmgqzEJfJE="; }; sourceRoot = "${src.name}/sdk/python"; diff --git a/pkgs/development/python-modules/pydmd/default.nix b/pkgs/development/python-modules/pydmd/default.nix index 96c00c716a40a..fc680d193d13e 100644 --- a/pkgs/development/python-modules/pydmd/default.nix +++ b/pkgs/development/python-modules/pydmd/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pydmd"; - version = "0.4.0.post2212"; + version = "0.4.0.post2301"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mathLab"; repo = "PyDMD"; rev = "refs/tags/v${version}"; - sha256 = "sha256-VaBITKRSyMlBoaH0ej4tMob0CjStUsED2/G1iqpkG4c="; + hash = "sha256-0ss7yyT6u0if+YjBYNbKtx5beJU43JC1LD9rqHPKBS8="; }; propagatedBuildInputs = [ @@ -50,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Dynamic Mode Decomposition"; homepage = "https://mathlab.github.io/PyDMD/"; + changelog = "https://github.com/mathLab/PyDMD/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ yl3dy ]; broken = stdenv.hostPlatform.isAarch64; diff --git a/pkgs/development/python-modules/pyisy/default.nix b/pkgs/development/python-modules/pyisy/default.nix index 33a47238b36f5..f2263a99dff12 100644 --- a/pkgs/development/python-modules/pyisy/default.nix +++ b/pkgs/development/python-modules/pyisy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyisy"; - version = "3.0.10"; + version = "3.0.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "automicus"; repo = "PyISY"; rev = "refs/tags/v${version}"; - hash = "sha256-nThHJYU23I9q5Irk5SoW1+dy5Agl9IJc5gnLirzp3YM="; + hash = "sha256-oJ6Y4Bo4OLPVEy8vygU1FeRpZskfkCFBObvzTMuif5M="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix b/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix index b4ed12200b5d8..5a8a803400e20 100644 --- a/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysigma-backend-elasticsearch"; - version = "0.1.1"; + version = "0.1.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-elasticsearch"; rev = "refs/tags/v${version}"; - hash = "sha256-Niix0j4xaoQBMxvTOhy7hgmZ5btjs+0ovTEJcXAzjNY="; + hash = "sha256-HzvL6b2zeUrAAJ4mmKPOacZzHVVxfs3gjzP+fZIhApI="; }; nativeBuildInputs = [ @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to support Elasticsearch for pySigma"; homepage = "https://github.com/SigmaHQ/pySigma-backend-elasticsearch"; + changelog = "https://github.com/SigmaHQ/pySigma-backend-elasticsearch/releases/tag/v${version}"; license = with licenses; [ lgpl21Only ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix b/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix index e7c4eb03b6097..3e4dbef22a7d5 100644 --- a/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pysigma-backend-opensearch"; - version = "0.1.3"; + version = "0.1.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-opensearch"; rev = "refs/tags/v${version}"; - hash = "sha256-lRw9zNyAIdwCT0uhZ9NxJXWs+sB/cyGFtZIIBImTNcM="; + hash = "sha256-ZcX8LK/qckNEhMWljv73QHtWv4IY7Xtr4ISrlnrUaAY="; }; nativeBuildInputs = [ @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to support OpenSearch for pySigma"; homepage = "https://github.com/SigmaHQ/pySigma-backend-opensearch"; + changelog = "https://github.com/SigmaHQ/pySigma-backend-opensearch/releases/tag/v${version}"; license = with licenses; [ lgpl21Only ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix b/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix index 905f1575dcf03..88e10b35b8311 100644 --- a/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix +++ b/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to support Windows service pipeline for pySigma"; homepage = "https://github.com/SigmaHQ/pySigma-pipeline-windows"; + changelog = "https://github.com/SigmaHQ/pySigma-pipeline-windows/releases/tag/v${version}"; license = with licenses; [ lgpl21Only ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix index 82fde07aef484..633f754fdfbce 100644 --- a/pkgs/development/python-modules/pysigma/default.nix +++ b/pkgs/development/python-modules/pysigma/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pysigma"; - version = "0.8.9"; + version = "0.8.12"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma"; rev = "refs/tags/v${version}"; - hash = "sha256-SXZ6bo1b5xhVGSlWr51ZCxT0Ov1g/qd8V43P5KEhY+s="; + hash = "sha256-OAhKeAKRT2/A6VO+PxUBi7bkaQVNRT59boyLPGdO+Yw="; }; nativeBuildInputs = [ @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to parse and convert Sigma rules into queries"; homepage = "https://github.com/SigmaHQ/pySigma"; + changelog = "https://github.com/SigmaHQ/pySigma/releases/tag/v${version}"; license = with licenses; [ lgpl21Only ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/sphinx-book-theme/default.nix b/pkgs/development/python-modules/sphinx-book-theme/default.nix index 10f45cb6a7d5d..6c5597755a361 100644 --- a/pkgs/development/python-modules/sphinx-book-theme/default.nix +++ b/pkgs/development/python-modules/sphinx-book-theme/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "sphinx-book-theme"; - version = "0.3.3"; + version = "0.4.0rc1"; format = "wheel"; @@ -20,7 +20,7 @@ buildPythonPackage rec { dist = "py3"; python = "py3"; pname = "sphinx_book_theme"; - sha256 = "9685959dbbb492af005165ef1b9229fdd5d5431580ac181578beae3b4d012d91"; + sha256 = "bfad8ef469885da5633f7cf7f8cd9a0ae11ea2351a91e507b44cf15973934512"; }; propagatedBuildInputs = [ @@ -34,10 +34,8 @@ buildPythonPackage rec { meta = with lib; { description = "A clean book theme for scientific explanations and documentation with Sphinx"; homepage = "https://github.com/executablebooks/sphinx-book-theme"; + changelog = "https://github.com/executablebooks/sphinx-book-theme/raw/v${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ marsam ]; - # Missing sphinx 5.X support - # https://github.com/executablebooks/sphinx-book-theme/issues/592 - broken = true; }; } diff --git a/pkgs/development/python-modules/sphinx-thebe/default.nix b/pkgs/development/python-modules/sphinx-thebe/default.nix index c98e2fea6883f..d031faa90c2ab 100644 --- a/pkgs/development/python-modules/sphinx-thebe/default.nix +++ b/pkgs/development/python-modules/sphinx-thebe/default.nix @@ -7,13 +7,14 @@ buildPythonPackage rec { pname = "sphinx-thebe"; - version = "0.1.2"; + version = "0.2.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "756f1dd6643f5abb491f8a27b22825b04f47e05c5d214bbb2e6b5d42b621b85e"; + sha256 = "sha256-CHZ6WacLlFhpGyujW7b2KkRSlGmUR3rlg5ulPMsKUoc="; }; propagatedBuildInputs = [ sphinx ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-katex/default.nix b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix index 93dc258cc6b09..476c3f1815c39 100644 --- a/pkgs/development/python-modules/sphinxcontrib-katex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "sphinxcontrib-katex"; - version = "0.9.3"; + version = "0.9.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-6IUTUc4HOK2e++3qMfT2MVm+cBnfVyohSiyROtiRGzI="; + hash = "sha256-Mcn+gcP6ywhVlguCggJkH4SA6n1ikmviRbah7LejDZE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/ats-acc/default.nix b/pkgs/development/tools/ats-acc/default.nix index 73e475da3942b..5a3cd9c640108 100644 --- a/pkgs/development/tools/ats-acc/default.nix +++ b/pkgs/development/tools/ats-acc/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-Wp39488YNL40GKp4KaJwhi75PsYP+gMtrZqAvs4Q/sw="; }; + postPatch = '' + substituteInPlace Makefile \ + --replace "mv acc \''$(PATSHOME)/bin/" "install -Dm755 acc ${placeholder "out"}/bin/" + ''; + nativeBuildInputs = [ ats2 ]; meta = with lib; { diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index 7ba2211cc2b38..9d84ab9f58c49 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "conftest"; - version = "0.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "conftest"; rev = "refs/tags/v${version}"; - hash = "sha256-MzvCMPGg2FYInyXcTh/Y7RhhxH4Z7Y3m4Hkni1hi8wI="; + hash = "sha256-zJvBa7LIm14HI8//J3mfnXb506O3EJ7zrypMYni287Y="; }; - vendorHash = "sha256-Dl+ErHyHBf5KbHs7H6RmXT0cMIAQ6hReX4aGsoggWbo="; + vendorHash = "sha256-A0rEPfNMrb/Z7Y5j1uf9Q5uYqnvyxy0D0p7USyhf2DU="; ldflags = [ "-s" diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index 70598ee7266e1..659cba2c42be5 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -3,16 +3,16 @@ nixosTests }: buildGoModule rec { pname = "buildkite-agent"; - version = "3.41.0"; + version = "3.42.0"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "sha256-AQaSwdletUP7amDHXIG/3Xsw6rJCJE+eYWj2FYe/vRY="; + sha256 = "sha256-vLfIZ2y9e6I0kEqI10D/B6VaNFh/D0k6GXY2OB8mZf8="; }; - vendorSha256 = "sha256-NEdwdDM/H6l2XzYCTU11uijZTSEqjIWRHsqg6ML/daY="; + vendorHash = "sha256-8nMN62vnzlus2kjefVUKj1SMkM1YfIm8ppPQaDXSeIA="; postPatch = '' substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 07b136ab03b6e..13664bb21ba2d 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.16.13"; + version = "0.16.15"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-X4UB2RDfupUP+u+4g2jLxbpx4n4uarhcjs5VtP9Zi20="; + hash = "sha256-iTAtPHjrBvHweSIiAbkkbBLgjF3v68jipJEzc0I4G04="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; diff --git a/pkgs/development/tools/gotestfmt/default.nix b/pkgs/development/tools/gotestfmt/default.nix new file mode 100644 index 0000000000000..69f90c1f9731f --- /dev/null +++ b/pkgs/development/tools/gotestfmt/default.nix @@ -0,0 +1,23 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "gotestfmt"; + version = "2.4.1"; + + src = fetchFromGitHub { + owner = "gotesttools"; + repo = pname; + rev = "v${version}"; + hash = "sha256-Rb/nIsHISzvqd+jJU4TNrHbailvgGEq4y0JuM9IdA3w="; + }; + + vendorHash = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + + meta = with lib; { + description = "Go test output for humans"; + homepage = "https://github.com/gotesttools/gotestfmt"; + changelog = "https://github.com/GoTestTools/gotestfmt/releases/tag/v${version}"; + license = licenses.unlicense; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/pkgs/development/tools/marksman/default.nix b/pkgs/development/tools/marksman/default.nix new file mode 100644 index 0000000000000..4ed6c40e66fde --- /dev/null +++ b/pkgs/development/tools/marksman/default.nix @@ -0,0 +1,58 @@ +{ lib +, fetchFromGitHub +, buildDotnetModule +, dotnetCorePackages +, marksman +, testVersion +}: + +buildDotnetModule rec { + pname = "marksman"; + version = "2022-12-28"; + + src = fetchFromGitHub { + owner = "artempyanykh"; + repo = "marksman"; + rev = version; + sha256 = "sha256-IOmAOO45sD0TkphbHWLCXXyouxKNJoiNYHXV/bw0xH4="; + }; + + projectFile = "Marksman/Marksman.fsproj"; + dotnetBuildFlags = "-p:VersionString=${version}"; + + doCheck = true; + testProjectFile = "Tests/Tests.fsproj"; + + nugetDeps = ./deps.nix; + + dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-runtime = dotnetCorePackages.runtime_6_0; + + postInstall = '' + install -m 644 -D -t "$out/share/doc/${pname}" LICENSE + ''; + + passthru = { + updateScript = ./update.sh; + tests.version = testVersion { + package = marksman; + command = "marksman --version"; + }; + }; + + meta = with lib; { + description = "Language Server for Markdown"; + longDescription = '' + Marksman is a program that integrates with your editor + to assist you in writing and maintaining your Markdown documents. + Using LSP protocol it provides completion, goto definition, + find references, rename refactoring, diagnostics, and more. + In addition to regular Markdown, it also supports wiki-link-style + references that enable Zettelkasten-like note taking. + ''; + homepage = "https://github.com/artempyanykh/marksman"; + license = licenses.mit; + maintainers = with maintainers; [ stasjok ]; + platforms = dotnet-sdk.meta.platforms; + }; +} diff --git a/pkgs/development/tools/marksman/deps.nix b/pkgs/development/tools/marksman/deps.nix new file mode 100644 index 0000000000000..4789ffad94d90 --- /dev/null +++ b/pkgs/development/tools/marksman/deps.nix @@ -0,0 +1,208 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ + (fetchNuGet { pname = "coverlet.collector"; version = "3.1.2"; sha256 = "0gsk2q93qw7pqxwd4pdyq5364wz0lvldcqqnf4amz13jaq86idmz"; }) + (fetchNuGet { pname = "FSharp.Core"; version = "6.0.0"; sha256 = "1hjhvr39c1vpgrdmf8xln5q86424fqkvy9nirkr29vl2461d2039"; }) + (fetchNuGet { pname = "FSharp.Core"; version = "6.0.5"; sha256 = "07929km96znf6xnqzmxdk3h48kz2rg9msf4c5xxmnjqr0ikfb8c6"; }) + (fetchNuGet { pname = "FSharp.SystemCommandLine"; version = "0.13.0-beta4"; sha256 = "10h58gqfdg2hdy9laf6ry8djfysrdmwlj9n0d7ydwyszb6zgnd20"; }) + (fetchNuGet { pname = "FSharpPlus"; version = "1.2.4"; sha256 = "08yg36hgmglll053kkqkkadcfcrdd37qqwqwfwzyrmyqp1mw4mj2"; }) + (fetchNuGet { pname = "Glob"; version = "1.1.9"; sha256 = "1q72haq20bf414xwdabsx30lp5c55fjh7hav6r9sp2cqhmva0y53"; }) + (fetchNuGet { pname = "Markdig"; version = "0.30.2"; sha256 = "0m4vjg3kzvknk376yfzazr6i6qkb833s63857a5xcym0l04chlha"; }) + (fetchNuGet { pname = "MessagePack"; version = "2.3.85"; sha256 = "0n7kv4i6knhv1dd35cv45sfpidsiy9albfdmbrdschykd1mzxmiy"; }) + (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.3.85"; sha256 = "0axjgy9r533bw00lflnc6acjyza76mf2x1nn6fw7qacvak9rqxm3"; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.2.0"; sha256 = "018yl113i037m5qhm3z6csb0c4l8kj412dxw2dagdbj07qbxwikj"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.2.0"; sha256 = "0ncnq378pk1immy2dyf75xjf2xn72r4m5gma1njhc4rvhzx9qz11"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.1"; sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.2.0"; sha256 = "0l05smcgjzdfa5f60f9q5lylap3i21aswxbava92s19bgv46w2rv"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.2.0"; sha256 = "1238hx3hdg22s123cxygdfm89h54abw1jv6az6hl8h76ip39ybdp"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.0.64"; sha256 = "1c5qng81nin399rqfpgxvlsik4qi8an7ryki7ybrplywl16c0c56"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.0.64"; sha256 = "17xi4xca6iby66yw86qlbmy7i8z0l6mahr5s4krhapqkhwq7lhwg"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "16.10.26"; sha256 = "111wyls8c85djafkdgy004n1gz26qwprg835prm8bdlhjjpn3hgf"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "16.10.35"; sha256 = "1ba7valnmhim3g2sw635f3zw5i26m84jzls131y5xjfw5pyh2dhx"; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) + (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.8.54"; sha256 = "0b0c85xf0ws2j5jbph0xfz7093yp93c5z25ykfjbr0mhvd8144gx"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0rwpqngkqiapqc5c2cpkj7idhngrgss5qpnqg0yh40mbyflcxf8i"; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r"; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3"; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) + (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) + (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0zy5r25jppz48i2bkg8b9lfig24xixg6nm3xyr1379zdnqnpm8f6"; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "096ch4n4s8k82xga80lfmpimpzahd2ip1mgwdqgar0ywbbl6x438"; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1dm8fifl7rf1gy7lnwln78ch4rw54g0pl5g1c189vawavll7p6rj"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6"; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1cpx56mcfxz7cpn57wvj18sjisvzq8b5vd9rw16ihd2i6mcp3wa1"; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0q0n5q1r1wnqmr5i5idsrd9ywl33k0js4pngkwq9p368mbxp8x1w"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c"; }) + (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) + (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) + (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) + (fetchNuGet { pname = "Serilog"; version = "2.11.0"; sha256 = "1nvd3hm615xlcdmw1i7llkd3xvwvpv66c4y4s28npv47v3yci3lh"; }) + (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "4.0.1"; sha256 = "080vh9kcyn9lx4j7p34146kp9byvhqlaz5jn9wzx70ql9cwd0hlz"; }) + (fetchNuGet { pname = "Snapper"; version = "2.3.2"; sha256 = "1nbsb47v7hacn7x5km1hq5n6igh4j7wb86ai2gbfmi0r9shd225a"; }) + (fetchNuGet { pname = "StreamJsonRpc"; version = "2.10.44"; sha256 = "0jmj8hhd1ff2a00rpzkriq37kz49xb3wrkygb35ysqvm8fw69rdc"; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) + (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta4.22272.1"; sha256 = "1iy5hwwgvx911g3yq65p4zsgpy08w4qz9j3h0igcf7yci44vw8yd"; }) + (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.0"; sha256 = "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) + (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) + (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) + (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) + (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) + (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.1"; sha256 = "0b6zvhhfdxx0wx3bzyvxbq0mk8l5lbjak5124sn0gkif5jb388w4"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.3.4"; sha256 = "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl"; }) + (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) + (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) + (fetchNuGet { pname = "System.Net.WebSockets"; version = "4.3.0"; sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) + (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) + (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) + (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "6.0.0"; sha256 = "1b4vyjdir9kdkiv2fqqm4f76h0df68k8gcd7jb2b38zgr2vpnk3c"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) + (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) + (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) + (fetchNuGet { pname = "Tomlyn"; version = "0.16.0"; sha256 = "1zbxd27ycn7ria1r4hz5039d0890hrnavzmhag6qxi7a25ljy0w6"; }) + (fetchNuGet { pname = "xunit"; version = "2.4.2"; sha256 = "0barl6x1qwx9srjxnanw9z0jik7lv1fp6cvmgqhk10aiv57dgqxm"; }) + (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.3"; sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh"; }) + (fetchNuGet { pname = "xunit.analyzers"; version = "1.0.0"; sha256 = "0p4f24c462z49gvbh3k4z5ksa8ffa6p8abdgysqbbladl96im4c5"; }) + (fetchNuGet { pname = "xunit.assert"; version = "2.4.2"; sha256 = "0ifdry9qq3yaw2lfxdll30ljx1jkyhwwy3ydw6gd97y3kifr3k60"; }) + (fetchNuGet { pname = "xunit.core"; version = "2.4.2"; sha256 = "1ir029igwm6b571lcm6585v5yxagy66rwrg26v4a1fnjq9dnh4cd"; }) + (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.4.2"; sha256 = "1h0a62xddsd82lljfjldn1nqy17imga905jb7j0ddr10wi8cqm62"; }) + (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.4.2"; sha256 = "0r9gczqz4bc59cwl6d6wali6pvlw210i97chc1nlwn2qh383m54p"; }) + (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.4.5"; sha256 = "0y8w33ci80z8k580pp24mfnaw1r8ji0w3az543xxcz6aagax9zhs"; }) +] diff --git a/pkgs/development/tools/marksman/update.sh b/pkgs/development/tools/marksman/update.sh new file mode 100755 index 0000000000000..0f4a416e7df9e --- /dev/null +++ b/pkgs/development/tools/marksman/update.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts +#shellcheck shell=bash + +set -eu -o pipefail + +version=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ + https://api.github.com/repos/artempyanykh/marksman/releases/latest | jq -e -r .tag_name) +old_version=$(nix-instantiate --eval -A marksman.version | jq -e -r) + +if [[ $version == "$old_version" ]]; then + echo "New version same as old version, nothing to do." >&2 + exit 0 +fi + +update-source-version marksman "$version" + +$(nix-build -A marksman.fetch-deps --no-out-link) "$(dirname -- "${BASH_SOURCE[0]}")/deps.nix" diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/development/tools/misc/blackfire/default.nix index 3dc581a06a360..6bd622a6e7499 100644 --- a/pkgs/development/tools/misc/blackfire/default.nix +++ b/pkgs/development/tools/misc/blackfire/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2.13.1"; + version = "2.13.2"; src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform for blackfire: ${stdenv.hostPlatform.system}"); @@ -57,23 +57,23 @@ stdenv.mkDerivation rec { sources = { "x86_64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; - sha256 = "ErlIjReX6ui3rLeEpZ87HjagRp+RswpOcEk17FFd0Rk="; + sha256 = "1/O1n0nO+adY7KNVnz6xkESyODiLw61x68xE84EKW+I="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - sha256 = "S/bV7AAsZhGrOZEeAY9E78nYcIykNMNzWobulUE06XE="; + sha256 = "fy3i++HpGuKH9ijPY61O66PhFyORIpjkZV++75H5738="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - sha256 = "SDIaZ4k5y85cJKrQOEPehj/vhActl49UHNXSqpspaog="; + sha256 = "zO3KWbrudhCGpbdCUBRWQkK/snvDdUOxKF9ukZC+vno="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - sha256 = "GAc3ikI8FVT9xFhrTWeX/pJVo147B0luPsS0QDYPv54="; + sha256 = "Sqn5tFpvlF9LbUyC1i38BsyM9B+MOmykt+5COMhuO1A="; }; "x86_64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - sha256 = "hy7u0lYI0qBdIDENFWea5aBeZWwwDITAl7WTlXjQuyM="; + sha256 = "9vrrBiz744s1W5FV7QO8QKL7pfK6OGPinnSOJSvMIOk="; }; }; diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix index c02fa4a9fa251..b6c018693e5e8 100644 --- a/pkgs/development/tools/mold/default.nix +++ b/pkgs/development/tools/mold/default.nix @@ -12,27 +12,38 @@ stdenv.mkDerivation rec { pname = "mold"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "rui314"; repo = pname; - rev = "v${version}"; - hash = "sha256-VykBOXeU3I6ZSmRIlngLdoLF4V2nb5QW/f8tr9Wn9o8="; + rev = "refs/tags/v${version}"; + hash = "sha256-i4+MOEZWt+Qb05HgXcGR0uDuMoOAyMhVeLPQwnGiEw8="; }; - nativeBuildInputs = [ cmake ninja ]; + nativeBuildInputs = [ + cmake + ninja + ]; - buildInputs = [ openssl zlib ] - ++ lib.optionals (!stdenv.isDarwin) [ mimalloc ]; + buildInputs = [ + openssl + zlib + ] ++ lib.optionals (!stdenv.isDarwin) [ + mimalloc + ]; postPatch = '' sed -i CMakeLists.txt -e '/.*set(DEST\ .*/d' ''; - cmakeFlags = [ "-DMOLD_USE_SYSTEM_MIMALLOC:BOOL=ON" ]; + cmakeFlags = [ + "-DMOLD_USE_SYSTEM_MIMALLOC:BOOL=ON" + ]; - NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ "-faligned-allocation" ]; + NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ + "-faligned-allocation" + ]; passthru.tests.version = testers.testVersion { package = mold; }; @@ -45,6 +56,7 @@ stdenv.mkDerivation rec { rapid debug-edit-rebuild cycles. ''; homepage = "https://github.com/rui314/mold"; + changelog = "https://github.com/rui314/mold/releases/tag/v${version}"; license = licenses.agpl3Plus; maintainers = with maintainers; [ azahi nitsky ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 107da2ed5ef9d..5246f13e564d1 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.212"; + version = "0.0.215"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1ZtuoKzmbnH/uGC8Fmyd3eihH+eyE3mtUrTteKGirAA="; + sha256 = "sha256-f/ZqHPZ1lhYn1iPz0dwIQQpjWmZj1fxBiVMTbT8bTRo="; }; - cargoSha256 = "sha256-yVoMxzI84jKrnntABHc65rzUX+R6P3z1J84x1hRrvTU="; + cargoSha256 = "sha256-o3W0yyqGh3CDgymISsJyxLolxwOAY4p8ldrCwU8qwiA="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/development/tools/rust/cargo-chef/default.nix b/pkgs/development/tools/rust/cargo-chef/default.nix index 82aed4809cc98..7ad698530ec43 100644 --- a/pkgs/development/tools/rust/cargo-chef/default.nix +++ b/pkgs/development/tools/rust/cargo-chef/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-chef"; - version = "0.1.50"; + version = "0.1.51"; src = fetchCrate { inherit pname version; - sha256 = "sha256-d467uk4UCtAKcpFYODxIhRrYoIOHzxhoaJVMA9ErRAw="; + sha256 = "sha256-K9oryItevSABbklaX5KKvKHuebFX8B0AgnizlpDhM5o="; }; - cargoSha256 = "sha256-5xj4/uxuMhlqY1ncrMU1IFWdVB4ZjHVXg0ZbRXDvIak="; + cargoHash = "sha256-KRhgYN8YMfotjkWAYP9RITbH9hudkakpWk53YZe9+Ks="; meta = with lib; { description = "A cargo-subcommand to speed up Rust Docker builds using Docker layer caching"; diff --git a/pkgs/development/tools/rust/cargo-modules/default.nix b/pkgs/development/tools/rust/cargo-modules/default.nix index 54290e2491f4c..060b710f8f7f9 100644 --- a/pkgs/development/tools/rust/cargo-modules/default.nix +++ b/pkgs/development/tools/rust/cargo-modules/default.nix @@ -1,26 +1,17 @@ -{ lib, rustPlatform, fetchFromGitHub, fetchpatch, stdenv, darwin }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin }: rustPlatform.buildRustPackage rec { pname = "cargo-modules"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "regexident"; repo = pname; rev = version; - sha256 = "sha256-QRBhlSHqOTJCdzZhqpcfLeCDuCfJsjyxa2+6yzzN52g="; + sha256 = "sha256-xjAjm23hzuyvxU0S7m9AsfvXui/jb0oFrAqcY8m9Cq0="; }; - cargoSha256 = "sha256-+asFAkUOHP9u/nOoHsr81KeqQkLqaRXhJH32oTG5vYo="; - - cargoPatches = [ - # https://github.com/regexident/cargo-modules/pull/161; - (fetchpatch { - name = "update-outdated-lock-file.patsh"; - url = "https://github.com/regexident/cargo-modules/commit/ea9029b79acdadddbaf4067076690153c38cd09c.patch"; - sha256 = "sha256-DOLvo/PP+4/6i1IYbl9oGC6BAnXNI88hK5he9549EJk="; - }) - ]; + cargoSha256 = "sha256-XU4kNP0xODuY5I16zLZeQqpxS37HJI67YF3enB/5N+s="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 6d08ec9163fad..aaae3082d320a 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -11,6 +11,7 @@ , makeWrapper , fuse-overlayfs , dockerTools +, runCommand }: buildGoModule rec { @@ -46,6 +47,7 @@ buildGoModule rec { runHook preInstall PREFIX=$out make install-binary install-completions PREFIX=$man make install-docs + install ${passthru.policy}/default-policy.json -Dt $out/etc/containers '' + lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/skopeo \ --prefix PATH : ${lib.makeBinPath [ fuse-overlayfs ]} @@ -53,8 +55,13 @@ buildGoModule rec { runHook postInstall ''; - passthru.tests = { - inherit (dockerTools.examples) testNixFromDockerHub; + passthru = { + policy = runCommand "policy" { } '' + install ${src}/default-policy.json -Dt $out + ''; + tests = { + inherit (dockerTools.examples) testNixFromDockerHub; + }; }; meta = with lib; { diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index 5412564f14cb2..78ad7429452fe 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.13.0"; + version = "1.13.6"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-/+M+yR28mUA3iJ8wJlsL5cNRHn19yypUpG/bcfFtwVQ="; + hash = "sha256-aaKjtxy0SVZB9/dcARmDkiiPM8XzwFHYqEctY3kfPWg="; }; - cargoHash = "sha256-GeEQ00r7GYm4goeCWGXg5m+d3eaM2eBJtuip09a1OV0="; + cargoHash = "sha256-tTArwBfxzbX6FJiOsAuyT6HRbdelp1txcmcDszACfn8="; meta = with lib; { description = "Source code spell checker"; diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 406f9c2a45633..c4e1dbf6b0a0d 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.441"; + version = "0.0.443"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-T69OGS9w0furVOABvctzCxSgUJpwppWRFCmOlWzgagE="; + sha256 = "sha256-v4N2Li7AGPMMIfleJ6sk2fEwJ9cYXJeV6WcDp1rI0xY="; }; - vendorSha256 = "sha256-yVR3pUsveZf4052hr6aO4fnvEOQyHdm3N7khcobcoyE="; + vendorHash = "sha256-l921q3RHyEZ6dx8gHThrC18IUChUOYvB+W5PYsE7Nu0="; subPackages = [ "." ]; |