public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging-next' into staging

This commit is contained in:
Jan Tojnar 2021-03-06 19:56:45 +01:00
parent f5a7d8bb41 909c7c15d5
commit 1465e8e397
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
45 changed files with 3069 additions and 1050 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nixos/modules/services/misc/home-assistant.nix
View File

@ -183,8 +183,14 @@ in {
}; };
package = mkOption { package = mkOption {
default = pkgs.home-assistant; default = pkgs.home-assistant.overrideAttrs (oldAttrs: {
defaultText = "pkgs.home-assistant"; doInstallCheck = false;
});
defaultText = literalExample ''
pkgs.home-assistant.overrideAttrs (oldAttrs: {
doInstallCheck = false;
})
'';
type = types.package; type = types.package;
example = literalExample '' example = literalExample ''
pkgs.home-assistant.override { pkgs.home-assistant.override {
@ -192,7 +198,7 @@ in {
} }
''; '';
description = '' description = ''
Home Assistant package to use. Home Assistant package to use. By default the tests are disabled, as they take a considerable amout of time to complete.
Override <literal>extraPackages</literal> or <literal>extraComponents</literal> in order to add additional dependencies. Override <literal>extraPackages</literal> or <literal>extraComponents</literal> in order to add additional dependencies.
If you specify <option>config</option> and do not set <option>autoExtraComponents</option> If you specify <option>config</option> and do not set <option>autoExtraComponents</option>
to <literal>false</literal>, overriding <literal>extraComponents</literal> will have no effect. to <literal>false</literal>, overriding <literal>extraComponents</literal> will have no effect.

7
nixos/modules/services/x11/desktop-managers/xfce.nix
View File

@ -58,7 +58,7 @@ in
noDesktop = mkOption { noDesktop = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;
description = "Don't install XFCE desktop components (xfdesktop, panel and notification daemon)."; description = "Don't install XFCE desktop components (xfdesktop and panel).";
}; };
enableXfwm = mkOption { enableXfwm = mkOption {
@ -98,6 +98,7 @@ in
parole parole
ristretto ristretto
xfce4-appfinder xfce4-appfinder
xfce4-notifyd
xfce4-screenshooter xfce4-screenshooter
xfce4-session xfce4-session
xfce4-settings xfce4-settings
@ -119,7 +120,6 @@ in
xfwm4 xfwm4
xfwm4-themes xfwm4-themes
] ++ optionals (!cfg.noDesktop) [ ] ++ optionals (!cfg.noDesktop) [
xfce4-notifyd
xfce4-panel xfce4-panel
xfdesktop xfdesktop
]; ];
@ -166,7 +166,8 @@ in
# Systemd services # Systemd services
systemd.packages = with pkgs.xfce; [ systemd.packages = with pkgs.xfce; [
(thunar.override { thunarPlugins = cfg.thunarPlugins; }) (thunar.override { thunarPlugins = cfg.thunarPlugins; })
] ++ optional (!cfg.noDesktop) xfce4-notifyd; xfce4-notifyd
];
}; };
} }

2
nixos/tests/home-assistant.nix
View File

