diff options
Diffstat (limited to 'pkgs')
159 files changed, 1199 insertions, 328 deletions
diff --git a/pkgs/applications/audio/feishin/darwin.nix b/pkgs/applications/audio/feishin/darwin.nix index b8b28f4768216..fb8a27abdc417 100644 --- a/pkgs/applications/audio/feishin/darwin.nix +++ b/pkgs/applications/audio/feishin/darwin.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/jeffvli/feishin/releases/download/v${version}/${appname}-${version}-mac-x64.zip"; - hash = "sha256-WzU/Yd3cNMIpmkKWC29mQlviYXiYV5k8+80iyzilPGc="; + hash = "sha256-J5LB4uR/NJ6ykiTqBY1VepcLujprgqwpxy7sGD0NtZw="; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/pkgs/applications/audio/feishin/default.nix b/pkgs/applications/audio/feishin/default.nix index f9a670dbfa3e7..aff0d5681ea25 100644 --- a/pkgs/applications/audio/feishin/default.nix +++ b/pkgs/applications/audio/feishin/default.nix @@ -8,7 +8,7 @@ let extraArgs = removeAttrs args [ "callPackage" ]; pname = "feishin"; - version = "0.2.0"; + version = "0.3.0"; appname = "Feishin"; meta = with lib; { diff --git a/pkgs/applications/audio/feishin/linux.nix b/pkgs/applications/audio/feishin/linux.nix index 08adc69bb7ee9..eaa6b9fc043ad 100644 --- a/pkgs/applications/audio/feishin/linux.nix +++ b/pkgs/applications/audio/feishin/linux.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/jeffvli/feishin/releases/download/v${version}/${appname}-${version}-linux-x64.tar.xz"; - hash = "sha256-o+fEjdG2iN84FEchyAKWZCpsrqDm1K1k+Q2K+cwYBZE="; + hash = "sha256-sl2zM24bb0yBTfCxtNGizp6Yu+L4nj/Uf669zylnPmE="; }; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 45db0854edaeb..e29227d11d609 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0dynpi8l2102z8kbzgdm8qwbpzm7jxjqvz8a3x0vsikxbfwhsdmy"; - x86_64-darwin = "1z3vzwgcjj57xrw8mklhsdr8n9214rb4vj6jfnqv5nxpdgx4dw55"; - aarch64-linux = "0jiwp6i9q8c87pfkhvj45viqi2m5x5aq94skrvxa8wjbkyafvm1d"; - aarch64-darwin = "1as6zfrv2jymxspmc3m453vs61b7y1lh5qh34xr0ps8c4h6dbjas"; - armv7l-linux = "17yd3bb4z99q4r0d91grifrbr50wln1fkz0bjp4s4snqnj9q9gfk"; + x86_64-linux = "0wx53ajjwil82s3nl6wvpdf01mh33yqasf1ia54s1rfzz10fa1m6"; + x86_64-darwin = "1avq0xlhsnxf6yfay1czi0rc0hy47ahj25rg07mzgb274p4x9q95"; + aarch64-linux = "1chdcy59w4zm27ga71iph7yqq88lv2rw73br1nmmjznbqgzk9lpc"; + aarch64-darwin = "140lrka50yqqd9dp9gb93jlc2zn2fjiq9palibwvgb14nzsb3x68"; + armv7l-linux = "0qf95nxy55f9m2z91fykwjgffj7wqvlqjn2d2xnfapa457v5lbir"; }.${system} or throwSystem; sourceRoot = lib.optionalString (!stdenv.isDarwin) "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.80.2.23209"; + version = "1.81.1.23222"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 7dbae3e43b464..cf2ac98bc0903 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -9,43 +9,43 @@ let pname = "1password"; - version = if channel == "stable" then "8.10.8" else "8.10.9-29.BETA"; + version = if channel == "stable" then "8.10.9" else "8.10.12-10.BETA"; sources = { stable = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; - hash = "sha256-E7lXyxoBL2ziMIIisskJJhZ5ymKyuv4zXEqigUtU41I="; + hash = "sha256-Ef0ee41WVN46IOYbdyF1w8Ud2s7ncR71/5TFnQwOnVU="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz"; - hash = "sha256-V/qJHt49pPEm1g92hEQCscmJ3ZkSHTY2oA69d6DxkmU="; + hash = "sha256-IuRPCphagpx0jynJmhL9ETSzS0JaWCpDaodt0TDm7xs="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - hash = "sha256-H2t4sEbm2Mp89a++r8oFSyvg19zc9dAsq3phX/h1VVg="; + hash = "sha256-KwMYxe6WpLFXaJ3jyEOc18IYO/pwZ7RiPF/7RN2c5xg="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - hash = "sha256-8lVc69Ra0wYxnlVcehtAIujrmUQXmsgsK8ATR4vkBe0="; + hash = "sha256-MDc2Okc8nZbAPPn0ihoraDe9kNI5xx654DdTe7AlD3E="; }; }; beta = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; - hash = "sha256-gC+niXGxg37pzMWu/yzD5KcrzbI39u//syVlPne6nBQ="; + hash = "sha256-SnfFd+ksJc69r7GGFUYCLH0NAwwiSxEDyaIRTrj/VWo="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz"; - hash = "sha256-y9P7032GaNKbDzL922HUwiu3DxqKzTiA5g1I3V+852k="; + hash = "sha256-5PDlMe/EZNBkfIrf6se4B5TKVYycSSoqiv0iMEPiIrA="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - hash = "sha256-/avHauTuFmKQiHL1WpRI488F8rcwvEOe26kmGF7sv3k="; + hash = "sha256-nn8lnn52MkKcFRluH9k8IoAu4vZ1C9Uk/+k6TQ6CKFs="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - hash = "sha256-kMrA8PhAtOjkgbl9m7NtzIJin+a05llQKdEzlkLE0sY="; + hash = "sha256-ACeFyaDzo1I4w/9CrkQ5iO/JBHYRbxxzMDhTX4oI548="; }; }; }; diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index 68f904f1db20e..7a466b0e5d861 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -21,11 +21,11 @@ python3Packages.buildPythonApplication rec { pname = "ulauncher"; - version = "5.15.0"; + version = "5.15.3"; src = fetchurl { url = "https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz"; - sha256 = "sha256-1Qo6ffMtVRtZDPCHvHEl7T0dPdDUxP4TP2hkSVSdQpo"; + sha256 = "sha256-unAic6GTgvZFFJwPERh164vfDiFE0zLEUjgADR94w5w="; }; nativeBuildInputs = with python3Packages; [ @@ -120,6 +120,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://ulauncher.io/"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ aaronjanse ]; + maintainers = with maintainers; [ aaronjanse sebtm ]; }; } diff --git a/pkgs/applications/misc/waypaper/default.nix b/pkgs/applications/misc/waypaper/default.nix new file mode 100644 index 0000000000000..83715ae525412 --- /dev/null +++ b/pkgs/applications/misc/waypaper/default.nix @@ -0,0 +1,51 @@ +{ lib +, python3 +, fetchFromGitHub +, gobject-introspection +, gtk3 +, wrapGAppsHook +}: + +python3.pkgs.buildPythonApplication rec { + pname = "waypaper"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "anufrievroman"; + repo = "waypaper"; + rev = "refs/tags/${version}"; + hash = "sha256-wD3DtxP4aUwIn+EoM3s1Y9VNEcUGhtyugNBEFHI9eqw="; + }; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pygobject3 + ]; + + # has no tests + doCheck = false; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = with lib; { + changelog = "https://github.com/anufrievroman/waypaper/releases/tag/${version}"; + description = "GUI wallpaper setter for Wayland-based window managers"; + longDescription = '' + GUI wallpaper setter for Wayland-based window managers that works as a frontend for popular backends like swaybg and swww. + + If wallpaper does not change, make sure that swaybg or swww is installed. + ''; + homepage = "https://github.com/anufrievroman/waypaper"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ totalchaos ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/browsers/mullvad-browser/default.nix b/pkgs/applications/networking/browsers/mullvad-browser/default.nix index 84ddc3e75844d..57f8d348164f8 100644 --- a/pkgs/applications/networking/browsers/mullvad-browser/default.nix +++ b/pkgs/applications/networking/browsers/mullvad-browser/default.nix @@ -78,12 +78,15 @@ let ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "12.5.1"; + version = "12.5.2"; sources = { x86_64-linux = fetchurl { - url = "https://cdn.mullvad.net/browser/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz"; - hash = "sha256-yG22oyTDb7i1OnM7L9uOSaMhDytONAxE68Tg5XQSYq4="; + urls = [ + "https://cdn.mullvad.net/browser/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz" + "https://github.com/mullvad/mullvad-browser/releases/download/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz" + ]; + hash = "sha256-sVVgQTpPQFiG1mEIih0CemNV5qjC2l+JTxef37/nC9k="; }; }; diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index 6b2fae7b23a28..38a2859455938 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "runc"; - version = "1.1.8"; + version = "1.1.9"; src = fetchFromGitHub { owner = "opencontainers"; repo = "runc"; rev = "v${version}"; - hash = "sha256-rDJYEc64KW4Qa3Eg2oUjJqIKrg6THb5hxQFFbvb9Zp4="; + hash = "sha256-9vNzKoG+0Ze4+dhluNM6QtsUjV8/bpkuvEF8ASBfBRo="; }; vendorHash = null; diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index 0c63cc5a9be95..7c4d204df4074 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -304,6 +304,7 @@ rec { checkPhase = '' ${stdenv.shellDryRun} "$target" ''; + meta.mainProgram = name; }; /* diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index 5c49914cdf024..dfc986f06b6a6 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -80,8 +80,10 @@ stdenv.mkDerivation rec { # Hardcode paths to various dependencies so that they can be found at runtime. (substituteAll { src = ./fix-paths.patch; - inherit libgnomekbd unzip; + gkbd_keyboard_display = "${lib.getBin libgnomekbd}/bin/gkbd-keyboard-display"; + glib_compile_schemas = "${glib.dev}/bin/glib-compile-schemas"; gsettings = "${glib.bin}/bin/gsettings"; + unzip = "${lib.getBin unzip}/bin/unzip"; }) # Use absolute path for libshew installation to make our patched gobject-introspection diff --git a/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch b/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch index 8b35736ecfcd6..e70c4851e9d59 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch +++ b/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch @@ -10,27 +10,62 @@ index de91167c5..1c9965678 100644 +ExecStart=@gsettings@ set org.gnome.shell disable-user-extensions true Restart=no diff --git a/js/ui/extensionDownloader.js b/js/ui/extensionDownloader.js -index 8bf4646a6..59e88bb4c 100644 +index 197cc1c1c..dd74aa167 100644 --- a/js/ui/extensionDownloader.js +++ b/js/ui/extensionDownloader.js -@@ -114,7 +114,7 @@ async function extractExtensionArchive(bytes, dir) { +@@ -110,7 +110,7 @@ async function extractExtensionArchive(bytes, dir) { stream.close_async(GLib.PRIORITY_DEFAULT, null); const unzip = Gio.Subprocess.new( - ['unzip', '-uod', dir.get_path(), '--', file.get_path()], -+ ['@unzip@/bin/unzip', '-uod', dir.get_path(), '--', file.get_path()], ++ ['@unzip@', '-uod', dir.get_path(), '--', file.get_path()], Gio.SubprocessFlags.NONE); await unzip.wait_check_async(null); - } + +@@ -132,7 +132,7 @@ async function extractExtensionArchive(bytes, dir) { + } + + const compileSchema = Gio.Subprocess.new( +- ['glib-compile-schemas', '--strict', schemasPath.get_path()], ++ ['@glib_compile_schemas@', '--strict', schemasPath.get_path()], + Gio.SubprocessFlags.NONE); + + try { diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js -index bc50f3d37..868eb5abf 100644 +index fff4e73c2..92859b099 100644 --- a/js/ui/status/keyboard.js +++ b/js/ui/status/keyboard.js -@@ -1080,6 +1080,6 @@ class InputSourceIndicator extends PanelMenu.Button { +@@ -1092,6 +1092,6 @@ class InputSourceIndicator extends PanelMenu.Button { if (xkbVariant.length > 0) - description = '%s\t%s'.format(description, xkbVariant); + description = `${description}\t${xkbVariant}`; - Util.spawn(['gkbd-keyboard-display', '-l', description]); -+ Util.spawn(['@libgnomekbd@/bin/gkbd-keyboard-display', '-l', description]); ++ Util.spawn(['@gkbd_keyboard_display@', '-l', description]); } }); +diff --git a/subprojects/extensions-tool/src/command-install.c b/subprojects/extensions-tool/src/command-install.c +index 11fb4b6b7..e00e4807b 100644 +--- a/subprojects/extensions-tool/src/command-install.c ++++ b/subprojects/extensions-tool/src/command-install.c +@@ -158,7 +158,7 @@ install_extension (const char *bundle, + + schemapath = g_file_get_path (schemadir); + proc = g_subprocess_new (G_SUBPROCESS_FLAGS_STDERR_SILENCE, &error, +- "glib-compile-schemas", "--strict", schemapath, ++ "@glib_compile_schemas@", "--strict", schemapath, + NULL); + + if (!g_subprocess_wait_check (proc, NULL, &error)) +diff --git a/subprojects/extensions-tool/src/command-pack.c b/subprojects/extensions-tool/src/command-pack.c +index f2cfcd51a..2a9a7efdf 100644 +--- a/subprojects/extensions-tool/src/command-pack.c ++++ b/subprojects/extensions-tool/src/command-pack.c +@@ -168,7 +168,7 @@ extension_pack_add_schemas (ExtensionPack *pack, + #else + dstpath = g_file_get_path (dstdir); + proc = g_subprocess_new (G_SUBPROCESS_FLAGS_STDERR_SILENCE, error, +- "glib-compile-schemas", "--strict", dstpath, NULL); ++ "@glib_compile_schemas@", "--strict", dstpath, NULL); + + if (!g_subprocess_wait_check (proc, NULL, error)) + return FALSE; diff --git a/pkgs/development/compilers/flutter/engine-artifacts/default.nix b/pkgs/development/compilers/flutter/engine-artifacts/default.nix index 249e9217325ba..41201bdb94e52 100644 --- a/pkgs/development/compilers/flutter/engine-artifacts/default.nix +++ b/pkgs/development/compilers/flutter/engine-artifacts/default.nix @@ -6,13 +6,43 @@ , fetchzip , autoPatchelfHook , gtk3 +, flutterVersion , unzip +, stdenvNoCC }: let hashes = (import ./hashes.nix).${engineVersion} or (throw "There are no known artifact hashes for Flutter engine version ${engineVersion}."); + noticeText = stdenvNoCC.mkDerivation (finalAttrs: { + pname = "flutter-notice"; + version = engineVersion; + dontUnpack = true; + src = fetchurl { + url = "https://raw.githubusercontent.com/flutter/engine/${engineVersion}/sky/packages/sky_engine/LICENSE"; + sha256 = hashes.skyNotice; + }; + flutterNotice = fetchurl { + url = "https://raw.githubusercontent.com/flutter/flutter/${flutterVersion}/LICENSE"; + sha256 = hashes.flutterNotice; + }; + installPhase = + '' + SRC_TEXT="$(cat $src)" + FLUTTER_NOTICE_TEXT="$(cat $flutterNotice)" + cat << EOF > $out + This artifact is from the Flutter SDK's engine. + This file carries third-party notices for its dependencies. + See also other files, that have LICENSE in the name, in the artifact directory. + + Appendix 1/2: merged sky_engine LICENSE file (also found at ${finalAttrs.src.url}) + $SRC_TEXT + Appendix 2/2: Flutter license (also found at ${finalAttrs.flutterNotice.url}) + $FLUTTER_NOTICE_TEXT + EOF + ''; + }); artifacts = { common = { @@ -165,6 +195,17 @@ let destination = "$out/${if subdirectory == true then archiveBasename else if subdirectory != null then subdirectory else "."}"; in '' + # ship the notice near all artifacts. if the artifact directory is / multiple directories are nested in $src, link it there. If there isn't a directory, link it in root + # this *isn't the same as the subdirectory variable above* + DIR_CNT="$(echo */ | wc -w)" + if [[ "$DIR_CNT" == 0 ]]; then + ln -s ${noticeText} LICENSE.README + else + for dir in */ + do + ln -s ${noticeText} "$dir/LICENSE.README" + done + fi mkdir -p "${destination}" cp -r . "${destination}" ''; diff --git a/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix b/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix index fb5134739f76b..f51e43b2474fa 100644 --- a/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix +++ b/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix @@ -1,5 +1,7 @@ { "1a65d409c7a1438a34d21b60bf30a6fd5db59314" = { + skyNotice = "sha256-n9B26rLlfUqdR6s+2+PNK4H/fN95UE0T7/Vic19W6yo="; + flutterNotice = "sha256-pZjblLYpD/vhC17PkRBXtqlDNRxyf92p5fKJHWhwCiA="; android-arm = { "artifacts.zip" = "sha256-KDMiI6SQoZHfFV5LJJZ7VOGyEKC4UxzRc777j4BbXgM="; }; @@ -113,6 +115,8 @@ }; }; "45f6e009110df4f34ec2cf99f63cf73b71b7a420" = { + skyNotice = "sha256-n9B26rLlfUqdR6s+2+PNK4H/fN95UE0T7/Vic19W6yo="; + flutterNotice = "sha256-pZjblLYpD/vhC17PkRBXtqlDNRxyf92p5fKJHWhwCiA="; android-arm = { "artifacts.zip" = "sha256-NOpUM+iFSPVzr99Dz0DBdDUQnMC0ad1eZnVhtqu9HnU="; }; diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix index 5685ddebd7813..a650b1853fd4d 100644 --- a/pkgs/development/compilers/flutter/wrapper.nix +++ b/pkgs/development/compilers/flutter/wrapper.nix @@ -56,7 +56,10 @@ }: let - engineArtifacts = callPackage ./engine-artifacts { inherit (flutter) engineVersion; }; + engineArtifacts = callPackage ./engine-artifacts { + inherit (flutter) engineVersion; + flutterVersion = flutter.version; + }; mkCommonArtifactLinkCommand = { artifact }: '' mkdir -p $out/artifacts/engine/common diff --git a/pkgs/development/interpreters/gpython/default.nix b/pkgs/development/interpreters/gpython/default.nix new file mode 100644 index 0000000000000..8bb432e839ea6 --- /dev/null +++ b/pkgs/development/interpreters/gpython/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, testers +, gpython +}: + +buildGoModule rec { + pname = "gpython"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "go-python"; + repo = "gpython"; + rev = "v${version}"; + hash = "sha256-xqwq27u41Jgoh7t9UDyatuBQswr+h3xio5AV/npncHc="; + }; + + vendorHash = "sha256-NXPllEhootdB8m5Wvfy8MW899oQnjWAQj7yCC2oDvqE="; + + subPackages = [ + "." + ]; + + ldflags = [ + "-s" + "-w" + "-X=main.version=${version}" + "-X=main.commit=${src.rev}" + "-X=main.date=1970-01-01" + ]; + + passthru.tests = { + version = testers.testVersion { + package = gpython; + command = "gpython < /dev/null"; + }; + }; + + meta = with lib; { + description = "A Python interpreter written in Go"; + homepage = "https://github.com/go-python/gpython"; + changelog = "https://github.com/go-python/gpython/releases/tag/${src.rev}"; + license = licenses.bsd3; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/development/interpreters/nickel/default.nix b/pkgs/development/interpreters/nickel/default.nix index ea69852b7ab5c..8ab3ec532fdbd 100644 --- a/pkgs/development/interpreters/nickel/default.nix +++ b/pkgs/development/interpreters/nickel/default.nix @@ -43,6 +43,6 @@ rustPlatform.buildRustPackage rec { ''; changelog = "https://github.com/tweag/nickel/blob/${version}/RELEASES.md"; license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres felschr ]; + maintainers = with maintainers; [ AndersonTorres felschr matthiasbeyer ]; }; } diff --git a/pkgs/development/libraries/blst/default.nix b/pkgs/development/libraries/blst/default.nix index 71b2814100efc..ef174d1118a9e 100644 --- a/pkgs/development/libraries/blst/default.nix +++ b/pkgs/development/libraries/blst/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation ( finalAttrs: { pname = "blst"; - version = "0.3.10"; + version = "0.3.11"; src = fetchFromGitHub { owner = "supranational"; repo = "blst"; rev = "v${finalAttrs.version}"; - hash = "sha256-xero1aTe2v4IhWIJaEDUsVDOfE77dOV5zKeHWntHogY="; + hash = "sha256-oqljy+ZXJAXEB/fJtmB8rlAr4UXM+Z2OkDa20gpILNA="; }; buildPhase = '' diff --git a/pkgs/development/libraries/catch2/3.nix b/pkgs/development/libraries/catch2/3.nix index 72dd4552bf974..f064eb7a4fdb5 100644 --- a/pkgs/development/libraries/catch2/3.nix +++ b/pkgs/development/libraries/catch2/3.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "catch2"; - version = "3.3.2"; + version = "3.4.0"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; rev = "v${version}"; - hash = "sha256-t/4iCrzPeDZNNlgibVqx5rhe+d3lXwm1GmBMDDId0VQ="; + hash = "sha256-DqGGfNjKPW9HFJrX9arFHyNYjB61uoL6NabZatTWrr0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/frozen/default.nix b/pkgs/development/libraries/frozen/default.nix new file mode 100644 index 0000000000000..f6e58991a590d --- /dev/null +++ b/pkgs/development/libraries/frozen/default.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +}: + +stdenv.mkDerivation rec { + pname = "frozen"; + # pin to a newer release if frozen releases again, see cesanta/frozen#72 + version = "unstable-2021-02-23"; + + src = fetchFromGitHub { + owner = "cesanta"; + repo = "frozen"; + rev = "21f051e3abc2240d9a25b2add6629b38e963e102"; + hash = "sha256-BpuYK9fbWSpeF8iPT8ImrV3CKKaA5RQ2W0ZQ03TciR0="; + }; + + nativeBuildInputs = [ meson ninja ]; + + # frozen has a simple Makefile and a GN BUILD file as building scripts. + # Since it has only two source files, the best course of action to support + # cross compilation is to create a small meson.build file. + # Relevant upstream issue: https://github.com/cesanta/frozen/pull/71 + preConfigure = '' + cp ${./meson.build} meson.build + ''; + + meta = { + homepage = "https://github.com/cesanta/frozen"; + description = "Minimal JSON parser for C, targeted for embedded systems"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ thillux ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/development/libraries/frozen/meson.build b/pkgs/development/libraries/frozen/meson.build new file mode 100644 index 0000000000000..1db9546491cea --- /dev/null +++ b/pkgs/development/libraries/frozen/meson.build @@ -0,0 +1,19 @@ +project( + 'frozen', + 'c', + default_options: [ + 'c_args=-Wextra -fno-builtin -pedantic', + 'c_std=c99', + 'werror=true' + ], + license: 'Apache-2.0', + version: '20210223' +) + +library( + 'frozen', + 'frozen.c', + install: true +) + +install_headers('frozen.h') diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix index b32414f855d0f..8136482d477bc 100644 --- a/pkgs/development/libraries/qgnomeplatform/default.nix +++ b/pkgs/development/libraries/qgnomeplatform/default.nix @@ -33,6 +33,10 @@ stdenv.mkDerivation rec { src = ./hardcode-gsettings.patch; gds_gsettings_path = glib.getSchemaPath gsettings-desktop-schemas; }) + + # Backport cursor fix for Qt6 apps + # Ajusted from https://github.com/FedoraQt/QGnomePlatform/pull/138 + ./qt6-cursor-fix.patch ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/qgnomeplatform/qt6-cursor-fix.patch b/pkgs/development/libraries/qgnomeplatform/qt6-cursor-fix.patch new file mode 100644 index 0000000000000..40438aae33edc --- /dev/null +++ b/pkgs/development/libraries/qgnomeplatform/qt6-cursor-fix.patch @@ -0,0 +1,53 @@ +diff --git a/src/common/gnomesettings.cpp b/src/common/gnomesettings.cpp +index 961f75d..d947eb2 100644 +--- a/src/common/gnomesettings.cpp ++++ b/src/common/gnomesettings.cpp +@@ -210,7 +210,7 @@ GnomeSettingsPrivate::GnomeSettingsPrivate(QObject *parent) + QStringLiteral("SettingChanged"), this, SLOT(portalSettingChanged(QString,QString,QDBusVariant))); + } + +- if (QGuiApplication::platformName() != QStringLiteral("xcb")) { ++ if (true) { + cursorSizeChanged(); + cursorThemeChanged(); + } +@@ -347,11 +347,11 @@ void GnomeSettingsPrivate::gsettingPropertyChanged(GSettings *settings, gchar *k + } else if (changedProperty == QStringLiteral("monospace-font-name")) { + gnomeSettings->fontChanged(); + } else if (changedProperty == QStringLiteral("cursor-size")) { +- if (QGuiApplication::platformName() != QStringLiteral("xcb")) { ++ if (true) { + gnomeSettings->cursorSizeChanged(); + } + } else if (changedProperty == QStringLiteral("cursor-theme")) { +- if (QGuiApplication::platformName() != QStringLiteral("xcb")) { ++ if (true) { + gnomeSettings->cursorThemeChanged(); + } + // Org.gnome.wm.preferences +@@ -393,13 +393,23 @@ void GnomeSettingsPrivate::cursorBlinkTimeChanged() + void GnomeSettingsPrivate::cursorSizeChanged() + { + int cursorSize = getSettingsProperty<int>(QStringLiteral("cursor-size")); +- qputenv("XCURSOR_SIZE", QString::number(cursorSize).toUtf8()); ++ if (QGuiApplication::platformName() != QStringLiteral("xcb")) { ++ qputenv("XCURSOR_SIZE", QString::number(cursorSize).toUtf8()); ++ } ++#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) ++ m_hints[QPlatformTheme::MouseCursorSize] = QSize(cursorSize, cursorSize); ++#endif + } + + void GnomeSettingsPrivate::cursorThemeChanged() + { + const QString cursorTheme = getSettingsProperty<QString>(QStringLiteral("cursor-theme")); +- qputenv("XCURSOR_THEME", cursorTheme.toUtf8()); ++ if (QGuiApplication::platformName() != QStringLiteral("xcb")) { ++ qputenv("XCURSOR_THEME", cursorTheme.toUtf8()); ++ } ++#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) ++ m_hints[QPlatformTheme::MouseCursorTheme] = cursorTheme; ++#endif + } + + void GnomeSettingsPrivate::fontChanged() diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix index 16bc36a781240..9b44c8e46d0cb 100644 --- a/pkgs/development/libraries/speechd/default.nix +++ b/pkgs/development/libraries/speechd/default.nix @@ -27,11 +27,11 @@ let inherit (python3Packages) python pyxdg wrapPython; in stdenv.mkDerivation rec { pname = "speech-dispatcher"; - version = "0.11.4"; + version = "0.11.5"; src = fetchurl { url = "https://github.com/brailcom/speechd/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-jAkiG7ctnbXInP17kZdxgyuGw6N3LWRWAWlklO31Zrk="; + sha256 = "sha256-HOR1n/q7rxrrQzpewHOb4Gdum9+66URKezvhsq8+wSs="; }; patches = [ diff --git a/pkgs/development/lisp-modules/ql.nix b/pkgs/development/lisp-modules/ql.nix index 2349cff0ec5bd..33b3753a83e87 100644 --- a/pkgs/development/lisp-modules/ql.nix +++ b/pkgs/development/lisp-modules/ql.nix @@ -223,7 +223,43 @@ let lispLibs = o.lispLibs ++ [ self.mcclim ]; -}); + }); + cl-charms = super.cl-charms.overrideLispAttrs (o: { + nativeLibs = [ pkgs.ncurses ]; + }); + libusb-ffi = super.libusb-ffi.overrideLispAttrs (o: { + nativeLibs = [ pkgs.libusb-compat-0_1 ]; + }); + cl-fam = super.cl-fam.overrideLispAttrs (o: { + nativeLibs = [ pkgs.fam ]; + }); + jpeg-turbo = super.jpeg-turbo.overrideLispAttrs (o: { + nativeLibs = [ pkgs.libjpeg_turbo ]; + }); + vorbisfile-ffi = super.vorbisfile-ffi.overrideLispAttrs (o: { + nativeLibs = [ pkgs.libvorbis ]; + }); + png = super.png.overrideLispAttrs (o: { + nativeLibs = [ pkgs.libpng ]; + }); + zmq = super.zmq.overrideLispAttrs (o: { + nativeLibs = [ pkgs.czmq ]; + }); + consfigurator = super.consfigurator.overrideLispAttrs (o: { + nativeLibs = [ pkgs.acl pkgs.libcap ]; + }); + cl-gss = super.cl-gss.overrideLispAttrs (o: { + nativeLibs = [ pkgs.libkrb5 ]; + }); + magicffi = super.magicffi.overrideLispAttrs (o: { + nativeLibs = [ pkgs.file ]; + }); + keystone = super.keystone.overrideLispAttrs (o: { + nativeLibs = [ pkgs.keystone ]; + }); + capstone = super.capstone.overrideLispAttrs (o: { + nativeLibs = [ pkgs.capstone ]; + }); }); qlpkgs = diff --git a/pkgs/development/python-modules/acquire/default.nix b/pkgs/development/python-modules/acquire/default.nix index 3b88d6bbb5539..e944a1d210133 100644 --- a/pkgs/development/python-modules/acquire/default.nix +++ b/pkgs/development/python-modules/acquire/default.nix @@ -17,16 +17,16 @@ buildPythonPackage rec { pname = "acquire"; - version = "3.7"; + version = "3.8"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fox-it"; repo = "acquire"; rev = "refs/tags/${version}"; - hash = "sha256-wGoMah3Pj7hS5+k/l5pEaDaM25RzdWRIG9Hrf3oWkR8="; + hash = "sha256-JfZ0sc7hFj71XxGWTTZ50uGWuKoWKY4vYm0v+zS2YiQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index b126a756b2e58..2054095206183 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "15.1.15"; + version = "16.0.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-qNljw3V0rfMb6GDtTd+jy/hHBaM3kc9y+RCEoNTKHFM="; + hash = "sha256-ATfAI8srh5G1ejkp/2wl2Soowatjprq9e8h8tSAAXGs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/astropy-extension-helpers/default.nix b/pkgs/development/python-modules/astropy-extension-helpers/default.nix index 08a5139e59797..0077cfdde1503 100644 --- a/pkgs/development/python-modules/astropy-extension-helpers/default.nix +++ b/pkgs/development/python-modules/astropy-extension-helpers/default.nix @@ -4,7 +4,9 @@ , findutils , pytestCheckHook , pythonOlder +, pip , setuptools-scm +, wheel }: buildPythonPackage rec { @@ -21,12 +23,14 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm + wheel ]; patches = [ ./permissions.patch ]; nativeCheckInputs = [ findutils + pip pytestCheckHook ]; diff --git a/pkgs/development/python-modules/bx-python/default.nix b/pkgs/development/python-modules/bx-python/default.nix index 085fc210f1b86..5fc21676d261a 100644 --- a/pkgs/development/python-modules/bx-python/default.nix +++ b/pkgs/development/python-modules/bx-python/default.nix @@ -1,27 +1,49 @@ -{ lib, fetchFromGitHub, buildPythonPackage, pythonOlder, numpy, cython, zlib, six -, python-lzo, nose }: +{ lib +, fetchFromGitHub +, buildPythonPackage +, pythonOlder +, numpy +, cython +, zlib +, python-lzo +, nose +}: buildPythonPackage rec { pname = "bx-python"; - version = "0.9.0"; - disabled = pythonOlder "3.6"; + version = "0.10.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bxlab"; repo = "bx-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Pi4hV3FatCXoXY3nNgqm5UfWYIrpP/v5PzzCi3gmIbE="; + hash = "sha256-j2GKj2IGDBk4LBnISRx6ZW/lh5VSdQBasC0gCRj0Fiw="; }; - nativeBuildInputs = [ cython ]; - buildInputs = [ zlib ]; - propagatedBuildInputs = [ numpy six python-lzo ]; - nativeCheckInputs = [ nose ]; + nativeBuildInputs = [ + cython + ]; + + buildInputs = [ + zlib + ]; + + propagatedBuildInputs = [ + numpy + python-lzo + ]; + + nativeCheckInputs = [ + nose + ]; postInstall = '' cp -r scripts/* $out/bin - # This is a small hack; the test suit uses the scripts which need to + # This is a small hack; the test suite uses the scripts which need to # be patched. Linking the patched scripts in $out back to the # working directory allows the tests to run rm -rf scripts @@ -29,11 +51,11 @@ buildPythonPackage rec { ''; meta = with lib; { + description = "Tools for manipulating biological data, particularly multiple sequence alignments"; homepage = "https://github.com/bxlab/bx-python"; - description = - "Tools for manipulating biological data, particularly multiple sequence alignments"; + changelog = "https://github.com/bxlab/bx-python/releases/tag/v${version}"; license = licenses.mit; - maintainers = [ maintainers.jbedo ]; + maintainers = with maintainers; [ jbedo ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/development/python-modules/dataclass-wizard/default.nix b/pkgs/development/python-modules/dataclass-wizard/default.nix new file mode 100644 index 0000000000000..603fd25e9b2a1 --- /dev/null +++ b/pkgs/development/python-modules/dataclass-wizard/default.nix @@ -0,0 +1,65 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, pythonOlder +, pythonAtLeast +, pytimeparse +, pyyaml +, pytestCheckHook +, pytest-mock +, typing-extensions +}: + +buildPythonPackage rec { + pname = "dataclass-wizard"; + version = "0.22.2"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "rnag"; + repo = "dataclass-wizard"; + rev = "v${version}"; + hash = "sha256-Ufi4lZc+UkM6NZr4bS2OibpOmMjyiBEoVKxmrqauW50="; + }; + + propagatedBuildInputs = [ + ] ++ lib.optionals (pythonOlder "3.9") [ + typing-extensions + ]; + + passthru.optional-dependencies = { + timedelta = [ + pytimeparse + ]; + yaml = [ + pyyaml + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + pytest-mock + ] ++ passthru.optional-dependencies.timedelta + ++ passthru.optional-dependencies.yaml; + + disabledTests = [ + ] ++ lib.optionals (pythonAtLeast "3.11") [ + # Any/None internal changes, tests need adjusting upstream + "without_type_hinting" + "default_dict" + "test_frozenset" + "test_set" + "date_times_with_custom_pattern" + "from_dict_handles_identical_cased_json_keys" + ]; + + pythonImportsCheck = [ "dataclass_wizard" ]; + + meta = with lib; { + description = "A set of simple, yet elegant wizarding tools for interacting with the Python dataclasses module"; + homepage = "https://github.com/rnag/dataclass-wizard"; + changelog = "https://github.com/rnag/dataclass-wizard/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ codifryed ]; + }; +} diff --git a/pkgs/development/python-modules/dbt-core/default.nix b/pkgs/development/python-modules/dbt-core/default.nix index bd346c3262d78..0a926744a814b 100644 --- a/pkgs/development/python-modules/dbt-core/default.nix +++ b/pkgs/development/python-modules/dbt-core/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { hash = "sha256-ZgP11fVMtXpzo9QaTkejvKl0LzCAkIyGBMcOquBirxQ="; }; - sourceRoot = "source/core"; + sourceRoot = "${src.name}/core"; nativeBuildInputs = [ pythonRelaxDepsHook diff --git a/pkgs/development/python-modules/dbt-postgres/default.nix b/pkgs/development/python-modules/dbt-postgres/default.nix index f5be13ccff7a3..0478e748f1c62 100644 --- a/pkgs/development/python-modules/dbt-postgres/default.nix +++ b/pkgs/development/python-modules/dbt-postgres/default.nix @@ -11,7 +11,7 @@ buildPythonPackage { inherit (dbt-core) version src; - sourceRoot = "source/plugins/postgres"; + sourceRoot = "${dbt-core.src.name}/plugins/postgres"; env.DBT_PSYCOPG2_NAME = "psycopg2"; diff --git a/pkgs/development/python-modules/dissect-cstruct/default.nix b/pkgs/development/python-modules/dissect-cstruct/default.nix index 46093c1268bb0..556927b63a08f 100644 --- a/pkgs/development/python-modules/dissect-cstruct/default.nix +++ b/pkgs/development/python-modules/dissect-cstruct/default.nix @@ -9,16 +9,16 @@ buildPythonPackage rec { pname = "dissect-cstruct"; - version = "3.8"; + version = "3.9"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.cstruct"; rev = "refs/tags/${version}"; - hash = "sha256-ART7m0OR0KjkZYHXDoNGJDX0v7h+FgctAaWXNFohGV8="; + hash = "sha256-v0giDdH6bYCSrotd9WGSlIMzylTz7FHeCE/JkCw7frY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dissect-etl/default.nix b/pkgs/development/python-modules/dissect-etl/default.nix index 06e9d2f282dde..de6a49ba9e262 100644 --- a/pkgs/development/python-modules/dissect-etl/default.nix +++ b/pkgs/development/python-modules/dissect-etl/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-etl"; - version = "3.6"; + version = "3.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.etl"; rev = "refs/tags/${version}"; - hash = "sha256-Z6IdSLHXwZULqV6aTZlXjRo5Xq/rRNw7b/nOhuKOth4="; + hash = "sha256-z6P7XpA+j9JIJJsp/Z4uewFw9OAPSZV+57eJu7rd17I="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dissect-ntfs/default.nix b/pkgs/development/python-modules/dissect-ntfs/default.nix index e81211286003c..96b3cb3a67455 100644 --- a/pkgs/development/python-modules/dissect-ntfs/default.nix +++ b/pkgs/development/python-modules/dissect-ntfs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-ntfs"; - version = "3.6"; + version = "3.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.ntfs"; rev = "refs/tags/${version}"; - hash = "sha256-kGvy1+MSjJ6IQjffmsT02toBNaSbBZXeYmC9AqwbfFk="; + hash = "sha256-bnFimn5ektIKiX73NZ+1Iz3Uoew138a0nFJgypffC4o="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dissect-regf/default.nix b/pkgs/development/python-modules/dissect-regf/default.nix index 726c9aad178c4..bc0d8798255ff 100644 --- a/pkgs/development/python-modules/dissect-regf/default.nix +++ b/pkgs/development/python-modules/dissect-regf/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-regf"; - version = "3.6"; + version = "3.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.regf"; rev = "refs/tags/${version}"; - hash = "sha256-doyyBmkRPH2wRZA44/7ldkUdNLX1lulo/XcSVFxaIfM="; + hash = "sha256-WUrND1RnXTeN3WosR+m+yVJLe/imBTx7nmUZrSIc1E0="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dissect-target/default.nix b/pkgs/development/python-modules/dissect-target/default.nix index 1a5bc7756f864..1f79a43759b3c 100644 --- a/pkgs/development/python-modules/dissect-target/default.nix +++ b/pkgs/development/python-modules/dissect-target/default.nix @@ -39,16 +39,16 @@ buildPythonPackage rec { pname = "dissect-target"; - version = "3.10"; + version = "3.11"; format = "pyproject"; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.target"; rev = "refs/tags/${version}"; - hash = "sha256-zAcNkRwCnU/53h8/WsaGjCpgPovPb+5VOu/6SHXu31g="; + hash = "sha256-WnF0Z/1jIUKSDAToQzKpiYQgn58KvQJfxk6r8oXANvU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dissect-util/default.nix b/pkgs/development/python-modules/dissect-util/default.nix index 22c1fe568279d..bcd15ffbd2506 100644 --- a/pkgs/development/python-modules/dissect-util/default.nix +++ b/pkgs/development/python-modules/dissect-util/default.nix @@ -9,16 +9,16 @@ buildPythonPackage rec { pname = "dissect-util"; - version = "3.9"; + version = "3.10"; format = "pyproject"; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.util"; rev = "refs/tags/${version}"; - hash = "sha256-u8FPGSG9bZi+bxqI5zABwHcqwmM24hURvHcHTKz8dYw="; + hash = "sha256-H89lPX//AlTEJLuZFzzn9wUc4lZC1TGd98t4+TYlbWs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dissect/default.nix b/pkgs/development/python-modules/dissect/default.nix index aedb4dcbb7e99..236371c41b96f 100644 --- a/pkgs/development/python-modules/dissect/default.nix +++ b/pkgs/development/python-modules/dissect/default.nix @@ -32,16 +32,16 @@ buildPythonPackage rec { pname = "dissect"; - version = "3.7"; + version = "3.8"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect"; rev = "refs/tags/${version}"; - hash = "sha256-noo7yDRTPPSIrSt8Hewb9mZsMuPgDmL3aIxI/bknsGc="; + hash = "sha256-TEzIKEGAp+1QHJtnPp5JhopuVVBNo9/Cwj0z3YcBCcg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/flow-record/default.nix b/pkgs/development/python-modules/flow-record/default.nix index bd21e113f75b0..0f4cea423e460 100644 --- a/pkgs/development/python-modules/flow-record/default.nix +++ b/pkgs/development/python-modules/flow-record/default.nix @@ -15,16 +15,16 @@ buildPythonPackage rec { pname = "flow-record"; - version = "3.10"; + version = "3.11"; format = "pyproject"; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "fox-it"; repo = "flow.record"; rev = "refs/tags/${version}"; - hash = "sha256-pOEK53+rIwzTxDEla1xoWo/xgy+eN0nxR0MeW7VQFds="; + hash = "sha256-/mrsm7WoqnTIaGOHuIZk1eMXAMi38eVpctgi6+RQ3WQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index 0a2f4ecf46ef1..d03ce98f2fe7d 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -97,7 +97,7 @@ buildPythonPackage rec { hash = "sha256-YQFIF1tA/CjvmD6xGgVre2lbcHR+UYx/sy1dOfpvkPY="; }; - sourceRoot = "source/libs/langchain"; + sourceRoot = "${src.name}/libs/langchain"; postPatch = '' substituteInPlace langchain/utilities/bash.py \ diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index af1a1c1afeacf..910ba98e88150 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -8,7 +8,7 @@ , pytest-asyncio }: -buildPythonPackage { +buildPythonPackage rec { pname = "langsmith"; version = "0.0.14"; format = "pyproject"; @@ -22,7 +22,7 @@ buildPythonPackage { hash = "sha256-U8fs16Uq80EB7Ey5YuQhUKKI9DOXJWlabM5JdoDnWP0="; }; - sourceRoot = "source/python"; + sourceRoot = "${src.name}/python"; nativeBuildInputs = [ poetry-core diff --git a/pkgs/development/python-modules/md-toc/default.nix b/pkgs/development/python-modules/md-toc/default.nix index 193fca714ad53..800fc6227b018 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.9"; + version = "8.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "frnmst"; repo = pname; rev = version; - hash = "sha256-t3G8nQCVUUuDb+W+Gw+f2miXQ2i/hdVfT6yGxdNWKpw="; + hash = "sha256-7Udmon/5E741+v2vBHHL7h31r91RR33hN1WhL3FiDQc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/memory_profiler/default.nix b/pkgs/development/python-modules/memory_profiler/default.nix index df1a5410ffbf3..7473514cd6286 100644 --- a/pkgs/development/python-modules/memory_profiler/default.nix +++ b/pkgs/development/python-modules/memory_profiler/default.nix @@ -5,11 +5,11 @@ python.pkgs.buildPythonPackage rec { pname = "memory_profiler"; - version = "0.55.0"; + version = "0.61.0"; src = fetchPypi { inherit pname version; - sha256 = "1hdgh5f59bya079w4ahx4l0hf4gc5yvaz44irp5x57cj9hkpp92z"; + sha256 = "sha256-Tltz14ZKHRKS+3agPoKj5475NNBoKKaY2dradtogZ7A="; }; propagatedBuildInputs = with python.pkgs; [ diff --git a/pkgs/development/python-modules/mkdocs-autorefs/default.nix b/pkgs/development/python-modules/mkdocs-autorefs/default.nix index 3b98ff015ccad..1a0b64efe1e15 100644 --- a/pkgs/development/python-modules/mkdocs-autorefs/default.nix +++ b/pkgs/development/python-modules/mkdocs-autorefs/default.nix @@ -4,26 +4,31 @@ , markdown , mkdocs , pytestCheckHook -, pdm-pep517 +, pdm-backend , pythonOlder }: buildPythonPackage rec { pname = "mkdocs-autorefs"; - version = "0.4.1"; + version = "0.5.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "mkdocstrings"; repo = "autorefs"; - rev = version; - hash = "sha256-kiHb/XSFw6yaUbLJHBvHaQAOVUM6UfyFeomgniDZqgU="; + rev = "refs/tags/${version}"; + hash = "sha256-GZKQlOXhQIQhS/z4cbmS6fhAKYgnVhSXh5a8Od7+TWc="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'dynamic = ["version"]' 'version = "${version}"' + ''; + nativeBuildInputs = [ - pdm-pep517 + pdm-backend ]; propagatedBuildInputs = [ @@ -35,11 +40,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'dynamic = ["version"]' 'version = "${version}"' - ''; - pythonImportsCheck = [ "mkdocs_autorefs" ]; @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Automatically link across pages in MkDocs"; homepage = "https://github.com/mkdocstrings/autorefs/"; + changelog = "https://github.com/mkdocstrings/autorefs/blob/${version}/CHANGELOG.md"; license = licenses.isc; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/msgspec/default.nix b/pkgs/development/python-modules/msgspec/default.nix index c385661738b11..2c3a0b153e439 100644 --- a/pkgs/development/python-modules/msgspec/default.nix +++ b/pkgs/development/python-modules/msgspec/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "msgspec"; - version = "0.17.0"; + version = "0.18.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "jcrist"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-IDu+Yu9BKk4/ITkNY6YLVmJ5zNR6F4LF1vj8QIEW108="; + hash = "sha256-FZq8SEtn/p7x43Je2d0gIGDi8S4uz4cdV0KkQecCFT4="; }; # Requires libasan to be accessible diff --git a/pkgs/development/python-modules/netutils/default.nix b/pkgs/development/python-modules/netutils/default.nix index 19a5be4077d2a..bee05b436cdc8 100644 --- a/pkgs/development/python-modules/netutils/default.nix +++ b/pkgs/development/python-modules/netutils/default.nix @@ -1,8 +1,9 @@ -{ stdenv -, lib +{ lib +, stdenv , buildPythonPackage , fetchFromGitHub , jinja2 +, napalm , poetry-core , pytestCheckHook , pythonOlder @@ -12,22 +13,26 @@ buildPythonPackage rec { pname = "netutils"; - version = "1.4.1"; + version = "1.5.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "networktocode"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-hSSHCWi0L/ZfFz0JQ6Al5mjhb2g0DpykLF66uMKMIN8="; + hash = "sha256-uUw48EBUpEUw+A8wxw3qXrnqmFWQzg/zb+8qAGRSlUw="; }; nativeBuildInputs = [ poetry-core ]; + propagatedBuildInputs = [ + napalm + ]; + nativeCheckInputs = [ jinja2 pytestCheckHook @@ -49,6 +54,9 @@ buildPythonPackage rec { # OSError: [Errno 22] Invalid argument "test_compare_type5" "test_encrypt_type5" + "test_compare_cisco_type5" + "test_get_napalm_getters_napalm_installed_default" + "test_encrypt_cisco_type5" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/opentelemetry-api/default.nix b/pkgs/development/python-modules/opentelemetry-api/default.nix index 2a4de0a92cc98..1ccb00617ac0f 100644 --- a/pkgs/development/python-modules/opentelemetry-api/default.nix +++ b/pkgs/development/python-modules/opentelemetry-api/default.nix @@ -12,7 +12,7 @@ }: let - self = buildPythonPackage { + self = buildPythonPackage rec { pname = "opentelemetry-api"; version = "1.18.0"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ let hash = "sha256-8xf4TqEkBeueejQBckFGwBNN4Gyo+/7/my6Z1Mnei5Q="; }; - sourceRoot = "source/opentelemetry-api"; + sourceRoot = "${src.name}/opentelemetry-api"; format = "pyproject"; diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix index a786318a58ba7..71c742c0ba2a4 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix @@ -14,7 +14,7 @@ buildPythonPackage { pname = "opentelemetry-exporter-otlp-proto-common"; disabled = pythonOlder "3.7"; - sourceRoot = "source/exporter/opentelemetry-exporter-otlp-proto-common"; + sourceRoot = "${opentelemetry-api.src.name}/exporter/opentelemetry-exporter-otlp-proto-common"; format = "pyproject"; diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix index d4f2f4c4305b1..b727d16b8e65e 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix @@ -17,7 +17,7 @@ buildPythonPackage { pname = "opentelemetry-exporter-otlp-proto-grpc"; disabled = pythonOlder "3.7"; - sourceRoot = "source/exporter/opentelemetry-exporter-otlp-proto-grpc"; + sourceRoot = "${opentelemetry-api.src.name}/exporter/opentelemetry-exporter-otlp-proto-grpc"; format = "pyproject"; diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix index 6d7bf23dafa34..2478826cd67e8 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix @@ -17,7 +17,7 @@ buildPythonPackage { pname = "opentelemetry-exporter-otlp-proto-http"; disabled = pythonOlder "3.7"; - sourceRoot = "source/exporter/opentelemetry-exporter-otlp-proto-http"; + sourceRoot = "${opentelemetry-api.src.name}/exporter/opentelemetry-exporter-otlp-proto-http"; format = "pyproject"; diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix index a3606148883f5..7dcc282e15368 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix @@ -14,7 +14,7 @@ buildPythonPackage { pname = "opentelemetry-exporter-otlp"; disabled = pythonOlder "3.7"; - sourceRoot = "source/exporter/opentelemetry-exporter-otlp"; + sourceRoot = "${opentelemetry-api.src.name}/exporter/opentelemetry-exporter-otlp"; format = "pyproject"; diff --git a/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix index 1e74b3fd502fb..7708b404a980c 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix @@ -14,7 +14,7 @@ buildPythonPackage { pname = "opentelemetry-exporter-prometheus"; disabled = pythonOlder "3.7"; - sourceRoot = "source/exporter/opentelemetry-exporter-prometheus"; + sourceRoot = "${opentelemetry-api.src.name}/exporter/opentelemetry-exporter-prometheus"; format = "pyproject"; diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix index de0823c0aac94..cdd40d4470503 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix @@ -17,7 +17,7 @@ buildPythonPackage { pname = "opentelemetry-instrumentation-aiohttp-client"; disabled = pythonOlder "3.7"; - sourceRoot = "source/instrumentation/opentelemetry-instrumentation-aiohttp-client"; + sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-aiohttp-client"; format = "pyproject"; diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix index 5777498873b77..952824cd1b72b 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix @@ -16,7 +16,7 @@ buildPythonPackage { pname = "opentelemetry-instrumentation-asgi"; disabled = pythonOlder "3.7"; - sourceRoot = "source/instrumentation/opentelemetry-instrumentation-asgi"; + sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-asgi"; format = "pyproject"; diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix index ec19eacf0e3d6..39058d16e2594 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix @@ -18,7 +18,7 @@ buildPythonPackage { pname = "opentelemetry-instrumentation-django"; disabled = pythonOlder "3.7"; - sourceRoot = "source/instrumentation/opentelemetry-instrumentation-django"; + sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-django"; format = "pyproject"; diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix index 8313faa8d6ddb..ad408c3dfbaa0 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix @@ -17,7 +17,7 @@ buildPythonPackage { pname = "opentelemetry-instrumentation-grpc"; disabled = pythonOlder "3.7"; - sourceRoot = "source/instrumentation/opentelemetry-instrumentation-grpc"; + sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-grpc"; format = "pyproject"; diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix index 408cfb6923297..0b1fda0276c97 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix @@ -15,7 +15,7 @@ buildPythonPackage { pname = "opentelemetry-instrumentation-wsgi"; disabled = pythonOlder "3.7"; - sourceRoot = "source/instrumentation/opentelemetry-instrumentation-wsgi"; + sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-wsgi"; format = "pyproject"; diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix index 8716ef4efedec..331a5e864374b 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { hash = "sha256-MPBOdurEQhA9BPRgVftejjtkvN/zRQEJDjQcS2QW3xc="; }; - sourceRoot = "source/opentelemetry-instrumentation"; + sourceRoot = "${src.name}/opentelemetry-instrumentation"; format = "pyproject"; diff --git a/pkgs/development/python-modules/opentelemetry-proto/default.nix b/pkgs/development/python-modules/opentelemetry-proto/default.nix index c673dee3986bc..21b84dd5898fe 100644 --- a/pkgs/development/python-modules/opentelemetry-proto/default.nix +++ b/pkgs/development/python-modules/opentelemetry-proto/default.nix @@ -12,7 +12,7 @@ buildPythonPackage { pname = "opentelemetry-proto"; disabled = pythonOlder "3.7"; - sourceRoot = "source/opentelemetry-proto"; + sourceRoot = "${opentelemetry-api.src.name}/opentelemetry-proto"; format = "pyproject"; diff --git a/pkgs/development/python-modules/opentelemetry-sdk/default.nix b/pkgs/development/python-modules/opentelemetry-sdk/default.nix index 1b4683137d956..ba5e7de5db83c 100644 --- a/pkgs/development/python-modules/opentelemetry-sdk/default.nix +++ b/pkgs/development/python-modules/opentelemetry-sdk/default.nix @@ -17,7 +17,7 @@ let pname = "opentelemetry-sdk"; disabled = pythonOlder "3.7"; - sourceRoot = "source/opentelemetry-sdk"; + sourceRoot = "${opentelemetry-api.src.name}/opentelemetry-sdk"; format = "pyproject"; diff --git a/pkgs/development/python-modules/opentelemetry-semantic-conventions/default.nix b/pkgs/development/python-modules/opentelemetry-semantic-conventions/default.nix index 0ae9fb34d06f3..d57a7f13fa535 100644 --- a/pkgs/development/python-modules/opentelemetry-semantic-conventions/default.nix +++ b/pkgs/development/python-modules/opentelemetry-semantic-conventions/default.nix @@ -11,7 +11,7 @@ buildPythonPackage { pname = "opentelemetry-semantic-conventions"; disabled = pythonOlder "3.7"; - sourceRoot = "source/opentelemetry-semantic-conventions"; + sourceRoot = "${opentelemetry-api.src.name}/opentelemetry-semantic-conventions"; format = "pyproject"; diff --git a/pkgs/development/python-modules/opentelemetry-test-utils/default.nix b/pkgs/development/python-modules/opentelemetry-test-utils/default.nix index 71e87b0737a99..4e2405058b86f 100644 --- a/pkgs/development/python-modules/opentelemetry-test-utils/default.nix +++ b/pkgs/development/python-modules/opentelemetry-test-utils/default.nix @@ -13,7 +13,7 @@ buildPythonPackage { pname = "opentelemetry-test-utils"; disabled = pythonOlder "3.7"; - sourceRoot = "source/tests/opentelemetry-test-utils"; + sourceRoot = "${opentelemetry-api.src.name}/tests/opentelemetry-test-utils"; format = "pyproject"; diff --git a/pkgs/development/python-modules/opentelemetry-util-http/default.nix b/pkgs/development/python-modules/opentelemetry-util-http/default.nix index 49ec52a380b05..85e28f2a6d49a 100644 --- a/pkgs/development/python-modules/opentelemetry-util-http/default.nix +++ b/pkgs/development/python-modules/opentelemetry-util-http/default.nix @@ -14,7 +14,7 @@ buildPythonPackage { pname = "opentelemetry-util-http"; disabled = pythonOlder "3.7"; - sourceRoot = "source/util/opentelemetry-util-http"; + sourceRoot = "${opentelemetry-instrumentation.src.name}/util/opentelemetry-util-http"; format = "pyproject"; diff --git a/pkgs/development/python-modules/prophet/default.nix b/pkgs/development/python-modules/prophet/default.nix index 7bb71fb778b6d..889f835861ed5 100644 --- a/pkgs/development/python-modules/prophet/default.nix +++ b/pkgs/development/python-modules/prophet/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { }) ]; - sourceRoot = "source/python"; + sourceRoot = "${src.name}/python"; env.PROPHET_REPACKAGE_CMDSTAN = "false"; diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 0c70cafa97c6b..7ed1f25ee6b65 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.0.20230806"; + version = "0.10.0.20230811"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-jDDqegAZOG0UTKPbh1H3V+5GrMGU6m2WGesXUEFJHJY="; + hash = "sha256-C6IKX6e5/lxtx4fZeMa+IS5TyWKhpBeipZSMnSikxUk="; }; passthru.optional-dependencies = { diff --git a/pkgs/development/python-modules/pynws/default.nix b/pkgs/development/python-modules/pynws/default.nix index 145f20e4c5899..4b9c70a044b68 100644 --- a/pkgs/development/python-modules/pynws/default.nix +++ b/pkgs/development/python-modules/pynws/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pynws"; - version = "1.5.0"; + version = "1.5.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "MatthewFlamm"; repo = pname; rev = "v${version}"; - hash = "sha256-UGwK7HasDAPw3edQUdrzWOmrbbM9l5R1BVw3M+FNm1s="; + hash = "sha256-Mq8kYS4p53gdSGF83AkSPecVizoEBbeKvyk7nCsRYdM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/radian/default.nix b/pkgs/development/python-modules/radian/default.nix index de60c93f9f8a1..d8ffc2bff9efa 100644 --- a/pkgs/development/python-modules/radian/default.nix +++ b/pkgs/development/python-modules/radian/default.nix @@ -11,24 +11,29 @@ , prompt-toolkit , pygments , rchitect -, six , R , rPackages +, pythonOlder }: buildPythonPackage rec { pname = "radian"; - version = "0.6.5"; + version = "0.6.6"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "randy3k"; repo = pname; - rev = "v${version}"; - sha256 = "iuD4EkGZ1GwNxR8Gpg9ANe3lMHJYZ/Q/RyuN6vZZWME="; + rev = "refs/tags/v${version}"; + hash = "sha256-zA7R9UIB0hOWev10Y4oySIKeIxTOo0V6Q3Fxe+FeHSU="; }; postPatch = '' - substituteInPlace setup.py --replace '"pytest-runner"' "" + substituteInPlace setup.py \ + --replace '"pytest-runner"' "" \ + --replace '0.3.39,<0.4.0' '0.3.39' ''; nativeBuildInputs = [ @@ -40,7 +45,6 @@ buildPythonPackage rec { prompt-toolkit pygments rchitect - six ] ++ (with rPackages; [ reticulate askpass @@ -65,6 +69,7 @@ buildPythonPackage rec { meta = with lib; { description = "A 21 century R console"; homepage = "https://github.com/randy3k/radian"; + changelog = "https://github.com/randy3k/radian/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ savyajha ]; }; diff --git a/pkgs/development/python-modules/rchitect/default.nix b/pkgs/development/python-modules/rchitect/default.nix index 9e0b1b48d29db..ad1484dfc254e 100644 --- a/pkgs/development/python-modules/rchitect/default.nix +++ b/pkgs/development/python-modules/rchitect/default.nix @@ -2,25 +2,31 @@ , buildPythonPackage , fetchFromGitHub , cffi -, six , pytestCheckHook , pytest-mock +, pythonOlder , R -, rPackages }: +, rPackages +, six +}: buildPythonPackage rec { pname = "rchitect"; - version = "0.3.40"; + version = "0.4.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "randy3k"; repo = pname; - rev = "v${version}"; - sha256 = "yJMiPmusZ62dd6+5VkA2uSjq57a0C3arG8CgiUUHKpk="; + rev = "refs/tags/v${version}"; + hash = "sha256-fXL2UX0n9kKAVwMUP0z8V3UtJAy4xbAjnPIggUHllN0="; }; postPatch = '' - substituteInPlace setup.py --replace '"pytest-runner"' "" + substituteInPlace setup.py \ + --replace '"pytest-runner"' "" ''; propagatedBuildInputs = [ @@ -46,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Interoperate R with Python"; homepage = "https://github.com/randy3k/rchitect"; + changelog = "https://github.com/randy3k/rchitect/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ savyajha ]; }; diff --git a/pkgs/development/python-modules/todoist-api-python/default.nix b/pkgs/development/python-modules/todoist-api-python/default.nix index ed7ae3ab0e719..d62f5b8ad2ac4 100644 --- a/pkgs/development/python-modules/todoist-api-python/default.nix +++ b/pkgs/development/python-modules/todoist-api-python/default.nix @@ -1,5 +1,4 @@ { lib -, attrs , buildPythonPackage , fetchFromGitHub , fetchpatch @@ -13,16 +12,16 @@ buildPythonPackage rec { pname = "todoist-api-python"; - version = "2.0.2"; + version = "2.1.1"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "Doist"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-CKOsUb35+7WjSNf4Xo0SK5loIqWJbEnHdmhw9QXWFAI="; + hash = "sha256-mBQCC1beBAB+vDV/TrQHQB7cTjjoCDZlqpiYP8IphUA="; }; patches = [ @@ -39,7 +38,6 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - attrs requests ]; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 1df7e59abc8ee..c8ee0e1b657dc 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -22,14 +22,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.3.360"; + version = "2.3.361"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-3EyaJiApKm2Kaj1nAfadMyn/qnrx3on2rYQAXc6jG8E="; + hash = "sha256-k357VjGB+mKsKsd+l0S2lMh1f5za5Htlm4AWEVisQss="; }; patches = [ diff --git a/pkgs/development/tools/ceedling/Gemfile b/pkgs/development/tools/ceedling/Gemfile new file mode 100644 index 0000000000000..01d6e98e76aae --- /dev/null +++ b/pkgs/development/tools/ceedling/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'ceedling' diff --git a/pkgs/development/tools/ceedling/Gemfile.lock b/pkgs/development/tools/ceedling/Gemfile.lock new file mode 100644 index 0000000000000..2709a0edab5f7 --- /dev/null +++ b/pkgs/development/tools/ceedling/Gemfile.lock @@ -0,0 +1,21 @@ +GEM + remote: https://rubygems.org/ + specs: + ceedling (0.31.1) + constructor (~> 2) + deep_merge (~> 1.2) + rake (>= 12, < 14) + thor (~> 0.14) + constructor (2.0.0) + deep_merge (1.2.2) + rake (13.0.6) + thor (0.20.3) + +PLATFORMS + x86_64-linux + +DEPENDENCIES + ceedling + +BUNDLED WITH + 2.4.17 diff --git a/pkgs/development/tools/ceedling/default.nix b/pkgs/development/tools/ceedling/default.nix new file mode 100644 index 0000000000000..5910b47b7424a --- /dev/null +++ b/pkgs/development/tools/ceedling/default.nix @@ -0,0 +1,16 @@ +{ lib +, bundlerApp +}: + +bundlerApp { + pname = "ceedling"; + gemdir = ./.; + exes = [ "ceedling" ]; + + meta = with lib; { + description = "A build system for C projects that is something of an extension around Ruby's Rake"; + homepage = "http://www.throwtheswitch.org/ceedling"; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/ceedling/gemset.nix b/pkgs/development/tools/ceedling/gemset.nix new file mode 100644 index 0000000000000..e094c7dd4d671 --- /dev/null +++ b/pkgs/development/tools/ceedling/gemset.nix @@ -0,0 +1,53 @@ +{ + ceedling = { + dependencies = ["constructor" "deep_merge" "rake" "thor"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jjvz14dg85v8c4raxvk618rq7f6kyna5148901xciz2zjpm3bri"; + type = "gem"; + }; + version = "0.31.1"; + }; + constructor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02qmp08kcvi5dkz3lxm5yck9msfwfx1msvrrz9d6z4klc14q889y"; + type = "gem"; + }; + version = "2.0.0"; + }; + deep_merge = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fjn4civid68a3zxnbgyjj6krs3l30dy8b4djpg6fpzrsyix7kl3"; + type = "gem"; + }; + version = "1.2.2"; + }; + rake = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; + type = "gem"; + }; + version = "13.0.6"; + }; + thor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29"; + type = "gem"; + }; + version = "0.20.3"; + }; +} diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index cd31dbd7a3a16..09c59eccb8f91 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.54.0"; + version = "1.54.1"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - hash = "sha256-UXN5gN1SNv3uvBCliJQ+5PSGHRL7RyU6pmZtGUTFsrQ="; + hash = "sha256-Dymo/ABlDh8JwaTMTQgsWARuAkqHbakyUzujTgtMTyQ="; }; - vendorHash = "sha256-jUlK/A0HxBrIby2C0zYFtnxQX1bgKVyypI3QdH4u/rg="; + vendorHash = "sha256-rMektYjs8laN9ykc3bcYOgJ9twnjKl1gIEEL/wPkhfE="; subPackages = [ "cmd/golangci-lint" ]; diff --git a/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock b/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock index ababbc9b3753f..c7073c422c488 100644 --- a/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock +++ b/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock @@ -189,6 +189,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[package]] +name = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + +[[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -366,6 +372,30 @@ dependencies = [ ] [[package]] +name = "crossbeam-deque" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset", + "scopeguard", +] + +[[package]] name = "crossbeam-utils" version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -375,6 +405,12 @@ dependencies = [ ] [[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] name = "csv" version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -562,6 +598,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] +name = "exr" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1e481eb11a482815d3e9d618db8c42a93207134662873809335a92327440c18" +dependencies = [ + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide", + "rayon-core", + "smallvec", + "zune-inflate", +] + +[[package]] name = "fancy-regex" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -624,6 +676,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" [[package]] +name = "flume" +version = "0.10.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +dependencies = [ + "futures-core", + "futures-sink", + "nanorand", + "pin-project", + "spin 0.9.8", +] + +[[package]] name = "fnv" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -776,8 +841,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi", + "wasm-bindgen", ] [[package]] @@ -816,6 +883,15 @@ dependencies = [ ] [[package]] +name = "half" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" +dependencies = [ + "crunchy", +] + +[[package]] name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1114,11 +1190,14 @@ dependencies = [ "bytemuck", "byteorder", "color_quant", + "exr", "gif", "jpeg-decoder", "num-rational", "num-traits", "png", + "qoi", + "tiff", ] [[package]] @@ -1135,6 +1214,7 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", + "serde", ] [[package]] @@ -1249,6 +1329,9 @@ name = "jpeg-decoder" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +dependencies = [ + "rayon", +] [[package]] name = "js-sys" @@ -1275,6 +1358,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] +name = "lebe" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + +[[package]] name = "libc" version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1299,6 +1388,15 @@ dependencies = [ ] [[package]] +name = "line-wrap" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" +dependencies = [ + "safemem", +] + +[[package]] name = "linked-hash-map" version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1380,6 +1478,15 @@ dependencies = [ ] [[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] name = "mime" version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1407,6 +1514,15 @@ dependencies = [ ] [[package]] +name = "nanorand" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +dependencies = [ + "getrandom", +] + +[[package]] name = "native-tls" version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1492,6 +1608,15 @@ dependencies = [ ] [[package]] +name = "oklab" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "467e40ada50d13bab19019e3707862b5076ca15841f31ee1474c40397c1b9f11" +dependencies = [ + "rgb", +] + +[[package]] name = "once_cell" version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1696,9 +1821,9 @@ checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pdf-writer" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30900f178ea696fc5d9637171f98aaa93d5aae54f0726726df68fc3e32810db6" +checksum = "86af2eb3faa4614bc7fda8bd578c25e76a17ff3b1577be034b81e0c20527e204" dependencies = [ "bitflags 1.3.2", "itoa", @@ -1783,6 +1908,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] +name = "plist" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdc0001cfea3db57a2e24bc0d818e9e20e554b5f97fabb9bc231dc240269ae06" +dependencies = [ + "base64", + "indexmap 1.9.3", + "line-wrap", + "quick-xml", + "serde", + "time", +] + +[[package]] name = "png" version = "0.17.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1870,6 +2009,24 @@ dependencies = [ ] [[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "quick-xml" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51" +dependencies = [ + "memchr", +] + +[[package]] name = "quote" version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1909,6 +2066,28 @@ dependencies = [ ] [[package]] +name = "rayon" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] + +[[package]] name = "rctree" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2022,8 +2201,11 @@ version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "142e83d8ae8c8c639f304698a5567b229ba65caba867bf4387bbc0ae158827cf" dependencies = [ + "gif", + "jpeg-decoder", "log", "pico-args", + "png", "rgb", "svgtypes", "tiny-skia", @@ -2048,7 +2230,7 @@ dependencies = [ "cc", "libc", "once_cell", - "spin", + "spin 0.5.2", "untrusted", "web-sys", "winapi", @@ -2155,6 +2337,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] +name = "safemem" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" + +[[package]] name = "same-file" version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2378,6 +2566,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] name = "stable_deref_trait" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2467,8 +2664,9 @@ dependencies = [ [[package]] name = "svg2pdf" -version = "0.5.0" -source = "git+https://github.com/typst/svg2pdf.git#39daf9fc2ee84b62b0e3b174ff8c9017f655af6b" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c966e59fd4afd959edcc226687f751a7d05c94d0477cca1a4c2b15a7220f2b24" dependencies = [ "image", "miniz_oxide", @@ -2532,11 +2730,13 @@ dependencies = [ "flate2", "fnv", "once_cell", + "plist", "regex-syntax", "serde", "serde_json", "thiserror", "walkdir", + "yaml-rust", ] [[package]] @@ -2611,6 +2811,17 @@ dependencies = [ ] [[package]] +name = "tiff" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", +] + +[[package]] name = "time" version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2972,8 +3183,8 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" [[package]] name = "typst" -version = "0.6.0" -source = "git+https://github.com/typst/typst.git?tag=v0.6.0#2dfd44fedd99ab9414c17f358179e1c37e953f30" +version = "0.7.0" +source = "git+https://github.com/typst/typst.git?tag=v0.7.0#da8367e189b02918a8fe1a98fd3059fd11a82cd9" dependencies = [ "bitflags 2.3.3", "bytemuck", @@ -2986,6 +3197,7 @@ dependencies = [ "indexmap 1.9.3", "log", "miniz_oxide", + "oklab", "once_cell", "pdf-writer", "pixglyph", @@ -3004,6 +3216,7 @@ dependencies = [ "tracing", "ttf-parser", "typst-macros", + "typst-syntax", "unicode-general-category", "unicode-ident", "unicode-math-class", @@ -3015,8 +3228,8 @@ dependencies = [ [[package]] name = "typst-library" -version = "0.6.0" -source = "git+https://github.com/typst/typst.git?tag=v0.6.0#2dfd44fedd99ab9414c17f358179e1c37e953f30" +version = "0.7.0" +source = "git+https://github.com/typst/typst.git?tag=v0.7.0#da8367e189b02918a8fe1a98fd3059fd11a82cd9" dependencies = [ "az", "chinese-number", @@ -3054,7 +3267,7 @@ dependencies = [ [[package]] name = "typst-lsp" -version = "0.8.1" +version = "0.9.0" dependencies = [ "anyhow", "async-compression", @@ -3097,8 +3310,8 @@ dependencies = [ [[package]] name = "typst-macros" -version = "0.6.0" -source = "git+https://github.com/typst/typst.git?tag=v0.6.0#2dfd44fedd99ab9414c17f358179e1c37e953f30" +version = "0.7.0" +source = "git+https://github.com/typst/typst.git?tag=v0.7.0#da8367e189b02918a8fe1a98fd3059fd11a82cd9" dependencies = [ "heck", "proc-macro2", @@ -3107,6 +3320,22 @@ dependencies = [ ] [[package]] +name = "typst-syntax" +version = "0.7.0" +source = "git+https://github.com/typst/typst.git?tag=v0.7.0#da8367e189b02918a8fe1a98fd3059fd11a82cd9" +dependencies = [ + "comemo", + "ecow", + "once_cell", + "serde", + "tracing", + "unicode-ident", + "unicode-math-class", + "unicode-segmentation", + "unscanny", +] + +[[package]] name = "unic-langid" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3686,3 +3915,12 @@ dependencies = [ "syn 1.0.109", "synstructure", ] + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] diff --git a/pkgs/development/tools/language-servers/typst-lsp/default.nix b/pkgs/development/tools/language-servers/typst-lsp/default.nix index 732c979bbefbb..e730ab24ce8b8 100644 --- a/pkgs/development/tools/language-servers/typst-lsp/default.nix +++ b/pkgs/development/tools/language-servers/typst-lsp/default.nix @@ -9,20 +9,19 @@ rustPlatform.buildRustPackage rec { pname = "typst-lsp"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "nvarner"; repo = "typst-lsp"; rev = "v${version}"; - hash = "sha256-Aq9KP9L9s42NmX45YVnGUMpP0MXKB1Pjd4W0f0U8T7o="; + hash = "sha256-XV/LlibO+2ORle0lVcqqHrDdH75kodk9yOU3OsHFA+A="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "svg2pdf-0.5.0" = "sha256-yBQpvDAnJ7C0PWIM/o0PzOg9JlDZCEiVdCTDDPSwrmE="; - "typst-0.6.0" = "sha256-8e6BNffKgAUNwic4uEfDh77y2nIyYt9BwZr+ypv+d5A="; + "typst-0.7.0" = "sha256-yrtOmlFAKOqAmhCP7n0HQCOQpU3DWyms5foCdUb9QTg="; }; }; @@ -36,11 +35,6 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.Security ]; - patches = [ - # `rustPlatform.importCargoLock` has trouble parsing the `??` in the url - ./remove-svg2pdf-patch.patch - ]; - checkFlags = [ # requires internet access "--skip=workspace::package::external::repo::test::full_download" diff --git a/pkgs/development/tools/language-servers/typst-lsp/remove-svg2pdf-patch.patch b/pkgs/development/tools/language-servers/typst-lsp/remove-svg2pdf-patch.patch deleted file mode 100644 index ad277caa81b55..0000000000000 --- a/pkgs/development/tools/language-servers/typst-lsp/remove-svg2pdf-patch.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -2468,7 +2468,7 @@ dependencies = [ - [[package]] - name = "svg2pdf" - version = "0.5.0" --source = "git+https://github.com/typst/svg2pdf.git??tag=v0.5.0#39daf9fc2ee84b62b0e3b174ff8c9017f655af6b" -+source = "git+https://github.com/typst/svg2pdf.git#39daf9fc2ee84b62b0e3b174ff8c9017f655af6b" - dependencies = [ - "image", - "miniz_oxide", ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -84,13 +84,5 @@ reqwest = { version = "0.11.18", default-features = false, features = [ - "rustls-tls", - ] } - -- --# Typst 0.6.0 does not specify a tag or ref for svg2pdf, so provide one... --# ...but Cargo doesn't want to make our lives too easy, and we can't replace the --# dependency with another at the same URL. Use a workaroud inspired by --# StackOverflow: https://stackoverflow.com/a/72261235 --[patch."https://github.com/typst/svg2pdf"] --svg2pdf = { git = "https://github.com/typst/svg2pdf.git?", tag = "v0.5.0" } -- - [dev-dependencies] - temp-dir = "0.1.11" diff --git a/pkgs/development/tools/misc/runme/default.nix b/pkgs/development/tools/misc/runme/default.nix index 8f390befa9237..fc61e0ae376fd 100644 --- a/pkgs/development/tools/misc/runme/default.nix +++ b/pkgs/development/tools/misc/runme/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "runme"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "stateful"; repo = "runme"; rev = "v${version}"; - hash = "sha256-WsYaOaXaNGztVqHMURn/96lWA9grccoKw6AJOhqUdfQ="; + hash = "sha256-BoPNIaYxK4VyafNWAVDonwTfpqF1N3Ggq5GF6A7DhF0="; }; - vendorHash = "sha256-5FMrz4I/i/uJDI4vK9hiet4zMRf0CSbc/YJAFi8hlEM="; + vendorHash = "sha256-sGk2K0I9onGFpDwboRugNHjFictisY4Q0NTNnOT3BW4="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index 9d81c46e20c9f..a09f226b3f136 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -1,31 +1,57 @@ -{ lib, stdenv, fetchFromGitHub, ocaml, perl }: +{ lib, stdenv, fetchFromGitHub, ocaml, findlib, perl, makeWrapper +, rresult, bos, ocaml_pcre, re, camlp-streams +}: if lib.versionOlder ocaml.version "4.02" -|| lib.versionOlder "4.13" ocaml.version then throw "camlp5 is not available for OCaml ${ocaml.version}" else -stdenv.mkDerivation rec { +let params = + if lib.versionAtLeast ocaml.version "4.12" + then rec { + version = "8.00.05"; - pname = "camlp5"; - version = "7.14"; + src = fetchFromGitHub { + owner = "camlp5"; + repo = "camlp5"; + rev = version; + hash = "sha256-Havr3RB6iUP7QzV+LUGwMHtGzmRdS5RqYsqJ0N5w6gE="; + }; - src = fetchFromGitHub { - owner = "camlp5"; - repo = "camlp5"; - rev = "rel${builtins.replaceStrings [ "." ] [ "" ] version}"; - sha256 = "1dd68bisbpqn5lq2pslm582hxglcxnbkgfkwhdz67z4w9d5nvr7w"; - }; + nativeBuildInputs = [ makeWrapper ocaml findlib perl ]; + buildInputs = [ bos ocaml_pcre re rresult ]; + propagatedBuildInputs = [ camlp-streams ]; - strictDeps = true; + postFixup = '' + for p in camlp5 camlp5o camlp5r camlp5sch mkcamlp5 ocpp5 + do + wrapProgram $out/bin/$p \ + --suffix CAML_LD_LIBRARY_PATH : ${ocaml_pcre}/lib/ocaml/${ocaml.version}/site-lib/stublibs + done + ''; + } else rec { + version = "7.14"; + src = fetchFromGitHub { + owner = "camlp5"; + repo = "camlp5"; + rev = "rel${builtins.replaceStrings [ "." ] [ "" ] version}"; + sha256 = "1dd68bisbpqn5lq2pslm582hxglcxnbkgfkwhdz67z4w9d5nvr7w"; + }; + nativeBuildInputs = [ ocaml perl ]; + } +; in - nativeBuildInputs = [ ocaml perl ]; +stdenv.mkDerivation (params // { + + pname = "ocaml${ocaml.version}-camlp5"; + + strictDeps = true; prefixKey = "-prefix "; preConfigure = '' configureFlagsArray=(--strict --libdir $out/lib/ocaml/${ocaml.version}/site-lib) - patchShebangs ./config/find_stuffversion.pl + patchShebangs ./config/find_stuffversion.pl etc/META.pl ''; buildFlags = [ "world.opt" ]; @@ -45,4 +71,4 @@ stdenv.mkDerivation rec { maggesi vbgl ]; }; -} +}) diff --git a/pkgs/development/tools/rust/cargo-about/default.nix b/pkgs/development/tools/rust/cargo-about/default.nix index cc30bfb24faa0..7af3b28817ae0 100644 --- a/pkgs/development/tools/rust/cargo-about/default.nix +++ b/pkgs/development/tools/rust/cargo-about/default.nix @@ -35,6 +35,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/EmbarkStudios/cargo-about"; changelog = "https://github.com/EmbarkStudios/cargo-about/blob/${version}/CHANGELOG.md"; license = with licenses; [ mit /* or */ asl20 ]; - maintainers = with maintainers; [ evanjs figsoda ]; + maintainers = with maintainers; [ evanjs figsoda matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-all-features/default.nix b/pkgs/development/tools/rust/cargo-all-features/default.nix index 0a7aeb9accb37..b4ba6b52afad9 100644 --- a/pkgs/development/tools/rust/cargo-all-features/default.nix +++ b/pkgs/development/tools/rust/cargo-all-features/default.nix @@ -18,6 +18,6 @@ rustPlatform.buildRustPackage rec { description = "A Cargo subcommand to build and test all feature flag combinations"; homepage = "https://github.com/frewsxcv/cargo-all-features"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ figsoda ]; + maintainers = with maintainers; [ figsoda matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-binstall/default.nix b/pkgs/development/tools/rust/cargo-binstall/default.nix index 24f938fee13ee..1d53e3724b69a 100644 --- a/pkgs/development/tools/rust/cargo-binstall/default.nix +++ b/pkgs/development/tools/rust/cargo-binstall/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-baP7F9YL/zm1Ve8jUOby4QLkR+Gy9tSZewQ1JuP822Q="; + hash = "sha256-xqY1C3ZPGY9GeyuSgV0s4+eSkm4r+jOQkNgSzqE2QUI="; }; - cargoHash = "sha256-wzwLMjOxMJBC0UNIga4FT/gL9syjW0dg9cD60+rwZ/c="; + cargoHash = "sha256-yAda80b62WGYuKo5YtCLRtx08fmNs5HLDcNWhq+FG/I="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-binutils/default.nix b/pkgs/development/tools/rust/cargo-binutils/default.nix index af3673e28bce5..ddb5e3c199bfc 100644 --- a/pkgs/development/tools/rust/cargo-binutils/default.nix +++ b/pkgs/development/tools/rust/cargo-binutils/default.nix @@ -19,6 +19,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/rust-embedded/cargo-binutils"; changelog = "https://github.com/rust-embedded/cargo-binutils/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ stupremee ]; + maintainers = with maintainers; [ stupremee matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-bloat/default.nix b/pkgs/development/tools/rust/cargo-bloat/default.nix index 0742b6b904fbc..03f8922ba6321 100644 --- a/pkgs/development/tools/rust/cargo-bloat/default.nix +++ b/pkgs/development/tools/rust/cargo-bloat/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/RazrFalcon/cargo-bloat"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ xrelkd ]; + maintainers = with maintainers; [ xrelkd matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-bundle-licenses/default.nix b/pkgs/development/tools/rust/cargo-bundle-licenses/default.nix index df8ff3c0e2c3b..3d78e18dd57ac 100644 --- a/pkgs/development/tools/rust/cargo-bundle-licenses/default.nix +++ b/pkgs/development/tools/rust/cargo-bundle-licenses/default.nix @@ -21,6 +21,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/sstadick/cargo-bundle-licenses"; changelog = "https://github.com/sstadick/cargo-bundle-licenses/blob/${src.rev}/CHANGELOG.md"; license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ figsoda ]; + maintainers = with maintainers; [ figsoda matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-cache/default.nix b/pkgs/development/tools/rust/cargo-cache/default.nix index 581b48211666d..8e37c1489dfd5 100644 --- a/pkgs/development/tools/rust/cargo-cache/default.nix +++ b/pkgs/development/tools/rust/cargo-cache/default.nix @@ -21,6 +21,6 @@ rustPlatform.buildRustPackage rec { description = "Manage cargo cache (\${CARGO_HOME}, ~/.cargo/), print sizes of dirs and remove dirs selectively"; homepage = "https://github.com/matthiaskrgr/cargo-cache"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ Br1ght0ne ]; + maintainers = with maintainers; [ Br1ght0ne matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-careful/default.nix b/pkgs/development/tools/rust/cargo-careful/default.nix index ce1815352e6a0..d64aeb320d971 100644 --- a/pkgs/development/tools/rust/cargo-careful/default.nix +++ b/pkgs/development/tools/rust/cargo-careful/default.nix @@ -20,6 +20,6 @@ rustPlatform.buildRustPackage rec { description = "A tool to execute Rust code carefully, with extra checking along the way"; homepage = "https://github.com/RalfJung/cargo-careful"; license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ figsoda ]; + maintainers = with maintainers; [ figsoda matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-clone/default.nix b/pkgs/development/tools/rust/cargo-clone/default.nix index 68af8c0a2d391..844839717b55d 100644 --- a/pkgs/development/tools/rust/cargo-clone/default.nix +++ b/pkgs/development/tools/rust/cargo-clone/default.nix @@ -36,6 +36,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/janlikar/cargo-clone"; changelog = "https://github.com/janlikar/cargo-clone/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ figsoda ]; + maintainers = with maintainers; [ figsoda matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-crev/default.nix b/pkgs/development/tools/rust/cargo-crev/default.nix index 61a8e94a436ba..a4ac312107961 100644 --- a/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/pkgs/development/tools/rust/cargo-crev/default.nix @@ -41,6 +41,6 @@ rustPlatform.buildRustPackage rec { description = "A cryptographically verifiable code review system for the cargo (Rust) package manager"; homepage = "https://github.com/crev-dev/cargo-crev"; license = with licenses; [ asl20 mit mpl20 ]; - maintainers = with maintainers; [ b4dm4n ]; + maintainers = with maintainers; [ b4dm4n matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-criterion/default.nix b/pkgs/development/tools/rust/cargo-criterion/default.nix index d33f455c9b93f..cc9f5ae255cca 100644 --- a/pkgs/development/tools/rust/cargo-criterion/default.nix +++ b/pkgs/development/tools/rust/cargo-criterion/default.nix @@ -17,6 +17,6 @@ rustPlatform.buildRustPackage rec { description = "Cargo extension for running Criterion.rs benchmarks"; homepage = "https://github.com/bheisler/cargo-criterion"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ humancalico ]; + maintainers = with maintainers; [ humancalico matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-deadlinks/default.nix b/pkgs/development/tools/rust/cargo-deadlinks/default.nix index 21ac416882f91..ead5705c59ae7 100644 --- a/pkgs/development/tools/rust/cargo-deadlinks/default.nix +++ b/pkgs/development/tools/rust/cargo-deadlinks/default.nix @@ -27,6 +27,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/deadlinks/cargo-deadlinks"; changelog = "https://github.com/deadlinks/cargo-deadlinks/blob/${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ newam ]; + maintainers = with maintainers; [ newam matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-deb/default.nix b/pkgs/development/tools/rust/cargo-deb/default.nix index 2cc64a771e112..a9b76710605ed 100644 --- a/pkgs/development/tools/rust/cargo-deb/default.nix +++ b/pkgs/development/tools/rust/cargo-deb/default.nix @@ -36,6 +36,6 @@ rustPlatform.buildRustPackage rec { description = "A cargo subcommand that generates Debian packages from information in Cargo.toml"; homepage = "https://github.com/kornelski/cargo-deb"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne ]; + maintainers = with maintainers; [ Br1ght0ne matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-depgraph/default.nix b/pkgs/development/tools/rust/cargo-depgraph/default.nix index 57c71687243a1..1e7c63574c99f 100644 --- a/pkgs/development/tools/rust/cargo-depgraph/default.nix +++ b/pkgs/development/tools/rust/cargo-depgraph/default.nix @@ -18,6 +18,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://sr.ht/~jplatte/cargo-depgraph"; changelog = "https://git.sr.ht/~jplatte/cargo-depgraph/tree/${src.rev}/item/CHANGELOG.md"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ figsoda ]; + maintainers = with maintainers; [ figsoda matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-dephell/default.nix b/pkgs/development/tools/rust/cargo-dephell/default.nix index 6a6cfa46d5fd3..63a8cabccefa6 100644 --- a/pkgs/development/tools/rust/cargo-dephell/default.nix +++ b/pkgs/development/tools/rust/cargo-dephell/default.nix @@ -47,6 +47,6 @@ rustPlatform.buildRustPackage rec { description = "A tool to analyze the third-party dependencies imported by a rust crate or rust workspace"; homepage = "https://github.com/mimoo/cargo-dephell"; license = with licenses; [ mit /* or */ asl20 ]; - maintainers = with maintainers; [ figsoda ]; + maintainers = with maintainers; [ figsoda matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-deps/default.nix b/pkgs/development/tools/rust/cargo-deps/default.nix index 51b6f14136dca..67e33406b6ceb 100644 --- a/pkgs/development/tools/rust/cargo-deps/default.nix +++ b/pkgs/development/tools/rust/cargo-deps/default.nix @@ -15,6 +15,6 @@ rustPlatform.buildRustPackage rec { description = "Cargo subcommand for building dependency graphs of Rust projects"; homepage = "https://github.com/m-cat/cargo-deps"; license = licenses.mit; - maintainers = with maintainers; [ arcnmx ]; + maintainers = with maintainers; [ arcnmx matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-diet/default.nix b/pkgs/development/tools/rust/cargo-diet/default.nix index da3036187e2d5..60aadca13d002 100644 --- a/pkgs/development/tools/rust/cargo-diet/default.nix +++ b/pkgs/development/tools/rust/cargo-diet/default.nix @@ -18,6 +18,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/the-lean-crate/cargo-diet"; changelog = "https://github.com/the-lean-crate/cargo-diet/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; + maintainers = with maintainers; [ figsoda matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-dist/default.nix b/pkgs/development/tools/rust/cargo-dist/default.nix index 50e9f240ba1d9..1c9e073ecdd7a 100644 --- a/pkgs/development/tools/rust/cargo-dist/default.nix +++ b/pkgs/development/tools/rust/cargo-dist/default.nix @@ -6,21 +6,23 @@ , xz , zstd , stdenv +, darwin +, git , rustup }: rustPlatform.buildRustPackage rec { pname = "cargo-dist"; - version = "0.0.7"; + version = "0.1.0"; src = fetchFromGitHub { owner = "axodotdev"; repo = "cargo-dist"; rev = "v${version}"; - hash = "sha256-uXC+iaOcEIyGMVNtAduhT68GuE29aL/3S6uEMllAWNA="; + hash = "sha256-yuBf6WgY+sGk7Y5/gZFHeawbHhsVIxabFlpiL4AUzK8="; }; - cargoHash = "sha256-/TLi+ESOZhJ4Xg3hdUEWhM0K4asI9+L1M1+hWuDOj9Q="; + cargoHash = "sha256-vfpSMa3NO95SPU4jSW1qKMUy4EGZloYNC3SyGwlTGC0="; nativeBuildInputs = [ pkg-config @@ -30,21 +32,30 @@ rustPlatform.buildRustPackage rec { bzip2 xz zstd + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + nativeCheckInputs = [ + git + ] ++ lib.optionals stdenv.isDarwin [ + rustup ]; env = { ZSTD_SYS_USE_PKG_CONFIG = true; }; - nativeCheckInputs = lib.optionals stdenv.isDarwin [ - rustup - ]; + # remove tests that require internet access + postPatch = '' + rm cargo-dist/tests/integration-tests.rs + ''; meta = with lib; { description = "A tool for building final distributable artifacts and uploading them to an archive"; homepage = "https://github.com/axodotdev/cargo-dist"; changelog = "https://github.com/axodotdev/cargo-dist/blob/${src.rev}/CHANGELOG.md"; license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ figsoda ]; + maintainers = with maintainers; [ figsoda matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-docset/default.nix b/pkgs/development/tools/rust/cargo-docset/default.nix index 8565d7f084083..95fa48e4aba91 100644 --- a/pkgs/development/tools/rust/cargo-docset/default.nix +++ b/pkgs/development/tools/rust/cargo-docset/default.nix @@ -29,6 +29,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Robzz/cargo-docset"; changelog = "https://github.com/Robzz/cargo-docset/blob/${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ colinsane ]; + maintainers = with maintainers; [ colinsane matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-duplicates/default.nix b/pkgs/development/tools/rust/cargo-duplicates/default.nix index a3983162a93b8..781764d3c313b 100644 --- a/pkgs/development/tools/rust/cargo-duplicates/default.nix +++ b/pkgs/development/tools/rust/cargo-duplicates/default.nix @@ -41,6 +41,6 @@ rustPlatform.buildRustPackage rec { description = "A cargo subcommand for displaying when different versions of a same dependency are pulled in"; homepage = "https://github.com/Keruspe/cargo-duplicates"; license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; + maintainers = with maintainers; [ figsoda matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-feature/default.nix b/pkgs/development/tools/rust/cargo-feature/default.nix index 88c48cd859447..855fb65fdfb71 100644 --- a/pkgs/development/tools/rust/cargo-feature/default.nix +++ b/pkgs/development/tools/rust/cargo-feature/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Riey/cargo-feature"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ riey ]; + maintainers = with maintainers; [ riey matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-flamegraph/default.nix b/pkgs/development/tools/rust/cargo-flamegraph/default.nix index 4c1ea48e4a567..f2890b0cd63e8 100644 --- a/pkgs/development/tools/rust/cargo-flamegraph/default.nix +++ b/pkgs/development/tools/rust/cargo-flamegraph/default.nix @@ -33,6 +33,6 @@ rustPlatform.buildRustPackage rec { description = "Easy flamegraphs for Rust projects and everything else, without Perl or pipes <3"; homepage = "https://github.com/flamegraph-rs/flamegraph"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ killercup ]; + maintainers = with maintainers; [ killercup matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-fuzz/default.nix b/pkgs/development/tools/rust/cargo-fuzz/default.nix index 5893fd2c828cc..6abe4fbc129e0 100644 --- a/pkgs/development/tools/rust/cargo-fuzz/default.nix +++ b/pkgs/development/tools/rust/cargo-fuzz/default.nix @@ -21,6 +21,6 @@ rustPlatform.buildRustPackage rec { description = "Command line helpers for fuzzing"; homepage = "https://github.com/rust-fuzz/cargo-fuzz"; license = with licenses; [ mit asl20 ]; - maintainers = [ maintainers.ekleog ]; + maintainers = with maintainers; [ ekleog matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-geiger/default.nix b/pkgs/development/tools/rust/cargo-geiger/default.nix index 6d35e4d3ab8a2..5c48aeeb38291 100644 --- a/pkgs/development/tools/rust/cargo-geiger/default.nix +++ b/pkgs/development/tools/rust/cargo-geiger/default.nix @@ -54,6 +54,6 @@ rustPlatform.buildRustPackage rec { code is appropriate. ''; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ evanjs jk ]; + maintainers = with maintainers; [ evanjs jk matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index c0687938d03b5..65dc535f71aba 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -53,6 +53,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/cargo-generate/cargo-generate"; changelog = "https://github.com/cargo-generate/cargo-generate/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ figsoda turbomack ]; + maintainers = with maintainers; [ figsoda turbomack matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-graph/default.nix b/pkgs/development/tools/rust/cargo-graph/default.nix index 37fd43a1bcf1d..81416af36cfcf 100644 --- a/pkgs/development/tools/rust/cargo-graph/default.nix +++ b/pkgs/development/tools/rust/cargo-graph/default.nix @@ -17,6 +17,6 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A cargo subcommand for creating GraphViz DOT files and dependency graphs"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ basvandijk ]; + maintainers = with maintainers; [ basvandijk matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-info/default.nix b/pkgs/development/tools/rust/cargo-info/default.nix index bc53e09feb47f..9e05699e6c439 100644 --- a/pkgs/development/tools/rust/cargo-info/default.nix +++ b/pkgs/development/tools/rust/cargo-info/default.nix @@ -35,6 +35,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://gitlab.com/imp/cargo-info"; changelog = "https://gitlab.com/imp/cargo-info/-/blob/${src.rev}/CHANGELOG.md"; license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ figsoda ]; + maintainers = with maintainers; [ figsoda matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-inspect/default.nix b/pkgs/development/tools/rust/cargo-inspect/default.nix index 1644929074bba..4a9f642b700fd 100644 --- a/pkgs/development/tools/rust/cargo-inspect/default.nix +++ b/pkgs/development/tools/rust/cargo-inspect/default.nix @@ -19,6 +19,6 @@ rustPlatform.buildRustPackage rec { description = "See what Rust is doing behind the curtains"; homepage = "https://github.com/mre/cargo-inspect"; license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ minijackson ]; + maintainers = with maintainers; [ minijackson matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-insta/default.nix b/pkgs/development/tools/rust/cargo-insta/default.nix index 2fd9eaeb38525..5db787197a1d6 100644 --- a/pkgs/development/tools/rust/cargo-insta/default.nix +++ b/pkgs/development/tools/rust/cargo-insta/default.nix @@ -23,6 +23,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/mitsuhiko/insta"; changelog = "https://github.com/mitsuhiko/insta/blob/${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with lib.maintainers; [ figsoda oxalica ]; + maintainers = with lib.maintainers; [ figsoda oxalica matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-kcov/default.nix b/pkgs/development/tools/rust/cargo-kcov/default.nix index f94c4fa5c0f00..1b7c3b0eead92 100644 --- a/pkgs/development/tools/rust/cargo-kcov/default.nix +++ b/pkgs/development/tools/rust/cargo-kcov/default.nix @@ -30,6 +30,6 @@ rustPlatform.buildRustPackage rec { description = "Cargo subcommand to run kcov to get coverage report on Linux"; homepage = "https://github.com/kennytm/cargo-kcov"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ saschagrunert ]; + maintainers = with maintainers; [ saschagrunert matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-license/default.nix b/pkgs/development/tools/rust/cargo-license/default.nix index 5d2f8765cdf93..085286a7eb0bd 100644 --- a/pkgs/development/tools/rust/cargo-license/default.nix +++ b/pkgs/development/tools/rust/cargo-license/default.nix @@ -15,6 +15,6 @@ rustPlatform.buildRustPackage rec { description = "Cargo subcommand to see license of dependencies"; homepage = "https://github.com/onur/cargo-license"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ basvandijk figsoda ]; + maintainers = with maintainers; [ basvandijk figsoda matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-limit/default.nix b/pkgs/development/tools/rust/cargo-limit/default.nix index 37ecf56426887..f52f76a3de5e9 100644 --- a/pkgs/development/tools/rust/cargo-limit/default.nix +++ b/pkgs/development/tools/rust/cargo-limit/default.nix @@ -29,6 +29,6 @@ rustPlatform.buildRustPackage rec { description = "Cargo subcommand \"limit\": reduces the noise of compiler messages"; homepage = "https://github.com/alopatindev/cargo-limit"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ otavio ]; + maintainers = with maintainers; [ otavio matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix index 681242cbf898b..b1cb0c3005523 100644 --- a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix @@ -39,6 +39,6 @@ rustPlatform.buildRustPackage rec { library (e.g. fenix or rust-overlay) ''; license = with lib.licenses; [ asl20 /* or */ mit ]; - maintainers = with lib.maintainers; [ wucke13 ]; + maintainers = with lib.maintainers; [ wucke13 matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix b/pkgs/development/tools/rust/cargo-llvm-lines/default.nix index 8ccc4d9a29ec0..3ad67d41c3a99 100644 --- a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-lines/default.nix @@ -18,6 +18,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/dtolnay/cargo-llvm-lines"; changelog = "https://github.com/dtolnay/cargo-llvm-lines/releases/tag/${src.rev}"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ figsoda ]; + maintainers = with maintainers; [ figsoda matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-lock/default.nix b/pkgs/development/tools/rust/cargo-lock/default.nix index 01769487e5367..af5f5eae17191 100644 --- a/pkgs/development/tools/rust/cargo-lock/default.nix +++ b/pkgs/development/tools/rust/cargo-lock/default.nix @@ -18,6 +18,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/rustsec/rustsec/tree/main/cargo-lock"; changelog = "https://github.com/rustsec/rustsec/blob/cargo-lock/v${version}/cargo-lock/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ figsoda ]; + maintainers = with maintainers; [ figsoda matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-machete/default.nix b/pkgs/development/tools/rust/cargo-machete/default.nix index b68aecced8870..5078ddf6043ca 100644 --- a/pkgs/development/tools/rust/cargo-machete/default.nix +++ b/pkgs/development/tools/rust/cargo-machete/default.nix @@ -24,6 +24,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/bnjbvr/cargo-machete"; changelog = "https://github.com/bnjbvr/cargo-machete/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; + maintainers = with maintainers; [ figsoda matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-modules/default.nix b/pkgs/development/tools/rust/cargo-modules/default.nix index 50ffa47e0d3c6..be530890da519 100644 --- a/pkgs/development/tools/rust/cargo-modules/default.nix +++ b/pkgs/development/tools/rust/cargo-modules/default.nix @@ -22,6 +22,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/regexident/cargo-modules"; changelog = "https://github.com/regexident/cargo-modules/blob/${version}/CHANGELOG.md"; license = with licenses; [ mpl20 ]; - maintainers = with maintainers; [ figsoda rvarago ]; + maintainers = with maintainers; [ figsoda rvarago matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-msrv/default.nix b/pkgs/development/tools/rust/cargo-msrv/default.nix index e8476474c03fb..f1b9e8eb0ec0b 100644 --- a/pkgs/development/tools/rust/cargo-msrv/default.nix +++ b/pkgs/development/tools/rust/cargo-msrv/default.nix @@ -49,6 +49,6 @@ rustPlatform.buildRustPackage rec { description = "Cargo subcommand \"msrv\": assists with finding your minimum supported Rust version (MSRV)"; homepage = "https://github.com/foresterre/cargo-msrv"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ otavio ]; + maintainers = with maintainers; [ otavio matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix index ba38d5be85b6e..c8dea37daf06c 100644 --- a/pkgs/development/tools/rust/cargo-nextest/default.nix +++ b/pkgs/development/tools/rust/cargo-nextest/default.nix @@ -30,6 +30,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/nextest-rs/nextest"; changelog = "https://nexte.st/CHANGELOG.html"; license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ ekleog figsoda ]; + maintainers = with maintainers; [ ekleog figsoda matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-outdated/default.nix b/pkgs/development/tools/rust/cargo-outdated/default.nix index c30cd5925d8d4..40114a810d261 100644 --- a/pkgs/development/tools/rust/cargo-outdated/default.nix +++ b/pkgs/development/tools/rust/cargo-outdated/default.nix @@ -35,6 +35,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/kbknapp/cargo-outdated"; changelog = "https://github.com/kbknapp/cargo-outdated/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ ivan ]; + maintainers = with maintainers; [ ivan matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-readme/default.nix b/pkgs/development/tools/rust/cargo-readme/default.nix index fb45763b50be7..35d3fb133e851 100644 --- a/pkgs/development/tools/rust/cargo-readme/default.nix +++ b/pkgs/development/tools/rust/cargo-readme/default.nix @@ -29,6 +29,6 @@ rustPlatform.buildRustPackage rec { description = "Generate README.md from docstrings"; homepage = "https://github.com/livioribeiro/cargo-readme"; license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ baloo ]; + maintainers = with maintainers; [ baloo matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-rr/default.nix b/pkgs/development/tools/rust/cargo-rr/default.nix index f36205bec9c93..5ffbb9fe992ae 100644 --- a/pkgs/development/tools/rust/cargo-rr/default.nix +++ b/pkgs/development/tools/rust/cargo-rr/default.nix @@ -36,6 +36,6 @@ rustPlatform.buildRustPackage rec { description = "Cargo subcommand \"rr\": a light wrapper around rr, the time-travelling debugger"; homepage = "https://github.com/danielzfranklin/cargo-rr"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ otavio ]; + maintainers = with maintainers; [ otavio matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-show-asm/default.nix b/pkgs/development/tools/rust/cargo-show-asm/default.nix index d0ec880ac2e3a..88107c0dbc6ed 100644 --- a/pkgs/development/tools/rust/cargo-show-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-show-asm/default.nix @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pacak/cargo-show-asm"; changelog = "https://github.com/pacak/cargo-show-asm/blob/${version}/Changelog.md"; license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ figsoda oxalica ]; + maintainers = with maintainers; [ figsoda oxalica matthiasbeyer ]; mainProgram = "cargo-asm"; }; } diff --git a/pkgs/development/tools/rust/cargo-sort/default.nix b/pkgs/development/tools/rust/cargo-sort/default.nix index f3ee100651320..bb0d96bdd6388 100644 --- a/pkgs/development/tools/rust/cargo-sort/default.nix +++ b/pkgs/development/tools/rust/cargo-sort/default.nix @@ -18,6 +18,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/devinr528/cargo-sort"; changelog = "https://github.com/devinr528/cargo-sort/blob/v${version}/changelog.md"; license = with licenses; [ mit /* or */ asl20 ]; - maintainers = with maintainers; [ figsoda ]; + maintainers = with maintainers; [ figsoda matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-spellcheck/default.nix b/pkgs/development/tools/rust/cargo-spellcheck/default.nix index 6e4051618bc17..679dfc54e80f5 100644 --- a/pkgs/development/tools/rust/cargo-spellcheck/default.nix +++ b/pkgs/development/tools/rust/cargo-spellcheck/default.nix @@ -33,6 +33,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/drahnr/cargo-spellcheck"; changelog = "https://github.com/drahnr/cargo-spellcheck/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ newam ]; + maintainers = with maintainers; [ newam matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-supply-chain/default.nix b/pkgs/development/tools/rust/cargo-supply-chain/default.nix index 5865c98b11a9b..bedbc17a22a6e 100644 --- a/pkgs/development/tools/rust/cargo-supply-chain/default.nix +++ b/pkgs/development/tools/rust/cargo-supply-chain/default.nix @@ -27,6 +27,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/rust-secure-code/cargo-supply-chain"; changelog = "https://github.com/rust-secure-code/cargo-supply-chain/blob/${src.rev}/CHANGELOG.md"; license = with licenses; [ asl20 mit zlib ]; # any of three - maintainers = with maintainers; [ figsoda ]; + maintainers = with maintainers; [ figsoda matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-sweep/default.nix b/pkgs/development/tools/rust/cargo-sweep/default.nix index 9efa337f1b19c..2b682000c1b17 100644 --- a/pkgs/development/tools/rust/cargo-sweep/default.nix +++ b/pkgs/development/tools/rust/cargo-sweep/default.nix @@ -17,6 +17,6 @@ rustPlatform.buildRustPackage rec { description = "A Cargo subcommand for cleaning up unused build files generated by Cargo"; homepage = "https://github.com/holmgr/cargo-sweep"; license = licenses.mit; - maintainers = with maintainers; [ xrelkd ]; + maintainers = with maintainers; [ xrelkd matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-sync-readme/default.nix b/pkgs/development/tools/rust/cargo-sync-readme/default.nix index 904404c65c30f..a761e42c1540d 100644 --- a/pkgs/development/tools/rust/cargo-sync-readme/default.nix +++ b/pkgs/development/tools/rust/cargo-sync-readme/default.nix @@ -18,6 +18,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/phaazon/cargo-sync-readme"; changelog = "https://github.com/phaazon/cargo-sync-readme/blob/${version}/CHANGELOG.md"; license = licenses.bsd3; - maintainers = with maintainers; [ b4dm4n ]; + maintainers = with maintainers; [ b4dm4n matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-tally/default.nix b/pkgs/development/tools/rust/cargo-tally/default.nix index 63e6a8456f6c6..b340dc338a27a 100644 --- a/pkgs/development/tools/rust/cargo-tally/default.nix +++ b/pkgs/development/tools/rust/cargo-tally/default.nix @@ -22,6 +22,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/dtolnay/cargo-tally"; changelog = "https://github.com/dtolnay/cargo-tally/releases/tag/${version}"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ figsoda ]; + maintainers = with maintainers; [ figsoda matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-temp/default.nix b/pkgs/development/tools/rust/cargo-temp/default.nix index c138fb6292d17..706e33235c6dc 100644 --- a/pkgs/development/tools/rust/cargo-temp/default.nix +++ b/pkgs/development/tools/rust/cargo-temp/default.nix @@ -18,6 +18,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/yozhgoor/cargo-temp"; changelog = "https://github.com/yozhgoor/cargo-temp/releases/tag/${src.rev}"; license = with licenses; [ mit /* or */ asl20 ]; - maintainers = with maintainers; [ figsoda ]; + maintainers = with maintainers; [ figsoda matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-toml-lint/default.nix b/pkgs/development/tools/rust/cargo-toml-lint/default.nix index bcaf9c158f59a..187dc636afbc4 100644 --- a/pkgs/development/tools/rust/cargo-toml-lint/default.nix +++ b/pkgs/development/tools/rust/cargo-toml-lint/default.nix @@ -19,6 +19,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/fuellabs/cargo-toml-lint"; changelog = "https://github.com/fuellabs/cargo-toml-lint/releases/tag/v${version}"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ mitchmindtree ]; + maintainers = with maintainers; [ mitchmindtree matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index 5c7a45fba5e26..8ff6c841758ec 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -26,6 +26,6 @@ rustPlatform.buildRustPackage rec { description = "Find unused dependencies in Cargo.toml"; homepage = "https://github.com/est31/cargo-udeps"; license = licenses.mit; - maintainers = with maintainers; [ b4dm4n ]; + maintainers = with maintainers; [ b4dm4n matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-ui/default.nix b/pkgs/development/tools/rust/cargo-ui/default.nix index 764648055bdb8..7af23346f0fb6 100644 --- a/pkgs/development/tools/rust/cargo-ui/default.nix +++ b/pkgs/development/tools/rust/cargo-ui/default.nix @@ -53,6 +53,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/slint-ui/cargo-ui"; changelog = "https://github.com/slint-ui/cargo-ui/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit asl20 gpl3Only ]; - maintainers = with maintainers; [ figsoda ]; + maintainers = with maintainers; [ figsoda matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-unused-features/default.nix b/pkgs/development/tools/rust/cargo-unused-features/default.nix index b320c2768eca2..f6e3057ecffef 100644 --- a/pkgs/development/tools/rust/cargo-unused-features/default.nix +++ b/pkgs/development/tools/rust/cargo-unused-features/default.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { description = "A tool to find potential unused enabled feature flags and prune them"; homepage = "https://github.com/timonpost/cargo-unused-features"; license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; + maintainers = with maintainers; [ figsoda matthiasbeyer ]; mainProgram = "unused-features"; }; } diff --git a/pkgs/development/tools/rust/cargo-update/default.nix b/pkgs/development/tools/rust/cargo-update/default.nix index d3b5abbc02732..f9ec56b49d90f 100644 --- a/pkgs/development/tools/rust/cargo-update/default.nix +++ b/pkgs/development/tools/rust/cargo-update/default.nix @@ -60,6 +60,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/nabijaczleweli/cargo-update"; changelog = "https://github.com/nabijaczleweli/cargo-update/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ gerschtli Br1ght0ne johntitor ]; + maintainers = with maintainers; [ gerschtli Br1ght0ne johntitor matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-valgrind/default.nix b/pkgs/development/tools/rust/cargo-valgrind/default.nix index 7b0647c14c452..aa6b38bf398b4 100644 --- a/pkgs/development/tools/rust/cargo-valgrind/default.nix +++ b/pkgs/development/tools/rust/cargo-valgrind/default.nix @@ -38,6 +38,6 @@ rustPlatform.buildRustPackage rec { description = ''Cargo subcommand "valgrind": runs valgrind and collects its output in a helpful manner''; homepage = "https://github.com/jfrimmel/cargo-valgrind"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ otavio ]; + maintainers = with maintainers; [ otavio matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix index 2ed8f739a570a..85661f78e9fc9 100644 --- a/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/pkgs/development/tools/rust/cargo-watch/default.nix @@ -34,6 +34,6 @@ rustPlatform.buildRustPackage rec { description = "A Cargo subcommand for watching over Cargo project's source"; homepage = "https://github.com/watchexec/cargo-watch"; license = licenses.cc0; - maintainers = with maintainers; [ xrelkd ivan ]; + maintainers = with maintainers; [ xrelkd ivan matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-whatfeatures/default.nix b/pkgs/development/tools/rust/cargo-whatfeatures/default.nix index e5b2a34b4d1d0..b2a5993343ef3 100644 --- a/pkgs/development/tools/rust/cargo-whatfeatures/default.nix +++ b/pkgs/development/tools/rust/cargo-whatfeatures/default.nix @@ -22,6 +22,6 @@ rustPlatform.buildRustPackage rec { description = "A simple cargo plugin to get a list of features for a specific crate"; homepage = "https://github.com/museun/cargo-whatfeatures"; license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ ivan-babrou ]; + maintainers = with maintainers; [ ivan-babrou matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-workspaces/default.nix b/pkgs/development/tools/rust/cargo-workspaces/default.nix index 06a1cc09b65ab..0c5ded210275c 100644 --- a/pkgs/development/tools/rust/cargo-workspaces/default.nix +++ b/pkgs/development/tools/rust/cargo-workspaces/default.nix @@ -44,6 +44,6 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/pksunkara/cargo-workspaces"; license = licenses.mit; - maintainers = with maintainers; [ macalinao ]; + maintainers = with maintainers; [ macalinao matthiasbeyer ]; }; } diff --git a/pkgs/misc/moonfire-nvr/default.nix b/pkgs/misc/moonfire-nvr/default.nix index 27b7ae7766db6..8c9de0e7da9d1 100644 --- a/pkgs/misc/moonfire-nvr/default.nix +++ b/pkgs/misc/moonfire-nvr/default.nix @@ -21,7 +21,7 @@ let ui = buildNpmPackage { inherit version src; pname = "${pname}-ui"; - sourceRoot = "source/ui"; + sourceRoot = "${src.name}/ui"; npmDepsHash = "sha256-IpZWgMo6Y3vRn9h495ifMB3tQxobLeTLC0xXS1vrKLA="; installPhase = '' runHook preInstall @@ -34,7 +34,7 @@ let in rustPlatform.buildRustPackage { inherit pname version src; - sourceRoot = "source/server"; + sourceRoot = "${src.name}/server"; cargoLock = { lockFile = ./Cargo.lock; diff --git a/pkgs/misc/t-rec/default.nix b/pkgs/misc/t-rec/default.nix index 2bbfeda4d3213..3d6317f71c0db 100644 --- a/pkgs/misc/t-rec/default.nix +++ b/pkgs/misc/t-rec/default.nix @@ -32,6 +32,6 @@ rustPlatform.buildRustPackage rec { description = "Blazingly fast terminal recorder that generates animated gif images for the web written in rust"; homepage = "https://github.com/sassman/t-rec-rs"; license = with licenses; [ gpl3Only ]; - maintainers = [ maintainers.hoverbear ]; + maintainers = with maintainers; [ hoverbear matthiasbeyer ]; }; } diff --git a/pkgs/misc/uq/default.nix b/pkgs/misc/uq/default.nix index e0c62ca92cabe..81c09685be8b6 100755 --- a/pkgs/misc/uq/default.nix +++ b/pkgs/misc/uq/default.nix @@ -20,6 +20,6 @@ rustPlatform.buildRustPackage rec { description = "A simple, user-friendly alternative to sort | uniq"; homepage = "https://github.com/lostutils/uq"; license = licenses.mit; - maintainers = with maintainers; [ doronbehar ]; + maintainers = with maintainers; [ doronbehar matthiasbeyer ]; }; } diff --git a/pkgs/misc/wiki-tui/default.nix b/pkgs/misc/wiki-tui/default.nix index 89959e3fcf785..76059258e0ff2 100644 --- a/pkgs/misc/wiki-tui/default.nix +++ b/pkgs/misc/wiki-tui/default.nix @@ -37,6 +37,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/builditluc/wiki-tui"; changelog = "https://github.com/Builditluc/wiki-tui/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ lom builditluc ]; + maintainers = with maintainers; [ lom builditluc matthiasbeyer ]; }; } diff --git a/pkgs/os-specific/darwin/dark-mode-notify/default.nix b/pkgs/os-specific/darwin/dark-mode-notify/default.nix new file mode 100644 index 0000000000000..31d1a2c8d8b9f --- /dev/null +++ b/pkgs/os-specific/darwin/dark-mode-notify/default.nix @@ -0,0 +1,40 @@ +{ lib +, fetchFromGitHub +, stdenv +, swift +, swiftpm +, darwin +}: + +stdenv.mkDerivation (final: { + pname = "dark-mode-notify"; + version = "unstable-2022-07-18"; + + src = fetchFromGitHub { + owner = "bouk"; + repo = "dark-mode-notify"; + rev = "4d7fe211f81c5b67402fad4bed44995344a260d1"; + hash = "sha256-LsAQ5v5jgJw7KsJnQ3Mh6+LNj1EMHICMoD5WzF3hRmU="; + }; + + nativeBuildInputs = [ + swift + swiftpm + ]; + + buildInputs = with darwin.apple_sdk.frameworks; [ + Foundation + Cocoa + ]; + + makeFlags = [ "prefix=$(out)" ]; + + meta = { + description = "Run a script whenever dark mode changes in macOS"; + homepage = "https://github.com/bouk/dark-mode-notify"; + # Doesn't build on x86_64 because of some CoreGraphics issue, even with SDK 11.0 + platforms = [ "aarch64-darwin" ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ YorikSar ]; + }; +}) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index ec49d21fab7f0..020b8f64da375 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.125"; + version = "5.15.126"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1izyv1ibiy4dapwb8745dshfbb9b6xqyz77l6mhkmlkcnx33h3qm"; + sha256 = "0vzdncrvwqxzjkpgf3gjxvl8iwz92szfyzc33cayx28ghjwsmx5d"; }; } // (args.argsOverride or { })) diff --git a/pkgs/servers/nfs-ganesha/default.nix b/pkgs/servers/nfs-ganesha/default.nix index e203bc209b88f..16e649684df67 100644 --- a/pkgs/servers/nfs-ganesha/default.nix +++ b/pkgs/servers/nfs-ganesha/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "nfs-ganesha"; - version = "5.4"; + version = "5.5"; src = fetchFromGitHub { owner = "nfs-ganesha"; repo = "nfs-ganesha"; rev = "V${version}"; - sha256 = "sha256-zKIFjplZtxOEPIH9PUw1gGPS4VSdgv2Zj1oOp3If9W0="; + sha256 = "sha256-ebnR/ukbVTwpFNzGf189NmsaDh97ThEGWew5kp50UGg="; }; preConfigure = "cd src"; diff --git a/pkgs/servers/rustypaste/default.nix b/pkgs/servers/rustypaste/default.nix index 2da905e1ffd33..bae1b5232c7da 100644 --- a/pkgs/servers/rustypaste/default.nix +++ b/pkgs/servers/rustypaste/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rustypaste"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Kk9SDGDTCq1qHew9yrf1HmYAhse5mB4AqH/Oo/lc0dc="; + sha256 = "sha256-AdcoyBtPgTK94VDBsCGozPU5enqCquY7r5IuEm3oW/g="; }; - cargoHash = "sha256-6YTdOb1JvP5yTD1FVpHGG3C+hgiuTUiy05s+e3k8cdI="; + cargoHash = "sha256-VJjXwvMDSnDedcxJTjg6tVjPUxjRGTSOnx2nXgXCdzI="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/tools/misc/clipbuzz/default.nix b/pkgs/tools/misc/clipbuzz/default.nix index 47dbbc6e6ff2b..7bece66a786de 100644 --- a/pkgs/tools/misc/clipbuzz/default.nix +++ b/pkgs/tools/misc/clipbuzz/default.nix @@ -1,23 +1,21 @@ { lib , stdenv -, fetchFromSourcehut +, fetchzip , libX11 , libXfixes -, zig_0_10 +, zig_0_11 }: stdenv.mkDerivation (finalAttrs: { pname = "clipbuzz"; - version = "2.0.0"; + version = "2.0.1"; - src = fetchFromSourcehut { - owner = "~cnx"; - repo = "clipbuzz"; - rev = finalAttrs.version; - hash = "sha256-V5bAZHoScTzFZBPUhPd7xc/c32SXPLAJp+vsc/lCyeI="; + src = fetchzip { + url = "https://trong.loang.net/~cnx/clipbuzz/snapshot/clipbuzz-${finalAttrs.version}.tar.gz"; + hash = "sha256-2//IwthAjGyVSZaXjgpM1pUJGYWZVkrJ6JyrVbzOtr8="; }; - nativeBuildInputs = [ zig_0_10.hook ]; + nativeBuildInputs = [ zig_0_11.hook ]; buildInputs = [ libX11 @@ -26,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Buzz on new X11 clipboard events"; - homepage = "https://git.sr.ht/~cnx/clipbuzz"; + homepage = "https://trong.loang.net/~cnx/clipbuzz"; license = lib.licenses.unlicense; maintainers = [ lib.maintainers.McSinyx ]; }; diff --git a/pkgs/tools/misc/fx-cast-bridge/default.nix b/pkgs/tools/misc/fx-cast-bridge/default.nix index c67289fb822b8..5f2274101e56d 100644 --- a/pkgs/tools/misc/fx-cast-bridge/default.nix +++ b/pkgs/tools/misc/fx-cast-bridge/default.nix @@ -10,7 +10,7 @@ buildNpmPackage rec { rev = "v${version}"; hash = "sha256-hB4NVJW2exHoKsMp0CKzHerYgj8aR77rV+ZsCoWA1Dg="; }; - sourceRoot = "source/app"; + sourceRoot = "${src.name}/app"; npmDepsHash = "sha256-GLrDRZqKcX1PDGREx+MLZ1TEjr88r9nz4TvZ9nvo40g="; nativeBuildInputs = [ python3 ]; diff --git a/pkgs/tools/misc/intermodal/default.nix b/pkgs/tools/misc/intermodal/default.nix index 555f4a529b92d..e4a296333569d 100644 --- a/pkgs/tools/misc/intermodal/default.nix +++ b/pkgs/tools/misc/intermodal/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "intermodal"; - version = "0.1.12"; + version = "0.1.13"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "v${version}"; - hash = "sha256-yPyKo2j0Up8gDzi2xOBqpMwIw6rpXDCxc8fCuEblwFY="; + hash = "sha256-hKMO7ZicXSYESXWKmDC2ILD996KoYDXS5HJExyXMdX4="; }; - cargoHash = "sha256-inJZTP4YwCZZ0JvSdGWnZbLN0A0B/+fz4g0XsfIQeq8="; + cargoHash = "sha256-7vtUMG6mxAHKnbouyTsaUf1myJssxYoqAIOjc6m86Fo="; # include_hidden test tries to use `chflags` on darwin checkFlagsArray = lib.optionals stdenv.isDarwin [ "--skip=subcommand::torrent::create::tests::include_hidden" ]; @@ -28,6 +28,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "User-friendly and featureful command-line BitTorrent metainfo utility"; homepage = "https://github.com/casey/intermodal"; + changelog = "https://github.com/casey/intermodal/releases/tag/v${version}"; license = licenses.cc0; maintainers = with maintainers; [ Br1ght0ne xrelkd ]; mainProgram = "imdl"; diff --git a/pkgs/tools/misc/krapslog/default.nix b/pkgs/tools/misc/krapslog/default.nix index e09b1ad9aff41..379612ea38629 100644 --- a/pkgs/tools/misc/krapslog/default.nix +++ b/pkgs/tools/misc/krapslog/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "krapslog"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "acj"; repo = "krapslog-rs"; rev = version; - sha256 = "sha256-MjFTdEtsgF4URN/gPMEieChWeKQYpJ1c9i4Zh7Bb+ps="; + sha256 = "sha256-Y5OdRi9OhVeT04BnHCCcNBr1G9vxSFwvNl1aL38AFWQ="; }; - cargoHash = "sha256-nxjdwp99KVJo7PME27QG66x+CAC91s26ccL0nyXE3Ac="; + cargoHash = "sha256-fdrcV4XmxaWiAVOL51sRUfTEDnnCKduYgj7I5unLpRI="; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index 88952936432af..65a3765e200b7 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "cnspec"; - version = "8.20.0"; + version = "8.22.1"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-VPXxeI4dO6bHUagS38l7358sXW3ot/v/j9MUrD/akNg="; + hash = "sha256-xTYPAipdfrwAhtLcLZkClnmB1qRlgfTwt8Qpq6iSZPk="; }; proxyVendor = true; - vendorHash = "sha256-LH9ts/hD16rF9VBJIfwTAQXq9MMAiBKBR3ulKGNrlow="; + vendorHash = "sha256-PE5RLMUi1bqFjUntvUU3dXmygFfzFJF+HerW5A+OktA="; subPackages = [ "apps/cnspec" diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index e01cb9626e1b7..bb322ce4f32cd 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2023-08-09"; + version = "2023-08-11"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-o6rLIp6bOJK+JB0zd+aHbcWUBlEj9Y8FUdTYdnBp8wg="; + hash = "sha256-Fv5vGPo9KZCNTllQhVHlGh496vdwpdTx1V0StaS9Flk="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/mitm6/default.nix b/pkgs/tools/security/mitm6/default.nix new file mode 100644 index 0000000000000..a7587330e7b99 --- /dev/null +++ b/pkgs/tools/security/mitm6/default.nix @@ -0,0 +1,36 @@ +{ lib +, fetchPypi +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "mitm6"; + version = "0.3.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-g+eFcJdgP7CQ6ntN17guJa4LdkGIb91mr/NKRPIukP8="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + scapy + future + twisted + netifaces + ]; + + # No tests exist for mitm6. + doCheck = false; + + pythonImportsCheck = [ + "mitm6" + ]; + + meta = { + description = "DHCPv6 network spoofing application"; + homepage = "https://github.com/dirkjanm/mitm6"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ arcayr ]; + }; +} diff --git a/pkgs/tools/security/tlsx/default.nix b/pkgs/tools/security/tlsx/default.nix index cd40cf1c76973..42c5a84cd3c33 100644 --- a/pkgs/tools/security/tlsx/default.nix +++ b/pkgs/tools/security/tlsx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "tlsx"; - version = "1.1.1"; + version = "1.1.3"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - hash = "sha256-sYyIZKhn2VJxNxoVb58WQj8a+sYHzuu4SjgPHyLsJK4="; + hash = "sha256-dCtMfrkN43zJqztCobT3RSkn4crGigqzI6NSP8wrCf0="; }; - vendorHash = "sha256-hutHe0n3IAeCP+Lw7dZLfRLyvaOwrWFIrA6chsn+BEw="; + vendorHash = "sha256-33eVwWV9PnrP2MSPXTAcYe9ruJc5lauASc4uubBd9S4="; # Tests require network access doCheck = false; diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix index 084980ebda29a..7ca5e4a634bc3 100644 --- a/pkgs/tools/text/mdbook/default.nix +++ b/pkgs/tools/text/mdbook/default.nix @@ -26,6 +26,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/rust-lang/mdBook"; changelog = "https://github.com/rust-lang/mdBook/blob/v${version}/CHANGELOG.md"; license = [ licenses.mpl20 ]; - maintainers = with maintainers; [ havvy Frostman ]; + maintainers = with maintainers; [ havvy Frostman matthiasbeyer ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 37421f215d217..448efbda11b88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3596,6 +3596,8 @@ with pkgs; dcap = callPackage ../tools/networking/dcap { }; + dark-mode-notify = callPackage ../os-specific/darwin/dark-mode-notify { }; + deltachat-cursed = callPackage ../applications/networking/instant-messengers/deltachat-cursed { }; delayarchitect = callPackage ../applications/audio/delayarchitect { }; @@ -4854,6 +4856,8 @@ with pkgs; dasher = callPackage ../applications/accessibility/dasher { }; + dataclass-wizard = with python3Packages; toPythonApplication dataclass-wizard; + datafusion-cli = callPackage ../development/misc/datafusion { }; datamash = callPackage ../tools/misc/datamash { }; @@ -9948,6 +9952,8 @@ with pkgs; ministat = callPackage ../tools/misc/ministat { }; + mitm6 = callPackage ../tools/security/mitm6 { }; + mjolnir = callPackage ../servers/mjolnir { matrix-sdk-crypto-nodejs = matrix-sdk-crypto-nodejs-0_1_0-beta_3; }; @@ -10146,7 +10152,7 @@ with pkgs; lact = callPackage ../tools/system/lact { }; ledit = callPackage ../tools/misc/ledit { - inherit (ocaml-ng.ocamlPackages_4_12) ocaml camlp5; + inherit (ocaml-ng.ocamlPackages_4_11) ocaml camlp5; }; ledmon = callPackage ../tools/system/ledmon { }; @@ -17593,6 +17599,8 @@ with pkgs; mpi = mpich; }; + gpython = callPackage ../development/interpreters/gpython { }; + graphql-client = callPackage ../development/tools/graphql-client { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -20632,6 +20640,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }; + ceedling = callPackage ../development/tools/ceedling { }; + celt = callPackage ../development/libraries/celt { }; celt_0_7 = callPackage ../development/libraries/celt/0.7.nix { }; celt_0_5_1 = callPackage ../development/libraries/celt/0.5.1.nix { }; @@ -21200,6 +21210,8 @@ with pkgs; fribidi = callPackage ../development/libraries/fribidi { }; + frozen = callPackage ../development/libraries/frozen { }; + funambol = callPackage ../development/libraries/funambol { }; function-runner = callPackage ../development/web/function-runner { }; @@ -36108,6 +36120,8 @@ with pkgs; watershot = callPackage ../applications/misc/watershot { }; + waypaper = callPackage ../applications/misc/waypaper { }; + w3m = callPackage ../applications/networking/browsers/w3m { }; # Should always be the version with the most features @@ -39259,7 +39273,7 @@ with pkgs; hol = callPackage ../applications/science/logic/hol { }; - inherit (ocaml-ng.ocamlPackages_4_12) hol_light; + inherit (ocamlPackages) hol_light; hologram = callPackage ../tools/security/hologram { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 425082dce9508..c2572b7a4e70a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2421,6 +2421,8 @@ self: super: with self; { databricks-sql-connector = callPackage ../development/python-modules/databricks-sql-connector { }; + dataclass-wizard = callPackage ../development/python-modules/dataclass-wizard { }; + dataclasses-json = callPackage ../development/python-modules/dataclasses-json { }; dataclasses-serialization = callPackage ../development/python-modules/dataclasses-serialization { }; |