Merge master into staging-next

This commit is contained in:
github-actions[bot] 2022-03-08 18:01:16 +00:00 committed by GitHub
commit d47f26379a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
66 changed files with 624 additions and 247 deletions

View File

@ -8822,6 +8822,12 @@
githubId = 8214542;
name = "Nicolò Balzarotti";
};
nidabdella = {
name = "Mohamed Nidabdella";
email = "nidabdella.mohamed@gmail.com";
github = "nidabdella";
githubId = 8083813;
};
NieDzejkob = {
email = "kuba@kadziolka.net";
github = "NieDzejkob";

View File

@ -65,7 +65,6 @@ with lib.maintainers; {
chia = {
members = [
atemu
lourkeur
];
scope = "Maintain the Chia blockchain and its dependencies";

View File

@ -924,7 +924,8 @@ in
PrivateMounts = true;
# System Call Filtering
SystemCallArchitectures = "native";
SystemCallFilter = [ "~@cpu-emulation @debug @keyring @mount @obsolete @privileged @setuid" ] ++ optionals (cfg.package != pkgs.tengine) [ "~@ipc" ];
SystemCallFilter = [ "~@cpu-emulation @debug @keyring @mount @obsolete @privileged @setuid" ]
++ optionals ((cfg.package != pkgs.tengine) && (!lib.any (mod: (mod.disableIPC or false)) cfg.package.modules)) [ "~@ipc" ];
};
};

View File

@ -6,14 +6,14 @@
let chia = python3Packages.buildPythonApplication rec {
pname = "chia";
version = "1.2.11";
version = "1.3.0";
src = fetchFromGitHub {
owner = "Chia-Network";
repo = "chia-blockchain";
rev = version;
fetchSubmodules = true;
sha256 = "sha256-hRpZce8ydEsyq7htNfzlRSKPwMAOUurC3uiQpX6WiB8=";
hash = "sha256-eUvZc/7gqGkCB2tNKdwqKOmOgEcG9a/7TSvvyQzhNcQ=";
};
postPatch = ''
@ -31,6 +31,7 @@ let chia = python3Packages.buildPythonApplication rec {
SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}";
propagatedBuildInputs = with python3Packages; [
aiofiles
aiohttp
aiosqlite
bitstring
@ -46,6 +47,7 @@ let chia = python3Packages.buildPythonApplication rec {
colorlog
concurrent-log-handler
cryptography
dnslib
dnspythonchia
fasteners
keyrings-cryptfile
@ -55,6 +57,7 @@ let chia = python3Packages.buildPythonApplication rec {
sortedcontainers
watchdog
websockets
zstd
];
checkInputs = with python3Packages; [

View File

@ -536,6 +536,19 @@ let
};
};
daohong-emilio.yash = buildVscodeMarketplaceExtension {
mktplcRef = {
publisher = "daohong-emilio";
name = "yash";
version = "0.2.8";
sha256 = "ummOEBSXUI78hBb1AUh+x339T7ocB/evOVaz79geHRM=";
};
meta = {
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ kamadorueda ];
};
};
davidanson.vscode-markdownlint = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-markdownlint";

View File

@ -1,64 +1,80 @@
{ lib
, dbus
, stdenv
, rustPlatform
, fetchFromGitHub
, dbus
, ffmpeg
, x264
, libva
, gst_all_1
, xorg
, libdrm
, libva
, fetchzip
, copyDesktopItems
, fontconfig
, libpng
, pipewire
, makeWrapper
, autoPatchelfHook
, pkg-config
, pango
, cmake
, autoconf
, libtool
, nodePackages
, ApplicationServices
, Carbon
, Cocoa
, VideoToolbox
}:
stdenv.mkDerivation rec {
rustPlatform.buildRustPackage rec {
pname = "weylus";
version = "0.11.4";
src = fetchzip {
url = "https://github.com/H-M-H/Weylus/releases/download/v${version}/linux.zip";
sha256 = "sha256-EW3TdI4F4d4X/BeSqI05QtS77ym1U5jdswFfNtSFyFk=";
stripRoot = false;
src = fetchFromGitHub {
owner = "H-M-H";
repo = pname;
rev = "v${version}";
sha256 = "0gq2czxvahww97j4i3k18np29zl6wx85f8253wn3ibqrpfnklz6l";
};
installPhase = ''
runHook preInstall
install -Dm755 ./weylus $out/bin/weylus
copyDesktopItems ./weylus.desktop
runHook postInstall
'';
buildInputs = [
libpng
ffmpeg
x264
] ++ lib.optionals stdenv.isDarwin [
ApplicationServices
Carbon
Cocoa
VideoToolbox
] ++ lib.optionals stdenv.isLinux [
dbus
libdrm
fontconfig
libva
gst_all_1.gst-plugins-base
pipewire
# autoPatchelfHook complains if these are missing, even on wayland
xorg.libXext
xorg.libXft
xorg.libXinerama
xorg.libXcursor
xorg.libXrender
xorg.libXfixes
xorg.libXtst
xorg.libXrandr
xorg.libXcomposite
xorg.libXtst
xorg.libXi
xorg.libXv
pango
libdrm
];
nativeBuildInputs = [ copyDesktopItems autoPatchelfHook makeWrapper ];
nativeBuildInputs = [
cmake
nodePackages.typescript
] ++ lib.optionals stdenv.isLinux [
pkg-config
autoconf
libtool
];
postFixup = let
GST_PLUGIN_PATH = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" [
gst_all_1.gst-plugins-base
pipewire
];
in ''
wrapProgram $out/bin/weylus --prefix GST_PLUGIN_PATH : ${GST_PLUGIN_PATH}
cargoSha256 = "1pigmch0sy9ipsafd83b8q54xwqjxdaif363n1q8n46arq4v81j0";
cargoBuildFlags = [ "--features=ffmpeg-system" ];
cargoTestFlags = [ "--features=ffmpeg-system" ];
postInstall = ''
install -vDm755 weylus.desktop $out/share/applications/weylus.desktop
'';
meta = with lib; {
@ -66,6 +82,5 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/H-M-H/Weylus";
license = with licenses; [ agpl3Only ];
maintainers = with maintainers; [ lom ];
platforms = [ "x86_64-linux" ];
};
}

View File

@ -30,13 +30,13 @@
stdenv.mkDerivation rec {
pname = "waybar";
version = "0.9.9";
version = "0.9.10";
src = fetchFromGitHub {
owner = "Alexays";
repo = "Waybar";
rev = version;
sha256 = "sha256-yXvT9NMXtUxr9VVLADoL6PUOMko5yFFc51zNsfHz6S4=";
sha256 = "sha256-KiRtU32h3AvThDWnCw55LnqbWVAZLXY/7fU1HxLMjLo=";
};
nativeBuildInputs = [

View File

@ -105,7 +105,7 @@ let
enterprisePolicies =
{
policies = lib.optionalAttrs usesNixExtensions {
policies = {
DisableAppUpdate = true;
} //
lib.optionalAttrs usesNixExtensions {

View File

@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element",
"main": "lib/electron-main.js",
"version": "1.10.4",
"version": "1.10.6",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {
@ -61,7 +61,7 @@
"app-builder-lib": "^22.14.10",
"asar": "^2.0.1",
"chokidar": "^3.5.2",
"electron": "^15.3.5",
"electron": "^17",
"electron-builder": "22.11.4",
"electron-builder-squirrel-windows": "22.11.4",
"electron-devtools-installer": "^3.1.1",

View File

@ -1,6 +1,6 @@
{
"version": "1.10.4",
"desktopSrcHash": "cuMo0wRMC6+un3BQK0+Ecnjvs6HugNk71yElNJarlyc=",
"desktopYarnHash": "0llnqwgiqggfcgjyaar2h2r1pyw8m14icfb1pcdphqxrah9gpsar",
"webHash": "0vf8npddbx4dmq9c1ghak97jn28b18ssblbrq5smdhlzsnxlpm3l"
"version": "1.10.6",
"desktopSrcHash": "TJGYavawLDLbP9Sg7HxIcOkr7hcTfAwk4fyOOEv4KhI=",
"desktopYarnHash": "038rqg26dn8chzscck5mlhnw2viy6gr8pjb7zrcmi7ipx9h038a0",
"webHash": "1wax4h5gfcq4giyq1igsix748cngky487kwvf69zb1gz95hjds9r"
}

View File

@ -1,4 +1,4 @@
{ lib, writeTextFile, desktop-file-utils }:
{ lib, writeTextFile, buildPackages }:
# All possible values as defined by the spec, version 1.4.
# Please keep in spec order for easier maintenance.
@ -119,5 +119,5 @@ writeTextFile {
name = "${cleanName}.desktop";
destination = "/share/applications/${cleanName}.desktop";
text = builtins.concatStringsSep "\n" content;
checkPhase = "${desktop-file-utils}/bin/desktop-file-validate $target";
checkPhase = "${buildPackages.desktop-file-utils}/bin/desktop-file-validate $target";
}

View File

@ -1,7 +1,8 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation {
name = "Fluid-3";
pname = "Fluid";
version = "3";
src = fetchurl {
url = "https://ftp.osuosl.org/pub/musescore/soundfont/fluid-soundfont.tar.gz";

View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation {
name = "ydp-grand";
pname = "ydp-grand";
version = "unstable-2016-08-04";
src = fetchurl {

View File

@ -1,12 +1,16 @@
{ lib, stdenv, fetchgit }:
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation {
name = "gnome-breeze-20160526";
src = fetchgit {
url = "https://github.com/dirruk1/gnome-breeze";
sha256 = "0hkk0gqlnrs1m4rb5r84f5y96qfamrbiwm09z89yc32124x1a1lm";
pname = "gnome-breeze";
version = "unstable-2016-05-26";
src = fetchFromGitHub {
owner = "dirruk1";
repo = "gnome-breeze";
rev = "49a5cd67a270e13a4c04a4b904f126ef728e9221";
sha256 = "sha256-lQYVOhFBDOYT+glUHleuymGTfHEE5bIyqUFnS/EDc0I=";
};
installPhase = ''
mkdir -p $out/share/themes
cp -r Breeze* $out/share/themes
@ -14,12 +18,12 @@ stdenv.mkDerivation {
preferLocalBuild = true;
meta = {
meta = with lib; {
description = "A GTK theme built to match KDE's breeze theme";
homepage = "https://github.com/dirruk1/gnome-breeze";
license = lib.licenses.lgpl2;
maintainers = with lib.maintainers; [ bennofs ];
platforms = lib.platforms.all;
license = licenses.lgpl2;
maintainers = with maintainers; [ bennofs ];
platforms = platforms.all;
hydraPlatforms = [];
};
}

View File

@ -18,10 +18,10 @@ let
};
in stdenv.mkDerivation rec {
version = "2.3.2";
name = "cde-${version}";
pname = "cde";
src = fetchurl {
url = "mirror://sourceforge/cdesktopenv/${name}.tar.gz";
url = "mirror://sourceforge/cdesktopenv/cde-${version}.tar.gz";
sha256 = "029rljhi5r483x8rzdpl8625z0wx8r7k2m0364nbw66h5pig9lbx";
};

View File

@ -19,7 +19,8 @@ let
testingName = lib.optionalString (testName != null) "${testName}-";
in
stdenv.mkDerivation rec {
name = "${testingName}${switchboard.name}-with-plugs";
pname = "${testingName}${switchboard.pname}-with-plugs";
inherit (switchboard) version;
src = null;

View File

@ -17,7 +17,8 @@ let
else indicators ++ (lib.optionals useDefaultIndicators wingpanelIndicators);
in
stdenv.mkDerivation rec {
name = "${wingpanel.name}-with-indicators";
pname = "${wingpanel.pname}-with-indicators";
inherit (wingpanel) version;
src = null;

View File

@ -1,7 +1,7 @@
{ lib, stdenv, src, version }:
stdenv.mkDerivation rec {
inherit src version;
name = "ocaml-${version}+bs";
pname = "ocaml-bs";
configurePhase = ''
./configure -prefix $out
'';

View File

@ -4,7 +4,7 @@
automake, autoconf, libtool, clangStdenv } :
clangStdenv.mkDerivation rec {
name = "ios-cross-compile-${version}";
pname = "ios-cross-compile";
version = "9.2";
sdk = "iPhoneOS9.2.sdk";
cctools_port = fetchFromGitHub {

View File

@ -12,7 +12,8 @@ let
"-x86-64";
in
stdenv.mkDerivation {
name = if enableX11 then "mit-scheme-x11-${version}" else "mit-scheme-${version}";
pname = "mit-scheme" + lib.optionalString enableX11 "-x11";
inherit version;
# MIT/GNU Scheme is not bootstrappable, so it's recommended to compile from
# the platform-specific tarballs, which contain pre-built binaries. It

View File

@ -7,7 +7,7 @@
let
jre = stdenv.mkDerivation {
name = "${jdk.name}-minimal-jre";
pname = "${jdk.pname}-minimal-jre";
version = jdk.version;
buildInputs = [ jdk ];

View File

@ -7,7 +7,7 @@ let boost_static = boost165.override { enableStatic = true; };
in clangStdenv.mkDerivation rec {
# In theory this could use GCC + Clang rather than just Clang,
# but https://github.com/NixOS/nixpkgs/issues/29877 stops this
name = "openshadinglanguage-${version}";
pname = "openshadinglanguage";
version = "1.10.9";
src = fetchFromGitHub {

View File

@ -1,6 +1,6 @@
{ stdenv, lib, rustPlatform, rustc, Security, patchelf }:
rustPlatform.buildRustPackage {
name = "clippy-${rustc.version}";
pname = "clippy";
inherit (rustc) version src;
# the rust source tarball already has all the dependencies vendored, no need to fetch them again

View File

@ -7,7 +7,8 @@ let
in
stdenv.mkDerivation {
name = "dotty-${dotty-bare.version}";
pname = "dotty";
inherit (dotty-bare) version;
dontUnpack = true;

View File

@ -182,7 +182,8 @@ let
in
stdenv.mkDerivation {
name = "swift-${versions.swift}";
pname = "swift";
version = versions.swift;
nativeBuildInputs = [
autoconf

View File

@ -21,7 +21,8 @@ let
in
stdenv.mkDerivation {
name = "urn-${optionalString (extraLibraries != []) "with-libraries-"}${version}";
pname = "urn${optionalString (extraLibraries != []) "-with-libraries"}";
inherit version;
src = fetchFromGitLab {
owner = "urn";

View File

@ -700,11 +700,6 @@ self: super: builtins.intersectAttrs super {
testToolDepends = [ pkgs.git pkgs.mercurial ] ++ drv.testToolDepends or [];
}) super.retrie_1_2_0_0;
nix-output-monitor = overrideCabal {
# Can't ran the golden-tests with nix, because they call nix
testTarget = "unit-tests";
} super.nix-output-monitor;
haskell-language-server = overrideCabal (drv: {
# starting with 1.6.1.1 haskell-language-server wants to be linked dynamically
# by default. Unless we reflect this in the generic builder, GHC is going to

View File

@ -1,18 +1,8 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper }:
let
version = "0.10";
name = "chibi-scheme-${version}";
in
stdenv.mkDerivation {
inherit name;
meta = {
homepage = "https://github.com/ashinn/chibi-scheme";
description = "Small Footprint Scheme for use as a C Extension Language";
platforms = lib.platforms.all;
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.DerGuteMoritz ];
};
stdenv.mkDerivation rec {
version = "0.10";
pname = "chibi-scheme";
src = fetchFromGitHub {
owner = "ashinn";
@ -36,4 +26,12 @@ stdenv.mkDerivation {
--replace "/usr/bin/env chibi-scheme" "$out/bin/chibi-scheme"
done
'';
meta = {
homepage = "https://github.com/ashinn/chibi-scheme";
description = "Small Footprint Scheme for use as a C Extension Language";
platforms = lib.platforms.all;
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.DerGuteMoritz ];
};
}

View File

@ -25,7 +25,7 @@ in
assert versionAtLeast (getVersion erlang) minimumOTPVersion;
stdenv.mkDerivation ({
name = "${baseName}-${version}";
pname = "${baseName}";
inherit src version debugInfo;

View File

@ -2,9 +2,10 @@
}:
racket.overrideAttrs (oldAttrs: rec {
name = "racket-minimal-${oldAttrs.version}";
pname = "racket-minimal";
version = oldAttrs.version;
src = oldAttrs.src.override {
inherit name;
name = "${pname}-${version}";
sha256 = "sha256-FZlUWvjtioe4S8gPetj7vdneVX6jEFguJo4j2wJsKAw=";
};

View File

@ -2,15 +2,15 @@
{ version, artifactId, groupId, sha512, type ? "jar", suffix ? "" }:
let
name = "${artifactId}-${version}";
m2Path = "${builtins.replaceStrings ["."] ["/"] groupId}/${artifactId}/${version}";
m2File = "${name}${suffix}.${type}";
m2File = "${artifactId}-${version}${suffix}.${type}";
src = fetchurl {
inherit sha512;
url = "mirror://maven/${m2Path}/${m2File}";
};
in stdenv.mkDerivation {
inherit name m2Path m2File src;
inherit version m2Path m2File src;
pname = artifactId;
dontUnpack = true;

View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "4.14.2";
name = "cgal-" + version;
pname = "cgal";
src = fetchFromGitHub {
owner = "CGAL";

View File

@ -11,6 +11,7 @@
, gtest
, ninja
, nlohmann_json
, openssl
, pkg-config
, protobuf
# default list of APIs: https://github.com/googleapis/google-cloud-cpp/blob/v1.32.1/CMakeLists.txt#L173
@ -18,29 +19,29 @@
, staticOnly ? stdenv.hostPlatform.isStatic
}:
let
googleapisRev = "ed739492993c4a99629b6430affdd6c0fb59d435";
googleapisRev = "d4f3468ef85278428005ed555b3a85db91551ee6";
googleapis = fetchFromGitHub {
owner = "googleapis";
repo = "googleapis";
rev = googleapisRev;
hash = "sha256:1xrnh77vb8hxmf1ywqsifzd39kylhbdyah0b0b9bm7nw0mnahssl";
hash = "sha256-sIQVFQhE3Ae6ia45apzdgtwzglMM4hFZ8efNAhMO5ZY=";
};
excludedTests = builtins.fromTOML (builtins.readFile ./skipped_tests.toml);
in
stdenv.mkDerivation rec {
pname = "google-cloud-cpp";
version = "1.32.1";
version = "1.38.0";
src = fetchFromGitHub {
owner = "googleapis";
repo = "google-cloud-cpp";
rev = "v${version}";
sha256 = "0g720sni70nlncv4spm4rlfykdkpjnv81axfz2jd1arpdajm0mg9";
sha256 = "sha256-kobOkohWIDTQaaihhoh/25tZUNv+CjKFwj2xQqO52bA=";
};
postPatch = ''
substituteInPlace external/googleapis/CMakeLists.txt \
--replace "https://github.com/googleapis/googleapis/archive/${googleapisRev}.tar.gz" "file://${googleapis}"
--replace "https://github.com/googleapis/googleapis/archive/\''${GOOGLE_CLOUD_CPP_GOOGLEAPIS_COMMIT_SHA}.tar.gz" "file://${googleapis}"
'';
nativeBuildInputs = [
@ -48,7 +49,7 @@ stdenv.mkDerivation rec {
ninja
pkg-config
] ++ lib.optionals (!doInstallCheck) [
# enable these dependencies when doInstallCheck failse because we're
# enable these dependencies when doInstallCheck is false because we're
# unconditionally building tests and benchmarks
#
# when doInstallCheck is true, these deps are added to installCheckInputs
@ -63,6 +64,7 @@ stdenv.mkDerivation rec {
curl
grpc
nlohmann_json
openssl
protobuf
];

View File

@ -1,6 +1,6 @@
whole = [
"bigquery_bigquery_read_integration_test",
"bigtable_admin_backup_integration_test",
"bigtable_admin_admin_iam_policy_integration_test",
"bigtable_admin_iam_policy_integration_test",
"bigtable_admin_integration_test",
"bigtable_apply_read_latency_benchmark",
@ -15,12 +15,15 @@ whole = [
"bigtable_table_sample_rows_integration_test",
"iam_iam_credentials_integration_test",
"iam_iam_integration_test",
"logging_quickstart",
"pubsub_endurance",
"pubsub_schema_admin_integration_test",
"pubsub_subscriber_integration_test",
"pubsub_subscription_admin_integration_test",
"pubsub_throughput",
"pubsub_topic_admin_integration_test",
"rest_internal_internal_curl_rest_client_integration_test",
"rest_internal_internal_unified_rest_credentials_integration_test",
"spanner_admin_backup_extra_integration_test",
"spanner_admin_database_admin_integration_test",
"spanner_admin_instance_admin_integration_test",

View File

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "liblouis";
version = "3.20.0";
version = "3.21.0";
src = fetchFromGitHub {
owner = "liblouis";
repo = "liblouis";
rev = "v${version}";
sha256 = "sha256-DuMVs9cC0VnZg3E9GtZB8LYkp3Ybfzlv8vd4d1Muwyc=";
sha256 = "sha256-Hfn0dfXihtUfO3R+qJaetrPwupcIwblvi1DQdHCF1s8=";
};
outputs = [ "out" "dev" "man" "info" "doc" ];

View File

@ -39,6 +39,16 @@ stdenv.mkDerivation rec {
sha256 = "sha256-xwfggrjKHh5mZdvH6dKqQo6o1ltxuYdjoGYaWl31C/Y=";
};
patches = [
# backport a patch to fix hangs in some applications
# ref: https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/213
# FIXME: drop this in 0.4.9
(fetchpatch {
url = "https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/afbc0ce57aac7aee8dc1651de4620f15c73dbace.patch";
sha256 = "sha256-8ycFnrzDq7QHgjwJ/772OTMsSsN3m7gjbdvTmlMJ+mU=";
})
];
nativeBuildInputs = [
meson
pkg-config

View File

@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "adafruit-platformdetect";
version = "3.20.1";
version = "3.21.0";
format = "setuptools";
src = fetchPypi {
pname = "Adafruit-PlatformDetect";
inherit version;
sha256 = "sha256-P5OWPsbRsTEMcvw7/uq0rj9p/4beVj/2OdWkllVMKMw=";
sha256 = "sha256-H65Ar/+9AwhKFNRK/SZyU8XzrMt3myjBo+YNJYtQ0b4=";
};
nativeBuildInputs = [

View File

@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-rdbms";
version = "10.0.0";
version = "10.1.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "bdc479b3bbcac423943d63e746a81dd5fc80b46a4dbb4393e760016e3fa4f74a";
sha256 = "sha256-qH1AHIdshHNM3UiIr1UeShRhtLMo2YFq9gy4rFl58DU=";
};
propagatedBuildInputs = [

View File

@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "blspy";
version = "1.0.8";
version = "1.0.9";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-yKLirwWWeUTs5BFXZfqfuNJUXtQW40EiNPxuP+FeHso=";
hash = "sha256-6keimQqwh37G9xc1Xyxlr+0n9Qgv87Np2D7Gzj6ik5Y=";
};
patches = [

View File

@ -1,11 +0,0 @@
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -80,7 +80,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "clvm_rs"
-version = "0.1.14"
+version = "0.1.15"
dependencies = [
"bls12_381",
"hex",

View File

@ -5,35 +5,59 @@
, pythonOlder
, openssl
, perl
, pkgs
}:
let
# clvm-rs does not work with maturin 0.12
# https://github.com/Chia-Network/clvm_rs/commit/32fba40178a5440a1306623f47d8b0684ae2339a#diff-50c86b7ed8ac2cf95bd48334961bf0530cdc77b5a56f852c5c61b89d735fd711
maturin_0_11 = with pkgs; rustPlatform.buildRustPackage rec {
pname = "maturin";
version = "0.11.5";
src = fetchFromGitHub {
owner = "PyO3";
repo = "maturin";
rev = "v${version}";
hash = "sha256-hwc6WObcJa6EXf+9PRByUtiupMMYuXThA8i/K4rl0MA=";
};
cargoHash = "sha256-qGCEfKpQwAC57LKonFnUEgLW4Cc7HFJgSyUOzHkKN9c=";
nativeBuildInputs = [ pkg-config ];
buildInputs = lib.optionals stdenv.isLinux [ dbus ]
++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security libiconv ];
# Requires network access, fails in sandbox.
doCheck = false;
};
in
buildPythonPackage rec {
pname = "clvm_rs";
version = "0.1.15";
version = "0.1.19";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "Chia-Network";
repo = "clvm_rs";
rev = version;
sha256 = "sha256-4QFreQlRjKqGhPvuXU/pZpxMfF8LkIf6X7C3K2q77MI=";
sha256 = "sha256-mCKY/PqNOUTaRsFDxQBvbTD6wC4qzP0uv5FldYkwl6c=";
};
patches = [
# upstream forgot to refresh the lock file
./bump-cargo-lock.patch
];
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src patches;
inherit src;
name = "${pname}-${version}";
sha256 = "sha256-jPNU+P6JgxTPL1GYUBE4VPU3p6cgL8u/+AIELr7r5Mk=";
sha256 = "sha256-TmrR8EeySsGWXohMdo3dCX4oT3l9uLVv5TUeRxCBQeE=";
};
format = "pyproject";
buildAndTestSubdir = "wheel";
nativeBuildInputs = [
perl # used by openssl-sys to configure
maturin_0_11
] ++ (with rustPlatform; [
cargoSetupHook
maturinBuildHook

View File

@ -0,0 +1,58 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, coqpit
, fsspec
, pytorch-bin
, pytestCheckHook
, soundfile
, tensorboardx
, torchvision
}:
let
pname = "coqui-trainer";
version = "0.0.4";
in
buildPythonPackage {
inherit pname version;
format = "pyproject";
src = fetchFromGitHub {
owner = "coqui-ai";
repo = "Trainer";
# https://github.com/coqui-ai/Trainer/issues/4
rev = "776eba829231543d3207927fc69b321d121e527c";
hash = "sha256-ICveftJjBNsCgegTmd/ewd/Y6XGMg7YOvchx640RFPI=";
};
propagatedBuildInputs = [
coqpit
fsspec
pytorch-bin
soundfile
tensorboardx
];
# tests are failing; tests require the clearml library
# https://github.com/coqui-ai/Trainer/issues/5
doCheck = false;
checkInputs = [
pytestCheckHook
torchvision
];
pythonImportsCheck = [
"trainer"
];
meta = with lib; {
description = "A general purpose model trainer, as flexible as it gets";
homepage = "https://github.com/coqui-ai/Trainer";
license = licenses.asl20;
maintainers = teams.tts.members;
};
}

View File

@ -18,12 +18,12 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery";
version = "2.34.1";
version = "2.34.2";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-gzWuWmcSYeuBcFQpVUNwsLVGSF2+h4JulN4bIkUBWaM=";
sha256 = "sha256-DriC3zCgD1oe89M5ojpnAjCACyqySUWVkafmharWcU8=";
};
propagatedBuildInputs = [

View File

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-container";
version = "2.10.5";
version = "2.10.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-doxO6Q8SaRqXNNMQow8kPp2BawpiTtSm2yuzyaOl7RY=";
sha256 = "sha256-dBt2Vs9J0+l534YtKS70MuUEUegwVoU66zghmcz7fGk=";
};
propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ];

View File

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-kms";
version = "2.11.0";
version = "2.11.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-8JOa8HzYGJq1lrPXCWRvspXpopEK+qf5av7kmKbFIrQ=";
sha256 = "sha256-n0alfJIsaqhQ4Wr4/d2JRXTCE24JTrRJBsYOnRhpV00=";
};
propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ];

View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "google-cloud-os-config";
version = "1.11.0";
version = "1.11.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-1emoPnXxKRLzMQe+/ojTGvt2sYQJLSwu6N3C06p0T00=";
sha256 = "sha256-i4STXwnFyfXauRx4zvYMO1uWMechvNUOxolOcY3Z5us=";
};
propagatedBuildInputs = [ google-api-core libcst proto-plus ];

View File

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-secret-manager";
version = "2.9.0";
version = "2.9.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-G2vyhj2pbNywGE2/QTyNviYQOcsAj4KR8vIcGhvM5e8=";
sha256 = "sha256-apn1ex/2VX18GHgN5+JYurzTKMqzPTNqTNOAI+DEBLw=";
};
propagatedBuildInputs = [

View File

@ -1,25 +1,43 @@
{ lib
, buildPythonPackage
, cffi
, fetchPypi
, zope_interface, cffi
, sphinx, manuel
, zope_interface
, sphinx
, manuel
, pythonOlder
}:
buildPythonPackage rec {
pname = "persistent";
version = "4.7.0";
version = "4.8.0";
format = "setuptools";
nativeBuildInputs = [ sphinx manuel ];
propagatedBuildInputs = [ zope_interface cffi ];
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "0ef7c05a6dca0104dc224fe7ff31feb30a63d970421c9462104a4752148ac333";
hash = "sha256-nRd+rT+jwfXWKjbUUmdUs3bgUEx9S3XLmqUvt3HexrI=";
};
meta = {
nativeBuildInputs = [
sphinx
manuel
];
propagatedBuildInputs = [
zope_interface
cffi
];
pythonImportsCheck = [
"persistent"
];
meta = with lib; {
description = "Automatic persistence for Python objects";
homepage = "http://www.zodb.org/";
license = lib.licenses.zpl21;
homepage = "https://github.com/zopefoundation/persistent/";
license = licenses.zpl21;
maintainers = with maintainers; [ ];
};
}

View File

@ -2,10 +2,11 @@
, fetchPypi
, buildPythonPackage
, pythonOlder
, Theano
, theano-pymc
, pandas
, patsy
, joblib
, cachetools
, tqdm
, six
, h5py
@ -16,6 +17,8 @@
, parameterized
, fastprogress
, typing-extensions
, dill
, semver
}:
buildPythonPackage rec {
@ -34,7 +37,6 @@ buildPythonPackage rec {
'';
propagatedBuildInputs = [
Theano
pandas
patsy
joblib
@ -45,12 +47,10 @@ buildPythonPackage rec {
packaging
fastprogress
typing-extensions
];
checkInputs = [
pytest
nose
parameterized
dill
theano-pymc
cachetools
semver
];
# The test suite is computationally intensive and test failures are not
@ -67,9 +67,6 @@ buildPythonPackage rec {
description = "Bayesian estimation, particularly using Markov chain Monte Carlo (MCMC)";
homepage = "https://github.com/pymc-devs/pymc3";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ ilya-kolpakov ];
# several dependencies are not declared and in the end it requires theano-pymc3
# instead of Theano. The former is currently not packaged.
broken = true;
maintainers = with lib.maintainers; [ nidabdella ];
};
}

View File

@ -24,14 +24,14 @@
buildPythonPackage rec {
pname = "python-miio";
version = "0.5.10";
version = "0.5.11";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-6iV+uIdVi0Z3FeM9xnp1Ss3VzFVEOm7wykxjSTXUIGM=";
sha256 = "sha256-1hC7yE/hGLx9g3NXqU45yC/6dcW6/0oZwgYW5bj/37c=";
};
nativeBuildInputs = [
@ -70,10 +70,6 @@ buildPythonPackage rec {
"miio"
];
disabledTestPaths = [
"miio/tests/test_vacuums.py"
];
meta = with lib; {
description = "Python library for interfacing with Xiaomi smart appliances";
homepage = "https://github.com/rytilahti/python-miio";

View File

@ -0,0 +1,48 @@
{ lib
, fetchPypi
, buildPythonPackage
, pythonOlder
, pandas
, numpy
, scipy
, filelock
, pytest
, nose
, parameterized
}:
buildPythonPackage rec {
pname = "theano-pymc";
version = "1.1.2";
disabled = pythonOlder "3.6";
src = fetchPypi {
pname = "Theano-PyMC";
inherit version;
sha256 = "5da6c2242ea72a991c8446d7fe7d35189ea346ef7d024c890397011114bf10fc";
};
# No need for coverage stats in Nix builds
postPatch = ''
substituteInPlace setup.py --replace ", 'pytest-cov'" ""
'';
propagatedBuildInputs = [
pandas
numpy
scipy
filelock
];
# The test suite is computationally intensive and test failures are not
# indicative for package usability hence tests are disabled by default.
doCheck = false;
pythonImportsCheck = [ "theano" ];
meta = {
description = "PyMC theano fork";
homepage = "https://github.com/majidaldo/Theano-PyMC";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ nidabdella ];
};
}

View File

@ -6,19 +6,23 @@
buildPythonPackage rec {
pname = "versioneer";
version = "0.21";
disabled = pythonOlder "3.6";
version = "0.22";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "64f2dbcbbed15f9a6da2b85f643997db729cf496cafdb97670fb2fa73a7d8e20";
hash = "sha256-nw6aLLXvUhy/0QTUOiCN2RJN+0rM+nLWlODQQwoBQrw=";
};
# Couldn't get tests to work because, for instance, they used virtualenv and
# pip.
doCheck = false;
pythonImportsCheck = [ "versioneer" ];
pythonImportsCheck = [
"versioneer"
];
meta = with lib; {
description = "Version-string management for VCS-controlled trees";

View File

@ -32,13 +32,13 @@ with py.pkgs;
buildPythonApplication rec {
pname = "checkov";
version = "2.0.921";
version = "2.0.923";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
hash = "sha256-Bl9zwJGyZN5vJVpy63GeaCQ+4X0dYMTAV4FtT96L42U=";
hash = "sha256-EvT1nEE58gtlpRKEZkVaZ0mjABldmioW9u1foF8RCJI=";
};
nativeBuildInputs = with py.pkgs; [

View File

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2022.3.2";
version = "2022.3.3";
components = {
"abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ];

View File

@ -158,7 +158,7 @@ let
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
# Don't forget to run parse-requirements.py after updating
hassVersion = "2022.3.2";
hassVersion = "2022.3.3";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@ -176,7 +176,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
hash = "sha256-oFFRqacLAAhiH+3HF/oZlkEJQ+pf7bZ0gOFyB92t9U4=";
hash = "sha256-qe9/VFcEBDfSa7AYrkmj1b6UGLHcm7CtLHiPwzZz8jg=";
};
# leave this in, so users don't have to constantly update their downstream patch handling

View File

@ -4,7 +4,7 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend";
version = "20220301.0";
version = "20220301.1";
format = "wheel";
src = fetchPypi {
@ -12,7 +12,7 @@ buildPythonPackage rec {
pname = "home_assistant_frontend";
dist = "py3";
python = "py3";
sha256 = "sha256-Gshw8GIiZfFHmldvxBhUKZ5NFWuBIA6ug7m7eEfQ+ao=";
sha256 = "sha256-+S888lUHbWqEJQm5HvZqimTfqoDEHYRVAoGQ5UvU4u4=";
};
# there is nothing to strip in this package

View File

@ -256,6 +256,7 @@ in
sha256 = "sha256-UXiitc3jZlgXlCsDPS+xEFLNRVgRbn8BCCXUEqAWlII=";
};
inputs = [ pkgs.curl pkgs.geoip pkgs.libmodsecurity pkgs.libxml2 pkgs.lmdb pkgs.yajl ];
disableIPC = true;
};
moreheaders = {

View File

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "icingaweb2";
version = "2.9.5";
version = "2.9.6";
src = fetchFromGitHub {
owner = "Icinga";
repo = "icingaweb2";
rev = "v${version}";
sha256 = "sha256-yKnG+wxWVgLwG9hRRiLPmNzm9pBrf/mh5V/lLdj8Sv8=";
sha256 = "sha256:1kcn1kkhm8fkwhjqmpysd2hvnrvh6bka8r67yq8d58m117l9wnpq";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -11,11 +11,11 @@ in
with python3.pkgs;
buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.53.0";
version = "1.54.0";
src = fetchPypi {
inherit pname version;
sha256 = "0pp9l3191rg9iildknm1s1phi896y7zh7b3a6m16f6bmchmn8jz3";
sha256 = "sha256-TmUu6KpL111mjd4Dgm/kYnKpDZjw9rWrpMQ5isXmWRo=";
};
buildInputs = [ openssl ];

View File

@ -1,6 +1,7 @@
{ lib
, python3
, fetchFromGitHub
, espeak-ng
}:
# USAGE:
@ -30,14 +31,14 @@ let
in
python.pkgs.buildPythonApplication rec {
pname = "tts";
version = "0.5.0";
version = "0.6.1";
format = "setuptools";
src = fetchFromGitHub {
owner = "coqui-ai";
repo = "TTS";
rev = "v${version}";
sha256 = "sha256-9fNYNhHS9wqrk2bZnrkkGU1OaDu/16RA8fz+Zj9xsyQ=";
sha256 = "sha256-YzMR/Tl1UvjdSqV/h4lYR6DuarEqEIM7RReqYznFU4Q=";
};
postPatch = let
@ -48,7 +49,7 @@ python.pkgs.buildPythonApplication rec {
"numba"
"numpy"
"umap-learn"
"torch"
"unidic-lite"
];
in ''
sed -r -i \
@ -65,6 +66,7 @@ python.pkgs.buildPythonApplication rec {
propagatedBuildInputs = with python.pkgs; [
anyascii
coqpit
coqui-trainer
flask
fsspec
gdown
@ -92,29 +94,19 @@ python.pkgs.buildPythonApplication rec {
];
postInstall = ''
cp -r TTS/server/templates/ $out/${python3.sitePackages}/TTS/server
cp -r TTS/server/templates/ $out/${python.sitePackages}/TTS/server
# cython modules are not installed for some reasons
(
cd TTS/tts/utils/monotonic_align
${python3.interpreter} setup.py install --prefix=$out
${python.interpreter} setup.py install --prefix=$out
)
'';
checkInputs = with python3.pkgs; [
pytest-sugar
checkInputs = with python.pkgs; [
espeak-ng
pytestCheckHook
];
disabledTests = [
# RuntimeError: fft: ATen not compiled with MKL support
"test_torch_stft"
"test_stft_loss"
"test_multiscale_stft_loss"
# Requires network acccess to download models
"test_synthesize"
"test_run_all_models"
];
preCheck = ''
# use the installed TTS in $PYTHONPATH instead of the one from source to also have cython modules.
mv TTS{,.old}
@ -125,22 +117,49 @@ python.pkgs.buildPythonApplication rec {
for file in $(grep -rl 'python TTS/bin' tests); do
substituteInPlace "$file" \
--replace "python TTS/bin" "${python3.interpreter} $out/lib/${python3.libPrefix}/site-packages/TTS/bin"
--replace "python TTS/bin" "${python.interpreter} $out/lib/${python.libPrefix}/site-packages/TTS/bin"
done
'';
disabledTests = [
# Requires network acccess to download models
"test_synthesize"
"test_run_all_models"
# Mismatch between phonemes
"test_text_to_ids_phonemes_with_eos_bos_and_blank"
# Takes too long
"test_parametrized_wavernn_dataset"
];
disabledTestPaths = [
# requires tensorflow
"tests/vocoder_tests/test_vocoder_tf_pqmf.py"
"tests/vocoder_tests/test_vocoder_tf_melgan_generator.py"
"tests/tts_tests/test_tacotron2_tf_model.py"
# RuntimeError: fft: ATen not compiled with MKL support
# phonemes mismatch between espeak-ng and gruuts phonemizer
"tests/text_tests/test_phonemizer.py"
# no training, it takes too long
"tests/aux_tests/test_speaker_encoder_train.py"
"tests/tts_tests/test_align_tts_train.py"
"tests/tts_tests/test_fast_pitch_speaker_emb_train.py"
"tests/tts_tests/test_fast_pitch_train.py"
"tests/tts_tests/test_glow_tts_d-vectors_train.py"
"tests/tts_tests/test_glow_tts_speaker_emb_train.py"
"tests/tts_tests/test_glow_tts_train.py"
"tests/tts_tests/test_speedy_speech_train.py"
"tests/tts_tests/test_tacotron2_d-vectors_train.py"
"tests/tts_tests/test_tacotron2_speaker_emb_train.py"
"tests/tts_tests/test_tacotron2_train.py"
"tests/tts_tests/test_tacotron2_train_fsspec_path.py"
"tests/tts_tests/test_tacotron_train.py"
"tests/tts_tests/test_vits_d-vectors_train.py"
"tests/tts_tests/test_vits_multilingual_speaker_emb_train.py"
"tests/tts_tests/test_vits_multilingual_train-d_vectors.py"
"tests/tts_tests/test_vits_speaker_emb_train.py"
"tests/tts_tests/test_vits_train.py"
"tests/vocoder_tests/test_wavegrad_train.py"
"tests/vocoder_tests/test_parallel_wavegan_train.py"
"tests/vocoder_tests/test_fullband_melgan_train.py"
"tests/vocoder_tests/test_hifigan_train.py"
"tests/vocoder_tests/test_melgan_train.py"
"tests/vocoder_tests/test_multiband_melgan_train.py"
"tests/vocoder_tests/test_parallel_wavegan_train.py"
"tests/vocoder_tests/test_melgan_train.py"
"tests/vocoder_tests/test_wavernn_train.py"
];
meta = with lib; {
@ -148,6 +167,6 @@ python.pkgs.buildPythonApplication rec {
changelog = "https://github.com/coqui-ai/TTS/releases/tag/v${version}";
description = "Deep learning toolkit for Text-to-Speech, battle-tested in research and production";
license = licenses.mpl20;
maintainers = with maintainers; [ hexa mic92 ];
maintainers = teams.tts.members;
};
}

View File

@ -1,25 +1,36 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, libnet, libpcap }:
{ lib
, stdenv
, fetchFromGitHub
, autoreconfHook
, libnet
, libpcap
}:
stdenv.mkDerivation rec {
version = "2.22";
pname = "arping";
buildInputs = [ libnet libpcap ];
version = "2.23";
src = fetchFromGitHub {
owner = "ThomasHabets";
repo = pname;
rev = "${pname}-${version}";
sha256 = "sha256-yFSLhhyz6i7xyJR8Ax8FnHFGNe/HE40YirkkeefBqC4=";
hash = "sha256-Yn0EFb23VJvcVluQhwGHg9cdnZ8LKlBEds7cq8Irftc=";
};
nativeBuildInputs = [ autoreconfHook ];
nativeBuildInputs = [
autoreconfHook
];
buildInputs = [
libnet
libpcap
];
meta = with lib; {
description = "Broadcasts a who-has ARP packet on the network and prints answers";
homepage = "https://github.com/ThomasHabets/arping";
license = with licenses; [ gpl2 ];
maintainers = [ maintainers.michalrus ];
license = with licenses; [ gpl2Plus ];
maintainers = with maintainers; [ michalrus ];
platforms = platforms.unix;
};
}

View File

@ -1,32 +1,145 @@
{ mkDerivation, ansi-terminal, async, attoparsec, base, containers
, cassava, directory, HUnit, mtl, nix-derivation, process, relude, lib
, stm, terminal-size, text, time, unix, wcwidth, fetchFromGitHub
, lock-file, data-default, expect, runtimeShell
# This file has been autogenerate with cabal2nix.
# Update via ./update.sh"
{
mkDerivation,
ansi-terminal,
async,
attoparsec,
base,
cassava,
containers,
data-default,
directory,
expect,
extra,
fetchzip,
filepath,
generic-optics,
HUnit,
lib,
lock-file,
MemoTrie,
mtl,
nix-derivation,
optics,
process,
random,
relude,
runtimeShell,
safe,
stm,
streamly,
terminal-size,
text,
time,
unix,
vector,
wcwidth,
}:
mkDerivation rec {
mkDerivation {
pname = "nix-output-monitor";
version = "1.0.5.0";
src = fetchFromGitHub {
owner = "maralorn";
repo = "nix-output-monitor";
hash = "sha256-7vjGE/MfRlFplGQBkhYwqMWjiFfky7J9aI8Tt5FycBo=";
rev = "v${version}";
version = "1.1.1.0";
src = fetchzip {
url = "https://github.com/maralorn/nix-output-monitor/archive/refs/tags/v1.1.1.0.tar.gz";
sha256 = "1zw7x1snyycl1bp5w7jh8wwnynqvw3g4glr293bnzi5jyirj5wlg";
};
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
ansi-terminal async attoparsec base cassava containers directory mtl
nix-derivation relude stm terminal-size text time unix wcwidth lock-file
ansi-terminal
async
attoparsec
base
cassava
containers
data-default
directory
extra
filepath
generic-optics
lock-file
MemoTrie
mtl
nix-derivation
optics
random
relude
safe
stm
streamly
terminal-size
text
time
unix
vector
wcwidth
];
executableHaskellDepends = [
ansi-terminal async attoparsec base containers directory mtl
nix-derivation relude stm text time unix
ansi-terminal
async
attoparsec
base
cassava
containers
data-default
directory
extra
filepath
generic-optics
lock-file
MemoTrie
mtl
nix-derivation
optics
random
relude
safe
stm
streamly
terminal-size
text
time
unix
vector
wcwidth
];
testHaskellDepends = [
ansi-terminal async attoparsec base containers directory HUnit mtl
nix-derivation process relude stm text time unix
ansi-terminal
async
attoparsec
base
cassava
containers
data-default
directory
extra
filepath
generic-optics
HUnit
lock-file
MemoTrie
mtl
nix-derivation
optics
process
random
relude
safe
stm
streamly
terminal-size
text
time
unix
vector
wcwidth
];
homepage = "https://github.com/maralorn/nix-output-monitor";
description = "Parses output of nix-build to show additional information";
license = lib.licenses.agpl3Plus;
maintainers = with lib.maintainers; [maralorn];
passthru.updateScript = ./update.sh;
testTarget = "unit-tests";
postInstall = ''
cat > $out/bin/nom-build << EOF
#!${runtimeShell}
@ -34,8 +147,4 @@ mkDerivation rec {
EOF
chmod a+x $out/bin/nom-build
'';
homepage = "https://github.com/maralorn/nix-output-monitor";
description = "Parses output of nix-build to show additional information";
license = lib.licenses.agpl3Plus;
maintainers = [ lib.maintainers.maralorn ];
}

View File

@ -0,0 +1,40 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p cabal2nix curl jq alejandra
#
# This script will update the nix-output-monitor derivation to the latest version using
# cabal2nix.
set -eo pipefail
# This is the directory of this update.sh script.
script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
derivation_file="${script_dir}/default.nix"
# This is the latest released version of nix-output-monitor on GitHub.
new_version=$(curl --silent "https://api.github.com/repos/maralorn/nix-output-monitor/releases" | jq '.[0].tag_name' --raw-output)
echo "Updating nix-output-monitor to version $new_version."
echo "Running cabal2nix and outputting to ${derivation_file}..."
cat > "$derivation_file" << EOF
# This file has been autogenerate with cabal2nix.
# Update via ./update.sh"
EOF
cabal2nix --extra-arguments expect --extra-arguments runtimeShell --maintainer maralorn "https://github.com/maralorn/nix-output-monitor/archive/refs/tags/${new_version}.tar.gz" | head -n-1 >> "$derivation_file"
cat >> "$derivation_file" << EOF
passthru.updateScript = ./update.sh;
testTarget = "unit-tests";
postInstall = ''
cat > \$out/bin/nom-build << EOF
#!\${runtimeShell}
\${expect}/bin/unbuffer nix-build "\\\$@" 2>&1 | exec \$out/bin/nom
EOF
chmod a+x \$out/bin/nom-build
'';
}
EOF
alejandra "${derivation_file}" | cat
echo "Finished."

View File

@ -14,11 +14,11 @@
stdenv.mkDerivation rec {
pname = "sudo";
version = "1.9.9";
version = "1.9.10";
src = fetchurl {
url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz";
sha256 = "sha256-bW7oY6O8Jsh2YQk6dOxj4Q/QMc66cUZC0hY23+JePgA=";
sha256 = "sha256-RKFGEJjnx7jmrFl0mcJPsuQ3SMDBOai0lE5X0TSaZPQ=";
};
prePatch = ''

View File

@ -1059,7 +1059,9 @@ with pkgs;
weidu = callPackage ../tools/games/weidu { };
weylus = callPackage ../applications/graphics/weylus { };
weylus = callPackage ../applications/graphics/weylus {
inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa VideoToolbox;
};
gfshare = callPackage ../tools/security/gfshare { };

View File

@ -1509,6 +1509,8 @@ in {
coqpit = callPackage ../development/python-modules/coqpit { };
coqui-trainer = callPackage ../development/python-modules/coqui-trainer {};
cepa = callPackage ../development/python-modules/cepa { };
cerberus = callPackage ../development/python-modules/cerberus { };
@ -9878,6 +9880,8 @@ in {
tgcrypto = callPackage ../development/python-modules/tgcrypto { };
theano-pymc = callPackage ../development/python-modules/theano-pymc { };
Theano = callPackage ../development/python-modules/Theano rec {
cudaSupport = pkgs.config.cudaSupport or false;
cudnnSupport = cudaSupport;