From 1b6dcf493661bc18f8ffd4b327f73b0d2d91aa8b Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Thu, 7 Jun 2018 09:04:45 +0000 Subject: [PATCH 1/5] dwarf-therapist: fix build Update for dfc4744afd82b2d26a8df71b05ffacf05230af50. --- .../dwarf-fortress/dwarf-therapist/default.nix | 15 --------------- .../dwarf-fortress/dwarf-therapist/wrapper.nix | 4 ++-- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index 6d96f98aec94..2e54258c4be9 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -11,24 +11,9 @@ stdenv.mkDerivation rec { sha256 = "0b5y7800nzydn0jcc0vglgi9mzkj8f3qhw16wd872cf5396xnag9"; }; - outputs = [ "out" "layouts" ]; buildInputs = [ qtbase qtdeclarative ]; nativeBuildInputs = [ texlive cmake ninja ]; - configurePhase = '' - cmake -GNinja - ''; - - buildPhase = '' - ninja -j$NIX_BUILD_CORES - ''; - - installPhase = '' - mkdir -p $out/bin - cp ./DwarfTherapist $out/bin/DwarfTherapist - cp -r ./share/memory_layouts $layouts - ''; - meta = with stdenv.lib; { description = "Tool to manage dwarves in in a running game of Dwarf Fortress"; maintainers = with maintainers; [ the-kenny abbradar bendlas ]; diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix index 6debf0bb0b2b..f9e3e468cdc0 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix @@ -18,7 +18,7 @@ in symlinkJoin { postBuild = '' # DwarfTherapist assumes it's run in $out/share/dwarftherapist and # therefore uses many relative paths. - wrapProgram $out/bin/DwarfTherapist \ + wrapProgram $out/bin/dwarftherapist \ --run "cd $out/share/dwarftherapist" rm -rf $out/share/dwarftherapist/memory_layouts/linux @@ -26,7 +26,7 @@ in symlinkJoin { origmd5=$(cat "${dfHashFile}.orig" | cut -c1-8) patchedmd5=$(cat "${dfHashFile}" | cut -c1-8) substitute \ - ${dt.layouts}/${inifile} \ + ${dt}/share/dwarftherapist/memory_layouts/${inifile} \ $out/share/dwarftherapist/memory_layouts/${inifile} \ --replace "$origmd5" "$patchedmd5" ''; From 48696cf4fea6e9a49f83c4487626f2522babcb0b Mon Sep 17 00:00:00 2001 From: Jean-Philippe Bernardy Date: Fri, 8 Jun 2018 15:13:47 +0200 Subject: [PATCH 2/5] python.packages.astunparse: init at 1.5.0 --- .../python-modules/astunparse/default.nix | 17 +++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/python-modules/astunparse/default.nix diff --git a/pkgs/development/python-modules/astunparse/default.nix b/pkgs/development/python-modules/astunparse/default.nix new file mode 100644 index 000000000000..4c46f93b547c --- /dev/null +++ b/pkgs/development/python-modules/astunparse/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchPypi, buildPythonPackage, six }: + +buildPythonPackage rec { + pname = "astunparse"; + version = "1.5.0"; + src = fetchPypi { + inherit pname version; + sha256 = "1kc9lm2jvfcip3z8snj04dar5a9jh857a704m6lvcv4xclm3rpsm"; + }; + propagatedBuildInputs = [ six ]; + doCheck = false; # no tests + meta = with stdenv.lib; { + description = "This is a factored out version of unparse found in the Python source distribution"; + license = licenses.bsd3; + maintainers = with maintainers; [ jyp ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index de99a1e64d8b..7a0248a05b3b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18171,6 +18171,8 @@ EOF spectral-cube = callPackage ../development/python-modules/spectral-cube { }; + astunparse = callPackage ../development/python-modules/astunparse { }; + }); in fix' (extends overrides packages) From 72f051a97025f85dbbb6e6b6f74a8c4ea451e3f2 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Bernardy Date: Thu, 7 Jun 2018 13:29:27 +0200 Subject: [PATCH 3/5] python.packages.gast: init at 0.2.0 --- pkgs/development/python-modules/gast/default.nix | 16 ++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/python-modules/gast/default.nix diff --git a/pkgs/development/python-modules/gast/default.nix b/pkgs/development/python-modules/gast/default.nix new file mode 100644 index 000000000000..036bed9dd792 --- /dev/null +++ b/pkgs/development/python-modules/gast/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchPypi, buildPythonPackage, astunparse }: + +buildPythonPackage rec { + pname = "gast"; + version = "0.2.0"; + src = fetchPypi { + inherit pname version; + sha256 = "0c296xm1vz9x4w4inmdl0k8mnc0i9arw94si2i7pglpc461r0s3h"; + }; + checkInputs = [ astunparse ] ; + meta = with stdenv.lib; { + description = "GAST provides a compatibility layer between the AST of various Python versions, as produced by ast.parse from the standard ast module."; + license = licenses.bsd3; + maintainers = with maintainers; [ jyp ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7a0248a05b3b..fc0ebcdc2e6f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18173,6 +18173,8 @@ EOF astunparse = callPackage ../development/python-modules/astunparse { }; + gast = callPackage ../development/python-modules/gast { }; + }); in fix' (extends overrides packages) From 14771710733d904de3849921923a5154d1bd3367 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Bernardy Date: Thu, 7 Jun 2018 13:29:58 +0200 Subject: [PATCH 4/5] python.packages.tensorflow-tensorboard: 1.5.0 -> 1.7.0 --- .../tensorflow-tensorboard/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix index f0b4e6f341d4..a767120ddf32 100644 --- a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix @@ -3,33 +3,34 @@ , numpy , werkzeug , protobuf +, grpcio , markdown , futures }: -# tensorflow is built from a downloaded wheel, because -# https://github.com/tensorflow/tensorboard/issues/719 -# blocks buildBazelPackage. +# tensorflow/tensorboard is built from a downloaded wheel, because +# https://github.com/tensorflow/tensorboard/issues/719 blocks +# buildBazelPackage. buildPythonPackage rec { pname = "tensorflow-tensorboard"; - version = "1.5.1"; + version = "1.7.0"; name = "${pname}-${version}"; format = "wheel"; src = fetchPypi ({ - pname = "tensorflow_tensorboard"; + pname = "tensorboard"; inherit version; format = "wheel"; } // (if isPy3k then { python = "py3"; - sha256 = "1cydgvrr0s05xqz1v9z2wdiv60gzbs8wv9wvbflw5700a2llb63l"; + sha256 = "1aa42rl3fkpllqch09d311gk1j281qry6nn07ywgbs6j0kwr6isc"; } else { python = "py2"; - sha256 = "0dhljddlirq6nr84zg4yrk5k69gj3x2abb6wg3crgrparb6qbya7"; + sha256 = "1vcdkyvw22kpljmj4gxb8m1q54ry02iwvw54w8v8hmdigvc77a7k"; })); - propagatedBuildInputs = [ bleach_1_5_0 numpy werkzeug protobuf markdown ] ++ lib.optional (!isPy3k) futures; + propagatedBuildInputs = [ bleach_1_5_0 numpy werkzeug protobuf markdown grpcio ] ++ lib.optional (!isPy3k) futures; meta = with stdenv.lib; { description = "TensorFlow's Visualization Toolkit"; From 7d02ec9ac6e4788e5a8d679c6615d7d7f0c47e14 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Bernardy Date: Thu, 7 Jun 2018 13:30:29 +0200 Subject: [PATCH 5/5] python.packages.tensorflow: add missing dependencies --- pkgs/development/python-modules/tensorflow/bin.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index 9c6b84e8c7ac..785cff5b8b75 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -3,8 +3,11 @@ , fetchurl , buildPythonPackage , isPy3k, isPy35, isPy36, pythonOlder +, astor +, gast , numpy , six +, termcolor , protobuf , absl-py , mock @@ -47,7 +50,7 @@ in buildPythonPackage rec { dls = import ./tf1.7.1-hashes.nix; in fetchurl dls.${key}; - propagatedBuildInputs = [ numpy six protobuf absl-py ] + propagatedBuildInputs = [ numpy six protobuf absl-py astor gast termcolor ] ++ lib.optional (!isPy3k) mock ++ lib.optionals (pythonOlder "3.4") [ backports_weakref enum34 ] ++ lib.optional (pythonOlder "3.6") tensorflow-tensorboard;