@ -24,6 +24,8 @@ in {
services.home-assistant = { services.home-assistant = {
inherit configDir; inherit configDir;
enable = true; enable = true;
# includes the package with all tests enabled
package = pkgs.home-assistant;
config = { config = {
homeassistant = { homeassistant = {
name = "Home"; name = "Home";

4
pkgs/applications/version-management/git-and-tools/git-machete/default.nix
View File

@ -4,11 +4,11 @@
buildPythonApplication rec { buildPythonApplication rec {
pname = "git-machete"; pname = "git-machete";
version = "2.16.1"; version = "3.0.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "00xh3q3gmi88qcl0a61pw532iyw4xcls5h336cjzld70ps2r89g4"; sha256 = "077xs3grjidahxz1gc93565b25blf97lwsljmkmr0yapps8z630d";
}; };
nativeBuildInputs = [ installShellFiles pbr ]; nativeBuildInputs = [ installShellFiles pbr ];

7
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -1487,13 +1487,6 @@ self: super: {
# Due to tests restricting base in 0.8.0.0 release # Due to tests restricting base in 0.8.0.0 release
http-media = doJailbreak super.http-media; http-media = doJailbreak super.http-media;
# Use an already merged upstream patch fixing the build with primitive >= 0.7.2
# The version bounds were correctly specified before, so we need to jailbreak as well
streamly = appendPatch (doJailbreak super.streamly) (pkgs.fetchpatch {
url = "https://github.com/composewell/streamly/commit/2c88cb631fdcb5c0d3a8bc936e1e63835800be9b.patch";
sha256 = "0g2m0y46zr3xs9fswkm4h9adhsg6gzl5zwgidshsjh3k3rq4h7b1";
});
# https://github.com/ekmett/half/issues/35 # https://github.com/ekmett/half/issues/35
half = if pkgs.stdenv.isAarch64 half = if pkgs.stdenv.isAarch64
then dontCheck super.half then dontCheck super.half

4
pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
View File

@ -102,4 +102,8 @@ self: super: {
vector = dontCheck super.vector; vector = dontCheck super.vector;
mmorph = super.mmorph_1_1_3; mmorph = super.mmorph_1_1_3;
# https://github.com/haskellari/time-compat/issues/23
time-compat = dontCheck super.time-compat;
} }

5
pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
View File

@ -80,10 +80,7 @@ self: super: {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/alex-3.2.5.patch"; url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/alex-3.2.5.patch";
sha256 = "0q8x49k3jjwyspcmidwr6b84s4y43jbf4wqfxfm6wz8x2dxx6nwh"; sha256 = "0q8x49k3jjwyspcmidwr6b84s4y43jbf4wqfxfm6wz8x2dxx6nwh";
}); });
doctest = appendPatch (dontCheck (doJailbreak super.doctest_0_18)) (pkgs.fetchpatch { doctest = dontCheck (doJailbreak super.doctest_0_18_1);
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/doctest-0.17.patch";
sha256 = "16s2jcbk9hsww38i2wzxghbf0zpp5dc35hp6rd2n7d4z5xfavp62";
});
generic-deriving = appendPatch (doJailbreak super.generic-deriving) (pkgs.fetchpatch { generic-deriving = appendPatch (doJailbreak super.generic-deriving) (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/generic-deriving-1.13.1.patch"; url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/generic-deriving-1.13.1.patch";
sha256 = "0z85kiwhi5p2wiqwyym0y8q8qrcifp125x5vm0n4482lz41kmqds"; sha256 = "0z85kiwhi5p2wiqwyym0y8q8qrcifp125x5vm0n4482lz41kmqds";

171
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@ -73,12 +73,15 @@ default-package-overrides:
# gi-gdkx11-4.x requires gtk-4.x, which is still under development and # gi-gdkx11-4.x requires gtk-4.x, which is still under development and
# not yet available in Nixpkgs # not yet available in Nixpkgs
- gi-gdkx11 < 4 - gi-gdkx11 < 4
- ghcide < 0.7.4 # for hls 0.9.0 # Don't update yet to remain compatible with haskell-language-server-0.9.0.
- hls-explicit-imports-plugin < 0.1.0.1 # for hls 0.9.0 - ghcide < 0.7.4
- hls-plugin-api < 0.7.1.0 # for hls 0.9.0 - hls-class-plugin < 1
- hls-retrie-plugin < 0.1.1.1 # for hls 0.9.0 - hls-explicit-imports-plugin < 0.1.0.1
- hls-haddock-comments-plugin < 1
# Stackage Nightly 2021-02-25 - hls-plugin-api < 0.7.1.0
- hls-retrie-plugin < 0.1.1.1
- hls-tactics-plugin < 1
# Stackage Nightly 2021-03-01
- abstract-deque ==0.3 - abstract-deque ==0.3
- abstract-par ==0.3.3 - abstract-par ==0.3.3
- AC-Angle ==1.0 - AC-Angle ==1.0
@ -267,8 +270,8 @@ default-package-overrides:
- attoparsec-iso8601 ==1.0.2.0 - attoparsec-iso8601 ==1.0.2.0
- attoparsec-path ==0.0.0.1 - attoparsec-path ==0.0.0.1
- audacity ==0.0.2 - audacity ==0.0.2
- aur ==7.0.5 - aur ==7.0.6
- aura ==3.2.2 - aura ==3.2.3
- authenticate ==1.3.5 - authenticate ==1.3.5
- authenticate-oauth ==1.6.0.1 - authenticate-oauth ==1.6.0.1
- auto ==0.4.3.1 - auto ==0.4.3.1
@ -314,7 +317,7 @@ default-package-overrides:
- bimap ==0.4.0 - bimap ==0.4.0
- bimaps ==0.1.0.2 - bimaps ==0.1.0.2
- bimap-server ==0.1.0.1 - bimap-server ==0.1.0.1
- bin ==0.1 - bin ==0.1.1
- binary-conduit ==1.3.1 - binary-conduit ==1.3.1
- binary-ext ==2.0.4 - binary-ext ==2.0.4
- binary-ieee754 ==0.1.0.0 - binary-ieee754 ==0.1.0.0
@ -336,7 +339,7 @@ default-package-overrides:
- bitset-word8 ==0.1.1.2 - bitset-word8 ==0.1.1.2
- bits-extra ==0.0.2.0 - bits-extra ==0.0.2.0
- bitvec ==1.1.1.0 - bitvec ==1.1.1.0
- bitwise-enum ==1.0.0.3 - bitwise-enum ==1.0.1.0
- blake2 ==0.3.0 - blake2 ==0.3.0
- blanks ==0.5.0 - blanks ==0.5.0
- blas-carray ==0.1.0.1 - blas-carray ==0.1.0.1
@ -816,6 +819,7 @@ default-package-overrides:
- fast-logger ==3.0.3 - fast-logger ==3.0.3
- fast-math ==1.0.2 - fast-math ==1.0.2
- fb ==2.1.1 - fb ==2.1.1
- fclabels ==2.0.5
- feature-flags ==0.1.0.1 - feature-flags ==0.1.0.1
- fedora-dists ==1.1.2 - fedora-dists ==1.1.2
- fedora-haskell-tools ==0.9 - fedora-haskell-tools ==0.9
@ -832,7 +836,7 @@ default-package-overrides:
- filepattern ==0.1.2 - filepattern ==0.1.2
- fileplow ==0.1.0.0 - fileplow ==0.1.0.0
- filtrable ==0.1.4.0 - filtrable ==0.1.4.0
- fin ==0.1.1 - fin ==0.2
- FindBin ==0.0.5 - FindBin ==0.0.5
- fingertree ==0.1.4.2 - fingertree ==0.1.4.2
- finite-typelits ==0.1.4.2 - finite-typelits ==0.1.4.2
@ -860,8 +864,8 @@ default-package-overrides:
- focuslist ==0.1.0.2 - focuslist ==0.1.0.2
- foldable1 ==0.1.0.0 - foldable1 ==0.1.0.0
- fold-debounce ==0.2.0.9 - fold-debounce ==0.2.0.9
- fold-debounce-conduit ==0.2.0.5 - fold-debounce-conduit ==0.2.0.6
- foldl ==1.4.10 - foldl ==1.4.11
- folds ==0.7.6 - folds ==0.7.6
- follow-file ==0.0.3 - follow-file ==0.0.3
- FontyFruity ==0.5.3.5 - FontyFruity ==0.5.3.5
@ -957,7 +961,7 @@ default-package-overrides:
- ghc-source-gen ==0.4.0.0 - ghc-source-gen ==0.4.0.0
- ghc-syntax-highlighter ==0.0.6.0 - ghc-syntax-highlighter ==0.0.6.0
- ghc-tcplugins-extra ==0.4.1 - ghc-tcplugins-extra ==0.4.1
- ghc-trace-events ==0.1.2.1 - ghc-trace-events ==0.1.2.2
- ghc-typelits-extra ==0.4.2 - ghc-typelits-extra ==0.4.2
- ghc-typelits-knownnat ==0.7.5 - ghc-typelits-knownnat ==0.7.5
- ghc-typelits-natnormalise ==0.7.4 - ghc-typelits-natnormalise ==0.7.4
@ -1054,7 +1058,7 @@ default-package-overrides:
- haskell-src ==1.0.3.1 - haskell-src ==1.0.3.1
- haskell-src-exts ==1.23.1 - haskell-src-exts ==1.23.1
- haskell-src-exts-util ==0.2.5 - haskell-src-exts-util ==0.2.5
- haskell-src-meta ==0.8.5 - haskell-src-meta ==0.8.7
- haskey-btree ==0.3.0.1 - haskey-btree ==0.3.0.1
- hasql ==1.4.4.2 - hasql ==1.4.4.2
- hasql-notifications ==0.1.0.0 - hasql-notifications ==0.1.0.0
@ -1090,8 +1094,6 @@ default-package-overrides:
- hexstring ==0.11.1 - hexstring ==0.11.1
- hformat ==0.3.3.1 - hformat ==0.3.3.1
- hfsevents ==0.1.6 - hfsevents ==0.1.6
- hgeometry ==0.11.0.0
- hgeometry-combinatorial ==0.11.0.0
- hgrev ==0.2.6 - hgrev ==0.2.6
- hidapi ==0.1.5 - hidapi ==0.1.5
- hie-bios ==0.7.4 - hie-bios ==0.7.4
@ -1103,7 +1105,7 @@ default-package-overrides:
- hint ==0.9.0.3 - hint ==0.9.0.3
- hjsmin ==0.2.0.4 - hjsmin ==0.2.0.4
- hkd-default ==1.1.0.0 - hkd-default ==1.1.0.0
- hkgr ==0.2.6.1 - hkgr ==0.2.7
- hlibcpuid ==0.2.0 - hlibcpuid ==0.2.0
- hlibgit2 ==0.18.0.16 - hlibgit2 ==0.18.0.16
- hlibsass ==0.1.10.1 - hlibsass ==0.1.10.1
@ -1204,7 +1206,7 @@ default-package-overrides:
- httpd-shed ==0.4.1.1 - httpd-shed ==0.4.1.1
- http-link-header ==1.0.3.1 - http-link-header ==1.0.3.1
- http-media ==0.8.0.0 - http-media ==0.8.0.0
- http-query ==0.1.0 - http-query ==0.1.0.1
- http-reverse-proxy ==0.6.0 - http-reverse-proxy ==0.6.0
- http-streams ==0.8.7.2 - http-streams ==0.8.7.2
- http-types ==0.12.3 - http-types ==0.12.3
@ -1409,7 +1411,7 @@ default-package-overrides:
- lens-datetime ==0.3 - lens-datetime ==0.3
- lens-family ==2.0.0 - lens-family ==2.0.0
- lens-family-core ==2.0.0 - lens-family-core ==2.0.0
- lens-family-th ==0.5.1.0 - lens-family-th ==0.5.2.0
- lens-misc ==0.0.2.0 - lens-misc ==0.0.2.0
- lens-process ==0.4.0.0 - lens-process ==0.4.0.0
- lens-properties ==4.11.1 - lens-properties ==4.11.1
@ -1426,7 +1428,7 @@ default-package-overrides:
- libyaml ==0.1.2 - libyaml ==0.1.2
- LibZip ==1.0.1 - LibZip ==1.0.1
- life-sync ==1.1.1.0 - life-sync ==1.1.1.0
- lifted-async ==0.10.1.2 - lifted-async ==0.10.1.3
- lifted-base ==0.2.3.12 - lifted-base ==0.2.3.12
- lift-generics ==0.2 - lift-generics ==0.2
- line ==4.0.1 - line ==4.0.1
@ -1464,7 +1466,7 @@ default-package-overrides:
- lrucache ==1.2.0.1 - lrucache ==1.2.0.1
- lrucaching ==0.3.3 - lrucaching ==0.3.3
- lsp-test ==0.11.0.5 - lsp-test ==0.11.0.5
- lucid ==2.9.12 - lucid ==2.9.12.1
- lucid-cdn ==0.2.2.0 - lucid-cdn ==0.2.2.0
- lucid-extras ==0.2.2 - lucid-extras ==0.2.2
- lukko ==0.1.1.3 - lukko ==0.1.1.3
@ -1558,7 +1560,7 @@ default-package-overrides:
- monad-chronicle ==1.0.0.1 - monad-chronicle ==1.0.0.1
- monad-control ==1.0.2.3 - monad-control ==1.0.2.3
- monad-control-aligned ==0.0.1.1 - monad-control-aligned ==0.0.1.1
- monad-coroutine ==0.9.0.4 - monad-coroutine ==0.9.1
- monad-extras ==0.6.0 - monad-extras ==0.6.0
- monadic-arrays ==0.2.2 - monadic-arrays ==0.2.2
- monad-journal ==0.8.1 - monad-journal ==0.8.1
@ -1571,7 +1573,7 @@ default-package-overrides:
- monad-memo ==0.5.3 - monad-memo ==0.5.3
- monad-metrics ==0.2.2.0 - monad-metrics ==0.2.2.0
- monad-par ==0.3.5 - monad-par ==0.3.5
- monad-parallel ==0.7.2.3 - monad-parallel ==0.7.2.4
- monad-par-extras ==0.3.3 - monad-par-extras ==0.3.3
- monad-peel ==0.2.1.2 - monad-peel ==0.2.1.2
- monad-primitive ==0.1 - monad-primitive ==0.1
@ -1635,7 +1637,7 @@ default-package-overrides:
- netlib-carray ==0.1 - netlib-carray ==0.1
- netlib-comfort-array ==0.0.0.1 - netlib-comfort-array ==0.0.0.1
- netlib-ffi ==0.1.1 - netlib-ffi ==0.1.1
- netpbm ==1.0.3 - netpbm ==1.0.4
- nettle ==0.3.0 - nettle ==0.3.0
- netwire ==5.0.3 - netwire ==5.0.3
- netwire-input ==0.0.7 - netwire-input ==0.0.7
@ -1811,7 +1813,7 @@ default-package-overrides:
- pipes-http ==1.0.6 - pipes-http ==1.0.6
- pipes-network ==0.6.5 - pipes-network ==0.6.5
- pipes-network-tls ==0.4 - pipes-network-tls ==0.4
- pipes-ordered-zip ==1.1.0 - pipes-ordered-zip ==1.2.1
- pipes-parse ==3.0.9 - pipes-parse ==3.0.9
- pipes-random ==1.0.0.5 - pipes-random ==1.0.0.5
- pipes-safe ==2.3.3 - pipes-safe ==2.3.3
@ -1850,7 +1852,7 @@ default-package-overrides:
- prelude-safeenum ==0.1.1.2 - prelude-safeenum ==0.1.1.2
- prettyclass ==1.0.0.0 - prettyclass ==1.0.0.0
- pretty-class ==1.0.1.1 - pretty-class ==1.0.1.1
- pretty-diff ==0.4.0.2 - pretty-diff ==0.4.0.3
- pretty-hex ==1.1 - pretty-hex ==1.1
- prettyprinter ==1.7.0 - prettyprinter ==1.7.0
- prettyprinter-ansi-terminal ==1.1.2 - prettyprinter-ansi-terminal ==1.1.2
@ -1932,7 +1934,7 @@ default-package-overrides:
- radius ==0.7.1.0 - radius ==0.7.1.0
- rainbow ==0.34.2.2 - rainbow ==0.34.2.2
- rainbox ==0.26.0.0 - rainbox ==0.26.0.0
- ral ==0.1 - ral ==0.2
- rampart ==1.1.0.2 - rampart ==1.1.0.2
- ramus ==0.1.2 - ramus ==0.1.2
- rando ==0.0.0.4 - rando ==0.0.0.4
@ -1965,10 +1967,8 @@ default-package-overrides:
- readable ==0.3.1 - readable ==0.3.1
- read-editor ==0.1.0.2 - read-editor ==0.1.0.2
- read-env-var ==1.0.0.0 - read-env-var ==1.0.0.0
- reanimate ==1.1.3.3
- reanimate-svg ==0.13.0.1
- rebase ==1.6.1 - rebase ==1.6.1
- record-dot-preprocessor ==0.2.8 - record-dot-preprocessor ==0.2.9
- record-hasfield ==1.0 - record-hasfield ==1.0
- records-sop ==0.1.0.3 - records-sop ==0.1.0.3
- record-wrangler ==0.1.1.0 - record-wrangler ==0.1.1.0
@ -2050,7 +2050,7 @@ default-package-overrides:
- safe-json ==1.1.1.1 - safe-json ==1.1.1.1
- safe-money ==0.9 - safe-money ==0.9
- SafeSemaphore ==0.10.1 - SafeSemaphore ==0.10.1
- safe-tensor ==0.2.1.0 - safe-tensor ==0.2.1.1
- salak ==0.3.6 - salak ==0.3.6
- salak-yaml ==0.3.5.3 - salak-yaml ==0.3.5.3
- saltine ==0.1.1.1 - saltine ==0.1.1.1
@ -2095,7 +2095,7 @@ default-package-overrides:
- seqalign ==0.2.0.4 - seqalign ==0.2.0.4
- seqid ==0.6.2 - seqid ==0.6.2
- seqid-streams ==0.7.2 - seqid-streams ==0.7.2
- sequence-formats ==1.5.2 - sequence-formats ==1.6.0
- sequenceTools ==1.4.0.5 - sequenceTools ==1.4.0.5
- serf ==0.1.1.0 - serf ==0.1.1.0
- serialise ==0.2.3.0 - serialise ==0.2.3.0
@ -2129,6 +2129,7 @@ default-package-overrides:
- setlocale ==1.0.0.9 - setlocale ==1.0.0.9
- sexp-grammar ==2.3.0 - sexp-grammar ==2.3.0
- SHA ==1.6.4.4 - SHA ==1.6.4.4
- shake-language-c ==0.12.0
- shake-plus ==0.3.3.1 - shake-plus ==0.3.3.1
- shake-plus-extended ==0.4.1.0 - shake-plus-extended ==0.4.1.0
- shakespeare ==2.0.25 - shakespeare ==2.0.25
@ -2167,8 +2168,8 @@ default-package-overrides:
- skein ==1.0.9.4 - skein ==1.0.9.4
- skews ==0.1.0.3 - skews ==0.1.0.3
- skip-var ==0.1.1.0 - skip-var ==0.1.1.0
- skylighting ==0.10.3 - skylighting ==0.10.4
- skylighting-core ==0.10.3 - skylighting-core ==0.10.4
- slack-api ==0.12 - slack-api ==0.12
- slack-progressbar ==0.1.0.1 - slack-progressbar ==0.1.0.1
- slist ==0.1.1.0 - slist ==0.1.1.0
@ -2196,7 +2197,7 @@ default-package-overrides:
- sox ==0.2.3.1 - sox ==0.2.3.1
- soxlib ==0.0.3.1 - soxlib ==0.0.3.1
- sparse-linear-algebra ==0.3.1 - sparse-linear-algebra ==0.3.1
- sparse-tensor ==0.2.1.4 - sparse-tensor ==0.2.1.5
- spatial-math ==0.5.0.1 - spatial-math ==0.5.0.1
- special-values ==0.1.0.0 - special-values ==0.1.0.0
- speculate ==0.4.2 - speculate ==0.4.2
@ -2308,7 +2309,7 @@ default-package-overrides:
- tardis ==0.4.3.0 - tardis ==0.4.3.0
- tasty ==1.2.3 - tasty ==1.2.3
- tasty-ant-xml ==1.1.7 - tasty-ant-xml ==1.1.7
- tasty-bench ==0.2.1 - tasty-bench ==0.2.2
- tasty-dejafu ==2.0.0.7 - tasty-dejafu ==2.0.0.7
- tasty-discover ==4.2.2 - tasty-discover ==4.2.2
- tasty-expected-failure ==0.12.3 - tasty-expected-failure ==0.12.3
@ -2379,8 +2380,8 @@ default-package-overrides:
- th-desugar ==1.11 - th-desugar ==1.11
- th-env ==0.1.0.2 - th-env ==0.1.0.2
- these ==1.1.1.1 - these ==1.1.1.1
- these-lens ==1.0.1.1 - these-lens ==1.0.1.2
- these-optics ==1.0.1.1 - these-optics ==1.0.1.2
- these-skinny ==0.7.4 - these-skinny ==0.7.4
- th-expand-syns ==0.4.6.0 - th-expand-syns ==0.4.6.0
- th-extras ==0.0.0.4 - th-extras ==0.0.0.4
@ -2403,7 +2404,7 @@ default-package-overrides:
- th-test-utils ==1.1.0 - th-test-utils ==1.1.0
- th-utilities ==0.2.4.1 - th-utilities ==0.2.4.1
- thyme ==0.3.5.5 - thyme ==0.3.5.5
- tidal ==1.7.1 - tidal ==1.7.2
- tile ==0.3.0.0 - tile ==0.3.0.0
- time-compat ==1.9.5 - time-compat ==1.9.5
- timeit ==2.0 - timeit ==2.0
@ -2546,7 +2547,7 @@ default-package-overrides:
- validity-vector ==0.2.0.3 - validity-vector ==0.2.0.3
- valor ==0.1.0.0 - valor ==0.1.0.0
- vault ==0.3.1.5 - vault ==0.3.1.5
- vec ==0.3 - vec ==0.4
- vector ==0.12.2.0 - vector ==0.12.2.0
- vector-algorithms ==0.8.0.4 - vector-algorithms ==0.8.0.4
- vector-binary-instances ==0.2.5.1 - vector-binary-instances ==0.2.5.1
@ -2646,11 +2647,11 @@ default-package-overrides:
- xdg-desktop-entry ==0.1.1.1 - xdg-desktop-entry ==0.1.1.1
- xdg-userdirs ==0.1.0.2 - xdg-userdirs ==0.1.0.2
- xeno ==0.4.2 - xeno ==0.4.2
- xlsx ==0.8.2 - xlsx ==0.8.3
- xlsx-tabular ==0.2.2.1 - xlsx-tabular ==0.2.2.1
- xml ==1.3.14 - xml ==1.3.14
- xml-basic ==0.1.3.1 - xml-basic ==0.1.3.1
- xml-conduit ==1.9.0.0 - xml-conduit ==1.9.1.0
- xml-conduit-writer ==0.1.1.2 - xml-conduit-writer ==0.1.1.2
- xmlgen ==0.6.2.2 - xmlgen ==0.6.2.2
- xml-hamlet ==0.5.0.1 - xml-hamlet ==0.5.0.1
@ -2679,7 +2680,7 @@ default-package-overrides:
- yesod-form ==1.6.7 - yesod-form ==1.6.7
- yesod-gitrev ==0.2.1 - yesod-gitrev ==0.2.1
- yesod-newsfeed ==1.7.0.0 - yesod-newsfeed ==1.7.0.0
- yesod-page-cursor ==2.0.0.3 - yesod-page-cursor ==2.0.0.4
- yesod-paginator ==1.1.1.0 - yesod-paginator ==1.1.1.0
- yesod-persistent ==1.6.0.5 - yesod-persistent ==1.6.0.5
- yesod-sitemap ==1.6.0 - yesod-sitemap ==1.6.0
@ -2703,7 +2704,7 @@ default-package-overrides:
- zip-archive ==0.4.1 - zip-archive ==0.4.1
- zipper-extra ==0.1.3.2 - zipper-extra ==0.1.3.2
- zippers ==0.3.1 - zippers ==0.3.1
- zip-stream ==0.2.0.1 - zip-stream ==0.2.1.0
- zlib ==0.6.2.3 - zlib ==0.6.2.3
- zlib-bindings ==0.1.1.5 - zlib-bindings ==0.1.1.5
- zlib-lens ==0.1.2.1 - zlib-lens ==0.1.2.1
@ -3107,6 +3108,7 @@ broken-packages:
- aeson-applicative - aeson-applicative
- aeson-decode - aeson-decode
- aeson-diff-generic - aeson-diff-generic
- aeson-extra
- aeson-filthy - aeson-filthy
- aeson-flowtyped - aeson-flowtyped
- aeson-injector - aeson-injector
@ -3151,6 +3153,7 @@ broken-packages:
- alga - alga
- algebra-checkers - algebra-checkers
- algebra-dag - algebra-dag
- algebra-driven-design
- algebra-sql - algebra-sql
- algebraic - algebraic
- algebraic-prelude - algebraic-prelude
@ -3276,6 +3279,7 @@ broken-packages:
- arbor-monad-metric - arbor-monad-metric
- arbor-monad-metric-datadog - arbor-monad-metric-datadog
- arch-hs - arch-hs
- arch-web
- archive-libarchive - archive-libarchive
- archiver - archiver
- archlinux - archlinux
@ -3412,6 +3416,7 @@ broken-packages:
- aws-lambda - aws-lambda
- aws-lambda-haskell-runtime-wai - aws-lambda-haskell-runtime-wai
- aws-lambda-runtime - aws-lambda-runtime
- aws-larpi
- aws-mfa-credentials - aws-mfa-credentials
- aws-performance-tests - aws-performance-tests
- aws-route53 - aws-route53
@ -3547,7 +3552,6 @@ broken-packages:
- binary-indexed-tree - binary-indexed-tree
- binary-protocol - binary-protocol
- binary-protocol-zmq - binary-protocol-zmq
- binary-search
- binary-streams - binary-streams
- binary-tagged - binary-tagged
- binary-typed - binary-typed
@ -4395,6 +4399,7 @@ broken-packages:
- crf-chain2-generic - crf-chain2-generic
- crf-chain2-tiers - crf-chain2-tiers
- critbit - critbit
- criterion-cmp
- criterion-compare - criterion-compare
- criterion-plus - criterion-plus
- criterion-to-html - criterion-to-html
@ -4629,6 +4634,8 @@ broken-packages:
- denominate - denominate
- dense - dense
- dense-int-set - dense-int-set
- dep-t
- dep-t-advice
- dependent-hashmap - dependent-hashmap
- dependent-monoidal-map - dependent-monoidal-map
- dependent-state - dependent-state
@ -4665,6 +4672,7 @@ broken-packages:
- dhall-fly - dhall-fly
- dhall-nix - dhall-nix
- dhall-nixpkgs - dhall-nixpkgs
- dhall-recursive-adt
- dhall-text - dhall-text
- dhall-to-cabal - dhall-to-cabal
- dhcp-lease-parser - dhcp-lease-parser
@ -4796,6 +4804,7 @@ broken-packages:
- docker-build-cacher - docker-build-cacher
- dockercook - dockercook
- docopt - docopt
- docrecords
- DocTest - DocTest
- doctest-discover-configurator - doctest-discover-configurator
- doctest-driver-gen - doctest-driver-gen
@ -5061,6 +5070,8 @@ broken-packages:
- ethereum-merkle-patricia-db - ethereum-merkle-patricia-db
- euphoria - euphoria
- eurofxref - eurofxref
- evdev
- evdev-streamly
- eve-cli - eve-cli
- event - event
- event-driven - event-driven
@ -5086,6 +5097,7 @@ broken-packages:
- execs - execs
- executor - executor
- exference - exference
- exh
- exherbo-cabal - exherbo-cabal
- exif - exif
- exigo-schema - exigo-schema
@ -5430,6 +5442,7 @@ broken-packages:
- ftp-conduit - ftp-conduit
- ftphs - ftphs
- FTPLine - FTPLine
- ftree
- ftshell - ftshell
- full-sessions - full-sessions
- fullstop - fullstop
@ -5445,6 +5458,7 @@ broken-packages:
- functional-arrow - functional-arrow
- functor - functor
- functor-combinators - functor-combinators
- functor-combo
- functor-friends - functor-friends
- functor-infix - functor-infix
- functor-products - functor-products
@ -5462,6 +5476,7 @@ broken-packages:
- fused-effects-squeal - fused-effects-squeal
- fused-effects-th - fused-effects-th
- fusion - fusion
- futhark
- futun - futun
- future - future
- fuzzy-time-gen - fuzzy-time-gen
@ -5504,6 +5519,7 @@ broken-packages:
- gelatin-gl - gelatin-gl
- gelatin-sdl2 - gelatin-sdl2
- gelatin-shaders - gelatin-shaders
- gemini-textboard
- gemstone - gemstone
- gen-imports - gen-imports
- gen-passwd - gen-passwd
@ -5521,6 +5537,7 @@ broken-packages:
- generic-church - generic-church
- generic-enum - generic-enum
- generic-enumeration - generic-enumeration
- generic-labels
- generic-lens-labels - generic-lens-labels
- generic-lucid-scaffold - generic-lucid-scaffold
- generic-maybe - generic-maybe
@ -5821,6 +5838,7 @@ broken-packages:
- gross - gross
- GroteTrap - GroteTrap
- groundhog-converters - groundhog-converters
- group-theory
- group-with - group-with
- grouped-list - grouped-list
- groups-generic - groups-generic
@ -6090,6 +6108,7 @@ broken-packages:
- haskell-lsp-client - haskell-lsp-client
- haskell-ml - haskell-ml
- haskell-mpfr - haskell-mpfr
- haskell-mpi
- haskell-neo4j-client - haskell-neo4j-client
- haskell-openflow - haskell-openflow
- haskell-overridez - haskell-overridez
@ -6323,6 +6342,7 @@ broken-packages:
- heckle - heckle
- hedgehog-checkers - hedgehog-checkers
- hedgehog-checkers-lens - hedgehog-checkers-lens
- hedgehog-classes
- hedgehog-fakedata - hedgehog-fakedata
- hedgehog-gen-json - hedgehog-gen-json
- hedgehog-generic - hedgehog-generic
@ -6410,6 +6430,8 @@ broken-packages:
- hGelf - hGelf
- hgen - hgen
- hgeometric - hgeometric
- hgeometry
- hgeometry-combinatorial
- hgeometry-ipe - hgeometry-ipe
- hgeometry-svg - hgeometry-svg
- hgeos - hgeos
@ -6982,6 +7004,7 @@ broken-packages:
- hyperloglogplus - hyperloglogplus
- hyperpublic - hyperpublic
- hypher - hypher
- hzk
- hzulip - hzulip
- i18n - i18n
- I1M - I1M
@ -7124,6 +7147,7 @@ broken-packages:
- introduction - introduction
- introduction-test - introduction-test
- intset - intset
- invert
- invertible-hlist - invertible-hlist
- invertible-syntax - invertible-syntax
- io-capture - io-capture
@ -7267,11 +7291,13 @@ broken-packages:
- json-incremental-decoder - json-incremental-decoder
- json-litobj - json-litobj
- json-pointer-hasql - json-pointer-hasql
- json-pointy
- json-python - json-python
- json-rpc-client - json-rpc-client
- json-schema - json-schema
- json-sop - json-sop
- json-syntax - json-syntax
- json-to-haskell
- json-togo - json-togo
- json-tokens - json-tokens
- json-tools - json-tools
@ -7383,6 +7409,7 @@ broken-packages:
- koellner-phonetic - koellner-phonetic
- kontra-config - kontra-config
- korfu - korfu
- kparams
- kqueue - kqueue
- kraken - kraken
- krank - krank
@ -7552,6 +7579,7 @@ broken-packages:
- lens-filesystem - lens-filesystem
- lens-labels - lens-labels
- lens-prelude - lens-prelude
- lens-process
- lens-simple - lens-simple
- lens-text-encoding - lens-text-encoding
- lens-th-rewrite - lens-th-rewrite
@ -7625,6 +7653,7 @@ broken-packages:
- line-bot-sdk - line-bot-sdk
- line-drawing - line-drawing
- linear-algebra-cblas - linear-algebra-cblas
- linear-base
- linear-circuit - linear-circuit
- linear-code - linear-code
- linear-maps - linear-maps
@ -7654,6 +7683,7 @@ broken-packages:
- linx-gateway - linx-gateway
- lio-eci11 - lio-eci11
- lio-simple - lio-simple
- lion
- lipsum-gen - lipsum-gen
- liquid - liquid
- liquid-base - liquid-base
@ -7773,6 +7803,7 @@ broken-packages:
- LRU - LRU
- ls-usb - ls-usb
- lscabal - lscabal
- lsfrom
- LslPlus - LslPlus
- lsystem - lsystem
- lti13 - lti13
@ -7986,6 +8017,7 @@ broken-packages:
- Michelangelo - Michelangelo
- miconix-test - miconix-test
- micro-recursion-schemes - micro-recursion-schemes
- microbase
- microformats2-parser - microformats2-parser
- microformats2-types - microformats2-types
- microgroove - microgroove
@ -8042,6 +8074,9 @@ broken-packages:
- ml-w - ml-w
- mlist - mlist
- mm2 - mm2
- mmark
- mmark-cli
- mmark-ext
- mmsyn7h - mmsyn7h
- mmtf - mmtf
- mmtl - mmtl
@ -8144,6 +8179,7 @@ broken-packages:
- morfeusz - morfeusz
- morley - morley
- morloc - morloc
- morpheus-graphql-app
- morpheus-graphql-cli - morpheus-graphql-cli
- morphisms-functors - morphisms-functors
- morphisms-functors-inventory - morphisms-functors-inventory
@ -8249,6 +8285,7 @@ broken-packages:
- musicbrainz-email - musicbrainz-email
- musicScroll - musicScroll
- musicxml - musicxml
- musicxml2
- mustache-haskell - mustache-haskell
- mutable-iter - mutable-iter
- MutationOrder - MutationOrder
@ -8831,6 +8868,11 @@ broken-packages:
- phoityne - phoityne
- phone-numbers - phone-numbers
- phone-push - phone-push
- phonetic-languages-examples
- phonetic-languages-properties
- phonetic-languages-simplified-lists-examples
- phonetic-languages-simplified-properties-lists
- phonetic-languages-simplified-properties-lists-double
- phooey - phooey
- photoname - photoname
- phraskell - phraskell
@ -8851,7 +8893,6 @@ broken-packages:
- piet - piet
- pig - pig
- pinboard - pinboard
- pinboard-notes-backup
- pinch - pinch
- pinch-gen - pinch-gen
- pinchot - pinchot
@ -8891,6 +8932,7 @@ broken-packages:
- pit - pit
- pitchtrack - pitchtrack
- pivotal-tracker - pivotal-tracker
- pixel-printer
- pixelated-avatar-generator - pixelated-avatar-generator
- pkcs10 - pkcs10
- pkcs7 - pkcs7
@ -9175,6 +9217,8 @@ broken-packages:
- pure-zlib - pure-zlib
- purescheme-wai-routing-core - purescheme-wai-routing-core
- purescript - purescript
- purescript-ast
- purescript-cst
- purescript-iso - purescript-iso
- purescript-tsd-gen - purescript-tsd-gen
- push-notifications - push-notifications
@ -9249,6 +9293,7 @@ broken-packages:
- quickpull - quickpull
- quickset - quickset
- Quickson - Quickson
- quickspec
- quicktest - quicktest
- quickwebapp - quickwebapp
- quipper - quipper
@ -9380,6 +9425,8 @@ broken-packages:
- record-syntax - record-syntax
- records - records
- records-th - records-th
- recursion-schemes
- recursion-schemes-ext
- recursors - recursors
- red-black-record - red-black-record
- reddit - reddit
@ -9436,6 +9483,7 @@ broken-packages:
- regex-tdfa-pipes - regex-tdfa-pipes
- regex-tdfa-quasiquoter - regex-tdfa-quasiquoter
- regex-tdfa-rc - regex-tdfa-rc
- regex-tdfa-text
- regex-tdfa-unittest - regex-tdfa-unittest
- regex-tdfa-utf8 - regex-tdfa-utf8
- regex-tre - regex-tre
@ -9509,6 +9557,7 @@ broken-packages:
- req-url-extra - req-url-extra
- reqcatcher - reqcatcher
- request-monad - request-monad
- rere
- rescue - rescue
- reserve - reserve
- reservoir - reservoir
@ -9554,6 +9603,7 @@ broken-packages:
- rfc-redis - rfc-redis
- rfc-servant - rfc-servant
- rg - rg
- rhbzquery
- rhythm-game-tutorial - rhythm-game-tutorial
- rib - rib
- ribbit - ribbit
@ -9564,6 +9614,7 @@ broken-packages:
- riff - riff
- ring-buffer - ring-buffer
- ring-buffers - ring-buffers
- rio-process-pool
- riot - riot
- risc-v - risc-v
- risc386 - risc386
@ -9595,6 +9646,7 @@ broken-packages:
- roc-cluster-demo - roc-cluster-demo
- rock - rock
- rocksdb-haskell - rocksdb-haskell
- rocksdb-haskell-jprupp
- rocksdb-query - rocksdb-query
- roku-api - roku-api
- rollbar - rollbar
@ -9896,6 +9948,7 @@ broken-packages:
- servant-server-namedargs - servant-server-namedargs
- servant-smsc-ru - servant-smsc-ru
- servant-snap - servant-snap
- servant-static-th
- servant-streaming - servant-streaming
- servant-streaming-client - servant-streaming-client
- servant-streaming-docs - servant-streaming-docs
@ -9930,6 +9983,7 @@ broken-packages:
- setoid - setoid
- setters - setters
- sexp - sexp
- sexp-grammar
- sexpr-parser - sexpr-parser
- sext - sext
- SFML - SFML
@ -9952,6 +10006,7 @@ broken-packages:
- shake-cabal-build - shake-cabal-build
- shake-dhall - shake-dhall
- shake-extras - shake-extras
- shake-futhark
- shake-minify - shake-minify
- shake-pack - shake-pack
- shake-path - shake-path
@ -10090,6 +10145,7 @@ broken-packages:
- slot-lambda - slot-lambda
- sloth - sloth
- slug - slug
- slugify
- slynx - slynx
- small-bytearray-builder - small-bytearray-builder
- smallarray - smallarray
@ -10199,6 +10255,7 @@ broken-packages:
- socketed - socketed
- socketio - socketio
- sockets - sockets
- sockets-and-pipes
- socketson - socketson
- sodium - sodium
- soegtk - soegtk
@ -10326,6 +10383,8 @@ broken-packages:
- stackage-types - stackage-types
- stackage-upload - stackage-upload
- stackage2nix - stackage2nix
- stackcollapse-ghc
- staged-gg
- standalone-derive-topdown - standalone-derive-topdown
- standalone-haddock - standalone-haddock
- starling - starling
@ -10412,6 +10471,7 @@ broken-packages:
- streaming-utils - streaming-utils
- streaming-with - streaming-with
- streamly-archive - streamly-archive
- streamly-fsnotify
- streamly-lmdb - streamly-lmdb
- streamproc - streamproc
- strelka - strelka
@ -10602,6 +10662,7 @@ broken-packages:
- tasty-fail-fast - tasty-fail-fast
- tasty-groundhog-converters - tasty-groundhog-converters
- tasty-hedgehog-coverage - tasty-hedgehog-coverage
- tasty-html
- tasty-integrate - tasty-integrate
- tasty-jenkins-xml - tasty-jenkins-xml
- tasty-laws - tasty-laws
@ -10663,6 +10724,7 @@ broken-packages:
- termination-combinators - termination-combinators
- termplot - termplot
- terntup - terntup
- terraform-http-backend-pass
- terrahs - terrahs
- tersmu - tersmu
- tesla - tesla
@ -10695,6 +10757,7 @@ broken-packages:
- texrunner - texrunner
- text-all - text-all
- text-and-plots - text-and-plots
- text-ascii
- text-containers - text-containers
- text-format-heavy - text-format-heavy
- text-generic-pretty - text-generic-pretty
@ -10997,6 +11060,7 @@ broken-packages:
- type-structure - type-structure
- type-sub-th - type-sub-th
- type-tree - type-tree
- type-unary
- typeable-th - typeable-th
- TypeClass - TypeClass
- typed-encoding - typed-encoding
@ -11063,6 +11127,8 @@ broken-packages:
- uniprot-kb - uniprot-kb
- uniqueid - uniqueid
- uniquely-represented-sets - uniquely-represented-sets
- uniqueness-periods-vector-examples
- uniqueness-periods-vector-properties
- units-attoparsec - units-attoparsec
- unittyped - unittyped
- unitym-yesod - unitym-yesod
@ -11076,8 +11142,10 @@ broken-packages:
- unix-fcntl - unix-fcntl
- unix-handle - unix-handle
- unix-process-conduit - unix-process-conduit
- unix-recursive
- unix-simple - unix-simple
- unlifted-list - unlifted-list
- unliftio-messagebox
- unliftio-streams - unliftio-streams
- unm-hip - unm-hip
- unordered-containers-rematch - unordered-containers-rematch
@ -11195,6 +11263,7 @@ broken-packages:
- vect-floating-accelerate - vect-floating-accelerate
- vect-opengl - vect-opengl
- vector-bytestring - vector-bytestring
- vector-circular
- vector-clock - vector-clock
- vector-conduit - vector-conduit
- vector-endian - vector-endian
@ -11249,6 +11318,10 @@ broken-packages:
- vitrea - vitrea
- vk-aws-route53 - vk-aws-route53
- VKHS - VKHS
- vocoder
- vocoder-audio
- vocoder-conduit
- vocoder-dunai
- voicebase - voicebase
- vowpal-utils - vowpal-utils
- voyeur - voyeur
@ -11490,11 +11563,11 @@ broken-packages:
- xleb - xleb
- xls - xls
- xlsior - xlsior
- xlsx
- xlsx-tabular - xlsx-tabular
- xlsx-templater - xlsx-templater
- xml-catalog - xml-catalog
- xml-conduit-decode - xml-conduit-decode
- xml-conduit-selectors
- xml-conduit-stylist - xml-conduit-stylist
- xml-enumerator - xml-enumerator
- xml-enumerator-combinators - xml-enumerator-combinators
@ -11547,6 +11620,7 @@ broken-packages:
- YACPong - YACPong
- yahoo-finance-api - yahoo-finance-api
- yahoo-finance-conduit - yahoo-finance-conduit
- yahoo-prices
- yahoo-web-search - yahoo-web-search
- yajl - yajl
- yajl-enumerator - yajl-enumerator
@ -11578,6 +11652,7 @@ broken-packages:
- yap - yap
- yarr - yarr
- yarr-image-io - yarr-image-io
- yasi
- yavie - yavie
- yaya-test - yaya-test
- yaya-unsafe-test - yaya-unsafe-test

2096
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

4
pkgs/development/node-packages/default.nix
View File

@ -68,6 +68,10 @@ let
dependencies = builtins.filter (d: d.packageName != "@expo/traveling-fastlane-${if stdenv.isLinux then "darwin" else "linux"}") attrs.dependencies; dependencies = builtins.filter (d: d.packageName != "@expo/traveling-fastlane-${if stdenv.isLinux then "darwin" else "linux"}") attrs.dependencies;
}); });
"@electron-forge/cli" = super."@electron-forge/cli".override {
buildInputs = [ self.node-pre-gyp self.rimraf ];
};
git-ssb = super.git-ssb.override { git-ssb = super.git-ssb.override {
buildInputs = [ self.node-gyp-build ]; buildInputs = [ self.node-gyp-build ];
meta.broken = since "10"; meta.broken = since "10";

1
pkgs/development/node-packages/node-packages.json
View File

@ -75,6 +75,7 @@
, "diagnostic-languageserver" , "diagnostic-languageserver"
, "dockerfile-language-server-nodejs" , "dockerfile-language-server-nodejs"
, "elasticdump" , "elasticdump"
, "@electron-forge/cli"
, "elm-oracle" , "elm-oracle"
, "emoj" , "emoj"
, "emojione" , "emojione"

1363
pkgs/development/node-packages/node-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

33
pkgs/development/python-modules/accuweather/default.nix
View File

@ -1,22 +1,43 @@
{ aiohttp, buildPythonPackage, fetchFromGitHub, lib, pytest, pytestCheckHook { lib
, pytestcov, pytestrunner, pytest-asyncio, python, pythonOlder }: , buildPythonPackage
, fetchFromGitHub
, pythonOlder
, pytestrunner
, aiohttp
, aioresponses
, pytestCheckHook
, pytestcov
, pytest-asyncio
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "accuweather"; pname = "accuweather";
version = "0.0.11"; version = "0.1.0";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bieniu"; owner = "bieniu";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1sgbw9yldf81phwx6pbvqg9sp767whxymyj0ca9pwx1r6ipr080h"; sha256 = "0jp2x7fgg1shgr1fx296rni00lmjjmjgg141giljzizgd04dwgy3";
}; };
postPatch = ''
# we don't have pytest-error-for-skips packaged
substituteInPlace pytest.ini --replace "--error-for-skips" ""
'';
nativeBuildInputs = [ pytestrunner ]; nativeBuildInputs = [ pytestrunner ];
propagatedBuildInputs = [ aiohttp ]; propagatedBuildInputs = [ aiohttp ];
checkInputs = [ pytestCheckHook pytestcov pytest-asyncio ];
checkInputs = [
aioresponses
pytestCheckHook
pytestcov
pytest-asyncio
];
meta = with lib; { meta = with lib; {
description = description =

16
pkgs/development/python-modules/adext/default.nix
View File

@ -1,24 +1,26 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, setuptools-scm
, alarmdecoder , alarmdecoder
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "adext"; pname = "adext";
version = "0.3"; version = "0.4.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "184qxw6i5ixnhgkjnby4zwn4jg90mxb8xy9vbg80x5w331p4z50f"; sha256 = "1yz1rpfvhbf7kfjck5vadbj9rd3bkx5248whaa3impdrjh7vs03x";
}; };
postPatch = '' nativeBuildInputs = [
substituteInPlace setup.py \ setuptools-scm
--replace "alarmdecoder==1.13.2" "alarmdecoder>=1.13.2" ];
'';
propagatedBuildInputs = [ alarmdecoder ]; propagatedBuildInputs = [
alarmdecoder
];
# Tests are not published yet # Tests are not published yet
doCheck = false; doCheck = false;

4
pkgs/development/python-modules/alarmdecoder/default.nix
View File

@ -3,14 +3,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "alarmdecoder"; pname = "alarmdecoder";
version = "1.13.9"; version = "1.13.10";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nutechsoftware"; owner = "nutechsoftware";
repo = "alarmdecoder"; repo = "alarmdecoder";
rev = version; rev = version;
sha256 = "0plr2h1qn4ryawbaxf29cfna4wailghhaqy1jcm9kxq6q7b9xqqy"; sha256 = "05581j78181p6mwbfpbkp5irnrzsvps1lslgqrh7xbdcmz5b2nxd";
}; };
propagatedBuildInputs = [ pyserial pyftdi pyusb pyopenssl ]; propagatedBuildInputs = [ pyserial pyftdi pyusb pyopenssl ];

38
pkgs/development/python-modules/bellows/default.nix
View File

@ -1,21 +1,40 @@
{ lib, buildPythonPackage, fetchFromGitHub { lib
, click, click-log, pure-pcapy3 , buildPythonPackage
, pyserial-asyncio, voluptuous, zigpy , fetchFromGitHub
, asynctest, pytestCheckHook, pytest-asyncio }: , click
, click-log
, pure-pcapy3
, pyserial-asyncio
, voluptuous
, zigpy
, asynctest
, pytestCheckHook
, pytest-asyncio
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "bellows"; pname = "bellows";
version = "0.21.0"; version = "0.22.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zigpy"; owner = "zigpy";
repo = "bellows"; repo = "bellows";
rev = version; rev = version;
sha256 = "1gja7cb1cyzbi19k8awa2gyc3bjam0adapalpk5slxny0vxlc73a"; sha256 = "0il2cwnrcvgxx9jkj1xr2caqyza3kqjys3fpmcx7avy04xbf5dbv";
}; };
prePatch = ''
substituteInPlace setup.py \
--replace "click-log==0.2.1" "click-log>=0.2.1"
'';
propagatedBuildInputs = [ propagatedBuildInputs = [
click click-log pure-pcapy3 pyserial-asyncio voluptuous zigpy click
click-log
pure-pcapy3
pyserial-asyncio
voluptuous
zigpy
]; ];
checkInputs = [ checkInputs = [
@ -24,11 +43,6 @@ buildPythonPackage rec {
pytest-asyncio pytest-asyncio
]; ];
prePatch = ''
substituteInPlace setup.py \
--replace "click-log==0.2.0" "click-log>=0.2.0"
'';
meta = with lib; { meta = with lib; {
description = "A Python 3 project to implement EZSP for EmberZNet devices"; description = "A Python 3 project to implement EZSP for EmberZNet devices";
homepage = "https://github.com/zigpy/bellows"; homepage = "https://github.com/zigpy/bellows";

4
pkgs/development/python-modules/bokeh/default.nix
View File

@ -33,11 +33,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "bokeh"; pname = "bokeh";
version = "2.2.3"; version = "2.3.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "c4a3f97afe5f525019dd58ee8c4e3d43f53fe1b1ac264ccaae9b02c07b2abc17"; sha256 = "dd417708f90702190222b1068a645acae99e66d4b58d7a336d545aeaa04e9b40";
}; };
patches = [ patches = [

1
pkgs/development/python-modules/colorcet/default.nix
View File

@ -24,7 +24,6 @@ buildPythonPackage rec {
]; ];
checkInputs = [ checkInputs = [
nbsmoke
pytest pytest
flake8 flake8
pytest-mpl pytest-mpl

6
pkgs/development/python-modules/dask/default.nix
View File

@ -4,6 +4,7 @@
, fetchFromGitHub , fetchFromGitHub
, fsspec , fsspec
, pytestCheckHook , pytestCheckHook
, pytest-rerunfailures
, pythonOlder , pythonOlder
, cloudpickle , cloudpickle
, numpy , numpy
@ -15,7 +16,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "dask"; pname = "dask";
version = "2021.01.0"; version = "2021.03.0";
disabled = pythonOlder "3.5"; disabled = pythonOlder "3.5";
@ -23,11 +24,12 @@ buildPythonPackage rec {
owner = "dask"; owner = "dask";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "V2cEOzV/L1zjyQ76zlGyN9CIkq6W8y8Yab4NQi3/Ju4="; sha256 = "LACv7lWpQULQknNGX/9vH9ckLsypbqKDGnsNBgKT1eI=";
}; };
checkInputs = [ checkInputs = [
pytestCheckHook pytestCheckHook
pytest-rerunfailures
]; ];
dontUseSetuptoolsCheck = true; dontUseSetuptoolsCheck = true;

6
pkgs/development/python-modules/holoviews/default.nix
View File

@ -11,18 +11,20 @@
, bokeh , bokeh
, scipy , scipy
, panel , panel
, colorcet
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "holoviews"; pname = "holoviews";
version = "1.13.5"; version = "1.14.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "3f8a00ce1cc67a388a3a949441accd7e7e9ca9960ba16b49ee96a50305105a01"; sha256 = "64f85cf2c99b083b96f26cd26452aec4b41ced6d9e57f56ae8d72b88defc61c9";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
colorcet
param param
numpy numpy
pyviz-comms pyviz-comms

4
pkgs/development/python-modules/hvplot/default.nix
View File

@ -18,11 +18,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "hvplot"; pname = "hvplot";
version = "0.7.0"; version = "0.7.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1c709bebb737ebd71a0433f2333ed15f03dd3c431d4646c41c2b9fcbae4a29b7"; sha256 = "cdb61183d3cdb1296c7f63c6aab59ee72b7b79b9ddc18abce2ebd3214e8de9db";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

13
pkgs/development/python-modules/ipykernel/default.nix
View File

@ -2,7 +2,6 @@
, stdenv , stdenv
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, fetchpatch
, flaky , flaky
, ipython , ipython
, jupyter_client , jupyter_client
@ -15,23 +14,15 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ipykernel"; pname = "ipykernel";
version = "5.2.1"; version = "5.5.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1a3hr7wx3ywwskr99hgp120dw9ab1vmcaxdixlsbd9bg6ly3fdr9"; sha256 = "98321abefdf0505fb3dc7601f60fc4087364d394bd8fad53107eb1adee9ff475";
}; };
propagatedBuildInputs = [ ipython jupyter_client traitlets tornado ]; propagatedBuildInputs = [ ipython jupyter_client traitlets tornado ];
# https://github.com/ipython/ipykernel/pull/377
patches = [
(fetchpatch {
url = "https://github.com/ipython/ipykernel/commit/a3bf849dbd368a1826deb9dfc94c2bd3e5ed04fe.patch";
sha256 = "1yhpwqixlf98a3n620z92mfips3riw6psijqnc5jgs2p58fgs2yc";
})
];
checkInputs = [ pytestCheckHook nose flaky ]; checkInputs = [ pytestCheckHook nose flaky ];
dontUseSetuptoolsCheck = true; dontUseSetuptoolsCheck = true;
preCheck = '' preCheck = ''

4
pkgs/development/python-modules/ipython/default.nix
View File

@ -22,12 +22,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ipython"; pname = "ipython";
version = "7.19.0"; version = "7.21.0";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "cbb2ef3d5961d44e6a963b9817d4ea4e1fa2eb589c371a470fed14d8d40cbd6a"; sha256 = "04323f72d5b85b606330b6d7e2dc8d2683ad46c3905e955aa96ecc7a99388e70";
}; };
prePatch = lib.optionalString stdenv.isDarwin '' prePatch = lib.optionalString stdenv.isDarwin ''

