mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-11 23:24:35 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
79368d0a63
|
|
@ -772,7 +772,7 @@ nameValuePair "some" 6
|
|||
<title>Modifying each value of an attribute set</title>
|
||||
<programlisting><![CDATA[
|
||||
lib.attrsets.mapAttrs
|
||||
(name: value: name + "-" value)
|
||||
(name: value: name + "-" + value)
|
||||
{ x = "foo"; y = "bar"; }
|
||||
=> { x = "x-foo"; y = "y-bar"; }
|
||||
]]></programlisting>
|
||||
|
|
|
|||
|
|
@ -646,6 +646,23 @@
|
|||
to use wildcards in the <literal>source</literal> argument.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>openrazer</literal> and
|
||||
<literal>openrazer-daemon</literal> packages as well as the
|
||||
<literal>hardware.openrazer</literal> module now require users
|
||||
to be members of the <literal>openrazer</literal> group
|
||||
instead of <literal>plugdev</literal>. With this change, users
|
||||
no longer need be granted the entire set of
|
||||
<literal>plugdev</literal> group permissions, which can
|
||||
include permissions other than those required by
|
||||
<literal>openrazer</literal>. This is desirable from a
|
||||
security point of view. The setting
|
||||
<link xlink:href="options.html#opt-services.hardware.openrazer.users"><literal>harware.openrazer.users</literal></link>
|
||||
can be used to add users to the <literal>openrazer</literal>
|
||||
group.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
<section xml:id="sec-release-21.11-notable-changes">
|
||||
|
|
|
|||
|
|
@ -164,6 +164,8 @@ pt-services.clipcat.enable).
|
|||
|
||||
- `programs.neovim.runtime` switched to a `linkFarm` internally, making it impossible to use wildcards in the `source` argument.
|
||||
|
||||
- The `openrazer` and `openrazer-daemon` packages as well as the `hardware.openrazer` module now require users to be members of the `openrazer` group instead of `plugdev`. With this change, users no longer need be granted the entire set of `plugdev` group permissions, which can include permissions other than those required by `openrazer`. This is desirable from a security point of view. The setting [`harware.openrazer.users`](options.html#opt-services.hardware.openrazer.users) can be used to add users to the `openrazer` group.
|
||||
|
||||
## Other Notable Changes {#sec-release-21.11-notable-changes}
|
||||
|
||||
- The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets.
|
||||
|
|
|
|||
|
|
@ -49,7 +49,9 @@ in
|
|||
{
|
||||
options = {
|
||||
hardware.openrazer = {
|
||||
enable = mkEnableOption "OpenRazer drivers and userspace daemon";
|
||||
enable = mkEnableOption ''
|
||||
OpenRazer drivers and userspace daemon.
|
||||
'';
|
||||
|
||||
verboseLogging = mkOption {
|
||||
type = types.bool;
|
||||
|
|
@ -92,6 +94,15 @@ in
|
|||
generate a heatmap.
|
||||
'';
|
||||
};
|
||||
|
||||
users = mkOption {
|
||||
type = with types; listOf str;
|
||||
default = [];
|
||||
description = ''
|
||||
Usernames to be added to the "openrazer" group, so that they
|
||||
can start and interact with the OpenRazer userspace daemon.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -106,10 +117,12 @@ in
|
|||
services.udev.packages = [ kernelPackages.openrazer ];
|
||||
services.dbus.packages = [ dbusServiceFile ];
|
||||
|
||||
# A user must be a member of the plugdev group in order to start
|
||||
# the openrazer-daemon. Therefore we make sure that the plugdev
|
||||
# group exists.
|
||||
users.groups.plugdev = {};
|
||||
# A user must be a member of the openrazer group in order to start
|
||||
# the openrazer-daemon. Therefore we make sure that the group
|
||||
# exists.
|
||||
users.groups.openrazer = {
|
||||
members = cfg.users;
|
||||
};
|
||||
|
||||
systemd.user.services.openrazer-daemon = {
|
||||
description = "Daemon to manage razer devices in userspace";
|
||||
|
|
|
|||
|
|
@ -173,6 +173,41 @@ in
|
|||
User = "unifi";
|
||||
UMask = "0077";
|
||||
WorkingDirectory = "${stateDir}";
|
||||
|
||||
# Hardening
|
||||
AmbientCapabilities = "";
|
||||
CapabilityBoundingSet = "";
|
||||
# ProtectClock= adds DeviceAllow=char-rtc r
|
||||
DeviceAllow = "";
|
||||
DevicePolicy = "closed";
|
||||
LockPersonality = true;
|
||||
NoNewPrivileges = true;
|
||||
PrivateDevices = true;
|
||||
PrivateMounts = true;
|
||||
PrivateTmp = true;
|
||||
PrivateUsers = true;
|
||||
ProtectClock = true;
|
||||
ProtectControlGroups = true;
|
||||
ProtectHome = true;
|
||||
ProtectHostname = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelTunables = true;
|
||||
ProtectSystem = "strict";
|
||||
RemoveIPC = true;
|
||||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
RestrictSUIDSGID = true;
|
||||
SystemCallErrorNumber = "EPERM";
|
||||
SystemCallFilter = [ "@system-service" ];
|
||||
|
||||
# Required for ProtectSystem=strict
|
||||
BindPaths = [ stateDir ];
|
||||
|
||||
# Needs network access
|
||||
PrivateNetwork = false;
|
||||
# Cannot be true due to OpenJDK
|
||||
MemoryDenyWriteExecute = false;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -24,13 +24,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "akira";
|
||||
version = "0.0.14";
|
||||
version = "0.0.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "akiraux";
|
||||
repo = "Akira";
|
||||
rev = "v${version}";
|
||||
sha256 = "1zbb2bsc6v2rwrbigbkgrzfjmlj96s3ri73zbdcyqg4p08v1w4l6";
|
||||
sha256 = "sha256-2GhpxajymLVAl2P6vZ0+nuZK3ZRRktFswWkj7TP8eHI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -29,13 +29,13 @@ with lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elogind";
|
||||
version = "243.7";
|
||||
version = "246.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elogind";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0cihdf7blhncm2359qxli24j9l3dkn15gjys5vpjwny80zlym5ma";
|
||||
sha256 = "sha256-EsW19D6eoEO4RJO+jwMA/SMFus+cxq9Fcy2zrcn9pd8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchgit
|
||||
, fetchFromGitea
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
|
@ -21,10 +21,12 @@ stdenv.mkDerivation rec {
|
|||
pname = "fnott";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://codeberg.org/dnkl/fnott.git";
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "dnkl";
|
||||
repo = "fnott";
|
||||
rev = version;
|
||||
sha256 = "sha256-lePd36TFQKZd+B7puUbQhLVrbybeSPjMTFWfY0B82S4=";
|
||||
sha256 = "sha256-gzU5AqjCIZlhLbnj/xuSGJ69ZhLv9zQxlM0Nn+MIX/U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -201,7 +201,6 @@ stdenv.mkDerivation {
|
|||
url = "http://www.mozilla.org/en-US/foundation/trademarks/policy/";
|
||||
};
|
||||
platforms = builtins.attrNames mozillaPlatforms;
|
||||
timeout = 86400; # 24 hours (increased from the Hydra default of 10h, c.f. #129115)
|
||||
maintainers = with maintainers; [ taku0 lovesegfault ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ rec {
|
|||
badPlatforms = lib.platforms.darwin;
|
||||
broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory".
|
||||
# not in `badPlatforms` because cross-compilation on 64-bit machine might work.
|
||||
maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115)
|
||||
license = lib.licenses.mpl20;
|
||||
};
|
||||
tests = [ nixosTests.firefox ];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,40 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "chart-testing";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "helm";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-c7Rjk2YZaQXyFwrDVwYgOCnq/F2ooIUVETXVn5FVlZE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-1Py66ljDjJC38biJ25D8KnWEi3nXAVt9QSgyH1KkwHM=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pkg/config/config.go \
|
||||
--replace "\"/etc/ct\"," "\"$out/etc/ct\","
|
||||
'';
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
"-s"
|
||||
"-X github.com/helm/chart-testing/v3/ct/cmd.Version=${version}"
|
||||
"-X github.com/helm/chart-testing/v3/ct/cmd.GitCommit=${src.rev}"
|
||||
"-X github.com/helm/chart-testing/v3/ct/cmd.BuildDate=19700101-00:00:00"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 -t $out/etc/ct etc/chart_schema.yaml
|
||||
install -Dm644 -t $out/etc/ct etc/lintconf.yaml
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool for testing Helm charts";
|
||||
homepage = "https://github.com/helm/chart-testing";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ atkinschang ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kpt";
|
||||
version = "0.38.0";
|
||||
version = "0.38.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleContainerTools";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MBZa4LdpCZnVVbjzkYpPi9/CYGqVLeYy2N/AS1PSYBE=";
|
||||
sha256 = "sha256-gJAdxg/evsQ+mKsNx/migDMK5lCZ2qSrksbsGDr4fmU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-P0cN8aw62nPD1OlUAw1E36YxptxtPqqruZfDDG4Ag2w=";
|
||||
vendorSha256 = "sha256-GvkT51JudEdPz6zbqyf5qY6P2AbsaSMbirnxXmza5aI=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, makeWrapper
|
||||
, git
|
||||
, go
|
||||
|
|
@ -15,11 +14,11 @@ buildGoModule rec {
|
|||
owner = "kubernetes-sigs";
|
||||
repo = "kubebuilder";
|
||||
rev = "v${version}";
|
||||
sha256 = "1726j2b5jyvllvnk60g6px3g2jyyphd9pc4vgid45mis9b60sh8a";
|
||||
sha256 = "0bl5ff2cplal6hg75800crhyviamk1ws85sq60h4zg21hzf21y68";
|
||||
};
|
||||
vendorSha256 = "0zxyd950ksjswja64rfri5v2yaalfg6qmq8215ildgrcavl9974n";
|
||||
|
||||
subPackages = ["cmd" "pkg/..."];
|
||||
subPackages = ["cmd"];
|
||||
|
||||
preBuild = ''
|
||||
export buildFlagsArray+=("-ldflags=-X main.kubeBuilderVersion=v${version} \
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"commit": "7060a9c8a2b0e92be86d0338296697df3e9a713f",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/7060a9c8a2b0e92be86d0338296697df3e9a713f.tar.gz",
|
||||
"sha256": "1dzdylg00j1rm8s0rs23jv22cvv9wy3abizzhnryq1wkp13npsc7",
|
||||
"msg": "Update from Hackage at 2021-07-29T16:00:40Z"
|
||||
"commit": "7818431b8d25dc7951cd7f50369741e9966d2dc8",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/7818431b8d25dc7951cd7f50369741e9966d2dc8.tar.gz",
|
||||
"sha256": "1fssc5r0482i03rcyvagql06p41qmr8vnyw6501zhbprvz0y1sd4",
|
||||
"msg": "Update from Hackage at 2021-08-04T07:53:53Z"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -45,6 +45,8 @@ self: super: {
|
|||
# TODO: figure out if needed on aarch32 as well
|
||||
BNFC = dontCheck super.BNFC;
|
||||
C-structs = dontCheck super.C-structs;
|
||||
Chart-tests = dontCheck super.Chart-tests;
|
||||
Jikka = dontCheck super.Jikka;
|
||||
accelerate = dontCheck super.accelerate;
|
||||
ad = dontCheck super.ad;
|
||||
autoapply = dontCheck super.autoapply;
|
||||
|
|
@ -93,6 +95,9 @@ self: super: {
|
|||
# https://github.com/ekmett/half/issues/35
|
||||
half = dontCheck super.half;
|
||||
|
||||
# We disable profiling on aarch64, so tests naturally fail
|
||||
ghc-prof = dontCheck super.ghc-prof;
|
||||
|
||||
} // lib.optionalAttrs pkgs.stdenv.hostPlatform.isAarch32 {
|
||||
# AARCH32-SPECIFIC OVERRIDES
|
||||
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ self: super: {
|
|||
name = "git-annex-${super.git-annex.version}-src";
|
||||
url = "git://git-annex.branchable.com/";
|
||||
rev = "refs/tags/" + super.git-annex.version;
|
||||
sha256 = "0jnxh12vkrssz0lj4fpkqw7nxwyc1kisvvpm85cd4zf525m5sgg3";
|
||||
sha256 = "0kcsb5kqyx256fp1bj3y0x6k3286j4cykrx0yr4k3vvb3maakf7k";
|
||||
# delete android and Android directories which cause issues on
|
||||
# darwin (case insensitive directory). Since we don't need them
|
||||
# during the build process, we can delete it to prevent a hash
|
||||
|
|
@ -1011,10 +1011,14 @@ self: super: {
|
|||
# https://github.com/mgajda/json-autotype/issues/25
|
||||
json-autotype = dontCheck super.json-autotype;
|
||||
|
||||
# Requires dlist <0.9 but it works fine with dlist-1.0
|
||||
# https://github.com/haskell-beam/beam/issues/581
|
||||
beam-core = doJailbreak super.beam-core;
|
||||
|
||||
# Requires pg_ctl command during tests
|
||||
beam-postgres = overrideCabal super.beam-postgres (drv: {
|
||||
testToolDepends = (drv.testToolDepends or []) ++ [pkgs.postgresql];
|
||||
});
|
||||
});
|
||||
|
||||
# Fix for base >= 4.11
|
||||
scat = overrideCabal super.scat (drv: {
|
||||
|
|
@ -1040,12 +1044,6 @@ self: super: {
|
|||
# Has tasty < 1.2 requirement, but works just fine with 1.2
|
||||
temporary-resourcet = doJailbreak super.temporary-resourcet;
|
||||
|
||||
# fake a home dir and capture generated man page
|
||||
ats-format = overrideCabal super.ats-format (old : {
|
||||
preConfigure = "export HOME=$PWD";
|
||||
postBuild = "mv .local/share $out";
|
||||
});
|
||||
|
||||
# Test suite doesn't work with current QuickCheck
|
||||
# https://github.com/pruvisto/heap/issues/11
|
||||
heap = dontCheck super.heap;
|
||||
|
|
@ -1281,8 +1279,10 @@ self: super: {
|
|||
# https://github.com/jgm/commonmark-hs/issues/55
|
||||
commonmark-extensions = dontCheck super.commonmark-extensions;
|
||||
|
||||
# Testsuite trying to run `which haskeline-examples-Test`
|
||||
haskeline_0_8_1_2 = dontCheck super.haskeline_0_8_1_2;
|
||||
# Fails with encoding problems, likely needs locale data.
|
||||
# Test can be executed by adding which to testToolDepends and
|
||||
# $PWD/dist/build/haskeline-examples-Test to $PATH.
|
||||
haskeline_0_8_2 = dontCheck super.haskeline_0_8_2;
|
||||
|
||||
# Tests for list-t, superbuffer, and stm-containers
|
||||
# depend on HTF and it is broken, 2020-08-23
|
||||
|
|
@ -1433,7 +1433,7 @@ self: super: {
|
|||
# 2020-11-19: Jailbreaking until: https://github.com/snapframework/heist/pull/124
|
||||
heist = doJailbreak super.heist;
|
||||
|
||||
hinit = generateOptparseApplicativeCompletion "hi" (super.hinit.override { haskeline = self.haskeline_0_8_1_2; });
|
||||
hinit = generateOptparseApplicativeCompletion "hi" (super.hinit.override { haskeline = self.haskeline_0_8_2; });
|
||||
|
||||
# 2020-11-19: Jailbreaking until: https://github.com/snapframework/snap/pull/219
|
||||
snap = doJailbreak super.snap;
|
||||
|
|
@ -1914,4 +1914,27 @@ EOT
|
|||
assert pkgs.lib.versionOlder self.hspec.version "2.8.2";
|
||||
doJailbreak super.graphql;
|
||||
|
||||
# Test suite doesn't build with base16-bytestring >= 1.0.0.0
|
||||
# https://github.com/emilypi/Base16/issues/9
|
||||
base16 = dontCheck super.base16;
|
||||
|
||||
# gtk2hsC2hs fails to build on certain architectures (aarch64, ppc64(le), ...)
|
||||
# with a linker error. As a workaround, we build gtk2hs-buildtools with -O0
|
||||
# as suggested in the GHC thread below. An alternative to this could be to use
|
||||
# -fllvm. I haven't been able to get this to work without linker errors, though.
|
||||
# See also:
|
||||
# * https://gitlab.haskell.org/ghc/ghc/-/issues/17203
|
||||
# * https://github.com/gtk2hs/gtk2hs/issues/305
|
||||
# * https://github.com/gtk2hs/gtk2hs/issues/279
|
||||
gtk2hs-buildtools = appendConfigureFlags super.gtk2hs-buildtools
|
||||
(pkgs.lib.optionals (with pkgs.stdenv.hostPlatform; isAarch64 || isPowerPC) [
|
||||
"--ghc-option=-O0"
|
||||
]);
|
||||
|
||||
# https://github.com/ajscholl/basic-cpuid/pull/1
|
||||
basic-cpuid = appendPatch super.basic-cpuid (pkgs.fetchpatch {
|
||||
url = "https://github.com/ajscholl/basic-cpuid/commit/2f2bd7a7b53103fb0cf26883f094db9d7659887c.patch";
|
||||
sha256 = "0l15ccfdys100jf50s9rr4p0d0ikn53bkh7a9qlk9i0y0z5jc6x1";
|
||||
});
|
||||
|
||||
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
|
||||
|
|
|
|||
|
|
@ -58,6 +58,12 @@ self: super: {
|
|||
|
||||
OpenAL = addExtraLibrary super.OpenAL darwin.apple_sdk.frameworks.OpenAL;
|
||||
|
||||
al = overrideCabal super.al (drv: {
|
||||
libraryFrameworkDepends = [
|
||||
darwin.apple_sdk.frameworks.OpenAL
|
||||
] ++ (drv.libraryFrameworkDepends or []);
|
||||
});
|
||||
|
||||
proteaaudio = addExtraLibrary super.proteaaudio darwin.apple_sdk.frameworks.AudioToolbox;
|
||||
|
||||
# the system-fileio tests use canonicalizePath, which fails in the sandbox
|
||||
|
|
@ -100,6 +106,12 @@ self: super: {
|
|||
|
||||
hmatrix = addBuildDepend super.hmatrix darwin.apple_sdk.frameworks.Accelerate;
|
||||
|
||||
blas-hs = overrideCabal super.blas-hs (drv: {
|
||||
libraryFrameworkDepends = [
|
||||
darwin.apple_sdk.frameworks.Accelerate
|
||||
] ++ (drv.libraryFrameworkDepends or []);
|
||||
});
|
||||
|
||||
# Ensure the necessary frameworks are propagatedBuildInputs on darwin
|
||||
OpenGLRaw = overrideCabal super.OpenGLRaw (drv: {
|
||||
librarySystemDepends = [];
|
||||
|
|
@ -168,6 +180,13 @@ self: super: {
|
|||
'' + (drv.postPatch or "");
|
||||
});
|
||||
|
||||
# conditional dependency via a cabal flag
|
||||
cas-store = overrideCabal super.cas-store (drv: {
|
||||
libraryHaskellDepends = [
|
||||
self.kqueue
|
||||
] ++ (drv.libraryHaskellDepends or []);
|
||||
});
|
||||
|
||||
# 2021-05-25: Tests fail and I have no way to debug them.
|
||||
hls-class-plugin = dontCheck super.hls-class-plugin;
|
||||
hls-brittany-plugin = dontCheck super.hls-brittany-plugin;
|
||||
|
|
@ -179,4 +198,56 @@ self: super: {
|
|||
# We are lacking pure pgrep at the moment for tests to work
|
||||
tmp-postgres = dontCheck super.tmp-postgres;
|
||||
|
||||
# On darwin librt doesn't exist and will fail to link against,
|
||||
# however linking against it is also not necessary there
|
||||
GLHUI = overrideCabal super.GLHUI (drv: {
|
||||
postPatch = ''
|
||||
substituteInPlace GLHUI.cabal --replace " rt" ""
|
||||
'' + (drv.postPatch or "");
|
||||
});
|
||||
|
||||
SDL-image = overrideCabal super.SDL-image (drv: {
|
||||
# Prevent darwin-specific configuration code path being taken
|
||||
# which doesn't work with nixpkgs' SDL libraries
|
||||
postPatch = ''
|
||||
substituteInPlace configure --replace xDarwin noDarwinSpecialCasing
|
||||
'' + (drv.postPatch or "");
|
||||
patches = [
|
||||
# Work around SDL_main.h redefining main to SDL_main
|
||||
./patches/SDL-image-darwin-hsc.patch
|
||||
];
|
||||
});
|
||||
|
||||
# Prevent darwin-specific configuration code path being taken which
|
||||
# doesn't work with nixpkgs' SDL libraries
|
||||
SDL-mixer = overrideCabal super.SDL-mixer (drv: {
|
||||
postPatch = ''
|
||||
substituteInPlace configure --replace xDarwin noDarwinSpecialCasing
|
||||
'' + (drv.postPatch or "");
|
||||
});
|
||||
|
||||
# Work around SDL_main.h redefining main to SDL_main
|
||||
SDL-ttf = appendPatch super.SDL-ttf ./patches/SDL-ttf-darwin-hsc.patch;
|
||||
|
||||
# Disable a bunch of test suites that fail because of darwin's case insensitive
|
||||
# file system: When a test suite has a test suite file that has the same name
|
||||
# as a module in scope, but in different case (e. g. hedgehog.hs and Hedgehog
|
||||
# in scope), GHC will complain that the file name and module name differ (in
|
||||
# the example hedgehog.hs would be Main).
|
||||
# These failures can easily be fixed by upstream by renaming files, so we
|
||||
# should create issues for them.
|
||||
# https://github.com/typeclasses/aws-cloudfront-signed-cookies/issues/2
|
||||
aws-cloudfront-signed-cookies = dontCheck super.aws-cloudfront-signed-cookies;
|
||||
# https://github.com/typeclasses/assoc-list/issues/2
|
||||
assoc-list = dontCheck super.assoc-list;
|
||||
assoc-listlike = dontCheck super.assoc-listlike;
|
||||
# https://github.com/typeclasses/dsv/issues/1
|
||||
dsv = dontCheck super.dsv;
|
||||
|
||||
# https://github.com/acid-state/acid-state/issues/133
|
||||
acid-state = dontCheck super.acid-state;
|
||||
|
||||
# Otherwise impure gcc is used, which is Apple's weird wrapper
|
||||
c2hsc = addTestToolDepends super.c2hsc [ pkgs.gcc ];
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -286,7 +286,6 @@ broken-packages:
|
|||
- barrie
|
||||
- barrier
|
||||
- barrier-monad
|
||||
- base16
|
||||
- base64-conduit
|
||||
- base-compat-migrate
|
||||
- base-encoding
|
||||
|
|
@ -305,7 +304,9 @@ broken-packages:
|
|||
- bdo
|
||||
- beam
|
||||
- beamable
|
||||
- beam-core
|
||||
- beam-mysql
|
||||
- beam-newtype-field
|
||||
- beam-sqlite
|
||||
- bech32
|
||||
- bed-and-breakfast
|
||||
- beeminder-api
|
||||
|
|
@ -1447,6 +1448,7 @@ broken-packages:
|
|||
- fractals
|
||||
- fraction
|
||||
- frag
|
||||
- Frames-beam
|
||||
- Frames-map-reduce
|
||||
- franchise
|
||||
- fraxl
|
||||
|
|
@ -1738,6 +1740,7 @@ broken-packages:
|
|||
- gtk2hs-rpn
|
||||
- gtk3-mac-integration
|
||||
- gtkglext
|
||||
- gtk-mac-integration
|
||||
- gtksourceview2
|
||||
- gtksourceview3
|
||||
- gtk-toy
|
||||
|
|
@ -2603,6 +2606,7 @@ broken-packages:
|
|||
- kalman
|
||||
- Kalman
|
||||
- kangaroo
|
||||
- karabiner-config
|
||||
- karps
|
||||
- katip-kafka
|
||||
- katip-raven
|
||||
|
|
@ -2630,7 +2634,6 @@ broken-packages:
|
|||
- koellner-phonetic
|
||||
- kontra-config
|
||||
- kparams
|
||||
- kqueue
|
||||
- kraken
|
||||
- krapsh
|
||||
- Kriens
|
||||
|
|
@ -2758,6 +2761,7 @@ broken-packages:
|
|||
- life-sync
|
||||
- lifted-protolude
|
||||
- lifter
|
||||
- lifx-lan
|
||||
- ligature
|
||||
- lilypond
|
||||
- Limit
|
||||
|
|
@ -3276,7 +3280,6 @@ broken-packages:
|
|||
- no-role-annots
|
||||
- notcpp
|
||||
- not-gloss-examples
|
||||
- notifications-tray-icon
|
||||
- NoTrace
|
||||
- now-haskell
|
||||
- np-extras
|
||||
|
|
|
|||
|
|
@ -342,7 +342,9 @@ unsupported-platforms:
|
|||
barbly: [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ]
|
||||
bdcs-api: [ x86_64-darwin ]
|
||||
bindings-directfb: [ x86_64-darwin ]
|
||||
bindings-parport: [ x86_64-darwin ] # parport is a linux kernel component
|
||||
bindings-sane: [ x86_64-darwin ]
|
||||
btrfs: [ x86_64-darwin ] # depends on linux
|
||||
bustle: [ x86_64-darwin ] # uses glibc-specific ptsname_r
|
||||
charsetdetect: [ aarch64-linux ] # not supported by vendored lib / not configured properly https://github.com/batterseapower/libcharsetdetect/issues/3
|
||||
crackNum: [ aarch64-linux ] # depends on sbv, which is not supported on aarch64-linux
|
||||
|
|
@ -356,6 +358,7 @@ unsupported-platforms:
|
|||
follow-file: [ x86_64-darwin ]
|
||||
freenect: [ x86_64-darwin ]
|
||||
FTGL: [ x86_64-darwin ]
|
||||
fuzzytime: [ x86_64-darwin ] # https://github.com/kamwitsta/fuzzytime/issues/2
|
||||
ghcjs-dom-hello: [ x86_64-darwin ]
|
||||
gi-dbusmenugtk3: [ x86_64-darwin ]
|
||||
gi-dbusmenu: [ x86_64-darwin ]
|
||||
|
|
@ -375,9 +378,11 @@ unsupported-platforms:
|
|||
hommage-ds: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
|
||||
honk: [ x86_64-darwin ]
|
||||
hpapi: [ x86_64-darwin ]
|
||||
HQu: [ aarch64-linux, armv7l-linux ] # unsupported by vendored C++ library, TODO: explicitly list supported platforms
|
||||
HSoM: [ x86_64-darwin ]
|
||||
iwlib: [ x86_64-darwin ]
|
||||
jsaddle-webkit2gtk: [ x86_64-darwin ]
|
||||
kqueue: [ x86_64-linux, aarch64-linux, i686-linux, armv7l-linux ] # BSD / Darwin only API
|
||||
LambdaHack: [ x86_64-darwin ]
|
||||
large-hashable: [ aarch64-linux ] # https://github.com/factisresearch/large-hashable/issues/17
|
||||
libmodbus: [ x86_64-darwin ]
|
||||
|
|
@ -400,6 +405,7 @@ unsupported-platforms:
|
|||
mplayer-spot: [ aarch64-linux ]
|
||||
mptcp-pm: [ x86_64-darwin ]
|
||||
netlink: [ x86_64-darwin ]
|
||||
notifications-tray-icon: [ x86_64-darwin ] # depends on gi-dbusmenu
|
||||
oculus: [ x86_64-darwin ]
|
||||
pam: [ x86_64-darwin ]
|
||||
parport: [ x86_64-darwin ]
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# Stackage LTS 18.4
|
||||
# Stackage LTS 18.5
|
||||
# This file is auto-generated by
|
||||
# maintainers/scripts/haskell/update-stackage.sh
|
||||
default-package-overrides:
|
||||
|
|
@ -469,7 +469,7 @@ default-package-overrides:
|
|||
- constraints-extras ==0.3.1.0
|
||||
- constraint-tuples ==0.1.2
|
||||
- construct ==0.3.0.2
|
||||
- contravariant ==1.5.3
|
||||
- contravariant ==1.5.5
|
||||
- contravariant-extras ==0.3.5.2
|
||||
- control-bool ==0.2.1
|
||||
- control-dsl ==0.2.1.3
|
||||
|
|
@ -549,7 +549,7 @@ default-package-overrides:
|
|||
- datadog ==0.2.5.0
|
||||
- data-dword ==0.3.2
|
||||
- data-endian ==0.1.1
|
||||
- data-fix ==0.3.1
|
||||
- data-fix ==0.3.2
|
||||
- data-forest ==0.1.0.8
|
||||
- data-has ==0.4.0.0
|
||||
- data-hash ==0.2.0.1
|
||||
|
|
@ -720,7 +720,7 @@ default-package-overrides:
|
|||
- exception-hierarchy ==0.1.0.4
|
||||
- exception-mtl ==0.4.0.1
|
||||
- exceptions ==0.10.4
|
||||
- exception-transformers ==0.4.0.9
|
||||
- exception-transformers ==0.4.0.10
|
||||
- exception-via ==0.1.0.0
|
||||
- executable-path ==0.0.3.1
|
||||
- exit-codes ==1.0.0
|
||||
|
|
@ -772,10 +772,10 @@ default-package-overrides:
|
|||
- first-class-patterns ==0.3.2.5
|
||||
- fitspec ==0.4.10
|
||||
- fixed ==0.3
|
||||
- fixed-length ==0.2.2.1
|
||||
- fixed-length ==0.2.3
|
||||
- fixed-vector ==1.2.0.0
|
||||
- fixed-vector-hetero ==0.6.1.0
|
||||
- fix-whitespace ==0.0.5
|
||||
- fix-whitespace ==0.0.6
|
||||
- flac ==0.2.0
|
||||
- flac-picture ==0.1.2
|
||||
- flags-applicative ==0.1.0.3
|
||||
|
|
@ -787,7 +787,7 @@ default-package-overrides:
|
|||
- flow ==1.0.22
|
||||
- flush-queue ==1.0.0
|
||||
- fmlist ==0.9.4
|
||||
- fmt ==0.6.1.2
|
||||
- fmt ==0.6.2.0
|
||||
- fn ==0.3.0.2
|
||||
- focus ==1.0.2
|
||||
- focuslist ==0.1.0.2
|
||||
|
|
@ -1105,7 +1105,7 @@ default-package-overrides:
|
|||
- hslua-module-path ==0.1.0.1
|
||||
- hslua-module-system ==0.2.2.1
|
||||
- hslua-module-text ==0.3.0.1
|
||||
- HsOpenSSL ==0.11.7
|
||||
- HsOpenSSL ==0.11.7.1
|
||||
- HsOpenSSL-x509-system ==0.1.0.4
|
||||
- hsp ==0.10.0
|
||||
- hspec ==2.7.10
|
||||
|
|
@ -1313,7 +1313,7 @@ default-package-overrides:
|
|||
- junit-xml ==0.1.0.2
|
||||
- justified-containers ==0.3.0.0
|
||||
- jwt ==0.10.0
|
||||
- kan-extensions ==5.2.2
|
||||
- kan-extensions ==5.2.3
|
||||
- kanji ==3.4.1
|
||||
- katip ==0.8.5.0
|
||||
- katip-logstash ==0.1.0.0
|
||||
|
|
@ -1526,7 +1526,7 @@ default-package-overrides:
|
|||
- modern-uri ==0.3.4.1
|
||||
- modular ==0.1.0.8
|
||||
- monad-chronicle ==1.0.0.1
|
||||
- monad-control ==1.0.2.3
|
||||
- monad-control ==1.0.3
|
||||
- monad-control-aligned ==0.0.1.1
|
||||
- monad-coroutine ==0.9.1.2
|
||||
- monad-extras ==0.6.0
|
||||
|
|
@ -2220,7 +2220,7 @@ default-package-overrides:
|
|||
- stackcollapse-ghc ==0.0.1.3
|
||||
- stack-templatizer ==0.1.0.2
|
||||
- stateref ==0.3
|
||||
- StateVar ==1.2.1
|
||||
- StateVar ==1.2.2
|
||||
- static-text ==0.2.0.7
|
||||
- statistics ==0.15.2.0
|
||||
- status-notifier-item ==0.3.1.0
|
||||
|
|
|
|||
|
|
@ -113,7 +113,6 @@ dont-distribute-packages:
|
|||
- Forestry
|
||||
- FormalGrammars
|
||||
- Foster
|
||||
- Frames-beam
|
||||
- Frames-dsv
|
||||
- Frank
|
||||
- GLFW-OGL
|
||||
|
|
@ -394,6 +393,7 @@ dont-distribute-packages:
|
|||
- adict
|
||||
- adp-multi-monadiccp
|
||||
- aern2-real
|
||||
- aern2-real_0_2_8_0
|
||||
- aeson-native
|
||||
- afv
|
||||
- agda-server
|
||||
|
|
@ -515,7 +515,6 @@ dont-distribute-packages:
|
|||
- bamboo-theme-mini-html5
|
||||
- bamse
|
||||
- bamstats
|
||||
- base16-lens
|
||||
- base32-bytestring
|
||||
- base64-bytes
|
||||
- baserock-schema
|
||||
|
|
@ -527,11 +526,6 @@ dont-distribute-packages:
|
|||
- bdcs
|
||||
- bdcs-api
|
||||
- beam-automigrate
|
||||
- beam-migrate
|
||||
- beam-mysql
|
||||
- beam-newtype-field
|
||||
- beam-postgres
|
||||
- beam-sqlite
|
||||
- beam-th
|
||||
- beautifHOL
|
||||
- bech32-th
|
||||
|
|
@ -1588,6 +1582,7 @@ dont-distribute-packages:
|
|||
- hs-ffmpeg
|
||||
- hs-gen-iface
|
||||
- hs-pkpass
|
||||
- hs-sdl-term-emulator
|
||||
- hs-swisstable-hashtables-class
|
||||
- hs2dot
|
||||
- hsautogui
|
||||
|
|
@ -2718,7 +2713,6 @@ dont-distribute-packages:
|
|||
- servant-streaming-docs
|
||||
- servant-streaming-server
|
||||
- servant-swagger-tags
|
||||
- servant-util-beam-pg
|
||||
- servant-waargonaut
|
||||
- servant-zeppelin-client
|
||||
- servant-zeppelin-server
|
||||
|
|
|
|||
|
|
@ -788,6 +788,11 @@ self: super: builtins.intersectAttrs super {
|
|||
platforms = pkgs.lib.platforms.x86;
|
||||
};
|
||||
|
||||
# uses x86 intrinsics
|
||||
geomancy = overrideCabal super.geomancy {
|
||||
platforms = pkgs.lib.platforms.x86;
|
||||
};
|
||||
|
||||
hls-brittany-plugin = overrideCabal super.hls-brittany-plugin (drv: {
|
||||
testToolDepends = [ pkgs.git ];
|
||||
preCheck = ''
|
||||
|
|
@ -919,4 +924,29 @@ self: super: builtins.intersectAttrs super {
|
|||
# Flag added in Agda 2.6.2
|
||||
Agda = appendConfigureFlag super.Agda "-foptimise-heavily";
|
||||
|
||||
# ats-format uses cli-setup in Setup.hs which is quite happy to write
|
||||
# to arbitrary files in $HOME. This doesn't either not achieve anything
|
||||
# or even fail, so we prevent it and install everything necessary ourselves.
|
||||
# See also: https://hackage.haskell.org/package/cli-setup-0.2.1.4/docs/src/Distribution.CommandLine.html#setManpathGeneric
|
||||
ats-format = generateOptparseApplicativeCompletion "atsfmt" (
|
||||
justStaticExecutables (
|
||||
overrideCabal super.ats-format (drv: {
|
||||
# use vanilla Setup.hs
|
||||
preCompileBuildDriver = ''
|
||||
cat > Setup.hs << EOF
|
||||
module Main where
|
||||
import Distribution.Simple
|
||||
main = defaultMain
|
||||
EOF
|
||||
'' + (drv.preCompileBuildDriver or "");
|
||||
# install man page
|
||||
buildTools = [
|
||||
pkgs.buildPackages.installShellFiles
|
||||
] ++ (drv.buildTools or []);
|
||||
postInstall = ''
|
||||
installManPage man/atsfmt.1
|
||||
'' + (drv.postInstall or "");
|
||||
})
|
||||
)
|
||||
);
|
||||
}
|
||||
|
|
|
|||
1274
pkgs/development/haskell-modules/hackage-packages.nix
generated
1274
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -0,0 +1,9 @@
|
|||
--- SDL-image-0.6.2.0/Graphics/UI/SDL/Image/Version.hsc.orig 2021-08-06 01:21:05.000000000 +0200
|
||||
+++ SDL-image-0.6.2.0/Graphics/UI/SDL/Image/Version.hsc 2021-08-06 01:21:56.000000000 +0200
|
||||
@@ -1,4 +1,6 @@
|
||||
#include "SDL_image.h"
|
||||
+-- override SDL_main.h redefining main to SDL_main on darwin
|
||||
+#define main main
|
||||
module Graphics.UI.SDL.Image.Version
|
||||
( compiledFor
|
||||
, linkedWith
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
--- SDL-ttf-0.6.3.0/Graphics/UI/SDL/TTF/Version.hsc.orig 2021-08-06 01:31:39.000000000 +0200
|
||||
+++ SDL-ttf-0.6.3.0/Graphics/UI/SDL/TTF/Version.hsc 2021-08-06 01:32:03.000000000 +0200
|
||||
@@ -1,4 +1,6 @@
|
||||
#include "SDL_ttf.h"
|
||||
+-- override SDL_main.h redefining main to SDL_main on darwin
|
||||
+#define main main
|
||||
module Graphics.UI.SDL.TTF.Version
|
||||
( compiledFor
|
||||
, linkedWith
|
||||
|
|
@ -3,16 +3,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "evcxr";
|
||||
version = "0.10.0";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "evcxr";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-EPxWLPw+V5eIm+eL8m8Xw14adgshthJSDRyWohsJH88=";
|
||||
sha256 = "sha256-JziLEsY6kF5UeDt17q/HDrTlNtHj7DWy1tTq3s2eZHE=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-5jGrv0YRVMo2X9p/WPgjYV3z193hl2+NiFTZr3v0Iik=";
|
||||
cargoSha256 = "sha256-I164eXgc/yiKKskloh6FGYD3bLCLWXaM6uWa01PRDXs=";
|
||||
|
||||
RUST_SRC_PATH = "${rustPlatform.rustLibSrc}";
|
||||
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "alkimia";
|
||||
version = "8.0.4";
|
||||
version = "8.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/alkimia/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-AASnBo3/CqLLb0f3DSHBKQc74R8u2yHxRRK8RHBIfR8=";
|
||||
sha256 = "sha256-kWgHNScHsEkM3ZymVoLv9zsAylIwKb2m/nonSaG8knw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules doxygen graphviz ];
|
||||
|
|
|
|||
|
|
@ -82,12 +82,6 @@ stdenv.mkDerivation rec {
|
|||
})
|
||||
./libglvnd-headers.patch
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/WebKit/WebKit/commit/94cdcd289b993ed4d39c17d4b8b90db7c81a9b10.diff";
|
||||
sha256 = "sha256-ywrTEjf3ATqI0Vvs60TeAZ+m58kCibum4DamRWrQfaA=";
|
||||
excludes = [ "Source/WebKit/ChangeLog" ];
|
||||
})
|
||||
|
||||
# https://bugs.webkit.org/show_bug.cgi?id=225856
|
||||
(fetchpatch {
|
||||
url = "https://bug-225856-attachments.webkit.org/attachment.cgi?id=428797";
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioesphomeapi";
|
||||
version = "5.1.1";
|
||||
version = "6.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "esphome";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "09hhkwkphyqa31yd1mmpz8xmyz6hav8vwf36v8xc4v6g1xm9l6f5";
|
||||
sha256 = "sha256-C799JoW58mmwHeoXLMJ5pYg8hjaZqVBqrbxBXpmF/mQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohomekit";
|
||||
version = "0.5.1";
|
||||
version = "0.6.2";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Jc2k";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Fo9KWBcN6Y/fa7vkWugSer5L7+hOWz99+hw6Hz1LAMM=";
|
||||
sha256 = "16lfav83g12vzs3ssfva7chcqqb7xdx54djwfwyn9xcwfaa7cwhw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohue";
|
||||
version = "2.5.1";
|
||||
version = "2.6.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "3ee8e857b07364516f8b9f0e5c52d4cd775036f3ace37c2769de1e8579f4dc07";
|
||||
sha256 = "0101bw2n6vd3c0p323qqr61wwraja48xbrwcw5sn7i5sa3ygfx0k";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,41 +1,52 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, asynctest
|
||||
, assertpy
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, pytest-aiohttp
|
||||
, pytest-asyncio
|
||||
, pytest-mockservers
|
||||
, pytest-resource-path
|
||||
, pytest-sugar
|
||||
, pytestCheckHook
|
||||
, time-machine
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioswitcher";
|
||||
version = "1.2.5";
|
||||
version = "2.0.4";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TomerFi";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-eiWmB2DVNAYHPHfnVwv0+4A/wYLgtAa1ReGsmwiIvAk=";
|
||||
sha256 = "sha256-n4JvtShs2/shJxAzxm6qyipVQ7e3QfeVwhnqu6RWZss=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
];
|
||||
preCheck = ''
|
||||
export TZ=Asia/Jerusalem
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
asynctest
|
||||
pytest-aiohttp
|
||||
assertpy
|
||||
pytest-asyncio
|
||||
pytest-mockservers
|
||||
pytest-resource-path
|
||||
pytest-sugar
|
||||
pytestCheckHook
|
||||
time-machine
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# AssertionError: Expected <14:00> to be equal to <17:00>, but was not.
|
||||
"test_schedule_parser_with_a_weekly_recurring_enabled_schedule_data"
|
||||
"test_schedule_parser_with_a_daily_recurring_enabled_schedule_data"
|
||||
"test_schedule_parser_with_a_partial_daily_recurring_enabled_schedule_data"
|
||||
"test_schedule_parser_with_a_non_recurring_enabled_schedule_data"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "aioswitcher" ];
|
||||
|
|
|
|||
32
pkgs/development/python-modules/assertpy/default.nix
Normal file
32
pkgs/development/python-modules/assertpy/default.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "assertpy";
|
||||
version = "1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0hnfh45cmqyp7zasrllwf8gbq3mazqlhhk0sq1iqlh6fig0yfq2f";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"assertpy"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple assertion library for unit testing with a fluent API";
|
||||
homepage = "https://github.com/assertpy/assertpy";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyncio-dgram";
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jsbronder";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-EL3iOoCfLAtfdMI1J2XMf4izOEo9+a+0PNQs+4HuEfo=";
|
||||
sha256 = "1ibyphncb3d8vrs3yk8j6l1smmnibizx9k1vir2njhi09r57h9mx";
|
||||
};
|
||||
|
||||
# OSError: AF_UNIX path too long
|
||||
|
|
@ -26,6 +26,7 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
disabledTests = [ "test_protocol_pause_resume" ];
|
||||
|
||||
pythonImportsCheck = [ "asyncio_dgram" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -3,31 +3,29 @@
|
|||
, fetchFromGitHub
|
||||
, click
|
||||
, click-log
|
||||
, dataclasses
|
||||
, pure-pcapy3
|
||||
, pyserial-asyncio
|
||||
, voluptuous
|
||||
, zigpy
|
||||
, asynctest
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
, pytest-asyncio
|
||||
, pytest-timeout
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bellows";
|
||||
version = "0.25.0";
|
||||
version = "0.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zigpy";
|
||||
repo = "bellows";
|
||||
rev = version;
|
||||
sha256 = "1836wm8whbryp31zdaj3b6w40sx1wjsxgpjdb1x9rgmwff4d1hc0";
|
||||
sha256 = "0qbsk5iv3vrpwz7kfmjdbc66rfkg788p6wwxbf6jzfarfhcgrh3k";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "click-log==0.2.1" "click-log>=0.2.1"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
click
|
||||
click-log
|
||||
|
|
@ -35,16 +33,31 @@ buildPythonPackage rec {
|
|||
pyserial-asyncio
|
||||
voluptuous
|
||||
zigpy
|
||||
] ++ lib.optionals (pythonOlder "3.7") [
|
||||
dataclasses
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
asynctest
|
||||
pytestCheckHook
|
||||
pytest-asyncio
|
||||
pytest-timeout
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
asynctest
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# RuntimeError: coroutine 'test_remigrate_forcibly_downgraded_v4' was never awaited
|
||||
#"test_remigrate_forcibly_downgraded_v4"
|
||||
# RuntimeError: Event loop is closed
|
||||
"test_thread_already_stopped"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"bellows"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Python 3 project to implement EZSP for EmberZNet devices";
|
||||
description = "Python module to implement EZSP for EmberZNet devices";
|
||||
homepage = "https://github.com/zigpy/bellows";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ etu mvnetbiz ];
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, fetchPypi, isPy27
|
||||
, buildPythonPackage
|
||||
, traits, apptools, pytestCheckHook
|
||||
, ipykernel, ipython
|
||||
, ipykernel, ipython, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
|||
sha256 = "0zrxlq4v3091727vf10ngc8418sp26raxa8q83i4h0sydfkh2dic";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ traits apptools ];
|
||||
propagatedBuildInputs = [ traits apptools setuptools ];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$PWD/HOME
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, aiohttp
|
||||
, aioresponses
|
||||
, buildPythonPackage
|
||||
, dacite
|
||||
, fetchFromGitHub
|
||||
, pytest-asyncio
|
||||
, pytest-error-for-skips
|
||||
|
|
@ -11,18 +12,19 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "gios";
|
||||
version = "1.0.2";
|
||||
version = "2.0.0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bieniu";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-7+np1lUbBFSTJNAD6OT5k89MM+kzEj90JlulXGm36k8=";
|
||||
sha256 = "1xbbp08ssan0b9j6s3vzg8cn421avc0xvahx5fvrb8kcbzkg8ssl";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
dacite
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hatasmota";
|
||||
version = "0.2.19";
|
||||
version = "0.2.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emontnemery";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-h1idJJd2lPV3+tAE59gzITa7jmtBhcEpRuyflf76EAk=";
|
||||
sha256 = "1qdvm1bnn7x2mf4fq997gvq6a5901ndhd2s75h92zsgmlcp7rc77";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -23,6 +23,7 @@ buildPythonPackage rec {
|
|||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "hatasmota" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "homematicip";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coreGreenberet";
|
||||
repo = "homematicip-rest-api";
|
||||
rev = version;
|
||||
sha256 = "0bgvrjcf10kiqqkbl56sxx3jydd722b08q2j9c8sxpk0qdrmrinv";
|
||||
sha256 = "008snxx9ijpi1zr1pi1v4a6g74j821hyw0khs9lmi08v2mcabm36";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -53,6 +53,7 @@ buildPythonPackage rec {
|
|||
"test_pluggable_switch_measuring"
|
||||
"test_rotary_handle_sensor"
|
||||
"test_security_group"
|
||||
"test_security_zone"
|
||||
"test_shutter_device"
|
||||
"test_smoke_detector"
|
||||
"test_switching_group"
|
||||
|
|
|
|||
|
|
@ -38,6 +38,10 @@ buildPythonApplication (common // rec {
|
|||
setproctitle
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace openrazer_daemon/daemon.py --replace "plugdev" "openrazer"
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
DESTDIR="$out" PREFIX="" make install manpages
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyatmo";
|
||||
version = "5.2.0";
|
||||
version = "5.2.3";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jabesq";
|
||||
repo = "pyatmo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-P9c9tm2RcF/4r0OYBoAQxQbMBaFAsaHg/stg9rrYHNM=";
|
||||
sha256 = "1w9rhh85z9m3c4rbz6zxlrxglsm5sk5d6796dsj1p1l3b3ad476z";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyatv";
|
||||
version = "0.8.1";
|
||||
version = "0.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "postlund";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/ccmYNOYE+RkJiJbGkQgdYE8/X4xzyRT4dkMa/qSZEc=";
|
||||
sha256 = "035cjm78xakvfi7k8zahjk0xr23p9my67d8jvq5bqrd506awrl0f";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyflunearyou";
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
|
@ -23,10 +23,12 @@ buildPythonPackage rec {
|
|||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-2a4OKPmy9tFLJqRg9bEXqrbr3RKVHmKPSYDrtAEqvdo=";
|
||||
sha256 = "07n2dvnfpfglpdlnwzj4dy41x2zc07ia2krvxdarnv8wzap30y23";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
|
|
@ -44,7 +46,8 @@ buildPythonPackage rec {
|
|||
|
||||
# Ignore the examples directory as the files are prefixed with test_.
|
||||
# disabledTestFiles doesn't seem to work here
|
||||
pytestFlagsArray = [ "--ignore examples/" ];
|
||||
disabledTestPaths = [ "examples/" ];
|
||||
|
||||
pythonImportsCheck = [ "pyflunearyou" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pylitterbot";
|
||||
version = "2021.7.2";
|
||||
version = "2021.8.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "natekspencer";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0hnjqj9n2sq1jhiwdrw2aayhyz94cwjxniiak2h1nxh2q0nzigh3";
|
||||
sha256 = "sha256-Z7/j5ZZd8cOJhY/GfKUcDSJZvmU/TR/KDK60j1eYsik=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -0,0 +1,54 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, aiohttp
|
||||
, pytest
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-mockservers";
|
||||
version = "0.6.0";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Gr1N";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0xql0fnw7m2zn103601gqbpyd761kzvgjj2iz9hjsv56nr4z1g9i";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "poetry.masonry.api" "poetry.core.masonry.api"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
pytest
|
||||
pytest-asyncio
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pytest_mockservers"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A set of fixtures to test your requests to HTTP/UDP servers";
|
||||
homepage = "https://github.com/Gr1N/pytest-mockservers";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,46 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, colorama
|
||||
, pytest-runner
|
||||
, pytest
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-resource-path";
|
||||
version = "1.3.0";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yukihiko-shinoda";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1siv3pk4fsabz254fdzr7c0pxy124habnbw4ym66pfk883fr96g2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pytest-runner
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
colorama
|
||||
pytest
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pytest_resource_path"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Pytest plugin to provide path for uniform access to test resources";
|
||||
homepage = "https://github.com/yukihiko-shinoda/pytest-resource-path";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "roonapi";
|
||||
version = "0.0.37";
|
||||
version = "0.0.38";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "pavoni";
|
||||
repo = "pyroon";
|
||||
rev = version;
|
||||
sha256 = "1hxr473z9h3kb91m3ygina58pfwfyjsv1yb29spxmnbzvk34rzzz";
|
||||
sha256 = "sha256-vXx7MgoGjBPdx7uKUtAVqlXphPJYt5SyuTo2JlKia60=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -34,15 +34,6 @@ buildPythonPackage rec {
|
|||
websocket-client
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Switch to poetry-core, https://github.com/pavoni/pyroon/pull/43
|
||||
(fetchpatch {
|
||||
name = "use-peotry-core.patch";
|
||||
url = "https://github.com/pavoni/pyroon/commit/16f890314683a6c2700fa4da5c937559e2e24bea.patch";
|
||||
sha256 = "047bhimr72rwqqyjy7jkfzacdc2ycy81wbmgnvf7xyhgjw1jyvh5";
|
||||
})
|
||||
];
|
||||
|
||||
# Tests require access to the Roon API
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -6,16 +6,17 @@
|
|||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, pytest-asyncio
|
||||
, pytest-aiohttp
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pytz
|
||||
, types-pytz
|
||||
, voluptuous
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "simplisafe-python";
|
||||
version = "11.0.2";
|
||||
version = "11.0.3";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
|
|
@ -23,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-sIv7zoLp+1CfeyhVYWMp93TkNk+h14WawOJOQMhwAp8=";
|
||||
sha256 = "17zld62q4qw2z2q7i5kkpnyc3immgc4xs009hp53jq4qc38w0jm5";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
|
|
@ -32,16 +33,23 @@ buildPythonPackage rec {
|
|||
aiohttp
|
||||
backoff
|
||||
pytz
|
||||
types-pytz
|
||||
voluptuous
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
aioresponses
|
||||
asynctest
|
||||
pytest-asyncio
|
||||
pytest-aiohttp
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# simplipy/api.py:253: InvalidCredentialsError
|
||||
"test_request_error_failed_retry"
|
||||
"test_update_error"
|
||||
];
|
||||
|
||||
disabledTestPaths = [ "examples/" ];
|
||||
|
||||
pythonImportsCheck = [ "simplipy" ];
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "soco";
|
||||
version = "0.23.1";
|
||||
version = "0.23.2";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SoCo";
|
||||
repo = "SoCo";
|
||||
rev = "v${version}";
|
||||
sha256 = "15q82fq10d162xanypn1k51y15r38l7sj0417jzbjx40zz6c93f7";
|
||||
sha256 = "0qq2k0xy8a5b54nk7h4ipkvq8dpzklhgcwcffhnlcnl1vhq2dh33";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, websockets
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, websockets
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "systembridge";
|
||||
version = "1.2.4";
|
||||
version = "2.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "timmo001";
|
||||
repo = "system-bridge-connector-py";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dZOtvJXBXMKC+VOyQRMyaWAXg8lHjLcM2Zz9P0/ILT8=";
|
||||
sha256 = "03scbn6khvw1nj73j8kmvyfrxnqcc0wh3ncck4byby6if1an5dvd";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -23,6 +23,7 @@ buildPythonPackage rec {
|
|||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "systembridge" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
50
pkgs/development/python-modules/time-machine/default.nix
Normal file
50
pkgs/development/python-modules/time-machine/default.nix
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonAtLeast
|
||||
, pythonOlder
|
||||
, backports-zoneinfo
|
||||
, python-dateutil
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "time-machine";
|
||||
version = "2.3.1";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adamchainz";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1flim8xaa7qglh2b39cf57i8g0kg0707pw3mdkrgh0xjn27bv9bi";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
python-dateutil
|
||||
#] ++ lib.optionals (pythonOlder "3.9") [
|
||||
backports-zoneinfo
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = lib.optionals (pythonAtLeast "3.9") [
|
||||
# Assertion Errors related to Africa/Addis_Ababa
|
||||
"test_destination_datetime_tzinfo_zoneinfo"
|
||||
"test_destination_datetime_tzinfo_zoneinfo_nested"
|
||||
"test_move_to_datetime_with_tzinfo_zoneinfo"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"time_machine"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Travel through time in your tests";
|
||||
homepage = "https://github.com/adamchainz/time-machine";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
26
pkgs/development/python-modules/types-pytz/default.nix
Normal file
26
pkgs/development/python-modules/types-pytz/default.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-pytz";
|
||||
version = "2021.1.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0hzjz6wgzfyybcfli4rpmfxk49cn6x3slbs2xdmlnckvlahs5pxd";
|
||||
};
|
||||
|
||||
# Modules doesn't have tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "pytz-stubs" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Typing stubs for pytz";
|
||||
homepage = "https://github.com/python/typeshed";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "wled";
|
||||
version = "0.7.1";
|
||||
version = "0.8.0";
|
||||
disabled = pythonOlder "3.8";
|
||||
format = "pyproject";
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "frenck";
|
||||
repo = "python-wled";
|
||||
rev = "v${version}";
|
||||
sha256 = "02xrml9mpq3akwyryg1m7xjmgnlgi5kjvx7vkq6110ai0f9hzpwi";
|
||||
sha256 = "1jhykilb81sp1srxk91222qglwdlr993ssvgfnl837nbcx6ws1hw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "zeroconf";
|
||||
version = "0.33.2";
|
||||
version = "0.33.4";
|
||||
format = "setuptools";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "jstasiak";
|
||||
repo = "python-zeroconf";
|
||||
rev = version;
|
||||
sha256 = "0pcfglxvrd3n6b5hkn169p38flhqr7alj8ipxx1p7kphywywplif";
|
||||
sha256 = "sha256-ld8Mo465fJTVNSv6YvKcsPafiIij4PEmeycWB3M3ewU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "zigpy-deconz";
|
||||
version = "0.12.0";
|
||||
version = "0.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zigpy";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-d/yAk8owMu+J1BzlwR5mzF9HkXiE6Kc81AznvsAboy8=";
|
||||
sha256 = "sha256-NpLhVQfezXbJQMvqqZjr9sc8tCjJgGu5Xk3C5/IDeUQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pyserial pyserial-asyncio zigpy ];
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
, buildPythonPackage
|
||||
, coloredlogs
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, jsonschema
|
||||
, pyserial
|
||||
, pyserial-asyncio
|
||||
|
|
@ -19,23 +18,15 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "zigpy-znp";
|
||||
version = "0.5.1";
|
||||
version = "0.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zigpy";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "152d803jfrvkj4namni41fnbbnq85wd7zsqjhmkwrrmn2gvqjiln";
|
||||
sha256 = "sha256-nnA/gVXBpCZFkspcO6kF3ZkEDu0vV0d9p1WNGVrN0u8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Fixes tests/application/test_joining.py::test_new_device_join_and_bind_complex[FormedLaunchpadCC26X2R1]
|
||||
url = "https://github.com/zigpy/zigpy-znp/commit/582cffb68fdf0c5bc14d55efca2a683222d7fed7.patch";
|
||||
sha256 = "0qsfziqqjnnf21gdqv3wwk50vni46i0h1liw5ysq641yjfnas9az";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
async-timeout
|
||||
coloredlogs
|
||||
|
|
|
|||
|
|
@ -5,46 +5,46 @@
|
|||
, buildPythonPackage
|
||||
, crccheck
|
||||
, fetchFromGitHub
|
||||
, pycrypto
|
||||
, pycryptodome
|
||||
, pytest-aiohttp
|
||||
, pytest-asyncio
|
||||
, pytest-timeout
|
||||
, pytestCheckHook
|
||||
, tox
|
||||
, voluptuous }:
|
||||
, pythonOlder
|
||||
, voluptuous
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zigpy";
|
||||
version = "0.35.2";
|
||||
version = "0.36.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zigpy";
|
||||
repo = "zigpy";
|
||||
rev = version;
|
||||
sha256 = "sha256-p0q0wGp3NaBO7gBTsPAt7FEAHW0MDPJCKqLklY21zBQ=";
|
||||
sha256 = "0rfif8ds6m9ndxnc0f02fivc2pwidf476ylyx9y2b1sa2qz36z5w";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
aiosqlite
|
||||
crccheck
|
||||
pycrypto
|
||||
pycryptodome
|
||||
voluptuous
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
asynctest
|
||||
pytest-aiohttp
|
||||
pytest-asyncio
|
||||
pytest-timeout
|
||||
pytestCheckHook
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
asynctest
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# RuntimeError: coroutine 'test_remigrate_forcibly_downgraded_v4' was never awaited
|
||||
"test_remigrate_forcibly_downgraded_v4"
|
||||
#"test_remigrate_forcibly_downgraded_v4"
|
||||
# RuntimeError: Event loop is closed
|
||||
"test_startup"
|
||||
#"test_startup"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "zwave-js-server-python";
|
||||
version = "0.27.1";
|
||||
version = "0.28.0";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "home-assistant-libs";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Q02S0jEFZe4qOkRok/sY0UPrMpmD13off85UL3+8o/o=";
|
||||
sha256 = "137m9052ndbii0q6zw9vmwsfimai05q9np4wv06nw2p2mhy5x48p";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bootstrap";
|
||||
version = "5.0.2";
|
||||
version = "5.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/twbs/bootstrap/releases/download/v${version}/${pname}-${version}-dist.zip";
|
||||
sha256 = "sha256-ZvvBNDF9sjcO4JnLPRkzC1B1YG3fcMyjM9qwFlAg9sE=";
|
||||
sha256 = "sha256-OVNCspdOM1BWDmV1LTaqtlc2UrEcxste95ouXoOtZLE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rpg-cli";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facundoolano";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-LRTHnYxjPraVISAERT6XJGKIA3YJIilgEwU6olq2CRc=";
|
||||
sha256 = "sha256-R0Yaxe7Z1gPH0pvfytl5lOJKDZi4hN/upY/baMLc3Aw=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-ZlQy/JiYKDKPCEWrAFvKV6WsAkk2zsPpfJADB+kPyuo=";
|
||||
cargoSha256 = "sha256-pvhZlj1uy5DZV+RBnqkUlVQPdQqGhh0YLE9aGFS3s1g=";
|
||||
|
||||
# tests assume the authors macbook, and thus fail
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "epson-escpr";
|
||||
version = "1.7.3";
|
||||
version = "1.7.16";
|
||||
|
||||
src = fetchurl {
|
||||
# To find new versions, visit
|
||||
|
|
@ -11,10 +11,10 @@ stdenv.mkDerivation {
|
|||
# version.
|
||||
# NOTE: Don't forget to update the webarchive link too!
|
||||
urls = [
|
||||
"https://download3.ebz.epson.net/dsc/f/03/00/09/83/26/f90d0f70b33a9d7d77a2408364c47fba1ccbf943/epson-inkjet-printer-escpr-1.7.3-1lsb3.2.tar.gz"
|
||||
"https://web.archive.org/web/https://download3.ebz.epson.net/dsc/f/03/00/09/83/26/f90d0f70b33a9d7d77a2408364c47fba1ccbf943/epson-inkjet-printer-escpr-1.7.3-1lsb3.2.tar.gz"
|
||||
"https://download3.ebz.epson.net/dsc/f/03/00/12/97/30/97f146010d33b9a55badbc23429296f6b9b46011/epson-inkjet-printer-escpr-1.7.16-1lsb3.2.tar.gz"
|
||||
"https://web.archive.org/web/https://download3.ebz.epson.net/dsc/f/03/00/12/97/30/97f146010d33b9a55badbc23429296f6b9b46011/epson-inkjet-printer-escpr-1.7.16-1lsb3.2.tar.gz"
|
||||
];
|
||||
sha256 = "0r3jkdfk33irha9gpyvhha056ans59p7dq9i153i292ifjsd8458";
|
||||
sha256 = "18n6fgyrii8084vdjhys94lr6nhhbmn7zzjd8jckvv1grb0iz9nv";
|
||||
};
|
||||
|
||||
patches = [ ./cups-filter-ppd-dirs.patch ];
|
||||
|
|
|
|||
|
|
@ -30,11 +30,13 @@ stdenv.mkDerivation (common // {
|
|||
install -m 644 -v -D install_files/udev/99-razer.rules $RAZER_RULES_OUT
|
||||
install -m 755 -v -D install_files/udev/razer_mount $RAZER_MOUNT_OUT
|
||||
substituteInPlace $RAZER_RULES_OUT \
|
||||
--replace razer_mount $RAZER_MOUNT_OUT
|
||||
--replace razer_mount $RAZER_MOUNT_OUT \
|
||||
--replace plugdev openrazer
|
||||
substituteInPlace $RAZER_MOUNT_OUT \
|
||||
--replace /usr/bin/logger ${util-linux}/bin/logger \
|
||||
--replace chgrp ${coreutils}/bin/chgrp \
|
||||
--replace "PATH='/sbin:/bin:/usr/sbin:/usr/bin'" ""
|
||||
--replace "PATH='/sbin:/bin:/usr/sbin:/usr/bin'" "" \
|
||||
--replace plugdev openrazer
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -2,13 +2,14 @@
|
|||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2021.7.4";
|
||||
version = "2021.8.3";
|
||||
components = {
|
||||
"abode" = ps: with ps; [ abodepy ];
|
||||
"accuweather" = ps: with ps; [ accuweather ];
|
||||
"acer_projector" = ps: with ps; [ pyserial ];
|
||||
"acmeda" = ps: with ps; [ aiopulse ];
|
||||
"actiontec" = ps: with ps; [ ];
|
||||
"adax" = ps: with ps; [ ]; # missing inputs: adax
|
||||
"adguard" = ps: with ps; [ adguardhome ];
|
||||
"ads" = ps: with ps; [ pyads ];
|
||||
"advantage_air" = ps: with ps; [ advantage-air ];
|
||||
|
|
@ -32,7 +33,7 @@
|
|||
"ambient_station" = ps: with ps; [ aioambient ];
|
||||
"amcrest" = ps: with ps; [ amcrest ha-ffmpeg ];
|
||||
"ampio" = ps: with ps; [ ]; # missing inputs: asmog
|
||||
"analytics" = ps: with ps; [ aiohttp-cors ];
|
||||
"analytics" = ps: with ps; [ aiohttp-cors sqlalchemy ];
|
||||
"android_ip_webcam" = ps: with ps; [ pydroid-ipcam ];
|
||||
"androidtv" = ps: with ps; [ adb-shell androidtv pure-python-adb ];
|
||||
"anel_pwrctrl" = ps: with ps; [ ]; # missing inputs: anel_pwrctrl-homeassistant
|
||||
|
|
@ -92,7 +93,7 @@
|
|||
"bluesound" = ps: with ps; [ xmltodict ];
|
||||
"bluetooth_le_tracker" = ps: with ps; [ pygatt ];
|
||||
"bluetooth_tracker" = ps: with ps; [ bt-proximity pybluez ];
|
||||
"bme280" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense
|
||||
"bme280" = ps: with ps; [ smbus-cffi ]; # missing inputs: bme280spi i2csense
|
||||
"bme680" = ps: with ps; [ bme680 smbus-cffi ];
|
||||
"bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280
|
||||
"bmw_connected_drive" = ps: with ps; [ bimmer-connected ];
|
||||
|
|
@ -183,7 +184,7 @@
|
|||
"dlib_face_detect" = ps: with ps; [ face_recognition ];
|
||||
"dlib_face_identify" = ps: with ps; [ face_recognition ];
|
||||
"dlink" = ps: with ps; [ ]; # missing inputs: pyW215
|
||||
"dlna_dmr" = ps: with ps; [ async-upnp-client ];
|
||||
"dlna_dmr" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr ];
|
||||
"dnsip" = ps: with ps; [ aiodns ];
|
||||
"dominos" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pizzapi
|
||||
"doods" = ps: with ps; [ pillow ]; # missing inputs: pydoods
|
||||
|
|
@ -224,7 +225,8 @@
|
|||
"emonitor" = ps: with ps; [ aioemonitor ];
|
||||
"emulated_hue" = ps: with ps; [ aiohttp-cors ];
|
||||
"emulated_kasa" = ps: with ps; [ sense-energy ];
|
||||
"emulated_roku" = ps: with ps; [ emulated-roku ];
|
||||
"emulated_roku" = ps: with ps; [ aiohttp-cors emulated-roku ifaddr ];
|
||||
"energy" = ps: with ps; [ aiohttp-cors sqlalchemy ];
|
||||
"enigma2" = ps: with ps; [ openwebifpy ];
|
||||
"enocean" = ps: with ps; [ enocean ];
|
||||
"enphase_envoy" = ps: with ps; [ envoy-reader ];
|
||||
|
|
@ -268,6 +270,7 @@
|
|||
"flexit" = ps: with ps; [ pymodbus ]; # missing inputs: pyflexit
|
||||
"flic" = ps: with ps; [ pyflic ];
|
||||
"flick_electric" = ps: with ps; [ pyflick ];
|
||||
"flipr" = ps: with ps; [ ]; # missing inputs: flipr-api
|
||||
"flo" = ps: with ps; [ aioflo ];
|
||||
"flock" = ps: with ps; [ ];
|
||||
"flume" = ps: with ps; [ pyflume ];
|
||||
|
|
@ -286,20 +289,19 @@
|
|||
"freebox" = ps: with ps; [ freebox-api ];
|
||||
"freedns" = ps: with ps; [ ];
|
||||
"freedompro" = ps: with ps; [ pyfreedompro ];
|
||||
"fritz" = ps: with ps; [ aiohttp-cors fritzconnection fritzprofiles ifaddr xmltodict ];
|
||||
"fritz" = ps: with ps; [ aiohttp-cors fritzconnection ifaddr xmltodict ];
|
||||
"fritzbox" = ps: with ps; [ pyfritzhome ];
|
||||
"fritzbox_callmonitor" = ps: with ps; [ fritzconnection ];
|
||||
"fritzbox_netmonitor" = ps: with ps; [ fritzconnection ];
|
||||
"fronius" = ps: with ps; [ pyfronius ];
|
||||
"frontend" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow ];
|
||||
"frontend" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ];
|
||||
"frontier_silicon" = ps: with ps; [ ]; # missing inputs: afsapi
|
||||
"futurenow" = ps: with ps; [ pyfnip ];
|
||||
"garadget" = ps: with ps; [ ];
|
||||
"garages_amsterdam" = ps: with ps; [ garages-amsterdam ];
|
||||
"garmin_connect" = ps: with ps; [ garminconnect-ha ];
|
||||
"gc100" = ps: with ps; [ ]; # missing inputs: python-gc100
|
||||
"gdacs" = ps: with ps; [ aio-georss-gdacs ];
|
||||
"generic" = ps: with ps; [ ];
|
||||
"generic_hygrostat" = ps: with ps; [ ];
|
||||
"generic_thermostat" = ps: with ps; [ sqlalchemy ];
|
||||
"geniushub" = ps: with ps; [ ]; # missing inputs: geniushub-client
|
||||
"geo_json_events" = ps: with ps; [ geojson-client ];
|
||||
|
|
@ -342,7 +344,7 @@
|
|||
"hangouts" = ps: with ps; [ hangups ];
|
||||
"harman_kardon_avr" = ps: with ps; [ ]; # missing inputs: hkavr
|
||||
"harmony" = ps: with ps; [ aioharmony ];
|
||||
"hassio" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow ];
|
||||
"hassio" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ];
|
||||
"haveibeenpwned" = ps: with ps; [ ];
|
||||
"hddtemp" = ps: with ps; [ ];
|
||||
"hdmi_cec" = ps: with ps; [ pycec ];
|
||||
|
|
@ -371,7 +373,7 @@
|
|||
"html5" = ps: with ps; [ aiohttp-cors pywebpush ];
|
||||
"http" = ps: with ps; [ aiohttp-cors ];
|
||||
"htu21d" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense
|
||||
"huawei_lte" = ps: with ps; [ getmac huawei-lte-api stringcase url-normalize ];
|
||||
"huawei_lte" = ps: with ps; [ huawei-lte-api stringcase url-normalize ];
|
||||
"huawei_router" = ps: with ps; [ ];
|
||||
"hue" = ps: with ps; [ aiohue ];
|
||||
"huisbaasje" = ps: with ps; [ huisbaasje-client ];
|
||||
|
|
@ -460,7 +462,7 @@
|
|||
"litterrobot" = ps: with ps; [ pylitterbot ];
|
||||
"llamalab_automate" = ps: with ps; [ ];
|
||||
"local_file" = ps: with ps; [ ];
|
||||
"local_ip" = ps: with ps; [ ];
|
||||
"local_ip" = ps: with ps; [ aiohttp-cors ifaddr ];
|
||||
"locative" = ps: with ps; [ aiohttp-cors ];
|
||||
"lock" = ps: with ps; [ ];
|
||||
"logbook" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ];
|
||||
|
|
@ -484,7 +486,7 @@
|
|||
"mailgun" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pymailgunner
|
||||
"manual" = ps: with ps; [ ];
|
||||
"manual_mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt ];
|
||||
"map" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow ];
|
||||
"map" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ];
|
||||
"marytts" = ps: with ps; [ ]; # missing inputs: speak2mary
|
||||
"mastodon" = ps: with ps; [ mastodon-py ];
|
||||
"matrix" = ps: with ps; [ matrix-client ];
|
||||
|
|
@ -528,7 +530,7 @@
|
|||
"monoprice" = ps: with ps; [ ]; # missing inputs: pymonoprice
|
||||
"moon" = ps: with ps; [ ];
|
||||
"motion_blinds" = ps: with ps; [ ]; # missing inputs: motionblinds
|
||||
"motioneye" = ps: with ps; [ motioneye-client ];
|
||||
"motioneye" = ps: with ps; [ aiohttp-cors motioneye-client ];
|
||||
"mpchc" = ps: with ps; [ ];
|
||||
"mpd" = ps: with ps; [ mpd2 ];
|
||||
"mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt ];
|
||||
|
|
@ -540,7 +542,7 @@
|
|||
"mullvad" = ps: with ps; [ mullvad-api ];
|
||||
"mutesync" = ps: with ps; [ mutesync ];
|
||||
"mvglive" = ps: with ps; [ PyMVGLive ];
|
||||
"my" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow ];
|
||||
"my" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ];
|
||||
"mychevy" = ps: with ps; [ ]; # missing inputs: mychevy
|
||||
"mycroft" = ps: with ps; [ ]; # missing inputs: mycroftapi
|
||||
"myq" = ps: with ps; [ pymyq ];
|
||||
|
|
@ -566,7 +568,7 @@
|
|||
"nexia" = ps: with ps; [ nexia ];
|
||||
"nextbus" = ps: with ps; [ ]; # missing inputs: py_nextbusnext
|
||||
"nextcloud" = ps: with ps; [ nextcloudmonitor ];
|
||||
"nfandroidtv" = ps: with ps; [ ];
|
||||
"nfandroidtv" = ps: with ps; [ ]; # missing inputs: notifications-android-tv
|
||||
"nightscout" = ps: with ps; [ ]; # missing inputs: py-nightscout
|
||||
"niko_home_control" = ps: with ps; [ ]; # missing inputs: niko-home-control
|
||||
"nilu" = ps: with ps; [ ]; # missing inputs: niluclient
|
||||
|
|
@ -596,7 +598,7 @@
|
|||
"ohmconnect" = ps: with ps; [ defusedxml ];
|
||||
"ombi" = ps: with ps; [ ]; # missing inputs: pyombi
|
||||
"omnilogic" = ps: with ps; [ omnilogic ];
|
||||
"onboarding" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow ];
|
||||
"onboarding" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ];
|
||||
"ondilo_ico" = ps: with ps; [ aiohttp-cors ondilo ];
|
||||
"onewire" = ps: with ps; [ ]; # missing inputs: pi1wire pyownet
|
||||
"onkyo" = ps: with ps; [ onkyo-eiscp ];
|
||||
|
|
@ -628,8 +630,8 @@
|
|||
"panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta
|
||||
"panasonic_viera" = ps: with ps; [ ]; # missing inputs: panasonic_viera
|
||||
"pandora" = ps: with ps; [ pexpect ];
|
||||
"panel_custom" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow ];
|
||||
"panel_iframe" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow ];
|
||||
"panel_custom" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ];
|
||||
"panel_iframe" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ];
|
||||
"pcal9535a" = ps: with ps; [ ]; # missing inputs: pcal9535a
|
||||
"pencom" = ps: with ps; [ ]; # missing inputs: pencompy
|
||||
"persistent_notification" = ps: with ps; [ ];
|
||||
|
|
@ -657,6 +659,7 @@
|
|||
"progettihwsw" = ps: with ps; [ ]; # missing inputs: progettihwsw
|
||||
"proliphix" = ps: with ps; [ ]; # missing inputs: proliphix
|
||||
"prometheus" = ps: with ps; [ aiohttp-cors prometheus_client ];
|
||||
"prosegur" = ps: with ps; [ ]; # missing inputs: pyprosegur
|
||||
"prowl" = ps: with ps; [ ];
|
||||
"proximity" = ps: with ps; [ ];
|
||||
"proxmoxve" = ps: with ps; [ proxmoxer ];
|
||||
|
|
@ -696,6 +699,7 @@
|
|||
"remember_the_milk" = ps: with ps; [ httplib2 ]; # missing inputs: RtmAPI
|
||||
"remote" = ps: with ps; [ ];
|
||||
"remote_rpi_gpio" = ps: with ps; [ ]; # missing inputs: gpiozero
|
||||
"renault" = ps: with ps; [ ]; # missing inputs: renault-api
|
||||
"repetier" = ps: with ps; [ ]; # missing inputs: pyrepetier
|
||||
"rest" = ps: with ps; [ jsonpath xmltodict ];
|
||||
"rest_command" = ps: with ps; [ ];
|
||||
|
|
@ -717,16 +721,16 @@
|
|||
"rpi_gpio_pwm" = ps: with ps; [ ]; # missing inputs: pwmled
|
||||
"rpi_pfio" = ps: with ps; [ ]; # missing inputs: pifacecommon pifacedigitalio
|
||||
"rpi_power" = ps: with ps; [ ]; # missing inputs: rpi-bad-power
|
||||
"rpi_rf" = ps: with ps; [ ]; # missing inputs: rpi-rf
|
||||
"rpi_rf" = ps: with ps; [ ]; # missing inputs: RPi.GPIO rpi-rf
|
||||
"rss_feed_template" = ps: with ps; [ aiohttp-cors ];
|
||||
"rtorrent" = ps: with ps; [ ];
|
||||
"ruckus_unleashed" = ps: with ps; [ pyruckus ];
|
||||
"russound_rio" = ps: with ps; [ ]; # missing inputs: russound_rio
|
||||
"russound_rnet" = ps: with ps; [ ]; # missing inputs: russound
|
||||
"sabnzbd" = ps: with ps; [ aiohttp-cors ifaddr netdisco zeroconf ]; # missing inputs: pysabnzbd
|
||||
"safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa home-assistant-frontend pillow ];
|
||||
"safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa home-assistant-frontend pillow sqlalchemy ];
|
||||
"saj" = ps: with ps; [ ]; # missing inputs: pysaj
|
||||
"samsungtv" = ps: with ps; [ samsungctl samsungtvws wakeonlan ];
|
||||
"samsungtv" = ps: with ps; [ getmac samsungctl samsungtvws wakeonlan ];
|
||||
"satel_integra" = ps: with ps; [ ]; # missing inputs: satel_integra
|
||||
"scene" = ps: with ps; [ ];
|
||||
"schluter" = ps: with ps; [ ]; # missing inputs: py-schluter
|
||||
|
|
@ -763,6 +767,7 @@
|
|||
"simplisafe" = ps: with ps; [ simplisafe-python ];
|
||||
"simulated" = ps: with ps; [ ];
|
||||
"sinch" = ps: with ps; [ ]; # missing inputs: clx-sdk-xms
|
||||
"siren" = ps: with ps; [ ];
|
||||
"sisyphus" = ps: with ps; [ ]; # missing inputs: sisyphus-control
|
||||
"sky_hub" = ps: with ps; [ ]; # missing inputs: pyskyqhub
|
||||
"skybeacon" = ps: with ps; [ pygatt ];
|
||||
|
|
@ -793,7 +798,7 @@
|
|||
"somfy_mylink" = ps: with ps; [ somfy-mylink-synergy ];
|
||||
"sonarr" = ps: with ps; [ sonarr ];
|
||||
"songpal" = ps: with ps; [ python-songpal ];
|
||||
"sonos" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml ifaddr plexapi plexauth plexwebsocket pysonos zeroconf ];
|
||||
"sonos" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml ifaddr plexapi plexauth plexwebsocket soco zeroconf ];
|
||||
"sony_projector" = ps: with ps; [ ]; # missing inputs: pysdcp
|
||||
"soundtouch" = ps: with ps; [ aiohttp-cors ifaddr libsoundtouch zeroconf ];
|
||||
"spaceapi" = ps: with ps; [ aiohttp-cors ];
|
||||
|
|
@ -833,7 +838,7 @@
|
|||
"syncthing" = ps: with ps; [ aiosyncthing ];
|
||||
"syncthru" = ps: with ps; [ pysyncthru url-normalize ];
|
||||
"synology_chat" = ps: with ps; [ ];
|
||||
"synology_dsm" = ps: with ps; [ synologydsm-api ];
|
||||
"synology_dsm" = ps: with ps; [ ]; # missing inputs: py-synologydsm-api
|
||||
"synology_srm" = ps: with ps; [ ]; # missing inputs: synology-srm
|
||||
"syslog" = ps: with ps; [ ];
|
||||
"system_bridge" = ps: with ps; [ aiohttp-cors ifaddr systembridge zeroconf ];
|
||||
|
|
@ -969,7 +974,6 @@
|
|||
"worldtidesinfo" = ps: with ps; [ ];
|
||||
"worxlandroid" = ps: with ps; [ ];
|
||||
"wsdot" = ps: with ps; [ ];
|
||||
"wunderground" = ps: with ps; [ ];
|
||||
"x10" = ps: with ps; [ ];
|
||||
"xbee" = ps: with ps; [ ]; # missing inputs: xbee-helper
|
||||
"xbox" = ps: with ps; [ aiohttp-cors xbox-webapi ];
|
||||
|
|
@ -989,6 +993,7 @@
|
|||
"yeelight" = ps: with ps; [ yeelight ];
|
||||
"yeelightsunflower" = ps: with ps; [ ]; # missing inputs: yeelightsunflower
|
||||
"yi" = ps: with ps; [ aioftp ha-ffmpeg ];
|
||||
"youless" = ps: with ps; [ ]; # missing inputs: youless-api
|
||||
"zabbix" = ps: with ps; [ ]; # missing inputs: py-zabbix
|
||||
"zamg" = ps: with ps; [ ];
|
||||
"zengge" = ps: with ps; [ ]; # missing inputs: zengge
|
||||
|
|
|
|||
|
|
@ -58,25 +58,6 @@ let
|
|||
(mkOverride "ring-doorbell" "0.6.2"
|
||||
"fbd537722a27b3b854c26506d894b7399bb8dc57ff36083285971227a2d46560")
|
||||
|
||||
# Pinned due to API changes in pyflunearyou>=2.0
|
||||
(self: super: {
|
||||
pyflunearyou = super.pyflunearyou.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.0.7";
|
||||
src = fetchFromGitHub {
|
||||
owner = "bachya";
|
||||
repo = "pyflunearyou";
|
||||
rev = version;
|
||||
sha256 = "0hq55k298m9a90qb3lasw9bi093hzndrah00rfq94bp53aq0is99";
|
||||
};
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "poetry.masonry.api" "poetry.core.masonry.api" \
|
||||
--replace 'msgpack = "^0.6.2"' 'msgpack = "*"' \
|
||||
--replace 'ujson = "^1.35"' 'ujson = "*"'
|
||||
'';
|
||||
});
|
||||
})
|
||||
|
||||
# Pinned due to API changes in pylast 4.2.1
|
||||
(mkOverride "pylast" "4.2.0"
|
||||
"0zd0dn2l738ndz62vpa751z0ldnm91dcz9zzbvxv53r08l0s9yf3")
|
||||
|
|
@ -157,7 +138,7 @@ let
|
|||
extraBuildInputs = extraPackages py.pkgs;
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2021.7.4";
|
||||
hassVersion = "2021.8.3";
|
||||
|
||||
in with py.pkgs; buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
|
|
@ -174,7 +155,7 @@ in with py.pkgs; buildPythonApplication rec {
|
|||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = version;
|
||||
sha256 = "1y6p3hg487ishar1r8vir5cxfbaw4c86s5w3zn9bmbf6jbd51pyk";
|
||||
sha256 = "02hm4x1qx9vd39d9l2gl2pnfnjmpk6p2w72lj45cvp3jimdg30fz";
|
||||
};
|
||||
|
||||
# leave this in, so users don't have to constantly update their downstream patch handling
|
||||
|
|
@ -388,7 +369,6 @@ in with py.pkgs; buildPythonApplication rec {
|
|||
"fritzbox_callmonitor"
|
||||
"frontend"
|
||||
"garages_amsterdam"
|
||||
"garmin_connect"
|
||||
"gdacs"
|
||||
"generic"
|
||||
"generic_thermostat"
|
||||
|
|
@ -430,7 +410,8 @@ in with py.pkgs; buildPythonApplication rec {
|
|||
"home_connect"
|
||||
"home_plus_control"
|
||||
"homeassistant"
|
||||
"homekit"
|
||||
# disable homekit tests because they fail in the network component
|
||||
#"homekit"
|
||||
"homekit_controller"
|
||||
"homematic"
|
||||
"homematicip_cloud"
|
||||
|
|
@ -658,7 +639,6 @@ in with py.pkgs; buildPythonApplication rec {
|
|||
"switcher_kis"
|
||||
"syncthing"
|
||||
"syncthru"
|
||||
"synology_dsm"
|
||||
"system_health"
|
||||
"system_log"
|
||||
"tado"
|
||||
|
|
@ -731,7 +711,6 @@ in with py.pkgs; buildPythonApplication rec {
|
|||
"workday"
|
||||
"worldclock"
|
||||
"wsdot"
|
||||
"wunderground"
|
||||
"xbox"
|
||||
"xiaomi"
|
||||
"xiaomi_aqara"
|
||||
|
|
@ -791,8 +770,15 @@ in with py.pkgs; buildPythonApplication rec {
|
|||
# wallbox/test_config_flow.py: Tries to connect to api.wall-box.cim: Failed to establish a new connection: [Errno -2] Name or service not known
|
||||
"--deselect tests/components/wallbox/test_config_flow.py::test_form_invalid_auth"
|
||||
"--deselect tests/components/wallbox/test_config_flow.py::test_form_cannot_connect"
|
||||
# tests/components/default_config/test_init.py: Tries to check for updates and fails ungracefully without network access
|
||||
# default_config/test_init.py: Tries to check for updates and fails ungracefully without network access
|
||||
"--deselect tests/components/default_config/test_init.py::test_setup"
|
||||
# local_ip/test_{init,config_flow}.py: tries to lookup a route towards a multicast address and fails
|
||||
"--deselect tests/components/local_ip/test_init.py::test_basic_setup"
|
||||
"--deselect tests/components/local_ip/test_config_flow.py::test_config_flow"
|
||||
# netatmo/test_select.py: NoneType object has no attribute state
|
||||
"--deselect tests/components/netatmo/test_select.py::test_select_schedule_thermostats"
|
||||
# helpers/test_system_info.py: AssertionError: assert 'Unknown' == 'Home Assistant Container'
|
||||
"--deselect tests/helpers/test_system_info.py::test_container_installationtype"
|
||||
# tests are located in tests/
|
||||
"tests"
|
||||
# dynamically add packages required for component tests
|
||||
|
|
@ -828,8 +814,6 @@ in with py.pkgs; buildPythonApplication rec {
|
|||
"test_onboarding_core_no_rpi_power"
|
||||
# hue/test_sensor_base.py: Race condition when counting events
|
||||
"test_hue_events"
|
||||
# homekit/test_homekit.py: Tries to use zeroconf, which tries to join a multicast group
|
||||
"test_homekit_uses_system_zeroconf"
|
||||
# august/test_lock.py: AssertionError: assert 'unlocked' == 'locked'
|
||||
"test_lock_update_via_pubnub"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@ 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 = "20210707.0";
|
||||
version = "20210804.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-6RR+T4+vS6g00+MS1ty8aFVx6WM2dE+c17+wDoPxnGg=";
|
||||
sha256 = "sha256-0VCukSHI4PXAecxHc1DJSQ1GrErenNb0K4OhSIgkQbs=";
|
||||
};
|
||||
|
||||
# there is nothing to strip in this package
|
||||
|
|
|
|||
|
|
@ -36,5 +36,5 @@ sed -i -e "s/hassVersion =.*/hassVersion = \"${TARGET_VERSION}\";/" \
|
|||
nix-update --version "$TARGET_VERSION" --build home-assistant
|
||||
)
|
||||
|
||||
git add ./component-packages.nix ./default.nix ./frontend.nix
|
||||
git commit -m "home-assistant: ${CURRENT_VERSION} -> ${TARGET_VERSION}"
|
||||
#git add ./component-packages.nix ./default.nix ./frontend.nix
|
||||
#git commit -m "home-assistant: ${CURRENT_VERSION} -> ${TARGET_VERSION}"
|
||||
|
|
|
|||
|
|
@ -44,18 +44,18 @@ in {
|
|||
'';
|
||||
|
||||
nextcloud20 = generic {
|
||||
version = "20.0.11";
|
||||
sha256 = "sha256-CLrJH5eNTiJJrDzfCg+re3J2qmwxFOe12nUU/QgtD6A=";
|
||||
version = "20.0.12";
|
||||
sha256 = "sha256-gIIPuWVcWv/5nuXMWticcPBKMjJVsCmvs83tj8fdbgY=";
|
||||
};
|
||||
|
||||
nextcloud21 = generic {
|
||||
version = "21.0.3";
|
||||
sha256 = "8adcd175c7a70c33332586fa9ce36d03ba02d1df5d4c334d1210201d3fb953ee";
|
||||
version = "21.0.4";
|
||||
sha256 = "sha256-Sg0w/r+6UxGLqZCgwtLBZ2e3eqZ2r8k30gGNaGXF/jo=";
|
||||
};
|
||||
|
||||
nextcloud22 = generic {
|
||||
version = "22.0.0";
|
||||
sha256 = "sha256-ORHTdUw3rKfJtfOys3UTwPK1u5ea8AgWwRF7Hu28XXo=";
|
||||
version = "22.1.0";
|
||||
sha256 = "sha256-SCCAj3mRRoU2BOH6J9fykkSQGKRNxzv5KKl7AgKDGLo=";
|
||||
};
|
||||
# tip: get she sha with:
|
||||
# curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256'
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
, rustPlatform
|
||||
, openssl
|
||||
, zlib
|
||||
, zstd
|
||||
, pkg-config
|
||||
, python3
|
||||
, xorg
|
||||
|
|
@ -17,27 +18,40 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nushell";
|
||||
version = "0.33.0";
|
||||
version = "0.35.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Asjm3IoAfzphITLQuNh6r/i/pjEM/A+wpCsAB83bu2U=";
|
||||
sha256 = "0p5whwx6wk9k7mrxhr7azrppbj9mv53hd4bl1cgygxz231aq8337";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-Ly59mdUzSI2pIPbckWn1WBz/o2zVzpAzaCDROLdjG7Y=";
|
||||
cargoSha256 = "0xs0s02zf78pgd94ifh465mg14rrwjfg7qbzmmq8jha758gfwdi3";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ];
|
||||
|
||||
buildInputs = [ openssl ]
|
||||
buildInputs = [ openssl zstd ]
|
||||
++ lib.optionals stdenv.isDarwin [ zlib libiconv Security ]
|
||||
++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ xorg.libX11 ]
|
||||
++ lib.optionals (withExtraFeatures && stdenv.isDarwin) [ AppKit nghttp2 libgit2 ];
|
||||
|
||||
cargoBuildFlags = lib.optional withExtraFeatures "--features=extra";
|
||||
|
||||
# Since 0.34, nu has an indirect dependency on `zstd-sys` (via `polars` and
|
||||
# `parquet`, for dataframe support), which by default has an impure build
|
||||
# (git submodule for the `zstd` C library). The `pkg-config` feature flag
|
||||
# fixes this, but it's hard to invoke this in the right place, because of
|
||||
# the indirect dependencies. So add a direct dependency on `zstd-sys` here
|
||||
# at the top level, along with this feature flag, to ensure that when
|
||||
# `zstd-sys` is transitively invoked, it triggers a pure build using the
|
||||
# system `zstd` library provided above.
|
||||
#
|
||||
# (If this patch needs updating, in a nushell repo add the zstd-sys line to
|
||||
# Cargo.toml, then `cargo update --package zstd-sys` to update Cargo.lock.)
|
||||
cargoPatches = [ ./use-system-zstd-lib.diff ];
|
||||
|
||||
# TODO investigate why tests are broken on darwin
|
||||
# failures show that tests try to write to paths
|
||||
# outside of TMPDIR
|
||||
|
|
|
|||
32
pkgs/shells/nushell/use-system-zstd-lib.diff
Normal file
32
pkgs/shells/nushell/use-system-zstd-lib.diff
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index 8833c3e5..0c90d2fe 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -3188,6 +3188,7 @@ dependencies = [
|
||||
"nu_plugin_xpath",
|
||||
"rstest",
|
||||
"serial_test",
|
||||
+ "zstd-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -6954,4 +6955,5 @@ checksum = "615120c7a2431d16cf1cf979e7fc31ba7a5b5e5707b29c8a99e5dbf8a8392a33"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"libc",
|
||||
+ "pkg-config",
|
||||
]
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index 89e8a311..4cc2331a 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -63,6 +63,9 @@ serial_test = "0.5.1"
|
||||
hamcrest2 = "0.3.0"
|
||||
rstest = "0.10.0"
|
||||
|
||||
+# Specify that the indirect dependency ztsd-sys should pick up the system zstd C library
|
||||
+zstd-sys = { version = "1", features = [ "pkg-config" ] }
|
||||
+
|
||||
[build-dependencies]
|
||||
|
||||
[features]
|
||||
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "calamares";
|
||||
version = "3.2.36";
|
||||
version = "3.2.39";
|
||||
|
||||
# release including submodule
|
||||
src = fetchurl {
|
||||
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-pgA0mRglIBObNNUQIozNy6EvJQSmHRF+kN4EjqL4tt4=";
|
||||
sha256 = "sha256-QGdy49RndRIBR3B+Z7iXbFyx5gxXO2GHNYc+iv0z47w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules ];
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "diffoscope";
|
||||
version = "179";
|
||||
version = "180";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
|
||||
sha256 = "sha256-SIFLWlmENuhgwG0YbIDTWG6uCHEfuoc0IMVz4cp5NX4=";
|
||||
sha256 = "sha256-P6u+5MwnJ4xQ955qdX1I/ujRCcgyCXjXDXvvpUbhqt8=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
|
@ -35,7 +35,7 @@ python3Packages.buildPythonApplication rec {
|
|||
# Most of the non-Python dependencies here are optional command-line tools for various file-format parsers.
|
||||
# To help figuring out what's missing from the list, run: ./pkgs/tools/misc/diffoscope/list-missing-tools.sh
|
||||
#
|
||||
# Still missing these tools: docx2txt dumppdf dumpxsb enjarify lipo ocamlobjinfo oggDump otool procyon
|
||||
# Still missing these tools: docx2txt dumpimage dumppdf dumpxsb enjarify lipo ocamlobjinfo oggDump otool procyon
|
||||
pythonPath = [
|
||||
binutils-unwrapped bzip2 colordiff coreutils cpio db diffutils
|
||||
dtc e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yad";
|
||||
version = "8.0";
|
||||
version = "9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "v1cont";
|
||||
repo = "yad";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-KntJtli1PtqH/9XOTq4FkVJYklp0L7bChwQQGCBTLDA=";
|
||||
sha256 = "sha256-P22DMmR+z2kl05SkOsbjFHFz9I5cu4W6EaYLpd1a0mg=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mu";
|
||||
version = "1.6.1";
|
||||
version = "1.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "djcb";
|
||||
repo = "mu";
|
||||
rev = version;
|
||||
sha256 = "7mSP1F2RxW0CEDRWbMzDRfoehrr24b11sCLM2gQFjuI=";
|
||||
sha256 = "EYERtDYIf0aw9nMLFZPGZ5s1i+erSq9H3tP29KwCAgQ=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString (batchSize != null) ''
|
||||
|
|
|
|||
24
pkgs/tools/text/pinyin-tool/default.nix
Normal file
24
pkgs/tools/text/pinyin-tool/default.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{ stdenv, lib, rustPlatform, fetchFromGitHub, Security }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "pinyin-tool";
|
||||
version = "0.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "briankung";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1gwqwxlvdrm4sdyqkvpvvfi6jh6qqn6qybn0z66wm06k62f8zj5b";
|
||||
};
|
||||
|
||||
cargoSha256 = "1ixl4bsb8c8dmz9s28a2v5l5f2hi3g9xjy6ribmhybpwmfs4mr4d";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple command line tool for converting Chinese characters to space-separate pinyin words";
|
||||
homepage = "https://github.com/briankung/pinyin-tool";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ neonfuz ];
|
||||
};
|
||||
}
|
||||
|
|
@ -8077,6 +8077,10 @@ in
|
|||
|
||||
pixiewps = callPackage ../tools/networking/pixiewps {};
|
||||
|
||||
pinyin-tool = callPackage ../tools/text/pinyin-tool {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
pk2cmd = callPackage ../tools/misc/pk2cmd { };
|
||||
|
||||
plantuml = callPackage ../tools/misc/plantuml { };
|
||||
|
|
@ -25497,6 +25501,8 @@ in
|
|||
|
||||
kubernetes-helmPlugins = dontRecurseIntoAttrs (callPackage ../applications/networking/cluster/helm/plugins { });
|
||||
|
||||
chart-testing = callPackage ../applications/networking/cluster/helm/chart-testing { };
|
||||
|
||||
kubetail = callPackage ../applications/networking/cluster/kubetail { } ;
|
||||
|
||||
kupfer = callPackage ../applications/misc/kupfer {
|
||||
|
|
|
|||
|
|
@ -569,6 +569,8 @@ in {
|
|||
|
||||
aspy-yaml = callPackage ../development/python-modules/aspy.yaml { };
|
||||
|
||||
assertpy = callPackage ../development/python-modules/assertpy { };
|
||||
|
||||
asteval = callPackage ../development/python-modules/asteval { };
|
||||
|
||||
astor = callPackage ../development/python-modules/astor { };
|
||||
|
|
@ -6904,6 +6906,8 @@ in {
|
|||
|
||||
pytest-mock = callPackage ../development/python-modules/pytest-mock { };
|
||||
|
||||
pytest-mockservers = callPackage ../development/python-modules/pytest-mockservers { };
|
||||
|
||||
pytest-mpl = callPackage ../development/python-modules/pytest-mpl { };
|
||||
|
||||
pytest-mypy = callPackage ../development/python-modules/pytest-mypy { };
|
||||
|
|
@ -6942,6 +6946,8 @@ in {
|
|||
|
||||
pytest-rerunfailures = callPackage ../development/python-modules/pytest-rerunfailures { };
|
||||
|
||||
pytest-resource-path = callPackage ../development/python-modules/pytest-resource-path { };
|
||||
|
||||
pytest-runner = callPackage ../development/python-modules/pytest-runner { };
|
||||
|
||||
pytest-sanic = callPackage ../development/python-modules/pytest-sanic {
|
||||
|
|
@ -8729,6 +8735,8 @@ in {
|
|||
|
||||
timelib = callPackage ../development/python-modules/timelib { };
|
||||
|
||||
time-machine = callPackage ../development/python-modules/time-machine { };
|
||||
|
||||
timeout-decorator = callPackage ../development/python-modules/timeout-decorator { };
|
||||
|
||||
timezonefinder = callPackage ../development/python-modules/timezonefinder { };
|
||||
|
|
@ -8935,6 +8943,8 @@ in {
|
|||
|
||||
types-decorator = callPackage ../development/python-modules/types-decorator { };
|
||||
|
||||
types-pytz = callPackage ../development/python-modules/types-pytz { };
|
||||
|
||||
types-requests = callPackage ../development/python-modules/types-requests { };
|
||||
|
||||
typesentry = callPackage ../development/python-modules/typesentry { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue