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: 7357961cf4cc
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: c3796a7d1b64
Choose a head ref
  • 4 commits
  • 5 files changed
  • 4 contributors

Commits on Sep 5, 2018

  1. spotify: 1.0.88.353.g15c26ea1-14 -> 1.0.83.316.ge96b6e67-5 

    The recent update is broken. Playing a song causes spotify to segfault.
This is probably
https://community.spotify.com/t5/Desktop-Linux/Segfault-with-the-new-update/td-p/4554830#,
which was recognized by upstream and will hopefully be fixed soon.

(cherry picked from commit d89b1f0)
    @timokau
    timokau committed Sep 5, 2018
    Copy the full SHA
    79b736e View commit details

  2. stdenv, neovim: Use lib.warn for deprecation warnings

    @Ericson2314
    Ericson2314 committed Sep 5, 2018
    Copy the full SHA
    51907d2 View commit details

  3. Merge pull request #46105 from obsidiansystems/trace-to-warn 

    stdenv, neovim: Use `lib.warn` for deprecation warnings for 18.09
    John Ericson authored Sep 5, 2018
    Copy the full SHA
    d3cc8c6 View commit details

  4. pythonPackages.tflearn: 0.2.1 -> 0.3.2 (#46102) 

    (cherry picked from commit a9a380b)
    @jethrokuan @Mic92
    jethrokuan authored and Mic92 committed Sep 5, 2018
    Copy the full SHA
    c3796a7 View commit details
8 changes: 4 additions & 4 deletions pkgs/applications/audio/spotify/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,14 +5,14 @@
let
# TO UPDATE: just execute the ./update.sh script (won't do anything if there is no update)
# "rev" decides what is actually being downloaded
version = "1.0.88.353.g15c26ea1-14";
version = "1.0.83.316.ge96b6e67-5";
# To get the latest stable revision:
# curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
# To get general information:
# curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
# More exapmles of api usage:
# More examples of api usage:
# https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
rev = "19";
rev = "17";


deps = [
@@ -65,7 +65,7 @@ stdenv.mkDerivation {
# https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334
src = fetchurl {
url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";
sha512 = "3a068cbe3c1fca84ae67e28830216f993aa459947517956897c3b3f63063005c9db646960e85185b149747ffc302060c208a7f9968ea69d50a3496067089f3db";
sha512 = "19bbr4142shsl4qrikf48vq7kyrd4k4jbsada13qxicxps46a9bx51vjm2hkijqv739c1gdkgzwx7llyk95z26lhrz53shm2n5ij8xi";
};

buildInputs = [ squashfsTools makeWrapper ];
2 changes: 1 addition & 1 deletion pkgs/applications/editors/neovim/wrapper.nix
View file
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ let

/* for compatibility with passing extraPythonPackages as a list; added 2018-07-11 */
compatFun = funOrList: (if builtins.isList funOrList then
(_: builtins.trace "passing a list as extraPythonPackages to the neovim wrapper is deprecated, pass a function as to python.withPackages instead" funOrList)
(_: lib.warn "passing a list as extraPythonPackages to the neovim wrapper is deprecated, pass a function as to python.withPackages instead" funOrList)
else funOrList);
extraPythonPackagesFun = compatFun extraPythonPackages;
extraPython3PackagesFun = compatFun extraPython3Packages;
24 changes: 24 additions & 0 deletions pkgs/development/python-modules/tflearn/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{ lib, fetchPypi, buildPythonPackage, fetchurl, pytest, scipy, h5py
, pillow, tensorflow }:

buildPythonPackage rec {
pname = "tflearn";
version = "0.3.2";

src = fetchPypi {
inherit pname version;
sha256 = "034lvbslcivyj64r4w6xmr90ckmyxmrnkka9kal50x4175h02n1z";
};

buildInputs = [ pytest ];

propagatedBuildInputs = [ scipy h5py pillow tensorflow ];

doCheck = false;

meta = with lib; {
description = "Deep learning library featuring a higher-level API for TensorFlow";
homepage = "https://github.com/tflearn/tflearn";
license = licenses.mit;
};
}
2 changes: 1 addition & 1 deletion pkgs/stdenv/generic/default.nix
View file
Original file line number Diff line number Diff line change
@@ -123,7 +123,7 @@ let
inherit (hostPlatform)
isDarwin isLinux isSunOS isCygwin isFreeBSD isOpenBSD
isi686 isx86_64 is64bit isAarch32 isAarch64 isMips isBigEndian;
isArm = builtins.trace
isArm = lib.warn
"`stdenv.isArm` is deprecated after 18.03. Please use `stdenv.isAarch32` instead"
hostPlatform.isAarch32;

17 changes: 1 addition & 16 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -16809,22 +16809,7 @@ EOF
cudaSupport = true;
};

tflearn = buildPythonPackage rec {
name = "tflearn-0.2.1";

meta = {
description = "Deep learning library featuring a higher-level API for TensorFlow";
homepage = "https://github.com/tflearn/tflearn";
license = licenses.mit;
};

propagatedBuildInputs = with self; [ scipy h5py pillow tensorflow ];

src = pkgs.fetchurl {
url = "mirror://pypi/t/tflearn/${name}.tar.gz";
sha256 = "1n884c4j35409id2bncyj5fvmmfpdqj3pk6wrv0s1znnvs0lkii0";
};
};
tflearn = callPackage ../development/python-modules/tflearn { };

simpleai = buildPythonPackage rec {
version = "0.7.11";