4
pkgs/development/python-modules/msldap/default.nix
View File

@ -12,11 +12,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "msldap"; pname = "msldap";
version = "0.3.26"; version = "0.3.27";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-cW1757NImdi5tz98qrspzEdI5Q/26ap2jVxyah44qR8="; sha256 = "sha256-tAMl1Xkb04Vfh18uS30eKX/IfeXhwER3J1lHXHxHlXY=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/nbclient/default.nix
View File

@ -6,12 +6,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "nbclient"; pname = "nbclient";
version = "0.5.2"; version = "0.5.3";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0ed6e5700ad18818030a3a5f0f201408c5972d8e38793840cd9339488fd9f7c4"; sha256 = "db17271330c68c8c88d46d72349e24c147bb6f34ec82d8481a8f025c4d26589c";
}; };
inherit doCheck; inherit doCheck;

4
pkgs/development/python-modules/notebook/default.nix
View File

@ -27,12 +27,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "notebook"; pname = "notebook";
version = "6.1.6"; version = "6.2.0";
disabled = !isPy3k; disabled = !isPy3k;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "cf40d4f81541401db5a2fda1707ca7877157abd41f04ef7b88f02b67f3c61791"; sha256 = "0464b28e18e7a06cec37e6177546c2322739be07962dd13bf712bcb88361f013";
}; };
LC_ALL = "en_US.utf8"; LC_ALL = "en_US.utf8";

