MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'upstream/master' into staging

Browse source
This commit is contained in:
John Ericson 2018-05-14 13:31:20 -04:00
commit 01a525b84e
12 changed files with 22 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/services/x11/window-managers/stumpwm.nix
View file

@ -15,10 +15,10 @@ in
services.xserver.windowManager.session = singleton {
name = "stumpwm";
start = ''
${pkgs.stumpwm}/bin/stumpwm &
${pkgs.lispPackages.stumpwm}/bin/stumpwm &
waitPID=$!
'';
};
environment.systemPackages = [ pkgs.stumpwm ];
environment.systemPackages = [ pkgs.lispPackages.stumpwm ];
};
}

12
pkgs/applications/editors/sublime/3/packages.nix
View file

@ -5,14 +5,14 @@ let
in
rec {
sublime3-dev = common {
buildVersion = "3170";
x32sha256 = "04ll92mqnpvvaa161il6l02gvd0g0x95sci0yrywr6jzk6am1fzg";
x64sha256 = "1snzjr000qrjyvzd876x5j66138glh0bff3c1b2cb2bfc88c3kzx";
buildVersion = "3176";
x32sha256 = "08asz13888d4ddsz81cfk7k3319dabzz1kgbnshw0756pvyrvr23";
x64sha256 = "0cppkh5jx2g8f6jyy1bs81fpb90l0kn5m7y3skackpjdxhd7rwbl";
} {};
sublime3 = common {
buildVersion = "3170";
x32sha256 = "04ll92mqnpvvaa161il6l02gvd0g0x95sci0yrywr6jzk6am1fzg";
x64sha256 = "1snzjr000qrjyvzd876x5j66138glh0bff3c1b2cb2bfc88c3kzx";
buildVersion = "3176";
x32sha256 = "08asz13888d4ddsz81cfk7k3319dabzz1kgbnshw0756pvyrvr23";
x64sha256 = "0cppkh5jx2g8f6jyy1bs81fpb90l0kn5m7y3skackpjdxhd7rwbl";
} {};
}

6
pkgs/development/compilers/gcc/4.8/default.nix
View file

