Merge branch 'master' into staging

* master: (53 commits)
  hashcat: 4.0.0 -> 4.0.1
  vault: add nixos test
  emem: 0.2.48 -> 0.2.50
  nixos/nat: add dmzHost option (#32257)
  vulnix: 1.3.4 -> 1.4.0
  linux-4.13: mark as insecure (+required generic changes)
  vault: 0.8.3 -> 0.9.0
  gox: 20140904 -> 0.4.0
  guitarix: 0.35.6 -> 0.36.1
  geolite-legacy: 2017-10-25 -> 2017-12-02
  premake5: 5.0.0pre.alpha.11 -> 5.0.0-alpha12
  otfcc: build with ninja
  python/hetzner: 0.7.5 -> 0.8.0
  linux-testing: 4.15-rc1 -> 4.15-rc2
  Revert "linux_4_13: Remove, no longer supported."
  jenkins: 2.92 -> 2.93
  psc-package: 0.2.4 -> 0.2.5
  dino: 2017-09-26 -> 2017-12-03
  gnome3.gpaste: fix keybindings path
  plasma: 5.11.3 -> 5.11.4
  ...
This commit is contained in:
Orivej Desh
2017-12-04 15:25:34 +00:00
70 changed files with 741 additions and 372 deletions

View File

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
homepage = https://01.org/linuxgraphics/;
description = "Tools for development and testing of the Intel DRM driver";
license = licenses.mit;
platforms = platforms.unix;
platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = with maintainers; [ pSub ];
};
}

View File

@@ -3,14 +3,14 @@
with stdenv.lib;
stdenv.mkDerivation rec {
name = "premake-${version}";
version = "5.0.0pre.alpha.11";
name = "premake5-${version}";
version = "5.0.0-alpha12";
src = fetchFromGitHub {
owner = "premake";
repo = "premake-core";
rev = "5dfb0238bc309df04819dd430def621ce854678d";
sha256 = "0k9xbqrnbwj0hnmdgcrwn70py1kiqvr10l42aw42xnlmdyg1sgsc";
rev = "v${version}";
sha256 = "1h3hr96pdz94njn4bg02ldcz0k5j1x017d8svc7fdyvl2b77nqzf";
};
buildInputs = optional stdenv.isDarwin [ CoreServices ];