Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2022-03-09 12:01:59 +00:00 committed by GitHub
commit f6b4a4048a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
122 changed files with 1551 additions and 855 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

@ -1,7 +1,7 @@
{
x86_64-linux = "/nix/store/67amfijcvhqfgz4bwf2izsvbnklwjbvk-nix-2.6.0";
i686-linux = "/nix/store/kinl99f619b2xsma4qnzhidbp65axyzm-nix-2.6.0";
aarch64-linux = "/nix/store/8zpm63nn7k4n1alp9a0fcilpgc8j014z-nix-2.6.0";
x86_64-darwin = "/nix/store/hw5v03wnc0k1pwgiyhblwlxb1fx5zyx8-nix-2.6.0";
aarch64-darwin = "/nix/store/669p1vjnzi56fib98qczwlaglcwcnip4-nix-2.6.0";
x86_64-linux = "/nix/store/0n2wfvi1i3fg97cjc54wslvk0804y0sn-nix-2.7.0";
i686-linux = "/nix/store/4p27c1k9z99pli6x8cxfph20yfyzn9nh-nix-2.7.0";
aarch64-linux = "/nix/store/r9yr8ijsb0gi9r7y92y3yzyld59yp0kj-nix-2.7.0";
x86_64-darwin = "/nix/store/hyfj5imsd0c4amlcjpf8l6w4q2draaj3-nix-2.7.0";
aarch64-darwin = "/nix/store/9l96qllhbb6xrsjaai76dn74ap7rq92n-nix-2.7.0";
}

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