4
pkgs/development/python-modules/pglast/default.nix
View File

@ -11,11 +11,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pglast"; pname = "pglast";
version = "1.14"; version = "1.17";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "72652b9edc7bdbfc9c3192235fb2fa1b2fb73a681613368fcaec747d7f5e479f"; sha256 = "2979b38ca5f72cfa0a5db78af2f62d04db6a7647ee7f03eac7a67f9e86e3f5f9";
}; };
disabled = !isPy3k; disabled = !isPy3k;

4
pkgs/development/python-modules/plexapi/default.nix
View File

@ -9,14 +9,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "PlexAPI"; pname = "PlexAPI";
version = "4.3.1"; version = "4.4.0";
disabled = isPy27; disabled = isPy27;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pkkid"; owner = "pkkid";
repo = "python-plexapi"; repo = "python-plexapi";
rev = version; rev = version;
sha256 = "sha256-gRXNOGd9YGcGysKbAtiNwi5NxPvv39F6PEXBjiYbVq4="; sha256 = "0wzdzi5afncinavz5g77ximdr9y2ndzwb0gl819n0l6pnvbxdwp2";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

9
pkgs/development/python-modules/py-cpuinfo/default.nix
View File

@ -1,8 +1,10 @@
{ lib { lib
, stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch , fetchpatch
, buildPythonPackage , buildPythonPackage
, pytestCheckHook , pytestCheckHook
, sysctl
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -33,6 +35,13 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
]; ];
# On Darwin sysctl is used to read CPU information.
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace cpuinfo/cpuinfo.py \
--replace "len(_program_paths('sysctl')) > 0" "True" \
--replace "_run_and_get_stdout(['sysctl'" "_run_and_get_stdout(['${sysctl}/bin/sysctl'"
'';
meta = { meta = {
description = "Get CPU info with pure Python 2 & 3"; description = "Get CPU info with pure Python 2 & 3";
longDescription = '' longDescription = ''

13
pkgs/development/python-modules/pyvera/default.nix
View File

@ -1,7 +1,6 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, poetry-core , poetry-core
, pytest-cov , pytest-cov
, pytest-asyncio , pytest-asyncio
@ -13,24 +12,16 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyvera"; pname = "pyvera";
version = "0.3.11"; version = "0.3.13";
format = "pyproject"; format = "pyproject";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pavoni"; owner = "pavoni";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0yi2cjd3jag95xa0k24f7d7agi26ywb3219a0j0k8l2nsx2sdi87"; sha256 = "0vh82bwgbq93jrwi9q4da534paknpak8hxi4wwlxh3qcvnpy1njv";
}; };
patches = [
(fetchpatch {
# build-system section is missing https://github.com/pavoni/pyvera/pull/142
url = "https://github.com/pavoni/pyvera/pull/142/commits/e90995a8d55107118d324e8cf189ddf1d9e3aa6c.patch";
sha256 = "1psq3fiwg20kcwyybzh5g17dzn5fh29lhm238npyg846innbzgs7";
})
];
nativeBuildInputs = [ poetry-core ]; nativeBuildInputs = [ poetry-core ];
propagatedBuildInputs = [ requests ]; propagatedBuildInputs = [ requests ];

