Merge master into staging-next

This commit is contained in:
github-actions[bot]
2023-12-07 18:00:57 +00:00
committed by GitHub
2333 changed files with 3249 additions and 874 deletions
+6
View File
@@ -12002,6 +12002,12 @@
githubId = 9799623;
name = "Rick van Schijndel";
};
mindstorms6 = {
email = "breland@bdawg.org";
github = "mindstorms6";
githubId = 92937;
name = "Breland Miley";
};
minijackson = {
email = "minijackson@riseup.net";
github = "minijackson";
@@ -34,7 +34,7 @@ let
# copy additional plugin(s), theme(s) and language(s)
${concatStringsSep "\n" (mapAttrsToList (name: theme: "cp -r ${theme} $out/share/wordpress/wp-content/themes/${name}") cfg.themes)}
${concatStringsSep "\n" (mapAttrsToList (name: plugin: "cp -r ${plugin} $out/share/wordpress/wp-content/plugins/${name}") cfg.plugins)}
${concatMapStringsSep "\n" (language: "cp -r ${language}/* $out/share/wordpress/wp-content/languages/") cfg.languages}
${concatMapStringsSep "\n" (language: "cp -r ${language} $out/share/wordpress/wp-content/languages/") cfg.languages}
'';
};
@@ -25,11 +25,11 @@
stdenv.mkDerivation rec {
pname = if withGui then "bitcoin-knots" else "bitcoind-knots";
version = "23.0.knots20220529";
version = "25.1.knots20231115";
src = fetchurl {
url = "https://bitcoinknots.org/files/23.x/${version}/bitcoin-${version}.tar.gz";
sha256 = "0c6l4bvj4ck8gp5vm4dla3l32swsp6ijk12fyf330wgry4mhqxyi";
url = "https://bitcoinknots.org/files/25.x/${version}/bitcoin-${version}.tar.gz";
sha256 = "b6251beee95cf6701c6ebc443b47fb0e99884880f2661397f964a8828add4002";
};
nativeBuildInputs =
@@ -32,20 +32,6 @@ lib.makeScope pkgs.newScope (self:
fetchFromSavannah;
};
emacs28 = callPackage (self.sources.emacs28) inheritedArgs;
emacs28-gtk2 = self.emacs28.override {
withGTK2 = true;
};
emacs28-gtk3 = self.emacs28.override {
withGTK3 = true;
};
emacs28-nox = pkgs.lowPrio (self.emacs28.override {
noGui = true;
});
emacs29 = callPackage (self.sources.emacs29) inheritedArgs;
emacs29-gtk3 = self.emacs29.override {
@@ -60,7 +46,5 @@ lib.makeScope pkgs.newScope (self:
withPgtk = true;
};
emacs28-macport = callPackage (self.sources.emacs28-macport) inheritedArgs;
emacs29-macport = callPackage (self.sources.emacs29-macport) inheritedArgs;
})
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "emacspeak";
version = "56.0";
version = "58.0";
src = fetchFromGitHub {
owner = "tvraman";
repo = pname;
rev = version;
hash= "sha256-juy+nQ7DrG818/uTH6Dv/lrrzu8qzPWwi0sX7JrhHK8=";
hash= "sha256-5pWC17nvy3ZuG0bR//LqDVpKsH5hFSFf63Q33a1BfBk=";
};
nativeBuildInputs = [
@@ -67,14 +67,6 @@ let
};
in
{
emacs28 = import ./make-emacs.nix (mkArgs {
pname = "emacs";
version = "28.2";
variant = "mainline";
rev = "28.2";
hash = "sha256-4oSLcUDR0MOEt53QOiZSVU8kPJ67GwugmBxdX3F15Ag=";
});
emacs29 = import ./make-emacs.nix (mkArgs {
pname = "emacs";
version = "29.1";
@@ -83,14 +75,6 @@ in
hash = "sha256-3HDCwtOKvkXwSULf3W7YgTz4GV8zvYnh2RrL28qzGKg=";
});
emacs28-macport = import ./make-emacs.nix (mkArgs {
pname = "emacs-mac";
version = "28.2";
variant = "macport";
rev = "emacs-28.2-mac-9.1";
hash = "sha256-Ne2jQ2nVLNiQmnkkOXVc5AkLVkTpm8pFC7VNY2gQjPE=";
});
emacs29-macport = import ./make-emacs.nix (mkArgs {
pname = "emacs-mac";
version = "29.1";
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "clipcat";
version = "0.11.0";
version = "0.13.0";
src = fetchFromGitHub {
owner = "xrelkd";
repo = pname;
rev = "v${version}";
hash = "sha256-6L6u8inHkiEz7lp3T0a237z3JQwGDWKXtTBVNIKct64=";
hash = "sha256-BpJI6IseQpAHrdZ+rbh9Ar8HhAVD6grdM2tpviKd51c=";
};
cargoHash = "sha256-uzIqIGjCZEmChM3uVAnAp7eTIznTLXW/4t+NVoryjtk=";
cargoHash = "sha256-BcqrQ4oUZazTSVtaAPgNKmLxhBbxR+sfpFFD1WiYP40=";
nativeBuildInputs = [
protobuf
@@ -17,13 +17,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lagrange";
version = "1.17.4";
version = "1.17.5";
src = fetchFromGitHub {
owner = "skyjake";
repo = "lagrange";
rev = "v${finalAttrs.version}";
hash = "sha256-vzdlcyA+RCr8RH0KbTiUah8lS++Xq6gLCHbgHHBFEig=";
hash = "sha256-q50r0jH7opIh3r08jAwYmFWl1e/x9qVL+mUEf8JVfuc=";
};
nativeBuildInputs = [ cmake pkg-config zip ];
@@ -14,16 +14,17 @@
let
package = buildGoModule rec {
pname = "opentofu";
version = "1.6.0-beta1";
version = "1.6.0-beta2";
src = fetchFromGitHub {
owner = "opentofu";
repo = "opentofu";
rev = "v${version}";
hash = "sha256-bOZzMraJ1Bc5CauYkJLH4riCOhAbZlXh9TdBjJsp4Ds=";
hash = "sha256-zUMRjUcFIgLgNcUp+I48dDyncI4cjup4+HMXxxJdXU4=";
};
vendorHash = "sha256-T67VFtAsw6Dn+Ma0znwaa53GvzmrNLFoU17rCeJehKw=";
ldflags = [ "-s" "-w" ];
vendorHash = "sha256-kSm5RZqQRgbmPaKt5IWmuMhHwAu+oJKTX1q1lbE7hWk=";
ldflags = [ "-s" "-w" "-X" "github.com/opentofu/opentofu/version.dev=no" ];
postConfigure = ''
# speakeasy hardcodes /bin/stty https://github.com/bgentry/speakeasy/issues/22
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "rke2";
version = "1.28.2+rke2r1";
version = "1.28.3+rke2r1";
src = fetchFromGitHub {
owner = "rancher";
repo = pname;
rev = "v${version}";
hash = "sha256-PkBnM6mKE90e8VZ3QHYp2mM4RgD9u1gNjFea3RaPGy0=";
hash = "sha256-0a659XE/Pg8g5Ui3ugUQeFnXJiWqkPbvhtdpLp4/5i8=";
};
vendorHash = "sha256-aW8en8KJsPITKT4fIyhhtLiYdk+98iL14wQXG4HsM3U=";
vendorHash = "sha256-Kexu3l4iV8bIIFFae0KVypy2bTKwtl5ibEDQ7YP0JK0=";
postPatch = ''
# Patch the build scripts so they work in the Nix build environment.
@@ -1,9 +0,0 @@
{
"version": "1.11.30-sc.2",
"rev": "v1.11.30-sc.2",
"srcHash": "1qb1fcr52gyzxndz3j77vn3ddwjpxwvicnh16c72zpzpfbbky7a5",
"webYarnHash": "0bg5vc7q8afqfpsaqqkczf9whbzici5d2bxj5cadhrlmlb27f8nx",
"jsSdkYarnHash": "0p1whh3pmqz170l542fiq3zgljl5daa9b96i59p3wvggnx7kny7j",
"reactSdkYarnHash": "02ysshiyjj3w00b628is9bd7i8qc3vc8kr1zam2dpj26lb9k5pdd",
"desktopYarnHash": "16pzmlwzf3z8mky3wb4azaiggigyfnpxmbq3irjp30ic6yhl50yw"
}
@@ -1,131 +0,0 @@
{ lib
, element-desktop # for seshat and keytar
, schildichat-web
, stdenv
, fetchFromGitHub
, makeWrapper
, makeDesktopItem
, copyDesktopItems
, fetchYarnDeps
, yarn
, nodejs
, prefetch-yarn-deps
, electron
, Security
, AppKit
, CoreServices
, sqlcipher
}:
let
pinData = lib.importJSON ./pin.json;
executableName = "schildichat-desktop";
in
stdenv.mkDerivation rec {
pname = "schildichat-desktop";
inherit (pinData) version;
src = fetchFromGitHub {
owner = "SchildiChat";
repo = "schildichat-desktop";
inherit (pinData) rev;
sha256 = pinData.srcHash;
fetchSubmodules = true;
};
offlineCache = fetchYarnDeps {
yarnLock = src + "/element-desktop/yarn.lock";
sha256 = pinData.desktopYarnHash;
};
nativeBuildInputs = [ yarn prefetch-yarn-deps nodejs makeWrapper copyDesktopItems ];
inherit (element-desktop) seshat keytar;
configurePhase = ''
runHook preConfigure
export HOME=$(mktemp -d)
pushd element-desktop
yarn config --offline set yarn-offline-mirror $offlineCache
fixup-yarn-lock yarn.lock
yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
rm -rf node_modules/matrix-seshat node_modules/keytar
ln -s $keytar node_modules/keytar
ln -s $seshat node_modules/matrix-seshat
patchShebangs node_modules/
popd
runHook postConfigure
'';
# Only affects unused scripts in $out/share/element/electron/scripts. Also
# breaks because there are some `node`-scripts with a `npx`-shebang and
# this shouldn't be in the closure just for unused scripts.
dontPatchShebangs = true;
buildPhase = ''
runHook preBuild
pushd element-desktop
yarn --offline run build:ts
yarn --offline run i18n
yarn --offline run build:res
popd
runHook postBuild
'';
installPhase = ''
runHook preInstall
# resources
mkdir -p "$out/share/element"
ln -s '${schildichat-web}' "$out/share/element/webapp"
mv element-desktop "$out/share/element/electron"
cp -r "$out/share/element/electron/res/img" "$out/share/element"
cp $out/share/element/electron/lib/i18n/strings/en_EN.json $out/share/element/electron/lib/i18n/strings/en-us.json
ln -s $out/share/element/electron/lib/i18n/strings/en{-us,}.json
# icons
for icon in $out/share/element/electron/build/icons/*.png; do
mkdir -p "$out/share/icons/hicolor/$(basename $icon .png)/apps"
ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png)/apps/schildichat.png"
done
# executable wrapper
# LD_PRELOAD workaround for sqlcipher not found: https://github.com/matrix-org/seshat/issues/102
makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \
--set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \
--add-flags "$out/share/element/electron" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
runHook postInstall
'';
# The desktop item properties should be kept in sync with data from upstream:
# https://github.com/schildichat/element-desktop/blob/sc/package.json
desktopItems = [
(makeDesktopItem {
name = "schildichat-desktop";
exec = "${executableName} %u";
icon = "schildichat";
desktopName = "SchildiChat";
genericName = "Matrix Client";
comment = meta.description;
categories = [ "Network" "InstantMessaging" "Chat" ];
startupWMClass = "schildichat";
mimeTypes = [ "x-scheme-handler/element" ];
})
];
passthru.updateScript = ./update.sh;
meta = with lib; {
description = "Matrix client / Element Desktop fork";
homepage = "https://schildi.chat/";
changelog = "https://github.com/SchildiChat/schildichat-desktop/releases";
maintainers = teams.matrix.members ++ (with maintainers; [ kloenk yuka ]);
license = licenses.asl20;
platforms = platforms.all;
};
}
@@ -1,113 +0,0 @@
{ stdenv, lib
, fetchFromGitHub
, fetchYarnDeps
, nodejs
, yarn
, prefetch-yarn-deps
, writeText, jq, conf ? {}
}:
let
pinData = lib.importJSON ./pin.json;
noPhoningHome = {
disable_guests = true; # disable automatic guest account registration at matrix.org
};
configOverrides = writeText "element-config-overrides.json" (builtins.toJSON (noPhoningHome // conf));
in stdenv.mkDerivation rec {
pname = "schildichat-web";
inherit (pinData) version;
src = fetchFromGitHub {
owner = "SchildiChat";
repo = "schildichat-desktop";
inherit (pinData) rev;
sha256 = pinData.srcHash;
fetchSubmodules = true;
};
webOfflineCache = fetchYarnDeps {
yarnLock = src + "/element-web/yarn.lock";
sha256 = pinData.webYarnHash;
};
jsSdkOfflineCache = fetchYarnDeps {
yarnLock = src + "/matrix-js-sdk/yarn.lock";
sha256 = pinData.jsSdkYarnHash;
};
reactSdkOfflineCache = fetchYarnDeps {
yarnLock = src + "/matrix-react-sdk/yarn.lock";
sha256 = pinData.reactSdkYarnHash;
};
nativeBuildInputs = [ yarn prefetch-yarn-deps jq nodejs ];
configurePhase = ''
runHook preConfigure
export HOME=$PWD/tmp
# with the update of openssl3, some key ciphers are not supported anymore
# this flag will allow those codecs again as a workaround
# see https://medium.com/the-node-js-collection/node-js-17-is-here-8dba1e14e382#5f07
# and https://github.com/vector-im/element-web/issues/21043
export NODE_OPTIONS=--openssl-legacy-provider
mkdir -p $HOME
pushd element-web
fixup-yarn-lock yarn.lock
yarn config --offline set yarn-offline-mirror $webOfflineCache
yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
patchShebangs node_modules
rm -rf node_modules/matrix-react-sdk
ln -s $PWD/../matrix-react-sdk node_modules/
rm -rf node_modules/matrix-js-sdk
ln -s $PWD/../matrix-js-sdk node_modules/
popd
pushd matrix-js-sdk
fixup-yarn-lock yarn.lock
yarn config --offline set yarn-offline-mirror $jsSdkOfflineCache
yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
patchShebangs node_modules
popd
pushd matrix-react-sdk
fixup-yarn-lock yarn.lock
yarn config --offline set yarn-offline-mirror $reactSdkOfflineCache
yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
patchShebangs node_modules scripts
popd
runHook postConfigure
'';
buildPhase = ''
runHook preBuild
pushd element-web
export VERSION=${version}
yarn build:res --offline
yarn build:module_system --offline
yarn build:bundle --offline
popd
runHook postBuild
'';
installPhase = ''
runHook preInstall
mv element-web/webapp $out
jq -s '.[0] * .[1]' "configs/sc/config.json" "${configOverrides}" > "$out/config.json"
runHook postInstall
'';
meta = with lib; {
description = "Matrix client / Element Web fork";
homepage = "https://schildi.chat/";
changelog = "https://github.com/SchildiChat/schildichat-desktop/releases";
maintainers = teams.matrix.members ++ (with maintainers; [ kloenk yuka ]);
license = licenses.asl20;
platforms = platforms.all;
};
}
@@ -1,43 +0,0 @@
#!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=../../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-git jq
if [[ "$#" -gt 2 || "$1" == -* ]]; then
echo "Regenerates packaging data for the SchildiChat packages."
echo "Usage: $0 [git revision or tag] [version string override]"
exit 1
fi
rev="$1"
version="$2"
set -euo pipefail
if [ -z "$rev" ]; then
rev="$(wget -O- "https://api.github.com/repos/SchildiChat/schildichat-desktop/releases?per_page=1" | jq -r '.[0].tag_name')"
fi
if [ -z "$version" ]; then
# strip leading "v"
version="${rev#v}"
fi
src_data=$(nix-prefetch-git https://github.com/SchildiChat/schildichat-desktop --fetch-submodules --rev $rev)
src=$(echo $src_data | jq -r .path)
src_hash=$(echo $src_data | jq -r .sha256)
web_yarn_hash=$(prefetch-yarn-deps $src/element-web/yarn.lock)
desktop_yarn_hash=$(prefetch-yarn-deps $src/element-desktop/yarn.lock)
js_sdk_yarn_hash=$(prefetch-yarn-deps $src/matrix-js-sdk/yarn.lock)
react_sdk_yarn_hash=$(prefetch-yarn-deps $src/matrix-react-sdk/yarn.lock)
cat > pin.json << EOF
{
"version": "$version",
"rev": "$rev",
"srcHash": "$src_hash",
"webYarnHash": "$web_yarn_hash",
"jsSdkYarnHash": "$js_sdk_yarn_hash",
"reactSdkYarnHash": "$react_sdk_yarn_hash",
"desktopYarnHash": "$desktop_yarn_hash"
}
EOF
@@ -1,12 +1,17 @@
{ callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {
signal-desktop = {
{ callPackage, stdenv }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {
signal-desktop = rec {
dir = "Signal";
version = "6.40.0";
version-aarch64 = "6.40.0";
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
url-aarch64 = "https://github.com/0mniteck/Signal-Desktop-Mobian/raw/${version-aarch64}/builds/release/signal-desktop_${version-aarch64}_arm64.deb";
hash = "sha256-vyXHlycPSyEyv938IKzGM6pdERHHerx2CLY/U+WMrH4=";
hash-aarch64 = "sha256-3Pi0c+CGcJR1M4ll51m+B5PmGIcIjjlc0qa9b8rkMeU=";
};
signal-desktop-beta = {
signal-desktop-beta = rec {
dir = "Signal Beta";
version = "6.40.0-beta.2";
hash = "sha256-pfedkxbZ25DFgz+/N7ZEb9LwKrHuoMM+Zi+Tc21QPsg=";
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb";
};
}
@@ -1,7 +1,11 @@
{ pname
, dir
, version
, version-aarch64 ? ""
, hash
, hash-aarch64 ? ""
, url
, url-aarch64 ? ""
, stdenv
, lib
, fetchurl
@@ -51,8 +55,15 @@
, wayland
}:
stdenv.mkDerivation rec {
inherit pname version; # Please backport all updates to the stable channel.
let
inherit (stdenv) targetPlatform;
ARCH = if targetPlatform.isAarch64 then "arm64" else "x64";
final-version = if targetPlatform.isAarch64 then version-aarch64 else version;
in stdenv.mkDerivation rec {
inherit pname;
version = final-version;
# Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@@ -61,8 +72,8 @@ stdenv.mkDerivation rec {
# few additional steps and might not be the best idea.)
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/s/${pname}/${pname}_${version}_amd64.deb";
inherit hash;
url = if targetPlatform.isAarch64 then url-aarch64 else url;
hash = if targetPlatform.isAarch64 then hash-aarch64 else hash;
};
nativeBuildInputs = [
@@ -163,7 +174,7 @@ stdenv.mkDerivation rec {
${if pname == "signal-desktop" then "--replace \"bin/signal-desktop\" \"bin/signal-desktop --use-tray-icon\"" else ""}
autoPatchelf --no-recurse -- "$out/lib/${dir}/"
patchelf --add-needed ${libpulseaudio}/lib/libpulse.so "$out/lib/${dir}/resources/app.asar.unpacked/node_modules/@signalapp/ringrtc/build/linux/libringrtc-x64.node"
patchelf --add-needed ${libpulseaudio}/lib/libpulse.so "$out/lib/${dir}/resources/app.asar.unpacked/node_modules/@signalapp/ringrtc/build/linux/libringrtc-${ARCH}.node"
'';
# Tests if the application launches and waits for "Link your phone to Signal Desktop":
@@ -176,11 +187,11 @@ stdenv.mkDerivation rec {
"Signal Android" or "Signal iOS" app.
'';
homepage = "https://signal.org/";
changelog = "https://github.com/signalapp/Signal-Desktop/releases/tag/v${version}";
changelog = "https://github.com/signalapp/Signal-Desktop/releases/tag/v${final-version}";
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ mic92 equirosa urandom ];
maintainers = with lib.maintainers; [ mic92 equirosa urandom bkchr ];
mainProgram = pname;
platforms = [ "x86_64-linux" ];
platforms = if builtins.stringLength version-aarch64 > 0 then [ "x86_64-linux" "aarch64-linux" ] else [ "x86_64-linux" ];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
};
}
+5 -5
View File
@@ -23,16 +23,16 @@
stdenv.mkDerivation rec {
pname = "planify";
version = "4.1.1";
version = "4.1.4";
src = fetchFromGitHub {
owner = "alainm23";
repo = "planify";
# The commit is named as "Release 4.1.1", published to Flathub, but not tags
# https://github.com/flathub/io.github.alainm23.planify/commit/2a353ccfcf3379add6778d569f49da37f40accfa
# The commit is named as "Release 4.1.4", published to Flathub, but not tags
# https://github.com/flathub/io.github.alainm23.planify/commit/f345f81b55e4638bc6605e0bf9d15a057b846252
# https://github.com/alainm23/planify/issues/1002
rev = "adf3629bcacfc9978f6dde5b87eff0278533ab3e";
hash = "sha256-xqklvSYmqBQ+IQ3lRjMbV4W4vD/rLCln7rBVCbYiBGo=";
rev = "73fd6cb7acfc60937d1403238c255736b97aa94b";
hash = "sha256-K3QFFpq2MJxK34Uh0qFyaSGeTPTZbwIVYkosFUrhflQ=";
};
nativeBuildInputs = [
@@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
version = "11.1.0.11711";
src = if useChineseVersion then fetchurl {
url = "https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2019/${lib.last (lib.splitString "." version)}/wps-office_${version}_amd64.deb";
url = "https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2019/${lib.last (lib.splitVersion version)}/wps-office_${version}_amd64.deb";
hash = "sha256-JHSTZZnOZoTpj8zF4C5PmjTkftEdxbeaqweY3ITiJto=";
} else fetchurl {
url = "https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${lib.last (lib.splitString "." version)}/wps-office_${version}.XA_amd64.deb";
url = "https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${lib.last (lib.splitVersion version)}/wps-office_${version}.XA_amd64.deb";
hash = "sha256-2apkSE/8Wm6/OQ4x5n1PE1emhovqOgD0NVTY5QZZTYA=";
};
+3 -3
View File
@@ -17,16 +17,16 @@
rustPlatform.buildRustPackage rec {
pname = "eza";
version = "0.16.2";
version = "0.16.3";
src = fetchFromGitHub {
owner = "eza-community";
repo = "eza";
rev = "v${version}";
hash = "sha256-AqOvhi/26Nl3ex6iJ9DxC/jMdgZ331VdrJTsjBrc490=";
hash = "sha256-DD9Ae397i1+rUPSyCSoPn66ZRy3WbbX/ZOIii3J60VU=";
};
cargoHash = "sha256-1hZZvXOV6towMVpnlf4P8jZei2pAZTKAfi362RKL+Jo=";
cargoHash = "sha256-U0smzRUkJOFKrdW4bHY3OT8/MJ74MH2dFnrPVXzqcXk=";
nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ];
buildInputs = [ zlib ]
+3 -3
View File
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "fortune-kind";
version = "0.1.11";
version = "0.1.12";
src = fetchFromGitHub {
owner = "cafkafk";
repo = "fortune-kind";
rev = "v${version}";
hash = "sha256-sk1Gj+QgU9eUjRySHsJTfM/tUcyLdqOxycAdrBPUSmg=";
hash = "sha256-1abke8wPvIFTmvEJ83TdfONFPBuJHbgmVHAoKddoTRw=";
};
cargoHash = "sha256-u2CwBV2sz2EIqwUR+sJ+xyvAIyoq3ujkx39e/Bq2V8s=";
cargoHash = "sha256-SRPhALRGkFZDl23Om/obg1Crd9yNXroN7F/7agobuqw=";
nativeBuildInputs = [ makeBinaryWrapper installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
+34
View File
@@ -0,0 +1,34 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "rita";
version = "4.8.0";
src = fetchFromGitHub {
owner = "activecm";
repo = "rita";
rev = "refs/tags/v${version}";
hash = "sha256-w86fGRH9pIqONgvdYpsHDNkE0BAuhzArET+NLIpRg/w=";
};
vendorHash = "sha256-KyC7VPgWlgKD6KWWRo3hFQHl2HjTub+VSMtJCpYE6Zk=";
ldflags = [
"-s"
"-w"
"-X=github.com/activecm/rita/config.Version=${version}"
"-X=github.com/activecm/rita/config.ExactVersion=${version}"
];
meta = with lib; {
description = "Framework for detecting command and control communication through network traffic analysis";
homepage = "https://github.com/activecm/rita";
changelog = "https://github.com/activecm/rita/releases/tag/v${version}";
license = licenses.gpl3Only;
maintainers = with maintainers; [ fab ];
mainProgram = "rita";
};
}
@@ -29,17 +29,20 @@ let
cryptography
pynacl
netifaces
netaddr
ifaddr
qrcode
]);
in
stdenv.mkDerivation rec {
pname = "warpinator";
version = "1.6.4";
version = "1.8.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-BKptTQbSBTQyc5V6WWdsPdC76sH0CFMXOyahfRmvQzc=";
hash = "sha256-dxbs2Qq1Ix04yIA587tntLJ3W/pnA0wTiQ4BB5GCTR0=";
};
nativeBuildInputs = [
@@ -60,6 +63,7 @@ stdenv.mkDerivation rec {
];
mesonFlags = [
"-Dbundle-grpc=false"
"-Dbundle-zeroconf=false"
];
@@ -0,0 +1,46 @@
{ lib
, fetchFromGitHub
, tcl
, tcllib
}:
tcl.mkTclDerivation rec {
pname = "critcl";
version = "3.2";
src = fetchFromGitHub {
owner = "andreas-kupries";
repo = "critcl";
rev = version;
hash = "sha256-IxScn9ZTlqD9mG9VJLG+TtplLFhhahOiFhQCjxp22Uk=";
};
buildInputs = [
tcl
tcllib
];
dontBuild = true;
doCheck = true;
checkPhase = ''
runHook preInstall
HOME="$(mktemp -d)" tclsh ./build.tcl test
runHook postInstall
'';
installPhase = ''
runHook preInstall
tclsh ./build.tcl install --prefix $out
runHook postInstall
'';
meta = with lib; {
description = "Easily embed C code in Tcl";
homepage = "https://andreas-kupries.github.io/critcl/";
license = licenses.tcltk;
mainProgram = "critcl";
maintainers = with maintainers; [ fgaz ];
platforms = platforms.all;
};
}
@@ -47,35 +47,21 @@ final: prev: let
./hooks/mark-for-cudatoolkit-root-hook.sh)
{ });
# Normally propagated by cuda_nvcc or cudatoolkit through their depsHostHostPropagated
# Currently propagated by cuda_nvcc or cudatoolkit, rather than used directly
setupCudaHook = (final.callPackage
({ makeSetupHook, backendStdenv }:
makeSetupHook
{
name = "setup-cuda-hook";
substitutions.setupCudaHook = placeholder "out";
# Point NVCC at a compatible compiler
substitutions.ccRoot = "${backendStdenv.cc}";
# Required in addition to ccRoot as otherwise bin/gcc is looked up
# when building CMakeCUDACompilerId.cu
substitutions.ccFullPath = "${backendStdenv.cc}/bin/${backendStdenv.cc.targetPrefix}c++";
# Required by cmake's enable_language(CUDA) to build a test program
# When implementing cross-compilation support: this is
# final.pkgs.targetPackages.cudaPackages.cuda_cudart
# Given the multiple-outputs each CUDA redist has, we can specify the exact components we
# need from the package. CMake requires:
# - the cuda_runtime.h header, which is in the dev output
# - the dynamic library, which is in the lib output
# - the static library, which is in the static output
substitutions.cudartFlags = let cudart = final.cuda_cudart; in
builtins.concatStringsSep " " (final.lib.optionals (final ? cuda_cudart) ([
"-I${final.lib.getDev cudart}/include"
"-L${final.lib.getLib cudart}/lib"
] ++ final.lib.optionals (builtins.elem "static" cudart.outputs) [
"-L${cudart.static}/lib"
]));
}
./hooks/setup-cuda-hook.sh)
{ });
@@ -1,8 +1,14 @@
# shellcheck shell=bash
# Should we mimick cc-wrapper's "hygiene"?
[[ -z ${strictDeps-} ]] || (( "$hostOffset" < 0 )) || return 0
echo "Sourcing mark-for-cudatoolkit-root-hook" >&2
markForCUDAToolkit_ROOT() {
mkdir -p "${prefix}/nix-support"
touch "${prefix}/nix-support/include-in-cudatoolkit-root"
[[ -f "${prefix}/nix-support/include-in-cudatoolkit-root" ]] && return
echo "$pname-$output" > "${prefix}/nix-support/include-in-cudatoolkit-root"
}
fixupOutputHooks+=(markForCUDAToolkit_ROOT)
@@ -1,5 +0,0 @@
# shellcheck shell=bash
# CMake's enable_language(CUDA) runs a compiler test and it doesn't account for
# CUDAToolkit_ROOT. We have to help it locate libcudart
export NVCC_APPEND_FLAGS+=" -L@cudartLib@/lib -L@cudartStatic@/lib -I@cudartInclude@/include"
@@ -3,19 +3,57 @@
# Only run the hook from nativeBuildInputs
(( "$hostOffset" == -1 && "$targetOffset" == 0)) || return 0
echo Sourcing setup-cuda-hook >&2
guard=Sourcing
reason=
extendCUDAToolkit_ROOT() {
if [[ -f "$1/nix-support/include-in-cudatoolkit-root" ]] ; then
addToSearchPathWithCustomDelimiter ";" CUDAToolkit_ROOT "$1"
[[ -n ${cudaSetupHookOnce-} ]] && guard=Skipping && reason=" because the hook has been propagated more than once"
if [[ -d "$1/include" ]] ; then
addToSearchPathWithCustomDelimiter ";" CUDAToolkit_INCLUDE_DIR "$1/include"
fi
fi
if (( "${NIX_DEBUG:-0}" >= 1 )) ; then
echo "$guard hostOffset=$hostOffset targetOffset=$targetOffset setupCudaHook$reason" >&2
else
echo "$guard setup-cuda-hook$reason" >&2
fi
[[ "$guard" = Sourcing ]] || return 0
declare -g cudaSetupHookOnce=1
declare -Ag cudaHostPathsSeen=()
declare -Ag cudaOutputToPath=()
extendcudaHostPathsSeen() {
(( "${NIX_DEBUG:-0}" >= 1 )) && echo "extendcudaHostPathsSeen $1" >&2
local markerPath="$1/nix-support/include-in-cudatoolkit-root"
[[ ! -f "${markerPath}" ]] && return
[[ -v cudaHostPathsSeen[$1] ]] && return
cudaHostPathsSeen["$1"]=1
# E.g. cuda_cudart-lib
local cudaOutputName
read -r cudaOutputName < "$markerPath"
[[ -z "$cudaOutputName" ]] && return
local oldPath="${cudaOutputToPath[$cudaOutputName]-}"
[[ -n "$oldPath" ]] && echo "extendcudaHostPathsSeen: warning: overwriting $cudaOutputName from $oldPath to $1" >&2
cudaOutputToPath["$cudaOutputName"]="$1"
}
addEnvHooks "$targetOffset" extendcudaHostPathsSeen
addEnvHooks "$targetOffset" extendCUDAToolkit_ROOT
setupCUDAToolkit_ROOT() {
(( "${NIX_DEBUG:-0}" >= 1 )) && echo "setupCUDAToolkit_ROOT: cudaHostPathsSeen=${!cudaHostPathsSeen[*]}" >&2
for path in "${!cudaHostPathsSeen[@]}" ; do
addToSearchPathWithCustomDelimiter ";" CUDAToolkit_ROOT "$path"
if [[ -d "$path/include" ]] ; then
addToSearchPathWithCustomDelimiter ";" CUDAToolkit_INCLUDE_DIR "$path/include"
fi
done
export cmakeFlags+=" -DCUDAToolkit_INCLUDE_DIR=$CUDAToolkit_INCLUDE_DIR -DCUDAToolkit_ROOT=$CUDAToolkit_ROOT"
}
preConfigureHooks+=(setupCUDAToolkit_ROOT)
setupCUDAToolkitCompilers() {
echo Executing setupCUDAToolkitCompilers >&2
@@ -58,15 +96,44 @@ setupCUDAToolkitCompilers() {
# CMake's enable_language(CUDA) runs a compiler test and it doesn't account for
# CUDAToolkit_ROOT. We have to help it locate libcudart
local cudartFlags="@cudartFlags@"
if [[ -z "${nvccDontPrependCudartFlags-}" ]] && [[ -n "${cudartFlags:-}" ]] ; then
export NVCC_APPEND_FLAGS+=" $cudartFlags"
if [[ -z "${nvccDontPrependCudartFlags-}" ]] ; then
if [[ ! -v cudaOutputToPath["cuda_cudart-out"] ]] ; then
echo "setupCUDAToolkitCompilers: missing cudaPackages.cuda_cudart. This may become an an error in the future" >&2
# exit 1
fi
for pkg in "${!cudaOutputToPath[@]}" ; do
[[ ! "$pkg" = cuda_cudart* ]] && continue
local path="${cudaOutputToPath[$pkg]}"
if [[ -d "$path/include" ]] ; then
export NVCC_PREPEND_FLAGS+=" -I$path/include"
fi
if [[ -d "$path/lib" ]] ; then
export NVCC_PREPEND_FLAGS+=" -L$path/lib"
fi
done
fi
}
preConfigureHooks+=(setupCUDAToolkitCompilers)
setupCMakeCUDAToolkit_ROOT() {
export cmakeFlags+=" -DCUDAToolkit_INCLUDE_DIR=$CUDAToolkit_INCLUDE_DIR -DCUDAToolkit_ROOT=$CUDAToolkit_ROOT"
propagateCudaLibraries() {
(( "${NIX_DEBUG:-0}" >= 1 )) && echo "propagateCudaLibraries: cudaPropagateToOutput=$cudaPropagateToOutput cudaHostPathsSeen=${!cudaHostPathsSeen[*]}" >&2
[[ -z "${cudaPropagateToOutput-}" ]] && return
mkdir -p "${!cudaPropagateToOutput}/nix-support"
# One'd expect this should be propagated-bulid-build-deps, but that doesn't seem to work
echo "@setupCudaHook@" >> "${!cudaPropagateToOutput}/nix-support/propagated-native-build-inputs"
local propagatedBuildInputs=( "${!cudaHostPathsSeen[@]}" )
for output in $(getAllOutputNames) ; do
if [[ ! "$output" = "$cudaPropagateToOutput" ]] ; then
propagatedBuildInputs+=( "${!output}" )
fi
break
done
# One'd expect this should be propagated-host-host-deps, but that doesn't seem to work
printWords "${propagatedBuildInputs[@]}" >> "${!cudaPropagateToOutput}/nix-support/propagated-build-inputs"
}
postHooks+=(setupCUDAToolkitCompilers)
preConfigureHooks+=(setupCMakeCUDAToolkit_ROOT)
postFixupHooks+=(propagateCudaLibraries)
@@ -14,8 +14,8 @@ let
java = openjdk17_headless;
});
dashed-icu-version = lib.concatStringsSep "-" (lib.splitString "." (lib.getVersion icu71));
underscored-icu-version = lib.concatStringsSep "_" (lib.splitString "." (lib.getVersion icu71));
dashed-icu-version = lib.concatStringsSep "-" (lib.splitVersion (lib.getVersion icu71));
underscored-icu-version = lib.concatStringsSep "_" (lib.splitVersion (lib.getVersion icu71));
icu-data = fetchurl {
url = "https://github.com/unicode-org/icu/releases/download/release-${dashed-icu-version}/icu4c-${underscored-icu-version}-data-bin-l.zip";
hash = "sha256-pVWIy0BkICsthA5mxhR9SJQHleMNnaEcGl/AaLi5qZM=";
+1 -1
View File
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
buildInputs = [
boost179
eigen
opencv
opencv.cxxdev
];
# Tests are broken on Darwin (linking issue)
@@ -16,14 +16,14 @@
}:
stdenv.mkDerivation rec {
version = "0.7.26";
version = "0.7.27";
pname = "libsolv";
src = fetchFromGitHub {
owner = "openSUSE";
repo = "libsolv";
rev = version;
sha256 = "sha256-NGybpl/Fd46pmSYMNGocStQQCXr5pX34PCmN/hFKeyk=";
sha256 = "sha256-kVExzCHfPU/o+C5TTAv1J9H7GmYwVWCsIpVkkts42js=";
};
cmakeFlags = [
+2 -2
View File
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "ngtcp2";
version = "1.0.1";
version = "1.1.0";
src = fetchFromGitHub {
owner = "ngtcp2";
repo = "ngtcp2";
rev = "v${version}";
hash = "sha256-Z8rMujmshdes5SLU5GpXu6QzAHl957sFDK+QSdGYCOc=";
hash = "sha256-z6lvtfO5XL/bZgbE+Sak+32QzjEhAdOnkpIO731h+bk=";
};
outputs = [ "out" "dev" ];
@@ -18,6 +18,11 @@ stdenv.mkDerivation {
cp -R * $out/include
'';
postFixup = ''
mkdir -p $out/nix-support
echo $pname >> "$out/nix-support/include-in-cudatoolkit-root"
'';
meta = with lib; {
description = "Nvidia optical flow headers for computing the relative motion of pixels between images";
homepage = "https://developer.nvidia.com/opticalflow-sdk";
+25 -10
View File
@@ -247,8 +247,10 @@ effectiveStdenv.mkDerivation {
outputs = [
"out"
"cxxdev"
"package_tests"
];
cudaPropagateToOutput = "cxxdev";
postUnpack = lib.optionalString buildContrib ''
cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/source/opencv_contrib"
@@ -328,20 +330,32 @@ effectiveStdenv.mkDerivation {
bzip2 AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox Accelerate
]
++ lib.optionals enableDocs [ doxygen graphviz-nox ]
++ lib.optionals enableCuda (with cudaPackages; [
cuda_cudart
cuda_cccl # <thrust/*>
libnpp # npp.h
++ lib.optionals enableCuda (with cudaPackages; [
cuda_cudart.lib
cuda_cudart.dev
cuda_cccl.dev # <thrust/*>
libnpp.dev # npp.h
libnpp.lib
libnpp.static
nvidia-optical-flow-sdk
] ++ lib.optionals enableCublas [
libcublas # cublas_v2.h
# May start using the default $out instead once
# https://github.com/NixOS/nixpkgs/issues/271792
# has been addressed
libcublas.static
libcublas.lib
libcublas.dev # cublas_v2.h
] ++ lib.optionals enableCudnn [
cudnn # cudnn.h
cudnn.dev # cudnn.h
cudnn.lib
cudnn.static
] ++ lib.optionals enableCufft [
libcufft # cufft.h
]);
libcufft.dev # cufft.h
libcufft.lib
libcufft.static
]);
propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy
++ lib.optionals enableCuda [ nvidia-optical-flow-sdk ];
propagatedBuildInputs = lib.optionals enablePython [ pythonPackages.numpy ];
nativeBuildInputs = [ cmake pkg-config unzip ]
++ lib.optionals enablePython [
@@ -458,6 +472,7 @@ effectiveStdenv.mkDerivation {
postInstall = ''
sed -i "s|{exec_prefix}/$out|{exec_prefix}|;s|{prefix}/$out|{prefix}|" \
"$out/lib/pkgconfig/opencv4.pc"
mkdir $cxxdev
''
# install python distribution information, so other packages can `import opencv`
+ lib.optionalString enablePython ''
@@ -122,6 +122,7 @@ stdenv.mkDerivation rec {
"-DENABLE_CPPLINT:BOOL=OFF"
"-DBUILD_TESTING:BOOL=OFF"
"-DENABLE_SAMPLES:BOOL=OFF"
(lib.cmakeBool "CMAKE_VERBOSE_MAKEFILE" true)
];
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-Wno-narrowing";
@@ -133,7 +134,7 @@ stdenv.mkDerivation rec {
buildInputs = [
libusb1
libxml2
opencv
opencv.cxxdev
protobuf
pugixml
tbb
+12 -3
View File
@@ -1,14 +1,23 @@
{ lib, fetchurl, tcl }:
{ lib
, fetchzip
, tcl
, critcl
, withCritcl ? true
}:
tcl.mkTclDerivation rec {
pname = "tcllib";
version = "1.21";
src = fetchurl {
src = fetchzip {
url = "mirror://sourceforge/tcllib/tcllib-${version}.tar.gz";
sha256 = "sha256-RrK7XsgEk2OuAWRa8RvaO9tdsQYp6AfYHRrUbNG+rVA=";
hash = "sha256-p8thpRpC+9k/LvbBFaSOIpDXuhMlEWhs0qbrjtKcTzQ=";
};
nativeBuildInputs = lib.optional withCritcl critcl;
buildFlags = [ "all" ] ++ lib.optional withCritcl "critcl";
meta = {
homepage = "https://core.tcl-lang.org/tcllib/";
description = "Tcl-only library of standard routines for Tcl";
@@ -3,6 +3,7 @@
buildPythonPackage rec {
pname = "IPy";
version = "1.01";
format = "setuptools";
src = fetchPypi {
inherit pname version;
@@ -9,6 +9,7 @@
buildPythonPackage rec {
pname = "aadict";
version = "0.2.3";
format = "setuptools";
src = fetchPypi {
inherit pname version;
@@ -3,6 +3,7 @@
buildPythonPackage rec {
pname = "aafigure";
version = "0.6";
format = "setuptools";
src = fetchPypi {
inherit pname version;
@@ -6,6 +6,7 @@
buildPythonPackage rec {
pname = "about-time";
version = "4.2.1";
format = "setuptools";
# PyPi release does not contain test files, but the repo has no release tags,
# so while having no tests is not ideal, follow the PyPi releases for now
@@ -9,6 +9,7 @@
buildPythonPackage rec {
pname = "absl-py";
version = "1.4.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
@@ -18,6 +18,7 @@
buildPythonPackage rec {
pname = "accupy";
version = "0.3.6";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
@@ -10,6 +10,7 @@
buildPythonPackage rec {
pname = "acme-tiny";
version = "5.0.1";
format = "setuptools";
src = fetchPypi {
inherit pname version;
@@ -17,6 +17,7 @@ buildPythonPackage rec {
inherit (certbot) src version;
pname = "acme";
format = "setuptools";
propagatedBuildInputs = [
cryptography pyasn1 pyopenssl pyRFC3339 pytz requests requests-toolbelt six
@@ -10,6 +10,7 @@
buildPythonPackage {
pname = "adb-homeassistant";
version = "1.3.1";
format = "setuptools";
# pypi does not contain tests, using github sources instead
src = fetchFromGitHub {
@@ -7,6 +7,7 @@
buildPythonPackage rec {
pname = "addict";
version = "2.4.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
@@ -9,6 +9,7 @@
buildPythonPackage rec {
pname = "adext";
version = "0.4.2";
format = "setuptools";
src = fetchFromGitHub {
owner = "ajschmidt8";
@@ -13,6 +13,7 @@
buildPythonPackage rec {
pname = "advocate";
version = "1.0.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "JordanMilne";
@@ -3,6 +3,7 @@
buildPythonPackage rec {
pname = "agate-dbf";
version = "0.2.2";
format = "setuptools";
propagatedBuildInputs = [ agate dbf dbfread ];
@@ -12,6 +12,7 @@
buildPythonPackage rec {
pname = "agate-sql";
version = "0.7.0";
format = "setuptools";
disabled = isPy27;
@@ -3,6 +3,7 @@
buildPythonPackage rec {
pname = "agent-py";
version = "0.0.23";
format = "setuptools";
disabled = !isPy3k;
@@ -12,6 +12,7 @@
buildPythonPackage rec {
pname = "aigpy";
version = "2022.7.8.1";
format = "setuptools";
src = fetchPypi {
inherit pname version;
@@ -10,6 +10,7 @@
buildPythonPackage rec {
pname = "aioasuswrt";
version = "1.4.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "kennedyshead";
@@ -9,6 +9,7 @@
buildPythonPackage rec {
pname = "aioazuredevops";
version = "1.4.3";
format = "setuptools";
disabled = isPy27;
@@ -10,6 +10,7 @@
buildPythonPackage rec {
pname = "aiocron";
version = "1.8";
format = "setuptools";
src = fetchPypi {
inherit pname version;
@@ -9,6 +9,7 @@
buildPythonPackage rec {
pname = "aiodns";
version = "3.0.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
@@ -8,6 +8,7 @@ buildPythonPackage rec {
pname = "aiodocker";
# unstable includes support for python 3.10+
version = "unstable-2022-01-20";
format = "setuptools";
src = fetchFromGitHub {
owner = "aio-libs";
@@ -9,6 +9,7 @@
buildPythonPackage rec {
pname = "aioeagle";
version = "1.1.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -13,6 +13,7 @@
buildPythonPackage rec {
pname = "aioemonitor";
version = "1.0.5";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
@@ -11,6 +11,7 @@
buildPythonPackage rec {
pname = "aioextensions";
version = "21.7.2261349";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
@@ -10,6 +10,7 @@
buildPythonPackage rec {
pname = "aioharmony";
version = "0.2.10";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -5,6 +5,7 @@
buildPythonPackage rec {
pname = "aiohttp-cors";
version = "0.7.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
@@ -3,6 +3,7 @@
buildPythonPackage rec {
pname = "aiohttp-socks";
version = "0.8.3";
format = "setuptools";
src = fetchPypi {
inherit version;
@@ -9,6 +9,7 @@
buildPythonPackage rec {
pname = "aiohttp-wsgi";
version = "0.10.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
@@ -9,6 +9,7 @@
buildPythonPackage rec {
pname = "aioinflux";
version = "0.9.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
@@ -10,6 +10,7 @@
buildPythonPackage rec {
pname = "aiokef";
version = "0.2.17";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
@@ -8,6 +8,7 @@
buildPythonPackage rec {
pname = "aiolip";
version = "1.1.6";
format = "setuptools";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
@@ -12,6 +12,7 @@
buildPythonPackage rec {
pname = "aiomodernforms";
version = "0.1.8";
format = "setuptools";
src = fetchFromGitHub {
owner = "wonderslug";
@@ -10,6 +10,7 @@
buildPythonPackage rec {
pname = "aiopylgtv";
version = "0.4.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
@@ -8,6 +8,7 @@
buildPythonPackage rec {
pname = "aiorpcx";
version = "0.22.1";
format = "setuptools";
src = fetchPypi {
inherit version;
@@ -9,6 +9,7 @@
buildPythonPackage rec {
pname = "aiorwlock";
version = "1.3.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
@@ -8,6 +8,7 @@
buildPythonPackage rec {
pname = "aioserial";
version = "1.3.1";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -13,6 +13,7 @@
buildPythonPackage rec {
pname = "aiosyncthing";
version = "0.6.3";
format = "setuptools";
src = fetchFromGitHub {
owner = "zhulik";
@@ -9,6 +9,7 @@
buildPythonPackage rec {
pname = "aiotractive";
version = "0.5.6";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
@@ -10,6 +10,7 @@
buildPythonPackage rec {
pname = "aiounittest";
version = "1.4.2";
format = "setuptools";
disabled = isPy27;
src = fetchFromGitHub {
@@ -8,6 +8,7 @@
buildPythonPackage rec {
pname = "aioymaps";
version = "1.2.3";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -8,6 +8,7 @@
buildPythonPackage rec {
pname = "aiozeroconf";
version = "0.1.8";
format = "setuptools";
disabled = isPy27;
src = fetchPypi {
@@ -10,6 +10,7 @@
buildPythonPackage rec {
pname = "airly";
version = "1.1.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "ak-ambi";
@@ -3,6 +3,7 @@
buildPythonPackage rec {
pname = "ajpy";
version = "0.0.5";
format = "setuptools";
src = fetchPypi {
inherit pname version;
@@ -3,6 +3,7 @@
buildPythonPackage rec {
pname = "ajsonrpc";
version = "1.2.0";
format = "setuptools";
disabled = pythonOlder "3.5";
@@ -4,6 +4,7 @@
buildPythonPackage rec {
pname = "alabaster";
version = "0.7.13";
format = "setuptools";
src = fetchPypi {
inherit pname version;
@@ -13,6 +13,7 @@
buildPythonPackage rec {
pname = "alarmdecoder";
version = "1.13.11";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
@@ -4,6 +4,7 @@
buildPythonPackage rec {
pname = "alectryon";
version = "1.4.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
@@ -10,6 +10,7 @@
buildPythonPackage rec {
pname = "alive-progress";
version = "3.1.4";
format = "setuptools";
src = fetchFromGitHub {
owner = "rsalmei";
@@ -10,6 +10,7 @@
buildPythonPackage rec {
pname = "allure-behave";
version = "2.13.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -13,6 +13,7 @@
buildPythonPackage rec {
pname = "allure-python-commons-test";
version = "2.13.2";
format = "setuptools";
disabled = pythonOlder "3.4";
@@ -13,6 +13,7 @@
buildPythonPackage rec {
pname = "allure-python-commons";
version = "2.13.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -12,6 +12,7 @@
buildPythonPackage rec {
pname = "alpha-vantage";
version = "2.3.1";
format = "setuptools";
src = fetchFromGitHub {
owner = "RomelTorres";
@@ -9,6 +9,7 @@
buildPythonPackage rec {
pname = "amaranth-boards";
version = "unstable-2021-12-17";
format = "setuptools";
# python setup.py --version
realVersion = "0.1.dev202+g${lib.substring 0 7 src.rev}";
@@ -9,6 +9,7 @@
buildPythonPackage rec {
pname = "amaranth-soc";
version = "unstable-2023-09-15";
format = "setuptools";
# python setup.py --version
realVersion = "0.1.dev70+g${lib.substring 0 7 src.rev}";
@@ -3,6 +3,7 @@
buildPythonPackage rec {
pname = "amazon-kclpy";
version = "2.1.3";
format = "setuptools";
src = fetchFromGitHub {
owner = "awslabs";
@@ -8,6 +8,7 @@
buildPythonPackage rec {
pname = "ambiclimate";
version = "0.2.1";
format = "setuptools";
src = fetchPypi {
pname = "Ambiclimate";
@@ -9,6 +9,7 @@
buildPythonPackage rec {
pname = "amiibo-py";
version = "unstable-2021-01-16";
format = "setuptools";
disabled = pythonOlder "3.5.3"; # Older versions are not supported upstream
src = fetchFromGitHub {
@@ -10,6 +10,7 @@
buildPythonPackage rec {
pname = "amply";
version = "0.1.6";
format = "setuptools";
src = fetchPypi {
inherit pname version;
@@ -3,6 +3,7 @@
buildPythonPackage rec {
pname = "amqplib";
version = "1.0.2";
format = "setuptools";
src = fetchPypi {
inherit pname version;
@@ -32,6 +32,7 @@
buildPythonPackage rec {
pname = "androguard";
version = "3.4.0a1";
format = "setuptools";
src = fetchFromGitHub {
repo = pname;
@@ -10,6 +10,7 @@
buildPythonPackage rec {
pname = "android-backup";
version = "0.2.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "bluec0re";
@@ -10,6 +10,7 @@
buildPythonPackage rec {
pname = "aniso8601";
version = "9.0.1";
format = "setuptools";
src = fetchPypi {
inherit pname version;
@@ -25,6 +25,7 @@ in
buildPythonPackage rec {
pname = "ansible-kernel";
version = "1.0.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
@@ -3,6 +3,7 @@
buildPythonPackage rec {
pname = "ansible-vault-rw";
version = "2.1.0";
format = "setuptools";
src = fetchPypi {
pname = "ansible-vault";
inherit version;
@@ -3,6 +3,7 @@
buildPythonPackage rec {
pname = "ansicolor";
version = "0.3.2";
format = "setuptools";
src = fetchPypi {
inherit pname version;

Some files were not shown because too many files have changed in this diff Show More