mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 14:11:36 +00:00
Code Issues Wiki Activity

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

Browse source
This commit is contained in:
Frederik Rietdijk 2017-07-28 19:37:36 +02:00
parent ec59e3b3f5 cb1742e76d
commit 55357de67a
14 changed files with 1336 additions and 8154 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/build-support/setup-hooks/setup-debug-info-dirs.sh Normal file
View file

@ -0,0 +1,5 @@
setupDebugInfoDirs () {
addToSearchPath NIX_DEBUG_INFO_DIRS $1/lib/debug
}
envHooks+=(setupDebugInfoDirs)

4
pkgs/development/compilers/scala/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }:
stdenv.mkDerivation rec {
name = "scala-2.12.2";
name = "scala-2.12.3";
src = fetchurl {
url = "http://www.scala-lang.org/files/archive/${name}.tgz";
sha256 = "1xd68q9h0vzqndar3r4mvabbd7naa25fbiciahkhxwgw8sr6hq8r";
sha256 = "133w4r2214ci7r4sg2yyk9lhn62ldm4ad0d89drwrvgvffvnly9b";
};
propagatedBuildInputs = [ jre ] ;

18
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -702,12 +702,6 @@ self: super: {
# broken test suite
servant-server = dontCheck super.servant-server;
# Fix build for latest versions of servant and servant-client.
servant-client_0_11 = super.servant-client_0_11.overrideScope (self: super: {
servant-server = self.servant-server_0_11;
servant = self.servant_0_11;
});
# build servant docs from the repository
servant =
let
@ -865,9 +859,6 @@ self: super: {
postInstall = "rm $out/bin/mkReadme && rmdir $out/bin";
});
# Needs a newer version of hsyslog than lts-8.x provides.
logging-facade-syslog = super.logging-facade-syslog.override { hsyslog = self.hsyslog_5_0_1; };
# Has a dependency on outdated versions of directory.
cautious-file = doJailbreak (dontCheck super.cautious-file);
@ -877,4 +868,13 @@ self: super: {
# Needs a newer version of ghc-events.
threadscope = super.threadscope.override { ghc-events = self.ghc-events_0_6_0; };
# version 1.3.1.2 does not compile: syb >=0.1.0.2 && <0.7
ChasingBottoms = doJailbreak super.ChasingBottoms;
# test suite does not compile with recent versions of QuickCheck
integer-logarithms = dontCheck (super.integer-logarithms);
# https://github.com/vincenthz/hs-tls/issues/247
tls = dontCheck super.tls;
}

9
pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
View file

@ -59,15 +59,6 @@ self: super: {
# https://github.com/nominolo/ghc-syb/issues/20
ghc-syb-utils = dontCheck super.ghc-syb-utils;
# Older, LTS-8-based versions don't compile.
base-orphans = self.base-orphans_0_6;
hspec-meta = self.hspec-meta_2_4_4;
lens = self.lens_4_15_3;
primitive = self.primitive_0_6_2_0;
semigroupoids = self.semigroupoids_5_2;
syb = self.syb_0_7;
vector = super.vector_0_12_0_1;
# Work around overly restrictive constraints on the version of 'base'.
ChasingBottoms = doJailbreak super.ChasingBottoms;
hashable = doJailbreak super.hashable;

1053
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View file

File diff suppressed because it is too large Load diff

8261
pkgs/development/haskell-modules/hackage-packages.nix
View file

File diff suppressed because it is too large Load diff

27
pkgs/development/tools/misc/elfutils/debug-info-from-env.patch Normal file
View file

@ -0,0 +1,27 @@
Look up .build-id files relative to the directories in the
colon-separated environment variable NIX_DEBUG_INFO_DIRS, unless
overriden by --debuginfo-path.
diff -ru elfutils-0.169-orig/libdwfl/argp-std.c elfutils-0.169/libdwfl/argp-std.c
--- elfutils-0.169-orig/libdwfl/argp-std.c 2017-05-02 23:05:52.000000000 +0200
+++ elfutils-0.169/libdwfl/argp-std.c 2017-07-28 16:08:06.739558106 +0200
@@ -376,5 +376,7 @@
const struct argp *
dwfl_standard_argp (void)
{
+ debuginfo_path = getenv("NIX_DEBUG_INFO_DIRS");
+
return &libdwfl_argp;
}
diff -ru elfutils-0.169-orig/src/stack.c elfutils-0.169/src/stack.c
--- elfutils-0.169-orig/src/stack.c 2017-02-24 11:55:28.000000000 +0100
+++ elfutils-0.169/src/stack.c 2017-07-28 15:50:06.743196696 +0200
@@ -631,6 +631,8 @@
/* Set locale. */
(void) setlocale (LC_ALL, "");
+ debuginfo_path = getenv("NIX_DEBUG_INFO_DIRS");
+
const struct argp_option options[] =
{
{ NULL, 0, NULL, 0, N_("Input selection options:"), 0 },

10
pkgs/development/tools/misc/elfutils/default.nix
View file

@ -1,15 +1,17 @@
{ lib, stdenv, fetchurl, m4, zlib, bzip2, bison, flex, gettext, xz }:
{ lib, stdenv, fetchurl, m4, zlib, bzip2, bison, flex, gettext, xz, setupDebugInfoDirs }:
# TODO: Look at the hardcoded paths to kernel, modules etc.
stdenv.mkDerivation rec {
name = "elfutils-${version}";
version = "0.168";
version = "0.169";
src = fetchurl {
url = "https://sourceware.org/elfutils/ftp/${version}/${name}.tar.bz2";
sha256 = "0xn2fbgda1i703csfs35frvm7l068ybmay4ssrykqdx17f4hg3dq";
sha256 = "1hiv1yqig3292dwqhrwsxwk3qjalxp5fpl8yphwbfwh8ng3zl4ll";
};
patches = ./debug-info-from-env.patch;
hardeningDisable = [ "format" ];
# We need bzip2 in NativeInputs because otherwise we can't unpack the src,
@ -17,6 +19,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ m4 bison flex gettext bzip2 ];
buildInputs = [ zlib bzip2 xz ];
propagatedNativeBuildInputs = [ setupDebugInfoDirs ];
configureFlags =
[ "--program-prefix=eu-" # prevent collisions with binutils
"--enable-deterministic-archives"

81
pkgs/development/tools/misc/gdb/debug-info-from-env.patch Normal file
View file

@ -0,0 +1,81 @@
Look up .build-id files relative to the directories in the
colon-separated environment variable NIX_DEBUG_INFO_DIRS, in addition
to the existing debug-file-directory setting.
diff -ru --exclude '*gcore' --exclude '*pdtrace' gdb-8.0-orig/gdb/build-id.c gdb-8.0/gdb/build-id.c
--- gdb-8.0-orig/gdb/build-id.c 2017-06-04 17:51:26.000000000 +0200
+++ gdb-8.0/gdb/build-id.c 2017-07-28 13:18:10.797375927 +0200
@@ -67,8 +67,8 @@
/* See build-id.h. */
-gdb_bfd_ref_ptr
-build_id_to_debug_bfd (size_t build_id_len, const bfd_byte *build_id)
+static gdb_bfd_ref_ptr
+build_id_to_debug_bfd_in (const char *directories, size_t build_id_len, const bfd_byte *build_id)
{
char *link, *debugdir;
VEC (char_ptr) *debugdir_vec;
@@ -78,7 +78,7 @@
int alloc_len;
/* DEBUG_FILE_DIRECTORY/.build-id/ab/cdef */
- alloc_len = (strlen (debug_file_directory)
+ alloc_len = (strlen (directories)
+ (sizeof "/.build-id/" - 1) + 1
+ 2 * build_id_len + (sizeof ".debug" - 1) + 1);
link = (char *) alloca (alloc_len);
@@ -86,7 +86,7 @@
/* Keep backward compatibility so that DEBUG_FILE_DIRECTORY being "" will
cause "/.build-id/..." lookups. */
- debugdir_vec = dirnames_to_char_ptr_vec (debug_file_directory);
+ debugdir_vec = dirnames_to_char_ptr_vec (directories);
back_to = make_cleanup_free_char_ptr_vec (debugdir_vec);
for (ix = 0; VEC_iterate (char_ptr, debugdir_vec, ix, debugdir); ++ix)
@@ -137,6 +137,30 @@
return abfd;
}
+gdb_bfd_ref_ptr
+build_id_to_debug_bfd (size_t build_id_len, const bfd_byte *build_id)
+{
+ gdb_bfd_ref_ptr abfd = build_id_to_debug_bfd_in(debug_file_directory, build_id_len, build_id);
+
+ if (abfd != NULL)
+ return abfd;
+
+ static int init = 0;
+ static char *env_var;
+ if (!init)
+ {
+ env_var = getenv("NIX_DEBUG_INFO_DIRS");
+ init = 1;
+ }
+
+ if (env_var)
+ {
+ abfd = build_id_to_debug_bfd_in(env_var, build_id_len, build_id);
+ }
+
+ return abfd;
+}
+
/* See build-id.h. */
char *
diff -ru --exclude '*gcore' --exclude '*pdtrace' gdb-8.0-orig/gdb/symfile.c gdb-8.0/gdb/symfile.c
--- gdb-8.0-orig/gdb/symfile.c 2017-06-04 17:51:27.000000000 +0200
+++ gdb-8.0/gdb/symfile.c 2017-07-28 12:54:05.401586174 +0200
@@ -1415,8 +1415,8 @@
struct cmd_list_element *c, const char *value)
{
fprintf_filtered (file,
- _("The directory where separate debug "
- "symbols are searched for is \"%s\".\n"),
+ _("The directories where separate debug "
+ "symbols are searched for are \"%s\".\n"),
value);
}

8
pkgs/development/tools/misc/gdb/default.nix
View file

@ -11,6 +11,8 @@
# Additional dependencies for GNU/Hurd.
, mig ? null, hurd ? null
, setupDebugInfoDirs
}:
let
@ -32,7 +34,9 @@ stdenv.mkDerivation rec {
sha256 = "1vplyf8v70yn0rdqjx6awl9nmfbwaj5ynwwjxwa71rhp97z4z8pn";
};
nativeBuildInputs = [ pkgconfig texinfo perl ]
patches = [ ./debug-info-from-env.patch ];
nativeBuildInputs = [ pkgconfig texinfo perl setupDebugInfoDirs ]
# TODO(@Ericson2314) not sure if should be host or target
++ stdenv.lib.optional targetPlatform.isHurd mig;
@ -41,6 +45,8 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional targetPlatform.isHurd hurd
++ stdenv.lib.optional doCheck dejagnu;
propagatedNativeBuildInputs = [ setupDebugInfoDirs ];
enableParallelBuilding = true;
# darwin build fails with format hardening since v7.12

4
pkgs/os-specific/linux/kernel/linux-4.12.nix
View file

@ -1,12 +1,12 @@
{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.12.3";
version = "4.12.4";
extraMeta.branch = "4.12";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "05mz5rza2cn7pnn0cgd4pxal4xyjk74bl6h742v0xxlf4aqrvgcr";
sha256 = "1jasxw8ifkklyfmp0avh53zjymgqwybaz3cmh9l5ydss3xgxfw7l";
};
kernelPatches = args.kernelPatches;

4
pkgs/os-specific/linux/kernel/linux-4.4.nix
View file

@ -1,12 +1,12 @@
{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.4.78";
version = "4.4.79";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "14xnmcw0f2faizd6ylhgw929yyc30hglr82mc5c62yzgszsdngvw";
sha256 = "1a5wprjimsnx49sdg05ndmnx84m24fl48s64jvdpz58i3sss7g8d";
};
kernelPatches = args.kernelPatches;

4
pkgs/os-specific/linux/kernel/linux-4.9.nix
View file

@ -1,12 +1,12 @@
{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.9.39";
version = "4.9.40";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0cgs3kprx73qffzy0vwd3wz0jdsxbb8b9p881mrcxa3gjfxzg33f";
sha256 = "16rdcvqkgb8hfzkkzbkhznnab22z43prm56jbrxnqr9acprnfmq2";
};
kernelPatches = args.kernelPatches;

2
pkgs/top-level/all-packages.nix
View file

@ -347,6 +347,8 @@ with pkgs;
separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh;
setupDebugInfoDirs = makeSetupHook { } ../build-support/setup-hooks/setup-debug-info-dirs.sh;
useOldCXXAbi = makeSetupHook { } ../build-support/setup-hooks/use-old-cxx-abi.sh;
iconConvTools = callPackage ../build-support/icon-conv-tools {};