Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2c95644e6929
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 603a369b8944
Choose a head ref
  • 16 commits
  • 13 files changed
  • 10 contributors

Commits on Mar 28, 2018

  1. paraview: include numpy in python environment 

    The Python filter functionality in Paraview requires numpy, which is currently not included.
Changes are based on the discussion in issue #37118.
    @SFrijters
    SFrijters committed Mar 28, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    rnhmjoj Michele Guerini Rocco
    GPG key ID: BFBAF4C975F76450
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    dff672e View commit details

Commits on Apr 10, 2018

  1. openclonk: 7.0 -> 8.1

    @lheckemann
    lheckemann committed Apr 10, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ea1a167 View commit details

Commits on Apr 14, 2018

  1. Merge pull request #37908 from lheckemann/openclonk-8.1 

    Openclonk 8.1
    @Mic92
    Mic92 authored Apr 14, 2018
    Copy the full SHA
    997ead8 View commit details

  2. Merge pull request #37595 from SFrijters/paraview-numpy 

    paraview: include numpy in python environment
    @dotlambda
    dotlambda authored Apr 14, 2018
    Copy the full SHA
    054f4f9 View commit details

  3. testssl: 2.9.5-4 -> 2.9.5-5 (#38936) 

    Changelog:
https://github.com/drwetter/testssl.sh/releases/tag/v2.9.5-5

Also improved expression.
    @etu @dotlambda
    etu authored and dotlambda committed Apr 14, 2018
    Copy the full SHA
    8b19b14 View commit details

  4. cbatticon: 1.6.7 -> 1.6.8 (#38747) 

    Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/cbatticon/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/b9f5y9awpbx1m193hrb57bwv70xg08cb-cbatticon-1.6.8/bin/cbatticon -h’ got 0 exit code
- ran ‘/nix/store/b9f5y9awpbx1m193hrb57bwv70xg08cb-cbatticon-1.6.8/bin/cbatticon --help’ got 0 exit code
- ran ‘/nix/store/b9f5y9awpbx1m193hrb57bwv70xg08cb-cbatticon-1.6.8/bin/cbatticon -v’ and found version 1.6.8
- ran ‘/nix/store/b9f5y9awpbx1m193hrb57bwv70xg08cb-cbatticon-1.6.8/bin/cbatticon --version’ and found version 1.6.8
- found 1.6.8 with grep in /nix/store/b9f5y9awpbx1m193hrb57bwv70xg08cb-cbatticon-1.6.8
- directory tree listing: https://gist.github.com/248717637ae5df50bb8a3da4134c627b
    @r-ryantm @dotlambda
    r-ryantm authored and dotlambda committed Apr 14, 2018
    Copy the full SHA
    277e123 View commit details

  5. libqrencode: 3.4.4 -> 4.0.0 (#38711) 

    Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libqrencode/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/qb2z3p3zcqmn0qskcck42z4ffv3107p5-libqrencode-4.0.0/bin/qrencode -h’ got 0 exit code
- ran ‘/nix/store/qb2z3p3zcqmn0qskcck42z4ffv3107p5-libqrencode-4.0.0/bin/qrencode --help’ got 0 exit code
- found 4.0.0 with grep in /nix/store/qb2z3p3zcqmn0qskcck42z4ffv3107p5-libqrencode-4.0.0
- directory tree listing: https://gist.github.com/2503d88770c4325ed73850dbd72eb7bf
    @r-ryantm @dotlambda
    r-ryantm authored and dotlambda committed Apr 14, 2018
    Copy the full SHA
    d8f8e3c View commit details

  6. asunder: 2.9.2 -> 2.9.3 (#38750) 

    Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/asunder/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.9.3 with grep in /nix/store/maiwh6l7wa8gyjhx1zlg8l8xwrczszr7-asunder-2.9.3
- directory tree listing: https://gist.github.com/5cfcd566e15079a73ab786533722d002
    @r-ryantm @dotlambda
    r-ryantm authored and dotlambda committed Apr 14, 2018
    Copy the full SHA
    3c574a4 View commit details

  7. oh-my-zsh: 2017-01-22 -> 2017-04-06

    @NeQuissimus
    NeQuissimus committed Apr 14, 2018
    Copy the full SHA
    cdf6859 View commit details

  8. home-assistant: 0.66.1 -> 0.67.0 (#38931)

    @dotlambda
    dotlambda authored Apr 14, 2018
    Copy the full SHA
    a2cd43e View commit details

  9. i3lock-pixeled: 1.1.0 -> 1.2.0 

    Simple feature release with some improvements.
See https://github.com/Ma27/i3lock-pixeled/releases/tag/1.2.0
    @Ma27
    Ma27 committed Apr 14, 2018
    Copy the full SHA
    4314d14 View commit details

  10. guake: 3.1.0 → 3.2.0

    @jtojnar
    jtojnar committed Apr 14, 2018
    Copy the full SHA
    1f9469f View commit details

  11. shotwell: 0.28.1 → 0.28.2

    @jtojnar
    jtojnar committed Apr 14, 2018
    Copy the full SHA
    b5a19ba View commit details

  12. Merge pull request #38951 from Ma27/update-i3lock-pixeled 

    i3lock-pixeled: 1.1.0 -> 1.2.0
    @Mic92
    Mic92 authored Apr 14, 2018
    Copy the full SHA
    dfd4704 View commit details

Commits on Apr 15, 2018

  1. buildSetupcfg: Include unzip for zip sources.

    @shlevy
    shlevy committed Apr 15, 2018
    Copy the full SHA
    0d3eb70 View commit details

  2. Revert "buildSetupcfg: Include unzip for zip sources." 

    Misunderstood the error I was seeing.

This reverts commit 0d3eb70.
    @shlevy
    shlevy committed Apr 15, 2018
    Copy the full SHA
    603a369 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/audio/asunder/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,11 +12,11 @@
with stdenv.lib;

stdenv.mkDerivation rec {
version = "2.9.2";
version = "2.9.3";
name = "asunder-${version}";
src = fetchurl {
url = "http://littlesvr.ca/asunder/releases/${name}.tar.bz2";
sha256 = "0vjbxrrjih4c673sc39wj5whp81xp9kmnwqxwzfnmhkky970rg5r";
sha256 = "1630i1df06y840v3fgdf75jxw1s8kwbfn5bhi0686viah0scccw5";
};

nativeBuildInputs = [ pkgconfig ];
24 changes: 18 additions & 6 deletions pkgs/applications/graphics/paraview/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
stdenv, fetchFromGitHub, cmake
stdenv, fetchFromGitHub, cmake, makeWrapper
,qtbase, qttools, python, libGLU_combined
,libXt, qtx11extras, qtxmlpatterns
}:
@@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};

cmakeFlags = [
"-DPARAVIEW_ENABLE_PYTHON=ON"
"-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON"
"-DPARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION=OFF"
];
cmakeFlags = [
"-DPARAVIEW_ENABLE_PYTHON=ON"
"-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON"
"-DPARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION=OFF"
];

# During build, binaries are called that rely on freshly built
# libraries. These reside in build/lib, and are not found by
@@ -35,10 +35,12 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [
cmake
makeWrapper
];

buildInputs = [
python
python.pkgs.numpy
libGLU_combined
libXt
qtbase
@@ -47,6 +49,16 @@ stdenv.mkDerivation rec {
qtxmlpatterns
];

# Paraview links into the Python library, resolving symbolic links on the way,
# so we need to put the correct sitePackages (with numpy) back on the path
postInstall = ''
wrapProgram $out/bin/paraview \
--set PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}"
wrapProgram $out/bin/pvbatch \
--set PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}"
wrapProgram $out/bin/pvpython \
--set PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}"
'';

meta = {
homepage = http://www.paraview.org/;
4 changes: 2 additions & 2 deletions pkgs/applications/graphics/shotwell/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,13 +7,13 @@

let
pname = "shotwell";
version = "0.28.1";
version = "0.28.2";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "1ywikm5kdsr7q8hklh146x28rzvqkqfjs8kdpw7zcc15ri0dkzya";
sha256 = "0pa7lb33i4hdnz7hr7x938d48ilrnj47jzb99la79rmm08yyin8n";
};

nativeBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/applications/misc/cbatticon/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {

name = "cbatticon-${version}";
version = "1.6.7";
version = "1.6.8";

src = fetchFromGitHub {
owner = "valr";
repo = "cbatticon";
rev = version;
sha256 = "0rm1rpq81cxjwd4f11c3ivg5hwsd08qm47vdn16yr1cmm2cw4r2d";
sha256 = "16g26vin1693dbdr9qsnw36fdchx394lp79gvp7gcbw0w1ny9av6";
};

makeFlags = "PREFIX=$(out)";
14 changes: 3 additions & 11 deletions pkgs/applications/misc/guake/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, fetchpatch, python3, gettext, gobjectIntrospection, wrapGAppsHook, glibcLocales
{ stdenv, fetchFromGitHub, python3, gettext, gobjectIntrospection, wrapGAppsHook, glibcLocales
, gtk3, keybinder3, libnotify, libutempter, vte }:

let
version = "3.1.0";
version = "3.2.0";
in python3.pkgs.buildPythonApplication rec {
name = "guake-${version}";
format = "other";
@@ -11,17 +11,9 @@ in python3.pkgs.buildPythonApplication rec {
owner = "Guake";
repo = "guake";
rev = version;
sha256 = "0wyis7vxfhwrpq5r72c58k7hqzbk0f5ilm1zffcmbryvy11abgmx";
sha256 = "1qghapg9sslj9fdrl2mnbi10lgqgqa36gdag74wn7as9wak4qc3d";
};

patches = [
# https://github.com/Guake/guake/issues/1264
(fetchpatch {
url = https://github.com/Guake/guake/commit/f289aa381bc5fffe83b1ba385c606a2e5cdc94a8.patch;
sha256 = "038niw44q14fs34nha1lz9vmxhf0l766ni8nsdxpid4crra2wjd3";
})
];

nativeBuildInputs = [ gettext gobjectIntrospection wrapGAppsHook python3.pkgs.pip glibcLocales ];

buildInputs = [ gtk3 keybinder3 libnotify python3 vte ];
35 changes: 22 additions & 13 deletions pkgs/applications/networking/testssl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{ stdenv, fetchFromGitHub, pkgs }:
{ stdenv, fetchFromGitHub, makeWrapper, lib
, dnsutils, coreutils, openssl, nettools, utillinux, procps }:

let
version = "2.9.5-4";
pwdBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ coreutils ])}/pwd";
opensslBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ openssl ])}/openssl";
version = "2.9.5-5";