6
pkgs/development/python-modules/tokenizers/default.nix
View File

@ -49,19 +49,19 @@ let
}; };
in buildPythonPackage rec { in buildPythonPackage rec {
pname = "tokenizers"; pname = "tokenizers";
version = "0.10.0"; version = "0.10.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "huggingface"; owner = "huggingface";
repo = pname; repo = pname;
rev = "python-v${version}"; rev = "python-v${version}";
hash = "sha256-rQ2hRV52naEf6PvRsWVCTN7B1oXAQGmnpJw4iIdhamw="; hash = "sha256-N/dKjQwHKmJnB76q8ISQ3cjuW0Z4GqGavnFFx/w9JRQ=";
}; };
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
inherit src sourceRoot; inherit src sourceRoot;
name = "${pname}-${version}"; name = "${pname}-${version}";
hash = "sha256-BoHIN/519Top1NUBjpB/oEMqi86Omt3zTQcXFWqrek0="; hash = "sha256-3ICSjtiRfLOj+PXu6mcuDoAtod5uXAcabYWTLxEgI18=";
}; };
sourceRoot = "source/bindings/python"; sourceRoot = "source/bindings/python";

4
pkgs/development/python-modules/transformers/default.nix
View File

@ -16,13 +16,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "transformers"; pname = "transformers";
version = "4.3.2"; version = "4.3.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "huggingface"; owner = "huggingface";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-vv4wKf1PcuVR63ZQJd3oixdNvS7VcTmAaKkmL8I4COg="; hash = "sha256-KII7ZR+vnCxCxUcBOQo9y0KxZa+XuIIAkSJejk8HrlA=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/zha-quirks/default.nix
View File

