Some small improvements

This commit is contained in:
Rehno Lindeque 2016-06-19 03:38:08 +00:00
parent bb93031010
commit ae16ffc5e5
2 changed files with 14 additions and 25 deletions

View file

@ -12,23 +12,15 @@ let
overrides = self: super:
{
nbstripout = super.buildPythonPackage rec {
version = "0.2.4a";
version = "0.2.6";
name = "nbstripout-${version}";
/* Note that 0.2.4 is currently broken with python3 */
/* src = pkgs.fetchurl { */
/* url = "https://pypi.python.org/packages/source/n/nbstripout/${name}.tar.gz"; */
/* sha256 = "1gphp7dl8cw5wmylk90vc2jbq4lgp680w3ybv9k0qq6ra2balcyk"; */
/* }; */
src = pkgs.fetchgit
{
url = "git://github.com/kynan/nbstripout.git";
sha256 = "12spiwh9wncbrvqhcfnv74zy6qnsxyjl6ma0zknkaxk8ga0bss1z";
rev = "fe1f767053462254a13c09bed8c5e24ec216a728";
};
src = pkgs.fetchurl {
url = "https://pypi.python.org/packages/source/n/nbstripout/${name}.tar.gz";
sha256 = "1dxij31pxl1lw1zcpi7s84g3ghnjvwamqp22hcr0vg7riwrr0a8w";
};
# TODO: what should build inputs look like?
buildInputs = with self; [ /*pytest*/ /*nbformat*/ /*jupyter*/ ];
buildInputs = with self; [ /*pytest*/ /*nbformat*/ /*jupyter*/ setuptools ];
propagatedBuildInputs = with self; [ ];
doCheck = false;
@ -50,7 +42,7 @@ let
extraLibs =
with pythonPackages;
[
jupyter
notebook
# Python packages (comment/uncomment as needed)
/* scipy */

View file

@ -1,23 +1,22 @@
{
nixpkgs ?
let
inherit (import <nixpkgs> {}) fetchgit;
inherit (import <nixpkgs> {}) fetchFromGitHub;
in
import
( fetchgit
( fetchFromGitHub
{
url = "git://github.com/NixOS/nixpkgs.git";
sha256 = "1zfk41ddixdycq4w6sxbn9qzgmahfp98niilzlzp6yfg88xpp5v1";
# Using the latest unstable nixpkgs for now to get access to recent updates
# TODO: should probably peg to a stable version or unpeg in future
rev = "2737365741406a2726e755c76390d8d2081119d7";
owner = "NixOS";
repo = "nixpkgs";
rev = "0bd54a6d5d4eba361c5b8ff04dd3c02d6dbfb259";
sha256 = "10fkcq9f2pmg5985kbxq05jgx9ih7axpqsam3jxkzpyalgd0gwvy";
}
) {}
}:
let
inherit (nixpkgs) pkgs;
inherit (import ./env.nix { inherit nixpkgs; }) jupyter-env;
inherit (import ./release.nix { inherit nixpkgs; }) jupyter-env;
in
pkgs.stdenv.mkDerivation
{
@ -32,8 +31,6 @@ in
# Utilities (comment/uncomment as needed)
/* cabal2nix */
/* nixops */
/* pythonPackages.pgcli */
/* pythonPackages.mycli */
/* pythonPackages.virtualenv */
/* pythonPackages.pip */