in stdenv.mkDerivation rec {
name = "testssl.sh-${version}";
@@ -12,22 +11,32 @@ in stdenv.mkDerivation rec {
owner = "drwetter";
repo = "testssl.sh";
rev = "v${version}";
sha256 = "0pfp7r4jhvkh06vawqlvq7vp4imwp6dpq6jx8m0k3j85ywwp45pd";
sha256 = "0zgj9vhd8fv3a1cn8dxqmjd8qmgryc867gq7zbvbr41lkqc06a1r";
};

patches = [ ./testssl.patch ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [
coreutils # for pwd and printf
dnsutils # for dig
nettools # for hostname
openssl # for openssl
procps # for ps
utillinux # for hexdump
];

postPatch = ''
substituteInPlace testssl.sh \
--replace /bin/pwd ${pwdBinPath} \
--replace TESTSSL_INSTALL_DIR:-\"\" TESTSSL_INSTALL_DIR:-\"$out\" \
--replace @@openssl-path@@ ${opensslBinPath}
--replace /bin/pwd pwd \
--replace TESTSSL_INSTALL_DIR:-\"\" TESTSSL_INSTALL_DIR:-\"$out\"
'';

installPhase = ''
mkdir -p $out/bin $out/etc
cp -r etc/ $out/
cp testssl.sh $out/bin/testssl.sh
install -Dt $out/bin testssl.sh
wrapProgram $out/bin/testssl.sh \
--prefix PATH ':' ${lib.makeBinPath buildInputs}
cp -r etc $out
'';

meta = with stdenv.lib; {
@@ -38,6 +47,6 @@ in stdenv.mkDerivation rec {
'';
homepage = https://testssl.sh/;
license = licenses.gpl2;
maintainers = [ maintainers.etu ];
maintainers = with maintainers; [ etu ];
};
}
10 changes: 0 additions & 10 deletions pkgs/applications/networking/testssl/testssl.patch
View file

This file was deleted.

4 changes: 2 additions & 2 deletions pkgs/development/libraries/libqrencode/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,12 +3,12 @@

stdenv.mkDerivation rec {
name = "libqrencode-${version}";
version = "3.4.4";
version = "4.0.0";

src = fetchurl {
url = "https://fukuchi.org/works/qrencode/qrencode-${version}.tar.gz";
sha1 = "644054a76c8b593acb66a8c8b7dcf1b987c3d0b2";
sha256 = "0wiagx7i8p9zal53smf5abrnh9lr31mv0p36wg017401jrmf5577";
sha256 = "10da4q5pym7pzxcv21w2kc2rxmq7sp1rg58zdklwfr0jjci1nqjv";
};

nativeBuildInputs = [ pkgconfig ];
32 changes: 19 additions & 13 deletions pkgs/games/openclonk/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake, gnome3, pcre, freetype, glew, gtk3, libjpeg, libpng,
SDL, SDL_mixer, libupnp, xorg, pkgconfig, gtest, tinyxml, gmock, readline,
libxkbcommon, epoxy, at-spi2-core, dbus, libxml2,
enableSoundtrack ? false # Enable the "Open Clonk Soundtrack - Explorers Journey" by David Oerther
{ stdenv, fetchurl, cmake, pkgconfig
, SDL2, libvorbis, libogg, libjpeg, libpng, freetype, glew, tinyxml, openal
, freealut, readline, gcc-unwrapped
, enableSoundtrack ? false # Enable the "Open Clonk Soundtrack - Explorers Journey" by David Oerther
}:

let
@@ -10,32 +10,38 @@ let
sha256 = "1ckj0dlpp5zsnkbb5qxxfxpkiq76jj2fgj91fyf3ll7n0gbwcgw5";
};
in stdenv.mkDerivation rec {
version = "7.0";
version = "8.1";
name = "openclonk-${version}";

src = fetchurl {
url = "http://www.openclonk.org/builds/release/7.0/openclonk-${version}-src.tar.bz2";
sha256 = "0ch71dqaaalg744pc1gvg6sj2yp2kgvy2m4yh6l7ljkpf8fj66mw";
url = "http://www.openclonk.org/builds/release/8.1/openclonk-${version}-src.tar.bz2";
sha256 = "0imkqjp8lww5p0cnqf4k4mb2v682mnsas63qmiz17rspakr7fxik";
};

postInstall = ''
mv -v $out/games/openclonk $out/bin/
'' + stdenv.lib.optionalString enableSoundtrack ''
cp -v ${soundtrack_src} $out/share/games/openclonk/Music.ocg
ln -sv ${soundtrack_src} $out/share/games/openclonk/Music.ocg
'';

enableParallelBuilding = true;

nativeBuildInputs = [ cmake pkgconfig ];

buildInputs = [
cmake gnome3.gtksourceview pcre freetype glew gtk3 libjpeg libpng SDL
SDL_mixer libupnp tinyxml xorg.libpthreadstubs libxkbcommon xorg.libXdmcp
pkgconfig gtest gmock readline epoxy at-spi2-core dbus libxml2
SDL2 libvorbis libogg libjpeg libpng freetype glew tinyxml openal freealut
readline
];

cmakeFlags = [ "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib" ];

cmakeBuildType = "RelWithDebInfo";

meta = with stdenv.lib; {
description = "Free multiplayer action game in which you control clonks, small but witty and nimble humanoid beings";
homepage = http://openclonk.org;
homepage = https://www.openclonk.org;
license = if enableSoundtrack then licenses.unfreeRedistributable else licenses.isc;
platforms = platforms.all;
maintainers = with maintainers; [ lheckemann ];
platforms = [ "x86_64-linux" "i686-linux" ];
};
}
4 changes: 2 additions & 2 deletions pkgs/misc/screensavers/i3lock-pixeled/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
name = "i3lock-pixeled-${version}";
version = "1.1.0";
version = "1.2.0";

src = fetchurl {
url = "https://github.com/Ma27/i3lock-pixeled/archive/${version}.tar.gz";
sha256 = "046qbx4qvcc66h53h4mm9pyjj9gjc6dzy38a0f0jc5a84xbivh7k";
sha256 = "0vlynm833fk1mmdnkcgh4hwqmfypn22zskhysm110k39zvikif0h";
};

propagatedBuildInputs = with pkgs; [
10 changes: 8 additions & 2 deletions pkgs/servers/home-assistant/component-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
# Do not edit!

{
version = "0.66.1";
version = "0.67.0";
components = {
"abode" = ps: with ps; [ ];
"ads" = ps: with ps; [ ];
@@ -59,6 +59,7 @@
"coinbase" = ps: with ps; [ ];
"comfoconnect" = ps: with ps; [ ];
"config.config_entries" = ps: with ps; [ ];
"cover.gogogate2" = ps: with ps; [ ];
"cover.myq" = ps: with ps; [ ];
"daikin" = ps: with ps; [ ];
"datadog" = ps: with ps; [ datadog ];
@@ -71,6 +72,7 @@
"device_tracker.bluetooth_tracker" = ps: with ps; [ ];
"device_tracker.cisco_ios" = ps: with ps; [ pexpect ];
"device_tracker.fritz" = ps: with ps; [ fritzconnection ];
"device_tracker.google_maps" = ps: with ps; [ ];
"device_tracker.icloud" = ps: with ps; [ ];
"device_tracker.linksys_ap" = ps: with ps; [ beautifulsoup4 ];
"device_tracker.mikrotik" = ps: with ps; [ ];
@@ -84,6 +86,7 @@
"device_tracker.unifi" = ps: with ps; [ pyunifi ];
"device_tracker.unifi_direct" = ps: with ps; [ pexpect ];
"device_tracker.upc_connect" = ps: with ps; [ defusedxml ];
"device_tracker.xiaomi_miio" = ps: with ps; [ ];
"digital_ocean" = ps: with ps; [ digital-ocean ];
"discovery" = ps: with ps; [ netdisco ];
"dominos" = ps: with ps; [ ];
@@ -99,6 +102,7 @@
"fan.xiaomi_miio" = ps: with ps; [ construct ];
"feedreader" = ps: with ps; [ feedparser ];
"ffmpeg" = ps: with ps; [ ha-ffmpeg ];
"folder_watcher" = ps: with ps; [ watchdog ];
"frontend" = ps: with ps; [ ];
"gc100" = ps: with ps; [ ];
"goalfeed" = ps: with ps; [ ];
@@ -139,6 +143,7 @@
"light.lifx_legacy" = ps: with ps; [ ];
"light.limitlessled" = ps: with ps; [ ];
"light.mystrom" = ps: with ps; [ ];
"light.nanoleaf_aurora" = ps: with ps; [ ];
"light.osramlightify" = ps: with ps; [ ];
"light.piglow" = ps: with ps; [ ];
"light.rpi_gpio_pwm" = ps: with ps; [ ];
@@ -205,7 +210,6 @@
"media_player.yamaha_musiccast" = ps: with ps; [ ];
"media_player.ziggo_mediabox_xl" = ps: with ps; [ ];
"melissa" = ps: with ps; [ ];
"mercedesme" = ps: with ps; [ ];
"mochad" = ps: with ps; [ ];
"modbus" = ps: with ps; [ ];
"mqtt" = ps: with ps; [ paho-mqtt ];
@@ -230,6 +234,7 @@
"notify.kodi" = ps: with ps; [ jsonrpc-async ];
"notify.lametric" = ps: with ps; [ ];
"notify.mailgun" = ps: with ps; [ ];
"notify.mastodon" = ps: with ps; [ ];
"notify.matrix" = ps: with ps; [ matrix-client ];
"notify.message_bird" = ps: with ps; [ ];
"notify.pushbullet" = ps: with ps; [ pushbullet ];
@@ -375,6 +380,7 @@
"sensor.ups" = ps: with ps; [ ];
"sensor.vasttrafik" = ps: with ps; [ ];
"sensor.waqi" = ps: with ps; [ ];
"sensor.waze_travel_time" = ps: with ps; [ ];
"sensor.whois" = ps: with ps; [ ];
"sensor.xbox_live" = ps: with ps; [ ];
"sensor.xiaomi_miio" = ps: with ps; [ construct ];
8 changes: 4 additions & 4 deletions pkgs/servers/home-assistant/default.nix
View file
Original file line number Diff line number Diff line change
@@ -8,10 +8,10 @@ let
py = python3.override {
packageOverrides = self: super: {
aiohttp = super.aiohttp.overridePythonAttrs (oldAttrs: rec {
version = "3.0.9";
version = "3.1.1";
src = oldAttrs.src.override {
inherit version;
sha256 = "281a9fa56b5ce587a2147ec285d18a224942f7e020581afa6cc44d7caecf937b";
sha256 = "dc5cab081d4b334d0440b019edf24fe1cb138b8114e0e22d2b0661284bc1775f";
};
});
pytest = super.pytest.overridePythonAttrs (oldAttrs: rec {
@@ -58,7 +58,7 @@ let
extraBuildInputs = extraPackages py.pkgs;

# Don't forget to run parse-requirements.py after updating
hassVersion = "0.66.1";
hassVersion = "0.67.0";

in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@@ -73,7 +73,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "home-assistant";
rev = version;
sha256 = "16yz5mfzpfms22f8linw1k3wjp3jpwj270vy2rc893x9bzsppfl0";
sha256 = "00y7sm6nsyxxl98izxxmg2nwi76kxb7p47hv07y04fs45lnvr61s";
};

propagatedBuildInputs = [
6 changes: 3 additions & 3 deletions pkgs/shells/oh-my-zsh/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@
{ stdenv, fetchgit }:

stdenv.mkDerivation rec {
version = "2018-01-22";
version = "2018-04-06";
name = "oh-my-zsh-${version}";

src = fetchgit {
url = "https://github.com/robbyrussell/oh-my-zsh";
rev = "37c2d0ddd751e15d0c87a51e2d9f9849093571dc";
sha256 = "0x2r7205ps5v5bl1f9vdnry9gxflypaahz49cnhq5f5klb49bakn";
rev = "62b8a70a7c5d0c939d8dabfef48796a092d1a55f";
sha256 = "02na47pa2ly17yvwa2nhzyrp8iarawyirhfw3779sh0w78vgw1gs";
};

pathsToLink = [ "/share/oh-my-zsh" ];