From 4f9f00fcc9ba5fce1bf476bf3e3200bdbed00f48 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 23 Jan 2017 18:35:03 -0500 Subject: Add function to build a ghc standalone archive (OSX/iOS only) --- pkgs/os-specific/darwin/ghc-standalone-archive/default.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 pkgs/os-specific/darwin/ghc-standalone-archive/default.nix (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix b/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix new file mode 100644 index 000000000000..d23328d362e0 --- /dev/null +++ b/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix @@ -0,0 +1,14 @@ +{ runCommand, cctools }: +{ haskellPackages, src, deps ? p : [], name }: let + inherit (haskellPackages) ghc ghcWithPackages; + with-env = ghcWithPackages deps; + crossPrefix = if (ghc.cross or null) != null then "${ghc.cross.config}-" else ""; + ghcName = "${crossPrefix}ghc"; +in runCommand name { buildInputs = [ with-env cctools ]; } '' + mkdir -p $out/lib + mkdir -p $out/include + ${ghcName} ${src} -staticlib -outputdir . -o $out/lib/${name}.a -stubdir $out/include + for file in ${ghc}/lib/${ghcName}-${ghc.version}/include/*; do + ln -sv $file $out/include + done +'' -- cgit 1.4.1 From adfb7e1f13c3129262551c4cee1912962bafdd2c Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 24 Jan 2017 08:31:11 +0100 Subject: kwm: init at 1.1.4 --- pkgs/os-specific/darwin/khd/default.nix | 42 +++++++++++++++++++++++++ pkgs/os-specific/darwin/khd/org.nixos.khd.plist | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 3 files changed, 79 insertions(+) create mode 100644 pkgs/os-specific/darwin/khd/default.nix create mode 100644 pkgs/os-specific/darwin/khd/org.nixos.khd.plist (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/darwin/khd/default.nix b/pkgs/os-specific/darwin/khd/default.nix new file mode 100644 index 000000000000..f08073a8901e --- /dev/null +++ b/pkgs/os-specific/darwin/khd/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub, Carbon, Cocoa }: + +stdenv.mkDerivation rec { + name = "khd-${version}"; + version = "1.1.4"; + + src = fetchFromGitHub { + owner = "koekeishiya"; + repo = "khd"; + rev = "v${version}"; + sha256 = "1klia3fywl0c88zbp5wdn6kxhdwdry1jwmkj27vpv8vzvdfzwfmy"; + }; + + buildInputs = [ Carbon Cocoa ]; + + prePatch = '' + substituteInPlace makefile \ + --replace g++ clang++ + ''; + + buildPhase = '' + make install + ''; + + installPhase = '' + mkdir -p $out/bin + cp bin/khd $out/bin/khd + + mkdir -p $out/Library/LaunchDaemons + cp ${./org.nixos.khd.plist} $out/Library/LaunchDaemons/org.nixos.khd.plist + substituteInPlace $out/Library/LaunchDaemons/org.nixos.khd.plist --subst-var out + ''; + + meta = with stdenv.lib; { + description = "A simple modal hototkey daemon for OSX"; + homepage = https://github.com/koekeishiya/khd; + downloadPage = https://github.com/koekeishiya/khd/releases; + platforms = platforms.darwin; + maintainers = with maintainers; [ lnl7 ]; + license = licenses.mit; + }; +} diff --git a/pkgs/os-specific/darwin/khd/org.nixos.khd.plist b/pkgs/os-specific/darwin/khd/org.nixos.khd.plist new file mode 100644 index 000000000000..3c0aaa81eb61 --- /dev/null +++ b/pkgs/os-specific/darwin/khd/org.nixos.khd.plist @@ -0,0 +1,33 @@ + + + + + Label + org.nixos.khd + ProgramArguments + + @out@/bin/khd + + KeepAlive + + ProcessType + Interactive + EnvironmentVariables + + PATH + @out@/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin + + Sockets + + Listeners + + SockServiceName + 3021 + SockType + dgram + SockFamily + IPv4 + + + + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 944f9c9d2258..84ea9ddb87aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -524,6 +524,10 @@ in oracle-instantclient = callPackage ../development/libraries/oracle-instantclient { }; + khd = callPackage ../os-specific/darwin/khd { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + }; + reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace {}; install_name_tool = callPackage ../os-specific/darwin/install_name_tool { }; -- cgit 1.4.1 From 7c5324f29ad67aca5b4fee3074e70e807249e46f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 24 Jan 2017 11:46:56 +0100 Subject: nftables: disable broken xtables support --- pkgs/os-specific/linux/nftables/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index 78b13b902c8d..c06de7ea6f2c 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, docbook2x, docbook_xml_dtd_45 -, flex, bison, libmnl, libnftnl, gmp, readline, iptables }: +, flex, bison, libmnl, libnftnl, gmp, readline }: stdenv.mkDerivation rec { name = "nftables-0.7"; @@ -12,13 +12,12 @@ stdenv.mkDerivation rec { configureFlags = [ "CONFIG_MAN=y" "DB2MAN=docbook2man" - "--with-xtables" ]; XML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml"; nativeBuildInputs = [ pkgconfig docbook2x flex bison ]; - buildInputs = [ libmnl libnftnl gmp readline iptables ]; + buildInputs = [ libmnl libnftnl gmp readline ]; meta = with stdenv.lib; { description = "The project that aims to replace the existing {ip,ip6,arp,eb}tables framework"; -- cgit 1.4.1 From a82810c7a7e62848b75739b1cccddca8f1363c75 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 24 Jan 2017 11:37:35 +0100 Subject: linux: Apply 9p veryloose patch to 4.9 --- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 42a6e0d037b9..ec114f93e83f 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -175,12 +175,12 @@ rec { }; }; - p9_caching_4_4 = rec + p9_caching_4_9 = rec { name = "9p-caching.patch"; patch = fetchpatch { inherit name; - url = https://github.com/edolstra/linux/commit/d522582553368b9564e2d88a8d7b1d469bf98c65.patch; - sha256 = "01h7461pdgavd6ghd6w9wg136hkaca0mrmmzhy6s3phksksimbc2"; + url = https://github.com/edolstra/linux/commit/7e20254412c780a2102761fee92cb1d32ceeaefd.patch; + sha256 = "001kf1sdy6pirn8sqnfgbfahvwwkc7n7vr5i8fy2n74xph1kks5a"; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d2b4cf52014..ac59998dde4e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11243,7 +11243,6 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.cpu-cgroup-v2."4.4" - kernelPatches.p9_caching_4_4 ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu @@ -11260,6 +11259,7 @@ in # !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking # kernelPatches.cpu-cgroup-v2."4.7" kernelPatches.modinst_arg_list_too_long + kernelPatches.p9_caching_4_9 ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu @@ -11272,6 +11272,7 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long + kernelPatches.p9_caching_4_9 ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill -- cgit 1.4.1