From 170223fe642bba1b36181d2120ba0095c70de6eb Mon Sep 17 00:00:00 2001 From: Michishige Kaito Date: Sat, 26 May 2018 12:05:04 +0100 Subject: [PATCH 1/8] Handle attributes being derivations --- nixos/modules/services/security/oauth2_proxy.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix index 433d97c2a7d7..96d78630e6d1 100644 --- a/nixos/modules/services/security/oauth2_proxy.nix +++ b/nixos/modules/services/security/oauth2_proxy.nix @@ -72,6 +72,7 @@ let mapConfig = key: attr: if (!isNull attr && attr != []) then ( + if isDerivation attr then mapConfig key (toString attr) else if (builtins.typeOf attr) == "set" then concatStringsSep " " (mapAttrsToList (name: value: mapConfig (key + "-" + name) value) attr) else if (builtins.typeOf attr) == "list" then concatMapStringsSep " " (mapConfig key) attr else From 4f1b14b513ba30deed71cafbc39480084d1f4e94 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 27 Mar 2018 17:51:02 -0500 Subject: [PATCH 2/8] editline: init at 1.15.3 --- .../libraries/editline/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/editline/default.nix diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix new file mode 100644 index 000000000000..d9b5a2b64d63 --- /dev/null +++ b/pkgs/development/libraries/editline/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "editline-${version}"; + version = "1.15.3"; + src = fetchFromGitHub { + owner = "troglobit"; + repo = "editline"; + rev = version; + sha256 = "0dm5fgq0acpprr938idwml64nclg9l6c6avirsd8r6f40qicbgma"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + dontDisableStatic = true; + + meta = with stdenv.lib; { + homepage = http://troglobit.com/editline.html; + description = "A readline() replacement for UNIX without termcap (ncurses)"; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ dtzWill ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dcfc3646bcc6..7bc82ba6094d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8926,6 +8926,8 @@ with pkgs; eclib = callPackage ../development/libraries/eclib {}; + editline = callPackage ../development/libraries/editline { }; + eigen = callPackage ../development/libraries/eigen {}; eigen3_3 = callPackage ../development/libraries/eigen/3.3.nix {}; From 83b389394b8ede5eb29b72c9ccda9380ee4aaf4e Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Thu, 19 Apr 2018 12:45:06 +0900 Subject: [PATCH 3/8] lightdm-mini-greeter: init at 0.3.2 --- .../lightdm-greeters/mini.nix | 100 ++++++++++++++++++ .../services/x11/display-managers/lightdm.nix | 1 + .../lightdm-mini-greeter/default.nix | 32 ++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 135 insertions(+) create mode 100644 nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix create mode 100644 pkgs/applications/display-managers/lightdm-mini-greeter/default.nix diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix new file mode 100644 index 000000000000..ba8151a60f20 --- /dev/null +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix @@ -0,0 +1,100 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + dmcfg = config.services.xserver.displayManager; + ldmcfg = dmcfg.lightdm; + cfg = ldmcfg.greeters.mini; + + xgreeters = pkgs.linkFarm "lightdm-mini-greeter-xgreeters" [{ + path = "${pkgs.lightdm-mini-greeter}/share/xgreeters/lightdm-mini-greeter.desktop"; + name = "lightdm-mini-greeter.desktop"; + }]; + + miniGreeterConf = pkgs.writeText "lightdm-mini-greeter.conf" + '' + [greeter] + user = ${cfg.user} + show-password-label = true + password-label-text = Password: + show-input-cursor = true + + [greeter-hotkeys] + mod-key = meta + shutdown-key = s + restart-key = r + hibernate-key = h + suspend-key = u + + [greeter-theme] + font = Sans + font-size = 1em + text-color = "#080800" + error-color = "#F8F8F0" + background-image = "${ldmcfg.background}" + background-color = "#1B1D1E" + window-color = "#F92672" + border-color = "#080800" + border-width = 2px + layout-space = 15 + password-color = "#F8F8F0" + password-background-color = "#1B1D1E" + + ${cfg.extraConfig} + ''; + +in +{ + options = { + + services.xserver.displayManager.lightdm.greeters.mini = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable lightdm-mini-greeter as the lightdm greeter. + + Note that this greeter starts only the default X session. + You can configure the default X session by + and + . + ''; + }; + + user = mkOption { + type = types.str; + default = "root"; + description = '' + The user to login as. + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Extra configuration that should be put in the lightdm-mini-greeter.conf + configuration file. + ''; + }; + + }; + + }; + + config = mkIf (ldmcfg.enable && cfg.enable) { + + services.xserver.displayManager.lightdm.greeters.gtk.enable = false; + + services.xserver.displayManager.lightdm.greeter = mkDefault { + package = xgreeters; + name = "lightdm-mini-greeter"; + }; + + environment.etc."lightdm/lightdm-mini-greeter.conf".source = miniGreeterConf; + + }; +} diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 9d30155a7234..5beadacdfa93 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -72,6 +72,7 @@ in # preferred. imports = [ ./lightdm-greeters/gtk.nix + ./lightdm-greeters/mini.nix ]; options = { diff --git a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix new file mode 100644 index 000000000000..ef80aa00563f --- /dev/null +++ b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, lightdm, gtk3 }: + +stdenv.mkDerivation rec { + name = "lightdm-mini-greeter-${version}"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "prikhi"; + repo = "lightdm-mini-greeter"; + rev = version; + sha256 = "1g3lrh034w38hiq96b0xmghmlf87hcycwdh06dwkdksr0hl08wxy"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ lightdm gtk3 ]; + + configureFlags = [ "--sysconfdir=/etc" ]; + makeFlags = [ "configdir=$(out)/etc" ]; + + postInstall = '' + substituteInPlace "$out/share/xgreeters/lightdm-mini-greeter.desktop" \ + --replace "Exec=lightdm-mini-greeter" "Exec=$out/bin/lightdm-mini-greeter" + ''; + + meta = with stdenv.lib; { + description = "A minimal, configurable, single-user GTK3 LightDM greeter"; + homepage = https://github.com/prikhi/lightdm-mini-greeter; + license = licenses.gpl3; + maintainers = with maintainers; [ mnacamura ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d652824d8b9c..fecd7b369980 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18006,6 +18006,8 @@ with pkgs; inherit (xfce) exo; }; + lightdm-mini-greeter = callPackage ../applications/display-managers/lightdm-mini-greeter { }; + slic3r = callPackage ../applications/misc/slic3r { }; slic3r-prusa3d = callPackage ../applications/misc/slic3r/prusa3d.nix { }; From 516c5f54ed7f0972a1d2c172303e6ec63e95d862 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 18 Jun 2018 10:41:24 -0500 Subject: [PATCH 4/8] ngx_brotli: 0.1.1 -> 0.1.2 Fixes socket closing issues (only happened in some circumstances AFAICT). --- pkgs/servers/http/nginx/modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index f482c92ed9f7..1919cfddf62d 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -5,8 +5,8 @@ src = let gitsrc = pkgs.fetchFromGitHub { owner = "eustas"; repo = "ngx_brotli"; - rev = "37ab9b2933a0b756ba3447000b7f31d432ed8228"; # v0.1.1 - sha256 = "114ai8v9ns23qm12wp9dgdjvldqjnrmb3cmarkn0d3k6n3bm01bf"; + rev = "v0.1.2"; + sha256 = "19r9igxm4hrzrhxajlxw2ccq0057h8ipkfiif725x0xqbxjskl6c"; }; in pkgs.runCommandNoCC "ngx_brotli-src" {} '' cp -a ${gitsrc} $out substituteInPlace $out/config \ From 54f50e6e2524dc29732c6d1a47e61c72e0f4dd55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20H=C3=B6ppner?= Date: Mon, 18 Jun 2018 16:49:57 +0100 Subject: [PATCH 5/8] WoeUSB: 3.1.5 -> 3.2.1 (#42158) --- pkgs/tools/misc/woeusb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix index 197eea17d886..9c6211b13dfe 100644 --- a/pkgs/tools/misc/woeusb/default.nix +++ b/pkgs/tools/misc/woeusb/default.nix @@ -3,14 +3,14 @@ , wxGTK30 }: stdenv.mkDerivation rec { - version = "3.1.5"; + version = "3.2.1"; name = "woeusb-${version}"; src = fetchFromGitHub { owner = "slacka"; repo = "WoeUSB"; rev = "v${version}"; - sha256 = "0jbyrd49ikwkfpnka884y3p600bm3nfil2zinrgbac7vyhxxqjmw"; + sha256 = "0qymdc216ws6adkzmzxz6hx43dim0hpwab9c4qmgg8jnkhnpvnj1"; }; buildInputs = [ wxGTK30 autoreconfHook makeWrapper ]; From 106bde413e424137ef7fa9797fc02fa5a549e948 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Thu, 7 Jun 2018 13:34:09 +0200 Subject: [PATCH 6/8] gitea: 1.4.1 -> 1.4.2 Not much of a changelog: https://github.com/go-gitea/gitea/releases/tag/v1.4.2 --- pkgs/applications/version-management/gitea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 71b59ed4aef7..917deac6daa3 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; buildGoPackage rec { name = "gitea-${version}"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "1mid67c4021m7mi4ablx1w5v43831gzn8xpg8n30a4zmr70781wm"; + sha256 = "15iqvfvijg46444pybi7vg7xhl2x0pr5p1416qlc2nakkn3drpi1"; }; patches = [ ./static-root-path.patch ]; From 627aae5884fd9bc2b380eab818f58212aa8753f1 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 18 Jun 2018 14:47:29 -0400 Subject: [PATCH 7/8] darwin stdenv: Put back "man" attribute on clang and llvm We take care to make it use the final stdenv to avoid mass rebuilds and bootstrap python. --- pkgs/stdenv/darwin/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 7ef74c5ea7df..71de45bb1d72 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -323,8 +323,16 @@ in rec { coreutils findutils diffutils patchutils; llvmPackages_5 = super.llvmPackages_5 // (let - tools = super.llvmPackages_5.tools.extend (_: _: { - inherit (llvmPackages_5) llvm clang-unwrapped; + tools = super.llvmPackages_5.tools.extend (_: super: { + # Build man pages with final stdenv not before + llvm = lib.extendDerivation + true + { inherit (super.llvm) man; } + llvmPackages_5.llvm; + clang-unwrapped = lib.extendDerivation + true + { inherit (super.clang-unwrapped) man; } + llvmPackages_5.clang-unwrapped; }); libraries = super.llvmPackages_5.libraries.extend (_: _: { inherit (llvmPackages_5) libcxx libcxxabi; @@ -370,7 +378,8 @@ in rec { inherit (prevStage) stdenv; }; inherit (pkgs) coreutils gnugrep; - cc = pkgs.llvmPackages.clang-unwrapped; + # Hack to avoid man pages in stdenv to avoid mass rebuild + cc = builtins.removeAttrs pkgs.llvmPackages.clang-unwrapped [ "man" ]; bintools = pkgs.darwin.binutils; libc = pkgs.darwin.Libsystem; extraPackages = [ pkgs.libcxx ]; From e3b1937baf008bea6bb60ff3f384a012e7c58531 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 18 Jun 2018 15:05:23 -0400 Subject: [PATCH 8/8] tests.cc-wrapper: Fix sanitizer condition fc9644d4c9c9d29958e9bcf1676d48d4b3026bb4 accidentally enabled the sanitizer tests for GCC on Darwin, when fixing that case was never attempted. Also inverted the condition from broken to working for clarity. --- pkgs/test/cc-wrapper/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix index dd41cd157cae..f9c6e9e77796 100644 --- a/pkgs/test/cc-wrapper/default.nix +++ b/pkgs/test/cc-wrapper/default.nix @@ -3,7 +3,9 @@ with stdenv.lib; let # Sanitizers are not supported on Darwin. # Sanitizer headers aren't available in older libc++ stdenvs due to a bug - sanitizersBroken = stdenv.cc.isClang && versionOlder (getVersion stdenv.cc.name) "6.0.0"; + sanitizersWorking = + (stdenv.cc.isClang && versionAtLeast (getVersion stdenv.cc.name) "6.0.0") + || (stdenv.cc.isGNU && stdenv.isLinux); in stdenv.mkDerivation { name = "cc-wrapper-test"; @@ -43,7 +45,7 @@ in stdenv.mkDerivation { NIX_LDFLAGS="-L$NIX_BUILD_TOP/foo/lib -rpath $NIX_BUILD_TOP/foo/lib" $CC -lfoo -o ldflags-check ${./ldflags-main.c} ./ldflags-check - ${optionalString (!sanitizersBroken) '' + ${optionalString sanitizersWorking '' printf "checking whether sanitizers are fully functional... ">&2 $CC -o sanitizers -fsanitize=address,undefined ${./sanitizers.c} ./sanitizers