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: e81788363d82
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: bea7aa233d43
Choose a head ref
  • 3 commits
  • 2 files changed
  • 4 contributors

Commits on Sep 19, 2020

  1. python3Packages.runway-python: add missing deps 

    (cherry picked from commit a9162ff)
    Jonathan Ringer committed Sep 19, 2020
    Copy the full SHA
    e7091ba View commit details

  2. unnethack: 5.2.0 -> 5.3.2 (#97595) 

    Co-authored-by: Jon <jonringer@users.noreply.github.com>
(cherry picked from commit 47ba35d)
    @Mathnerd314
    Mathnerd314 and Jon committed Sep 19, 2020
    Copy the full SHA
    d6d7be3 View commit details

  3. Merge pull request #98254 from Mathnerd314/20.09-unnethack 

    [20.09] unnethack: 5.2.0 -> 5.3.2, fix build
    @AndersonTorres
    AndersonTorres authored Sep 19, 2020

    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
    bea7aa2 View commit details
Showing with 34 additions and 8 deletions.
  1. +17 −1 pkgs/development/python-modules/runway-python/default.nix
  2. +17 −7 pkgs/games/unnethack/default.nix
18 changes: 17 additions & 1 deletion pkgs/development/python-modules/runway-python/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@
, flask-compress
, flask-cors
, flask-sockets
, imageio
, numpy
, scipy
, pillow
@@ -25,7 +26,22 @@ buildPythonPackage rec {
sha256 = "695d78f8edeb6a7ca98d8351adb36948d56cceeffe8a84896c9fbfd349fc4cb8";
};

propagatedBuildInputs = [ flask flask-compress flask-cors flask-sockets numpy scipy pillow gevent wget six colorcet unidecode urllib3 ];
propagatedBuildInputs = [
colorcet
flask
flask-compress
flask-cors
flask-sockets
gevent
imageio
numpy
pillow
scipy
six
unidecode
urllib3
wget
];

# tests are not packaged in the released tarball
doCheck = false;
24 changes: 17 additions & 7 deletions pkgs/games/unnethack/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
{ stdenv, fetchgit, utillinux, ncurses, flex, bison }:
{ stdenv, fetchFromGitHub, fetchpatch, utillinux, ncurses, flex, bison }:

stdenv.mkDerivation rec {
pname = "unnethack";
version = "5.2.0";
version = "5.3.2";

src = fetchgit {
url = "https://github.com/UnNetHack/UnNetHack";
rev = "refs/tags/${version}";
sha256 = "088gd2c7v95f2pm9ky38i28sz73mnsksr2p2hhhflkchxncd21f1";
src = fetchFromGitHub {
name = "UnNetHack";
owner = "UnNetHack";
repo = "UnNetHack";
rev = version;
sha256 = "1rg0mqyplgn3dfh3wz09a600qxk7aidqw4d84kyiincljvhyb7ps";
};

buildInputs = [ ncurses ];
@@ -22,6 +24,14 @@ stdenv.mkDerivation rec {
];

makeFlags = [ "GAMEPERM=744" ];
patches = [
# fix regression with bison, merged in master
(fetchpatch {
name = "fix-bison.patch";
url = "https://github.com/UnNetHack/UnNetHack/commit/04f0a3a850a94eb8837ddcef31303968240d1c31.patch";
sha256 = "1zblbwqqz9nx16k6n31wi2hdvz775lvzmkjblmrx18nbm4ylj0n9";
})
];

enableParallelBuilding = true;

@@ -54,5 +64,5 @@ stdenv.mkDerivation rec {
license = "nethack";
platforms = platforms.all;
maintainers = with maintainers; [ abbradar ];
};
};
}