diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-11-02 14:36:19 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-11-02 14:40:14 +0100 |
commit | a92a2c8e158c1a67486e17063d04e448f25b865c (patch) | |
tree | db7fac830d1fbd363ccaeecc300a2e492844f33d /pkgs/os-specific | |
parent | a53bc2c2659d638982e15c6e981e447f5e88075f (diff) | |
parent | 87e4e1ba72dafd0ea1208cd959d047c04612b4aa (diff) | |
download | nixlib-a92a2c8e158c1a67486e17063d04e448f25b865c.tar nixlib-a92a2c8e158c1a67486e17063d04e448f25b865c.tar.gz nixlib-a92a2c8e158c1a67486e17063d04e448f25b865c.tar.bz2 nixlib-a92a2c8e158c1a67486e17063d04e448f25b865c.tar.lz nixlib-a92a2c8e158c1a67486e17063d04e448f25b865c.tar.xz nixlib-a92a2c8e158c1a67486e17063d04e448f25b865c.tar.zst nixlib-a92a2c8e158c1a67486e17063d04e448f25b865c.zip |
Merge branch 'master' into staging
Conflict: rename of pythondaemon -> python-daemon.
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/dropwatch/default.nix | 35 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix | 6 | ||||
-rw-r--r-- | pkgs/os-specific/linux/pmtools/default.nix | 23 | ||||
-rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 7 | ||||
-rw-r--r-- | pkgs/os-specific/linux/thunderbolt/default.nix | 21 |
5 files changed, 48 insertions, 44 deletions
diff --git a/pkgs/os-specific/linux/dropwatch/default.nix b/pkgs/os-specific/linux/dropwatch/default.nix new file mode 100644 index 000000000000..936dbf719a87 --- /dev/null +++ b/pkgs/os-specific/linux/dropwatch/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +, libnl, readline, libbfd, ncurses, zlib }: + +stdenv.mkDerivation rec { + pname = "dropwatch"; + version = "1.5"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "nhorman"; + repo = pname; + rev = version; + sha256 = "085hyyl28v0vpxfnmzchl97fjfnzj46ynhkg6y4i6h194y0d99m7"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ libbfd libnl ncurses readline zlib ]; + + # To avoid running into https://sourceware.org/bugzilla/show_bug.cgi?id=14243 we need to define: + NIX_CFLAGS_COMPILE = [ + "-DPACKAGE=${pname}" + "-DPACKAGE_VERSION=${version}" + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Kernel dropped packet monitor"; + homepage = https://github.com/nhorman/dropwatch; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.c0bw3b ]; + }; +} diff --git a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix index fc9cb2f238b2..8ad96f4f1bfb 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix @@ -1,10 +1,10 @@ { stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.14.73-149"; + version = "4.14.78-150"; # modDirVersion needs to be x.y.z. - modDirVersion = "4.14.73"; + modDirVersion = "4.14.78"; # branchVersion needs to be x.y. extraMeta.branch = "4.14"; @@ -13,7 +13,7 @@ buildLinux (args // rec { owner = "hardkernel"; repo = "linux"; rev = version; - sha256 = "1zc5py6v3xyvy6dwghnqb7nsn9l1aib3d96i5bqy9dd56vyiy5m2"; + sha256 = "0139qciaf1vlz41s9idjbcx20c1svrp1l7qaazfkwfx52ghb4pvv"; }; defconfig = "odroidxu4_defconfig"; diff --git a/pkgs/os-specific/linux/pmtools/default.nix b/pkgs/os-specific/linux/pmtools/default.nix deleted file mode 100644 index a284924f0058..000000000000 --- a/pkgs/os-specific/linux/pmtools/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - name = "pmtools-20071116"; - - src = fetchurl { - url = "http://www.lesswatts.org/patches/linux_acpi/${name}.tar.gz"; - sha256 = "91751774976e39f6237efd0326eb35196a9346220b92ad35894a33283e872748"; - }; - - installPhase = '' - mkdir -p $out/bin $out/share/pmtools - cp acpidump/acpidump acpixtract/acpixtract madt/madt $out/bin/ - cp README $out/share/pmtools/ - ''; - - meta = { - homepage = http://www.lesswatts.org/projects/acpi/utilities.php; - description = "Linux ACPI utilities"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index db64b8e6f6de..2a17a0a2875f 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -18,7 +18,7 @@ let pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]); in stdenv.mkDerivation rec { - version = "239"; + version = "239.20181031"; name = "systemd-${version}"; # When updating, use https://github.com/systemd/systemd-stable tree, not the development one! @@ -26,8 +26,8 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "NixOS"; repo = "systemd"; - rev = "31859ddd35fc3fa82a583744caa836d356c31d7f"; - sha256 = "1xci0491j95vdjgs397n618zii3sgwnvanirkblqqw6bcvcjvir1"; + rev = "nixos-v${version}"; + sha256 = "1rzl0iqrpa4ajvama5k3cb3yc7893c55kzcxkl3cyavpdzsw5505"; }; outputs = [ "out" "lib" "man" "dev" ]; @@ -91,6 +91,7 @@ in stdenv.mkDerivation rec { "-Dsulogin-path=${utillinux}/bin/sulogin" "-Dmount-path=${utillinux}/bin/mount" "-Dumount-path=${utillinux}/bin/umount" + "-Ddns-over-tls=false" ]; preConfigure = '' diff --git a/pkgs/os-specific/linux/thunderbolt/default.nix b/pkgs/os-specific/linux/thunderbolt/default.nix index ac687de8c9ab..faf47c96a5e6 100644 --- a/pkgs/os-specific/linux/thunderbolt/default.nix +++ b/pkgs/os-specific/linux/thunderbolt/default.nix @@ -16,22 +16,13 @@ stdenv.mkDerivation rec { sha256 = "02w1bfm7xvq0dzkhwqiq0camkzz9kvciyhnsis61c8vzp39cwx0x"; }; - buildInputs = [ - boost - cmake - pkgconfig - txt2tags - ]; + nativeBuildInputs = [ cmake pkgconfig txt2tags ]; + buildInputs = [ boost ]; - # These can't go in the normal nix cmakeFlags because $out needs to be - # expanded by the shell, not by cmake or nix. $ENV{out} doesn't work right - # either; it results in /build/source/build//nix/store/blahblahblahblah/bin/ - # TODO: use ${placeholder "out"} when possible. - # See https://github.com/NixOS/nixpkgs/pull/37693 - preConfigure = '' - cmakeFlags+=" -DUDEV_BIN_DIR=$out/bin" - cmakeFlags+=" -DUDEV_RULES_DIR=$out/etc/udev/rules.d" - ''; + cmakeFlags = [ + "-DUDEV_BIN_DIR=${placeholder "out"}/bin" + "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d" + ]; meta = { description = "Thunderbolt(TM) user-space components"; |