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

Merge remote-tracking branch 'upstream/master' into staging

Browse Source 
Conflicts:
	pkgs/applications/science/math/sage/sage-src.nix
This commit is contained in:
Tuomas Tynkkynen 2018-10-27 19:58:03 +03:00
commit 067d1cf330
58 changed files with 385 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maintainers/maintainer-list.nix
View File

@ -2967,6 +2967,11 @@
github = "nequissimus"; github = "nequissimus";
name = "Tim Steinbach"; name = "Tim Steinbach";
}; };
nikitavoloboev = {
email = "nikita.voloboev@gmail.com";
github = "nikitavoloboev";
name = "Nikita Voloboev";
};
nfjinjing = { nfjinjing = {
email = "nfjinjing@gmail.com"; email = "nfjinjing@gmail.com";
github = "nfjinjing"; github = "nfjinjing";

57
nixos/modules/config/networking.nix
View File

@ -16,6 +16,13 @@ let
resolvconfOptions = cfg.resolvconfOptions resolvconfOptions = cfg.resolvconfOptions
++ optional cfg.dnsSingleRequest "single-request" ++ optional cfg.dnsSingleRequest "single-request"
++ optional cfg.dnsExtensionMechanism "edns0"; ++ optional cfg.dnsExtensionMechanism "edns0";
localhostMapped4 = cfg.hosts ? "127.0.0.1" && elem "localhost" cfg.hosts."127.0.0.1";
localhostMapped6 = cfg.hosts ? "::1" && elem "localhost" cfg.hosts."::1";
localhostMultiple = any (elem "localhost") (attrValues (removeAttrs cfg.hosts [ "127.0.0.1" "::1" ]));
in in
{ {
@ -23,8 +30,7 @@ in
options = { options = {
networking.hosts = lib.mkOption { networking.hosts = lib.mkOption {
type = types.attrsOf ( types.listOf types.str ); type = types.attrsOf (types.listOf types.str);
default = {};
example = literalExample '' example = literalExample ''
{ {
"127.0.0.1" = [ "foo.bar.baz" ]; "127.0.0.1" = [ "foo.bar.baz" ];
@ -192,6 +198,29 @@ in
config = { config = {
assertions = [{
assertion = localhostMapped4;
message = ''`networking.hosts` doesn't map "127.0.0.1" to "localhost"'';
} {
assertion = !cfg.enableIPv6 || localhostMapped6;
message = ''`networking.hosts` doesn't map "::1" to "localhost"'';
} {
assertion = !localhostMultiple;
message = ''
`networking.hosts` maps "localhost" to something other than "127.0.0.1"
or "::1". This will break some applications. Please use
`networking.extraHosts` if you really want to add such a mapping.
'';
}];
networking.hosts = {
"127.0.0.1" = [ "localhost" ];
} // optionalAttrs (cfg.hostName != "") {
"127.0.1.1" = [ cfg.hostName ];
} // optionalAttrs cfg.enableIPv6 {
"::1" = [ "localhost" ];
};
environment.etc = environment.etc =
{ # /etc/services: TCP/UDP port assignments. { # /etc/services: TCP/UDP port assignments.
"services".source = pkgs.iana-etc + "/etc/services"; "services".source = pkgs.iana-etc + "/etc/services";
@ -203,23 +232,11 @@ in
"rpc".source = pkgs.glibc.out + "/etc/rpc"; "rpc".source = pkgs.glibc.out + "/etc/rpc";
# /etc/hosts: Hostname-to-IP mappings. # /etc/hosts: Hostname-to-IP mappings.
"hosts".text = "hosts".text = let
let oneToString = set : ip : ip + " " + concatStringsSep " " ( getAttr ip set ); oneToString = set: ip: ip + " " + concatStringsSep " " set.${ip};
allToString = set : concatMapStringsSep "\n" ( oneToString set ) ( attrNames set ); allToString = set: concatMapStringsSep "\n" (oneToString set) (attrNames set);
userLocalHosts = optionalString in ''
( builtins.hasAttr "127.0.0.1" cfg.hosts ) ${allToString cfg.hosts}
( concatStringsSep " " ( remove "localhost" cfg.hosts."127.0.0.1" ));
userLocalHosts6 = optionalString
( builtins.hasAttr "::1" cfg.hosts )
( concatStringsSep " " ( remove "localhost" cfg.hosts."::1" ));
otherHosts = allToString ( removeAttrs cfg.hosts [ "127.0.0.1" "::1" ]);
in
''
127.0.0.1 ${userLocalHosts} localhost
${optionalString cfg.enableIPv6 ''
::1 ${userLocalHosts6} localhost
''}
${otherHosts}
${cfg.extraHosts} ${cfg.extraHosts}
''; '';
@ -296,4 +313,4 @@ in
}; };
} }

2
nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
View File

@ -7,4 +7,6 @@
imports = imports =
[ ./installation-cd-base.nix [ ./installation-cd-base.nix
]; ];
fonts.fontconfig.enable = false;
} }

5
nixos/modules/profiles/base.nix
View File

@ -7,7 +7,7 @@
# Include some utilities that are useful for installing or repairing # Include some utilities that are useful for installing or repairing
# the system. # the system.
environment.systemPackages = [ environment.systemPackages = [
pkgs.w3m-nox # needed for the manual anyway pkgs.w3m-nographics # needed for the manual anyway
pkgs.testdisk # useful for repairing boot problems pkgs.testdisk # useful for repairing boot problems
pkgs.ms-sys # for writing Microsoft boot sectors / MBRs pkgs.ms-sys # for writing Microsoft boot sectors / MBRs
pkgs.efibootmgr pkgs.efibootmgr
@ -19,6 +19,9 @@
pkgs.cryptsetup # needed for dm-crypt volumes pkgs.cryptsetup # needed for dm-crypt volumes
pkgs.mkpasswd # for generating password files pkgs.mkpasswd # for generating password files
# Some text editors.
pkgs.vim
# Some networking tools. # Some networking tools.
pkgs.fuse pkgs.fuse
pkgs.fuse3 pkgs.fuse3

3
nixos/modules/profiles/installation-device.nix
View File

@ -87,9 +87,6 @@ with lib;
# console less cumbersome if the machine has a public IP. # console less cumbersome if the machine has a public IP.
networking.firewall.logRefusedConnections = mkDefault false; networking.firewall.logRefusedConnections = mkDefault false;
environment.systemPackages = [ pkgs.vim ];
# Allow the user to log in as root without a password. # Allow the user to log in as root without a password.
users.users.root.initialHashedPassword = ""; users.users.root.initialHashedPassword = "";
}; };

83
nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix
View File

@ -248,6 +248,14 @@ in {
</itemizedlist> </itemizedlist>
''; '';
ppk_id = mkOptionalStrParam ''
String identifying the Postquantum Preshared Key (PPK) to be used.
'';
ppk_required = mkYesNoParam no ''
Whether a Postquantum Preshared Key (PPK) is required for this connection.
'';
keyingtries = mkIntParam 1 '' keyingtries = mkIntParam 1 ''
Number of retransmission sequences to perform during initial Number of retransmission sequences to perform during initial
connect. Instead of giving up initiation after the first retransmission connect. Instead of giving up initiation after the first retransmission
@ -922,6 +930,36 @@ in {
<literal>0xffffffff</literal>. <literal>0xffffffff</literal>.
''; '';
set_mark_in = mkStrParam "0/0x00000000" ''
Netfilter mark applied to packets after the inbound IPsec SA processed
them. This way it's not necessary to mark packets via Netfilter before
decryption or right afterwards to match policies or process them
differently (e.g. via policy routing).
An additional mask may be appended to the mark, separated by
<literal>/</literal>. The default mask if omitted is 0xffffffff. The
special value <literal>%same</literal> uses the value (but not the mask)
from <option>mark_in</option> as mark value, which can be fixed,
<literal>%unique</literal> or <literal>%unique-dir</literal>.
Setting marks in XFRM input requires Linux 4.19 or higher.
'';
set_mark_out = mkStrParam "0/0x00000000" ''
Netfilter mark applied to packets after the outbound IPsec SA processed
them. This allows processing ESP packets differently than the original
traffic (e.g. via policy routing).
An additional mask may be appended to the mark, separated by
<literal>/</literal>. The default mask if omitted is 0xffffffff. The
special value <literal>%same</literal> uses the value (but not the mask)
from <option>mark_out</option> as mark value, which can be fixed,
<literal>%unique_</literal> or <literal>%unique-dir</literal>.
Setting marks in XFRM output is supported since Linux 4.14. Setting a
mask requires at least Linux 4.19.
'';
tfc_padding = mkParamOfType (with lib.types; either int (enum ["mtu"])) 0 '' tfc_padding = mkParamOfType (with lib.types; either int (enum ["mtu"])) 0 ''
Pads ESP packets with additional data to have a consistent ESP packet Pads ESP packets with additional data to have a consistent ESP packet
size for improved Traffic Flow Confidentiality. The padding defines the size for improved Traffic Flow Confidentiality. The padding defines the
@ -946,6 +984,33 @@ in {
supported, but the installation does not fail otherwise. supported, but the installation does not fail otherwise.
''; '';
copy_df = mkYesNoParam yes ''
Whether to copy the DF bit to the outer IPv4 header in tunnel mode. This
effectively disables Path MTU discovery (PMTUD). Controlling this
behavior is not supported by all kernel interfaces.
'';
copy_ecn = mkYesNoParam yes ''
Whether to copy the ECN (Explicit Congestion Notification) header field
to/from the outer IP header in tunnel mode. Controlling this behavior is
not supported by all kernel interfaces.
'';
copy_dscp = mkEnumParam [ "out" "in" "yes" "no" ] "out" ''
Whether to copy the DSCP (Differentiated Services Field Codepoint)
header field to/from the outer IP header in tunnel mode. The value
<literal>out</literal> only copies the field from the inner to the outer
header, the value <literal>in</literal> does the opposite and only
copies the field from the outer to the inner header when decapsulating,
the value <literal>yes</literal> copies the field in both directions,
and the value <literal>no</literal> disables copying the field
altogether. Setting this to <literal>yes</literal> or
<literal>in</literal> could allow an attacker to adversely affect other
traffic at the receiver, which is why the default is
<literal>out</literal>. Controlling this behavior is not supported by
all kernel interfaces.
'';
start_action = mkEnumParam ["none" "trap" "start"] "none" '' start_action = mkEnumParam ["none" "trap" "start"] "none" ''
Action to perform after loading the configuration. Action to perform after loading the configuration.
<itemizedlist> <itemizedlist>
@ -1060,6 +1125,24 @@ in {
defined in a unique section having the <literal>ike</literal> prefix. defined in a unique section having the <literal>ike</literal> prefix.
''; '';
ppk = mkPrefixedAttrsOfParams {
secret = mkOptionalStrParam ''
Value of the PPK. It may either be an ASCII string, a hex encoded string
if it has a <literal>0x</literal> prefix or a Base64 encoded string if
it has a <literal>0s</literal> prefix in its value. Should have at least
256 bits of entropy for 128-bit security.
'';
id = mkPrefixedAttrsOfParam (mkOptionalStrParam "") ''
PPK identity the PPK belongs to. Multiple unique identities may be
specified, each having an <literal>id</literal> prefix, if a secret is
shared between multiple peers.
'';
} ''
Postquantum Preshared Key (PPK) section for a specific secret. Each PPK is
defined in a unique section having the <literal>ppk</literal> prefix.
'';
private = mkPrefixedAttrsOfParams { private = mkPrefixedAttrsOfParams {
file = mkOptionalStrParam '' file = mkOptionalStrParam ''
File name in the private folder for which this passphrase should be used. File name in the private folder for which this passphrase should be used.

4
pkgs/applications/altcoins/litecoin.nix
View File

@ -11,13 +11,13 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "litecoin" + (toString (optional (!withGui) "d")) + "-" + version; name = "litecoin" + (toString (optional (!withGui) "d")) + "-" + version;
version = "0.16.2"; version = "0.16.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "litecoin-project"; owner = "litecoin-project";
repo = "litecoin"; repo = "litecoin";
rev = "v${version}"; rev = "v${version}";
sha256 = "0xfwh7cxxz6w8kgr4kl48w3zm81n1hv8fxb5l9zx3460im1ffgy6"; sha256 = "0vc184qfdkjky1qffa7309k6973k4197bkzwcmffc9r5sdfhrhkp";
}; };
nativeBuildInputs = [ pkgconfig autoreconfHook ]; nativeBuildInputs = [ pkgconfig autoreconfHook ];

4
pkgs/applications/gis/openorienteering-mapper/default.nix
View File

@ -4,7 +4,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "OpenOrienteering-Mapper-${version}"; name = "OpenOrienteering-Mapper-${version}";
version = "0.8.2"; version = "0.8.3";
buildInputs = [ gdal qtbase qttools qtlocation qtimageformats buildInputs = [ gdal qtbase qttools qtlocation qtimageformats
qtsensors clipper zlib proj doxygen cups]; qtsensors clipper zlib proj doxygen cups];
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
owner = "OpenOrienteering"; owner = "OpenOrienteering";
repo = "mapper"; repo = "mapper";
rev = "v${version}"; rev = "v${version}";
sha256 = "02lga6nlal4c7898zc3lv1pcwyv1wpkn7v2xji2kgq68r6aw6j59"; sha256 = "0pnqwvmg97mgc2ci3abmx07l0njxcrbljh75w8ym31g0jq76pgr9";
}; };
cmakeFlags = cmakeFlags =

4
pkgs/applications/misc/nnn/default.nix
View File

@ -4,13 +4,13 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "nnn-${version}"; name = "nnn-${version}";
version = "1.9"; version = "2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jarun"; owner = "jarun";
repo = "nnn"; repo = "nnn";
rev = "v${version}"; rev = "v${version}";
sha256 = "0z7mr9lql5hz0518wzkj8fdsdp8yh17fr418arjxjn66md4kwgpg"; sha256 = "16c6fimr1ayb2x3mvli70x2va3nz106jdfyqn53bhss7zjqvszxl";
}; };
configFile = optionalString (conf!=null) (builtins.toFile "nnn.h" conf); configFile = optionalString (conf!=null) (builtins.toFile "nnn.h" conf);

4
pkgs/applications/networking/browsers/vivaldi/default.nix
View File

@ -13,11 +13,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${product}-${version}"; name = "${product}-${version}";
product = "vivaldi"; product = "vivaldi";
version = "2.0.1309.29-2"; version = "2.1.1337.36-1";
src = fetchurl { src = fetchurl {
url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb"; url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb";
sha256 = "09vaf191djbrfijvhklivh2ifj8w68car2vz956gsw4lhz07kzck"; sha256 = "14qf3gk46m65yfc7q7gsnkj6av8yhg7byi0h1yv24sr7n4rrnrsc";
}; };
unpackPhase = '' unpackPhase = ''

4
pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
View File

@ -6,11 +6,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${product}-${version}"; name = "${product}-${version}";
product = "vivaldi-ffmpeg-codecs"; product = "vivaldi-ffmpeg-codecs";
version = "69.0.3497.73"; version = "70.0.3538.77";
src = fetchurl { src = fetchurl {
url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz"; url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz";
sha512 = "3qyzxdybiszwy62izr35wffnh1a1plg9y536vrmd4b2xl8p4nz18c7439blr0cdzsr5qplgrdl64446a27mkyhbw8c3iy0gb4zgb5j9"; sha512 = "128hvkcbyw70j31dj4jviqqjrzyfx38689nb8v0kk5vi2zlgfy5ibz2gyrv4bvrb53ld262y9pvam51nbdmrx2vqd9xrs173py7v0a0";
}; };
buildInputs = [ ]; buildInputs = [ ];

11
pkgs/applications/networking/sniffers/wireshark/default.nix
View File

@ -17,6 +17,7 @@ let
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "wireshark-${variant}-${version}"; name = "wireshark-${variant}-${version}";
outputs = [ "out" "dev" ];
src = fetchurl { src = fetchurl {
url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
@ -87,6 +88,16 @@ in stdenv.mkDerivation {
--replace "Exec=wireshark" "Exec=$out/bin/wireshark" --replace "Exec=wireshark" "Exec=$out/bin/wireshark"
install -Dm644 ../image/wsicon.svg $out/share/icons/wireshark.svg install -Dm644 ../image/wsicon.svg $out/share/icons/wireshark.svg
mkdir $dev/include/{epan/{wmem,ftypes,dfilter},wsutil,wiretap} -pv
cp config.h $dev/include/
cp ../ws_*.h $dev/include
cp ../epan/*.h $dev/include/epan/
cp ../epan/wmem/*.h $dev/include/epan/wmem/
cp ../epan/ftypes/*.h $dev/include/epan/ftypes/
cp ../epan/dfilter/*.h $dev/include/epan/dfilter/
cp ../wsutil/*.h $dev/include/wsutil/
cp ../wiretap/*.h $dev/include/wiretap
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;

6
pkgs/applications/science/math/sage/sage-src.nix
View File

@ -75,6 +75,12 @@ stdenv.mkDerivation rec {
url = "https://git.sagemath.org/sage.git/patch/?h=f77de1d0e7f90ee12761140500cb8cbbb789ab20"; url = "https://git.sagemath.org/sage.git/patch/?h=f77de1d0e7f90ee12761140500cb8cbbb789ab20";
sha256 = "14wrpy8jgbnpza1j8a2nx8y2r946y82pll1fv3cn6gpfmm6640l3"; sha256 = "14wrpy8jgbnpza1j8a2nx8y2r946y82pll1fv3cn6gpfmm6640l3";
}) })
# https://trac.sagemath.org/ticket/26360
(fetchpatch {
name = "arb-2.15.1.patch";
url = "https://git.sagemath.org/sage.git/patch/?id=30cc778d46579bd0c7537ed33e8d7a4f40fd5c31";
sha256 = "13vc2q799dh745sm59xjjabllfj0sfjzcacf8k59kwj04x755d30";
})
]; ];
patches = nixPatches ++ packageUpgradePatches ++ [ patches = nixPatches ++ packageUpgradePatches ++ [

2
pkgs/applications/science/math/sage/sage-wrapper.nix
View File

@ -8,7 +8,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = sage.version; version = sage.version;
name = "sage-wrapper-${version}"; name = "sage-${version}";
buildInputs = [ buildInputs = [
makeWrapper makeWrapper

2
pkgs/applications/science/math/sage/sage.nix
View File

@ -5,7 +5,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = sage-with-env.version; version = sage-with-env.version;
name = "sage-${version}"; name = "sage-tests-${version}";
buildInputs = [ buildInputs = [
makeWrapper makeWrapper

6
pkgs/development/compilers/dotnet/sdk/default.nix
View File

@ -12,14 +12,14 @@ let
rpath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc libunwind libuuid icu openssl zlib curl ]; rpath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc libunwind libuuid icu openssl zlib curl ];
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.1.402"; version = "2.1.403";
netCoreVersion = "2.1.4"; netCoreVersion = "2.1.5";
name = "dotnet-sdk-${version}"; name = "dotnet-sdk-${version}";
src = fetchurl { src = fetchurl {
url = "https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/dotnet-sdk-${version}-linux-x64.tar.gz"; url = "https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/dotnet-sdk-${version}-linux-x64.tar.gz";
# use sha512 from the download page # use sha512 from the download page
sha512 = "dd7f15a8202ffa2a435b7289865af4483bb0f642ffcf98a1eb10464cb9c51dd1d771efbb6120f129fe9666f62707ba0b7c476cf1fd3536d3a29329f07456de48"; sha512 = "903a8a633aea9211ba36232a2decb3b34a59bb62bc145a0e7a90ca46dd37bb6c2da02bcbe2c50c17e08cdff8e48605c0f990786faf1f06be1ea4a4d373beb8a9";
}; };
unpackPhase = '' unpackPhase = ''

4
pkgs/development/compilers/ponyc/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation ( rec { stdenv.mkDerivation ( rec {
name = "ponyc-${version}"; name = "ponyc-${version}";
version = "0.24.4"; version = "0.25.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ponylang"; owner = "ponylang";
repo = "ponyc"; repo = "ponyc";
rev = version; rev = version;
sha256 = "1p75h1ldi9iskqkwic5h426cwi45042p3agh9sdl6gld9s7lc9a6"; sha256 = "0ghmjp03q7k58yzfkvnl05xc2i2gmgnzpj3hs6g7ls4ny8n3i6hv";
}; };
buildInputs = [ llvm makeWrapper which ]; buildInputs = [ llvm makeWrapper which ];

7
pkgs/development/interpreters/bats/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchzip }: { stdenv, fetchzip, gnugrep }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "bats-${version}"; name = "bats-${version}";
@ -9,7 +9,10 @@ stdenv.mkDerivation rec {
sha256 = "1kkh0j2alql3xiyhw9wsvcc3xclv52g0ivgyk8h85q9fn3qdqakz"; sha256 = "1kkh0j2alql3xiyhw9wsvcc3xclv52g0ivgyk8h85q9fn3qdqakz";
}; };
patchPhase = "patchShebangs ./install.sh"; patchPhase = ''
patchShebangs ./install.sh
substituteInPlace ./libexec/bats-core/bats-format-tap-stream --replace grep ${gnugrep}/bin/grep
'';
installPhase = "./install.sh $out"; installPhase = "./install.sh $out";

10
pkgs/development/interpreters/spidermonkey/52.nix
View File

@ -10,6 +10,9 @@ in stdenv.mkDerivation rec {
sha256 = "1mlx34fgh1kaqamrkl5isf0npch3mm6s4lz3jsjb7hakiijhj7f0"; sha256 = "1mlx34fgh1kaqamrkl5isf0npch3mm6s4lz3jsjb7hakiijhj7f0";
}; };
outputs = [ "out" "dev" ];
setOutputFlags = false; # Configure script only understands --includedir
buildInputs = [ readline icu zlib nspr ]; buildInputs = [ readline icu zlib nspr ];
nativeBuildInputs = [ autoconf213 pkgconfig perl which python2 zip ]; nativeBuildInputs = [ autoconf213 pkgconfig perl which python2 zip ];
@ -32,6 +35,7 @@ in stdenv.mkDerivation rec {
export CXXFLAGS="-fpermissive" export CXXFLAGS="-fpermissive"
export LIBXUL_DIST=$out export LIBXUL_DIST=$out
export PYTHON="${python2.interpreter}" export PYTHON="${python2.interpreter}"
configureFlagsArray+=("--includedir=$dev/include")
cd js/src cd js/src
@ -49,6 +53,12 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
postInstall = ''
moveToOutput bin/js52-config "$dev"
# Nuke a static lib.
rm $out/lib/libjs_static.ajs
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Mozilla's JavaScript engine written in C/C++"; description = "Mozilla's JavaScript engine written in C/C++";
homepage = https://developer.mozilla.org/en/SpiderMonkey; homepage = https://developer.mozilla.org/en/SpiderMonkey;

4
pkgs/development/libraries/arb/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "arb"; pname = "arb";
version = "2.14.0"; version = "2.15.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fredrik-johansson"; owner = "fredrik-johansson";
repo = "${pname}"; repo = "${pname}";
rev = "${version}"; rev = "${version}";
sha256 = "1ndxg7h4xvccjgp5l9z2f8b66dsff6fhf86bn5n7f75a1ksd7554"; sha256 = "148mn31xy4wgja2cainn2yaw1bjrppf1dxw2ngnvp7x5j7fms1am";
}; };
buildInputs = [mpir gmp mpfr flint]; buildInputs = [mpir gmp mpfr flint];
configureFlags = [ configureFlags = [

4
pkgs/development/libraries/libcouchbase/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libcouchbase-${version}"; name = "libcouchbase-${version}";
version = "2.9.5"; version = "2.10.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "couchbase"; owner = "couchbase";
repo = "libcouchbase"; repo = "libcouchbase";
rev = version; rev = version;
sha256 = "18l3579b47l8d6nhv0xls8pybkqdmdkw8jg4inalnx3g7ydqfn00"; sha256 = "08bvnd0m18qs5akbblf80l54khm1523fdiiajp7fj88vrs86nbi2";
}; };
cmakeFlags = "-DLCB_NO_MOCK=ON"; cmakeFlags = "-DLCB_NO_MOCK=ON";

4
pkgs/development/libraries/libsolv/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }: { stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
rev = "0.6.35"; rev = "0.7.0";
name = "libsolv-${rev}"; name = "libsolv-${rev}";
src = fetchFromGitHub { src = fetchFromGitHub {
inherit rev; inherit rev;
owner = "openSUSE"; owner = "openSUSE";
repo = "libsolv"; repo = "libsolv";
sha256 = "0jx1bmwwhjwfidwa0hrarwpcrf4ic068kapd4vb9m5y7xd4l55nq"; sha256 = "02vz1yp516nh4vv0jdckll37mc373ddd363ip005xfbrbb2jr1xh";
}; };
cmakeFlags = [ cmakeFlags = [

4
pkgs/development/libraries/libversion/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake }: { stdenv, fetchFromGitHub, cmake }:
let let
version = "2.6.0"; version = "2.7.0";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libversion-${version}"; name = "libversion-${version}";
@ -10,7 +10,7 @@ stdenv.mkDerivation {
owner = "repology"; owner = "repology";
repo = "libversion"; repo = "libversion";
rev = version; rev = version;
sha256 = "0krhfycva3l4rhac5kx6x1a6fad594i9i77vy52rwn37j62bm601"; sha256 = "0brk2mbazc7yz0h4zsvbybbaymf497dgxnc74qihnvbi4z4rlqpj";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

4
pkgs/development/libraries/matio/default.nix
View File

@ -1,9 +1,9 @@
{ stdenv, fetchurl }: { stdenv, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "matio-1.5.12"; name = "matio-1.5.13";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/matio/${name}.tar.gz"; url = "mirror://sourceforge/matio/${name}.tar.gz";
sha256 = "1afqjhc1wbm7g1vry3w30c7dbrxg6n4i482ybgx6l1b5wj0f75c6"; sha256 = "1jz5760jn1cifr479znhmzksi8fp07j99jd8xdnxpjd79gsv5bgy";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {

4
pkgs/development/libraries/pupnp/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libupnp-${version}"; name = "libupnp-${version}";
version = "1.8.3"; version = "1.8.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mrjimenez"; owner = "mrjimenez";
repo = "pupnp"; repo = "pupnp";
rev = "release-${version}"; rev = "release-${version}";
sha256 = "1w0kfq1pg3y2wl6gwkm1w872g0qz29w1z9wj08xxmwnk5mkpvsrl"; sha256 = "1daml02z4rs9cxls95p2v24jvwcsp43a0gqv06s84ay5yn6r47wx";
}; };
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];

15
pkgs/development/libraries/sfml/default.nix
View File

@ -1,26 +1,31 @@
{ stdenv, fetchurl, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis { stdenv, fetchzip, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis
, glew, libXrandr, libXrender, udev, xcbutilimage , glew, libXrandr, libXrender, udev, xcbutilimage
, IOKit, Foundation, AppKit, OpenAL , IOKit, Foundation, AppKit, OpenAL
}: }:
let let
version = "2.5.0"; version = "2.5.1";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "sfml-${version}"; name = "sfml-${version}";
src = fetchurl {
src = fetchzip {
url = "https://github.com/SFML/SFML/archive/${version}.tar.gz"; url = "https://github.com/SFML/SFML/archive/${version}.tar.gz";
sha256 = "1x3yvhdrln5b6h4g5r4mds76gq8zsxw6icxqpwqkmxsqcq5yviab"; sha256 = "0abr8ri2ssfy9ylpgjrr43m6rhrjy03wbj9bn509zqymifvq5pay";
}; };
buildInputs = [ cmake libX11 freetype libjpeg openal flac libvorbis glew
nativeBuildInputs = [ cmake ];
buildInputs = [ libX11 freetype libjpeg openal flac libvorbis glew
libXrandr libXrender xcbutilimage libXrandr libXrender xcbutilimage
] ++ stdenv.lib.optional stdenv.isLinux udev ] ++ stdenv.lib.optional stdenv.isLinux udev
++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL ]; ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL ];
cmakeFlags = [ "-DSFML_INSTALL_PKGCONFIG_FILES=yes" cmakeFlags = [ "-DSFML_INSTALL_PKGCONFIG_FILES=yes"
"-DSFML_MISC_INSTALL_PREFIX=share/SFML" "-DSFML_MISC_INSTALL_PREFIX=share/SFML"
"-DSFML_BUILD_FRAMEWORKS=no" "-DSFML_BUILD_FRAMEWORKS=no"
"-DSFML_USE_SYSTEM_DEPS=yes" ]; "-DSFML_USE_SYSTEM_DEPS=yes" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://www.sfml-dev.org/; homepage = http://www.sfml-dev.org/;
description = "Simple and fast multimedia library"; description = "Simple and fast multimedia library";

56
pkgs/development/libraries/wxwidgets/3.0/mac.nix
View File

@ -1,60 +1,26 @@
{ stdenv, fetchurl, fetchpatch, expat, libiconv, libjpeg, libpng, libtiff, zlib { stdenv, fetchzip, fetchpatch, expat, libiconv, libjpeg, libpng, libtiff, zlib
# darwin only attributes # darwin only attributes
, derez, rez, setfile , cf-private, derez, rez, setfile
, AGL, Cocoa, Kernel , AGL, Cocoa, Kernel
}: }:
with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "3.0.2"; version = "3.0.4";
name = "wxmac-${version}"; name = "wxmac-${version}";
src = fetchurl { src = fetchzip {
url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.bz2"; url = "https://github.com/wxWidgets/wxWidgets/archive/v${version}.tar.gz";
sha256 = "346879dc554f3ab8d6da2704f651ecb504a22e9d31c17ef5449b129ed711585d"; sha256 = "19mqglghjjqjgz4rbybn3qdgn2cz9xc511nq1pvvli9wx2k8syl1";
}; };
patches =
[ # Use std::abs() from <cmath> instead of abs() from <math.h> to avoid problems
# with abiguous overloads for clang-3.8 and gcc6.
(fetchpatch {
name = "patch-stc-abs.diff";
url = https://github.com/wxWidgets/wxWidgets/commit/73e9e18ea09ffffcaac50237def0d9728a213c02.patch;
sha256 = "0w5whmfzm8waw62jmippming0zffa9064m5b3aw5nixph21rlcvq";
})
# Various fixes related to Yosemite. Revisit in next stable release.
# Please keep an eye on http://trac.wxwidgets.org/ticket/16329 as well
# Theoretically the above linked patch should still be needed, but it isn't.
# Try to find out why.
(fetchpatch {
name = "patch-yosemite.diff";
url = https://raw.githubusercontent.com/Homebrew/formula-patches/bbf4995/wxmac/patch-yosemite.diff;
sha256 = "0ss66z2a79v976mvlrskyj1zmkyaz8hbwm98p29bscfvcx5845jb";
})
# Remove uncenessary <QuickTime/QuickTime.h> includes
# http://trac.wxwidgets.org/changeset/f6a2d1caef5c6d412c84aa900cb0d3990b350938/git-wxWidgets
(fetchpatch {
name = "patch-quicktime-removal.diff";
url = https://raw.githubusercontent.com/Homebrew/formula-patches/bbf4995/wxmac/patch-quicktime-removal.diff;
sha256 = "0mzvdk8r70p9s1wj7qzdsqmdrlxlf2dalh9gqs8xjkqq2666yp0y";
})
# Patch for wxOSXPrintData, custom paper not applied
# http://trac.wxwidgets.org/ticket/16959
(fetchpatch {
name = "wxPaperCustomPatch.patch";
url = http://trac.wxwidgets.org/raw-attachment/ticket/16959/wxPaperCustomPatch.patch;
sha256 = "0xgscv86f8dhggn9n8bhlq9wlj3ydsicgy9v35sraxyma18cbjvl";
})
];
buildInputs = [ buildInputs = [
expat libiconv libjpeg libpng libtiff zlib expat libiconv libjpeg libpng libtiff zlib
derez rez setfile derez rez setfile
Cocoa Kernel Cocoa Kernel
# Needed for CFURLGetFSRef, etc. which have deen deprecated
# since 10.9 and are not part of swift-corelibs CoreFoundation.
cf-private
]; ];
propagatedBuildInputs = [ AGL ]; propagatedBuildInputs = [ AGL ];
@ -98,7 +64,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
meta = { meta = with stdenv.lib; {
platforms = platforms.darwin; platforms = platforms.darwin;
license = licenses.wxWindows; license = licenses.wxWindows;
maintainers = [ maintainers.lnl7 ]; maintainers = [ maintainers.lnl7 ];

4
pkgs/development/misc/loc/default.nix
View File

@ -15,12 +15,12 @@ buildRustPackage rec {
cargoSha256 = "0y2ww48vh667kkyg9pyjwcbh7fxi41bjnkhwp749crjqn2abimrk"; cargoSha256 = "0y2ww48vh667kkyg9pyjwcbh7fxi41bjnkhwp749crjqn2abimrk";
meta = { meta = with stdenv.lib; {
homepage = https://github.com/cgag/loc; homepage = https://github.com/cgag/loc;
description = "Count lines of code quickly"; description = "Count lines of code quickly";
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [ ]; maintainers = with stdenv.lib.maintainers; [ ];
platforms = with stdenv.lib.platforms; linux; platforms = platforms.unix;
}; };
} }

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

@ -18,11 +18,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aiohttp"; pname = "aiohttp";
version = "3.3.2"; version = "3.4.4";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "f20deec7a3fbaec7b5eb7ad99878427ad2ee4cc16a46732b705e8121cbb3cc12"; sha256 = "1ykm6kdjkrg556j0zd7dx2l1rsrbh0d9g27ivr6dmaahz9pyrbsi";
}; };
disabled = pythonOlder "3.5"; disabled = pythonOlder "3.5";

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

@ -3,7 +3,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aniso8601"; pname = "aniso8601";
version = "3.0.2"; version = "4.0.1";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Parses ISO 8601 strings."; description = "Parses ISO 8601 strings.";
@ -15,6 +15,6 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "7849749cf00ae0680ad2bdfe4419c7a662bef19c03691a19e008c8b9a5267802"; sha256 = "15cwnadw2xdczdi13k9grrgqq67hxgys4l155dqsl2zh3glhsmp7";
}; };
} }

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

@ -6,11 +6,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "async-timeout"; pname = "async-timeout";
version = "3.0.0"; version = "3.0.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "b3c0ddc416736619bd4a95ca31de8da6920c3b9a140c64dbef2b2fa7bf521287"; sha256 = "0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f";
}; };
# Circular dependency on aiohttp # Circular dependency on aiohttp

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

@ -1,11 +1,11 @@
{ stdenv, buildPythonPackage, fetchPypi, django }: { stdenv, buildPythonPackage, fetchPypi, django }:
buildPythonPackage rec { buildPythonPackage rec {
version = "3.8.2"; version = "3.9.0";
pname = "djangorestframework"; pname = "djangorestframework";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "b6714c3e4b0f8d524f193c91ecf5f5450092c2145439ac2769711f7eba89a9d9"; sha256 = "0dk1r2qiifws4bb2pq8xk5dbsrhli0fi14iqg59v360mpfq6ay30";
}; };
# Test settings are missing # Test settings are missing

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

@ -16,13 +16,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "grip"; pname = "grip";
version = "4.4.0"; version = "4.5.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "joeyespo"; owner = "joeyespo";
repo = "grip"; repo = "grip";
rev = "v${version}"; rev = "v${version}";
sha256 = "1768n3w40qg1njkzqjyl5gkva0h31k8h250821v69imj1zimymag"; sha256 = "0hphplnyi903jx7ghfxplg1qlj2kpcav1frr2js7p45pbh5ib9rm";
}; };
patches = [ patches = [

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

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "phonenumbers"; pname = "phonenumbers";
version = "8.9.15"; version = "8.9.16";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "8e9664ce0a838c81f4fb3e4d271c76859d26bde57242d64fe1632ab636f5319f"; sha256 = "1camfcbvbl0xljxmd4h8smcfg3ris19jjznjv5zcbrxr28fafq74";
}; };
meta = { meta = {

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

@ -5,13 +5,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "praw"; pname = "praw";
version = "5.4.0"; version = "6.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "praw-dev"; owner = "praw-dev";
repo = "praw"; repo = "praw";
rev = "v${version}"; rev = "v${version}";
sha256 = "13vbh2r952ai2m6sc79psfwaj5fc8cssdg2pqpizg2mwd0l1s6lb"; sha256 = "0y6nyz8vf98gl1qfmnznv3dbvlbzdl6mz99vk673nyfn3hbs451i";
}; };
postPatch = '' postPatch = ''

24
pkgs/development/tools/go-junit-report/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "go-junit-report-unstable-${version}";
version = "2018-06-14";
rev = "385fac0ced9acaae6dc5b39144194008ded00697";
goPackagePath = "github.com/jstemmer/go-junit-report";
src = fetchFromGitHub {
inherit rev;
owner = "jstemmer";
repo = "go-junit-report";
sha256 = "109zs8wpdmc2ijc2khyqija8imay88ka6v50xvrpnnwnd3ywckxi";
};
meta = with stdenv.lib; {
description = "Converts go test output to an xml report, suitable for applications that expect junit xml reports (e.g. Jenkins)";
homepage = "https://${goPackagePath}";
maintainers = with maintainers; [ cryptix ];
license = licenses.mit;
platforms = platforms.all;
};
}

4
pkgs/development/tools/minizinc/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, flex, bison }: { stdenv, fetchFromGitHub, cmake, flex, bison }:
let let
version = "2.2.0"; version = "2.2.1";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "minizinc-${version}"; name = "minizinc-${version}";
@ -11,7 +11,7 @@ stdenv.mkDerivation {
rev = "${version}"; rev = "${version}";
owner = "MiniZinc"; owner = "MiniZinc";
repo = "libminizinc"; repo = "libminizinc";
sha256 = "05is1r5y06jfqwvka90dn2ffxnvbgyswaxl00aqz6455hnggnxvm"; sha256 = "1i11lan7fqs3lg0s6jfr8sflzwn5nk1ln5j6afjrkrdb08291dr7";
}; };
# meta is all the information about the package.. # meta is all the information about the package..

8
pkgs/os-specific/darwin/cf-private/default.nix
View File

@ -1,4 +1,4 @@
{ CF, apple_sdk }: { CF, apple_sdk, osx_private_sdk }:
# cf-private is a bit weird, but boils down to CF with a weird setup-hook that # cf-private is a bit weird, but boils down to CF with a weird setup-hook that
# makes a build link against the system CoreFoundation rather than our pure one. # makes a build link against the system CoreFoundation rather than our pure one.
@ -38,14 +38,16 @@ CF.overrideAttrs (orig: {
# this is watchman, who can almost certainly switch to the pure CF once the header # this is watchman, who can almost certainly switch to the pure CF once the header
# and functionality is merged in. # and functionality is merged in.
installPhase = orig.installPhase + '' installPhase = orig.installPhase + ''
# Copy or overwrite private headers, some of these might already
# exist in CF but the private versions have more information.
basepath="Library/Frameworks/CoreFoundation.framework/Headers" basepath="Library/Frameworks/CoreFoundation.framework/Headers"
path="$basepath/CFFileDescriptor.h" cp -Lfv --no-preserve mode ${osx_private_sdk}/include/CoreFoundationPrivateHeaders/* "$out/$basepath"
# Append the include at top level or nobody will notice the header we're about to add # Append the include at top level or nobody will notice the header we're about to add
sed -i '/CFNotificationCenter.h/a #include <CoreFoundation/CFFileDescriptor.h>' \ sed -i '/CFNotificationCenter.h/a #include <CoreFoundation/CFFileDescriptor.h>' \
"$out/$basepath/CoreFoundation.h" "$out/$basepath/CoreFoundation.h"
cp ${apple_sdk.frameworks.CoreFoundation}/$path $out/$path cp ${apple_sdk.frameworks.CoreFoundation}/$basepath/CFFileDescriptor.h $out/$basepath/CFFileDescriptor.h
'' + '' +
# This one is less likely to go away, but I'll mention it anyway. The issue is at # This one is less likely to go away, but I'll mention it anyway. The issue is at
# https://bugs.swift.org/browse/SR-8744, and the main user I know of is qtbase # https://bugs.swift.org/browse/SR-8744, and the main user I know of is qtbase

27
pkgs/os-specific/darwin/goku/default.nix Normal file
View File

@ -0,0 +1,27 @@
{stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "goku-${version}";
version = "0.1.11";
src = fetchurl {
url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${version}/goku.tar.gz";
sha256 = "49562342be114c2656726c5c697131acd286965ab3903a1a1e157cc689e20b15";
};
sourceRoot = ".";
installPhase = ''
mkdir -p $out/bin
cp goku $out/bin
cp gokuw $out/bin
'';
meta = with stdenv.lib; {
description = "Karabiner configurator";
homepage = https://github.com/yqrashawn/GokuRakuJoudo;
license = licenses.gpl3;
maintainers = [ maintainers.nikitavoloboev ];
platforms = platforms.darwin;
};
}

4
pkgs/os-specific/linux/alsa-tools/default.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "alsa-tools-${version}"; name = "alsa-tools-${version}";
version = "1.1.6"; version = "1.1.7";
src = fetchurl { src = fetchurl {
url = "mirror://alsa/tools/${name}.tar.bz2"; url = "mirror://alsa/tools/${name}.tar.bz2";
sha256 = "09rjb6hw1mn9y1jfdfj5djncgc2cr5wfps83k56rf6k4zg14v76n"; sha256 = "1xjfghr9s0j6n91kgs95cc4r6qrjsgc4yj2w0nir3xpnm0l36950";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

4
pkgs/os-specific/linux/alsa-utils/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "alsa-utils-${version}"; name = "alsa-utils-${version}";
version = "1.1.6"; version = "1.1.7";
src = fetchurl { src = fetchurl {
url = "mirror://alsa/utils/${name}.tar.bz2"; url = "mirror://alsa/utils/${name}.tar.bz2";
sha256 = "0vnkyymgwj9rfdb11nvab30dnfrylmakdfildxl0y8mj836awp0m"; sha256 = "02jlw6a22j2rr7inggfgk2hzx3w0fjhvhs0dn1afpzdp9aspzchx";
}; };
patchPhase = '' patchPhase = ''

4
pkgs/os-specific/linux/open-isns/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "open-isns-${version}"; name = "open-isns-${version}";
version = "0.98"; version = "0.99";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gonzoleeman"; owner = "gonzoleeman";
repo = "open-isns"; repo = "open-isns";
rev = "v${version}"; rev = "v${version}";
sha256 = "055gjwz5hxaj5jk23bf7dy9wbxk9m8cfgl1msbzjc60gr2mmcbdg"; sha256 = "0m294aiv80rkihacw5094093pc0kd5bkbxqgs6i32jsglxy33hvf";
}; };
propagatedBuildInputs = [ openssl ]; propagatedBuildInputs = [ openssl ];

4
pkgs/servers/atlassian/jira.nix
View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "atlassian-jira-${version}"; name = "atlassian-jira-${version}";
version = "7.12.1"; version = "7.12.3";
src = fetchurl { src = fetchurl {
url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
sha256 = "0qk72dq53kk40m8rz7i3r45cgrka2s1682b8d3kzdmmhclnzbaym"; sha256 = "0gna0pr8g78pahm4ci14742w40f0nwfn4hpm3iwbsiw2w6vziahv";
}; };
phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];

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

@ -2,7 +2,7 @@
# Do not edit! # Do not edit!
{ {
version = "0.80.3"; version = "0.81.0";
components = { components = {
"abode" = ps: with ps; [ ]; "abode" = ps: with ps; [ ];
"ads" = ps: with ps; [ ]; "ads" = ps: with ps; [ ];
@ -16,6 +16,7 @@
"alarm_control_panel.concord232" = ps: with ps; [ ]; "alarm_control_panel.concord232" = ps: with ps; [ ];
"alarm_control_panel.demo" = ps: with ps; [ ]; "alarm_control_panel.demo" = ps: with ps; [ ];
"alarm_control_panel.egardia" = ps: with ps; [ ]; "alarm_control_panel.egardia" = ps: with ps; [ ];
"alarm_control_panel.elkm1" = ps: with ps; [ ];
"alarm_control_panel.envisalink" = ps: with ps; [ ]; "alarm_control_panel.envisalink" = ps: with ps; [ ];
"alarm_control_panel.homematicip_cloud" = ps: with ps; [ ]; "alarm_control_panel.homematicip_cloud" = ps: with ps; [ ];
"alarm_control_panel.ialarm" = ps: with ps; [ ]; "alarm_control_panel.ialarm" = ps: with ps; [ ];
@ -54,6 +55,7 @@
"auth.mfa_setup_flow" = ps: with ps; [ ]; "auth.mfa_setup_flow" = ps: with ps; [ ];
"automation" = ps: with ps; [ ]; "automation" = ps: with ps; [ ];
"automation.event" = ps: with ps; [ ]; "automation.event" = ps: with ps; [ ];
"automation.geo_location" = ps: with ps; [ ];
"automation.homeassistant" = ps: with ps; [ ]; "automation.homeassistant" = ps: with ps; [ ];
"automation.litejet" = ps: with ps; [ ]; "automation.litejet" = ps: with ps; [ ];
"automation.mqtt" = ps: with ps; [ paho-mqtt ]; "automation.mqtt" = ps: with ps; [ paho-mqtt ];
@ -118,6 +120,7 @@
"binary_sensor.netatmo" = ps: with ps; [ ]; "binary_sensor.netatmo" = ps: with ps; [ ];
"binary_sensor.nx584" = ps: with ps; [ ]; "binary_sensor.nx584" = ps: with ps; [ ];
"binary_sensor.octoprint" = ps: with ps; [ ]; "binary_sensor.octoprint" = ps: with ps; [ ];
"binary_sensor.opentherm_gw" = ps: with ps; [ ];
"binary_sensor.openuv" = ps: with ps; [ ]; "binary_sensor.openuv" = ps: with ps; [ ];
"binary_sensor.pilight" = ps: with ps; [ ]; "binary_sensor.pilight" = ps: with ps; [ ];
"binary_sensor.ping" = ps: with ps; [ ]; "binary_sensor.ping" = ps: with ps; [ ];
@ -128,6 +131,7 @@
"binary_sensor.random" = ps: with ps; [ ]; "binary_sensor.random" = ps: with ps; [ ];
"binary_sensor.raspihats" = ps: with ps; [ ]; "binary_sensor.raspihats" = ps: with ps; [ ];
"binary_sensor.rest" = ps: with ps; [ ]; "binary_sensor.rest" = ps: with ps; [ ];
"binary_sensor.rflink" = ps: with ps; [ ];
"binary_sensor.rfxtrx" = ps: with ps; [ ]; "binary_sensor.rfxtrx" = ps: with ps; [ ];
"binary_sensor.ring" = ps: with ps; [ ]; "binary_sensor.ring" = ps: with ps; [ ];
"binary_sensor.rpi_gpio" = ps: with ps; [ ]; "binary_sensor.rpi_gpio" = ps: with ps; [ ];
@ -209,8 +213,9 @@
"climate" = ps: with ps; [ ]; "climate" = ps: with ps; [ ];
"climate.daikin" = ps: with ps; [ ]; "climate.daikin" = ps: with ps; [ ];
"climate.demo" = ps: with ps; [ ]; "climate.demo" = ps: with ps; [ ];
"climate.dyson" = ps: with ps; [ ];
"climate.ecobee" = ps: with ps; [ ]; "climate.ecobee" = ps: with ps; [ ];
"climate.econet" = ps: with ps; [ ]; "climate.elkm1" = ps: with ps; [ ];
"climate.ephember" = ps: with ps; [ ]; "climate.ephember" = ps: with ps; [ ];
"climate.eq3btsmart" = ps: with ps; [ construct ]; "climate.eq3btsmart" = ps: with ps; [ construct ];
"climate.evohome" = ps: with ps; [ ]; "climate.evohome" = ps: with ps; [ ];
@ -226,6 +231,7 @@
"climate.knx" = ps: with ps; [ ]; "climate.knx" = ps: with ps; [ ];
"climate.maxcube" = ps: with ps; [ ]; "climate.maxcube" = ps: with ps; [ ];
"climate.melissa" = ps: with ps; [ ]; "climate.melissa" = ps: with ps; [ ];
"climate.mill" = ps: with ps; [ ];
"climate.modbus" = ps: with ps; [ ]; "climate.modbus" = ps: with ps; [ ];
"climate.mqtt" = ps: with ps; [ paho-mqtt ]; "climate.mqtt" = ps: with ps; [ paho-mqtt ];
"climate.mysensors" = ps: with ps; [ ]; "climate.mysensors" = ps: with ps; [ ];
@ -295,7 +301,6 @@
"cover.rflink" = ps: with ps; [ ]; "cover.rflink" = ps: with ps; [ ];
"cover.rfxtrx" = ps: with ps; [ ]; "cover.rfxtrx" = ps: with ps; [ ];
"cover.rpi_gpio" = ps: with ps; [ ]; "cover.rpi_gpio" = ps: with ps; [ ];
"cover.ryobi_gdo" = ps: with ps; [ ];
"cover.scsgate" = ps: with ps; [ ]; "cover.scsgate" = ps: with ps; [ ];
"cover.tahoma" = ps: with ps; [ ]; "cover.tahoma" = ps: with ps; [ ];
"cover.tellduslive" = ps: with ps; [ ]; "cover.tellduslive" = ps: with ps; [ ];
@ -351,6 +356,7 @@
"device_tracker.owntracks" = ps: with ps; [ libnacl paho-mqtt ]; "device_tracker.owntracks" = ps: with ps; [ libnacl paho-mqtt ];
"device_tracker.owntracks_http" = ps: with ps; [ aiohttp-cors libnacl ]; "device_tracker.owntracks_http" = ps: with ps; [ aiohttp-cors libnacl ];
"device_tracker.ping" = ps: with ps; [ ]; "device_tracker.ping" = ps: with ps; [ ];
"device_tracker.quantum_gateway" = ps: with ps; [ ];
"device_tracker.ritassist" = ps: with ps; [ ]; "device_tracker.ritassist" = ps: with ps; [ ];
"device_tracker.sky_hub" = ps: with ps; [ ]; "device_tracker.sky_hub" = ps: with ps; [ ];
"device_tracker.snmp" = ps: with ps; [ pysnmp ]; "device_tracker.snmp" = ps: with ps; [ pysnmp ];
@ -383,6 +389,7 @@
"edp_redy" = ps: with ps; [ ]; "edp_redy" = ps: with ps; [ ];
"egardia" = ps: with ps; [ ]; "egardia" = ps: with ps; [ ];
"eight_sleep" = ps: with ps; [ ]; "eight_sleep" = ps: with ps; [ ];
"elkm1" = ps: with ps; [ ];
"emoncms_history" = ps: with ps; [ ]; "emoncms_history" = ps: with ps; [ ];
"emulated_hue" = ps: with ps; [ aiohttp-cors ]; "emulated_hue" = ps: with ps; [ aiohttp-cors ];
"emulated_hue.hue_api" = ps: with ps; [ ]; "emulated_hue.hue_api" = ps: with ps; [ ];
@ -410,11 +417,12 @@
"foursquare" = ps: with ps; [ aiohttp-cors ]; "foursquare" = ps: with ps; [ aiohttp-cors ];
"freedns" = ps: with ps; [ ]; "freedns" = ps: with ps; [ ];
"fritzbox" = ps: with ps; [ ]; "fritzbox" = ps: with ps; [ ];
"frontend" = ps: with ps; [ aiohttp-cors ]; "frontend" = ps: with ps; [ aiohttp-cors ruamel_yaml ];
"gc100" = ps: with ps; [ ]; "gc100" = ps: with ps; [ ];
"geo_location" = ps: with ps; [ ]; "geo_location" = ps: with ps; [ ];
"geo_location.demo" = ps: with ps; [ ]; "geo_location.demo" = ps: with ps; [ ];
"geo_location.geo_json_events" = ps: with ps; [ ]; "geo_location.geo_json_events" = ps: with ps; [ ];
"geo_location.nsw_rural_fire_service_feed" = ps: with ps; [ ];
"goalfeed" = ps: with ps; [ ]; "goalfeed" = ps: with ps; [ ];
"google" = ps: with ps; [ google_api_python_client httplib2 oauth2client ]; "google" = ps: with ps; [ google_api_python_client httplib2 oauth2client ];
"google_assistant" = ps: with ps; [ aiohttp-cors ]; "google_assistant" = ps: with ps; [ aiohttp-cors ];
@ -506,6 +514,7 @@
"knx" = ps: with ps; [ ]; "knx" = ps: with ps; [ ];
"konnected" = ps: with ps; [ aiohttp-cors netdisco ]; "konnected" = ps: with ps; [ aiohttp-cors netdisco ];
"lametric" = ps: with ps; [ ]; "lametric" = ps: with ps; [ ];
"lifx" = ps: with ps; [ ];
"light" = ps: with ps; [ ]; "light" = ps: with ps; [ ];
"light.abode" = ps: with ps; [ ]; "light.abode" = ps: with ps; [ ];
"light.ads" = ps: with ps; [ ]; "light.ads" = ps: with ps; [ ];
@ -516,6 +525,7 @@
"light.decora" = ps: with ps; [ ]; "light.decora" = ps: with ps; [ ];
"light.decora_wifi" = ps: with ps; [ ]; "light.decora_wifi" = ps: with ps; [ ];
"light.demo" = ps: with ps; [ ]; "light.demo" = ps: with ps; [ ];
"light.elkm1" = ps: with ps; [ ];
"light.enocean" = ps: with ps; [ ]; "light.enocean" = ps: with ps; [ ];
"light.eufy" = ps: with ps; [ ]; "light.eufy" = ps: with ps; [ ];
"light.flux_led" = ps: with ps; [ ]; "light.flux_led" = ps: with ps; [ ];
@ -593,6 +603,7 @@
"lock.nello" = ps: with ps; [ ]; "lock.nello" = ps: with ps; [ ];
"lock.nuki" = ps: with ps; [ ]; "lock.nuki" = ps: with ps; [ ];
"lock.sesame" = ps: with ps; [ ]; "lock.sesame" = ps: with ps; [ ];
"lock.template" = ps: with ps; [ ];
"lock.tesla" = ps: with ps; [ ]; "lock.tesla" = ps: with ps; [ ];
"lock.vera" = ps: with ps; [ ]; "lock.vera" = ps: with ps; [ ];
"lock.verisure" = ps: with ps; [ ]; "lock.verisure" = ps: with ps; [ ];
@ -600,11 +611,11 @@
"lock.wink" = ps: with ps; [ ]; "lock.wink" = ps: with ps; [ ];
"lock.xiaomi_aqara" = ps: with ps; [ ]; "lock.xiaomi_aqara" = ps: with ps; [ ];
"lock.zwave" = ps: with ps; [ ]; "lock.zwave" = ps: with ps; [ ];
"logbook" = ps: with ps; [ aiohttp-cors sqlalchemy ]; "logbook" = ps: with ps; [ aiohttp-cors ruamel_yaml sqlalchemy ];
"logentries" = ps: with ps; [ ]; "logentries" = ps: with ps; [ ];
"logger" = ps: with ps; [ ]; "logger" = ps: with ps; [ ];
"logi_circle" = ps: with ps; [ ]; "logi_circle" = ps: with ps; [ ];
"lovelace" = ps: with ps; [ ]; "lovelace" = ps: with ps; [ ruamel_yaml ];
"lutron" = ps: with ps; [ ]; "lutron" = ps: with ps; [ ];
"lutron_caseta" = ps: with ps; [ ]; "lutron_caseta" = ps: with ps; [ ];
"mailbox" = ps: with ps; [ aiohttp-cors ]; "mailbox" = ps: with ps; [ aiohttp-cors ];
@ -644,6 +655,7 @@
"media_player.itunes" = ps: with ps; [ ]; "media_player.itunes" = ps: with ps; [ ];
"media_player.kodi" = ps: with ps; [ jsonrpc-async jsonrpc-websocket ]; "media_player.kodi" = ps: with ps; [ jsonrpc-async jsonrpc-websocket ];
"media_player.lg_netcast" = ps: with ps; [ ]; "media_player.lg_netcast" = ps: with ps; [ ];
"media_player.lg_soundbar" = ps: with ps; [ ];
"media_player.liveboxplaytv" = ps: with ps; [ ]; "media_player.liveboxplaytv" = ps: with ps; [ ];
"media_player.mediaroom" = ps: with ps; [ ]; "media_player.mediaroom" = ps: with ps; [ ];
"media_player.monoprice" = ps: with ps; [ ]; "media_player.monoprice" = ps: with ps; [ ];
@ -727,7 +739,8 @@
"notify.group" = ps: with ps; [ ]; "notify.group" = ps: with ps; [ ];
"notify.hangouts" = ps: with ps; [ ]; "notify.hangouts" = ps: with ps; [ ];
"notify.hipchat" = ps: with ps; [ ]; "notify.hipchat" = ps: with ps; [ ];
"notify.html5" = ps: with ps; [ aiohttp-cors ]; "notify.homematic" = ps: with ps; [ pyhomematic ];
"notify.html5" = ps: with ps; [ aiohttp-cors ruamel_yaml ];
"notify.instapush" = ps: with ps; [ ]; "notify.instapush" = ps: with ps; [ ];
"notify.ios" = ps: with ps; [ aiohttp-cors zeroconf ]; "notify.ios" = ps: with ps; [ aiohttp-cors zeroconf ];
"notify.joaoapps_join" = ps: with ps; [ ]; "notify.joaoapps_join" = ps: with ps; [ ];
@ -764,7 +777,7 @@
"notify.twilio_sms" = ps: with ps; [ aiohttp-cors twilio ]; "notify.twilio_sms" = ps: with ps; [ aiohttp-cors twilio ];
"notify.twitter" = ps: with ps; [ ]; "notify.twitter" = ps: with ps; [ ];
"notify.webostv" = ps: with ps; [ ]; "notify.webostv" = ps: with ps; [ ];
"notify.xmpp" = ps: with ps; [ pyasn1-modules pyasn1 sleekxmpp ]; "notify.xmpp" = ps: with ps; [ slixmpp ];
"notify.yessssms" = ps: with ps; [ ]; "notify.yessssms" = ps: with ps; [ ];
"nuheat" = ps: with ps; [ ]; "nuheat" = ps: with ps; [ ];
"nuimo_controller" = ps: with ps; [ ]; "nuimo_controller" = ps: with ps; [ ];
@ -772,11 +785,12 @@
"onboarding" = ps: with ps; [ aiohttp-cors ]; "onboarding" = ps: with ps; [ aiohttp-cors ];
"onboarding.const" = ps: with ps; [ ]; "onboarding.const" = ps: with ps; [ ];
"onboarding.views" = ps: with ps; [ ]; "onboarding.views" = ps: with ps; [ ];
"opentherm_gw" = ps: with ps; [ ];
"openuv" = ps: with ps; [ ]; "openuv" = ps: with ps; [ ];
"openuv.config_flow" = ps: with ps; [ ]; "openuv.config_flow" = ps: with ps; [ ];
"openuv.const" = ps: with ps; [ ]; "openuv.const" = ps: with ps; [ ];
"panel_custom" = ps: with ps; [ aiohttp-cors ]; "panel_custom" = ps: with ps; [ aiohttp-cors ruamel_yaml ];
"panel_iframe" = ps: with ps; [ aiohttp-cors ]; "panel_iframe" = ps: with ps; [ aiohttp-cors ruamel_yaml ];
"persistent_notification" = ps: with ps; [ ]; "persistent_notification" = ps: with ps; [ ];
"pilight" = ps: with ps; [ ]; "pilight" = ps: with ps; [ ];
"plant" = ps: with ps; [ ]; "plant" = ps: with ps; [ ];
@ -806,6 +820,7 @@
"rflink" = ps: with ps; [ ]; "rflink" = ps: with ps; [ ];
"rfxtrx" = ps: with ps; [ ]; "rfxtrx" = ps: with ps; [ ];
"ring" = ps: with ps; [ ]; "ring" = ps: with ps; [ ];
"route53" = ps: with ps; [ boto3 ];
"rpi_gpio" = ps: with ps; [ ]; "rpi_gpio" = ps: with ps; [ ];
"rpi_pfio" = ps: with ps; [ ]; "rpi_pfio" = ps: with ps; [ ];
"rss_feed_template" = ps: with ps; [ aiohttp-cors ]; "rss_feed_template" = ps: with ps; [ aiohttp-cors ];
@ -813,6 +828,7 @@
"satel_integra" = ps: with ps; [ ]; "satel_integra" = ps: with ps; [ ];
"scene" = ps: with ps; [ ]; "scene" = ps: with ps; [ ];
"scene.deconz" = ps: with ps; [ ]; "scene.deconz" = ps: with ps; [ ];
"scene.elkm1" = ps: with ps; [ ];
"scene.homeassistant" = ps: with ps; [ ]; "scene.homeassistant" = ps: with ps; [ ];
"scene.hunterdouglas_powerview" = ps: with ps; [ ]; "scene.hunterdouglas_powerview" = ps: with ps; [ ];
"scene.knx" = ps: with ps; [ ]; "scene.knx" = ps: with ps; [ ];
@ -889,6 +905,7 @@
"sensor.efergy" = ps: with ps; [ ]; "sensor.efergy" = ps: with ps; [ ];
"sensor.eight_sleep" = ps: with ps; [ ]; "sensor.eight_sleep" = ps: with ps; [ ];
"sensor.eliqonline" = ps: with ps; [ ]; "sensor.eliqonline" = ps: with ps; [ ];
"sensor.elkm1" = ps: with ps; [ ];
"sensor.emoncms" = ps: with ps; [ ]; "sensor.emoncms" = ps: with ps; [ ];
"sensor.enocean" = ps: with ps; [ ]; "sensor.enocean" = ps: with ps; [ ];
"sensor.enphase_envoy" = ps: with ps; [ ]; "sensor.enphase_envoy" = ps: with ps; [ ];
@ -992,6 +1009,7 @@
"sensor.openexchangerates" = ps: with ps; [ ]; "sensor.openexchangerates" = ps: with ps; [ ];
"sensor.openhardwaremonitor" = ps: with ps; [ ]; "sensor.openhardwaremonitor" = ps: with ps; [ ];
"sensor.opensky" = ps: with ps; [ ]; "sensor.opensky" = ps: with ps; [ ];
"sensor.opentherm_gw" = ps: with ps; [ ];
"sensor.openuv" = ps: with ps; [ ]; "sensor.openuv" = ps: with ps; [ ];
"sensor.openweathermap" = ps: with ps; [ pyowm ]; "sensor.openweathermap" = ps: with ps; [ pyowm ];
"sensor.otp" = ps: with ps; [ pyotp ]; "sensor.otp" = ps: with ps; [ pyotp ];
@ -1017,6 +1035,7 @@
"sensor.ring" = ps: with ps; [ ]; "sensor.ring" = ps: with ps; [ ];
"sensor.ripple" = ps: with ps; [ ]; "sensor.ripple" = ps: with ps; [ ];
"sensor.rmvtransport" = ps: with ps; [ ]; "sensor.rmvtransport" = ps: with ps; [ ];
"sensor.rtorrent" = ps: with ps; [ ];
"sensor.sabnzbd" = ps: with ps; [ ]; "sensor.sabnzbd" = ps: with ps; [ ];
"sensor.scrape" = ps: with ps; [ beautifulsoup4 ]; "sensor.scrape" = ps: with ps; [ beautifulsoup4 ];
"sensor.season" = ps: with ps; [ ephem ]; "sensor.season" = ps: with ps; [ ephem ];
@ -1062,6 +1081,7 @@
"sensor.temper" = ps: with ps; [ ]; "sensor.temper" = ps: with ps; [ ];
"sensor.template" = ps: with ps; [ ]; "sensor.template" = ps: with ps; [ ];
"sensor.tesla" = ps: with ps; [ ]; "sensor.tesla" = ps: with ps; [ ];
"sensor.thermoworks_smoke" = ps: with ps; [ ];
"sensor.thethingsnetwork" = ps: with ps; [ ]; "sensor.thethingsnetwork" = ps: with ps; [ ];
"sensor.thinkingcleaner" = ps: with ps; [ ]; "sensor.thinkingcleaner" = ps: with ps; [ ];
"sensor.tibber" = ps: with ps; [ ]; "sensor.tibber" = ps: with ps; [ ];
@ -1071,6 +1091,7 @@
"sensor.tradfri" = ps: with ps; [ ]; "sensor.tradfri" = ps: with ps; [ ];
"sensor.trafikverket_weatherstation" = ps: with ps; [ ]; "sensor.trafikverket_weatherstation" = ps: with ps; [ ];
"sensor.transmission" = ps: with ps; [ transmissionrpc ]; "sensor.transmission" = ps: with ps; [ transmissionrpc ];
"sensor.transport_nsw" = ps: with ps; [ ];
"sensor.travisci" = ps: with ps; [ ]; "sensor.travisci" = ps: with ps; [ ];
"sensor.twitch" = ps: with ps; [ ]; "sensor.twitch" = ps: with ps; [ ];
"sensor.uber" = ps: with ps; [ ]; "sensor.uber" = ps: with ps; [ ];
@ -1116,10 +1137,16 @@
"shell_command" = ps: with ps; [ ]; "shell_command" = ps: with ps; [ ];
"shiftr" = ps: with ps; [ paho-mqtt ]; "shiftr" = ps: with ps; [ paho-mqtt ];
"shopping_list" = ps: with ps; [ aiohttp-cors ]; "shopping_list" = ps: with ps; [ aiohttp-cors ];
"simplisafe" = ps: with ps; [ ];
"simplisafe.config_flow" = ps: with ps; [ ];
"simplisafe.const" = ps: with ps; [ ];
"sisyphus" = ps: with ps; [ ]; "sisyphus" = ps: with ps; [ ];
"skybell" = ps: with ps; [ ]; "skybell" = ps: with ps; [ ];
"sleepiq" = ps: with ps; [ ]; "sleepiq" = ps: with ps; [ ];
"smappee" = ps: with ps; [ ]; "smappee" = ps: with ps; [ ];
"smhi" = ps: with ps; [ ];
"smhi.config_flow" = ps: with ps; [ ];
"smhi.const" = ps: with ps; [ ];
"snips" = ps: with ps; [ paho-mqtt ]; "snips" = ps: with ps; [ paho-mqtt ];
"sonos" = ps: with ps; [ ]; "sonos" = ps: with ps; [ ];
"spaceapi" = ps: with ps; [ aiohttp-cors ]; "spaceapi" = ps: with ps; [ aiohttp-cors ];
@ -1150,6 +1177,7 @@
"switch.doorbird" = ps: with ps; [ ]; "switch.doorbird" = ps: with ps; [ ];
"switch.edimax" = ps: with ps; [ ]; "switch.edimax" = ps: with ps; [ ];
"switch.edp_redy" = ps: with ps; [ ]; "switch.edp_redy" = ps: with ps; [ ];
"switch.elkm1" = ps: with ps; [ ];
"switch.enocean" = ps: with ps; [ ]; "switch.enocean" = ps: with ps; [ ];
"switch.eufy" = ps: with ps; [ ]; "switch.eufy" = ps: with ps; [ ];
"switch.flux" = ps: with ps; [ ]; "switch.flux" = ps: with ps; [ ];
@ -1190,6 +1218,7 @@
"switch.raincloud" = ps: with ps; [ ]; "switch.raincloud" = ps: with ps; [ ];
"switch.rainmachine" = ps: with ps; [ ]; "switch.rainmachine" = ps: with ps; [ ];
"switch.raspihats" = ps: with ps; [ ]; "switch.raspihats" = ps: with ps; [ ];
"switch.recswitch" = ps: with ps; [ ];
"switch.rest" = ps: with ps; [ ]; "switch.rest" = ps: with ps; [ ];
"switch.rflink" = ps: with ps; [ ]; "switch.rflink" = ps: with ps; [ ];
"switch.rfxtrx" = ps: with ps; [ ]; "switch.rfxtrx" = ps: with ps; [ ];
@ -1215,6 +1244,7 @@
"switch.tradfri" = ps: with ps; [ ]; "switch.tradfri" = ps: with ps; [ ];
"switch.transmission" = ps: with ps; [ transmissionrpc ]; "switch.transmission" = ps: with ps; [ transmissionrpc ];
"switch.tuya" = ps: with ps; [ ]; "switch.tuya" = ps: with ps; [ ];
"switch.unifi" = ps: with ps; [ ];
"switch.upcloud" = ps: with ps; [ ]; "switch.upcloud" = ps: with ps; [ ];
"switch.velbus" = ps: with ps; [ ]; "switch.velbus" = ps: with ps; [ ];
"switch.vera" = ps: with ps; [ ]; "switch.vera" = ps: with ps; [ ];
@ -1262,6 +1292,10 @@
"tts.yandextts" = ps: with ps; [ ]; "tts.yandextts" = ps: with ps; [ ];
"tuya" = ps: with ps; [ ]; "tuya" = ps: with ps; [ ];
"twilio" = ps: with ps; [ aiohttp-cors twilio ]; "twilio" = ps: with ps; [ aiohttp-cors twilio ];
"unifi" = ps: with ps; [ ];
"unifi.const" = ps: with ps; [ ];
"unifi.controller" = ps: with ps; [ ];
"unifi.errors" = ps: with ps; [ ];
"upcloud" = ps: with ps; [ ]; "upcloud" = ps: with ps; [ ];
"updater" = ps: with ps; [ distro ]; "updater" = ps: with ps; [ distro ];
"upnp" = ps: with ps; [ aiohttp-cors ]; "upnp" = ps: with ps; [ aiohttp-cors ];
@ -1284,6 +1318,10 @@
"volvooncall" = ps: with ps; [ ]; "volvooncall" = ps: with ps; [ ];
"vultr" = ps: with ps; [ vultr ]; "vultr" = ps: with ps; [ vultr ];
"wake_on_lan" = ps: with ps; [ wakeonlan ]; "wake_on_lan" = ps: with ps; [ wakeonlan ];
"water_heater" = ps: with ps; [ ];
"water_heater.demo" = ps: with ps; [ ];
"water_heater.econet" = ps: with ps; [ ];
"water_heater.wink" = ps: with ps; [ ];
"waterfurnace" = ps: with ps; [ ]; "waterfurnace" = ps: with ps; [ ];
"watson_iot" = ps: with ps; [ ]; "watson_iot" = ps: with ps; [ ];
"weather" = ps: with ps; [ ]; "weather" = ps: with ps; [ ];
@ -1296,6 +1334,7 @@
"weather.met" = ps: with ps; [ ]; "weather.met" = ps: with ps; [ ];
"weather.metoffice" = ps: with ps; [ ]; "weather.metoffice" = ps: with ps; [ ];
"weather.openweathermap" = ps: with ps; [ pyowm ]; "weather.openweathermap" = ps: with ps; [ pyowm ];
"weather.smhi" = ps: with ps; [ ];
"weather.yweather" = ps: with ps; [ yahooweather ]; "weather.yweather" = ps: with ps; [ yahooweather ];
"weather.zamg" = ps: with ps; [ ]; "weather.zamg" = ps: with ps; [ ];
"webhook" = ps: with ps; [ aiohttp-cors ]; "webhook" = ps: with ps; [ aiohttp-cors ];
@ -1324,6 +1363,7 @@
"zone.zone" = ps: with ps; [ ]; "zone.zone" = ps: with ps; [ ];
"zoneminder" = ps: with ps; [ ]; "zoneminder" = ps: with ps; [ ];
"zwave" = ps: with ps; [ pydispatcher python_openzwave ]; "zwave" = ps: with ps; [ pydispatcher python_openzwave ];
"zwave.config_flow" = ps: with ps; [ ];
"zwave.const" = ps: with ps; [ ]; "zwave.const" = ps: with ps; [ ];
"zwave.discovery_schemas" = ps: with ps; [ ]; "zwave.discovery_schemas" = ps: with ps; [ ];
"zwave.node_entity" = ps: with ps; [ ]; "zwave.node_entity" = ps: with ps; [ ];

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

@ -22,6 +22,8 @@ let
"51afec6ffa50a9da4cdef188971a802beb1ca8e8edb40fa429e5e529db3475fa") "51afec6ffa50a9da4cdef188971a802beb1ca8e8edb40fa429e5e529db3475fa")
(mkOverride "astral" "1.6.1" (mkOverride "astral" "1.6.1"
"ab0c08f2467d35fcaeb7bad15274743d3ac1ad18b5391f64a0058a9cd192d37d") "ab0c08f2467d35fcaeb7bad15274743d3ac1ad18b5391f64a0058a9cd192d37d")
(mkOverride "async-timeout" "3.0.1"
"0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f")
(mkOverride "attrs" "18.2.0" (mkOverride "attrs" "18.2.0"
"10cbf6e27dbce8c30807caf056c8eb50917e0eaafe86347671b57254006c3e69") "10cbf6e27dbce8c30807caf056c8eb50917e0eaafe86347671b57254006c3e69")
(mkOverride "bcrypt" "3.1.4" (mkOverride "bcrypt" "3.1.4"
@ -77,7 +79,7 @@ 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 = "0.80.3"; hassVersion = "0.81.0";
in with py.pkgs; buildPythonApplication rec { in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant"; pname = "homeassistant";
@ -92,7 +94,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant"; owner = "home-assistant";
repo = "home-assistant"; repo = "home-assistant";
rev = version; rev = version;
sha256 = "0fjkw8kg0vsyrkcrx9jhqrh5nzxx5wphj6zglqgai2d635m8j2dg"; sha256 = "05cdx2pax7vx0v7arnciqrq38k2xyiv7iagxd3qs5m6gra72qlqw";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

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

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "home-assistant-frontend"; pname = "home-assistant-frontend";
version = "20181018.0"; version = "20181026.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "83f52421056acda8297f174a7c4e3c540109673c2f2c25720638d171c6bc2653"; sha256 = "fa877803ec7201a9b2129e96d6c19822cbcb28fa8ad5d422974bd3c872da1531";
}; };
propagatedBuildInputs = [ user-agents ]; propagatedBuildInputs = [ user-agents ];

4
pkgs/servers/http/lighttpd/default.nix
View File

@ -13,11 +13,11 @@ assert enableWebDAV -> sqlite != null;
assert enableWebDAV -> libuuid != null; assert enableWebDAV -> libuuid != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "lighttpd-1.4.50"; name = "lighttpd-1.4.51";
src = fetchurl { src = fetchurl {
url = "https://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz"; url = "https://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz";
sha256 = "1sr9avcnld22a5wl5s8vgrz8r86mybggm9z8zwabqz48v0986dr9"; sha256 = "10lw9vvivpvf4aw7ajayb2yyq4lp4dq3gq9llszjbw6icnrgvy9a";
}; };
postPatch = '' postPatch = ''

4
pkgs/servers/mail/rspamd/default.nix
View File

@ -6,13 +6,13 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "rspamd-${version}"; name = "rspamd-${version}";
version = "1.8.0"; version = "1.8.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vstakhov"; owner = "vstakhov";
repo = "rspamd"; repo = "rspamd";
rev = version; rev = version;
sha256 = "02q1id9kv5d6w1b1ifa2m6qrnbsja787dn0ywwi0yrsaqwk63wk7"; sha256 = "1cgnychv8yz7a6mjg3b12nzs4gl0xqg9agl7m6faihnh7gqx4xld";
}; };
nativeBuildInputs = [ cmake pkgconfig perl ]; nativeBuildInputs = [ cmake pkgconfig perl ];

4
pkgs/servers/nosql/neo4j/default.nix
View File

@ -4,11 +4,11 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "neo4j-${version}"; name = "neo4j-${version}";
version = "3.4.8"; version = "3.4.9";
src = fetchurl { src = fetchurl {
url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz"; url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz";
sha256 = "1mdxqfy5xzc6944lg87975i9bfpqqx28xl8h70m4wn79x0qgby2v"; sha256 = "0kg0dr42qi8cwg3i1hcgczd4psh97s54q5zd8z2wn1fqf4m2h597";
}; };
buildInputs = [ makeWrapper jre8 which gawk ]; buildInputs = [ makeWrapper jre8 which gawk ];

4
pkgs/servers/sql/mysql/5.7.x.nix
View File

@ -7,11 +7,11 @@
let let
self = stdenv.mkDerivation rec { self = stdenv.mkDerivation rec {
name = "mysql-${version}"; name = "mysql-${version}";
version = "5.7.23"; version = "5.7.24";
src = fetchurl { src = fetchurl {
url = "mirror://mysql/MySQL-5.7/${name}.tar.gz"; url = "mirror://mysql/MySQL-5.7/${name}.tar.gz";
sha256 = "0rbc3xsc11lq2dm0ip6gxa16c06hi74scb97x5cw7yhbabaz4c07"; sha256 = "11qz8cc4zyi7sxs66c5zlap6fd3vra1srwgzcxdzhz59qs90rgq5";
}; };
preConfigure = stdenv.lib.optional stdenv.isDarwin '' preConfigure = stdenv.lib.optional stdenv.isDarwin ''

4
pkgs/servers/web-apps/matomo/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "matomo-${version}"; name = "matomo-${version}";
version = "3.6.0"; version = "3.6.1";
src = fetchurl { src = fetchurl {
# TODO: As soon as the tarballs are renamed as well on future releases, this should be enabled again # TODO: As soon as the tarballs are renamed as well on future releases, this should be enabled again
# url = "https://builds.matomo.org/${name}.tar.gz"; # url = "https://builds.matomo.org/${name}.tar.gz";
url = "https://builds.matomo.org/piwik-${version}.tar.gz"; url = "https://builds.matomo.org/piwik-${version}.tar.gz";
sha256 = "1bkxa163s420w579ma7sbab1nm8c6ca6r6irn200j7p1r5zjklp8"; sha256 = "0hddj1gyyriwgsh1mghihck2i7rj6gvb1i0b2ripcdfjnxcs47hz";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

4
pkgs/tools/networking/urlwatch/default.nix
View File

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
name = "urlwatch-${version}"; name = "urlwatch-${version}";
version = "2.14"; version = "2.15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "thp"; owner = "thp";
repo = "urlwatch"; repo = "urlwatch";
rev = version; rev = version;
sha256 = "1m7qdh2lk5napncmfnk86dj4wqcahq8y24xnylxa4qlx2ivwkr6b"; sha256 = "1bkd0r5arzdvinpn1n23cw1gf7byxml95hl6qvvf6mnggb1ifcwg";
}; };
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [

4
pkgs/tools/security/trufflehog/default.nix
View File

@ -12,11 +12,11 @@ let
in in
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
pname = "truffleHog"; pname = "truffleHog";
version = "2.0.91"; version = "2.0.97";
src = pythonPackages.fetchPypi { src = pythonPackages.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0r4c9ihy6wjh5cwli7lb6cr2yfvxrh7r6cgznql1src5gzlnkymx"; sha256 = "034kpv1p4m90286slvc6d4mlrzaf0b5jbd4qaj87hj65wbpcpg8r";
}; };
# Relax overly restricted version constraint # Relax overly restricted version constraint

4
pkgs/tools/system/syslog-ng/default.nix
View File

@ -11,11 +11,11 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
version = "3.17.2"; version = "3.18.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz"; url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz";
sha256 = "02y593ar1c4503ww7mhn0p5ajfl3q6769c6m311m6srwl5y1yq3k"; sha256 = "1y1v16vvyirh0qv4wzczqp8d3llh6dl63lz3irwib1qhh7x56dyn";
}; };
nativeBuildInputs = [ pkgconfig which ]; nativeBuildInputs = [ pkgconfig which ];

4
pkgs/tools/text/miller/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "miller-${version}"; name = "miller-${version}";
version = "5.3.0"; version = "5.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "johnkerl"; owner = "johnkerl";
repo = "miller"; repo = "miller";
rev = "${version}"; rev = "${version}";
sha256 = "0abw2n6mi4wbgwihcv3y2xccqx4sj0gdgwvdrg2jkcgraa78sw8v"; sha256 = "0158by642frh9x6rrgqxwmk4766wb36kp0rrjg5swdbs9w3is3xg";
}; };
nativeBuildInputs = [ autoreconfHook flex libtool ]; nativeBuildInputs = [ autoreconfHook flex libtool ];

1
pkgs/top-level/aliases.nix
View File

@ -250,6 +250,7 @@ mapAliases ({
s6Networking = s6-networking; # added 2018-07-23 s6Networking = s6-networking; # added 2018-07-23
s6LinuxUtils = s6-linux-utils; # added 2018-07-23 s6LinuxUtils = s6-linux-utils; # added 2018-07-23
s6PortableUtils = s6-portable-utils; # added 2018-07-23 s6PortableUtils = s6-portable-utils; # added 2018-07-23
sagemath = sage; # added 2018-10-27
sam = deadpixi-sam; # added 2018-04-25 sam = deadpixi-sam; # added 2018-04-25
samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25 samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25
saneBackends = sane-backends; # added 2016-01-02 saneBackends = sane-backends; # added 2016-01-02

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

@ -732,6 +732,8 @@ with pkgs;
oracle-instantclient = callPackage ../development/libraries/oracle-instantclient { }; oracle-instantclient = callPackage ../development/libraries/oracle-instantclient { };
goku = callPackage ../os-specific/darwin/goku { };
kwakd = callPackage ../servers/kwakd { }; kwakd = callPackage ../servers/kwakd { };
kwm = callPackage ../os-specific/darwin/kwm { }; kwm = callPackage ../os-specific/darwin/kwm { };
@ -6935,6 +6937,8 @@ with pkgs;
go-repo-root = callPackage ../development/tools/go-repo-root { }; go-repo-root = callPackage ../development/tools/go-repo-root { };
go-junit-report = callPackage ../development/tools/go-junit-report { };
gox = callPackage ../development/tools/gox { }; gox = callPackage ../development/tools/gox { };
gprolog = callPackage ../development/compilers/gprolog { }; gprolog = callPackage ../development/compilers/gprolog { };
@ -12714,6 +12718,7 @@ with pkgs;
wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix { wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix {
inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel; inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel;
inherit (darwin.stubs) setfile rez derez; inherit (darwin.stubs) setfile rez derez;
inherit (darwin) cf-private;
}; };
wxSVG = callPackage ../development/libraries/wxSVG { wxSVG = callPackage ../development/libraries/wxSVG {

4
pkgs/top-level/darwin-packages.nix
View File

@ -31,7 +31,9 @@ in
libcxxabi = pkgs.libcxxabi; libcxxabi = pkgs.libcxxabi;
}; };
cf-private = callPackage ../os-specific/darwin/cf-private { inherit (darwin) CF apple_sdk; }; cf-private = callPackage ../os-specific/darwin/cf-private {
inherit (darwin) CF apple_sdk osx_private_sdk;
};
DarwinTools = callPackage ../os-specific/darwin/DarwinTools { }; DarwinTools = callPackage ../os-specific/darwin/DarwinTools { };