@ -59,7 +59,7 @@ $ENV{NIXOS_ACTION} = $action;
# This is a NixOS installation if it has /etc/NIXOS or a proper
# /etc/os-release.
die "This is not a NixOS installation!\n" unless
-f "/etc/NIXOS" || (read_file("/etc/os-release", err_mode => 'quiet') // "") =~ /ID=nixos/s;
-f "/etc/NIXOS" || (read_file("/etc/os-release", err_mode => 'quiet') // "") =~ /ID="?nixos"?/s;
openlog("nixos", "", LOG_USER);

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

@ -1,5 +1,6 @@
{ lib
, stdenv
, darwin
, fetchurl
, autoconf
, automake
@ -27,16 +28,25 @@ stdenv.mkDerivation rec {
sha256 = "3c9dcb686217b2efe0e988e90b95777c4591e3335e259e01a94af87e0bf01809";
};
nativeBuildInputs = [ autogen autoconf automake gettext libtool pkg-config py3 unzip which ];
# when building on darwin we need dawin.cctools to provide the correct libtool
# as libwally-core detects the host as darwin and tries to add the -static
# option to libtool, also we have to add the modified gsed package.
nativeBuildInputs = [ autogen autoconf automake gettext pkg-config py3 unzip which ]
++ lib.optionals stdenv.isDarwin [ darwin.cctools darwin.autoSignDarwinBinariesHook ] ++ [ libtool ];
buildInputs = [ gmp libsodium sqlite zlib ];
postPatch = ''
# this causes some python trouble on a darwin host so we skip this step.
# also we have to tell libwally-core to use sed instead of gsed.
postPatch = if !stdenv.isDarwin then ''
patchShebangs \
tools/generate-wire.py \
tools/update-mocks.sh \
tools/mockup.sh \
devtools/sql-rewrite.py
'' else ''
substituteInPlace external/libwally-core/tools/autogen.sh --replace gsed sed && \
substituteInPlace external/libwally-core/configure.ac --replace gsed sed
'';
configureFlags = [ "--disable-developer" "--disable-valgrind" ];
@ -56,6 +66,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/ElementsProject/lightning";
maintainers = with maintainers; [ jb55 prusnak ];
license = licenses.mit;
platforms = platforms.linux;
platforms = platforms.linux ++ platforms.darwin;
};
}

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

@ -0,0 +1,78 @@
{ lib
, mkDerivation
, fetchpatch
, fetchFromGitHub
, cmake
, extra-cmake-modules
, qtbase
, wrapQtAppsHook
, libraw
, exiv2
, zlib
, alglib
, pkg-config
, makeDesktopItem
, copyDesktopItems
}:
mkDerivation rec {
pname = "hdrmerge";
version = "unstable-2020-11-12";
src = fetchFromGitHub {
owner = "jcelaya";
repo = "hdrmerge";
rev = "f5a2538cffe3e27bd9bea5d6a199fa211d05e6da";
sha256 = "1bzf9wawbdvdbv57hnrmh0gpjfi5hamgf2nwh2yzd4sh1ssfa8jz";
};
nativeBuildInputs = [
cmake
pkg-config
wrapQtAppsHook
copyDesktopItems
];
buildInputs = [ qtbase libraw exiv2 zlib alglib ];
cmakeFlags = [
"-DALGLIB_DIR:PATH=${alglib}"
];
patches = [
(fetchpatch {
# patch FindAlglib.cmake to respect ALGLIB_DIR
# see https://github.com/jcelaya/hdrmerge/pull/213
name = "patch-hdrmerge-CMake.patch";
url = "https://github.com/mkroehnert/hdrmerge/commit/472b2dfe7d54856158aea3d5412a02d0bab1da4c.patch";
sha256 = "0jc713ajr4w08pfbi6bva442prj878nxp1fpl9112i3xj34x9sdi";
})
];
desktopItems = [
(makeDesktopItem {
name = "HDRMerge";
genericName = "HDR raw image merge";
desktopName = "HDRMerge";
comment = meta.description;
icon = "hdrmerge";
exec = "@out@/bin/hdrmerge -F";
categories = [ "Graphics" ];
mimeTypes = [ "image/x-dcraw" "image/x-adobe-dng" ];
terminal = false;
})
];
postInstallPhase = ''
# Make a desktop item
mkdir -p $out/share/icons/ $out/share/applications/
cp ../data/images/logo.png $out/share/icons/hdrmerge.png
'';
meta = with lib; {
homepage = "https://github.com/jcelaya/hdrmerge";
description = "Combines two or more raw images into an HDR";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = [ maintainers.paperdigits ];
};
}

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

@ -1,11 +1,11 @@
{
"packageVersion": "97.0.1-1",
"packageVersion": "97.0.2-1",
"source": {
"rev": "97.0.1-1",
"sha256": "10gbnkmyivawwqn3gf5c98l49b03j70gbniaar8bfl80j8av0v5j"
"rev": "97.0.2-1",
"sha256": "0pk9ci0wvz61879w3fvy8p1w4w8anv5s7rfiimz21m351gcf3d7m"
},
"firefox": {
"version": "97.0.1",
"sha512": "8620aace77167593aab5acd230860eb3e67eeddc49c0aad0491b5dc20bd0ddb6089dbb8975aed241426f57b2ad772238b04d03b95390175f580cbd80bb6d5f6c"
"version": "97.0.2",
"sha512": "efbf33723f5979025454b6cc183927afb4bc72a51c00b5d45940122da596b8ac99080f3a6a59f5dd85a725e356349ec57e7eba1c36cdab7d55a28b04895d274c"
}
}

View file

@ -7,16 +7,16 @@ in
rec {
firefox = common rec {
pname = "firefox";
version = "97.0.2";
version = "98.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "efbf33723f5979025454b6cc183927afb4bc72a51c00b5d45940122da596b8ac99080f3a6a59f5dd85a725e356349ec57e7eba1c36cdab7d55a28b04895d274c";
sha512 = "5b9186dd2a5dee5f2d2a2ce156fc06e2073cf71a70891a294cf3358218592f19ec3413d33b68d6f38e3cc5f940213e590a188e2b6efc39f416e90a55f89bfd9b";
};
meta = {
description = "A web browser built from Firefox source tree";
homepage = "http://www.mozilla.com/en-US/firefox/";
maintainers = with lib.maintainers; [ eelco lovesegfault hexa ];
maintainers = with lib.maintainers; [ lovesegfault hexa ];
platforms = lib.platforms.unix;
badPlatforms = lib.platforms.darwin;
broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory".
@ -32,10 +32,10 @@ rec {
firefox-esr-91 = common rec {
pname = "firefox-esr";
version = "91.6.1esr";
version = "91.7.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "e72ff7114e251ec3558f47bb45e4017fe4c665a95e0a108d5818c628b3de44c92f57cfb3dd9f5a25b7abad889be228f89dda838bc20fc9617c90655694184ed5";
sha512 = "925811989d8a91d826ba356bd46ac54be8153288ec0319c28d2bfbe89191e62e107691159dd7ca247253e2a4952eb59a5b9613e3feea3f5351238d4822e26301";
};
meta = {

View file

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

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "clusterctl";
version = "1.1.2";
version = "1.1.3";
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = "cluster-api";
rev = "v${version}";
sha256 = "sha256-IjkksHa94gkNiaeksGHlLdeHlLS/uwI0GnKK0d3s5wk=";
sha256 = "sha256-0njXmYhZM4DXFeK9KboXnVw8uHdz4PFJ2aJxwhgyEc8=";
};
vendorSha256 = "sha256-3PzaMB7U19HnqS+zRbIupErE1S8+MzG92vQFq3oxHpE=";
vendorSha256 = "sha256-JVRLPsfI1ITilAOkVIAa2IjjuAlJ2PCpvYEkhnTzRDA=";
subPackages = [ "cmd/clusterctl" ];

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

@ -25,7 +25,7 @@ flutter.mkFlutterApp rec {
icon = "fluffychat";
desktopName = "Fluffychat";
genericName = "Chat with your friends (matrix client)";
categories = "Chat;Network;InstantMessaging;";
categories = [ "Chat" "Network" "InstantMessaging" ];
};
buildInputs = [
@ -49,7 +49,7 @@ flutter.mkFlutterApp rec {
# replace olm dummy path
postConfigure = ''
M=$(echo $TMP/.pub-cache/hosted/pub.dartlang.org/matrix-*)
M=$(echo $depsFolder/.pub-cache/hosted/pub.dartlang.org/matrix-*)
ln -sf ${olm}/lib/libolm.so.3 $M/ffi/olm/libolm.so
'';

View file

@ -976,13 +976,13 @@ let
sha512 = "uUbetCWczQHbsKyX1C99XpQHBM8SWfovvaZhPIj23/1uV7SQf0WeRZbiLpw0JZm+LHTChfNgrLfDJOVoU2kU+A==";
};
};
"aws-sdk-2.1083.0" = {
"aws-sdk-2.1087.0" = {
name = "aws-sdk";
packageName = "aws-sdk";
version = "2.1083.0";
version = "2.1087.0";
src = fetchurl {
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1083.0.tgz";
sha512 = "o9pOC3LrkJRKLwSumdFrNWzGAVRNPGt4EFS48/917BaFafvnOAzOG/DM8cl5yguz3wT7eylj92I4pP2TE3qZIQ==";
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1087.0.tgz";
sha512 = "m5EERT29Fwh2cv3SaSdygeAjJBXnjSaXRRERy70bf6PQ7KgmASJouBxY11g5G7LTEPK/yfB0TGshujKh3hEtPA==";
};
};
"aws-sign2-0.7.0" = {
@ -2956,13 +2956,13 @@ let
sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==";
};
};
"has-symbols-1.0.2" = {
"has-symbols-1.0.3" = {
name = "has-symbols";
packageName = "has-symbols";
version = "1.0.2";
version = "1.0.3";
src = fetchurl {
url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz";
sha512 = "chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==";
url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz";
sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==";
};
};
"has-tostringtag-1.0.0" = {
@ -4486,49 +4486,49 @@ let
sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==";
};
};
"n8n-core-0.106.0" = {
"n8n-core-0.107.0" = {
name = "n8n-core";
packageName = "n8n-core";
version = "0.106.0";
version = "0.107.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.106.0.tgz";
sha512 = "0aEoY00VPKNodcQl9NN2hTvqQysCNPeg/Ex1UKlt4b0xeqhkIEJ2KMILexXwHitPnTyJwXhn7ewqK7YafdKBcw==";
url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.107.0.tgz";
sha512 = "jwlEv67bPCn1Npp5SkZ11MViQgN96B2bUmSdsKPIBkJGkAPdd6BAUNAhF6qlAS53KhkbSqjuZkn71sDwbHv1cg==";
};
};
"n8n-design-system-0.12.0" = {
"n8n-design-system-0.13.0" = {
name = "n8n-design-system";
packageName = "n8n-design-system";
version = "0.12.0";
version = "0.13.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.12.0.tgz";
sha512 = "ZMPcOVL/yzsIut7mvHbIx03OxLa2z+jE3CtaZjSyK4tk2NQ8gVc+BOBAasmVCkO4CeJbdDMGDF+ktnUaC4ougw==";
url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.13.0.tgz";
sha512 = "dnweYfFdU9RLdZhmllAlF35dFp0F8Cxw2YAVPMTYOJ2saTs992kvI+09k5iVHDdRxA92BKRXgRRfvY1p0goXcQ==";
};
};
"n8n-editor-ui-0.132.1" = {
"n8n-editor-ui-0.133.0" = {
name = "n8n-editor-ui";
packageName = "n8n-editor-ui";
version = "0.132.1";
version = "0.133.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.132.1.tgz";
sha512 = "Kggz0oSLjmh/kqIkerfTaPqGE+qk8mEK9Vs7ZxgmQ4CdRreELSBBVGZiuZALfDjm//+hUF2VnLU3PWUm6uqfDg==";
url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.133.0.tgz";
sha512 = "lKi2eyx5mn5vfo5sArvsnQ+1khdkX7I1Aqml5VFgzTUhHDLZB2Pvupu+czE55l9QSGs6oqaN9a9NRblWOHc0zQ==";
};
};
"n8n-nodes-base-0.163.0" = {
"n8n-nodes-base-0.164.0" = {
name = "n8n-nodes-base";
packageName = "n8n-nodes-base";
version = "0.163.0";
version = "0.164.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.163.0.tgz";
sha512 = "kLndPbDemejOGROHrf5KHs7E1yQ5JwwAdyhJpzWX4M2C2Od52YRk4G97r5FZsaxW/e6vJawY6tw1O6PVM1H6nw==";
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.164.0.tgz";
sha512 = "5GSd0f1rQZfKt9e0S1zwn5K34TSd1lYkd3MEPKDHjvksxfNOumtZpf0rwEgb/7Uf6azw7ESqk4VXwxiVQu0sgw==";
};
};
"n8n-workflow-0.88.0" = {
"n8n-workflow-0.89.0" = {
name = "n8n-workflow";
packageName = "n8n-workflow";
version = "0.88.0";
version = "0.89.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.88.0.tgz";
sha512 = "Rrlw7MqzPS0Q8T2AIe+aDioIkxC9v1aDbs5L0L/SDlGe54W2uG9qmLZ9/TTfzZZ4qzXX6fTEMNbICVmlmbEaUQ==";
url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.89.0.tgz";
sha512 = "hggmmjHsa3VjP5puRssH4Q8hoigqJ3W+KQeY54Qsa1rJoJEjZYy53NGOQ3QMmuPuTUvVMHe4Z/Hb6u4Bbh1wAg==";
};
};
"named-placeholders-1.1.2" = {
@ -6340,13 +6340,13 @@ let
sha512 = "1SdTNo+BVU211Xj1csWa8lV6KM0CtucDwRyA0VHl91wEH1Mgh7RxUpI4rVvG7OhHrzCSGaVyW5g8vKvlrk9DJA==";
};
};
"sqlstring-2.3.2" = {
"sqlstring-2.3.3" = {
name = "sqlstring";
packageName = "sqlstring";
version = "2.3.2";
version = "2.3.3";
src = fetchurl {
url = "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.2.tgz";
sha512 = "vF4ZbYdKS8OnoJAWBmMxCQDkiEBkGQYU7UZPtL8flbDRSNkhaXvRJ279ZtI6M+zDaQovVU4tuRgzK5fVhvFAhg==";
url = "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.3.tgz";
sha512 = "qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg==";
};
};
"sse-channel-3.1.1" = {
@ -6367,13 +6367,13 @@ let
sha512 = "+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==";
};
};
"ssh2-1.6.0" = {
"ssh2-1.7.0" = {
name = "ssh2";
packageName = "ssh2";
version = "1.6.0";
version = "1.7.0";
src = fetchurl {
url = "https://registry.npmjs.org/ssh2/-/ssh2-1.6.0.tgz";
sha512 = "lxc+uvXqOxyQ99N2M7k5o4pkYDO5GptOTYduWw7hIM41icxvoBcCNHcj+LTKrjkL0vFcAl+qfZekthoSFRJn2Q==";
url = "https://registry.npmjs.org/ssh2/-/ssh2-1.7.0.tgz";
sha512 = "u1gdFfqKV1PTGR2szS5FImhFii40o+8FOUpg1M//iimNaS4BkTyUVfVdoydXS93M1SquOU02Z4KFhYDBNqQO+g==";
};
};
"ssh2-sftp-client-7.2.2" = {
@ -7375,13 +7375,13 @@ let
sha1 = "52a63e56ca0b84a7f3a5f3d61872f126ad7a5943";
};
};
"xss-1.0.10" = {
"xss-1.0.11" = {
name = "xss";
packageName = "xss";
version = "1.0.10";
version = "1.0.11";
src = fetchurl {
url = "https://registry.npmjs.org/xss/-/xss-1.0.10.tgz";
sha512 = "qmoqrRksmzqSKvgqzN0055UFWY7OKx1/9JWeRswwEVX9fCG5jcYRxa/A2DHcmZX6VJvjzHRQ2STeeVcQkrmLSw==";
url = "https://registry.npmjs.org/xss/-/xss-1.0.11.tgz";
sha512 = "EimjrjThZeK2MO7WKR9mN5ZC1CSqivSl55wvUK5EtU6acf0rzEE1pN+9ZDrFXJ82BRp3JL38pPE6S4o/rpp1zQ==";
};
};
"xtend-4.0.2" = {
@ -7480,10 +7480,10 @@ in
n8n = nodeEnv.buildNodePackage {
name = "n8n";
packageName = "n8n";
version = "0.165.1";
version = "0.166.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n/-/n8n-0.165.1.tgz";
sha512 = "bezUoR+PGGZIoZ4fV7BfH3C9poVJj0GXBkswsA2nhCSGoE2WExhLFEh8mR1ExDUqCwe9mhVLUEdJHO/RNJAD4g==";
url = "https://registry.npmjs.org/n8n/-/n8n-0.166.0.tgz";
sha512 = "t8tRpOyrEIxaIuLzfBajDPjAMygcCapiIqHDjU8YloJalI0MnbuoQ6DgA2RdRDZElN0yew0rQR8ZxZ2nMUk8Fg==";
};
dependencies = [
(sources."@azure/abort-controller-1.0.5" // {
@ -7664,7 +7664,7 @@ in
];
})
sources."avsc-5.7.3"
(sources."aws-sdk-2.1083.0" // {
(sources."aws-sdk-2.1087.0" // {
dependencies = [
sources."buffer-4.9.2"
sources."events-1.1.1"
@ -8011,7 +8011,7 @@ in
})
sources."has-bigints-1.0.1"
sources."has-flag-4.0.0"
sources."has-symbols-1.0.2"
sources."has-symbols-1.0.3"
sources."has-tostringtag-1.0.0"
sources."has-unicode-2.0.1"
sources."he-1.2.0"
@ -8224,19 +8224,19 @@ in
];
})
sources."mz-2.7.0"
(sources."n8n-core-0.106.0" // {
(sources."n8n-core-0.107.0" // {
dependencies = [
sources."qs-6.10.3"
];
})
sources."n8n-design-system-0.12.0"
sources."n8n-editor-ui-0.132.1"
(sources."n8n-nodes-base-0.163.0" // {
sources."n8n-design-system-0.13.0"
sources."n8n-editor-ui-0.133.0"
(sources."n8n-nodes-base-0.164.0" // {
dependencies = [
sources."iconv-lite-0.6.3"
];
})
sources."n8n-workflow-0.88.0"
sources."n8n-workflow-0.89.0"
(sources."named-placeholders-1.1.2" // {
dependencies = [
sources."lru-cache-4.1.5"
@ -8534,10 +8534,10 @@ in
})
sources."sprintf-js-1.1.2"
sources."sqlite3-5.0.2"
sources."sqlstring-2.3.2"
sources."sqlstring-2.3.3"
sources."sse-channel-3.1.1"
sources."ssf-0.11.2"
sources."ssh2-1.6.0"
sources."ssh2-1.7.0"
sources."ssh2-sftp-client-7.2.2"
sources."sshpk-1.17.0"
sources."stack-trace-0.0.10"
@ -8695,7 +8695,7 @@ in
sources."xmlbuilder-11.0.1"
sources."xpath.js-1.1.0"
sources."xregexp-2.0.0"
(sources."xss-1.0.10" // {
(sources."xss-1.0.11" // {
dependencies = [
sources."commander-2.20.3"
];

View file

@ -1,7 +1,21 @@
{ lib, fetchurl, cups, libssh, libXpm, nx-libs, openldap, openssh
, mkDerivation, qtbase, qtsvg, qtx11extras, qttools, phonon, pkg-config }:
{ lib
, fetchurl
, cups
, libssh
, libXpm
, nx-libs
, openldap
, openssh
, qt5
, qtbase
, qtsvg
, qtx11extras
, qttools
, phonon
, pkg-config
}:
mkDerivation rec {
qt5.mkDerivation rec {
pname = "x2goclient";
version = "4.1.2.2";
@ -10,8 +24,24 @@ mkDerivation rec {
sha256 = "yZUyZ8QPpnEZrZanO6yx8mYZbaIFnwzc0bjVGZQh0So=";
};
buildInputs = [ cups libssh libXpm nx-libs openldap openssh
qtbase qtsvg qtx11extras qttools phonon pkg-config ];
buildInputs = [
cups
libssh
libXpm
nx-libs
openldap
openssh
qtbase
qtsvg
qtx11extras
qttools
phonon
];
nativeBuildInputs = [
pkg-config
qt5.wrapQtAppsHook
];
postPatch = ''
substituteInPlace src/onmainwindow.cpp --replace "/usr/sbin/sshd" "${openssh}/bin/sshd"
@ -26,7 +56,7 @@ mkDerivation rec {
installTargets = [ "install_client" "install_man" ];
qtWrapperArgs = [ "--suffix PATH : ${nx-libs}/bin:${openssh}/libexec" ];
qtWrapperArgs = [ "--suffix PATH : ${nx-libs}/bin:${openssh}/libexec" "--set QT_QPA_PLATFORM xcb" ];
meta = with lib; {
description = "Graphical NoMachine NX3 remote desktop client";

View file

@ -25,14 +25,14 @@ let
};
in
stdenv.mkDerivation rec {
version = "14.32.28";
version = "14.32.30";
pname = "jmol";
src = let
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
in fetchurl {
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
sha256 = "sha256-J5m18pHjm3mbMwmCR1v9ycPNFwJdewp6zP4pxCZ+lF0=";
sha256 = "sha256-VpOoduUA0iD+nI83GSQYQDHoK2Snog0NHkHWHfpLqFM=";
};
patchPhase = ''

View file

@ -11,7 +11,7 @@
, systemdSupport ? stdenv.isLinux
, dbusSupport ? true
, dbus
, trayEnabled ? dbusSupport
, trayEnabled ? systemdSupport && dbusSupport
}:
# The "sd-bus-provider" meson option does not include a "none" option,

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

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "yaru";
version = "21.10.2";
version = "22.04.1";
src = fetchFromGitHub {
owner = "ubuntu";
repo = "yaru";
rev = version;
sha256 = "sha256-VN/jgKGM2Th+2nv91vEz47kmQiBx8xAiEVbtXwhZg6U=";
sha256 = "sha256-5mB5eTIPw4CqYSQm675MKbRwsYLpg+5WJrLDkbc6nKs=";
};
nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ];

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

@ -33,7 +33,7 @@ buildType = if stdenv.isDarwin then
edk2 = buildStdenv.mkDerivation {
pname = "edk2";
version = "202108";
version = "202202";
# submodules
src = fetchFromGitHub {
@ -41,21 +41,9 @@ edk2 = buildStdenv.mkDerivation {
repo = "edk2";
rev = "edk2-stable${edk2.version}";
fetchSubmodules = true;
sha256 = "1ps244f7y43afxxw6z95xscy24f9mpp8g0mfn90rd4229f193ba2";
sha256 = "0srmhi6c27n5vyl01nhh0fq8k4vngbwn79siyjvcacjbj2ivhh8d";
};
patches = [
# Pull upstream fix for gcc-11 build.
(fetchpatch {
name = "gcc-11-vla.patch";
url = "https://github.com/google/brotli/commit/0a3944c8c99b8d10cc4325f721b7c273d2b41f7b.patch";
sha256 = "10c6ibnxh4f8lrh9i498nywgva32jxy2c1zzvr9mcqgblf9d19pj";
# Apply submodule patch to subdirectory: "a/" -> "BaseTools/Source/C/BrotliCompress/brotli/"
stripLen = 1;
extraPrefix = "BaseTools/Source/C/BrotliCompress/brotli/";
})
];
buildInputs = [ libuuid pythonEnv ];
makeFlags = [ "-C BaseTools" ]
@ -75,7 +63,7 @@ edk2 = buildStdenv.mkDerivation {
meta = with lib; {
description = "Intel EFI development kit";
homepage = "https://sourceforge.net/projects/edk2/";
homepage = "https://github.com/tianocore/tianocore.github.io/wiki/EDK-II/";
license = licenses.bsd2;
platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" ];
};

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

@ -19,7 +19,7 @@
let
release_version = "14.0.0";
candidate = "rc1"; # empty or "rcN"
candidate = "rc2"; # empty or "rcN"
dash-candidate = lib.optionalString (candidate != "") "-${candidate}";
rev = ""; # When using a Git commit
rev-version = ""; # When using a Git commit
@ -30,7 +30,7 @@ let
owner = "llvm";
repo = "llvm-project";
rev = if rev != "" then rev else "llvmorg-${version}";
sha256 = "sha256-bO13J5bhE4YVGvoaTuzFgf62HYh+Shv6T0u07CFjI9E=";
sha256 = "sha256-5wJEaWvwJohtjqlIsBkqQ5rE6rcWw07MaQnN1RxPb5w=";
};
llvm_meta = {

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

@ -0,0 +1,36 @@
{ lib, stdenv, fetchurl, cmake, clang }:
stdenv.mkDerivation rec {
pname = "alglib3";
version = "3.18.0";
src = fetchurl {
url = "https://www.alglib.net/translator/re/alglib-${version}.cpp.gpl.tgz";
sha256 = "0ag8dvcxzzp9riqvk4lhcbwhvh0lq54lbdnsbyr107rjfi2p1vlq";
};
nativeBuildInputs = [
cmake
clang
];
patches = [
./patch-alglib-CMakeLists.patch
];
meta = with lib; {
description = "Numerical analysis and data processing library";
homepage = "https://www.alglib.net/";
license = lib.licenses.gpl2Plus;
maintainers = [ maintainers.paperdigits ];
longDescription = ''
ALGLIB is a cross-platform numerical analysis and data processing library. It supports several programming languages (C++, C#, Delphi) and several operating systems (Windows and POSIX, including Linux). ALGLIB features include:
* Data analysis (classification/regression, statistics)
* Optimization and nonlinear solvers
* Interpolation and linear/nonlinear least-squares fitting
* Linear algebra (direct algorithms, EVD/SVD), direct and iterative linear solvers
* Fast Fourier Transform and many other algorithms
'';
};
}

View file

@ -0,0 +1,23 @@
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,20 @@
+cmake_minimum_required(VERSION 2.8)
+
+project(alglib3 CXX)
+
+file(GLOB_RECURSE sources src/*.cpp)
+file(GLOB_RECURSE headers src/*.h)
+
+add_library(${PROJECT_NAME} STATIC ${sources} ${headers})
+
+install(
+ TARGETS ${PROJECT_NAME}
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+)
+
+install(
+ FILES ${headers}
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/alglib
+)

View file

@ -11,14 +11,14 @@
stdenv.mkDerivation rec {
pname = "coeurl";
version = "0.1.1";
version = "0.2.0";
src = fetchFromGitLab {
domain = "nheko.im";
owner = "nheko-reborn";
repo = pname;
rev = "v${version}";
sha256 = "sha256-F4kHE9r2pR8hI+CrZQ9ElPjtp0McgwfSxoD5p56KDGs=";
sha256 = "sha256-IIIl+/5Omv0lYTNAjeA63ofJlBmNe3+yTOxDsvL+ak0=";
};
nativeBuildInputs = [ ninja pkg-config meson ];

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

@ -60,6 +60,7 @@
, addOpenGLRunpath
, enableGeoLocation ? true
, withLibsecret ? true
, systemdSupport ? stdenv.isLinux
}:
stdenv.mkDerivation rec {
@ -158,9 +159,10 @@ stdenv.mkDerivation rec {
bubblewrap
libseccomp
libmanette
systemd
wayland
xdg-dbus-proxy
] ++ lib.optionals systemdSupport [
systemd
] ++ lib.optionals enableGeoLocation [
geoclue2
] ++ lib.optionals withLibsecret [
@ -193,7 +195,7 @@ stdenv.mkDerivation rec {
"-DUSE_APPLE_ICU=OFF"
"-DUSE_OPENGL_OR_ES=OFF"
"-DUSE_SYSTEM_MALLOC=ON"
] ++ lib.optionals (!stdenv.isLinux) [
] ++ lib.optionals (!systemdSupport) [
"-DUSE_SYSTEMD=OFF"
] ++ lib.optionals (stdenv.isLinux && enableGLES) [
"-DENABLE_GLES2=ON"

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

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "censys";
version = "2.1.2";
version = "2.1.3";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "censys";
repo = "censys-python";
rev = "v${version}";
sha256 = "0qxqd5ip98d6q1d48vcprpr38sa47ky3cr6lprd01nzibdmf2r2d";
sha256 = "sha256-Zv3ViOrdQby+7UQrHy6174W2qh1vx21R0yOA7ecr0lU=";
};
nativeBuildInputs = [

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

@ -16,11 +16,11 @@
buildPythonPackage rec {
pname = "google-cloud-asset";
version = "3.8.0";
version = "3.8.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-4r1F7OgMS3TZdmEgXf5TtY4xv/YWInS6NyY6Ay4l8Ig=";
sha256 = "sha256-DvbHQV71hTsWtjN/D1+bHGLSss+UidCZRi3J0zTa07U=";
};
propagatedBuildInputs = [

View file

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery-logging";
version = "1.0.1";
version = "1.0.2";
src = fetchPypi {
inherit pname version;
sha256 = "3cdbf4f82199d2ee0d07fa2c75527661fe034130e27e5c05fd070ed615cd7e23";
sha256 = "sha256-i8Bh39MnQRQtE4WwDNhHdxFX2bGL6txT+sV8RcvXiZw=";
};
propagatedBuildInputs = [

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

@ -7,20 +7,32 @@
, proto-plus
, pytestCheckHook
, pytest-asyncio
, pythonOlder
}:
buildPythonPackage rec {
pname = "google-cloud-dataproc";
version = "4.0.0";
version = "4.0.1";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-x4ejr6qj5z4yKOx0pIqK13oVzsKj+uQ43Q5VN48jaFQ=";
sha256 = "sha256-IAnsz7UxMf3GqaPYPltis0WWPM+IIWwpK1iTSV7Kl5c=";
};
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
propagatedBuildInputs = [
google-api-core
libcst
proto-plus
];
checkInputs = [ mock pytestCheckHook pytest-asyncio ];
checkInputs = [
mock
pytestCheckHook
pytest-asyncio
];
disabledTests = [
# requires credentials

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

@ -7,20 +7,32 @@
, proto-plus
, pytestCheckHook
, pytest-asyncio
, pythonOlder
}:
buildPythonPackage rec {
pname = "google-cloud-language";
version = "2.4.0";
version = "2.4.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-ZqnwvpXfWGEc+yiImNGRGUXVJGiNzGFeMSmjn7MzuQE=";
sha256 = "sha256-BhQQ4QZ7GbacjpLLg5LXm1g5IhIMk3tJdDrHZLquuTk=";
};
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
propagatedBuildInputs = [
google-api-core
libcst
proto-plus
];
checkInputs = [ mock pytestCheckHook pytest-asyncio ];
checkInputs = [
mock
pytestCheckHook
pytest-asyncio
];
pythonImportsCheck = [
"google.cloud.language"

View file

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "google-cloud-org-policy";
version = "1.3.0";
version = "1.3.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-IbQP2/XMdwzmY3UgINiUvdd1Y1ABJkhh7x7x3kiR4Is=";
sha256 = "sha256-r9qz2/HjDYHXu9jY03rt0QC1BofzQ/HrKVjGCtvXzsU=";
};
propagatedBuildInputs = [ google-api-core 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

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-tasks";
version = "2.8.0";
version = "2.8.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-/iEexbBw/lBhD+7BawaYHQpDB98jxqJB4hkmUaFHJN8=";
sha256 = "sha256-VfRDZRgwq1pOwjzmq6mdbVqcT6wQdD6qOMivQn4Ua10=";
};
propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ];

View file

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-trace";
version = "1.6.0";
version = "1.6.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-MXbuSWVezxsXGrRgGqhLWFF5iByiYRKA1/qbqYawPRQ=";
sha256 = "sha256-JkKW9vJAAkw3sHYDapRvu5jjunV8oWSg/ykDmd1wpyA=";
};
propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ];

View file

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "google-cloud-translate";
version = "3.7.1";
version = "3.7.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-x4gSLVNo2uk93GWpvcPM20f0gJ1S3x/BVe13oNIpa0Y=";
hash = "sha256-icZG33G/noii9V0rsHTG/Qe8cKDVDfASRKy2XRYM5Yg=";
};
propagatedBuildInputs = [

View file

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "meshtastic";
version = "1.2.88";
version = "1.2.90";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "meshtastic";
repo = "Meshtastic-python";
rev = version;
sha256 = "sha256-iNDS1QjlDiXb89g7Gut+5ShbgtCCHBSJuQmXfHaTXB8=";
sha256 = "sha256-n/M1Q6YS3EkUcn45ffiTy0wuj9yKf6qBLLfD2XJkhHU=";
};
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

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "samsungtvws";
version = "2.2.0";
version = "2.3.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "sha256-yTRRcY3PTmhNku7kfrG2ff1i4hEow6JaiBvq0Ic19uI=";
sha256 = "sha256-2ly9lbnIHGHB55ml10jKE7dC5LdN1ToGW4GqfxTC5kI=";
};
propagatedBuildInputs = [

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

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-setuptools";
version = "57.4.9";
version = "57.4.10";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-U273R0T44eS+T8cZiH+IbnTkzzx5K0oGmEMgvk30ULU=";
sha256 = "sha256-mhNRNnnGQPZhbi2atQ1DHJnKiumEipckP4h8gP1c8pQ=";
};
# Module doesn't have tests

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.927";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
hash = "sha256-Bl9zwJGyZN5vJVpy63GeaCQ+4X0dYMTAV4FtT96L42U=";
hash = "sha256-g/aJT1ZbD7wrsb4M3tvGmhWbElmnZbQkP0I0KV7J80c=";
};
nativeBuildInputs = with py.pkgs; [

View file

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "fheroes2";
version = "0.9.12";
version = "0.9.13";
src = fetchFromGitHub {
owner = "ihhub";
repo = "fheroes2";
rev = version;
sha256 = "sha256-6voM6aQ22zW6NHm9x2TDsM4Kea6TLYZTdSLyc/6fz8A=";
sha256 = "sha256-+VAgS7NR/D0HD/Fy7idSUTMJPp2ctpirMpcFooo+bEg=";
};
buildInputs = [ gettext libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ];

View file

@ -1,28 +1,27 @@
diff --git a/data/meson.build b/data/meson.build
index f10d4ff6..2dc66fb6 100644
index 2ae29ce5..342cac92 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -21,7 +21,7 @@ endif
@@ -26,7 +26,7 @@ endif
if build_standalone
install_data(['daemon.conf'],
- install_dir : join_paths(sysconfdir, 'fwupd')
+ install_dir : join_paths(sysconfdir_install, 'fwupd')
)
install_data(['power.quirk'],
install_data(['power.quirk', 'cfi.quirk'],
install_dir: join_paths(datadir, 'fwupd', 'quirks.d'))
diff --git a/data/pki/meson.build b/data/pki/meson.build
index dcd9e128..ff137f3a 100644
index 2a7d0f24..091981f7 100644
--- a/data/pki/meson.build
+++ b/data/pki/meson.build
@@ -2,24 +2,23 @@ install_data([
@@ -12,13 +12,13 @@ install_data([
'GPG-KEY-Linux-Foundation-Firmware',
'GPG-KEY-Linux-Vendor-Firmware-Service',
],
- install_dir : join_paths(sysconfdir, 'pki', 'fwupd')
+ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd')
)
install_data([
'GPG-KEY-Linux-Foundation-Metadata',
'GPG-KEY-Linux-Vendor-Firmware-Service',
@ -30,7 +29,9 @@ index dcd9e128..ff137f3a 100644
- install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata')
+ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd-metadata')
)
endif
@@ -26,11 +26,11 @@ if supported_pkcs7 == '1'
install_data([
'LVFS-CA.pem',
],
@ -43,7 +44,7 @@ index dcd9e128..ff137f3a 100644
- install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata')
+ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd-metadata')
)
-
endif
diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build
index 02d8777b..2c89d593 100644
--- a/data/remotes.d/meson.build
@ -82,10 +83,10 @@ index 02d8777b..2c89d593 100644
+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
)
diff --git a/meson.build b/meson.build
index 7557cd4a..4c98de6d 100644
index 394f40fa..7b602c73 100644
--- a/meson.build
+++ b/meson.build
@@ -190,6 +190,12 @@ endif
@@ -187,6 +187,12 @@ endif
mandir = join_paths(prefix, get_option('mandir'))
localedir = join_paths(prefix, get_option('localedir'))
@ -99,14 +100,14 @@ index 7557cd4a..4c98de6d 100644
gio = dependency('gio-2.0', version : '>= 2.45.8')
giounix = dependency('gio-unix-2.0', version : '>= 2.45.8', required: false)
diff --git a/meson_options.txt b/meson_options.txt
index 94f73898..5de6cc7b 100644
index c1b483cb..047dbdd8 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,4 @@
+option('sysconfdir_install', type: 'string', value: '', description: 'sysconfdir to use during installation')
option('build', type : 'combo', choices : ['all', 'standalone', 'library'], value : 'all', description : 'build type')
option('consolekit', type : 'boolean', value : true, description : 'enable ConsoleKit support')
option('firmware-packager', type : 'boolean', value : true, description : 'enable firmware-packager installation')
option('static_analysis', type : 'boolean', value : false, description : 'enable GCC static analysis support')
diff --git a/plugins/dell-esrt/meson.build b/plugins/dell-esrt/meson.build
index e9f12879..a0126dbb 100644
--- a/plugins/dell-esrt/meson.build
@ -119,8 +120,21 @@ index e9f12879..a0126dbb 100644
+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
)
endif
diff --git a/plugins/msr/meson.build b/plugins/msr/meson.build
index 3ea47456..40dbd116 100644
--- a/plugins/msr/meson.build
+++ b/plugins/msr/meson.build
@@ -12,7 +12,7 @@ install_data(['fwupd-msr.conf'],
endif
install_data(['msr.conf'],
- install_dir: join_paths(sysconfdir, 'fwupd')
+ install_dir: join_paths(sysconfdir_install, 'fwupd')
)
shared_module('fu_plugin_msr',
fu_hash,
diff --git a/plugins/redfish/meson.build b/plugins/redfish/meson.build
index 5263048c..c46fac64 100644
index 4a0a8664..7d9ba77d 100644
--- a/plugins/redfish/meson.build
+++ b/plugins/redfish/meson.build
@@ -53,7 +53,7 @@ shared_module('fu_plugin_redfish',
@ -129,14 +143,14 @@ index 5263048c..c46fac64 100644
install_data(['redfish.conf'],
- install_dir: join_paths(sysconfdir, 'fwupd'),
+ install_dir: join_paths(sysconfdir_install, 'fwupd'),
install_mode: 'rw-r-----',
)
if get_option('tests')
diff --git a/plugins/thunderbolt/meson.build b/plugins/thunderbolt/meson.build
index 646ed6cb..8d7c59aa 100644
index 1ba9562f..c074f770 100644
--- a/plugins/thunderbolt/meson.build
+++ b/plugins/thunderbolt/meson.build
@@ -35,7 +35,7 @@ fu_plugin_thunderbolt = shared_module('fu_plugin_thunderbolt',
@@ -37,7 +37,7 @@ fu_plugin_thunderbolt = shared_module('fu_plugin_thunderbolt',
)
install_data(['thunderbolt.conf'],
@ -146,7 +160,7 @@ index 646ed6cb..8d7c59aa 100644
# we use functions from 2.52 in the tests
if get_option('tests') and umockdev.found() and gio.version().version_compare('>= 2.52')
diff --git a/plugins/uefi-capsule/meson.build b/plugins/uefi-capsule/meson.build
index 708586b0..f29536b1 100644
index 04cbd51a..9a8c43de 100644
--- a/plugins/uefi-capsule/meson.build
+++ b/plugins/uefi-capsule/meson.build
@@ -21,7 +21,7 @@ if host_machine.system() == 'linux'
@ -158,7 +172,7 @@ index 708586b0..f29536b1 100644
)
elif host_machine.system() == 'freebsd'
backend_srcs += 'fu-uefi-backend-freebsd.c'
@@ -116,7 +116,7 @@ if get_option('man')
@@ -114,7 +114,7 @@ if get_option('compat_cli') and get_option('man')
endif
install_data(['uefi_capsule.conf'],

View file

@ -12,6 +12,7 @@
, libgudev
, polkit
, libxmlb
, glib
, gusb
, sqlite
, libarchive
@ -50,6 +51,9 @@
, nixosTests
, runCommand
, unstableGitUpdater
, modemmanager
, libqmi
, libmbim
}:
let
@ -112,7 +116,7 @@ let
self = stdenv.mkDerivation rec {
pname = "fwupd";
version = "1.7.2";
version = "1.7.6";
# libfwupd goes to lib
# daemon, plug-ins and libfwupdplugin go to out
@ -121,7 +125,7 @@ let
src = fetchurl {
url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
sha256 = "sha256-hjLfacO6/Fk4fNy1F8POMaWXoJAm5E9ZB9g4RnG5+DQ=";
sha256 = "sha256-fr4VFKy2iNJknOzDktuSkJTaPwPPyYqcD6zKuwhJEvo=";
};
patches = [
@ -136,15 +140,26 @@ let
# they are not really part of the library.
./install-fwupdplugin-to-out.patch
# Fix detection of installed tests
# https://github.com/fwupd/fwupd/issues/3880
(fetchpatch {
url = "https://github.com/fwupd/fwupd/commit/5bc546221331feae9cedc1892219a25d8837955f.patch";
sha256 = "XcLhcDrB2/MFCXjKAyhftQgvJG4BBkp07geM9eK3q1g=";
})
# Installed tests are installed to different output
# we also cannot have fwupd-tests.conf in $out/etc since it would form a cycle.
./installed-tests-path.patch
# Tests detect fwupd is installed when prefix is /usr.
./fix-install-detection.patch
# EFI capsule is located in fwupd-efi now.
./efi-app-path.patch
# Drop hard-coded FHS path
# https://github.com/fwupd/fwupd/issues/4360
(fetchpatch {
url = "https://github.com/fwupd/fwupd/commit/14cc2e7ee471b66ee2ef54741f4bec1f92204620.patch";
sha256 = "47682oqE66Y6QKPtN2mYpnb2+TIJFqBgsgx60LmC3FM=";
})
];
nativeBuildInputs = [
@ -187,6 +202,9 @@ let
efivar
fwupd-efi
protobufc
modemmanager
libmbim
libqmi
] ++ lib.optionals haveDell [
libsmbios
];
@ -206,6 +224,7 @@ let
"--sysconfdir=/etc"
"-Dsysconfdir_install=${placeholder "out"}/etc"
"-Defi_os_dir=nixos"
"-Dplugin_modem_manager=true"
# We do not want to place the daemon into lib (cyclic reference)
"--libexecdir=${placeholder "out"}/libexec"
@ -250,6 +269,9 @@ let
contrib/generate-version-script.py \
meson_post_install.sh \
po/test-deps
substituteInPlace data/installed-tests/fwupdmgr-p2p.sh \
--replace "gdbus" ${glib.bin}/bin/gdbus
'';
preCheck = ''
@ -301,6 +323,7 @@ let
passthru = {
filesInstalledToEtc = [
"fwupd/daemon.conf"
"fwupd/msr.conf"
"fwupd/remotes.d/lvfs-testing.conf"
"fwupd/remotes.d/lvfs.conf"
"fwupd/remotes.d/vendor.conf"

View file

@ -1,13 +0,0 @@
diff --git a/plugins/redfish/fu-self-test.c b/plugins/redfish/fu-self-test.c
index 4710c769..1c68fdb9 100644
--- a/plugins/redfish/fu-self-test.c
+++ b/plugins/redfish/fu-self-test.c
@@ -27,7 +27,7 @@ fu_test_is_installed_test(void)
const gchar *builddir = g_getenv("G_TEST_BUILDDIR");
if (builddir == NULL)
return FALSE;
- return g_str_has_prefix(builddir, "/usr");
+ return g_str_has_prefix(builddir, "/nix");
}
static void

View file

@ -1,8 +1,8 @@
diff --git a/data/installed-tests/meson.build b/data/installed-tests/meson.build
index adadbcdd..1b51bb9c 100644
index b8ec916f0..38209b363 100644
--- a/data/installed-tests/meson.build
+++ b/data/installed-tests/meson.build
@@ -65,5 +65,5 @@ configure_file(
@@ -83,5 +83,5 @@ configure_file(
output : 'fwupd-tests.conf',
configuration : con2,
install: true,
@ -10,10 +10,10 @@ index adadbcdd..1b51bb9c 100644
+ install_dir: join_paths(get_option('installed_test_prefix'), 'etc', 'fwupd', 'remotes.d'),
)
diff --git a/meson.build b/meson.build
index 772b7bbe..f59302cd 100644
index 32fe6e408..b35d741e0 100644
--- a/meson.build
+++ b/meson.build
@@ -177,8 +177,8 @@ else
@@ -183,8 +183,8 @@ else
datadir = join_paths(prefix, get_option('datadir'))
sysconfdir = join_paths(prefix, get_option('sysconfdir'))
localstatedir = join_paths(prefix, get_option('localstatedir'))
@ -24,6 +24,14 @@ index 772b7bbe..f59302cd 100644
endif
mandir = join_paths(prefix, get_option('mandir'))
localedir = join_paths(prefix, get_option('localedir'))
@@ -484,6 +484,7 @@ gnome = import('gnome')
i18n = import('i18n')
conf.set_quoted('FWUPD_PREFIX', prefix)
+conf.set_quoted('FWUPD_INSTALLED_TEST_PREFIX', get_option('installed_test_prefix'))
conf.set_quoted('FWUPD_BINDIR', bindir)
conf.set_quoted('FWUPD_LIBDIR', libdir)
conf.set_quoted('FWUPD_LIBEXECDIR', libexecdir)
diff --git a/meson_options.txt b/meson_options.txt
index 0a0e2853..5f68d78b 100644
--- a/meson_options.txt
@ -36,3 +44,16 @@ index 0a0e2853..5f68d78b 100644
option('tests', type : 'boolean', value : true, description : 'enable tests')
option('tpm', type : 'boolean', value : true, description : 'enable TPM support')
option('udevdir', type: 'string', value: '', description: 'Directory for udev rules')
diff --git a/plugins/redfish/fu-self-test.c b/plugins/redfish/fu-self-test.c
index c507fabc8..0cddc3248 100644
--- a/plugins/redfish/fu-self-test.c
+++ b/plugins/redfish/fu-self-test.c
@@ -27,7 +27,7 @@ fu_test_is_installed_test(void)
const gchar *builddir = g_getenv("G_TEST_BUILDDIR");
if (builddir == NULL)
return FALSE;
- return g_str_has_prefix(builddir, FWUPD_PREFIX);
+ return g_str_has_prefix(builddir, FWUPD_INSTALLED_TEST_PREFIX);
}
static void

View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "4.14.269";
version = "4.14.270";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1lhqq3va468k8w5f4hhsq1rgjcfrgi5l8lnrikfy9jisbi05z9h3";
sha256 = "17fj5aif5f0z0xgb321ghpv5p6drqxz0w948dr4hql4cj193r2zv";
};
} // (args.argsOverride or {}))

View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "4.19.232";
version = "4.19.233";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0b520cwwqr5b1skc3gbq35hfjqpidxcl3gq7x5bdqqqdg0afiksg";
sha256 = "0dyf1xapmhly9gpygyjzj5yhn6s5xb0gss033sgllwn243q6bxmq";
};
} // (args.argsOverride or {}))

View file

@ -1,12 +1,12 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
buildLinux (args // rec {
version = "4.9.304";
version = "4.9.305";
extraMeta.branch = "4.9";
extraMeta.broken = stdenv.isAarch64;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "099bkypbkb8an8jsl49f83kg6ic1yw9ssfc1qksaji1jparlnpi9";
sha256 = "0yspfrqlgpsa3a591bk9c2xqq5xf70lqfgj8wrnhd42agfxanr8k";
};
} // (args.argsOverride or {}))

View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.10.103";
version = "5.10.104";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "02jq126r8dgqrhgdg8dym2v8xgp9jkjm8kf9zgj440s3wrasvf2g";
sha256 = "1wb2ql58md45wi49bp3rck7ppgisyjdl7lxarzqd094fx9kr4jir";
};
} // (args.argsOverride or {}))

View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.15.26";
version = "5.15.27";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -15,6 +15,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0fmydc5v51iacd5ys7p1m1k2318p47prj8xv02rcngv1y8s224jq";
sha256 = "01ksvmcwljzphbdll0pd9zg8ys8jy5xy29b54pxqjs3wq3n8zj9k";
};
} // (args.argsOverride or { }))

View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.16.12";
version = "5.16.13";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1wnpn5w0rfniy60m2a25wjm3flvpzvs2z1s4ga01b9qhbbqisnmv";
sha256 = "1fvz4v3mcm9yxfak6mshl764piadgz46y71wprb85b1shc09i2ig";
};
} // (args.argsOverride or { }))

View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.4.182";
version = "5.4.183";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "03gly4ivsdahixmshi021al48ycsalx30vsxr3iyj47hchgj1wdj";
sha256 = "17691h1575spgwh88mk189ars6gyjcl9nnaz585l2da8civhnjrd";
};
} // (args.argsOverride or {}))

View file

@ -6,7 +6,7 @@
, ... } @ args:
let
version = "5.4.177-rt69"; # updated by ./update-rt.sh
version = "5.4.182-rt70"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@ -14,14 +14,14 @@ in buildLinux (args // {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
sha256 = "0wvb5is8rqvfxia1i8lw4yd3fm2bhb6wdl0bdjq90dx7y46wpxqq";
sha256 = "03gly4ivsdahixmshi021al48ycsalx30vsxr3iyj47hchgj1wdj";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "16m1swkg54cgcgqwl6vifbpfvdf7waigbwi9brafwplb965zq5a2";
sha256 = "193glhb0bkaa7qggkj2vpp3r6avf0sh8fasj8byww7xwkhm7cncq";
};
}; in [ rt-patch ] ++ kernelPatches;

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

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