diff options
Diffstat (limited to 'pkgs')
99 files changed, 1540 insertions, 491 deletions
diff --git a/pkgs/applications/audio/pocket-casts/default.nix b/pkgs/applications/audio/pocket-casts/default.nix new file mode 100644 index 0000000000000..ab55287f29f35 --- /dev/null +++ b/pkgs/applications/audio/pocket-casts/default.nix @@ -0,0 +1,58 @@ +{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron_12, +alsa-lib, gtk3, libXScrnSaver, libXtst, mesa, nss }: + +let + # Using Electron 12 to solve errors regarding threading + electron = electron_12; + +in stdenv.mkDerivation rec { + pname = "pocket-casts"; + version = "0.5.0"; + + src = fetchurl { + url = "https://github.com/felicianotech/pocket-casts-desktop-app/releases/download/v${version}/${pname}_${version}_amd64.deb"; + sha256 = "sha256-frBtIxwRO/6k6j0itqN10t+9AyNadqXm8vC1YP960ts="; + }; + + nativeBuildInputs = [ + dpkg + autoPatchelfHook + makeWrapper + ]; + + buildInputs = [ alsa-lib gtk3 libXScrnSaver libXtst mesa nss ]; + + dontBuild = true; + dontConfigure = true; + + unpackPhase = '' + dpkg-deb -x ${src} ./ + ''; + + installPhase = '' + runHook preInstall + + mv usr $out + mv opt $out + mv "$out/opt/Pocket Casts" $out/opt/pocket-casts + mv $out/share/icons/hicolor/0x0 $out/share/icons/hicolor/256x256 + + runHook postInstall + ''; + + postFixup = '' + substituteInPlace $out/share/applications/pocket-casts.desktop --replace '"/opt/Pocket Casts/pocket-casts"' $out/bin/pocket-casts + substituteInPlace $out/share/applications/pocket-casts.desktop --replace '/usr/share/icons/hicolor/0x0/apps/pocket-casts.png' "pocket-casts" + makeWrapper ${electron}/bin/electron \ + $out/bin/pocket-casts \ + --add-flags $out/opt/pocket-casts/resources/app.asar + ''; + + meta = with lib; { + description = "Pocket Casts webapp, packaged for the Linux Desktop"; + homepage = "https://github.com/felicianotech/pocket-casts-desktop-app"; + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index 6cc55650220ae..fd75a4a8e5d77 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -36,13 +36,13 @@ mkDerivation rec { pname = "strawberry"; - version = "0.9.3"; + version = "1.0.0"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - sha256 = "sha256-OOdHsii6O4okVHDhrqCNJ7WVB0VKPs8q0AhEY+IvflE="; + sha256 = "sha256-m1BB5OIeCIQuJpxEO1xmb/Z8tzeHF31jYg67OpVWWRM="; }; buildInputs = [ diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix index b4ffd2a4f2add..83d9cee9ec6c5 100644 --- a/pkgs/applications/blockchains/chia/default.nix +++ b/pkgs/applications/blockchains/chia/default.nix @@ -6,14 +6,14 @@ let chia = python3Packages.buildPythonApplication rec { pname = "chia"; - version = "1.2.9"; + version = "1.2.10"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "chia-blockchain"; rev = version; fetchSubmodules = true; - sha256 = "sha256-ZDWkVCga/NsKOnj5HP0lnmnX6vqw+I0b3a1Wr1t1VN0="; + sha256 = "sha256-TzSBGjgaE0IWaqJcCIoO/u+gDh17NtAqhE8ldbbjNIE="; }; postPatch = '' diff --git a/pkgs/applications/blockchains/elements/default.nix b/pkgs/applications/blockchains/elements/default.nix index c44f2078dae3c..63914af6f3c21 100644 --- a/pkgs/applications/blockchains/elements/default.nix +++ b/pkgs/applications/blockchains/elements/default.nix @@ -17,7 +17,6 @@ , qtbase ? null , qttools ? null , python3 -, openssl , withGui , withWallet ? true }: @@ -25,11 +24,11 @@ with lib; stdenv.mkDerivation rec { pname = if withGui then "elements" else "elementsd"; - version = "0.18.1.12"; + version = "0.21.0"; src = fetchurl { url = "https://github.com/ElementsProject/elements/archive/elements-${version}.tar.gz"; - sha256 = "84a51013596b09c62913649ac90373622185f779446ee7e65b4b258a2876609f"; + sha256 = "0d9mcb0nw9qqhv0jhpddi9i4iry3w7b5jifsl5kpcw82qrkvgfgj"; }; nativeBuildInputs = @@ -38,7 +37,7 @@ stdenv.mkDerivation rec { ++ optionals stdenv.isDarwin [ hexdump ] ++ optionals withGui [ wrapQtAppsHook ]; - buildInputs = [ boost libevent miniupnpc zeromq zlib openssl ] + buildInputs = [ boost libevent miniupnpc zeromq zlib ] ++ optionals withWallet [ db48 sqlite ] ++ optionals withGui [ qrencode qtbase qttools ]; @@ -79,8 +78,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ prusnak ]; license = licenses.mit; platforms = platforms.unix; - # Qt GUI is currently broken in upstream - # No rule to make target 'qt/res/rendered_icons/about.png', needed by 'qt/qrc_bitcoin.cpp'. - broken = withGui; }; } diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 853593557dc51..6b1b34e11cf08 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "texstudio"; - version = "4.0.0"; + version = "4.0.2"; src = fetchFromGitHub { owner = "${pname}-org"; repo = pname; rev = version; - sha256 = "0fapgc6dvzn47gmhxkqymwi3818rdiag33ml57j2mfmsi5pjxi0f"; + sha256 = "sha256-SCrWoIZan8mFwQoXaXvM0Ujdhcic3FbmfgKZSFXFBGE="; }; nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ]; diff --git a/pkgs/applications/editors/thiefmd/default.nix b/pkgs/applications/editors/thiefmd/default.nix new file mode 100644 index 0000000000000..81222ff82f101 --- /dev/null +++ b/pkgs/applications/editors/thiefmd/default.nix @@ -0,0 +1,48 @@ +{ lib, stdenv, fetchFromGitHub, wrapGAppsHook, cmake, desktop-file-utils, glib +, meson, ninja, pkg-config, vala, clutter, discount, gtk3, gtksourceview4, gtkspell3 +, libarchive, libgee, libhandy, libsecret, link-grammar, webkitgtk }: + +stdenv.mkDerivation rec { + pname = "thiefmd"; + version = "0.2.4"; + + src = fetchFromGitHub { + owner = "kmwallio"; + repo = "ThiefMD"; + rev = "v${version}-easypdf"; + sha256 = "sha256-YN17o6GtpulxhXs+XYZLY36g9S8ggR6URNLrjs5PEoI="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake desktop-file-utils glib meson wrapGAppsHook + ninja pkg-config vala + ]; + + buildInputs = [ + clutter discount gtk3 gtksourceview4 gtkspell3 + libarchive libgee libhandy libsecret link-grammar + webkitgtk + ]; + + dontUseCmakeConfigure = true; + + postInstall = '' + mv $out/share/applications/com.github.kmwallio.thiefmd.desktop \ + $out/share/applications/thiefmd.desktop + substituteInPlace $out/share/applications/thiefmd.desktop \ + --replace 'Exec=com.github.kmwallio.' Exec=$out/bin/ + + makeWrapper $out/bin/com.github.kmwallio.thiefmd \ + $out/bin/thiefmd \ + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" + ''; + + meta = with lib; { + description = "Markdown & Fountain editor that helps with organization and management"; + homepage = "https://thiefmd.com"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/applications/editors/your-editor/default.nix b/pkgs/applications/editors/your-editor/default.nix new file mode 100644 index 0000000000000..a191943c3fd6e --- /dev/null +++ b/pkgs/applications/editors/your-editor/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "your-editor"; + version = "1203"; + + src = fetchFromGitHub { + owner = "kammerdienerb"; + repo = "yed"; + rev = "608418f2037dc4ef5647e69fcef45302c50f138c"; + sha256 = "KqK2lcDTn91aCFJIDg+h+QsTrl7745So5aiKCxPkeh4="; + }; + + installPhase = '' + runHook preInstall + patchShebangs install.sh + ./install.sh -p $out + runHook postInstall + ''; + + meta = with lib; { + description = "Your-editor (yed) is a small and simple terminal editor core that is meant to be extended through a powerful plugin architecture"; + homepage = "https://your-editor.org/"; + license = with licenses; [ mit ]; + platforms = platforms.linux; + maintainers = with maintainers; [ uniquepointer ]; + mainProgram = "yed"; + }; +} diff --git a/pkgs/applications/graphics/ImageMagick/6.x.nix b/pkgs/applications/graphics/ImageMagick/6.x.nix index 7cb4018f38f47..4c06eb7962bc0 100644 --- a/pkgs/applications/graphics/ImageMagick/6.x.nix +++ b/pkgs/applications/graphics/ImageMagick/6.x.nix @@ -16,13 +16,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "6.9.12-19"; + version = "6.9.12-26"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick6"; rev = version; - sha256 = "sha256-8KofT9aNd8SXL0YBQ0RUOTccVxQNacvJL1uYPZiSPkY="; + sha256 = "sha256-oNorY/93jk1v5BS1T3wqctXuzV4o8JlyZtHnsNYmO4U="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 64fdf50a0d15b..78c00b7984e3c 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -18,13 +18,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-9"; + version = "7.1.0-11"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - sha256 = "sha256-9eeOY6TvNykWA3yyQH1UR3ahdhOja87I9rsie9fMbso="; + sha256 = "sha256-z7ZpoB8NlcS5NVyoW0ngSlakCcb5qC3bh3xDVYuWS6w="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/pkgs/applications/graphics/cloudcompare/default.nix b/pkgs/applications/graphics/cloudcompare/default.nix index 9fbe390f5d83e..c120ece8cb4f2 100644 --- a/pkgs/applications/graphics/cloudcompare/default.nix +++ b/pkgs/applications/graphics/cloudcompare/default.nix @@ -10,6 +10,7 @@ , LASzip , libLAS , pdal +, pcl , qtbase , qtsvg , qttools @@ -19,30 +20,23 @@ mkDerivation rec { pname = "cloudcompare"; - version = "2.11.2"; # Remove below patch with the next version bump. + # Released version doesn't work with packaged PCL + # because it's too new. Considering that a release + # is a year ago it's unreasonable to wait for it. + version = "unstable-2021-10-14"; src = fetchFromGitHub { owner = "CloudCompare"; repo = "CloudCompare"; - rev = "v${version}"; - sha256 = "0sb2h08iaf6zrf54sg6ql6wm63q5vq0kpd3gffdm26z8w6j6wv3s"; + rev = "1f65ba63756e23291ae91ff52d04da468ade8249"; + sha256 = "x1bDjFjXIl3r+yo1soWvRB+4KGP50/WBoGlrH013JQo="; # As of writing includes (https://github.com/CloudCompare/CloudCompare/blob/a1c589c006fc325e8b560c77340809b9c7e7247a/.gitmodules): # * libE57Format # * PoissonRecon - # In a future version it will also contain # * CCCoreLib fetchSubmodules = true; }; - patches = [ - # TODO: Remove with next CloudCompare release (see https://github.com/CloudCompare/CloudCompare/pull/1478) - (fetchpatch { - name = "CloudCompare-fix-for-PDAL-2.3.0.patch"; - url = "https://github.com/CloudCompare/CloudCompare/commit/f3038dcdeb0491c4a653c2ee6fb017326eb676a3.patch"; - sha256 = "0ca5ry987mcgsdawz5yd4xhbsdb5k44qws30srxymzx2djvamwli"; - }) - ]; - nativeBuildInputs = [ cmake eigen # header-only @@ -55,6 +49,7 @@ mkDerivation rec { LASzip libLAS pdal + pcl qtbase qtsvg qttools @@ -63,15 +58,14 @@ mkDerivation rec { ]; cmakeFlags = [ - # TODO: This will become -DCCCORELIB_USE_TBB=ON in a future version, see - # https://github.com/CloudCompare/CloudCompare/commit/f5a0c9fd788da26450f3fa488b2cf0e4a08d255f - "-DCOMPILE_CC_CORE_LIB_WITH_TBB=ON" + "-DCCCORELIB_USE_TBB=ON" "-DOPTION_USE_DXF_LIB=ON" "-DOPTION_USE_GDAL=ON" "-DOPTION_USE_SHAPE_LIB=ON" "-DPLUGIN_GL_QEDL=ON" "-DPLUGIN_GL_QSSAO=ON" + "-DPLUGIN_IO_QADDITIONAL=ON" "-DPLUGIN_IO_QCORE=ON" "-DPLUGIN_IO_QCSV_MATRIX=ON" @@ -80,6 +74,8 @@ mkDerivation rec { "-DPLUGIN_IO_QPDAL=ON" # required for .las/.laz support "-DPLUGIN_IO_QPHOTOSCAN=ON" "-DPLUGIN_IO_QRDB=OFF" # Riegl rdblib is proprietary; not packaged in nixpkgs + + "-DPLUGIN_STANDARD_QPCL=ON" # Adds PCD import and export support ]; meta = with lib; { diff --git a/pkgs/applications/misc/binance/default.nix b/pkgs/applications/misc/binance/default.nix new file mode 100644 index 0000000000000..db287cb37e693 --- /dev/null +++ b/pkgs/applications/misc/binance/default.nix @@ -0,0 +1,58 @@ +{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron_12, +alsa-lib, gtk3, libxshmfence, mesa, nss, popt }: + +let + electron = electron_12; + +in stdenv.mkDerivation rec { + pname = "binance"; + version = "1.25.0"; + + src = fetchurl { + url = "https://github.com/binance/desktop/releases/download/v${version}/${pname}-${version}-amd64-linux.deb"; + sha256 = "sha256-oXXzrRhdaWP8GcWI/Ugl8BrDWomZ+hsy5Om0+ME+zY0="; + }; + + nativeBuildInputs = [ + dpkg + autoPatchelfHook + makeWrapper + ]; + + buildInputs = [ alsa-lib gtk3 libxshmfence mesa nss popt ]; + + libPath = lib.makeLibraryPath buildInputs; + + dontBuild = true; + dontConfigure = true; + + unpackPhase = '' + dpkg-deb -x ${src} ./ + ''; + + installPhase = '' + runHook preInstall + + mv usr $out + mv opt $out + + runHook postInstall + ''; + + postFixup = '' + substituteInPlace $out/share/applications/binance.desktop --replace '/opt/Binance' $out/bin + + makeWrapper ${electron}/bin/electron \ + $out/bin/binance \ + --add-flags $out/opt/Binance/resources/app.asar \ + --prefix LD_LIBRARY_PATH : ${libPath} + ''; + + meta = with lib; { + description = "Binance Cryptoexchange Official Desktop Client"; + homepage = "https://www.binance.com/en/desktop-download"; + license = licenses.unfree; + maintainers = with maintainers; [ wolfangaukang ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index e11efa8f8dd26..a96be344b3d4d 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -27,19 +27,20 @@ mkDerivation rec { pname = "calibre"; - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-9ymHEpTHDUM3NAGoeSETzKRLKgJLRY4eEli6N5lbZug="; + sha256 = "058dqqxhc3pl4is1idlnc3pz80k4r681d5aj4a26v9acp8j7zy4f"; }; - # https://sources.debian.org/patches/calibre/5.29.0+dfsg-1 + # https://sources.debian.org/patches/calibre/5.30.0+dfsg-1 patches = [ # allow for plugin update check, but no calibre version check (fetchpatch { name = "0001_only_plugin_update.patch"; - url = "https://sources.debian.org/data/main/c/calibre/5.29.0%2Bdfsg-1/debian/patches/0001-only-plugin-update.patch"; + url = + "https://sources.debian.org/data/main/c/calibre/${version}%2Bdfsg-1/debian/patches/0001-only-plugin-update.patch"; sha256 = "sha256-aGT8rJ/eQKAkmyHBWdY0ouZuWvDwtLVJU5xY6d3hY3k="; }) ] diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 5dffbf56a36ae..35e5d59171a52 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -1,19 +1,19 @@ { stdenv, lib, fetchFromGitHub, makeWrapper , pkg-config, which, perl, libXrandr , cairo, dbus, systemd, gdk-pixbuf, glib, libX11, libXScrnSaver -, gtk3, wayland, wayland-protocols +, wayland, wayland-protocols , libXinerama, libnotify, pango, xorgproto, librsvg }: stdenv.mkDerivation rec { pname = "dunst"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "dunst-project"; repo = "dunst"; rev = "v${version}"; - sha256 = "0lga1kj2vjbj9g9rl93nivngjmk5fkxdxwal8w96x9whwk9jvdga"; + sha256 = "sha256-BWbvGetXXCXbfPRY+u6gEfzBmX8PLSnI6a5vfCByiC0="; }; nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo dbus gdk-pixbuf glib libX11 libXScrnSaver libXinerama libnotify pango xorgproto librsvg libXrandr - gtk3 wayland wayland-protocols + wayland wayland-protocols ]; outputs = [ "out" "man" ]; diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 822a2c4b70a52..662f9df030503 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -43,18 +43,18 @@ with lib; # Those pieces of software we entirely ignore upstream's handling of, and just # make sure they're in the path if desired. let - k3sVersion = "1.21.4+k3s1"; # k3s git tag - k3sCommit = "3e250fdbab72d88f7e6aae57446023a0567ffc97"; # k3s git commit at the above version - k3sRepoSha256 = "1w7drvk0bmlmqrxh1y6dxjy7dk6bdrl72pkd25lc1ir6wbzb05h9"; + k3sVersion = "1.22.2+k3s2"; # k3s git tag + k3sCommit = "3f5774b41eb475eb10c93bb0ce58459a6f777c5f"; # k3s git commit at the above version + k3sRepoSha256 = "1kjf2zkm5d3s1aj4w9gzsc3ms3a0cm900fyi9899ijczw1cbrc61"; - traefikChartVersion = "9.18.2"; # taken from ./manifests/traefik.yaml at spec.version - traefikChartSha256 = "sha256-9d7p0ngyMN27u4OPgz7yI14Zj9y36t9o/HMX5wyDpUI="; + traefikChartVersion = "10.3.0"; # taken from ./manifests/traefik.yaml at spec.version + traefikChartSha256 = "0y6wr64xp7bgx24kqil0x6myr3pnfrg8rw0d1h5zd2n5a8nfd73f"; k3sRootVersion = "0.9.1"; # taken from ./scripts/download at ROOT_VERSION - k3sRootSha256 = "sha256-qI84KYJKY/T6pqWZW9lOTq5NzZiu//v1zrMzUCiRTGQ="; + k3sRootSha256 = "0r2cj4l50cxkrvszpzxfk36lvbjf9vcmp6d5lvxg8qsah8lki3x8"; - k3sCNIVersion = "0.8.6-k3s1"; # taken from ./scripts/version.sh at VERSION_CNIPLUGINS - k3sCNISha256 = "sha256-uAy17eRRAXPCcnh481KxFMvFQecnnBs24jn5YnVNfY4="; + k3sCNIVersion = "0.9.1-k3s1"; # taken from ./scripts/version.sh at VERSION_CNIPLUGINS + k3sCNISha256 = "1327vmfph7b8i14q05c2xdfzk60caflg1zhycx0mrf3d59f4zsz5"; baseMeta = { description = "A lightweight Kubernetes distribution"; diff --git a/pkgs/applications/networking/cluster/k3s/update.sh b/pkgs/applications/networking/cluster/k3s/update.sh index 34257fcda2fce..01b3434b5bae5 100755 --- a/pkgs/applications/networking/cluster/k3s/update.sh +++ b/pkgs/applications/networking/cluster/k3s/update.sh @@ -12,7 +12,9 @@ LATEST_TAG_RAWFILE=${WORKDIR}/latest_tag.json curl --silent ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ https://api.github.com/repos/k3s-io/k3s/releases > ${LATEST_TAG_RAWFILE} -LATEST_TAG_NAME=$(jq 'map(.tag_name)' ${LATEST_TAG_RAWFILE} | grep -v -e rc -e engine | sed 's/["|,| ]//g' | sort -V -r | head -n1) +LATEST_TAG_NAME=$(jq 'map(.tag_name)' ${LATEST_TAG_RAWFILE} | \ + grep -v -e rc -e engine | tail -n +2 | head -n -1 | sed 's|[", ]||g' | sort -rV | head -n1) + K3S_VERSION=$(echo ${LATEST_TAG_NAME} | sed 's/^v//') K3S_COMMIT=$(curl --silent ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index ac85ef8a6a33e..51dced0af2805 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "stable"; - version = "2.10.2"; - sha256 = "sha256-dOD0S4FJ2lXE+1VZooi8tKvC8ndGEHAxmAvSqoWI/m0="; - vendorSha256 = "sha256-Qb0FZOvKL9GgncfUl538PynkYbm3V8Q6lUpApUoIp5s="; + version = "2.11.0"; + sha256 = "172in8vmr7c5sff111rrd5127lz2pv7bbh7p399xafnk8ri0fx2i"; + vendorSha256 = "sha256-c3EyVrblqtFuoP7+YdbyPN0DdN6TcQ5DTtFQ/frKM0Q="; } diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 8f2b9cda0b9d0..8744c0f1744e0 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "21.9.3"; - sha256 = "0swqx4myvr24visj39icg8g90kj325pvf22bq447rnm0whq3cnyz"; - vendorSha256 = "sha256-fMtAR66TwMNR/HCVQ9Jg3sJ0XBx2jUKDG7/ts0lEZM4="; + version = "21.10.3"; + sha256 = "09k4c0dgn9vvgp6xb20x0vylk6bbd03srk3sra8vnpywwi591mcv"; + vendorSha256 = "sha256-uGj1sMEa791ZKA7hpJ1A9vtwsmrZDGAYp6HQo6QNAYY="; } diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 5770d815f0d42..ffcc0b3d43b11 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -563,10 +563,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/kubernetes", "repo": "terraform-provider-kubernetes", - "rev": "v2.5.0", - "sha256": "1hp3bwhlfiwf1a4l6xfldwdxmyjs4nq3n8g343grjya7ibbhh4sg", + "rev": "v2.6.1", + "sha256": "164x0ddgqk3bj0za4h9kz69npgr4cw7w5hnl0pmxsgvsb04vwc0g", "vendorSha256": null, - "version": "2.5.0" + "version": "2.6.1" }, "launchdarkly": { "owner": "terraform-providers", diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index 30cbd8f92b575..c5723dbab98ea 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -1,6 +1,7 @@ { mkDerivation , lib , fetchFromGitHub +, fetchpatch , qmake , pkg-config , qtbase @@ -9,45 +10,49 @@ , qtserialport , boost , libgit2 +, quazip }: let - # build number corresponding to a release, has no further relation - # see https://github.com/fritzing/fritzing-app/releases/tag/CD-498 - # fritzingBuild = "498"; - # version 0.9.6 is properly tagged, hope it continues - # SHA256 of the fritzing-parts HEAD on the master branch, # which contains the latest stable parts definitions - partsSha = "6f04697be286768bc9e4d64f8707e8e40cbcafcb"; + partsSha = "640fa25650211afccd369f960375ade8ec3e8653"; + + parts = fetchFromGitHub { + owner = "fritzing"; + repo = "fritzing-parts"; + rev = partsSha; + sha256 = "sha256-4S65eX4LCnXCFQAOxmdvr8d0nAgTWcJooE2SpLYpcXI="; + }; in mkDerivation rec { pname = "fritzing"; - version = "0.9.6"; + version = "unstable-2021-09-22"; src = fetchFromGitHub { owner = pname; repo = "fritzing-app"; - rev = version; - sha256 = "083nz7vj7a334575smjry6257535h68gglh8a381xxa36dw96aqs"; + rev = "f0af53a9077f7cdecef31d231b85d8307de415d4"; + sha256 = "sha256-fF38DrBoeZ0aKwVMNyYMPWa5rFPbIVXRARZT+eRat5Q="; }; - parts = fetchFromGitHub { - owner = pname; - repo = "fritzing-parts"; - name = "fritzing-parts"; - rev = partsSha; - sha256 = "1f4w0hz44n4iw1rc5vhcgzvlji54rf4yr8bvzkqv99hn2xf5pjgs"; - }; - - buildInputs = [ qtbase qtsvg qtserialport boost libgit2 ]; + buildInputs = [ qtbase qtsvg qtserialport boost libgit2 quazip ]; nativeBuildInputs = [ qmake pkg-config qttools ]; + patches = [ + # Add support for QuaZip 1.x + (fetchpatch { + url = "https://github.com/fritzing/fritzing-app/commit/ef83ebd9113266bb31b3604e3e9d0332bb48c999.patch"; + sha256 = "sha256-J43E6iBRIVbsuuo82gPk3Q7tyLhNkuuyYwtH8hUfcPU="; + }) + ]; + postPatch = '' substituteInPlace phoenix.pro \ --replace 'LIBGIT_STATIC = true' 'LIBGIT_STATIC = false' + #TODO: Do not hardcode SHA. substituteInPlace src/fapplication.cpp \ --replace 'PartsChecker::getSha(dir.absolutePath());' '"${partsSha}";' @@ -55,21 +60,25 @@ mkDerivation rec { cp -a ${parts}/* parts/ ''; + qmakeFlags = [ + "phoenix.pro" + "DEFINES=QUAZIP_INSTALLED" + "DEFINES+=QUAZIP_1X" + ]; + postFixup = '' # generate the parts.db file QT_QPA_PLATFORM=offscreen "$out/bin/Fritzing" \ -db "$out/share/fritzing/parts/parts.db" \ - -pp "$out/fritzing/parts" \ + -pp "$out/share/fritzing/parts" \ -folder "$out/share/fritzing" ''; - qmakeFlags = [ "phoenix.pro" ]; - meta = with lib; { description = "An open source prototyping tool for Arduino-based projects"; homepage = "https://fritzing.org/"; license = with licenses; [ gpl3 cc-by-sa-30 ]; - maintainers = with maintainers; [ robberer ]; + maintainers = with maintainers; [ robberer musfay ]; platforms = platforms.linux; }; } diff --git a/pkgs/data/fonts/source-han/default.nix b/pkgs/data/fonts/source-han/default.nix index e24bc8ae0dd37..1672af411c041 100644 --- a/pkgs/data/fonts/source-han/default.nix +++ b/pkgs/data/fonts/source-han/default.nix @@ -48,8 +48,13 @@ in serif = makePackage { family = "serif"; description = "serif"; - rev = "1.001R"; - sha256 = "0nnsb2w140ih0cnp1fh7s4csvzp9y0cavz9df2ryhv215mh9z4m0"; + rev = "2.000R"; + sha256 = "0x3n6s4khdd6l0crwd7g9sjaqp8lkvksglhc7kj3cv80hldab9wp"; + postFetch = '' + mkdir -p $out/share/fonts/opentype/source-han-serif + unzip $downloadedFile -d $out/share/fonts/opentype/source-han-serif + ''; + zip = ".zip"; }; mono = makePackage { diff --git a/pkgs/development/interpreters/php/7.4.nix b/pkgs/development/interpreters/php/7.4.nix index 0c8edacbae58d..93ce56e875cda 100644 --- a/pkgs/development/interpreters/php/7.4.nix +++ b/pkgs/development/interpreters/php/7.4.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "7.4.24"; - sha256 = "0cigvwp469kmc27r28liq5dwdz5icp61vqqr3w24jhw6i2vk43pm"; + version = "7.4.25"; + sha256 = "sha256-J5klcMrz4uUyOrezeFPETBUpsdMeqU2Xdu+pHVp4ExM="; }); in diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix index 0c8930c9c68f5..5c393d8ed9610 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.0.11"; - sha256 = "0fj0yk0h0fvr9ckszp496wdyvf8kdfsvydw95qg0q0g4hm18gvbh"; + version = "8.0.12"; + sha256 = "sha256-tIhtsd8yLcj7Eo2LNK5+lPb8aC7LKf9PWlkdTen+rb8="; }); in diff --git a/pkgs/development/libraries/libint/default.nix b/pkgs/development/libraries/libint/default.nix index 64b83166ae990..dd5b26244a978 100644 --- a/pkgs/development/libraries/libint/default.nix +++ b/pkgs/development/libraries/libint/default.nix @@ -6,7 +6,7 @@ let pname = "libint"; - version = "2.6.0"; + version = "2.7.1"; meta = with lib; { description = "Library for the evaluation of molecular integrals of many-body operators over Gaussian functions"; @@ -23,10 +23,22 @@ let owner = "evaleev"; repo = pname; rev = "v${version}"; - sha256 = "0pbc2j928jyffhdp4x5bkw68mqmx610qqhnb223vdzr0n2yj5y19"; + sha256 = "5nSeyT1DhFsA76Dt3dqYfhfBYD+iTl34O3lVeH6+OVw="; }; - patches = [ ./fix-paths.patch ]; + # Replace hardcoded "/bin/rm" with normal "rm" + postPatch = '' + for f in \ + bin/ltmain.sh \ + configure.ac \ + src/bin/libint/Makefile \ + src/lib/libint/Makefile.library \ + tests/eri/Makefile \ + tests/hartree-fock/Makefile \ + tests/unit/Makefile; do + substituteInPlace $f --replace "/bin/rm" "rm" + done + ''; nativeBuildInputs = [ autoconf @@ -56,8 +68,7 @@ let "--with-g12dkh-opt-am=3" "--enable-contracted-ints" "--enable-shared" - ] ++ lib.optional enableFMA "--enable-fma" - ++ lib.optional enableFortran "--enable-fortran"; + ] ++ lib.optional enableFMA "--enable-fma"; makeFlags = [ "export" ]; diff --git a/pkgs/development/libraries/libint/fix-paths.patch b/pkgs/development/libraries/libint/fix-paths.patch deleted file mode 100644 index 2cf178e81f3ae..0000000000000 --- a/pkgs/development/libraries/libint/fix-paths.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff --git a/export/fortran/Makefile b/export/fortran/Makefile -index 62d8711..a83edc7 100644 ---- a/export/fortran/Makefile -+++ b/export/fortran/Makefile -@@ -1,12 +1,14 @@ --TOPDIR = .. --SRCDIR = .. -+TOPDIR = ../.. -+SRCDIR = ../.. - ---include ../MakeSuffixRules ---include ../MakeVars ---include ../MakeVars.features -+-include ../../lib/MakeSuffixRules -+-include ../../src/bin/MakeVars -+-include ../../src/lib/libint/MakeVars.features - --FCFLAGS := -I../include -I../include/libint2 -D__COMPILING_LIBINT2=1 $(FCFLAGS) --COMPUTE_LIB = -L../lib -lint2 -+FCFLAGS := -I../../include -I../../include/libint2 -D__COMPILING_LIBINT2=1 $(FCFLAGS) -+COMPUTE_LIB = -L../../lib -lint2 -+ -+CXXCPP = cc -E -I../../include/libint2 - - .PHONY: clean distclean default make_test check_test - -@@ -28,7 +30,7 @@ libint2_types_f.h: $(TOPDIR)/include/libint2.h.i - - fortran_example.o: libint_f.o - --fortran_incldefs.h: $(TOPDIR)/include/libint2_types.h -+fortran_incldefs.h: $(TOPDIR)/include/libint2/libint2_types.h - grep '^#' $< | grep -v '#include' > $@ - - fortran_example: fortran_example.o libint_f.o -diff --git a/src/bin/libint/Makefile b/src/bin/libint/Makefile -index 406306c..bd8a695 100644 ---- a/src/bin/libint/Makefile -+++ b/src/bin/libint/Makefile -@@ -59,7 +59,7 @@ test: $(TESTCXXOBJ) $(LIBTARGET) - $(CXX) -o $@ $(CXXFLAGS) $(LDFLAGS) $^ $(SYSLIBS) - - $(LIBTARGET): $(LIBOBJ) -- /bin/rm -f $@ -+ rm -f $@ - $(AR) $(ARFLAGS) $@ $(LIBOBJ) - $(RANLIB) $@ - -@@ -102,7 +102,7 @@ ifneq ($(CXXDEPENDSUF),none) - %.d: %.cc - $(CXXDEPEND) $(CXXDEPENDFLAGS) -c $(CPPFLAGS) $(CXXFLAGS) $< > /dev/null - sed 's/^$*.o/$*.$(OBJSUF) $*.d/g' < $(*F).$(CXXDEPENDSUF) > $(@F) -- /bin/rm -f $(*F).$(CXXDEPENDSUF) -+ rm -f $(*F).$(CXXDEPENDSUF) - else - %.d: %.cc - $(CXXDEPEND) $(CXXDEPENDFLAGS) -c $(CPPFLAGS) $(CXXFLAGS) $< | sed 's/^$*.o/$*.$(OBJSUF) $*.d/g' > $(@F) -diff --git a/tests/eri/Makefile b/tests/eri/Makefile -index 6223e4f..05909dc 100644 ---- a/tests/eri/Makefile -+++ b/tests/eri/Makefile -@@ -62,7 +62,7 @@ ifneq ($(CXXDEPENDSUF),none) - %.d: %.cc - $(CXXDEPEND) $(CXXDEPENDFLAGS) -c $(CPPFLAGS) $(CXXFLAGS) $< > /dev/null - sed 's/^$*.o/$*.$(OBJSUF) $*.d/g' < $(*F).$(CXXDEPENDSUF) > $(@F) -- /bin/rm -f $(*F).$(CXXDEPENDSUF) -+ rm -f $(*F).$(CXXDEPENDSUF) - else - %.d: %.cc - $(CXXDEPEND) $(CXXDEPENDFLAGS) -c $(CPPFLAGS) $(CXXFLAGS) $< | sed 's/^$*.o/$*.$(OBJSUF) $*.d/g' > $(@F) -diff --git a/tests/hartree-fock/Makefile b/tests/hartree-fock/Makefile -index aaebadc..4971472 100644 ---- a/tests/hartree-fock/Makefile -+++ b/tests/hartree-fock/Makefile -@@ -95,7 +95,7 @@ ifneq ($(CXXDEPENDSUF),none) - %.d:: %.cc - $(CXXDEPEND) $(CXXDEPENDFLAGS) -c $(CPPFLAGS) $(CXXFLAGS) $< > /dev/null - sed 's/^$*.o/$*.$(OBJSUF) $*.d/g' < $(*F).$(CXXDEPENDSUF) > $(@F) -- /bin/rm -f $(*F).$(CXXDEPENDSUF) -+ rm -f $(*F).$(CXXDEPENDSUF) - else - %.d:: %.cc - $(CXXDEPEND) $(CXXDEPENDFLAGS) -c $(CPPFLAGS) $(CXXFLAGS) $< | sed 's/^$*.o/$*.$(OBJSUF) $*.d/g' > $(@F) -diff --git a/tests/unit/Makefile b/tests/unit/Makefile -index f2d9400..da9d82b 100644 ---- a/tests/unit/Makefile -+++ b/tests/unit/Makefile -@@ -93,7 +93,7 @@ ifneq ($(CXXDEPENDSUF),none) - %.d:: %.cc - $(CXXDEPEND) $(CXXDEPENDFLAGS) -c $(CPPFLAGS) $(CXXGENFLAGS) $< > /dev/null - sed 's/^$*.o/$*.$(OBJSUF) $*.d/g' < $(*F).$(CXXDEPENDSUF) > $(@F) -- /bin/rm -f $(*F).$(CXXDEPENDSUF) -+ rm -f $(*F).$(CXXDEPENDSUF) - else - %.d:: %.cc - $(CXXDEPEND) $(CXXDEPENDFLAGS) -c $(CPPFLAGS) $(CXXGENFLAGS) $< | sed 's/^$*.o/$*.$(OBJSUF) $*.d/g' > $(@F) diff --git a/pkgs/development/libraries/libnfc/default.nix b/pkgs/development/libraries/libnfc/default.nix index b4daab97388e1..7e0d18115ef79 100644 --- a/pkgs/development/libraries/libnfc/default.nix +++ b/pkgs/development/libraries/libnfc/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation { buildInputs = [ libusb-compat-0_1 readline ]; + configureFlags = [ "sysconfdir=/etc" ]; + meta = with lib; { description = "Open source library libnfc for Near Field Communication"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix index 1968e76274bfa..e50750d58ec0c 100644 --- a/pkgs/development/libraries/oniguruma/default.nix +++ b/pkgs/development/libraries/oniguruma/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook ]; + configureFlags = [ "--enable-posix-api=yes" ]; meta = with lib; { homepage = "https://github.com/kkos/oniguruma"; diff --git a/pkgs/development/libraries/physics/fastjet-contrib/default.nix b/pkgs/development/libraries/physics/fastjet-contrib/default.nix index a09f031e76518..d87c9d68b7155 100644 --- a/pkgs/development/libraries/physics/fastjet-contrib/default.nix +++ b/pkgs/development/libraries/physics/fastjet-contrib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fastjet-contrib"; - version = "1.045"; + version = "1.046"; src = fetchurl { url = "http://fastjet.hepforge.org/contrib/downloads/fjcontrib-${version}.tar.gz"; - sha256 = "1y45jx7i30ik2pjv33y16fi5i5jpmi0zp1jh32pwywd3diaiazv6"; + sha256 = "sha256-cgavrH/rIHXZn7sDa7NRPTKy2sOvMDQQJjmGNUeT7s8="; }; buildInputs = [ fastjet ]; diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 6b65f84196450..0411086c78c33 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.66.0"; + version = "0.64.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-0IE6wA+x102IhR52X3VdSWyD4JcJc1jqG6rbOLN7ezM="; + sha256 = "sha256-KzyCC2WmZ8HYhZuiBHi+Ym0VGcwxWdrCX3AzMMbQfhg="; }; patches = [ diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index e9b9112c8fd7a..3d9bf719adca4 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "vulkan-headers"; - version = "1.2.182.0"; + version = "1.2.189.1"; nativeBuildInputs = [ cmake ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Headers"; rev = "sdk-${version}"; - sha256 = "03j0kzq2qxhy0y82l10m8am26zrms2sjrdb1dcbpv9zh5vkxhcla"; + sha256 = "1qggc7dv9jr83xr9w2h375wl3pz3rfgrk9hnrjmylkg9gz4p9q03"; }; meta = with lib; { diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 21239b9b43680..ce3853687721d 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "vulkan-loader"; - version = "1.2.182.0"; + version = "1.2.189.1"; src = (assert version == vulkan-headers.version; fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; rev = "sdk-${version}"; - sha256 = "0gmr9q3a6s8xvaa74fs9zbi9c305i2b3rx768qvl79nhbdj8nc02"; + sha256 = "1745fdzi0n5qj2s41q6z1y52cq8pwswvh1a32d3n7kl6bhksagp6"; }); nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix index d81c374670fd2..ea745dba369ce 100644 --- a/pkgs/development/python-modules/b2sdk/default.nix +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "b2sdk"; - version = "1.12.0"; + version = "1.13.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-PsImSuK0IVY9EwpLKlP5ZFS6A7j2iJOtUg/GUcQTJR0="; + sha256 = "sha256-Q9B85c+WhazDeXsMR2S0aId32xLY8BAuYRj4QD21x1k="; }; nativeBuildInputs = [ @@ -57,7 +57,9 @@ buildPythonPackage rec { "test_large_file" ]; - pythonImportsCheck = [ "b2sdk" ]; + pythonImportsCheck = [ + "b2sdk" + ]; meta = with lib; { description = "Client library and utilities for access to B2 Cloud Storage (backblaze)"; diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index dc31600f94757..07ed4c5b19578 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.9.2"; + version = "1.9.3"; disabled = isPy27; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "v${version}"; - sha256 = "0awqdh4jsarf0lr2bl2qiaff1yk9vndq15jcl4abiig9wr2yghpc"; + sha256 = "sha256-PN31/1BpXcNqsqBZ8sS/MM3UL47/Bi24bUh+jGOJevk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index 183548f5f944e..ed3e70e3ab2e9 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "debugpy"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "Microsoft"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xgxKyqtSqKITwze7DKDdkxZlq1mWM+x4C/eJlUJmYuk="; + sha256 = "sha256-dPP4stLt5nl9B9afPmH6/hpGKXBsaTpvYZQSHxU6KaY="; }; patches = [ diff --git a/pkgs/development/python-modules/django-formtools/default.nix b/pkgs/development/python-modules/django-formtools/default.nix new file mode 100644 index 0000000000000..faca36c2a98b4 --- /dev/null +++ b/pkgs/development/python-modules/django-formtools/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, buildPythonPackage, fetchPypi, django, python }: + +buildPythonPackage rec { + pname = "django-formtools"; + version = "2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1chkbl188yj6hvhh1wgjpfgql553k6hrfwxzb8vv4lfdq41jq9y5"; + }; + + propagatedBuildInputs = [ django ]; + checkPhase = '' + ${python.interpreter} -m django test --settings=tests.settings + ''; + + meta = with lib; { + description = "A set of high-level abstractions for Django forms"; + homepage = "https://github.com/jazzband/django-formtools"; + license = licenses.bsd3; + maintainers = with maintainers; [ greizgh schmittlauch ]; + }; +} diff --git a/pkgs/development/python-modules/django-statici18n/default.nix b/pkgs/development/python-modules/django-statici18n/default.nix new file mode 100644 index 0000000000000..88c63319a89da --- /dev/null +++ b/pkgs/development/python-modules/django-statici18n/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, buildPythonPackage, fetchPypi, django, django_appconf }: + +buildPythonPackage rec { + pname = "django-statici18n"; + version = "2.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0cqwfirzjbanibq3mfz9lcwqnc8655zpysf9hk9g3lbwj2m478sp"; + }; + + propagatedBuildInputs = [ django django_appconf ]; + + # pypi package does not contains test harness + # source tarball requires setting up a config + doCheck = false; + + meta = with lib; { + description = "Helper for generating Javascript catalog to static files"; + homepage = "https://github.com/zyegfryed/django-statici18n"; + license = licenses.bsd3; + maintainers = with maintainers; [ greizgh schmittlauch ]; + }; +} diff --git a/pkgs/development/python-modules/insegel/default.nix b/pkgs/development/python-modules/insegel/default.nix new file mode 100644 index 0000000000000..499d380675398 --- /dev/null +++ b/pkgs/development/python-modules/insegel/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchPypi, pygments }: + +buildPythonPackage rec { + pname = "insegel"; + version = "1.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1d055dd64f6eb335580a485271511ba2f4e3b5e315f48f827f58da3cace4b4ae"; + }; + + propagatedBuildInputs = [ pygments ]; + + # No tests included + doCheck = false; + + pythonImportsCheck = [ + "insegel" + ]; + + meta = with lib; { + homepage = "https://github.com/autophagy/insegel"; + description = "A monochrome 2 column Sphinx theme"; + license = licenses.mit; + maintainers = with maintainers; [ autophagy ]; + }; +} diff --git a/pkgs/development/python-modules/logfury/default.nix b/pkgs/development/python-modules/logfury/default.nix index 5f83c8633dc18..64766c232cdb7 100644 --- a/pkgs/development/python-modules/logfury/default.nix +++ b/pkgs/development/python-modules/logfury/default.nix @@ -2,30 +2,49 @@ , buildPythonPackage , fetchPypi , funcsigs -, six +, setuptools-scm +, pytestCheckHook +, pythonOlder +, testfixtures }: buildPythonPackage rec { pname = "logfury"; - version = "0.1.2"; + version = "1.0.1"; + + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "1lywirv3d1lw691mc4mfpz7ak6r49klri43bbfgdnvsfppxminj2"; + sha256 = "sha256-EwpdrOq5rVNJJCUt33BIKqLJZmKzo4JafTCYHQO3aiY="; }; + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ funcsigs - six ]; - # No tests - doCheck = false; + checkInputs = [ + pytestCheckHook + testfixtures + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "'setuptools_scm<6.0'" "'setuptools_scm'" + ''; + + pythonImportsCheck = [ + "logfury" + ]; - meta = { - description = "Logfury is for python library maintainers. It allows for responsible, low-boilerplate logging of method calls."; + meta = with lib; { + description = "Python module that allows for responsible, low-boilerplate logging of method calls"; homepage = "https://github.com/ppolewicz/logfury"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ jwiegley ]; + license = licenses.bsd3; + maintainers = with maintainers; [ jwiegley ]; }; } diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index 7b1085e78fec4..19c549243843e 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "minio"; - version = "7.1.0"; + version = "7.1.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "minio"; repo = "minio-py"; rev = version; - sha256 = "sha256-0N9hPjGGYHFyGzEWWDnW7KsPQtv0y/j/lCBLNC9IlpA="; + sha256 = "sha256-dUNx6r7KppfeHefa1IeJPXSEMyElPk+RAGdn447ax1g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/py-synologydsm-api/default.nix b/pkgs/development/python-modules/py-synologydsm-api/default.nix index 73ac2fcc01916..e363cd412d66c 100644 --- a/pkgs/development/python-modules/py-synologydsm-api/default.nix +++ b/pkgs/development/python-modules/py-synologydsm-api/default.nix @@ -1,28 +1,40 @@ { lib , buildPythonPackage , fetchFromGitHub -, pytestCheckHook , poetry-core -, urllib3 +, pytestCheckHook , requests +, urllib3 }: buildPythonPackage rec { pname = "py-synologydsm-api"; - version = "1.0.4"; + version = "1.0.5"; format = "pyproject"; src = fetchFromGitHub { owner = "mib1185"; repo = "synologydsm-api"; rev = "v${version}"; - sha256 = "1f9fbcp6dbh1c7q1cpppwggnw4m89w14cjdgl64f1bzv72rggpn1"; + sha256 = "sha256-mm5N2RKn2KP2dV7+dw0sNWlCDT5X/fRmH8POQqJIoZY="; }; - nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ urllib3 requests ]; - pythonImportsCheck = [ "synology_dsm" ]; - checkInputs = [ pytestCheckHook ]; + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + requests + urllib3 + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "synology_dsm" + ]; meta = with lib; { description = "Python API for Synology DSM"; diff --git a/pkgs/development/python-modules/pylgnetcast/default.nix b/pkgs/development/python-modules/pylgnetcast/default.nix new file mode 100644 index 0000000000000..cadb4bb83839d --- /dev/null +++ b/pkgs/development/python-modules/pylgnetcast/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pylgnetcast"; + version = "0.3.5"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "Drafteed"; + repo = "python-lgnetcast"; + rev = "v${version}"; + sha256 = "11g7ya4ppqxjiv3fkz9mi6h1afw9icy6xyn4jzm63kjvxqhrwnw4"; + }; + + propagatedBuildInputs = [ + requests + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "pylgnetcast" + ]; + + meta = with lib; { + description = "Python API client for the LG Smart TV running NetCast 3 or 4"; + homepage = "https://github.com/Drafteed/python-lgnetcast"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-sanic/default.nix b/pkgs/development/python-modules/pytest-sanic/default.nix index 761f4deed2dc5..edcc430c1d8cf 100644 --- a/pkgs/development/python-modules/pytest-sanic/default.nix +++ b/pkgs/development/python-modules/pytest-sanic/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "pytest-sanic"; - version = "1.8.1"; + version = "1.9.1"; src = fetchFromGitHub { owner = "yunstanford"; repo = pname; rev = "v${version}"; - sha256 = "128qxpqilqjhpjzjzzfzsgi4bc0vxwmz0k3xwry6fwhyzcf2bzl5"; + sha256 = "sha256-82Xq/jyxTXyZVHqn7G+S9K++InDdORCO9oFqgaIgY7s="; }; buildInputs = [ @@ -38,33 +38,14 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - # https://github.com/yunstanford/pytest-sanic/issues/55 - substituteInPlace setup.py \ - --replace "websockets>=8.1,<9.0" "websockets>=9.1,<10.0" - ''; - - disabledTests = [ - # https://github.com/yunstanford/pytest-sanic/issues/51 - "test_fixture_sanic_client_get" - "test_fixture_sanic_client_post" - "test_fixture_sanic_client_put" - "test_fixture_sanic_client_delete" - "test_fixture_sanic_client_patch" - "test_fixture_sanic_client_options" - "test_fixture_sanic_client_head" - "test_fixture_sanic_client_close" - "test_fixture_sanic_client_passing_headers" - "test_fixture_sanic_client_context_manager" - "test_fixture_test_client_context_manager" + pythonImportsCheck = [ + "pytest_sanic" ]; - pythonImportsCheck = [ "pytest_sanic" ]; - meta = with lib; { description = "A pytest plugin for Sanic"; homepage = "https://github.com/yunstanford/pytest-sanic/"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/pytm/default.nix b/pkgs/development/python-modules/pytm/default.nix new file mode 100644 index 0000000000000..abae39aff0626 --- /dev/null +++ b/pkgs/development/python-modules/pytm/default.nix @@ -0,0 +1,34 @@ +{ buildPythonPackage +, fetchPypi +, fetchFromGitHub +, lib +, pythonOlder +, pydal +, graphviz +, pandoc +, plantuml +}: + +buildPythonPackage rec { + pname = "pytm"; + version = "1.2.0"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "izar"; + repo = pname; + rev = "v${version}"; + sha256 = "1bx4s9a5kdyr2xvpw0smmh7zi9w38891yfqzdj1bmnsjl57x6qrg"; + }; + + propagatedBuildInputs = [ pydal graphviz pandoc plantuml ]; + + pythonImportsCheck = [ "pytm" ]; + + meta = with lib; { + description = "A Pythonic framework for threat modeling"; + homepage = "https://owasp.org/www-project-pytm/"; + license = with licenses; [ capec mit ]; + maintainers = with maintainers; [ wamserma ]; + }; +} diff --git a/pkgs/development/python-modules/pytradfri/default.nix b/pkgs/development/python-modules/pytradfri/default.nix index 597702e6d34bc..36ffb02623a33 100644 --- a/pkgs/development/python-modules/pytradfri/default.nix +++ b/pkgs/development/python-modules/pytradfri/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pytradfri"; - version = "7.1.0"; + version = "7.1.1"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "pytradfri"; rev = version; - sha256 = "sha256-r/qt06YPia8PYhwOeDXk0oK3YvEZ/1kN//+LXj34fmE="; + sha256 = "sha256-rLpqCpvHTXv6SyT3SOv6oUrWnSDhMG5r+BmznlnNKwg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix index 7f3b3f5da8f06..b9eb4da6f469a 100644 --- a/pkgs/development/python-modules/pyvicare/default.nix +++ b/pkgs/development/python-modules/pyvicare/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyvicare"; - version = "2.13.0"; + version = "2.13.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "somm15"; repo = "PyViCare"; rev = version; - sha256 = "sha256-v1twWyxd0nhXxvbRCbnH5TP736eeDYE5Nz62sf6HIcA="; + sha256 = "sha256-L43aickagJolw+VTRX4ZwRcfOm9fMBZOimPx8jLPHhE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/seahub/default.nix b/pkgs/development/python-modules/seahub/default.nix new file mode 100644 index 0000000000000..3ed0d9acfedce --- /dev/null +++ b/pkgs/development/python-modules/seahub/default.nix @@ -0,0 +1,56 @@ +{ stdenv, lib, fetchFromGitHub, python3Packages, makeWrapper }: + +python3Packages.buildPythonPackage rec { + pname = "seahub"; + version = "8.0.7"; + + src = fetchFromGitHub { + owner = "haiwen"; + repo = "seahub"; + rev = "4f7bb3f617dd847cf0a6b33c0bfb567b44c06059"; # using a fixed revision because upstream may re-tag releases :/ + sha256 = "09d05sxly1bljxxzm77limhwsbg8c4b54fzv3kmaih59pjnjyr03"; + }; + + dontBuild = true; + doCheck = false; # disabled because it requires a ccnet environment + + nativeBuildInputs = [ makeWrapper ]; + + propagatedBuildInputs = with python3Packages; [ + django + future + django-statici18n + django-webpack-loader + django-simple-captcha + django-picklefield + django-formtools + mysqlclient + pillow + python-dateutil + django_compressor + djangorestframework + openpyxl + requests + requests_oauthlib + pyjwt + pycryptodome + qrcode + pysearpc + seaserv + ]; + + installPhase = '' + cp -dr --no-preserve='ownership' . $out/ + wrapProgram $out/manage.py \ + --prefix PYTHONPATH : "$PYTHONPATH:$out/thirdpart:" \ + --prefix PATH : "${python3Packages.python}/bin" + ''; + + meta = with lib; { + homepage = "https://github.com/haiwen/seahub"; + description = "The web end of seafile server"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ greizgh schmittlauch ]; + }; +} diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index e8ea874e5ca5f..7cf75e12cb545 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "Shapely"; - version = "1.7.1"; - disabled = pythonOlder "3.5"; + version = "1.8.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0adiz4jwmwxk7k1awqifb1a9bj5x4nx4gglb5dz9liam21674h8n"; + sha256 = "177g8wxsgnphhhn4634n6ca1qrk462ijqlznpj5ry6d49ghpwc7m"; }; nativeBuildInputs = [ @@ -38,16 +38,6 @@ buildPythonPackage rec { GEOS_LIBRARY_PATH = "${geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}"; patches = [ - # Fix with geos 3.9. This patch will be part of the next release after 1.7.1 - (fetchpatch { - url = "https://github.com/Toblerity/Shapely/commit/77879a954d24d1596f986d16ba3eff5e13861164.patch"; - sha256 = "1w7ngjqbpf9vnvrfg4nyv34kckim9a60gvx20h6skc79xwihd4m5"; - excludes = [ - "tests/test_create_inconsistent_dimensionality.py" - "appveyor.yml" - ".travis.yml" - ]; - }) # Patch to search form GOES .so/.dylib files in a Nix-aware way (substituteAll { src = ./library-paths.patch; diff --git a/pkgs/development/python-modules/shapely/library-paths.patch b/pkgs/development/python-modules/shapely/library-paths.patch index 7681fb1d9bb20..d55630be9c109 100644 --- a/pkgs/development/python-modules/shapely/library-paths.patch +++ b/pkgs/development/python-modules/shapely/library-paths.patch @@ -1,27 +1,45 @@ diff --git a/shapely/geos.py b/shapely/geos.py -index d5a67d2..19b7ffc 100644 +index 4619732..1abdb5e 100644 --- a/shapely/geos.py +++ b/shapely/geos.py -@@ -61,127 +61,17 @@ def load_dll(libname, fallbacks=None, mode=DEFAULT_MODE): +@@ -55,148 +55,21 @@ def load_dll(libname, fallbacks=None, mode=DEFAULT_MODE): "Could not find lib {} or load any of its variants {}.".format( libname, fallbacks or [])) -_lgeos = None + def exists_conda_env(): + """Does this module exist in a conda environment?""" + return os.path.exists(os.path.join(sys.prefix, 'conda-meta')) + - -if sys.platform.startswith('linux'): -- # Test to see if we have a wheel repaired by 'auditwheel' containing its -- # own libgeos_c -- geos_whl_so = glob.glob(os.path.abspath(os.path.join(os.path.dirname( -- __file__), '.libs/libgeos_c-*.so.*'))) -- if len(geos_whl_so) == 1: -- _lgeos = CDLL(geos_whl_so[0]) +- # Test to see if we have a wheel repaired by auditwheel which contains its +- # own libgeos_c. Note: auditwheel 3.1 changed the location of libs. +- geos_whl_so = glob.glob( +- os.path.abspath(os.path.join(os.path.dirname(__file__), ".libs/libgeos*.so*")) +- ) or glob.glob( +- os.path.abspath( +- os.path.join( +- os.path.dirname(__file__), "..", "Shapely.libs", "libgeos*.so*" +- ) +- ) +- ) +- +- if len(geos_whl_so) > 0: +- # We have observed problems with CDLL of libgeos_c not automatically +- # loading the sibling c++ library since the change made by auditwheel +- # 3.1, so we explicitly load them both. +- geos_whl_so = sorted(geos_whl_so) +- CDLL(geos_whl_so[0]) +- _lgeos = CDLL(geos_whl_so[-1]) - LOG.debug("Found GEOS DLL: %r, using it.", _lgeos) +- - elif hasattr(sys, 'frozen'): - geos_pyinstaller_so = glob.glob(os.path.join(sys.prefix, 'libgeos_c-*.so.*')) -- if len(geos_pyinstaller_so) == 1: +- if len(geos_pyinstaller_so) >= 1: - _lgeos = CDLL(geos_pyinstaller_so[0]) - LOG.debug("Found GEOS DLL: %r, using it.", _lgeos) -- elif os.getenv('CONDA_PREFIX', ''): +- elif exists_conda_env(): - # conda package. - _lgeos = CDLL(os.path.join(sys.prefix, 'lib', 'libgeos_c.so')) - else: @@ -30,11 +48,14 @@ index d5a67d2..19b7ffc 100644 - 'libgeos_c.so', - ] - _lgeos = load_dll('geos_c', fallbacks=alt_paths) -- # Necessary for environments with only libc.musl -- c_alt_paths = [ -- 'libc.musl-x86_64.so.1' -- ] -- free = load_dll('c', fallbacks=c_alt_paths).free +- ++_lgeos = CDLL('@libgeos_c@') ++if sys.platform == 'darwin': + # ctypes.CDLL(None) internally calls dlopen(NULL), and as the dlopen + # manpage says, "If filename is NULL, then the returned handle is for the + # main program". This way we can let the linker do the work to figure out + # which libc Python is actually using. + free = CDLL(None).free - free.argtypes = [c_void_p] - free.restype = None - @@ -52,7 +73,7 @@ index d5a67d2..19b7ffc 100644 - _lgeos = CDLL(geos_whl_dylib) - LOG.debug("Found GEOS DLL: %r, using it.", _lgeos) - -- elif os.getenv('CONDA_PREFIX', ''): +- elif exists_conda_env(): - # conda package. - _lgeos = CDLL(os.path.join(sys.prefix, 'lib', 'libgeos_c.dylib')) - else: @@ -63,9 +84,11 @@ index d5a67d2..19b7ffc 100644 - os.environ['RESOURCEPATH'], '..', 'Frameworks', - 'libgeos_c.dylib')] - except KeyError: -- # binary from pyinstaller - alt_paths = [ -- os.path.join(sys.executable, 'libgeos_c.dylib')] +- # binary from pyinstaller +- os.path.join(sys.executable, 'libgeos_c.dylib'), +- # .app from cx_Freeze +- os.path.join(os.path.dirname(sys.executable), 'libgeos_c.1.dylib')] - if hasattr(sys, '_MEIPASS'): - alt_paths.append( - os.path.join(sys._MEIPASS, 'libgeos_c.1.dylib')) @@ -75,23 +98,22 @@ index d5a67d2..19b7ffc 100644 - "/Library/Frameworks/GEOS.framework/Versions/Current/GEOS", - # macports - '/opt/local/lib/libgeos_c.dylib', -- # homebrew +- # homebrew Intel - '/usr/local/lib/libgeos_c.dylib', +- # homebrew Apple Silicon +- '/opt/homebrew/lib/libgeos_c.dylib', - ] - _lgeos = load_dll('geos_c', fallbacks=alt_paths) - -- # ctypes.CDLL(None) internally calls dlopen(NULL), and as the dlopen -- # manpage says, "If filename is NULL, then the returned handle is for the -- # main program". This way we can let the linker do the work to figure out -- # which libc Python is actually using. - free = CDLL(None).free - free.argtypes = [c_void_p] - free.restype = None - -elif sys.platform == 'win32': -- if os.getenv('CONDA_PREFIX', ''): +- _conda_dll_path = os.path.join(sys.prefix, 'Library', 'bin', 'geos_c.dll') +- if exists_conda_env() and os.path.exists(_conda_dll_path): - # conda package. -- _lgeos = CDLL(os.path.join(sys.prefix, 'Library', 'bin', 'geos_c.dll')) +- _lgeos = CDLL(_conda_dll_path) - else: - try: - egg_dlls = os.path.abspath( @@ -119,21 +141,15 @@ index d5a67d2..19b7ffc 100644 - -elif sys.platform == 'sunos5': - _lgeos = load_dll('geos_c', fallbacks=['libgeos_c.so.1', 'libgeos_c.so']) -- free = CDLL('libc.so.1').free +- free.restype = None - free.argtypes = [c_void_p] - free.restype = None +- -else: # other *nix systems - _lgeos = load_dll('geos_c', fallbacks=['libgeos_c.so.1', 'libgeos_c.so']) -- free = load_dll('c', fallbacks=['libc.so.6']).free +- free = CDLL(None).free - free.argtypes = [c_void_p] - free.restype = None -+_lgeos = CDLL('@libgeos_c@') -+if sys.platform == 'darwin': -+ # ctypes.CDLL(None) internally calls dlopen(NULL), and as the dlopen -+ # manpage says, "If filename is NULL, then the returned handle is for the -+ # main program". This way we can let the linker do the work to figure out -+ # which libc Python is actually using. -+ free = CDLL(None).free +else: + free = CDLL('@libc@').free +free.argtypes = [c_void_p] @@ -142,20 +158,18 @@ index d5a67d2..19b7ffc 100644 def _geos_version(): diff --git a/tests/test_dlls.py b/tests/test_dlls.py -index 35f9cc2..3dfcaac 100644 +index c71da8e..fae9da6 100644 --- a/tests/test_dlls.py +++ b/tests/test_dlls.py -@@ -12,12 +12,7 @@ class LoadingTestCase(unittest.TestCase): +@@ -12,10 +12,4 @@ class LoadingTestCase(unittest.TestCase): @unittest.skipIf(sys.platform == "win32", "FIXME: adapt test for win32") def test_fallbacks(self): load_dll('geos_c', fallbacks=[ - os.path.join(sys.prefix, "lib", "libgeos_c.dylib"), # anaconda (Mac OS X) -- '/opt/local/lib/libgeos_c.dylib', # MacPorts -- '/usr/local/lib/libgeos_c.dylib', # homebrew (Mac OS X) +- '/opt/local/lib/libgeos_c.dylib', # MacPorts +- '/usr/local/lib/libgeos_c.dylib', # homebrew (Mac OS X) +- '/opt/homebrew/lib/libgeos_c.dylib', # homebrew (macOS) - os.path.join(sys.prefix, "lib", "libgeos_c.so"), # anaconda (Linux) - 'libgeos_c.so.1', - 'libgeos_c.so']) + '@libgeos_c@']) - - - def test_suite(): diff --git a/pkgs/development/python-modules/simple_di/default.nix b/pkgs/development/python-modules/simple_di/default.nix new file mode 100644 index 0000000000000..7421ccdb6367e --- /dev/null +++ b/pkgs/development/python-modules/simple_di/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, setuptools +, typing-extensions +, dataclasses +}: + +buildPythonPackage rec { + version = "0.1.2"; + pname = "simple_di"; + disabled = pythonOlder "3.6.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0wqbfbajnwmkzih0jl3mncalr7dslvmwhb5mk11asqvmbp1xhn30"; + }; + + propagatedBuildInputs = [ + setuptools + typing-extensions + ] ++ lib.optional (pythonOlder "3.7") [ + dataclasses + ]; + + meta = { + description = "Simple dependency injection library"; + homepage = "https://github.com/bentoml/simple_di"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ sauyon ]; + }; +} diff --git a/pkgs/development/python-modules/simpleeval/default.nix b/pkgs/development/python-modules/simpleeval/default.nix index cb6f50fdd2871..6467dc964ef33 100644 --- a/pkgs/development/python-modules/simpleeval/default.nix +++ b/pkgs/development/python-modules/simpleeval/default.nix @@ -1,16 +1,37 @@ -{ lib, fetchPypi, buildPythonPackage }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: buildPythonPackage rec { pname = "simpleeval"; - version = "0.9.10"; - src = fetchPypi { - inherit pname version; - sha256 = "1skvl467kj83rzkhk01i0wm8m5vmh6j5znrfdizn6r18ii45a839"; + version = "0.9.11"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "danthedeckie"; + repo = pname; + rev = version; + sha256 = "111w76mahbf3lm2p72dkqp5fhwg7nvnwm4l078dgsgkixssjazi7"; }; - meta = { + + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "test_simpleeval.py" + ]; + + pythonImportsCheck = [ + "simpleeval" + ]; + + meta = with lib; { + description = "Simple, safe single expression evaluator library"; homepage = "https://github.com/danthedeckie/simpleeval"; - description = "A simple, safe single expression evaluator library"; - maintainers = with lib.maintainers; [ johbo ]; - license = lib.licenses.mit; + license = licenses.mit; + maintainers = with maintainers; [ johbo ]; }; } diff --git a/pkgs/development/python-modules/wakeonlan/default.nix b/pkgs/development/python-modules/wakeonlan/default.nix index 9499254ae4c26..699af41201584 100644 --- a/pkgs/development/python-modules/wakeonlan/default.nix +++ b/pkgs/development/python-modules/wakeonlan/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "wakeonlan"; - version = "2.0.1"; + version = "2.1.0"; disabled = pythonOlder "3.6"; format = "pyproject"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "remcohaszing"; repo = "pywakeonlan"; rev = version; - sha256 = "sha256-WgoL8ntfEaHcvVbJjdewe0wE31Lq7WBj8Bppeq1uJx8="; + sha256 = "sha256-5ri4bXc0EMNntzmcUZYpRIfaXoex4s5M6psf/9ta17Y="; }; nativeBuildInputs = [ @@ -27,12 +27,16 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "test_wakeonlan.py" ]; + pytestFlagsArray = [ + "test_wakeonlan.py" + ]; - pythonImportsCheck = [ "wakeonlan" ]; + pythonImportsCheck = [ + "wakeonlan" + ]; meta = with lib; { - description = "A small python module for wake on lan"; + description = "Python module for wake on lan"; homepage = "https://github.com/remcohaszing/pywakeonlan"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 38b843d577868..70763446293e6 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.38.0"; + version = "0.39.0"; src = fetchFromGitHub { owner = "zigpy"; repo = "zigpy"; rev = version; - sha256 = "sha256-3iS2VMaicbgtsiKUPe6GjFJQV8xKjs+dC8+IeprMa9I="; + sha256 = "sha256-cR63xzx62ZKCXJENoksJTwEU8vGL8HtdIN3+5OqIL1Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/analysis/rr/zen_workaround.nix b/pkgs/development/tools/analysis/rr/zen_workaround.nix index d15587d2a8111..a79c70821558c 100644 --- a/pkgs/development/tools/analysis/rr/zen_workaround.nix +++ b/pkgs/development/tools/analysis/rr/zen_workaround.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.vcunat ]; platforms = platforms.linux; + broken = versionOlder kernel.version "4.19"; # 4.14 breaks and 4.19 works }; } diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix index a326f85eac0a5..70bf668765baa 100644 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ b/pkgs/development/tools/backblaze-b2/default.nix @@ -12,12 +12,12 @@ let in python3Packages.buildPythonApplication rec { pname = "backblaze-b2"; - version = "3.0.1"; + version = "3.0.3"; src = python3Packages.fetchPypi { inherit version; pname = "b2"; - sha256 = "sha256-Zr+5J6MCjfth+5fOSfHXpT/CAgD754ZpS1b1NqeGid8="; + sha256 = "sha256-asrhinANGlTsSBbtGToOxTRGGSCf+1c4VWnoE3ezoIA="; }; postPatch = '' @@ -39,11 +39,14 @@ python3Packages.buildPythonApplication rec { setuptools-scm ]; - checkInputs = with python3Packages; [ pytestCheckHook ]; + checkInputs = with python3Packages; [ + pytestCheckHook + ]; disabledTests = [ "test_files_headers" "test_integration" + "test_get_account_info" ]; postInstall = '' diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index 2abe30b413fe2..fa6b5aefd0acf 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -1,17 +1,16 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "conftest"; - version = "0.28.1"; + version = "0.28.2"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "conftest"; rev = "v${version}"; - sha256 = "sha256-o2P14Nsu77AXO+UnMBXthhP3Q7kI7nd/lI6GFE2cs3M="; + sha256 = "sha256-lmmk6veBDI51UA/wnFB7Q3DTxZ9J/1qp0OoNgmBrR1Y="; }; - - vendorSha256 = "sha256-zzckZI/n00BBl166S7uonJFNQ4RJGLCkDyfLRoHZOtA="; + vendorSha256 = "sha256-NALyUjFL6OqgCke1QiUxbSNLAoaIMB2zeIWWEfcnCjs="; ldflags = [ "-s" @@ -19,10 +18,22 @@ buildGoModule rec { "-X github.com/open-policy-agent/conftest/internal/commands.version=${version}" ]; - HOME = "$TMPDIR"; + nativeBuildInputs = [ installShellFiles ]; + + preCheck = '' + export HOME="$TMPDIR" + ''; + + postInstall = '' + installShellCompletion --cmd conftest \ + --bash <($out/bin/conftest completion bash) \ + --fish <($out/bin/conftest completion fish) \ + --zsh <($out/bin/conftest completion zsh) + ''; doInstallCheck = true; installCheckPhase = '' + export HOME="$TMPDIR" $out/bin/conftest --version | grep ${version} > /dev/null ''; diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 95365cd9caa1f..e77da6d03813e 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "14.3.2"; + version = "14.4.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/binaries/gitlab-runner-helper/gitlab-runner-helper.x86_64"; - sha256 = "0np2ijgrq6yg3r0744qlj9a9va7y996f7csfs4ajyfqq3vm7jz2g"; + sha256 = "0cd0bcqfy2cwkhgj1d4mmn0xv4n5mmhyf2yv42ynvv0yr5xk75n0"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/binaries/gitlab-runner-helper/gitlab-runner-helper.arm"; - sha256 = "0adjczad3y2f55i76pcp1q2kzdwqr04y59bslb9523s4dlav9jcd"; + sha256 = "06dnxj1w1nnqkkxrbhz8p85g1afr49j8jizkf2g8j01dsk5b2gvi"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "15mwyhr7a4b9vl7c0qz299qv91h3kcmf6d6p5vjjrm1phiy3bpgf"; + sha256 = "07dvbair8fiska7ay4k4hbdwlkgyrq8hmxxwdzkhcpyc0faxqlly"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/metal-cli/default.nix b/pkgs/development/tools/metal-cli/default.nix new file mode 100644 index 0000000000000..92aca00259fe6 --- /dev/null +++ b/pkgs/development/tools/metal-cli/default.nix @@ -0,0 +1,28 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "metal-cli"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "equinix"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-dGeOFrsqhW0+aQyB4f6pvv4ZBawqKX2+WRskDWoLS7E="; + }; + + vendorSha256 = "sha256-ifSfeJjrZI1Hrsq64zAGBiLVc8GKvq+Ddg26gQooyTs="; + + postInstall = '' + ln -s $out/bin/metal-cli $out/bin/metal + ''; + + doCheck = false; + + meta = with lib; { + description = "Official Equinix Metal CLI"; + homepage = "https://github.com/equinix/metal-cli/"; + license = licenses.mit; + maintainers = with maintainers; [ Br1ght0ne nshalman ]; + }; +} diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index 6779c096d3984..f77ced3a2adad 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -1,16 +1,17 @@ { stdenv, lib, fetchgit, cmake, llvmPackages, boost, python -, gocode ? null -, godef ? null -, gotools ? null -, nodePackages ? null -, fixDarwinDylibNames, Cocoa ? null +, withGocode ? true, gocode +, withGodef ? true, godef +, withGotools? true, gotools +, withTypescript ? true, nodePackages +, fixDarwinDylibNames, Cocoa }: stdenv.mkDerivation { pname = "ycmd"; - version = "2020-02-22"; + version = "unstable-2020-02-22"; disabled = !python.isPy3k; + # required for third_party directory creation src = fetchgit { url = "https://github.com/Valloric/ycmd.git"; rev = "9a6b86e3a156066335b678c328f226229746bae5"; @@ -20,7 +21,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ boost llvmPackages.libclang ] - ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; + ++ lib.optional stdenv.isDarwin Cocoa; buildPhase = '' export EXTRA_CMAKE_ARGS=-DPATH_TO_LLVM_ROOT=${llvmPackages.clang-unwrapped} @@ -58,19 +59,19 @@ stdenv.mkDerivation { mkdir -p $out/lib/ycmd/third_party cp -r third_party/* $out/lib/ycmd/third_party/ - '' + lib.optionalString (gocode != null) '' + '' + lib.optionalString withGocode '' TARGET=$out/lib/ycmd/third_party/gocode mkdir -p $TARGET ln -sf ${gocode}/bin/gocode $TARGET - '' + lib.optionalString (godef != null) '' + '' + lib.optionalString withGodef '' TARGET=$out/lib/ycmd/third_party/godef mkdir -p $TARGET ln -sf ${godef}/bin/godef $TARGET - '' + lib.optionalString (gotools != null) '' + '' + lib.optionalString withGotools '' TARGET=$out/lib/ycmd/third_party/go/src/golang.org/x/tools/cmd/gopls mkdir -p $TARGET ln -sf ${gotools}/bin/gopls $TARGET - '' + lib.optionalString (nodePackages != null) '' + '' + lib.optionalString withTypescript '' TARGET=$out/lib/ycmd/third_party/tsserver ln -sf ${nodePackages.typescript} $TARGET ''; @@ -79,10 +80,8 @@ stdenv.mkDerivation { # python won't be thrown off by argv[0] postFixup = '' substituteInPlace $out/lib/ycmd/ycmd/__main__.py \ - --replace $out/lib/ycmd/ycmd/__main__.py \ - $out/bin/ycmd \ - --replace __file__ \ - "'$out/lib/ycmd/ycmd/__main__.py'" + --replace $out/lib/ycmd/ycmd/__main__.py $out/bin/ycmd \ + --replace __file__ "'$out/lib/ycmd/ycmd/__main__.py'" ''; meta = with lib; { diff --git a/pkgs/development/tools/packet-cli/default.nix b/pkgs/development/tools/packet-cli/default.nix deleted file mode 100644 index fbe5c879fca97..0000000000000 --- a/pkgs/development/tools/packet-cli/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "packet-cli"; - version = "0.5.0"; - - src = fetchFromGitHub { - owner = "packethost"; - repo = pname; - rev = version; - sha256 = "0dlcx186l8kh6w3i4dvj7v90lhjkgvq1xkjb2vijy6399z41grw2"; - }; - - vendorSha256 = "1y1c369gsaf5crkdvv5g8d9p2g5602x2gcj8zy1q3wjx9lwhl0i6"; - - postInstall = '' - ln -s $out/bin/packet-cli $out/bin/packet - ''; - - doCheck = false; - - meta = with lib; { - description = "Official Packet CLI"; - homepage = "https://github.com/packethost/packet-cli"; - license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne nshalman ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-diet/default.nix b/pkgs/development/tools/rust/cargo-diet/default.nix index df50ed02d11a4..471b7454684a8 100644 --- a/pkgs/development/tools/rust/cargo-diet/default.nix +++ b/pkgs/development/tools/rust/cargo-diet/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-diet"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "the-lean-crate"; repo = pname; rev = "v${version}"; - sha256 = "1wxwf3i8qhak8b61iscsbndm4z7r5sg6iiarqlpf0y3lzb0yi5ah"; + sha256 = "sha256-R40cggAdNbd8/+fG87PYHIbmgIsrhEwQ9ocB4p22bL4="; }; - cargoSha256 = "06scamzr1676q5lx75bm05hdr21mdiby84dpm1wf2va5qpq6mjyl"; + cargoSha256 = "sha256-lgCP5P7X9B4sTND+p8repZB63c64o1QuozJoz6KQXiE="; meta = with lib; { description = "Help computing optimal include directives for your Cargo.toml manifest"; diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index eac704b4a9c48..9df68c63810b7 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -23,8 +23,8 @@ let src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "dafead1765f6c1a5f9f8a76387dcb2abe4e54acd"; # pin - sha256 = "1kj6wcx9y7r1xyg8n7ai2pzrg9ira7hbakr45wh5p4zyxh0m45n8"; + rev = "449bc986ba6f4c5e10e32828783f9daef2a77644"; # pin + sha256 = "1249pvk4iz09caxm3kwckzwcx2hbw97cr2h8h770l6c061kb14z5"; }; }); localGlslang = (glslang.override { @@ -32,8 +32,8 @@ let src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "dc72924cb31cd9f3dbc3eb47e9d926cf641e3a07"; # pin - sha256 = "0pxgbq6xapw9hgrzb3rk5cylzgg1y1bkqz5wxzwqls63pwga5912"; + rev = "1fbed83c8aab8517d821fcb4164c08567951938f"; # pin + sha256 = "0faz468bnxpvbg1np13gnbwf35s0hl9ad7r2p9wi9si5k336qjmj"; }; }); argSpirv-headers = localSpirvHeaders; @@ -41,20 +41,20 @@ let src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "18eef33bd7a4bf5ad8c69f99cb72022608cf6e73"; # pin - sha256 = "0wwj7q509pkp8wj7120g1n2ddl4x2r03ljf5czd9794ji6yraidn"; + rev = "2fb89a0072ae7316af1c856f22663fde4928128a"; # pin + sha256 = "04kkmphv0a5mb5javhmkc4kab8r0n107kb7djakj5h238ni2j7q9"; }; }); robin-hood-hashing = fetchFromGitHub { owner = "martinus"; repo = "robin-hood-hashing"; - rev = "3.11.2"; # pin - sha256 = "0103mnqpmka1smy0arnrbihlvi7i8xr5im0px8wn4faw4flikkcm"; + rev = "3.11.3"; # pin + sha256 = "1gm3lwjkh6h8m7lfykzd0jzhfqjmjchindkmxc008rwvxafsd1pl"; }; in stdenv.mkDerivation rec { pname = "vulkan-validation-layers"; - version = "1.2.182.0"; + version = "1.2.189.1"; # If we were to use "dev" here instead of headers, the setupHook would be # placed in that output instead of "out". @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; rev = "sdk-${version}"; - sha256 = "1fnmb7vbm7y1x67bf1xiwdrpj9j4lkvhk9xhb6hp6x2aryvcyrnc"; + sha256 = "0a5plvvffidgnqh5ymq315xscl08w298sn9da48b3x2rdbdqgw90"; }); # Include absolute paths to layer libraries in their associated diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index cc6d0ced6d1b5..6db3ab932db9e 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "haiwen"; repo = "seafile"; - rev = "v${version}"; - sha256 = "QflLh3fj+jOq/8etr9aG8LGrvtIlB/htVkWbdO+GIbM="; + rev = "0fdc14d5175979919b7c741f6bb97bfaaacbbfbe"; + sha256 = "1cr1hvpp96s5arnzh1r5sazapcghhvbazbf7zym37yp3fy3lpya1"; }; nativeBuildInputs = [ @@ -40,12 +40,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-server" - "--disable-console" "--with-python3" ]; pythonPath = with python3.pkgs; [ - libsearpc + future + pysearpc ]; postFixup = '' @@ -55,8 +55,8 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/haiwen/seafile"; description = "Shared components of Seafile: seafile-daemon, libseafile, libseafile python bindings, manuals, and icons"; - license = licenses.gpl3; + license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ ]; + maintainers = with maintainers; [ greizgh schmittlauch ]; }; } diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index fa319dbab8fd7..6bfaa6a087701 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -316,6 +316,8 @@ let }; }; + chenglou92.rescript-vscode = callPackage ./rescript { }; + cmschuetz12.wal = buildVscodeMarketplaceExtension { mktplcRef = { name = "wal"; diff --git a/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix b/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix index 50a4dd26ee851..d4200c335524c 100644 --- a/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix +++ b/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix @@ -38,8 +38,8 @@ in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtens mktplcRef = { name = "vsliveshare"; publisher = "ms-vsliveshare"; - version = "1.0.4836"; - sha256 = "7hK2ptNU2mQt3iTZgkrKU9ZTVN+m7VFmAlXHxkiPL+o="; + version = "1.0.5043"; + sha256 = "OdFOFvidUV/trySHvF8iELPNVP2kq8+vZQ4q4Nf7SiQ="; }; }).overrideAttrs({ nativeBuildInputs ? [], buildInputs ? [], ... }: { nativeBuildInputs = nativeBuildInputs ++ [ diff --git a/pkgs/misc/vscode-extensions/rescript/default.nix b/pkgs/misc/vscode-extensions/rescript/default.nix new file mode 100644 index 0000000000000..5bad9b2e62836 --- /dev/null +++ b/pkgs/misc/vscode-extensions/rescript/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, vscode-utils, callPackage }: +let + rescript-editor-analysis = (callPackage ./rescript-editor-analysis.nix { }); + arch = + if stdenv.isLinux then "linux" + else if stdenv.isDarwin then "darwin" + else throw "Unsupported platform"; + analysisDir = "server/analysis_binaries/${arch}"; +in +vscode-utils.buildVscodeMarketplaceExtension rec { + mktplcRef = { + name = "rescript-vscode"; + publisher = "chenglou92"; + version = "1.1.3"; + sha256 = "1c1ipxgm0f0a3vlnhr0v85jr5l3rwpjzh9w8nv2jn5vgvpas0b2a"; + }; + postPatch = '' + rm -r ${analysisDir} + ln -s ${rescript-editor-analysis}/bin ${analysisDir} + ''; + + meta = with lib; { + description = "The official VSCode plugin for ReScript"; + homepage = "https://github.com/rescript-lang/rescript-vscode"; + maintainers = with maintainers; [ dlip ]; + license = licenses.mit; + }; +} diff --git a/pkgs/misc/vscode-extensions/rescript/rescript-editor-analysis.nix b/pkgs/misc/vscode-extensions/rescript/rescript-editor-analysis.nix new file mode 100644 index 0000000000000..518280b4b06b9 --- /dev/null +++ b/pkgs/misc/vscode-extensions/rescript/rescript-editor-analysis.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub, bash, ocaml }: + +stdenv.mkDerivation { + pname = "rescript-editor-analysis"; + version = "1.1.3"; + + src = fetchFromGitHub { + owner = "rescript-lang"; + repo = "rescript-vscode"; + rev = "8d0412a72307b220b7f5774e2612760a2d429059"; + sha256 = "rHQtfuIiEWlSPuZvNpEafsvlXCj2Uv1YRR1IfvKfC2s="; + }; + + nativeBuildInputs = [ ocaml ]; + + postPatch = '' + cd analysis + substituteInPlace Makefile --replace "/bin/bash" "${bash}/bin/bash" + ''; + + installPhase = '' + install -D -m0555 rescript-editor-analysis.exe $out/bin/rescript-editor-analysis.exe + ''; + + meta = with lib; { + description = "Analysis binary for the ReScript VSCode plugin"; + homepage = "https://github.com/rescript-lang/rescript-vscode"; + maintainers = with maintainers; [ dlip ]; + license = licenses.mit; + }; +} diff --git a/pkgs/os-specific/linux/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch b/pkgs/os-specific/linux/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch index 9beeab0f95433..2aabbc4d4c80d 100644 --- a/pkgs/os-specific/linux/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch +++ b/pkgs/os-specific/linux/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch @@ -1,28 +1,24 @@ -From 6503848d9e0eb009e5f462116a963beacb208930 Mon Sep 17 00:00:00 2001 +From 5cfb08effd21d9278e3eb8901c85112a331c3181 Mon Sep 17 00:00:00 2001 From: Austin Seipp <aseipp@pobox.com> -Date: Thu, 20 Feb 2014 00:11:44 -0600 +Date: Tue, 26 Oct 2021 09:23:07 +0000 Subject: [PATCH] attempt to 'modprobe config' before checking kernel -Signed-off-by: Austin Seipp <aseipp@pobox.com> --- - checksec.sh | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + checksec | 1 + + 1 file changed, 1 insertion(+) diff --git a/checksec b/checksec -index dd1f72e..63acc29 100644 +index 5536250..895073b 100755 --- a/checksec +++ b/checksec -@@ -676,7 +676,8 @@ kernelcheck() { - echo_message " userspace processes, this option lists the status of kernel configuration\n" '' '' '' +@@ -1059,6 +1059,7 @@ kernelcheck() { echo_message " options that harden the kernel itself against attack.\n\n" '' '' '' echo_message " Kernel config:\n" '' '' '{ "kernel": ' -- -+ + + modprobe configs 2> /dev/null - if [[ ! "${1}" == "" ]] ; then + if [[ ! "${1}" == "" ]]; then kconfig="cat ${1}" - echo_message " Warning: The config ${1} on disk may not represent running kernel config!\n\n" "${1}" "<kernel config=\"${1}\"" "{ \"KernelConfig\":\"${1}\"," - # update the architecture based on the config rather than the system + echo_message " Warning: The config ${1} on disk may not represent running kernel config!\n\n" "${1}" "<kernel config=\"${1}\"" "{ \"KernelConfig\":\"${1}\"" -- -1.8.3.2 +2.33.0 diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix index e0a65589571e6..fada305c3720f 100644 --- a/pkgs/os-specific/linux/checksec/default.nix +++ b/pkgs/os-specific/linux/checksec/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "checksec"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "slimm609"; repo = "checksec.sh"; rev = version; - sha256 = "1gbbq85d3g3mnm3xvgvi2085aba7qc3cmsbwn76al50ax1518j2q"; + sha256 = "sha256-GxWXocz+GCEssRrIQP6E9hjVIhVh2EmZrefELxQlV1Q="; }; patches = [ ./0001-attempt-to-modprobe-config-before-checking-kernel.patch ]; diff --git a/pkgs/servers/gemini/gmid/default.nix b/pkgs/servers/gemini/gmid/default.nix new file mode 100644 index 0000000000000..f06498d583b53 --- /dev/null +++ b/pkgs/servers/gemini/gmid/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub, bison, libressl, libevent }: + +stdenv.mkDerivation rec { + pname = "gmid"; + version = "1.7.5"; + + src = fetchFromGitHub { + owner = "omar-polo"; + repo = pname; + rev = version; + sha256 = "sha256-BBd0AL5jRRslxzDnxcTZRR+8J5D23NAQ7mp9K+leXAQ="; + }; + + nativeBuildInputs = [ bison ]; + + buildInputs = [ libressl libevent ]; + + configurePhase = '' + runHook preConfigure + ./configure PREFIX=$out + runHook postConfigure + ''; + + meta = with lib; { + description = "Simple and secure Gemini server"; + homepage = "https://gmid.omarpolo.com/"; + license = licenses.isc; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index e66f138c66cbb..d680607e5b10e 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -452,7 +452,7 @@ "lastfm" = ps: with ps; [ pylast ]; "launch_library" = ps: with ps; [ ]; # missing inputs: pylaunches "lcn" = ps: with ps; [ pypck ]; - "lg_netcast" = ps: with ps; [ ]; # missing inputs: pylgnetcast + "lg_netcast" = ps: with ps; [ pylgnetcast ]; "lg_soundbar" = ps: with ps; [ ]; # missing inputs: temescal "life360" = ps: with ps; [ ]; # missing inputs: life360 "lifx" = ps: with ps; [ aiolifx aiolifx-effects ]; diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/servers/hqplayerd/default.nix index 3bda53ad1404c..a461608badf08 100644 --- a/pkgs/servers/hqplayerd/default.nix +++ b/pkgs/servers/hqplayerd/default.nix @@ -8,21 +8,47 @@ , gcc11 , gnome , gssdp -, gupnp , lib , libgmpris , llvmPackages_10 , rpmextract , wavpack -}: +, gupnp +, gupnp-av +, meson +, ninja +}: +let + # hqplayerd relies on some package versions available for the fc34 release, + # which has out-of-date pkgs compared to nixpkgs. The following drvs + # can/should be removed when the fc35 hqplayer rpm is made available. + gupnp_1_2 = gupnp.overrideAttrs (old: rec { + pname = "gupnp"; + version = "1.2.7"; + src = fetchurl { + url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-hEEnbxr9AXbm9ZUCajpQfu0YCav6BAJrrT8hYis1I+w="; + }; + }); + + gupnp-av_0_12 = gupnp-av.overrideAttrs (old: rec { + pname = "gupnp-av"; + version = "0.12.11"; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-aJ3PFJKriZHa6ikTZaMlSKd9GiKU2FszYitVzKnOb9w="; + }; + nativeBuildInputs = lib.subtractLists [ meson ninja ] old.nativeBuildInputs; + }); +in stdenv.mkDerivation rec { pname = "hqplayerd"; - version = "4.26.0-67"; + version = "4.26.2-69"; src = fetchurl { url = "https://www.signalyst.eu/bins/${pname}/fc34/${pname}-${version}.fc34.x86_64.rpm"; - sha256 = "sha256-Wbtt1yO/CE2cewOE5RynwEm+fCdOV1cxzR/XiCwj0NU="; + sha256 = "sha256-zxUVtOi4fN3EuCbzH/SEse24Qz7/0jozzDX1yW8bhCU="; }; unpackPhase = '' @@ -38,7 +64,8 @@ stdenv.mkDerivation rec { gcc11.cc.lib gnome.rygel gssdp - gupnp + gupnp_1_2 + gupnp-av_0_12 libgmpris llvmPackages_10.openmp wavpack diff --git a/pkgs/servers/jibri/default.nix b/pkgs/servers/jibri/default.nix index 91d6a7ddf0401..6a77a448bf7f7 100644 --- a/pkgs/servers/jibri/default.nix +++ b/pkgs/servers/jibri/default.nix @@ -1,5 +1,16 @@ -{ lib, stdenv, fetchurl, dpkg, jre_headless, makeWrapper }: +{ lib, stdenv, fetchurl, dpkg, jre8_headless, makeWrapper, writeText, xorg }: + +let + xorgModulePaths = writeText "module-paths" '' + Section "Files" + ModulePath "${xorg.xorgserver}/lib/xorg/modules + ModulePath "${xorg.xorgserver}/lib/xorg/extensions + ModulePath "${xorg.xorgserver}/lib/xorg/drivers + ModulePath "${xorg.xf86videodummy}/lib/xorg/modules/drivers + EndSection + ''; +in stdenv.mkDerivation rec { pname = "jibri"; version = "8.0-93-g51fe7a2"; @@ -19,7 +30,9 @@ stdenv.mkDerivation rec { mv etc/jitsi/jibri/* $out/etc/jitsi/jibri/ mv opt/jitsi/jibri/* $out/opt/jitsi/jibri/ - makeWrapper ${jre_headless}/bin/java $out/bin/jibri --add-flags "-jar $out/opt/jitsi/jibri/jibri.jar" + cat '${xorgModulePaths}' >> $out/etc/jitsi/jibri/xorg-video-dummy.conf + + makeWrapper ${jre8_headless}/bin/java $out/bin/jibri --add-flags "-jar $out/opt/jitsi/jibri/jibri.jar" runHook postInstall ''; diff --git a/pkgs/servers/seafile-server/default.nix b/pkgs/servers/seafile-server/default.nix new file mode 100644 index 0000000000000..d60dd7809913f --- /dev/null +++ b/pkgs/servers/seafile-server/default.nix @@ -0,0 +1,52 @@ +{ stdenv, lib, fetchFromGitHub, pkg-config, python3Packages, autoreconfHook +, libuuid, sqlite, glib, libevent, libsearpc, openssl, fuse, libarchive, which +, vala, cmake, oniguruma }: + +let + # seafile-server relies on a specific version of libevhtp. + # It contains non upstreamed patches and is forked off an outdated version. + libevhtp = import ./libevhtp.nix { + inherit stdenv lib fetchFromGitHub cmake libevent; + }; +in stdenv.mkDerivation rec { + pname = "seafile-server"; + version = "8.0.7"; + + src = fetchFromGitHub { + owner = "haiwen"; + repo = "seafile-server"; + rev = "27dac89bb3a81c5acc3f764ce92134eb357ea64b"; + sha256 = "1h2hxvv0l5m9nbkdyjpznb7ddk8hb8hhwj8b2lx6aqbvp8gll9q7"; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + buildInputs = [ + libuuid + sqlite + openssl + glib + libsearpc + libevent + python3Packages.python + fuse + libarchive + which + vala + libevhtp + oniguruma + ]; + + postInstall = '' + mkdir -p $out/share/seafile/sql + cp -r scripts/sql $out/share/seafile + ''; + + meta = with lib; { + description = "File syncing and sharing software with file encryption and group sharing, emphasis on reliability and high performance"; + homepage = "https://github.com/haiwen/seafile-server"; + license = licenses.agpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ greizgh schmittlauch ]; + }; +} diff --git a/pkgs/servers/seafile-server/libevhtp.nix b/pkgs/servers/seafile-server/libevhtp.nix new file mode 100644 index 0000000000000..97cdc0804faa7 --- /dev/null +++ b/pkgs/servers/seafile-server/libevhtp.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, fetchFromGitHub, cmake, libevent }: + +stdenv.mkDerivation rec { + pname = "libevhtp"; + version = "unstable-2021-04-28"; + + src = fetchFromGitHub { + owner = "haiwen"; + repo = "libevhtp"; + rev = "18c649203f009ef1d77d6f8301eba09af3777adf"; + sha256 = "1rf0jcy2lf8jbzpkhfgv289hc8zdy5zs6sn36k4vlqvilginxiid"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ libevent ]; + + cmakeFlags = [ + "-DEVHTP_DISABLE_SSL=ON" + "-DEVHTP_BUILD_SHARED=ON" + ]; + + meta = with lib; { + description = "Create extremely-fast and secure embedded HTTP servers with ease"; + homepage = "https://github.com/criticalstack/libevhtp"; + license = licenses.bsd3; + maintainers = with maintainers; [ greizgh schmittlauch ]; + }; +} diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index c3b90d99bafba..60bf80653a4c8 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "trivy"; - version = "0.19.2"; + version = "0.20.2"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aYPG0xvuijASKXBGgB+6UyF9bmeU8l5snOoPWI8Ewh8="; + sha256 = "sha256-ittOVWsM+1IaILCLCJNOeLxRbRHiiMN4qgLTS9gxV0w="; }; - vendorSha256 = "sha256-4FO6/1eNyxy/CH7XMUkLfRqEg2+XUXL1gKleL6o4EoM="; + vendorSha256 = "sha256-HrDj09gUJtkZhQ3nYfoj0K8+T62ib0CWAhhcuvg8cyc="; excludedPackages = "misc"; diff --git a/pkgs/tools/backup/gamerbackup/default.nix b/pkgs/tools/backup/gamerbackup/default.nix index 5512ce2b7b12e..37bff91100dff 100644 --- a/pkgs/tools/backup/gamerbackup/default.nix +++ b/pkgs/tools/backup/gamerbackup/default.nix @@ -2,13 +2,13 @@ buildGoModule { pname = "gb-backup"; - version = "unstable-2021-04-07"; + version = "unstable-2021-08-16"; src = fetchFromGitHub { owner = "leijurv"; repo = "gb"; - rev = "904813bf0bbce048af5795618d58c0b1953f9ff8"; - sha256 = "111jrcv4x38sc19xha5q3pd2297s13qh1maa7sa1k09hgypvgsxf"; + rev = "fa996208d06766bf523686fbe5831628130d80f7"; + sha256 = "1vggl8d69sf4z2lmixfndwwd6l9gi0fkkrxga7v4w7a7yr96b1vp"; }; vendorSha256 = "0m2aa6p04b4fs7zncar1mlykc94pp527phv71cdsbx58jgsm1jnx"; @@ -23,6 +23,7 @@ buildGoModule { meta = with lib; { description = "Gamer Backup, a super opinionated cloud backup system"; + homepage = "https://github.com/leijurv/gb"; license = licenses.agpl3Only; maintainers = with maintainers; [ babbaj ]; platforms = platforms.unix; diff --git a/pkgs/tools/cd-dvd/ventoy-bin/default.nix b/pkgs/tools/cd-dvd/ventoy-bin/default.nix index 334b3abdfc952..b5f33f7a65852 100644 --- a/pkgs/tools/cd-dvd/ventoy-bin/default.nix +++ b/pkgs/tools/cd-dvd/ventoy-bin/default.nix @@ -1,6 +1,8 @@ { lib, stdenv, fetchurl, fetchpatch , autoPatchelfHook, makeWrapper , hexdump, exfat, dosfstools, e2fsprogs, xz, util-linux, bash, parted +, withGtk3 ? true, gtk3 +, withQt5 ? false, qt5 }: let arch = { @@ -9,16 +11,22 @@ let arch = { aarch64-linux = "aarch64"; mipsel-linux = "mips64el"; }.${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}"); +defaultGuiType = if withGtk3 then "gtk3" + else if withQt5 then "qt5" + else ""; in stdenv.mkDerivation rec { pname = "ventoy-bin"; - version = "1.0.51"; + version = "1.0.56"; - nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; - buildInputs = [ hexdump exfat dosfstools e2fsprogs xz util-linux bash parted ]; + nativeBuildInputs = [ autoPatchelfHook makeWrapper ] + ++ lib.optional withQt5 qt5.wrapQtAppsHook; + buildInputs = [ hexdump exfat dosfstools e2fsprogs xz util-linux bash parted ] + ++ lib.optional withGtk3 gtk3 + ++ lib.optional withQt5 qt5.qtbase; src = fetchurl { url = "https://github.com/ventoy/Ventoy/releases/download/v${version}/ventoy-${version}-linux.tar.gz"; - sha256 = "81ae02a06b132b5965dd09c9b64e000a6dafa1d57e03d8564feefda14ef1ee02"; + sha256 = "da53d51e653092a170c11dd560e0ad6fb27c497dd77ad0ba483c32935c069dea"; }; patches = [ (fetchpatch { @@ -53,12 +61,13 @@ in stdenv.mkDerivation rec { # Cleanup. case "$ARCH" in - x86_64) rm -r tool/{i386,aarch64,mips64el};; - i386) rm -r tool/{x86_64,aarch64,mips64el};; - aarch64) rm -r tool/{x86_64,i386,mips64el};; - mips64el) rm -r tool/{x86_64,i386,aarch64};; + x86_64) rm -r {tool/,VentoyGUI.}{i386,aarch64,mips64el};; + i386) rm -r {tool/,VentoyGUI.}{x86_64,aarch64,mips64el};; + aarch64) rm -r {tool/,VentoyGUI.}{x86_64,i386,mips64el};; + mips64el) rm -r {tool/,VentoyGUI.}{x86_64,i386,aarch64};; esac rm README + rm tool/"$ARCH"/Ventoy2Disk.gtk2 # Copy from "$src" to "$out". mkdir -p "$out"/bin "$VENTOY_PATH" @@ -72,6 +81,15 @@ in stdenv.mkDerivation rec { --prefix PATH : "${lib.makeBinPath buildInputs}" \ --run "cd '$VENTOY_PATH' || exit 1" done + '' + lib.optionalString (withGtk3 || withQt5) '' + echo "${defaultGuiType}" > "$VENTOY_PATH/ventoy_gui_type" + makeWrapper "$VENTOY_PATH/VentoyGUI.$ARCH" "$out/bin/ventoy-gui" \ + --prefix PATH : "${lib.makeBinPath buildInputs}" \ + --run "cd '$VENTOY_PATH' || exit 1" + '' + lib.optionalString (!withGtk3) '' + rm "$out"/share/ventoy/tool/"$ARCH"/Ventoy2Disk.gtk3 + '' + lib.optionalString (!withQt5) '' + rm "$out"/share/ventoy/tool/"$ARCH"/Ventoy2Disk.qt5 ''; meta = with lib; { diff --git a/pkgs/tools/games/opentracker/default.nix b/pkgs/tools/games/opentracker/default.nix new file mode 100644 index 0000000000000..a191a90b17ba6 --- /dev/null +++ b/pkgs/tools/games/opentracker/default.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, buildDotnetModule +, fetchFromGitHub +, autoPatchelfHook +, wrapGAppsHook +, dotnetCorePackages +, fontconfig +, gtk3 +, openssl +, libX11 +, libXi +, xinput +}: + +buildDotnetModule rec { + pname = "opentracker"; + version = "1.8.2"; + + src = fetchFromGitHub { + owner = "trippsc2"; + repo = pname; + rev = version; + sha256 = "0nsmyb1wd86465iri9jxl3jp74gxkscvnmr3687ddbia3dv4fz0z"; + }; + + dotnet-runtime = dotnetCorePackages.runtime_3_1; + projectFile = "OpenTracker.sln"; + nugetDeps = ./deps.nix; + executables = [ "OpenTracker" ]; + + nativeBuildInputs = [ + autoPatchelfHook + wrapGAppsHook + ]; + + buildInputs = [ + stdenv.cc.cc.lib + fontconfig + ]; + + runtimeDeps = [ + gtk3 + openssl + libX11 + libXi + xinput + ]; + + autoPatchelfIgnoreMissingDeps = true; # Attempts to patchelf unneeded SOs + dontWrapGApps = true; # gappsWrapperArgs gets included when wrapping the application for dotnet. + + meta = with lib; { + description = "A tracking application for A Link to the Past Randomizer"; + homepage = "https://github.com/trippsc2/OpenTracker"; + license = licenses.mit; + maintainers = [ maintainers.ivar ]; + }; +} diff --git a/pkgs/tools/games/opentracker/deps.nix b/pkgs/tools/games/opentracker/deps.nix new file mode 100644 index 0000000000000..3d6944b66724f --- /dev/null +++ b/pkgs/tools/games/opentracker/deps.nix @@ -0,0 +1,228 @@ +{ fetchNuGet }: [ + (fetchNuGet { name = "Autofac"; version = "6.0.0"; sha256 = "1faz8j3caqh4f2w4bcicz5x67f63f6463jikg89sr9qmqbv778hn"; }) + (fetchNuGet { name = "Autofac"; version = "6.1.0"; sha256 = "0g1iic7y19rm536dzsllabw7phbgb6wzghhpfmdxz7yp7zrfjk15"; }) + (fetchNuGet { name = "Autofac.Extras.Moq"; version = "6.0.0"; sha256 = "1jbdzwr712iq11s3i24a4b7g6025djkmf40fcrfiqkihvdrfprcw"; }) + (fetchNuGet { name = "Avalonia"; version = "0.10.0"; sha256 = "0wf8nqdj0xi6drzw676vm5ac2kaxcd76af4y1cirfw4j7lxvs344"; }) + (fetchNuGet { name = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2020091801"; sha256 = "04jm83cz7vkhhr6n2c9hya2k8i2462xbf6np4bidk55as0jdq43a"; }) + (fetchNuGet { name = "Avalonia.Controls.DataGrid"; version = "0.10.0"; sha256 = "0yry5kwbp03lznv2zay39p2ry2jsdf7s1syjzf93dd64pgl5bwpk"; }) + (fetchNuGet { name = "Avalonia.Desktop"; version = "0.10.0"; sha256 = "1vwaxxnzcgkdrxvrkjcxpc9c839pxmm6ajq83xiqzn5f4vvx29di"; }) + (fetchNuGet { name = "Avalonia.Diagnostics"; version = "0.10.0"; sha256 = "1fw6bbbm7g1w4s6hyskkx7p59i3p965bly8p50dmfs31ls01jfrx"; }) + (fetchNuGet { name = "Avalonia.FreeDesktop"; version = "0.10.0"; sha256 = "08z3vybk474yxaipd7nqqr9xycgprggcri4lp61ns3p3fj599ydp"; }) + (fetchNuGet { name = "Avalonia.Markup.Xaml.Loader"; version = "0.10.0"; sha256 = "05wdf7gc5v03gia29srq44g49ijqg45vygargm087m2s63i134jk"; }) + (fetchNuGet { name = "Avalonia.Native"; version = "0.10.0"; sha256 = "1kfzn349rllp7ngydvxqn84hmgxrkbgf7mgrqwcagq809f73mzyp"; }) + (fetchNuGet { name = "Avalonia.ReactiveUI"; version = "0.10.0"; sha256 = "0azkwfi72gy7158fpfs6i0iixixy00zfkgsh939pfzy7fkz5pq8m"; }) + (fetchNuGet { name = "Avalonia.Remote.Protocol"; version = "0.10.0"; sha256 = "0527966nmjdhzdq6dwhjhyc79kmy56ymhxsmrp344jn43d67kmnr"; }) + (fetchNuGet { name = "Avalonia.Skia"; version = "0.10.0"; sha256 = "1d5w7pl1xx9l250mhdq3jnpy5zl77j8n3ccjjxfg8sc7rnyd2fx9"; }) + (fetchNuGet { name = "Avalonia.Win32"; version = "0.10.0"; sha256 = "0lyfmhh0q1dzzb5blp76phj894wl6ab0kn1pcprxqvj94dcwric8"; }) + (fetchNuGet { name = "Avalonia.X11"; version = "0.10.0"; sha256 = "0asja6g20c6wzxmvx0knkdk6f5fbrx99n82zcrj4y2irhmmzjhxy"; }) + (fetchNuGet { name = "Avalonia.Xaml.Behaviors"; version = "0.10.0"; sha256 = "10g6i9y00a13cy3y889y3z8i5p5arpif53q3xx9k6k0qzcq6zq51"; }) + (fetchNuGet { name = "Avalonia.Xaml.Interactions"; version = "0.10.0"; sha256 = "0s1mha3m912lmzaw87a841807fcx150vmhwcbfb8mnhqf6qgdwjy"; }) + (fetchNuGet { name = "Avalonia.Xaml.Interactions.DragAndDrop"; version = "0.10.0"; sha256 = "1hi9ii7r6xr6avac0a2fs1fq9x34iw23hn1qmnzskbj6jz1pzsbj"; }) + (fetchNuGet { name = "Avalonia.Xaml.Interactivity"; version = "0.10.0"; sha256 = "0nqpxbn390g98vyhvp4rvbchxlrcc8vkjjkakgz15crk1irf941b"; }) + (fetchNuGet { name = "Castle.Core"; version = "4.0.0"; sha256 = "10zq7mb1gvm946grw7fxa5dh1xwccqmk5jmwx6pqn7kbjp9frkpy"; }) + (fetchNuGet { name = "DotNet.Bundle"; version = "0.9.13"; sha256 = "0awzvk62hgszm9b8ar87y862aj8nlm77d7hgfmp84mxny0ag03jl"; }) + (fetchNuGet { name = "DynamicData"; version = "7.1.1"; sha256 = "14xcqkw87zbjljy1pb727kwq5a4dfmsf5vg99fq0xxb71q828nvh"; }) + (fetchNuGet { name = "HarfBuzzSharp"; version = "2.6.1.7"; sha256 = "0xm4dr6cs5n1ywbbpp1jrxfk8rn1iy61kdm29kb6bqj1q0gv8zyv"; }) + (fetchNuGet { name = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.6.1.7"; sha256 = "1slackrhcwsjn3f6sa0nlrcynzmx5pbqv8j33l9w6z9w7ssq4wkn"; }) + (fetchNuGet { name = "JetBrains.Annotations"; version = "2020.3.0"; sha256 = "04xlfqnfg3069f014q8f0vx7y70m8nldbf9fia4b50bp3rry2lv2"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Ref"; version = "3.1.10"; sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "3.1.19"; sha256 = "19z4zrchaxcz0a33c33n1qd11z9khj4323nfzsbzah0xxkkj8ka8"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "3.1.19"; sha256 = "0fhj1q9zdy5nqxppjgr8ayqlc2b9zfbrs7h3zc1wlg9xxbzk944y"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "3.1.19"; sha256 = "0cbic6d8ck79fgg7hngfvsdyd9aj6zanf6c36lzdydvqvjza1l48"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "3.1.19"; sha256 = "040rbbxgcqks2f81x2sr8bnrarxygadzv84ksfpwcdw5xjnqj5c9"; }) + (fetchNuGet { name = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.2"; sha256 = "162vb5894zxps0cf5n9gc08an7gwybzz87allx3lsszvllr9ldx4"; }) + (fetchNuGet { name = "Microsoft.CodeAnalysis.Common"; version = "3.9.0"; sha256 = "1x6l6kn8iv5gk1545nxs2gwzkb8gj4sb9kryai132l7yg9afjqik"; }) + (fetchNuGet { name = "Microsoft.CodeAnalysis.CSharp"; version = "3.9.0"; sha256 = "0crb9x5rhija8y7b0iya9axcvinz2hv3bgf80bvz7kv6zpbpszkz"; }) + (fetchNuGet { name = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.9.0"; sha256 = "0hrihj0q96vjlbfvkq9l4maqdf6rqdznr7cpj82iw51n8kbzj8s3"; }) + (fetchNuGet { name = "Microsoft.CodeAnalysis.NetAnalyzers"; version = "5.0.3"; sha256 = "1l0zg9wl8yapjq9g2d979zhsmdkr8kfybmxnl7kvgkgldf114fbg"; }) + (fetchNuGet { name = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.9.0"; sha256 = "0kds9i8bla540787qchbzayrg50ai40pxyai2vihc1m2l39h4mdf"; }) + (fetchNuGet { name = "Microsoft.CodeCoverage"; version = "16.9.1"; sha256 = "18isx8w4kwnlk6hq5ay8i4lgzwhx0zg9brayfdk2lakagvv6yyaf"; }) + (fetchNuGet { name = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) + (fetchNuGet { name = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.linux-x64"; version = "3.1.19"; sha256 = "10fs93kg8vhhm1l05815m8yqz796i6gk824pk1bps239mshmkybr"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.osx-x64"; version = "3.1.19"; sha256 = "1yqkh1z643vfxs2qkhc4h8403ha29f3kpj28cm067zsyr0jn1zbx"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x64"; version = "3.1.19"; sha256 = "1069h3yznipl44gzx0r7srg5yfhkp8v552g1pl7rdnwrbi1xfrbg"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x86"; version = "3.1.19"; sha256 = "19vkqpw5j0zd6b06npx934idjq90av0rhsvcx01z6hlhg80ajr14"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Ref"; version = "3.1.0"; sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "3.1.19"; sha256 = "10c9bq1z8j173n9jzamgplbxq101yscwdhksshn1ybisn7cr5g0h"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "3.1.19"; sha256 = "0av8fnjmjmws9h1r49ga7an9180z156dii3n0crwmn9fwdw2l7g2"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x64"; version = "3.1.19"; sha256 = "19rw3hpr32x4kwlx7drd2f522pkvhgpscjldg0rg40z6ki3biykd"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x86"; version = "3.1.19"; sha256 = "17kxfradsfdf8cr506izmb3lhgy4kg7ij82cjdx6nxwkpaq96ykw"; }) + (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) + (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) + (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "5.0.1"; sha256 = "12ilya3x6g5frbwmh41mwygax9v8vrycq3vnzhv3r258jwv69974"; }) + (fetchNuGet { name = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) + (fetchNuGet { name = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { name = "Microsoft.NETCore.Targets"; version = "5.0.0"; sha256 = "0z3qyv7qal5irvabc8lmkh58zsl42mrzd1i0sssvzhv4q4kl3cg6"; }) + (fetchNuGet { name = "Microsoft.NET.Test.Sdk"; version = "16.9.1"; sha256 = "1761mvkp5mwhw150fvazdhh4ybvxpvx05g9znf8n1fqx832wxrw5"; }) + (fetchNuGet { name = "Microsoft.TestPlatform.ObjectModel"; version = "16.9.1"; sha256 = "1igpx7ldxqx9fkrbhakd2bybc0dgpvj86zr30vpfj31ncm6lp4id"; }) + (fetchNuGet { name = "Microsoft.TestPlatform.TestHost"; version = "16.9.1"; sha256 = "1frx5r7l0jd3j6my4s2qas13fkljgfn87a84xk8l7sisafpfsvzp"; }) + (fetchNuGet { name = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) + (fetchNuGet { name = "Microsoft.Win32.SystemEvents"; version = "5.0.0"; sha256 = "0sja4ba0mrvdamn0r9mhq38b9dxi08yb3c1hzh29n1z6ws1hlrcq"; }) + (fetchNuGet { name = "Moq"; version = "4.7.0"; sha256 = "1y1lzg7scrzl5x8cxsbrgkpg79mf3v0ylnpgjw8q6hib2rhsi8ff"; }) + (fetchNuGet { name = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) + (fetchNuGet { name = "Newtonsoft.Json"; version = "12.0.3"; sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; }) + (fetchNuGet { name = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) + (fetchNuGet { name = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; }) + (fetchNuGet { name = "Packaging.Targets"; version = "0.1.155"; sha256 = "0iija7gskcbrj8qgj5lqxqsfpz8k58fbvjnix6rccpzgvb16dkhy"; }) + (fetchNuGet { name = "ReactiveUI"; version = "12.1.1"; sha256 = "1mwv9fi2zazp9ddwci9xfzrmi4pyp8n69r8ilc4lp5lvr1c6chih"; }) + (fetchNuGet { name = "ReactiveUI"; version = "13.2.2"; sha256 = "1f9jh3d8lblqpva4iy5c6qvnya3cc0fp6mva3f9z3q7ll8v4h62h"; }) + (fetchNuGet { name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) + (fetchNuGet { name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) + (fetchNuGet { name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) + (fetchNuGet { name = "runtime.native.System"; version = "4.0.0"; sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; }) + (fetchNuGet { name = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) + (fetchNuGet { name = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) + (fetchNuGet { name = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) + (fetchNuGet { name = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) + (fetchNuGet { name = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) + (fetchNuGet { name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) + (fetchNuGet { name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) + (fetchNuGet { name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) + (fetchNuGet { name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) + (fetchNuGet { name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) + (fetchNuGet { name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) + (fetchNuGet { name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) + (fetchNuGet { name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) + (fetchNuGet { name = "Serilog"; version = "2.10.0"; sha256 = "08bih205i632ywryn3zxkhb15dwgyaxbhmm1z3b5nmby9fb25k7v"; }) + (fetchNuGet { name = "Serilog.Sinks.File"; version = "4.1.0"; sha256 = "1ry7p9hf1zlnai1j5zjhjp4dqm2agsbpq6cvxgpf5l8m26x6mgca"; }) + (fetchNuGet { name = "Serilog.Sinks.File"; version = "5.0.0-dev-00909"; sha256 = "1rz1zzyamnl8g4ccscaaij2bkhpd4md4sr9k28i0zwvij4kpj22z"; }) + (fetchNuGet { name = "SkiaSharp"; version = "2.80.2"; sha256 = "17n0f4gfxz69fzd7zmgimbxfja15vq902arap2rqjr1hxp8sck7g"; }) + (fetchNuGet { name = "SkiaSharp.NativeAssets.Linux"; version = "2.80.2"; sha256 = "1951b7rpisaymb37j846jq01pjd05l4fjlnf56blh33ihxyj2jzi"; }) + (fetchNuGet { name = "Splat"; version = "10.0.1"; sha256 = "18fzrn7xwjzxj4v3drs8djd3yf14bnq5n9n8vdnwfa1zk5jqpsb9"; }) + (fetchNuGet { name = "Splat"; version = "9.6.1"; sha256 = "1sd3gbcv21vwl3spcpmy4d7nzcs0x6m72qj8qfbv4dvgpvbv5sdy"; }) + (fetchNuGet { name = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) + (fetchNuGet { name = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) + (fetchNuGet { name = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) + (fetchNuGet { name = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) + (fetchNuGet { name = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) + (fetchNuGet { name = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) + (fetchNuGet { name = "System.Collections.Concurrent"; version = "4.0.12"; sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; }) + (fetchNuGet { name = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) + (fetchNuGet { name = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) + (fetchNuGet { name = "System.Collections.NonGeneric"; version = "4.0.1"; sha256 = "19994r5y5bpdhj7di6w047apvil8lh06lh2c2yv9zc4fc5g9bl4d"; }) + (fetchNuGet { name = "System.Collections.Specialized"; version = "4.0.1"; sha256 = "1wbv7y686p5x169rnaim7sln67ivmv6r57falrnx8aap9y33mam9"; }) + (fetchNuGet { name = "System.ComponentModel"; version = "4.0.1"; sha256 = "0v4qpmqlzyfad2kswxxj2frnaqqhz9201c3yn8fmmarx5vlzg52z"; }) + (fetchNuGet { name = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) + (fetchNuGet { name = "System.ComponentModel.Annotations"; version = "5.0.0"; sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; }) + (fetchNuGet { name = "System.ComponentModel.Primitives"; version = "4.1.0"; sha256 = "0wb5mnaag0w4fnyc40x19j8v2vshxp266razw64bcqfyj1whb1q0"; }) + (fetchNuGet { name = "System.ComponentModel.TypeConverter"; version = "4.1.0"; sha256 = "178cva9p1cs043h5n2fry5xkzr3wc9n0hwbxa8m3ymld9m6wcv0y"; }) + (fetchNuGet { name = "System.Console"; version = "4.0.0"; sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; }) + (fetchNuGet { name = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) + (fetchNuGet { name = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) + (fetchNuGet { name = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) + (fetchNuGet { name = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) + (fetchNuGet { name = "System.Diagnostics.DiagnosticSource"; version = "4.7.1"; sha256 = "1mivaifniyrqwlnvzsfaxzrh2sd981bwzs3cbvs5wi7jjzbcqr4p"; }) + (fetchNuGet { name = "System.Diagnostics.DiagnosticSource"; version = "5.0.1"; sha256 = "0mzw44wsm87vpslb9sn7rirxynpq9m3b00l7gl0q71m8shfh66qs"; }) + (fetchNuGet { name = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) + (fetchNuGet { name = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) + (fetchNuGet { name = "System.Diagnostics.TraceSource"; version = "4.0.0"; sha256 = "1mc7r72xznczzf6mz62dm8xhdi14if1h8qgx353xvhz89qyxsa3h"; }) + (fetchNuGet { name = "System.Diagnostics.Tracing"; version = "4.1.0"; sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; }) + (fetchNuGet { name = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) + (fetchNuGet { name = "System.Drawing.Common"; version = "5.0.1"; sha256 = "14h722wq58k1wmgxmpws91xc7kh8109ijw0hcxjq9qkbhbi6pwmb"; }) + (fetchNuGet { name = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) + (fetchNuGet { name = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) + (fetchNuGet { name = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) + (fetchNuGet { name = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) + (fetchNuGet { name = "System.Globalization.Extensions"; version = "4.0.1"; sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; }) + (fetchNuGet { name = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) + (fetchNuGet { name = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) + (fetchNuGet { name = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) + (fetchNuGet { name = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) + (fetchNuGet { name = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) + (fetchNuGet { name = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) + (fetchNuGet { name = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) + (fetchNuGet { name = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) + (fetchNuGet { name = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) + (fetchNuGet { name = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) + (fetchNuGet { name = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) + (fetchNuGet { name = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) + (fetchNuGet { name = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) + (fetchNuGet { name = "System.Linq.Queryable"; version = "4.0.1"; sha256 = "11jn9k34g245yyf260gr3ldzvaqa9477w2c5nhb1p8vjx4xm3qaw"; }) + (fetchNuGet { name = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) + (fetchNuGet { name = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) + (fetchNuGet { name = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) + (fetchNuGet { name = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) + (fetchNuGet { name = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) + (fetchNuGet { name = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) + (fetchNuGet { name = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) + (fetchNuGet { name = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) + (fetchNuGet { name = "System.Reactive"; version = "5.0.0"; sha256 = "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"; }) + (fetchNuGet { name = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) + (fetchNuGet { name = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) + (fetchNuGet { name = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) + (fetchNuGet { name = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) + (fetchNuGet { name = "System.Reflection.Emit"; version = "4.7.0"; sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; }) + (fetchNuGet { name = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) + (fetchNuGet { name = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) + (fetchNuGet { name = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) + (fetchNuGet { name = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) + (fetchNuGet { name = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) + (fetchNuGet { name = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) + (fetchNuGet { name = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) + (fetchNuGet { name = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; }) + (fetchNuGet { name = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) + (fetchNuGet { name = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) + (fetchNuGet { name = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) + (fetchNuGet { name = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) + (fetchNuGet { name = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) + (fetchNuGet { name = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) + (fetchNuGet { name = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) + (fetchNuGet { name = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { name = "System.Runtime"; version = "4.3.1"; sha256 = "03ch4d2acf6q037a4njxpll2kkx3dwzlg07yxr4z5m6j1kqgmm27"; }) + (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "4.6.0"; sha256 = "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m"; }) + (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }) + (fetchNuGet { name = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) + (fetchNuGet { name = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) + (fetchNuGet { name = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) + (fetchNuGet { name = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) + (fetchNuGet { name = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) + (fetchNuGet { name = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) + (fetchNuGet { name = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) + (fetchNuGet { name = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) + (fetchNuGet { name = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) + (fetchNuGet { name = "System.Runtime.Serialization.Primitives"; version = "4.3.0"; sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; }) + (fetchNuGet { name = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) + (fetchNuGet { name = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) + (fetchNuGet { name = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) + (fetchNuGet { name = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) + (fetchNuGet { name = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) + (fetchNuGet { name = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) + (fetchNuGet { name = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) + (fetchNuGet { name = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) + (fetchNuGet { name = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) + (fetchNuGet { name = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { name = "System.Text.Encoding.CodePages"; version = "5.0.0"; sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0"; }) + (fetchNuGet { name = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) + (fetchNuGet { name = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) + (fetchNuGet { name = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) + (fetchNuGet { name = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) + (fetchNuGet { name = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) + (fetchNuGet { name = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { name = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) + (fetchNuGet { name = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) + (fetchNuGet { name = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) + (fetchNuGet { name = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) + (fetchNuGet { name = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) + (fetchNuGet { name = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) + (fetchNuGet { name = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) + (fetchNuGet { name = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) + (fetchNuGet { name = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) + (fetchNuGet { name = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) + (fetchNuGet { name = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) + (fetchNuGet { name = "System.Xml.XmlDocument"; version = "4.0.1"; sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1"; }) + (fetchNuGet { name = "System.Xml.XmlSerializer"; version = "4.0.11"; sha256 = "01nzc3gdslw90qfykq4qzr2mdnqxjl4sj0wp3fixiwdmlmvpib5z"; }) + (fetchNuGet { name = "ThemeEditor.Controls.ColorPicker"; version = "0.10.0"; sha256 = "0sib6cf2xkss48rm3shbwr57rbzz7d2zq0fvjp0hwsa1mb985p2b"; }) + (fetchNuGet { name = "Tmds.DBus"; version = "0.9.1"; sha256 = "095vinsbb9pbphbhh7x7rxvs8a3b9w1nnz7gxn9bw5is01qnhgdm"; }) + (fetchNuGet { name = "WebSocketSharp-netstandard"; version = "1.0.1"; sha256 = "0q89wiqpli72333zsa04d1vzq9xj0583hn5mih9sdd84myksz5b0"; }) + (fetchNuGet { name = "xunit"; version = "2.4.1"; sha256 = "0xf3kaywpg15flqaqfgywqyychzk15kz0kz34j21rcv78q9ywq20"; }) + (fetchNuGet { name = "xunit.abstractions"; version = "2.0.3"; sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh"; }) + (fetchNuGet { name = "xunit.analyzers"; version = "0.10.0"; sha256 = "15n02q3akyqbvkp8nq75a8rd66d4ax0rx8fhdcn8j78pi235jm7j"; }) + (fetchNuGet { name = "xunit.assert"; version = "2.4.1"; sha256 = "1imynzh80wxq2rp9sc4gxs4x1nriil88f72ilhj5q0m44qqmqpc6"; }) + (fetchNuGet { name = "xunit.core"; version = "2.4.1"; sha256 = "1nnb3j4kzmycaw1g76ii4rfqkvg6l8gqh18falwp8g28h802019a"; }) + (fetchNuGet { name = "xunit.extensibility.core"; version = "2.4.1"; sha256 = "103qsijmnip2pnbhciqyk2jyhdm6snindg5z2s57kqf5pcx9a050"; }) + (fetchNuGet { name = "xunit.extensibility.execution"; version = "2.4.1"; sha256 = "1pbilxh1gp2ywm5idfl0klhl4gb16j86ib4x83p8raql1dv88qia"; }) + (fetchNuGet { name = "xunit.runner.console"; version = "2.4.1"; sha256 = "13ykz9anhz72xc4q6byvdfwrp54hlcbl6zsfapwfhnzyvfgb9w13"; }) + (fetchNuGet { name = "xunit.runner.visualstudio"; version = "2.4.3"; sha256 = "0j1d0rbcm7pp6dypi61sjxp8l22sv261252z55b243l39jgv2rp3"; }) +] diff --git a/pkgs/tools/graphics/vulkan-extension-layer/default.nix b/pkgs/tools/graphics/vulkan-extension-layer/default.nix index aa90fced901f2..ed76557632621 100644 --- a/pkgs/tools/graphics/vulkan-extension-layer/default.nix +++ b/pkgs/tools/graphics/vulkan-extension-layer/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "vulkan-extension-layer"; - version = "1.2.182.0"; + version = "1.2.189.1"; src = (assert version == vulkan-headers.version; fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ExtensionLayer"; rev = "sdk-${version}"; - sha256 = "0by2kp48jbd55xk26rmlvc4wm77g1zvidx8czn1587ng2yzi7acr"; + sha256 = "0qi9ps215pmrh8vgi81wvlzjyxs44bama2x3d43a1bbvcyp9s6kp"; }); nativeBuildInputs = [ cmake jq ]; diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix index 3b33328485eec..ae9e0e86b2521 100644 --- a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix +++ b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { pname = "vulkan-tools-lunarg"; # The version must match that in vulkan-headers - version = "1.2.182.0"; + version = "1.2.189.1"; src = (assert version == vulkan-headers.version; fetchFromGitHub { owner = "LunarG"; repo = "VulkanTools"; rev = "sdk-${version}"; - sha256 = "1b7762fcbakfvj2b2l68qj25pc7pz9jhfabf1x80b9w3q205hl2f"; + sha256 = "0431dgplv5wiz8bj0ja91mbpc2qhjgdhqhrgaqarvyvjr1f7jw52"; fetchSubmodules = true; }); diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index 161384c3ad015..9f9593b2cf700 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "vulkan-tools"; - version = "1.2.182.0"; + version = "1.2.189.1"; # It's not strictly necessary to have matching versions here, however # since we're using the SDK version we may as well be consistent with @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Tools"; rev = "sdk-${version}"; - sha256 = "028l2l7jx4443k8207q8jmjq1mnnm9kgyl2417jrkrvylcbv8ji9"; + sha256 = "0izmzyj6gb51d71vbdjcgd9qw34aidvbmz0mg4bkc13n48w8s9vj"; }); nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/inputmethods/m17n-db/default.nix b/pkgs/tools/inputmethods/m17n-db/default.nix index 9344951dffe75..d24d1b44d8620 100644 --- a/pkgs/tools/inputmethods/m17n-db/default.nix +++ b/pkgs/tools/inputmethods/m17n-db/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gettext }: +{ lib, stdenv, fetchurl, gettext, gawk, bash }: stdenv.mkDerivation rec { pname = "m17n-db"; @@ -9,7 +9,10 @@ stdenv.mkDerivation rec { sha256 = "0vfw7z9i2s9np6nmx1d4dlsywm044rkaqarn7akffmb6bf1j6zv5"; }; - buildInputs = [ gettext ]; + nativeBuildInputs = [ gettext ]; + buildInputs = [ gettext gawk bash ]; + + strictDeps = true; configureFlags = lib.optional (stdenv ? glibc) "--with-charmaps=${stdenv.glibc.out}/share/i18n/charmaps" diff --git a/pkgs/tools/inputmethods/m17n-lib/default.nix b/pkgs/tools/inputmethods/m17n-lib/default.nix index c80f973631162..946d18a80ccc7 100644 --- a/pkgs/tools/inputmethods/m17n-lib/default.nix +++ b/pkgs/tools/inputmethods/m17n-lib/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, m17n_db}: +{ lib, stdenv, fetchurl, m17n_db, autoreconfHook, pkg-config }: stdenv.mkDerivation rec { pname = "m17n-lib"; version = "1.8.0"; @@ -8,6 +8,11 @@ stdenv.mkDerivation rec { sha256 = "0jp61y09xqj10mclpip48qlfhniw8gwy8b28cbzxy8hq8pkwmfkq"; }; + strictDeps = true; + + # reconf needed to sucesfully cross-compile + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ m17n_db ]; meta = { diff --git a/pkgs/tools/inputmethods/m17n-lib/otf.nix b/pkgs/tools/inputmethods/m17n-lib/otf.nix index f4d276e0a61dd..b0d30a58d48eb 100644 --- a/pkgs/tools/inputmethods/m17n-lib/otf.nix +++ b/pkgs/tools/inputmethods/m17n-lib/otf.nix @@ -1,22 +1,46 @@ -{ lib, stdenv, fetchurl, libXaw, freetype }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, autoreconfHook, libXaw, freetype }: stdenv.mkDerivation rec { - name = "libotf-0.9.16"; + pname = "libotf"; + version = "0.9.16"; src = fetchurl { - url = "https://download.savannah.gnu.org/releases/m17n/${name}.tar.gz"; + url = "https://download.savannah.gnu.org/releases/m17n/${pname}-${version}.tar.gz"; sha256 = "0sq6g3xaxw388akws6qrllp3kp2sxgk2dv4j79k6mm52rnihrnv8"; }; - outputs = [ "out" "dev" ]; + patches = [ + # https://salsa.debian.org/debian/libotf/-/tree/master/debian/patches + # Fix cross-compilation + (fetchpatch { + url = "https://salsa.debian.org/debian/libotf/-/raw/1be04cedf887720eb8f5efb3594dc2cefd96b1f1/debian/patches/0002-use-pkg-config-not-freetype-config.patch"; + sha256 = "sha256-VV9iGoNWIEie6UiLLTJBD+zxpvj0acgqkcBeAN1V6Kc="; + }) + # these 2 are required by the above patch + (fetchpatch { + url = "https://salsa.debian.org/debian/libotf/-/raw/1be04cedf887720eb8f5efb3594dc2cefd96b1f1/debian/patches/0001-do-not-add-flags-for-required-packages-to-pc-file.patch"; + sha256 = "sha256-3kzqNPAHNVJQ1F4fyifq3AqLdChWli/k7wOq+ha+iDs="; + }) + (fetchpatch { + url = "https://salsa.debian.org/debian/libotf/-/raw/1be04cedf887720eb8f5efb3594dc2cefd96b1f1/debian/patches/0001-libotf-config-modify-to-support-multi-arch.patch"; + sha256 = "sha256-SUlI87h+MtYWWtrAegzAnSds8JhxZwTJltDcj/se/Qc="; + }) + ]; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ libXaw freetype ]; - postInstall = - '' - mkdir -p $dev/bin - mv $out/bin/libotf-config $dev/bin/ - ''; + outputs = [ "out" "dev" ]; + + postInstall = '' + mkdir -p $dev/bin + mv $out/bin/libotf-config $dev/bin/ + substituteInPlace $dev/bin/libotf-config \ + --replace "pkg-config" "${pkg-config}/bin/pkg-config" + ''; meta = { homepage = "https://www.nongnu.org/m17n/"; diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index b75f31c617203..2f9db4c85cb43 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, dpkg, gawk, perl, wget, coreutils, util-linux -, gnugrep, gnutar, gnused, gzip, makeWrapper }: +, gnugrep, gnupg1, gnutar, gnused, gzip, makeWrapper }: # USAGE like this: debootstrap sid /tmp/target-chroot-directory # There is also cdebootstrap now. Is that easier to maintain? let binPath = lib.makeBinPath [ @@ -7,6 +7,7 @@ let binPath = lib.makeBinPath [ dpkg gawk gnugrep + gnupg1 gnused gnutar gzip diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index 8eeee269b07d7..37361abf2b2f3 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "snapper"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "openSUSE"; repo = "snapper"; rev = "v${version}"; - sha256 = "1gx3ichbkdqlzl7w187vc3xpmr9prmnp7as0h6ympgigradj5c7g"; + sha256 = "1ci5mdsph2n5cqad51zf4sank35yj741adsqy2gg7vqwxrhpm8mj"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 0c1cea4beed7d..15a0e0bdcda84 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "7.1.0"; + version = "8.0.0"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MGu0rQhNEaToPY4o9fz9E3RlvcLKjDq76Mqoq4UeL08="; + sha256 = "sha256-af1W2Iu9K7epl8EdNkdyHyhNQfH3MaWcNfP5ukDriLE="; }; - cargoSha256 = "sha256-Nx0Mw+V8Hgtioi77sk7p/lq6KGJQ3zRXWMNEIzT4Xn8="; + cargoSha256 = "sha256-HInvYDDqvkqewgIGd7nQYD+djH7lTc4vp3eVzg706+8="; buildInputs = lib.optional stdenv.isDarwin Foundation; diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 0d94861da2958..b94cc498fa09f 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.6.7"; + version = "1.6.9"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = version; - sha256 = "bhZrottFT5NX43Iz1wFGYzaUSAgvgkhOwNHX6fjUs7M="; + sha256 = "RoSj283fcllEbirZOScKRU4BKLoxgatDdL1qYZu+LEI="; }; postPatch = lib.optionalString (batchSize != null) '' diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix index 99751c00d99c9..aab524d77a285 100644 --- a/pkgs/tools/package-management/protontricks/default.nix +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -13,13 +13,13 @@ buildPythonApplication rec { pname = "protontricks"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "Matoking"; repo = pname; rev = version; - hash = "sha256-sbYIqVsuDZ2Htb6SVIe/gBA1UIvUzu4fjTjWQ7k1WFs="; + sha256 = "sha256-2ZOVcPCF1o8mNfHOWRFTjAEu0dWzaMxlMTcctn/ScxY="; }; patches = [ diff --git a/pkgs/tools/package-management/protontricks/steam-run.patch b/pkgs/tools/package-management/protontricks/steam-run.patch index 0144160c5af81..eead5ef6f49ed 100644 --- a/pkgs/tools/package-management/protontricks/steam-run.patch +++ b/pkgs/tools/package-management/protontricks/steam-run.patch @@ -1,5 +1,5 @@ diff --git a/src/protontricks/cli/main.py b/src/protontricks/cli/main.py -index 535ec9b..690c1f9 100755 +index d811cb7..a376a34 100755 --- a/src/protontricks/cli/main.py +++ b/src/protontricks/cli/main.py @@ -14,8 +14,8 @@ import sys @@ -48,7 +48,7 @@ index 535ec9b..690c1f9 100755 steam_app=steam_app, use_steam_runtime=use_steam_runtime, - legacy_steam_runtime_path=legacy_steam_runtime_path, - command=[winetricks_path, "--gui"], + command=[str(winetricks_path), "--gui"], use_bwrap=use_bwrap ) @@ -286,7 +276,6 @@ def main(args=None): @@ -57,7 +57,7 @@ index 535ec9b..690c1f9 100755 use_steam_runtime=use_steam_runtime, - legacy_steam_runtime_path=legacy_steam_runtime_path, use_bwrap=use_bwrap, - command=[winetricks_path] + args.winetricks_command) + command=[str(winetricks_path)] + args.winetricks_command) elif args.command: @@ -296,7 +285,6 @@ def main(args=None): steam_app=steam_app, @@ -68,10 +68,10 @@ index 535ec9b..690c1f9 100755 # Pass the command directly into the shell *without* # escaping it diff --git a/src/protontricks/steam.py b/src/protontricks/steam.py -index e898caf..7448d11 100644 +index be5322b..552f894 100644 --- a/src/protontricks/steam.py +++ b/src/protontricks/steam.py -@@ -12,8 +12,8 @@ from .util import lower_dict +@@ -12,8 +12,8 @@ from .util import lower_dict, is_flatpak_sandbox __all__ = ( "COMMON_STEAM_DIRS", "SteamApp", "find_steam_path", @@ -82,7 +82,7 @@ index e898caf..7448d11 100644 "find_proton_app", "get_steam_lib_paths", "get_compat_tool_dirs", "get_custom_compat_tool_installations_in_dir", "get_custom_compat_tool_installations", "find_current_steamid3", "get_appid_from_shortcut", -@@ -311,37 +311,6 @@ def find_steam_path(): +@@ -318,37 +318,6 @@ def find_steam_path(): return None, None @@ -275,7 +275,7 @@ index 5252d6c..f16dfec 100644 os.environ["PATH"] = "".join([ str(wine_bin_dir), os.pathsep, os.environ["PATH"] diff --git a/tests/cli/test_main.py b/tests/cli/test_main.py -index e6da0fb..46b9545 100644 +index f714f2c..b03fac1 100644 --- a/tests/cli/test_main.py +++ b/tests/cli/test_main.py @@ -116,15 +116,10 @@ class TestCLIRun: diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 472e7c9159487..82c6e8316367d 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-10-20"; + version = "2021-10-23"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-IHZpfUJA0h1dDkq3pp+x+gT9RSTMq9egHyXGi6ZmBP8="; + sha256 = "sha256-gNvpNs+fYETB3zKMX7pJbMEW79vH6yTX8LxvLHw9X3I="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index a935c302d4465..2364afc39ea7a 100644 --- a/pkgs/tools/security/kubescape/default.nix +++ b/pkgs/tools/security/kubescape/default.nix @@ -1,28 +1,47 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "kubescape"; - version = "1.0.126"; + version = "1.0.127"; src = fetchFromGitHub { owner = "armosec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kx7TgQ+ordlgYfnlt9/KkmTMUwfykGnTOEcTtq7EAYA="; + sha256 = "sha256-01k0FJNWrLnwOGa4JgQ/HKSJNgWAzmBUWFhdPi/yPY4="; }; + vendorSha256 = "sha256-cOxjsujlpRbdw4098eMHe2oNAJXWGjKbPeYpKt0DCp8="; - vendorSha256 = "sha256-u9Jo3/AdW+AhVe/5RwAPfLIjp+H1Omb1SlpctOEQB5Q="; + ldflags = [ "-s" "-w" "-X github.com/armosec/kubescape/clihandler/cmd.BuildNumber=v${version}" ]; - # One test is failing, disabling for now - doCheck = false; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + # Running kubescape to generate completions outputs error warnings + # but does not crash and completes successfully + # https://github.com/armosec/kubescape/issues/200 + installShellCompletion --cmd kubescape \ + --bash <($out/bin/kubescape completion bash) \ + --fish <($out/bin/kubescape completion fish) \ + --zsh <($out/bin/kubescape completion zsh) + ''; meta = with lib; { description = "Tool for testing if Kubernetes is deployed securely"; homepage = "https://github.com/armosec/kubescape"; + changelog = "https://github.com/armosec/kubescape/releases/tag/v${version}"; + longDescription = '' + Kubescape is the first open-source tool for testing if Kubernetes is + deployed securely according to multiple frameworks: regulatory, customized + company policies and DevSecOps best practices, such as the NSA-CISA and + the MITRE ATT&CK®. + Kubescape scans K8s clusters, YAML files, and HELM charts, and detect + misconfigurations and software vulnerabilities at early stages of the + CI/CD pipeline and provides a risk score instantly and risk trends over + time. Kubescape integrates natively with other DevOps tools, including + Jenkins, CircleCI and Github workflows. + ''; license = licenses.asl20; - maintainers = with maintainers; [ fab ]; + maintainers = with maintainers; [ fab jk ]; }; } diff --git a/pkgs/tools/security/sn0int/default.nix b/pkgs/tools/security/sn0int/default.nix index bdcfe6e28baca..42f8c8beaefc3 100644 --- a/pkgs/tools/security/sn0int/default.nix +++ b/pkgs/tools/security/sn0int/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "sn0int"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "kpcyrd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0BadgWZhP73WOVO18jtcdhsM0L7AM0TQ3PF7MNJM7M0="; + sha256 = "sha256-DsDSGF43yEyYYduRHu4+VRrPZ89Ce1fwtDxit0x8Apo="; }; - cargoSha256 = "sha256-KYrJIOaFX2wTDj4KeHn3d8wBHfVevCKQK/bDglfLWAU="; + cargoSha256 = "sha256-dXNIbngfwMVvLx4uSO6MWpSrZfUGhlggGvXHysYAJIE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/security/snowcat/default.nix b/pkgs/tools/security/snowcat/default.nix new file mode 100644 index 0000000000000..e6211caec5567 --- /dev/null +++ b/pkgs/tools/security/snowcat/default.nix @@ -0,0 +1,33 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "snowcat"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "praetorian-inc"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-EulQYGOMIh952e4Xp13hT/HMW3qP1QXYtt5PEej1VTY="; + }; + vendorSha256 = "sha256-D6ipwGMxT0B3uYUzg6Oo2TYnsOVBY0mYO5lC7vtVPc0="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + homepage = "https://github.com/praetorian-inc/snowcat"; + changelog = "https://github.com/praetorian-inc/snowcat/releases/tag/v${version}"; + description = "A tool to audit the istio service mesh"; + longDescription = '' + Snowcat gathers and analyzes the configuration of an Istio cluster and + audits it for potential violations of security best practices. + + There are two main modes of operation for Snowcat. With no positional + argument, Snowcat will assume it is running inside of a cluster enabled + with Istio, and begin to enumerate the required data. Optionally, you can + point snowcat at a directory containing Kubernets YAML files. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ jk ]; + }; +} diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index bc8dde743c8e2..8a3664b854771 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -11,13 +11,13 @@ assert systemdSupport -> stdenv.isLinux; stdenv.mkDerivation rec { pname = "htop"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "htop-dev"; repo = pname; rev = version; - sha256 = "sha256-/48Ca7JPzhPS4eYsPbwbSVcx9aS1f0LHcqsbNVWL+9k="; + sha256 = "JnpuBa09U086wWp0OtsDnStF4aLjhvtEj371u5XFtqc="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix index 791d779bf8333..3c130162ca156 100644 --- a/pkgs/tools/text/languagetool/default.nix +++ b/pkgs/tools/text/languagetool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "LanguageTool"; - version = "5.4"; + version = "5.5"; src = fetchzip { url = "https://www.languagetool.org/download/${pname}-${version}.zip"; - sha256 = "sha256-2khadADfzwkW+J0uafPWJ6xUQRSQDm8seiBHueQGmKI="; + sha256 = "sha256-v9p+G1aSzrvuoJLfRqWQXGVJ+2vysxdTgrD+ZUt6Yg4="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fdb08d8989e87..76de35caac941 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -620,6 +620,7 @@ mapAliases ({ owncloudclient = owncloud-client; # added 2016-08 ocz-ssd-guru = throw "ocz-ssd-guru has been removed due to there being no source available"; # added 2021-07-12 p11_kit = p11-kit; # added 2018-02-25 + packet-cli = metal-cli; # added 2021-10-25 paperless = paperless-ng; # added 2021-06-06 parity = openethereum; # added 2020-08-01 parquet-cpp = arrow-cpp; # added 2018-09-08 @@ -775,6 +776,7 @@ mapAliases ({ qt-3 = throw "qt-3 has been removed from nixpkgs, as it's unmaintained and insecure"; # added 2021-02-15 rfkill = throw "rfkill has been removed, as it's included in util-linux"; # added 2020-08-23 riak-cs = throw "riak-cs is not maintained anymore"; # added 2020-10-14 + ring-daemon = jami-daemon; #added 2021-10-26 radare2-cutter = cutter; # added 2021-03-30 redkite = throw "redkite was archived by upstream"; # added 2021-04-12 rkt = throw "rkt was archived by upstream"; # added 2020-05-16 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fad6cdb25d07a..f111f9dbd7d48 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1453,6 +1453,8 @@ with pkgs; bic = callPackage ../development/interpreters/bic { }; + binance = callPackage ../applications/misc/binance { }; + bit = callPackage ../applications/version-management/git-and-tools/bit { }; bitwarden = callPackage ../tools/security/bitwarden { }; @@ -1721,6 +1723,8 @@ with pkgs; glasgow = with python3Packages; toPythonApplication glasgow; + gmid = callPackage ../servers/gemini/gmid { }; + gmni = callPackage ../applications/networking/browsers/gmni { }; gmnisrv = callPackage ../servers/gemini/gmnisrv { }; @@ -3400,6 +3404,8 @@ with pkgs; pn = callPackage ../tools/text/pn { }; + pocket-casts = callPackage ../applications/audio/pocket-casts { }; + poweralertd = callPackage ../tools/misc/poweralertd { }; ps_mem = callPackage ../tools/system/ps_mem { }; @@ -3477,6 +3483,8 @@ with pkgs; snippetpixie = callPackage ../tools/text/snippetpixie { }; + snowcat = callPackage ../tools/security/snowcat { }; + socklog = callPackage ../tools/system/socklog { }; soju = callPackage ../applications/networking/soju { }; @@ -8150,6 +8158,8 @@ with pkgs; opentracker = callPackage ../applications/networking/p2p/opentracker { }; + alttpr-opentracker = callPackage ../tools/games/opentracker { }; + opentsdb = callPackage ../tools/misc/opentsdb {}; inherit (callPackages ../tools/networking/openvpn {}) @@ -9852,6 +9862,8 @@ with pkgs; thicket = callPackage ../applications/version-management/git-and-tools/thicket { }; + thiefmd = callPackage ../applications/editors/thiefmd { }; + thin-provisioning-tools = callPackage ../tools/misc/thin-provisioning-tools { }; thinkpad-scripts = python3.pkgs.callPackage ../tools/misc/thinkpad-scripts { }; @@ -27150,7 +27162,7 @@ with pkgs; packet-sd = callPackage ../development/tools/packet-sd { }; - packet-cli = callPackage ../development/tools/packet-cli { }; + metal-cli = callPackage ../development/tools/metal-cli { }; pb_cli = callPackage ../tools/misc/pb_cli {}; @@ -29220,6 +29232,8 @@ with pkgs; yoshimi = callPackage ../applications/audio/yoshimi { }; + your-editor = callPackage ../applications/editors/your-editor { }; + youtube-dl = with python3Packages; toPythonApplication youtube-dl; youtube-dl-light = with python3Packages; toPythonApplication youtube-dl-light; @@ -32662,6 +32676,8 @@ with pkgs; thrift = thrift-0_10; }; + seafile-server = callPackage ../servers/seafile-server { }; + seafile-shared = callPackage ../misc/seafile-shared { }; ser2net = callPackage ../servers/ser2net {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 276facab0baef..f355534dc77ea 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2110,6 +2110,8 @@ in { django-filter = callPackage ../development/python-modules/django-filter { }; + django-formtools = callPackage ../development/python-modules/django-formtools { }; + django-gravatar2 = callPackage ../development/python-modules/django-gravatar2 { }; django_guardian = callPackage ../development/python-modules/django_guardian { }; @@ -2179,6 +2181,8 @@ in { django-sr = callPackage ../development/python-modules/django-sr { }; + django-statici18n = callPackage ../development/python-modules/django-statici18n { }; + django-storages = callPackage ../development/python-modules/django-storages { }; django_tagging = callPackage ../development/python-modules/django_tagging { }; @@ -3728,6 +3732,8 @@ in { inquirer = callPackage ../development/python-modules/inquirer { }; + insegel = callPackage ../development/python-modules/insegel { }; + intake = callPackage ../development/python-modules/intake { }; intake-parquet = callPackage ../development/python-modules/intake-parquet { }; @@ -6505,6 +6511,8 @@ in { pylev = callPackage ../development/python-modules/pylev { }; + pylgnetcast = callPackage ../development/python-modules/pylgnetcast { }; + pylibacl = callPackage ../development/python-modules/pylibacl { }; pylibconfig2 = callPackage ../development/python-modules/pylibconfig2 { }; @@ -6952,6 +6960,8 @@ in { pysdl2 = callPackage ../development/python-modules/pysdl2 { }; + pysearpc = toPythonModule pkgs.libsearpc; + pysendfile = callPackage ../development/python-modules/pysendfile { }; pysensors = callPackage ../development/python-modules/pysensors { }; @@ -7620,6 +7630,8 @@ in { pytimeparse = callPackage ../development/python-modules/pytimeparse { }; + pytm = callPackage ../development/python-modules/pytm { }; + pytmx = callPackage ../development/python-modules/pytmx { }; pytoml = callPackage ../development/python-modules/pytoml { }; @@ -8313,6 +8325,10 @@ in { seabreeze = callPackage ../development/python-modules/seabreeze { }; + seahub = callPackage ../development/python-modules/seahub { }; + + seaserv = toPythonModule pkgs.seafile-server; + seccomp = callPackage ../development/python-modules/seccomp { }; secp256k1 = callPackage ../development/python-modules/secp256k1 { @@ -8450,6 +8466,8 @@ in { simplekml = callPackage ../development/python-modules/simplekml { }; + simple_di = callPackage ../development/python-modules/simple_di { }; + simple-rest-client = callPackage ../development/python-modules/simple-rest-client { }; simple-salesforce = callPackage ../development/python-modules/simple-salesforce { }; |