@ -9,13 +9,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "zha-quirks"; pname = "zha-quirks";
version = "0.0.53"; version = "0.0.54";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zigpy"; owner = "zigpy";
repo = "zha-device-handlers"; repo = "zha-device-handlers";
rev = version; rev = version;
sha256 = "16n99r7bjd3lnxn72lfnxg44n7mkv196vdhkw2sf1nq1an4ks1nc"; sha256 = "1xc4rky9x2n15rsb18vyg4lb2897k14gkz03khgf8gp37bg2dk5h";
}; };
propagatedBuildInputs = [ aiohttp zigpy ]; propagatedBuildInputs = [ aiohttp zigpy ];

9
pkgs/development/python-modules/zigpy-znp/default.nix
View File

@ -17,13 +17,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "zigpy-znp"; pname = "zigpy-znp";
version = "0.3.0"; version = "0.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zha-ng"; owner = "zha-ng";
repo = "zigpy-znp"; repo = "zigpy-znp";
rev = "v${version}"; rev = "v${version}";
sha256 = "18dav2n5fqdigf8dl7gcqa9z8l6p2ig6l5q78gqg2wj7wjpncwyj"; sha256 = "1g5jssdnibhb4i4k1js9iy9w40cipf1gdnyp847x0bv6wblzx8rl";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -45,11 +45,6 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
]; ];
disabledTests = [
# zigpy-znp was too slow to sync up with the zigpy 0.29 release and has API breakage, remove >0.3.0
"test_force_remove"
];
meta = with lib; { meta = with lib; {
description = "A library for zigpy which communicates with TI ZNP radios"; description = "A library for zigpy which communicates with TI ZNP radios";
homepage = "https://github.com/zha-ng/zigpy-znp"; homepage = "https://github.com/zha-ng/zigpy-znp";

6
pkgs/development/tools/analysis/tflint/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "tflint"; pname = "tflint";
version = "0.24.1"; version = "0.25.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "terraform-linters"; owner = "terraform-linters";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "00v6d1ffj1f4djbdf41bw4ymy2fhph1b5kfi50fp9c3c7319sqwr"; sha256 = "1n234ivpjfvppfqcpgbvsqg869m4g5xyi536di3ckm3sba9r4jwr";
}; };
vendorSha256 = "1xy1vg34nv6v77sx13d3663v7xfm0f2kimdsjqzwpkzz8a6q6g2m"; vendorSha256 = "101bw29c2dn0mf5n32r7rkqrb9r71z3afbhwnzrm31xckbkvlwsa";
doCheck = false; doCheck = false;

12
pkgs/misc/vim-plugins/generated.nix
View File

