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

Merge commit '9361b7eb85045c7e7dd20d2ddd716a9d10bf4bd4' into ericson2314-cross-base

Browse Source
This commit is contained in:
John Ericson
2018-01-03 17:20:40 -05:00
parent 3fb5fd0060 9361b7eb85
commit 0e23478a7e
3 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/misc/toot/default.nix
View File

@@ -1,19 +1,19 @@
{ stdenv, fetchFromGitHub, pythonPackages }:
{ stdenv, fetchFromGitHub, python3Packages }:
pythonPackages.buildPythonApplication rec {
version = "0.15.0";
python3Packages.buildPythonApplication rec {
version = "0.16.2";
name = "toot-${version}";
src = fetchFromGitHub {
owner = "ihabunek";
repo = "toot";
rev = "${version}";
sha256 = "08k913gw0ip2q686z9k63bcn1n5s4w6b7jj6jmmamm427xmibkph";
sha256 = "19n6rmm44y24zvkpk56vd2xmx49sn6wc5qayi1jm83jlnlbbwfh7";
};
checkInputs = with pythonPackages; [ pytest ];
checkInputs = with python3Packages; [ pytest ];
propagatedBuildInputs = with pythonPackages;
propagatedBuildInputs = with python3Packages;
[ requests beautifulsoup4 future ];
checkPhase = ''

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

@@ -72,7 +72,7 @@ in rec {
sphinx = pkgs.python27Packages.sphinx;
};
ghc822 = callPackage ../development/compilers/ghc/8.2.2.nix rec {
bootPkgs = packages.ghc7103Binary;
bootPkgs = packages.ghc821Binary;
inherit (bootPkgs) hscolour alex happy;
inherit buildPlatform targetPlatform;
sphinx = pkgs.python3Packages.sphinx;