jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv

Browse Source
This commit is contained in:
Eelco Dolstra 2014-10-03 15:49:20 +02:00
commit 8c3ddec416
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/services/x11/desktop-managers/gnome3.nix
View File

@ -44,9 +44,10 @@ in {
};
environment.gnome3.packageSet = mkOption {
default = pkgs.gnome3;
default = null;
example = literalExample "pkgs.gnome3_10";
description = "Which Gnome 3 package set to use.";
apply = p: if p == null then pkgs.gnome3 else p;
};
environment.gnome3.excludePackages = mkOption {

2
nixos/modules/services/x11/display-managers/gdm.nix
View File

@ -5,8 +5,8 @@ with lib;
let
cfg = config.services.xserver.displayManager;
gdm = pkgs.gnome3_12.gdm; # gdm 3.10 not supported
gnome3 = config.environment.gnome3.packageSet;
gdm = gnome3.gdm;
in

2
pkgs/stdenv/linux/default.nix
View File

@ -234,7 +234,7 @@ rec {
# other purposes (binutils and top-level pkgs) too.
inherit (stage3.pkgs) gettext gnum4 gmp perl glibc zlib linuxHeaders;
gcc = import ../../build-support/gcc-wrapper {
gcc = lib.makeOverridable (import ../../build-support/gcc-wrapper) {
nativeTools = false;
nativeLibc = false;
gcc = stage4.stdenv.gcc.gcc;

5
pkgs/tools/text/gawk/default.nix
View File

@ -1,11 +1,12 @@
{ stdenv, fetchurl, libsigsegv, readline, readlineSupport ? false }:
stdenv.mkDerivation rec {
name = "gawk-4.1.0";
name = "gawk-${version}";
version = "4.1.1";
src = fetchurl {
url = "mirror://gnu/gawk/${name}.tar.xz";
sha256 = "0hin2hswbbd6kd6i4zzvgciwpl5fba8d2s524z8y5qagyz3x010q";
sha256 = "1nz83vpss8xv7m475sv4qhhj40g74nvcw0y9kwq9ds8wzfmcdm7g";
};
doCheck = !stdenv.isCygwin; # XXX: `test-dup2' segfaults on Cygwin 6.1