@ -4334,6 +4334,18 @@ let
meta.homepage = "https://github.com/tjdevries/train.nvim/"; meta.homepage = "https://github.com/tjdevries/train.nvim/";
}; };
tremor-vim = buildVimPluginFrom2Nix {
pname = "tremor-nvim";
version = "2020-11-19";
src = fetchFromGitHub {
owner = "tremor-rs";
repo = "tremor-vim";
rev = "17e53c33f3b0e825330580034ca60172b8ddaadc";
sha256 = "1gy67qjv0iwqza0yx9y8p5yzn5fszrp7szg1527h0ki3q69cfqki";
};
meta.homepage = "https://github.com/tremor-rs/tremor-vim";
};
tslime-vim = buildVimPluginFrom2Nix { tslime-vim = buildVimPluginFrom2Nix {
pname = "tslime-vim"; pname = "tslime-vim";
version = "2020-09-09"; version = "2020-09-09";

1
pkgs/misc/vim-plugins/vim-plugin-names
View File

@ -626,6 +626,7 @@ tpope/vim-tbone
tpope/vim-unimpaired tpope/vim-unimpaired
tpope/vim-vinegar tpope/vim-vinegar
travitch/hasksyn travitch/hasksyn
tremor-rs/tremor-vim
triglav/vim-visual-increment triglav/vim-visual-increment
troydm/zoomwintab.vim troydm/zoomwintab.vim
twerth/ir_black twerth/ir_black

8
pkgs/os-specific/linux/nvidia-x11/default.nix
View File

@ -28,10 +28,10 @@ rec {
# Policy: use the highest stable version as the default (on our master). # Policy: use the highest stable version as the default (on our master).
stable = if stdenv.hostPlatform.system == "x86_64-linux" stable = if stdenv.hostPlatform.system == "x86_64-linux"
then generic { then generic {
version = "460.39"; version = "460.56";
sha256_64bit = "0zx3v4xas9z18yv1z3irp626h8kvcg8aw344sqpacfh1g106dw0b"; sha256_64bit = "003kwlsghlix2kilrqad7mn7ygkb755rzjlxd0b52vqz1nx1qmsf";
settingsSha256 = "15fa6lmfmgg02gya47ynx5d7cqsb73w4rbg4ly7lc1pnwl5f9qhm"; settingsSha256 = "1xwhbd78q0bc3v8fnlss9amkl03vnvf91ffpfnz0v7clvn3xymkf";
persistencedSha256 = "1dj3w03fa1i32c9c7w9392bg3nr2dk8mm4qm0wv12cv587zml0gx"; persistencedSha256 = "0sh2csv04fkimf1msbmdc608gxb3j95g8i3rqf32b1pl9jv0p5ly";
} }
else legacy_390; else legacy_390;

12
pkgs/os-specific/linux/nvidia-x11/nvidia-setttings-parallel-build.patch
View File

@ -1,12 +0,0 @@
diff --git a/src/Makefile b/src/Makefile
index acbb1b8..fe97103 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -242,6 +242,7 @@ endif
define BINARY_DATA_HEADER_RULE
$$(OUTPUTDIR)/$(notdir $(1)).h:
+ $(at_if_quiet)$(MKDIR) $$(OUTPUTDIR)
$(at_if_quiet){ \
$$(PRINTF) "extern const char _binary_$(subst .,_,$(notdir $(1)))_start[];\n"; \
$$(PRINTF) "extern const char _binary_$(subst .,_,$(notdir $(1)))_end[];\n"; \

6
pkgs/os-specific/linux/nvidia-x11/settings.nix
View File

@ -45,12 +45,6 @@ stdenv.mkDerivation {
version = nvidia_x11.settingsVersion; version = nvidia_x11.settingsVersion;
inherit src; inherit src;
patches = [
# Fix a race condition in parallel builds.
# https://github.com/NVIDIA/nvidia-settings/issues/59#issuecomment-770302032
./nvidia-setttings-parallel-build.patch
];
nativeBuildInputs = [ pkg-config m4 ]; nativeBuildInputs = [ pkg-config m4 ];
buildInputs = [ jansson libXv libXrandr libXext libXxf86vm libvdpau nvidia_x11 gtk2 dbus ] buildInputs = [ jansson libXv libXrandr libXext libXxf86vm libvdpau nvidia_x11 gtk2 dbus ]

29
pkgs/servers/home-assistant/component-packages.nix
View File

@ -2,7 +2,7 @@
# Do not edit! # Do not edit!
{ {
version = "2021.2.3"; version = "2021.3.2";
components = { components = {
"abode" = ps: with ps; [ abodepy ]; "abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ]; "accuweather" = ps: with ps; [ accuweather ];
@ -12,6 +12,7 @@
"adguard" = ps: with ps; [ adguardhome ]; "adguard" = ps: with ps; [ adguardhome ];
"ads" = ps: with ps; [ pyads ]; "ads" = ps: with ps; [ pyads ];
"advantage_air" = ps: with ps; [ advantage-air ]; "advantage_air" = ps: with ps; [ advantage-air ];
"aemet" = ps: with ps; [ ]; # missing inputs: AEMET-OpenData
"aftership" = ps: with ps; [ pyaftership ]; "aftership" = ps: with ps; [ pyaftership ];
"agent_dvr" = ps: with ps; [ agent-py ]; "agent_dvr" = ps: with ps; [ agent-py ];
"air_quality" = ps: with ps; [ ]; "air_quality" = ps: with ps; [ ];
@ -120,13 +121,13 @@
"clickatell" = ps: with ps; [ ]; "clickatell" = ps: with ps; [ ];
"clicksend" = ps: with ps; [ ]; "clicksend" = ps: with ps; [ ];
"clicksend_tts" = ps: with ps; [ ]; "clicksend_tts" = ps: with ps; [ ];
"climacell" = ps: with ps; [ ]; # missing inputs: pyclimacell
"climate" = ps: with ps; [ ]; "climate" = ps: with ps; [ ];
"cloud" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; "cloud" = ps: with ps; [ aiohttp-cors hass-nabucasa ];
"cloudflare" = ps: with ps; [ pycfdns ]; "cloudflare" = ps: with ps; [ pycfdns ];
"cmus" = ps: with ps; [ ]; # missing inputs: pycmus "cmus" = ps: with ps; [ ]; # missing inputs: pycmus
"co2signal" = ps: with ps; [ ]; # missing inputs: co2signal "co2signal" = ps: with ps; [ ]; # missing inputs: co2signal
"coinbase" = ps: with ps; [ ]; # missing inputs: coinbase "coinbase" = ps: with ps; [ ]; # missing inputs: coinbase
"coinmarketcap" = ps: with ps; [ coinmarketcap ];
"color_extractor" = ps: with ps; [ ]; # missing inputs: colorthief "color_extractor" = ps: with ps; [ ]; # missing inputs: colorthief
"comed_hourly_pricing" = ps: with ps; [ ]; "comed_hourly_pricing" = ps: with ps; [ ];
"comfoconnect" = ps: with ps; [ ]; # missing inputs: pycomfoconnect "comfoconnect" = ps: with ps; [ ]; # missing inputs: pycomfoconnect
@ -142,7 +143,6 @@
"cover" = ps: with ps; [ ]; "cover" = ps: with ps; [ ];
"cppm_tracker" = ps: with ps; [ ]; # missing inputs: clearpasspy "cppm_tracker" = ps: with ps; [ ]; # missing inputs: clearpasspy
"cpuspeed" = ps: with ps; [ py-cpuinfo ]; "cpuspeed" = ps: with ps; [ py-cpuinfo ];
"crimereports" = ps: with ps; [ ]; # missing inputs: crimereports
"cups" = ps: with ps; [ pycups ]; "cups" = ps: with ps; [ pycups ];
"currencylayer" = ps: with ps; [ ]; "currencylayer" = ps: with ps; [ ];
"daikin" = ps: with ps; [ pydaikin ]; "daikin" = ps: with ps; [ pydaikin ];
@ -154,7 +154,7 @@
"deconz" = ps: with ps; [ ]; # missing inputs: pydeconz "deconz" = ps: with ps; [ ]; # missing inputs: pydeconz
"decora" = ps: with ps; [ bluepy ]; # missing inputs: decora "decora" = ps: with ps; [ bluepy ]; # missing inputs: decora
"decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi "decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi
"default_config" = ps: with ps; [ pynacl aiohttp-cors defusedxml distro emoji hass-nabucasa netdisco pillow scapy sqlalchemy zeroconf ]; "default_config" = ps: with ps; [ pynacl aiohttp-cors async-upnp-client defusedxml distro emoji hass-nabucasa netdisco pillow scapy sqlalchemy zeroconf ];
"delijn" = ps: with ps; [ ]; # missing inputs: pydelijn "delijn" = ps: with ps; [ ]; # missing inputs: pydelijn
"deluge" = ps: with ps; [ deluge-client ]; "deluge" = ps: with ps; [ deluge-client ];
"demo" = ps: with ps; [ aiohttp-cors ]; "demo" = ps: with ps; [ aiohttp-cors ];
@ -238,6 +238,7 @@
"everlights" = ps: with ps; [ pyeverlights ]; "everlights" = ps: with ps; [ pyeverlights ];
"evohome" = ps: with ps; [ ]; # missing inputs: evohome-async "evohome" = ps: with ps; [ ]; # missing inputs: evohome-async
"ezviz" = ps: with ps; [ ]; # missing inputs: pyezviz "ezviz" = ps: with ps; [ ]; # missing inputs: pyezviz
"faa_delays" = ps: with ps; [ faadelays ];
"facebook" = ps: with ps; [ ]; "facebook" = ps: with ps; [ ];
"facebox" = ps: with ps; [ ]; "facebox" = ps: with ps; [ ];
"fail2ban" = ps: with ps; [ ]; "fail2ban" = ps: with ps; [ ];
@ -276,7 +277,7 @@
"foscam" = ps: with ps; [ ]; # missing inputs: libpyfoscam "foscam" = ps: with ps; [ ]; # missing inputs: libpyfoscam
"foursquare" = ps: with ps; [ aiohttp-cors ]; "foursquare" = ps: with ps; [ aiohttp-cors ];
"free_mobile" = ps: with ps; [ ]; # missing inputs: freesms "free_mobile" = ps: with ps; [ ]; # missing inputs: freesms
"freebox" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: aiofreepybox "freebox" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: freebox-api
"freedns" = ps: with ps; [ ]; "freedns" = ps: with ps; [ ];
"fritz" = ps: with ps; [ fritzconnection ]; "fritz" = ps: with ps; [ fritzconnection ];
"fritzbox" = ps: with ps; [ pyfritzhome ]; "fritzbox" = ps: with ps; [ pyfritzhome ];
@ -421,6 +422,7 @@
"keyboard_remote" = ps: with ps; [ aionotify evdev ]; "keyboard_remote" = ps: with ps; [ aionotify evdev ];
"kira" = ps: with ps; [ pykira ]; "kira" = ps: with ps; [ pykira ];
"kiwi" = ps: with ps; [ ]; # missing inputs: kiwiki-client "kiwi" = ps: with ps; [ ]; # missing inputs: kiwiki-client
"kmtronic" = ps: with ps; [ pykmtronic ];
"knx" = ps: with ps; [ xknx ]; "knx" = ps: with ps; [ xknx ];
"kodi" = ps: with ps; [ ]; # missing inputs: pykodi "kodi" = ps: with ps; [ ]; # missing inputs: pykodi
"konnected" = ps: with ps; [ aiohttp-cors ]; # missing inputs: konnected "konnected" = ps: with ps; [ aiohttp-cors ]; # missing inputs: konnected
@ -446,6 +448,7 @@
"linux_battery" = ps: with ps; [ batinfo ]; "linux_battery" = ps: with ps; [ batinfo ];
"lirc" = ps: with ps; [ ]; # missing inputs: python-lirc "lirc" = ps: with ps; [ ]; # missing inputs: python-lirc
"litejet" = ps: with ps; [ ]; # missing inputs: pylitejet "litejet" = ps: with ps; [ ]; # missing inputs: pylitejet
"litterrobot" = ps: with ps; [ ]; # missing inputs: pylitterbot
"llamalab_automate" = ps: with ps; [ ]; "llamalab_automate" = ps: with ps; [ ];
"local_file" = ps: with ps; [ ]; "local_file" = ps: with ps; [ ];
"local_ip" = ps: with ps; [ ]; "local_ip" = ps: with ps; [ ];
@ -466,6 +469,7 @@
"lutron_caseta" = ps: with ps; [ ]; # missing inputs: aiolip pylutron-caseta "lutron_caseta" = ps: with ps; [ ]; # missing inputs: aiolip pylutron-caseta
"lw12wifi" = ps: with ps; [ ]; # missing inputs: lw12 "lw12wifi" = ps: with ps; [ ]; # missing inputs: lw12
"lyft" = ps: with ps; [ ]; # missing inputs: lyft_rides "lyft" = ps: with ps; [ ]; # missing inputs: lyft_rides
"lyric" = ps: with ps; [ aiohttp-cors aiolyric ];
"magicseaweed" = ps: with ps; [ ]; # missing inputs: magicseaweed "magicseaweed" = ps: with ps; [ ]; # missing inputs: magicseaweed
"mailbox" = ps: with ps; [ aiohttp-cors ]; "mailbox" = ps: with ps; [ aiohttp-cors ];
"mailgun" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pymailgunner "mailgun" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pymailgunner
@ -476,6 +480,7 @@
"mastodon" = ps: with ps; [ ]; # missing inputs: Mastodon.py "mastodon" = ps: with ps; [ ]; # missing inputs: Mastodon.py
"matrix" = ps: with ps; [ matrix-client ]; "matrix" = ps: with ps; [ matrix-client ];
"maxcube" = ps: with ps; [ ]; # missing inputs: maxcube-api "maxcube" = ps: with ps; [ ]; # missing inputs: maxcube-api
"mazda" = ps: with ps; [ pymazda ];
"mcp23017" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-mcp230xx "mcp23017" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-mcp230xx
"media_extractor" = ps: with ps; [ aiohttp-cors youtube-dl-light ]; "media_extractor" = ps: with ps; [ aiohttp-cors youtube-dl-light ];
"media_player" = ps: with ps; [ aiohttp-cors ]; "media_player" = ps: with ps; [ aiohttp-cors ];
@ -519,7 +524,9 @@
"mqtt_room" = ps: with ps; [ aiohttp-cors paho-mqtt ]; "mqtt_room" = ps: with ps; [ aiohttp-cors paho-mqtt ];
"mqtt_statestream" = ps: with ps; [ aiohttp-cors paho-mqtt ]; "mqtt_statestream" = ps: with ps; [ aiohttp-cors paho-mqtt ];
"msteams" = ps: with ps; [ pymsteams ]; "msteams" = ps: with ps; [ pymsteams ];
"mullvad" = ps: with ps; [ mullvad-api ];
"mvglive" = ps: with ps; [ PyMVGLive ]; "mvglive" = ps: with ps; [ PyMVGLive ];
"my" = ps: with ps; [ aiohttp-cors pillow ];
"mychevy" = ps: with ps; [ ]; # missing inputs: mychevy "mychevy" = ps: with ps; [ ]; # missing inputs: mychevy
"mycroft" = ps: with ps; [ ]; # missing inputs: mycroftapi "mycroft" = ps: with ps; [ ]; # missing inputs: mycroftapi
"myq" = ps: with ps; [ pymyq ]; "myq" = ps: with ps; [ pymyq ];
@ -560,7 +567,6 @@
"nsw_fuel_station" = ps: with ps; [ ]; # missing inputs: nsw-fuel-api-client "nsw_fuel_station" = ps: with ps; [ ]; # missing inputs: nsw-fuel-api-client
"nsw_rural_fire_service_feed" = ps: with ps; [ ]; # missing inputs: aio_geojson_nsw_rfs_incidents "nsw_rural_fire_service_feed" = ps: with ps; [ ]; # missing inputs: aio_geojson_nsw_rfs_incidents
"nuheat" = ps: with ps; [ ]; # missing inputs: nuheat "nuheat" = ps: with ps; [ ]; # missing inputs: nuheat
"nuimo_controller" = ps: with ps; [ ]; # missing inputs: --only-binary=all nuimo
"nuki" = ps: with ps; [ pynuki ]; "nuki" = ps: with ps; [ pynuki ];
"numato" = ps: with ps; [ ]; # missing inputs: numato-gpio "numato" = ps: with ps; [ ]; # missing inputs: numato-gpio
"number" = ps: with ps; [ ]; "number" = ps: with ps; [ ];
@ -622,7 +628,7 @@
"ping" = ps: with ps; [ icmplib ]; "ping" = ps: with ps; [ icmplib ];
"pioneer" = ps: with ps; [ ]; "pioneer" = ps: with ps; [ ];
"pjlink" = ps: with ps; [ ]; # missing inputs: pypjlink2 "pjlink" = ps: with ps; [ ]; # missing inputs: pypjlink2
"plaato" = ps: with ps; [ aiohttp-cors ]; "plaato" = ps: with ps; [ aiohttp-cors hass-nabucasa pyplaato ];
"plant" = ps: with ps; [ sqlalchemy ]; "plant" = ps: with ps; [ sqlalchemy ];
"plex" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket ]; "plex" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket ];
"plugwise" = ps: with ps; [ plugwise ]; "plugwise" = ps: with ps; [ plugwise ];
@ -682,6 +688,7 @@
"ring" = ps: with ps; [ ha-ffmpeg ring-doorbell ]; "ring" = ps: with ps; [ ha-ffmpeg ring-doorbell ];
"ripple" = ps: with ps; [ ]; # missing inputs: python-ripple-api "ripple" = ps: with ps; [ ]; # missing inputs: python-ripple-api
"risco" = ps: with ps; [ pyrisco ]; "risco" = ps: with ps; [ pyrisco ];
"rituals_perfume_genie" = ps: with ps; [ pyrituals ];
"rmvtransport" = ps: with ps; [ PyRMVtransport ]; "rmvtransport" = ps: with ps; [ PyRMVtransport ];
"rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API "rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API
"roku" = ps: with ps; [ ]; # missing inputs: rokuecp "roku" = ps: with ps; [ ]; # missing inputs: rokuecp
@ -749,6 +756,7 @@
"smart_meter_texas" = ps: with ps; [ ]; # missing inputs: smart-meter-texas "smart_meter_texas" = ps: with ps; [ ]; # missing inputs: smart-meter-texas
"smarthab" = ps: with ps; [ ]; # missing inputs: smarthab "smarthab" = ps: with ps; [ ]; # missing inputs: smarthab
"smartthings" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; # missing inputs: pysmartapp pysmartthings "smartthings" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; # missing inputs: pysmartapp pysmartthings
"smarttub" = ps: with ps; [ python-smarttub ];
"smarty" = ps: with ps; [ ]; # missing inputs: pysmarty "smarty" = ps: with ps; [ ]; # missing inputs: pysmarty
"smhi" = ps: with ps; [ ]; # missing inputs: smhi-pkg "smhi" = ps: with ps; [ ]; # missing inputs: smhi-pkg
"sms" = ps: with ps; [ python-gammu ]; "sms" = ps: with ps; [ python-gammu ];
@ -780,7 +788,7 @@
"sql" = ps: with ps; [ sqlalchemy ]; "sql" = ps: with ps; [ sqlalchemy ];
"squeezebox" = ps: with ps; [ pysqueezebox ]; "squeezebox" = ps: with ps; [ pysqueezebox ];
"srp_energy" = ps: with ps; [ ]; # missing inputs: srpenergy "srp_energy" = ps: with ps; [ ]; # missing inputs: srpenergy
"ssdp" = ps: with ps; [ aiohttp-cors defusedxml netdisco zeroconf ]; "ssdp" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml netdisco zeroconf ];
"starline" = ps: with ps; [ ]; # missing inputs: starline "starline" = ps: with ps; [ ]; # missing inputs: starline
"starlingbank" = ps: with ps; [ ]; # missing inputs: starlingbank "starlingbank" = ps: with ps; [ ]; # missing inputs: starlingbank
"startca" = ps: with ps; [ xmltodict ]; "startca" = ps: with ps; [ xmltodict ];
@ -792,6 +800,7 @@
"stream" = ps: with ps; [ aiohttp-cors av ]; "stream" = ps: with ps; [ aiohttp-cors av ];
"streamlabswater" = ps: with ps; [ ]; # missing inputs: streamlabswater "streamlabswater" = ps: with ps; [ ]; # missing inputs: streamlabswater
"stt" = ps: with ps; [ aiohttp-cors ]; "stt" = ps: with ps; [ aiohttp-cors ];
"subaru" = ps: with ps; [ subarulink ];
"suez_water" = ps: with ps; [ ]; # missing inputs: pysuez "suez_water" = ps: with ps; [ ]; # missing inputs: pysuez
"sun" = ps: with ps; [ ]; "sun" = ps: with ps; [ ];
"supervisord" = ps: with ps; [ ]; "supervisord" = ps: with ps; [ ];
@ -805,7 +814,6 @@
"switcher_kis" = ps: with ps; [ aioswitcher ]; "switcher_kis" = ps: with ps; [ aioswitcher ];
"switchmate" = ps: with ps; [ ]; # missing inputs: pySwitchmate "switchmate" = ps: with ps; [ ]; # missing inputs: pySwitchmate
"syncthru" = ps: with ps; [ url-normalize ]; # missing inputs: pysyncthru "syncthru" = ps: with ps; [ url-normalize ]; # missing inputs: pysyncthru
"synology" = ps: with ps; [ ]; # missing inputs: py-synology
"synology_chat" = ps: with ps; [ ]; "synology_chat" = ps: with ps; [ ];
"synology_dsm" = ps: with ps; [ ]; # missing inputs: synologydsm-api "synology_dsm" = ps: with ps; [ ]; # missing inputs: synologydsm-api
"synology_srm" = ps: with ps; [ ]; # missing inputs: synology-srm "synology_srm" = ps: with ps; [ ]; # missing inputs: synology-srm
@ -873,7 +881,7 @@
"twinkly" = ps: with ps; [ twinkly-client ]; "twinkly" = ps: with ps; [ twinkly-client ];
"twitch" = ps: with ps; [ python-twitch-client ]; "twitch" = ps: with ps; [ python-twitch-client ];
"twitter" = ps: with ps; [ twitterapi ]; "twitter" = ps: with ps; [ twitterapi ];
"ubus" = ps: with ps; [ ]; "ubus" = ps: with ps; [ openwrt-ubus-rpc ];
"ue_smart_radio" = ps: with ps; [ ]; "ue_smart_radio" = ps: with ps; [ ];
"uk_transport" = ps: with ps; [ ]; "uk_transport" = ps: with ps; [ ];
"unifi" = ps: with ps; [ aiounifi ]; "unifi" = ps: with ps; [ aiounifi ];
@ -946,7 +954,6 @@
"xbox" = ps: with ps; [ aiohttp-cors ]; # missing inputs: xbox-webapi "xbox" = ps: with ps; [ aiohttp-cors ]; # missing inputs: xbox-webapi
"xbox_live" = ps: with ps; [ xboxapi ]; "xbox_live" = ps: with ps; [ xboxapi ];
"xeoma" = ps: with ps; [ pyxeoma ]; "xeoma" = ps: with ps; [ pyxeoma ];
"xfinity" = ps: with ps; [ ]; # missing inputs: xfinity-gateway
"xiaomi" = ps: with ps; [ ha-ffmpeg ]; "xiaomi" = ps: with ps; [ ha-ffmpeg ];
"xiaomi_aqara" = ps: with ps; [ pyxiaomigateway aiohttp-cors netdisco zeroconf ]; "xiaomi_aqara" = ps: with ps; [ pyxiaomigateway aiohttp-cors netdisco zeroconf ];
"xiaomi_miio" = ps: with ps; [ construct python-miio ]; "xiaomi_miio" = ps: with ps; [ construct python-miio ];

163
pkgs/servers/home-assistant/default.nix
View File

@ -61,14 +61,14 @@ let
extraBuildInputs = extraPackages py.pkgs; extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating # Don't forget to run parse-requirements.py after updating
hassVersion = "2021.2.3"; hassVersion = "2021.3.2";
in with py.pkgs; buildPythonApplication rec { in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant"; pname = "homeassistant";
version = assert (componentPackages.version == hassVersion); hassVersion; version = assert (componentPackages.version == hassVersion); hassVersion;
# check REQUIRED_PYTHON_VER in homeassistant/const.py # check REQUIRED_PYTHON_VER in homeassistant/const.py
disabled = pythonOlder "3.7.1"; disabled = pythonOlder "3.8";
# don't try and fail to strip 6600+ python files, it takes minutes! # don't try and fail to strip 6600+ python files, it takes minutes!
dontStrip = true; dontStrip = true;
@ -80,7 +80,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant"; owner = "home-assistant";
repo = "core"; repo = "core";
rev = version; rev = version;
sha256 = "0s1jcd94wwvmvzq86w8s9dwfvnmjs9l661z9pc6kwgagggjjgd8c"; sha256 = "09z2sds9my4vq0vmryjpzi7fv787zjfikfkd711d34c140bgcjch";
}; };
# leave this in, so users don't have to constantly update their downstream patch handling # leave this in, so users don't have to constantly update their downstream patch handling
@ -88,15 +88,15 @@ in with py.pkgs; buildPythonApplication rec {
postPatch = '' postPatch = ''
substituteInPlace setup.py \ substituteInPlace setup.py \
--replace "aiohttp==3.7.4" "aiohttp>=3.7.3" \
--replace "attrs==19.3.0" "attrs>=19.3.0" \ --replace "attrs==19.3.0" "attrs>=19.3.0" \
--replace "bcrypt==3.1.7" "bcrypt>=3.1.7" \ --replace "bcrypt==3.1.7" "bcrypt>=3.1.7" \
--replace "awesomeversion==21.2.2" "awesomeversion>=21.2.2" \ --replace "cryptography==3.3.2" "cryptography" \
--replace "cryptography==3.2" "cryptography" \
--replace "httpx==0.16.1" "httpx>=0.16.1" \ --replace "httpx==0.16.1" "httpx>=0.16.1" \
--replace "jinja2>=2.11.3" "jinja2>=2.11.2" \
--replace "pip>=8.0.3,<20.3" "pip" \ --replace "pip>=8.0.3,<20.3" "pip" \
--replace "pytz>=2020.5" "pytz>=2020.4" \ --replace "pytz>=2021.1" "pytz>=2020.5" \
--replace "pyyaml==5.4.1" "pyyaml" \ --replace "pyyaml==5.4.1" "pyyaml" \
--replace "requests==2.25.1" "requests>=2.25.0" \
--replace "ruamel.yaml==0.15.100" "ruamel.yaml>=0.15.100" --replace "ruamel.yaml==0.15.100" "ruamel.yaml>=0.15.100"
substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"' substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"'
''; '';
@ -127,6 +127,8 @@ in with py.pkgs; buildPythonApplication rec {
yarl yarl
] ++ componentBuildInputs ++ extraBuildInputs; ] ++ componentBuildInputs ++ extraBuildInputs;
makeWrapperArgs = lib.optional skipPip "--add-flags --skip-pip";
# upstream only tests on Linux, so do we. # upstream only tests on Linux, so do we.
doCheck = stdenv.isLinux; doCheck = stdenv.isLinux;
@ -134,78 +136,207 @@ in with py.pkgs; buildPythonApplication rec {
# test infrastructure # test infrastructure
asynctest asynctest
pytest-aiohttp pytest-aiohttp
pytest-rerunfailures
pytest-xdist pytest-xdist
pytestCheckHook pytestCheckHook
requests-mock requests-mock
# component dependencies # component dependencies
pyotp pyotp
respx
] ++ lib.concatMap (component: getPackages component py.pkgs) componentTests; ] ++ lib.concatMap (component: getPackages component py.pkgs) componentTests;
# We cannot test all components, since they'd introduce lots of dependencies, some of which are unpackaged, # We can reasonably test components that don't communicate with any network
# but we should test very common stuff, like what's in `default_config`. # services. Before adding new components to this list make sure we have all
# https://github.com/home-assistant/core/commits/dev/homeassistant/components/default_config/manifest.json # its dependencies packaged and listed in ./component-packages.nix.
componentTests = [ componentTests = [
"alert"
"api" "api"
"auth"
"automation" "automation"
"bayesian"
"binary_sensor"
"caldav"
"calendar"
"camera"
"climate"
"cloud"
"command_line"
"config" "config"
"configurator" "configurator"
"conversation"
"counter" "counter"
"cover"
"default_config" "default_config"
"demo" "demo"
"derivative"
"device_automation"
"device_sun_light_trigger"
"device_tracker"
"dhcp" "dhcp"
"discovery" "discovery"
"emulated_hue"
"esphome"
"fan"
"faa_delays"
"ffmpeg"
"file"
"filesize"
"filter"
"flux"
"folder"
"folder_watcher"
"fritzbox"
"fritzbox_callmonitor"
"frontend" "frontend"
"generic"
"generic_thermostat"
"geo_json_events"
"geo_location"
"group" "group"
"hddtemp"
"history" "history"
"history_stats"
"homekit_controller"
"homeassistant" "homeassistant"
"html5"
"http" "http"
"hue" "hue"
"ifttt"
"image"
"image_processing"
"influxdb"
"input_boolean" "input_boolean"
"input_datetime" "input_datetime"
"input_text" "input_text"
"input_number" "input_number"
"input_select" "input_select"
"intent"
"intent_script"
"ipp"
"kmtronic"
"light"
"local_file"
"local_ip"
"lock"
"logbook" "logbook"
"logentries"
"logger" "logger"
"lovelace"
"manual"
"manual_mqtt"
"mazda"
"media_player"
"media_source" "media_source"
"met"
"mobile_app" "mobile_app"
"modbus"
"moon"
"mqtt"
"mqtt_eventstream"
"mqtt_json"
"mqtt_room"
"mqtt_statestream"
"mullvad"
"notify"
"number"
"ozw"
"panel_custom"
"panel_iframe"
"persistent_notification"
"person" "person"
"plaato"
"prometheus"
"proximity"
"push"
"python_script"
"random"
"recorder"
"rest"
"rest_command"
"rituals_perfume_genie"
"rmvtransport"
"rss_feed_template"
"safe_mode"
"scene" "scene"
"script" "script"
"search"
"shell_command" "shell_command"
"shopping_list"
"simulated"
"sensor"
"smarttub"
"smtp"
"sql"
"ssdp" "ssdp"
"stream"
"sun" "sun"
"switch"
"system_health" "system_health"
"system_log" "system_log"
"tag" "tag"
"tasmota"
"tcp"
"template"
"threshold"
"time_date"
"timer" "timer"
"tod"
"tts"
"universal"
"updater"
"upnp"
"uptime"
"vacuum"
"weather"
"webhook" "webhook"
"websocket_api" "websocket_api"
"wled"
"workday"
"worldclock"
"zeroconf" "zeroconf"
"zha"
"zone" "zone"
"zwave" "zwave"
]; ];
pytestFlagsArray = [ pytestFlagsArray = [
# limit amout of runners to reduce race conditions # limit amout of runners to reduce race conditions
"-n 2" "-n auto"
# retry racy tests that end in "RuntimeError: Event loop is closed"
"--reruns 3"
"--only-rerun RuntimeError"
# assign tests grouped by file to workers # assign tests grouped by file to workers
"--dist loadfile" "--dist loadfile"
# don't bulk test all components # tests are located in tests/
"--ignore tests/components"
# pyotp since v2.4.0 complains about the short mock keys, hass pins v2.3.0
"--ignore tests/auth/mfa_modules/test_notify.py"
"tests" "tests"
# dynamically add packages required for component tests
] ++ map (component: "tests/components/" + component) componentTests; ] ++ map (component: "tests/components/" + component) componentTests;
disabledTestPaths = [
# don't bulk test all components
"tests/components"
# pyotp since v2.4.0 complains about the short mock keys, hass pins v2.3.0
"tests/auth/mfa_modules/test_notify.py"
];
disabledTests = [ disabledTests = [
# AssertionError: assert 1 == 0 # AssertionError: assert 1 == 0
"test_error_posted_as_event"
"test_merge" "test_merge"
# ModuleNotFoundError: No module named 'pyqwikswitch' # ModuleNotFoundError: No module named 'pyqwikswitch'
"test_merge_id_schema" "test_merge_id_schema"
# keyring.errors.NoKeyringError: No recommended backend was available. # keyring.errors.NoKeyringError: No recommended backend was available.
"test_secrets_from_unrelated_fails" "test_secrets_from_unrelated_fails"
"test_secrets_credstash" "test_secrets_credstash"
# generic/test_camera.py: AssertionError: 500 == 200
"test_fetching_without_verify_ssl"
"test_fetching_url_with_verify_ssl"
] ++ lib.optionals (stdenv.isAarch64) [
# tests getting stuck on aarch64
# components/stream/test_hls.py
"test_stream_ended"
# components/stream/test_recorder.py
"test_record_stream"
]; ];
preCheck = '' preCheck = ''
@ -213,8 +344,6 @@ in with py.pkgs; buildPythonApplication rec {
mkdir /build/media mkdir /build/media
''; '';
makeWrapperArgs = lib.optional skipPip "--add-flags --skip-pip";
passthru = { passthru = {
inherit (py.pkgs) hass-frontend; inherit (py.pkgs) hass-frontend;
tests = { tests = {

4
pkgs/servers/home-assistant/frontend.nix
View File

@ -4,11 +4,11 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here # 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 # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend"; pname = "home-assistant-frontend";
version = "20210127.7"; version = "20210302.5";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-N+n1DI1oZ/j+GydH+Du21zTNA6leW4YBri7cAMvAac4="; sha256 = "sha256-+SKXLOuvMYfNyR++uQMMY4M5deRgm2w3AhMM/DP470k=";
}; };
# there is nothing to strip in this package # there is nothing to strip in this package

6
pkgs/tools/package-management/nfpm/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "nfpm"; pname = "nfpm";
version = "2.2.5"; version = "2.3.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "goreleaser"; owner = "goreleaser";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-B8bXZ5PjlZIly25jK23ODa+RYGDfxHR0Z2fpAjptgP8="; sha256 = "sha256-zS8HXzu0oX66oVmupMU9YZKXGF+IQ/tCrO32PXfHPGY=";
}; };
vendorSha256 = "sha256-aSoryidfAfqPBpOtAXFJsq1ZcqJqpGiX3pZz5GpkKqQ="; vendorSha256 = "sha256-1zPrCmC+J9LbD3tRKzdJbyWbyTtD6SiPZ6efc9CSjsg=";
doCheck = false; doCheck = false;

2
pkgs/top-level/all-packages.nix
View File

@ -11542,7 +11542,7 @@ in
# Python package sets. # Python package sets.
python27Packages = python27.pkgs; python27Packages = python27.pkgs;
python36Packages = python36.pkgs; python36Packages = python36.pkgs;
python37Packages = recurseIntoAttrs python37.pkgs; python37Packages = python37.pkgs;
python38Packages = recurseIntoAttrs python38.pkgs; python38Packages = recurseIntoAttrs python38.pkgs;
python39Packages = recurseIntoAttrs python39.pkgs; python39Packages = recurseIntoAttrs python39.pkgs;
python310Packages = python310.pkgs; python310Packages = python310.pkgs;