From e861f313442d12f752b120daf533d7c35aa69998 Mon Sep 17 00:00:00 2001 From: stites Date: Fri, 7 Sep 2018 10:27:03 -0400 Subject: [PATCH 1/5] add stites to maintainers list (cherry picked from commit 82f980828df4037b98c11a6490d4f8916b01f570) --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6c524d321771..1700da9af7c2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3893,6 +3893,11 @@ github = "StillerHarpo"; name = "Florian Engel"; }; + stites = { + email = "sam@stites.io"; + github = "stites"; + name = "Sam Stites"; + }; stumoss = { email = "samoss@gmail.com"; github = "stumoss"; From e835796a18b69247ccd578e2919446cf02dbb90b Mon Sep 17 00:00:00 2001 From: stites Date: Fri, 7 Sep 2018 10:27:27 -0400 Subject: [PATCH 2/5] noti: init at 3.1.0 (cherry picked from commit f1c30cf77227c2f1964921fa26a2675dd671ff93) --- pkgs/tools/misc/noti/default.nix | 38 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/tools/misc/noti/default.nix diff --git a/pkgs/tools/misc/noti/default.nix b/pkgs/tools/misc/noti/default.nix new file mode 100644 index 000000000000..ac5b4199c216 --- /dev/null +++ b/pkgs/tools/misc/noti/default.nix @@ -0,0 +1,38 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "noti-${version}"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "variadico"; + repo = "noti"; + rev = "${version}"; + sha256 = "1chsqfqk0pnhx5k2nr4c16cpb8m6zv69l1jvv4v4903zgfzcm823"; + }; + + goPackagePath = "github.com/variadico/noti"; + + preBuild = '' + buildFlagsArray+=("-ldflags" "-X ${goPackagePath}/internal/command.Version=${version}") + ''; + + postInstall = '' + mkdir -p $out/share/man/man{1,5}/ + cp $src/docs/man/noti.1 $out/share/man/man1/ + cp $src/docs/man/noti.yaml.5 $out/share/man/man5/ + ''; + + meta = with stdenv.lib; { + description = "Monitor a process and trigger a notification."; + longDescription = '' + Monitor a process and trigger a notification. + + Never sit and wait for some long-running process to finish. Noti can alert you when it's done. You can receive messages on your computer or phone. + ''; + homepage = https://github.com/variadico/noti; + license = licenses.mit; + maintainers = [ maintainers.stites ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ec67128b9f50..1826fa547dc0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1462,6 +1462,8 @@ with pkgs; noteshrink = callPackage ../tools/misc/noteshrink { }; + noti = callPackage ../tools/misc/noti { }; + nrsc5 = callPackage ../applications/misc/nrsc5 { }; nwipe = callPackage ../tools/security/nwipe { }; From 583a32148cdadb6cf514409d825703beec6b4c5a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 18 Sep 2018 20:13:46 -0500 Subject: [PATCH 3/5] noti: fix darwin build (cherry picked from commit 4c56eb81e9522c74b85f2aadf14f619288191dad) --- pkgs/tools/misc/noti/default.nix | 6 +++++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/noti/default.nix b/pkgs/tools/misc/noti/default.nix index ac5b4199c216..23646abe7875 100644 --- a/pkgs/tools/misc/noti/default.nix +++ b/pkgs/tools/misc/noti/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, Cocoa }: buildGoPackage rec { name = "noti-${version}"; @@ -11,6 +11,10 @@ buildGoPackage rec { sha256 = "1chsqfqk0pnhx5k2nr4c16cpb8m6zv69l1jvv4v4903zgfzcm823"; }; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; + # TODO: Remove this when we update apple_sdk + NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.isDarwin [ "-fno-objc-arc" ]; + goPackagePath = "github.com/variadico/noti"; preBuild = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1826fa547dc0..c0a2299deb4f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1462,7 +1462,9 @@ with pkgs; noteshrink = callPackage ../tools/misc/noteshrink { }; - noti = callPackage ../tools/misc/noti { }; + noti = callPackage ../tools/misc/noti { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; nrsc5 = callPackage ../applications/misc/nrsc5 { }; From a3fd29883a3e1f6656bcb928849a805ade95c66a Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 6 Aug 2018 19:18:02 -0400 Subject: [PATCH 4/5] paxctl: Fix cross and Darwin builds --- pkgs/os-specific/linux/paxctl/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/paxctl/default.nix b/pkgs/os-specific/linux/paxctl/default.nix index 270be695f03a..52e4c512f9a2 100644 --- a/pkgs/os-specific/linux/paxctl/default.nix +++ b/pkgs/os-specific/linux/paxctl/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, stdenv, elf-header }: stdenv.mkDerivation rec { name = "paxctl-${version}"; @@ -9,7 +9,17 @@ stdenv.mkDerivation rec { sha256 = "0biw882fp1lmgs6kpxznp1v6758r7dg9x8iv5a06k0b82bcdsc53"; }; - preBuild = '' + # TODO Always do first way next mass rebuild. + buildInputs = stdenv.lib.optional + (!stdenv.hostPlatform.isLinux || !stdenv.buildPlatform.isLinux) + elf-header; + + # TODO Always do first way next mass rebuild. + preBuild = if !stdenv.hostPlatform.isLinux || !stdenv.buildPlatform.isLinux then '' + sed -i Makefile \ + -e 's|--owner 0 --group 0||g' \ + -e '/CC:=gcc/d' + '' else '' sed "s|--owner 0 --group 0||g" -i Makefile ''; @@ -24,7 +34,7 @@ stdenv.mkDerivation rec { description = "A tool for controlling PaX flags on a per binary basis"; homepage = "https://pax.grsecurity.net"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ thoughtpolice ]; }; } From f49ca01c50c37d5f050fc5053d48e0605d10d4f8 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 26 Sep 2018 11:26:27 -0400 Subject: [PATCH 5/5] Revert "stdenv: partial revert of f2bb59e" This reverts commit 607063f61be3b19a2da054776b360d9c5b03038a. --- pkgs/stdenv/cross/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index d1efa3602374..daa9f66615c9 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -53,6 +53,9 @@ in lib.init bootStages ++ [ else buildPackages.gcc; extraNativeBuildInputs = old.extraNativeBuildInputs + ++ lib.optionals + (hostPlatform.isLinux && !buildPlatform.isLinux) + [ buildPackages.patchelf buildPackages.paxctl ] ++ lib.optional (let f = p: !p.isx86 || p.libc == "musl"; in f hostPlatform && !(f buildPlatform)) buildPackages.updateAutotoolsGnuConfigScriptsHook