From ace66a7aeb45157284dc02292bc0d5d618c82b56 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Jul 2018 02:20:46 -0700 Subject: autorandr: 1.5 -> 1.6 (#43953) --- pkgs/tools/misc/autorandr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/misc') diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index 9a51553ae43a..20beacf2b4f0 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -6,7 +6,7 @@ let python = python3Packages.python; - version = "1.5"; + version = "1.6"; in stdenv.mkDerivation { name = "autorandr-${version}"; @@ -48,7 +48,7 @@ in owner = "phillipberndt"; repo = "autorandr"; rev = "${version}"; - sha256 = "01pij2r73f190qk7q3cgf5cmk0w59g9l9v4vah5vf4ddn7nnk7yq"; + sha256 = "0m4lqqinr1mqf536gll7qyrnz86ca322pf99lagj00x0r8yj9liy"; }; meta = { -- cgit 1.4.1 From 13a288dcee53c9675804c1760d60989f32c1d40c Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 22 Jul 2018 16:54:01 +0200 Subject: yad: add license see issue #43716 --- pkgs/tools/misc/yad/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/tools/misc') diff --git a/pkgs/tools/misc/yad/default.nix b/pkgs/tools/misc/yad/default.nix index 2c5a2b808a57..5c66c545636c 100644 --- a/pkgs/tools/misc/yad/default.nix +++ b/pkgs/tools/misc/yad/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [ smironov ]; + license = stdenv.lib.licenses.gpl3; }; } -- cgit 1.4.1 From 4fac5ea60ce60d16d20539e117e4ccedc75c4998 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Tue, 24 Jul 2018 17:25:28 +1000 Subject: minicom: Add macOS support --- pkgs/tools/misc/minicom/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/tools/misc') diff --git a/pkgs/tools/misc/minicom/default.nix b/pkgs/tools/misc/minicom/default.nix index 5796f6335c0b..326a3b053ed1 100644 --- a/pkgs/tools/misc/minicom/default.nix +++ b/pkgs/tools/misc/minicom/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig -, ncurses }: +, ncurses, libiconv }: stdenv.mkDerivation rec { name = "minicom-2.7.1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1wa1l36fa4npd21xa9nz60yrqwkk5cq713fa3p5v0zk7g9mq6bsk"; }; - buildInputs = [ ncurses ]; + buildInputs = [ ncurses ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { download. ''; maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } -- cgit 1.4.1 From 710f0f8c1091d5156b609b6e0035ba09c943bbe3 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sun, 22 Jul 2018 17:03:19 +0200 Subject: skarnet software: rename attributes and split outputs Change the attribute names of camelCased utils to kebab-case to improve consistency. Split every package into multiple outputs where possible. --- nixos/doc/manual/release-notes/rl-1809.xml | 9 +++++ pkgs/development/libraries/skalibs/default.nix | 14 ++++++-- pkgs/os-specific/linux/s6-linux-utils/default.nix | 18 +++++++--- pkgs/tools/misc/execline/default.nix | 22 +++++++++---- pkgs/tools/misc/s6-portable-utils/default.nix | 17 +++++++--- pkgs/tools/networking/s6-dns/default.nix | 22 +++++++++---- pkgs/tools/networking/s6-networking/default.nix | 40 +++++++++++++++-------- pkgs/tools/system/s6-rc/default.nix | 33 +++++++++++++------ pkgs/tools/system/s6/default.nix | 31 ++++++++++++++---- pkgs/top-level/aliases.nix | 4 +++ pkgs/top-level/all-packages.nix | 8 ++--- 11 files changed, 159 insertions(+), 59 deletions(-) (limited to 'pkgs/tools/misc') diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index 7fd6483bca1a..f03b1eab619d 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -362,6 +362,15 @@ inherit (pkgs.nixos { The module now uses WPA2 by default. + + + s6Dns, s6Networking, + s6LinuxUtils and s6PortableUtils + renamed to + s6-dns, s6-networking, + s6-linux-utils and s6-portable-utils respectively. + + diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix index 29cc477a279d..01eda4890d11 100644 --- a/pkgs/development/libraries/skalibs/default.nix +++ b/pkgs/development/libraries/skalibs/default.nix @@ -14,15 +14,18 @@ in stdenv.mkDerivation rec { sha256 = "0skdv3wff1i78hb0y771apw0cak5rzxbwbh6l922snfm01z9k1ws"; }; + outputs = [ "lib" "dev" "doc" "out" ]; + dontDisableStatic = true; enableParallelBuilding = true; configureFlags = [ "--enable-force-devr" # assume /dev/random works - "--libdir=\${prefix}/lib" - "--includedir=\${prefix}/include" - "--sysdepdir=\${prefix}/lib/skalibs/sysdeps" + "--libdir=\${lib}/lib" + "--dynlibdir=\${lib}/lib" + "--includedir=\${dev}/include" + "--sysdepdir=\${lib}/lib/skalibs/sysdeps" ] ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) # On darwin, the target triplet from -dumpmachine includes version number, but @@ -32,6 +35,11 @@ in stdenv.mkDerivation rec { # http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}"); + postInstall = '' + mkdir -p $doc/share/doc/skalibs + mv doc $doc/share/doc/skalibs/html + ''; + meta = { homepage = http://skarnet.org/software/skalibs/; description = "A set of general-purpose C programming libraries"; diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix index f24d8d1f875c..9a7d1a9fc7d3 100644 --- a/pkgs/os-specific/linux/s6-linux-utils/default.nix +++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix @@ -13,17 +13,25 @@ in stdenv.mkDerivation rec { sha256 = "0245rmk7wfyyfsi4g7f0niprwlvqlwkbyjxflb8kkbvhwfdavqip"; }; + outputs = [ "bin" "dev" "doc" "out" ]; + dontDisableStatic = true; configureFlags = [ "--enable-absolute-paths" - "--includedir=\${prefix}/include" - "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" - "--with-include=${skalibs}/include" - "--with-lib=${skalibs}/lib" - "--with-dynlib=${skalibs}/lib" + "--bindir=\${bin}/bin" + "--includedir=\${dev}/include" + "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps" + "--with-include=${skalibs.dev}/include" + "--with-lib=${skalibs.lib}/lib" + "--with-dynlib=${skalibs.lib}/lib" ]; + postInstall = '' + mkdir -p $doc/share/doc/s6-networking/ + mv doc $doc/share/doc/s6-networking/html + ''; + meta = { homepage = http://www.skarnet.org/software/s6-linux-utils/; description = "A set of minimalistic Linux-specific system utilities"; diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix index 6a13d289efc0..26cd9112f58d 100644 --- a/pkgs/tools/misc/execline/default.nix +++ b/pkgs/tools/misc/execline/default.nix @@ -14,22 +14,32 @@ in stdenv.mkDerivation rec { sha256 = "1q0izb8ajzxl36fjpy4rn63sz01055r9s33fga99jprdmkkfzz6x"; }; + outputs = [ "bin" "lib" "dev" "doc" "out" ]; + dontDisableStatic = true; enableParallelBuilding = true; configureFlags = [ "--enable-absolute-paths" - "--libdir=\${prefix}/lib" - "--includedir=\${prefix}/include" - "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" - "--with-include=${skalibs}/include" - "--with-lib=${skalibs}/lib" - "--with-dynlib=${skalibs}/lib" + "--libdir=\${lib}/lib" + "--dynlibdir=\${lib}/lib" + "--bindir=\${bin}/bin" + "--includedir=\${dev}/include" + "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps" + "--with-include=${skalibs.dev}/include" + "--with-lib=${skalibs.lib}/lib" + "--with-dynlib=${skalibs.lib}/lib" ] ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}"); + postInstall = '' + mkdir -p $doc/share/doc/execline + mv doc $doc/share/doc/execline/html + mv examples $doc/share/doc/execline/examples + ''; + meta = { homepage = http://skarnet.org/software/execline/; description = "A small scripting language, to be used in place of a shell in non-interactive scripts"; diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index 082eb6879c41..6d37cea0b23a 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -11,14 +11,18 @@ stdenv.mkDerivation rec { sha256 = "0ca5iiq3n6isj64jb81xpwjzjx1q8jg145nnnn91ra2qqk93kqka"; }; + outputs = [ "bin" "dev" "doc" "out" ]; + dontDisableStatic = true; configureFlags = [ "--enable-absolute-paths" - "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" - "--with-include=${skalibs}/include" - "--with-lib=${skalibs}/lib" - "--with-dynlib=${skalibs}/lib" + "--bindir=\${bin}/bin" + "--includedir=\${dev}/include" + "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps" + "--with-include=${skalibs.dev}/include" + "--with-lib=${skalibs.lib}/lib" + "--with-dynlib=${skalibs.lib}/lib" ] # On darwin, the target triplet from -dumpmachine includes version number, but # skarnet.org software uses the triplet to test binary compatibility. @@ -27,6 +31,11 @@ stdenv.mkDerivation rec { # http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}"); + postInstall = '' + mkdir -p $doc/share/doc/s6-portable-utils/ + mv doc $doc/share/doc/s6-portable-utils/html + ''; + meta = { homepage = http://www.skarnet.org/software/s6-portable-utils/; description = "A set of tiny general Unix utilities optimized for simplicity and small size"; diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix index 7134e969fd08..964782de06f8 100644 --- a/pkgs/tools/networking/s6-dns/default.nix +++ b/pkgs/tools/networking/s6-dns/default.nix @@ -14,22 +14,32 @@ in stdenv.mkDerivation rec { sha256 = "10qvkh608nsx8gqs3pj4pb8aivwpshbmjw2766grgmrb35d31brl"; }; + outputs = [ "bin" "lib" "dev" "doc" "out" ]; + dontDisableStatic = true; enableParallelBuilding = true; configureFlags = [ "--enable-absolute-paths" - "--includedir=\${prefix}/include" - "--libdir=\${prefix}/lib" - "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" - "--with-include=${skalibs}/include" - "--with-lib=${skalibs}/lib" - "--with-dynlib=${skalibs}/lib" + "--libdir=\${lib}/lib" + "--libexecdir=\${lib}/libexec" + "--dynlibdir=\${lib}/lib" + "--bindir=\${bin}/bin" + "--includedir=\${dev}/include" + "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps" + "--with-include=${skalibs.dev}/include" + "--with-lib=${skalibs.lib}/lib" + "--with-dynlib=${skalibs.lib}/lib" ] ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}"); + postInstall = '' + mkdir -p $doc/share/doc/s6-dns/ + mv doc $doc/share/doc/s6-dns/html + ''; + meta = { homepage = http://www.skarnet.org/software/s6-dns/; description = "A suite of DNS client programs and libraries for Unix systems"; diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix index 3239a8f49e65..fb5f02bbe68f 100644 --- a/pkgs/tools/networking/s6-networking/default.nix +++ b/pkgs/tools/networking/s6-networking/default.nix @@ -1,4 +1,4 @@ -{ stdenv, execline, fetchgit, s6, s6Dns, skalibs }: +{ stdenv, execline, fetchgit, s6, s6-dns, skalibs }: let @@ -14,28 +14,40 @@ in stdenv.mkDerivation rec { sha256 = "1qrhca8yjaysrqf7nx3yjfyfi9yly3rxpgrd2sqj0a0ckk73rv42"; }; + outputs = [ "bin" "lib" "dev" "doc" "out" ]; + dontDisableStatic = true; enableParallelBuilding = true; configureFlags = [ "--enable-absolute-paths" - "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" - "--with-include=${skalibs}/include" - "--with-include=${execline}/include" - "--with-include=${s6}/include" - "--with-include=${s6Dns}/include" - "--with-lib=${skalibs}/lib" - "--with-lib=${execline}/lib" - "--with-lib=${s6}/lib/s6" - "--with-lib=${s6Dns}/lib" - "--with-dynlib=${skalibs}/lib" - "--with-dynlib=${execline}/lib" - "--with-dynlib=${s6}/lib" - "--with-dynlib=${s6Dns}/lib" + "--libdir=\${lib}/lib" + "--libexecdir=\${lib}/libexec" + "--dynlibdir=\${lib}/lib" + "--bindir=\${bin}/bin" + "--includedir=\${dev}/include" + "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps" + "--with-include=${skalibs.dev}/include" + "--with-include=${execline.dev}/include" + "--with-include=${s6.dev}/include" + "--with-include=${s6-dns.dev}/include" + "--with-lib=${skalibs.lib}/lib" + "--with-lib=${execline.lib}/lib" + "--with-lib=${s6.out}/lib" + "--with-lib=${s6-dns.lib}/lib" + "--with-dynlib=${skalibs.lib}/lib" + "--with-dynlib=${execline.lib}/lib" + "--with-dynlib=${s6.out}/lib" + "--with-dynlib=${s6-dns.lib}/lib" ] ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}"); + postInstall = '' + mkdir -p $doc/share/doc/s6-networking/ + mv doc $doc/share/doc/s6-networking/html + ''; + meta = { homepage = http://www.skarnet.org/software/s6-networking/; description = "A suite of small networking utilities for Unix systems"; diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix index ed1da8d450dc..b5ac30f3582f 100644 --- a/pkgs/tools/system/s6-rc/default.nix +++ b/pkgs/tools/system/s6-rc/default.nix @@ -14,26 +14,39 @@ in stdenv.mkDerivation rec { sha256 = "174a3l92nkhxrx8gq36xmb5a7krj40iz1xdiii25nxwjfiw5ynfb"; }; + outputs = [ "bin" "lib" "dev" "doc" "out" ]; + dontDisableStatic = true; enableParallelBuilding = true; configureFlags = [ "--enable-absolute-paths" - "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" - "--with-include=${skalibs}/include" - "--with-include=${execline}/include" - "--with-include=${s6}/include" - "--with-lib=${skalibs}/lib" - "--with-lib=${execline}/lib" - "--with-lib=${s6}/lib/s6" - "--with-dynlib=${skalibs}/lib" - "--with-dynlib=${execline}/lib" - "--with-dynlib=${s6}/lib" + "--libdir=\${lib}/lib" + "--libexecdir=\${lib}/libexec" + "--dynlibdir=\${lib}/lib" + "--bindir=\${bin}/bin" + "--includedir=\${dev}/include" + "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps" + "--with-include=${skalibs.dev}/include" + "--with-include=${execline.dev}/include" + "--with-include=${s6.dev}/include" + "--with-lib=${skalibs.lib}/lib" + "--with-lib=${execline.lib}/lib" + "--with-lib=${s6.out}/lib" + "--with-dynlib=${skalibs.lib}/lib" + "--with-dynlib=${execline.lib}/lib" + "--with-dynlib=${s6.out}/lib" ] ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}"); + postInstall = '' + mkdir -p $doc/share/doc/s6-rc/ + mv doc $doc/share/doc/s6-rc/html + mv examples $doc/share/doc/s6-rc/examples + ''; + meta = { homepage = http://skarnet.org/software/s6-rc/; description = "A service manager for s6-based systems"; diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/tools/system/s6/default.nix index b8607a983570..8338b357c57a 100644 --- a/pkgs/tools/system/s6/default.nix +++ b/pkgs/tools/system/s6/default.nix @@ -14,23 +14,40 @@ in stdenv.mkDerivation rec { sha256 = "162hng8xcwjp8pr4d78zq3f82lm9c6ldbcfll0mjsmnxdds5hrsg"; }; + # NOTE lib: cannot split lib from bin at the moment, + # since some parts of lib depend on executables in bin. + # (the `*_startf` functions in `libs6`) + + outputs = [ /*"bin" "lib"*/ "out" "dev" "doc" ]; + dontDisableStatic = true; enableParallelBuilding = true; configureFlags = [ "--enable-absolute-paths" - "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" - "--with-include=${skalibs}/include" - "--with-include=${execline}/include" - "--with-lib=${skalibs}/lib" - "--with-lib=${execline}/lib" - "--with-dynlib=${skalibs}/lib" - "--with-dynlib=${execline}/lib" + "--libdir=\${out}/lib" + "--libexecdir=\${out}/libexec" + "--dynlibdir=\${out}/lib" + "--bindir=\${out}/bin" + "--includedir=\${dev}/include" + "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps" + "--with-include=${skalibs.dev}/include" + "--with-include=${execline.dev}/include" + "--with-lib=${skalibs.lib}/lib" + "--with-lib=${execline.lib}/lib" + "--with-dynlib=${skalibs.lib}/lib" + "--with-dynlib=${execline.lib}/lib" ] ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}"); + postInstall = '' + mkdir -p $doc/share/doc/s6/ + mv doc $doc/share/doc/s6/html + mv examples $doc/share/doc/s6/examples + ''; + meta = { homepage = http://www.skarnet.org/software/s6/; description = "skarnet.org's small & secure supervision software suite"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fe77a591876f..55251c904514 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -229,6 +229,10 @@ mapAliases ({ ruby_2_5_0 = throw "deprecated 2018-0213: use ruby_2_5 instead"; rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby"; rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02 + s6Dns = s6-dns; # added 2018-07-23 + s6Networking = s6-networking; # added 2018-07-23 + s6LinuxUtils = s6-linux-utils; # added 2018-07-23 + s6PortableUtils = s6-portable-utils; # added 2018-07-23 sam = deadpixi-sam; # added 2018-04-25 samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25 saneBackends = sane-backends; # added 2016-01-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed28a7563601..da44294f6379 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4939,13 +4939,13 @@ with pkgs; s3gof3r = callPackage ../tools/networking/s3gof3r { }; - s6Dns = callPackage ../tools/networking/s6-dns { }; + s6-dns = callPackage ../tools/networking/s6-dns { }; - s6LinuxUtils = callPackage ../os-specific/linux/s6-linux-utils { }; + s6-linux-utils = callPackage ../os-specific/linux/s6-linux-utils { }; - s6Networking = callPackage ../tools/networking/s6-networking { }; + s6-networking = callPackage ../tools/networking/s6-networking { }; - s6PortableUtils = callPackage ../tools/misc/s6-portable-utils { }; + s6-portable-utils = callPackage ../tools/misc/s6-portable-utils { }; sablotron = callPackage ../tools/text/xml/sablotron { }; -- cgit 1.4.1 From 4295da8af4bf330c79031645ca650caf3cc5b625 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sun, 22 Jul 2018 21:44:10 +0200 Subject: skarnet software: add Profpatsch as maintainer --- pkgs/development/libraries/skalibs/default.nix | 2 +- pkgs/os-specific/linux/s6-linux-utils/default.nix | 2 +- pkgs/tools/misc/execline/default.nix | 2 +- pkgs/tools/misc/s6-portable-utils/default.nix | 2 +- pkgs/tools/networking/s6-dns/default.nix | 2 +- pkgs/tools/networking/s6-networking/default.nix | 2 +- pkgs/tools/system/s6-rc/default.nix | 2 +- pkgs/tools/system/s6/default.nix | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'pkgs/tools/misc') diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix index 01eda4890d11..6fe88fd7cea8 100644 --- a/pkgs/development/libraries/skalibs/default.nix +++ b/pkgs/development/libraries/skalibs/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { description = "A set of general-purpose C programming libraries"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ pmahoney ]; + maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ]; }; } diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix index 9a7d1a9fc7d3..dbef7c41c067 100644 --- a/pkgs/os-specific/linux/s6-linux-utils/default.nix +++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { description = "A set of minimalistic Linux-specific system utilities"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ pmahoney ]; + maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ]; }; } diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix index 26cd9112f58d..6cd9623ad1c0 100644 --- a/pkgs/tools/misc/execline/default.nix +++ b/pkgs/tools/misc/execline/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { description = "A small scripting language, to be used in place of a shell in non-interactive scripts"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ pmahoney ]; + maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ]; }; } diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index 6d37cea0b23a..014e000eabdb 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { description = "A set of tiny general Unix utilities optimized for simplicity and small size"; platforms = platforms.all; license = licenses.isc; - maintainers = with maintainers; [ pmahoney ]; + maintainers = with maintainers; [ pmahoney Profpatsch ]; }; } diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix index 964782de06f8..c0163f066aae 100644 --- a/pkgs/tools/networking/s6-dns/default.nix +++ b/pkgs/tools/networking/s6-dns/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { description = "A suite of DNS client programs and libraries for Unix systems"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ pmahoney ]; + maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ]; }; } diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix index fb5f02bbe68f..c70e8273163a 100644 --- a/pkgs/tools/networking/s6-networking/default.nix +++ b/pkgs/tools/networking/s6-networking/default.nix @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { description = "A suite of small networking utilities for Unix systems"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ pmahoney ]; + maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ]; }; } diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix index b5ac30f3582f..5436c2f8c707 100644 --- a/pkgs/tools/system/s6-rc/default.nix +++ b/pkgs/tools/system/s6-rc/default.nix @@ -52,7 +52,7 @@ in stdenv.mkDerivation rec { description = "A service manager for s6-based systems"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ pmahoney ]; + maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ]; }; } diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/tools/system/s6/default.nix index 8338b357c57a..05666a7ad678 100644 --- a/pkgs/tools/system/s6/default.nix +++ b/pkgs/tools/system/s6/default.nix @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { description = "skarnet.org's small & secure supervision software suite"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ pmahoney ]; + maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ]; }; } -- cgit 1.4.1 From 0438900c7a3f138df81a68a8228375db5884671f Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Wed, 25 Jul 2018 11:34:32 +0930 Subject: eot_utilities: change platforms to unix This works on Darwin too. --- pkgs/tools/misc/eot-utilities/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/tools/misc') diff --git a/pkgs/tools/misc/eot-utilities/default.nix b/pkgs/tools/misc/eot-utilities/default.nix index b44159be8ce8..b9efead27988 100644 --- a/pkgs/tools/misc/eot-utilities/default.nix +++ b/pkgs/tools/misc/eot-utilities/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { description = "Create Embedded Open Type from OpenType or TrueType font"; license = stdenv.lib.licenses.w3c; maintainers = with stdenv.lib.maintainers; [ leenaars ]; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; unix; }; } -- cgit 1.4.1