diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-01-18 14:35:07 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-01-18 14:46:20 +0100 |
| commit | 0a58b512cb696b2482cbac4fd3a20b43ae31c1bc (patch) | |
| tree | 7ae35a255ac57b66696c3db743f6ed9a4dab7431 /pkgs/misc/emulators | |
| parent | 284833649192072959a335367374fc0a6ec667df (diff) | |
| parent | 9c1d3bfa9f7d7b95eb20d0f729e3b3c9d7abcd4b (diff) | |
| download | nixlib-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar nixlib-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar.gz nixlib-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar.bz2 nixlib-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar.lz nixlib-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar.xz nixlib-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar.zst nixlib-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.zip | |
Merge master into stdenv-updates
Conflicts (simple): pkgs/development/compilers/gcc/4.8/default.nix pkgs/development/compilers/llvm/default.nix pkgs/development/libraries/gmp/5.1.1.nix pkgs/development/libraries/gmp/5.1.3.nix pkgs/development/libraries/gmp/5.1.x.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/misc/emulators')
| -rw-r--r-- | pkgs/misc/emulators/wine/stable.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/emulators/wine/unstable.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/misc/emulators/wine/stable.nix b/pkgs/misc/emulators/wine/stable.nix index c0643c78a59a..3096c1efc910 100644 --- a/pkgs/misc/emulators/wine/stable.nix +++ b/pkgs/misc/emulators/wine/stable.nix @@ -72,7 +72,7 @@ in stdenv.mkDerivation rec { license = "LGPL"; inherit version; description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix"; - maintainers = [stdenv.lib.maintainers.raskin stdenv.lib.maintainers.simons]; + maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix index f19ef0fcc7f3..5d891c381001 100644 --- a/pkgs/misc/emulators/wine/unstable.nix +++ b/pkgs/misc/emulators/wine/unstable.nix @@ -6,7 +6,7 @@ assert stdenv.isLinux; assert stdenv.gcc.gcc != null; -let +let version = "1.7.10"; name = "wine-${version}"; @@ -72,7 +72,7 @@ in stdenv.mkDerivation rec { license = "LGPL"; inherit version; description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix"; - maintainers = [stdenv.lib.maintainers.raskin stdenv.lib.maintainers.simons]; + maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; }; } |