@ -185,11 +185,7 @@ stdenv.mkDerivation ({
libc_dev = stdenv.cc.libc_dev;
postPatch =
if (hostPlatform.isHurd
|| (libcCross != null # e.g., building `gcc.crossDrv'
&& libcCross ? crossConfig
&& libcCross.crossConfig == "i586-pc-gnu")
|| (crossGNU && libcCross != null))
if targetPlatform.isHurd
then
# On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not
# in glibc, so add the right `-I' flags to the default spec string.

6
pkgs/development/compilers/gcc/4.9/default.nix
View file

@ -194,11 +194,7 @@ stdenv.mkDerivation ({
libc_dev = stdenv.cc.libc_dev;
postPatch =
if (hostPlatform.isHurd
|| (libcCross != null # e.g., building `gcc.crossDrv'
&& libcCross ? crossConfig
&& libcCross.crossConfig == "i586-pc-gnu")
|| (crossGNU && libcCross != null))
if targetPlatform.isHurd
then
# On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not
# in glibc, so add the right `-I' flags to the default spec string.

6
pkgs/development/compilers/gcc/5/default.nix
View file

@ -196,11 +196,7 @@ stdenv.mkDerivation ({
'';
postPatch =
if (hostPlatform.isHurd
|| (libcCross != null # e.g., building `gcc.crossDrv'
&& libcCross ? crossConfig
&& libcCross.crossConfig == "i586-pc-gnu")
|| (crossGNU && libcCross != null))
if targetPlatform.isHurd
then
# On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not
# in glibc, so add the right `-I' flags to the default spec string.

6
pkgs/development/compilers/gcc/6/default.nix
View file

@ -196,11 +196,7 @@ stdenv.mkDerivation ({
'';
postPatch =
if (hostPlatform.isHurd
|| (libcCross != null # e.g., building `gcc.crossDrv'
&& libcCross ? crossConfig
&& libcCross.crossConfig == "i586-pc-gnu")
|| (crossGNU && libcCross != null))
if targetPlatform.isHurd
then
# On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not
# in glibc, so add the right `-I' flags to the default spec string.

6
pkgs/development/compilers/gcc/7/default.nix
View file

@ -168,11 +168,7 @@ stdenv.mkDerivation ({
patchShebangs $configureScript
done
'' + (
if (hostPlatform.isHurd
|| (libcCross != null # e.g., building `gcc.crossDrv'
&& libcCross ? crossConfig
&& libcCross.crossConfig == "i586-pc-gnu")
|| (crossGNU && libcCross != null))
if targetPlatform.isHurd
then
# On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not
# in glibc, so add the right `-I' flags to the default spec string.

6
pkgs/development/compilers/gcc/8/default.nix
View file

@ -163,11 +163,7 @@ stdenv.mkDerivation ({
patchShebangs $configureScript
done
'' + (
if (hostPlatform.isHurd
|| (libcCross != null # e.g., building `gcc.crossDrv'
&& libcCross ? crossConfig
&& libcCross.crossConfig == "i586-pc-gnu")
|| (crossGNU && libcCross != null))
if targetPlatform.isHurd
then
# On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not
# in glibc, so add the right `-I' flags to the default spec string.

6
pkgs/development/compilers/gcc/snapshot/default.nix
View file

@ -138,11 +138,7 @@ stdenv.mkDerivation ({
hardeningDisable = [ "format" ];
postPatch =
if (hostPlatform.isHurd
|| (libcCross != null # e.g., building `gcc.crossDrv'
&& libcCross ? crossConfig
&& libcCross.crossConfig == "i586-pc-gnu")
|| (crossGNU && libcCross != null))
if targetPlatform.isHurd
then
# On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not
# in glibc, so add the right `-I' flags to the default spec string.

4
pkgs/development/libraries/fstrm/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "fstrm-${version}";
version = "0.3.2";
version = "0.4.0";
src = fetchFromGitHub {
owner = "farsightsec";
repo = "fstrm";
rev = "v${version}";
sha256 = "135m0d4z1wbiaazs3bh6z53a35mgs33gvfki8pl4xfaw9cfcfpd2";
sha256 = "11i8b3wy6j3z3fcv816xccxxlrfkczdr8bm2gnan6yv4ppbji4ny";
};
outputs = [ "bin" "out" "dev" ];

4
pkgs/development/tools/parsing/byacc/default.nix
View file

@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
name = "byacc-${version}";
version = "20170709";
version = "20180510";
src = fetchurl {
urls = [
"ftp://ftp.invisible-island.net/byacc/${name}.tgz"
"https://invisible-mirror.net/archives/byacc/${name}.tgz"
];
sha256 = "1syrg1nwh2qmlr5mh7c4vz9psdv4gf55h8i5ffw84q6whlcq1kr7";
sha256 = "14ynlrcsc2hwny3gxng19blfvglhqd4m7hl597fwksf7zfzhv56h";
};
doCheck = true;

6
pkgs/tools/networking/ccnet/default.nix
View file

@ -1,13 +1,13 @@
{stdenv, fetchurl, which, autoreconfHook, pkgconfig, vala, python, libsearpc, libzdb, libuuid, libevent, sqlite, openssl}:
stdenv.mkDerivation rec {
version = "6.1.7";
seafileVersion = "6.1.7";
version = "6.1.8";
seafileVersion = "6.1.8";
name = "ccnet-${version}";
src = fetchurl {
url = "https://github.com/haiwen/ccnet/archive/v${version}.tar.gz";
sha256 = "1kkzdxa9r7sw1niwniznfkvilgvb7q039wq07cfk73qs3231bj7r";
sha256 = "0qlpnrz30ldrqnvbj59d54qdghxpxc5lsq6kf3dw2b93jnzkcmmm";
};
nativeBuildInputs = [ pkgconfig which autoreconfHook vala python ];