Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/nixos/modules/config/console.nix
	nixpkgs/nixos/modules/services/mail/mailman.nix
	nixpkgs/nixos/modules/services/mail/public-inbox.nix
	nixpkgs/nixos/modules/services/mail/rss2email.nix
	nixpkgs/nixos/modules/services/networking/ssh/sshd.nix
	nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix
	nixpkgs/pkgs/applications/networking/irc/weechat/default.nix
	nixpkgs/pkgs/applications/window-managers/sway/default.nix
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
	nixpkgs/pkgs/development/interpreters/python/default.nix
	nixpkgs/pkgs/development/node-packages/overrides.nix
	nixpkgs/pkgs/development/tools/b4/default.nix
	nixpkgs/pkgs/servers/dict/dictd-db.nix
	nixpkgs/pkgs/servers/mail/public-inbox/default.nix
	nixpkgs/pkgs/tools/security/pinentry/default.nix
	nixpkgs/pkgs/tools/text/unoconv/default.nix
	nixpkgs/pkgs/top-level/all-packages.nix

1 files changed, 26 insertions, 14 deletions

diff --git a/nixpkgs/pkgs/games/keeperrl/default.nix b/nixpkgs/pkgs/games/keeperrl/default.nix
index f1c0f1712629..ba2783fb2b25 100644
--- a/nixpkgs/pkgs/games/keeperrl/default.nix
+++ b/nixpkgs/pkgs/games/keeperrl/default.nix
@@ -1,17 +1,27 @@
-{ lib, stdenv, fetchFromGitHub, requireFile
-, openal, curl, libogg, libvorbis
-, SDL2, SDL2_image, zlib
+{ lib
+, stdenv
+, fetchFromGitHub
+, requireFile
+, openal
+, curl
+, libogg
+, libvorbis
+, SDL2
+, SDL2_image
+, zlib
+, clang
+, libtheora
 , unfree_assets ? false }:
 
 stdenv.mkDerivation rec {
   pname = "keeperrl";
-  version = "alpha28";
+  version = "alpha34";
 
   free-src = fetchFromGitHub {
     owner = "miki151";
     repo = "keeperrl";
     rev = version;
-    sha256 = "0isj8ijn5a89m2r5cxk4lcsq0cydx7c0h87vgr8v5cndm3rd27cy";
+    sha256 = "sha256-0sww+ppctXvxMouclG3OdXpcNgrrOZJw9z8s2GhJ+IE=";
   };
 
   assets = if unfree_assets then requireFile rec {
@@ -28,7 +38,7 @@ stdenv.mkDerivation rec {
 
       "nix-prefetch-url file://\$PWD/${name}".
     '';
-    sha256 = "0115pxdzdyma2vicxgr0j21pp82gxdyrlj090s8ihp0b50f0nk53";
+    sha256 = "0115pxdzdyma2vicxgr0j21pp82gxdyrlj090s8ihp0b50f0nlll";
   } else null;
 
   sourceRoot = "source";
@@ -40,20 +50,22 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [
-    openal curl libogg libvorbis SDL2 SDL2_image zlib
+    openal curl libogg libvorbis libtheora SDL2 SDL2_image zlib clang
   ];
 
-  NIX_CFLAGS_COMPILE = [
+  env.NIX_CFLAGS_COMPILE = toString [
     "-I${SDL2.dev}/include/SDL2"
   ];
 
   enableParallelBuilding = true;
 
-  makeFlags = [ "OPT=true"
-                "RELEASE=true"
-                "DATA_DIR=$(out)/share"
-                "ENABLE_LOCAL_USER_DIR=true"
-              ];
+  makeFlags = [
+    "OPT=true"
+    "RELEASE=true"
+    "DATA_DIR=$(out)/share"
+    "ENABLE_LOCAL_USER_DIR=true"
+    "NO_STEAMWORKS=true"
+  ];
 
   installPhase = ''
     install -Dm755 keeper $out/bin/keeper
@@ -68,7 +80,7 @@ stdenv.mkDerivation rec {
     description = "A dungeon management rogue-like";
     homepage = "https://keeperrl.com/";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ onny ];
     # TODO: Add OS X
     platforms = [ "i686-linux" "x86_64-linux" ];
   };