diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-21 08:43:10 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-21 08:43:10 +0100 |
| commit | 1ffd7cf0d6cb509565deb21a6e57a17575834b76 (patch) | |
| tree | 60b348740eec1eac0730c50016372762141836d9 /pkgs/servers | |
| parent | 553b7a8bf08cfdcf5bd64c5118f4a4fec640f93b (diff) | |
| parent | 65c4e2500f25076a2db330b8953410faab817420 (diff) | |
| download | nixpkgs-1ffd7cf0d6cb509565deb21a6e57a17575834b76.tar nixpkgs-1ffd7cf0d6cb509565deb21a6e57a17575834b76.tar.gz nixpkgs-1ffd7cf0d6cb509565deb21a6e57a17575834b76.tar.bz2 nixpkgs-1ffd7cf0d6cb509565deb21a6e57a17575834b76.tar.lz nixpkgs-1ffd7cf0d6cb509565deb21a6e57a17575834b76.tar.xz nixpkgs-1ffd7cf0d6cb509565deb21a6e57a17575834b76.tar.zst nixpkgs-1ffd7cf0d6cb509565deb21a6e57a17575834b76.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/home-assistant/component-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/home-assistant/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/pim6sd/default.nix | 23 |
3 files changed, 26 insertions, 3 deletions
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 52f114bfe7f..38b8cca170b 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.118.0"; + version = "0.118.1"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index b7350a4efd2..018cf82b961 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -62,7 +62,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.118.0"; + hassVersion = "0.118.1"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -78,7 +78,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "0q3kjsxp82r11gqsnwcw8rnqhgi46214hw84ibw8956w7h75ik5m"; + sha256 = "1l2jqvq3amwdr4v6xq7df19bf75s1dpgcgnaacsx7k7pfwsyn63f"; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/servers/pim6sd/default.nix b/pkgs/servers/pim6sd/default.nix new file mode 100644 index 00000000000..6752a8089af --- /dev/null +++ b/pkgs/servers/pim6sd/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, lib, autoreconfHook, yacc, flex }: + +stdenv.mkDerivation rec { + pname = "pim6sd"; + version = "unstable-2019-05-31"; + + src = fetchFromGitHub { + owner = "troglobit"; + repo = "pim6sd"; + rev = "fa3909529981dd705ba9ead0517222c30c581a4e"; + sha256 = "0x7dyark2mp9xqz9cnmmgaf0z143vxn2835clllpji4ylg77zdjw"; + }; + + nativeBuildInputs = [ autoreconfHook yacc flex ]; + + meta = with lib; { + description = "PIM for IPv6 sparse mode daemon"; + homepage = "https://github.com/troglobit/pim6sd"; + license = licenses.bsd3; + maintainers = with maintainers; [ hexa ]; + platforms = platforms.unix; + }; +} |