diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-06-18 15:30:39 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-06-18 15:30:39 -0400 |
commit | b3d957649f2cf6033f1b4bb9c3fe759d9b7e1527 (patch) | |
tree | 35f6e6901ea4e5ea2cded73fff1e12e2730a00ed /pkgs | |
parent | a13286fcf04ec02f41f034b76a11dc920606e2b3 (diff) | |
parent | 4627f0719dcc73ccd10d421b05af35170324971d (diff) |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/display-managers/lightdm-mini-greeter/default.nix | 32 | ||||
-rw-r--r-- | pkgs/applications/version-management/gitea/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/editline/default.nix | 24 | ||||
-rw-r--r-- | pkgs/servers/http/nginx/modules.nix | 4 | ||||
-rw-r--r-- | pkgs/stdenv/darwin/default.nix | 22 | ||||
-rw-r--r-- | pkgs/test/cc-wrapper/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/woeusb/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
8 files changed, 85 insertions, 15 deletions
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 0000000000000..ef80aa00563fa --- /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/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 71b59ed4aef7f..917deac6daa32 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 ]; diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix new file mode 100644 index 0000000000000..d9b5a2b64d635 --- /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/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index f482c92ed9f77..1919cfddf62d2 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 \ diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index ee57c9e4e625f..366be3915802d 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -283,10 +283,7 @@ in rec { llvmPackages_5 = super.llvmPackages_5 // (let tools = super.llvmPackages_5.tools.extend (llvmSelf: _: { - inherit (llvmPackages_5) llvm; - # The .override that was here before had the side affect of removing - # the hacked-in "man" output. - clang-unwrapped = builtins.removeAttrs llvmPackages_5.clang-unwrapped [ "man" ]; + inherit (llvmPackages_5) llvm clang-unwrapped; }); libraries = super.llvmPackages_5.libraries.extend (llvmSelf: _: { inherit (llvmPackages_5) libcxx libcxxabi compiler-rt; @@ -327,8 +324,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) compiler-rt libcxx libcxxabi; @@ -365,7 +370,10 @@ in rec { initialPath = import ../common-path.nix { inherit pkgs; }; shell = "${pkgs.bash}/bin/bash"; - cc = pkgs.llvmPackages.libcxxClang; + # Hack to avoid man pages in stdenv, building bootstrap python + cc = pkgs.llvmPackages.libcxxClang.override { + cc = builtins.removeAttrs pkgs.llvmPackages.clang-unwrapped [ "man" ]; + }; extraNativeBuildInputs = []; extraBuildInputs = [ pkgs.darwin.CF ]; diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix index 6d30157fe8429..7bd82b4ab2a53 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) "5.0.0"; + sanitizersWorking = + (stdenv.cc.isClang && versionAtLeast (getVersion stdenv.cc.name) "5.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 diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix index 197eea17d8868..9c6211b13dfea 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 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e842e896dbe2c..7872e03426d6e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8930,6 +8930,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 {}; @@ -18020,6 +18022,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 { }; |