unixtools refactor #43259

matthewbauer · 2018-07-09T16:01:32Z

Motivation for this change

This refactors unixtools to make things easier to work with. Also remove watch command in favor of using procps-ng directly.

openjdk: fix build for !enableGnome2

vampire: portability fixes

pdfjs: 1.7.225 -> 1.10.100

Fixes https://josm.openstreetmap.de/ticket/11806

Fixes NixOS#43001.

Resembles idris --noprelude and --nobasepkgs arguments

@dezgeg

I have renamed the overlay to “otherPackageSets” because I think that is more descriptive. pkgsLocal has been removed because there were concerns that it would be confusing. None of the other names seemed very useful so I think it is best to avoid it altogether. pkgsCross is still included, hopefully, that will not have as much confusion. pkgsMusl is now available for building Musl packages. It will give you packages bulit with the Musl libc. Also added more documentation. /cc @dezgeg @Ericson2314 @dtzWill

This has been replaced with pkgsi686Linux.callPackage

…ut-qt recoll: Add support to build without QT

flatpak: 0.99.1 -> 0.99.2

oauth2_proxy: add nginx vhost module

…System more For example: nix-repl> pkgsi686Linux.pkgsMusl.hostPlatform.config "i686-unknown-linux-musl" nix-repl> pkgsMusl.pkgsi686Linux.hostPlatform.config "i686-unknown-linux-musl"

This prevent us evaluation on macOS systems where pkgsMusl & pkgsi686Linux is unsupported.

never built on darwin

mxt-app: 1.27 -> 1.28

This is a small c program used for pairing with a wireless PlayStation 3 controller via bluetooth. I included a patch that replaces the depricated 'hcitool' command with 'bluetoothctl'. For further info visit: http://www.pabr.org/sixlinux/

Rework stage.nix's extraPkgs

…S#43086)

Asterisk xmpp support

Bold marked applicable changelog entries: - Support extended attributes (xattr) in forward mode<Paste> - Add -fsck function - Fix several symlink race attacks - Use memory pools for buffer handling - Parallelize file content encryption - Use HKDF to derive separate keys for GCM and EME

zimbatm · 2018-07-09T16:35:01Z

Please be careful when submitting PRs ^_^

matthewbauer · 2018-07-09T16:37:12Z

Haha yeah the problem here is just that staging is really out-of-date. I can't really base it off of the current staging without making my own PR out-of-date. I wonder if we could get an automated merge of master -> staging to prevent this kind of thing?

zimbatm · 2018-07-09T16:46:40Z

pkgs/os-specific/linux/procps-ng/default.nix

  meta = {
    homepage = https://gitlab.com/procps-ng/procps;
    description = "Utilities that give information about processes using the /proc filesystem";
    priority = 10; # less than coreutils, which also provides "kill" and "uptime"
    license = lib.licenses.gpl2;
-    platforms = lib.platforms.linux ++ lib.platforms.cygwin;


since it's not linux-specific anymore the package should probably be moved out the the linux folder

It's like 95% linux-only. Not sure if it's worth moving just for that?

zimbatm · 2018-07-09T16:48:37Z

pkgs/os-specific/linux/procps-ng/default.nix

+# system (or very similar like that found in Cygwin). The one
+# exception is ‘watch’ which is portable enough to run on pretty much
+# any UNIX-compatible system.
+, watchOnly ? !(stdenv.isLinux || stdenv.isCygwin) }:


stdenv.isDarwin seems more precise

It should work on BSD systems as well at least: http://pkgsrc.se/wip/watch

The correct fix for this mess would be for someone to step up and maintain a fork of procps with just watch enabled. But apparently no one has done that and I don't think anyone else wants to.

Another approach might be to have to version of procps-ng: watch only and everything but watch. That would reduce the amount of condition switches.

Yes that would work but might be a little harder to maintain. The old watch derivation kind of worked like this the only problem was that it was pretty easy for it to become out of date - procps-ng was the only one updated. At least now CI we will have watch built as part of procps.

matthewbauer and others added 30 commits July 5, 2018 11:43

Merge pull request NixOS#42187 from jameysharp/jdk-without-gnome

d6a202f

openjdk: fix build for !enableGnome2

cvc4: 1.5 -> 1.6

bec83a2

Merge pull request NixOS#43071 from dtzWill/fix/vampire-portability

6798638

vampire: portability fixes

kitty: 0.10.1 -> 0.11.2

481e61f

graalvm8: 1.0.0-rc1 -> 1.0.0-rc3 (NixOS#43061)

9c63a9e

qutebrowser: 1.3.3 -> 1.4.0 (NixOS#42916)

151afd2

pdfjs: 1.7.225 -> 1.10.100

josm: bump to jre10

806e5a3

Fixes https://josm.openstreetmap.de/ticket/11806

python.pkgs.flask-restful: fix tests

a04c9e2

Fixes NixOS#43001.

build-idris-package: includePreludeBase -> noPrelude, noBase

5f620d0

Resembles idris --noprelude and --nobasepkgs arguments

treewide: remove callPackage_i686

c491a99

This has been replaced with pkgsi686Linux.callPackage

Merge pull request NixOS#42876 from marsam/feature/build-recoll-witho…

58ff8a3

…ut-qt recoll: Add support to build without QT

Merge pull request NixOS#43011 from r-ryantm/auto-update/flatpak

9655e1a

flatpak: 0.99.1 -> 0.99.2

Merge pull request NixOS#42775 from mkaito/oauth2_proxy-virtualHosts

1bb95d8

oauth2_proxy: add nginx vhost module

ocamlPackages.janeStreet: 0.10 -> 0.11

3b0cd74

treewide: remove forceSystem

69f1045

stage: Make pkgsMusl and pkgsi686linux respect the original local…

f795ed7

…System more For example: nix-repl> pkgsi686Linux.pkgsMusl.hostPlatform.config "i686-unknown-linux-musl" nix-repl> pkgsMusl.pkgsi686Linux.hostPlatform.config "i686-unknown-linux-musl"

zoom-us: 2.2.128100.0627 -> 2.2.128200.0702 (NixOS#42922)

14555ea

stage: add Linux checks

ad20a4a

This prevent us evaluation on macOS systems where pkgsMusl & pkgsi686Linux is unsupported.

mxt-app: limit platforms to linux

0aaf209

never built on darwin

Merge pull request NixOS#42974 from r-ryantm/auto-update/mxt-app

b1abb5a

mxt-app: 1.27 -> 1.28

gocryptfs: fix typo in folder name

dff0cfc

sixpair: init at 2007-04-18 (NixOS#43072)

cdebd1c

This is a small c program used for pairing with a wireless PlayStation 3 controller via bluetooth. I included a patch that replaces the depricated 'hcitool' command with 'bluetoothctl'. For further info visit: http://www.pabr.org/sixlinux/

Merge pull request NixOS#43079 from matthewbauer/rework-extra-pkgs

bb0febf

Rework stage.nix's extraPkgs

atom, atom-beta: 1.28.0 -> 1.28.1, 1.29.0-beta0 -> 1.29.0-beta1 (NixO…

d45a099

…S#43086)

verilator: Allow building on Darwin as well as Linux

56afc55

coqPackages.equations: Add support for Coq 8.8

1459b2d

texlive: Propagate biber binary (NixOS#42875)

a986631

Merge pull request NixOS#43060 from disassembler/asterisk

5c271db

Asterisk xmpp support

matthewbauer requested review from FRidh, LnL7, Mic92, nbp, peti, Profpatsch, ttuegel and zimbatm as code owners July 9, 2018 16:01

zimbatm reviewed Jul 9, 2018

View reviewed changes

matthewbauer merged commit c7e7cd7 into NixOS:staging Jul 9, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

unixtools refactor #43259

unixtools refactor #43259

matthewbauer commented Jul 9, 2018

zimbatm commented Jul 9, 2018

matthewbauer commented Jul 9, 2018 •

edited

zimbatm Jul 9, 2018

matthewbauer Jul 9, 2018

zimbatm Jul 9, 2018

matthewbauer Jul 9, 2018

matthewbauer Jul 9, 2018

zimbatm Jul 10, 2018

matthewbauer Jul 10, 2018

unixtools refactor #43259

unixtools refactor #43259

Conversation

matthewbauer commented Jul 9, 2018

Motivation for this change

zimbatm commented Jul 9, 2018

matthewbauer commented Jul 9, 2018 • edited

zimbatm Jul 9, 2018

Choose a reason for hiding this comment

matthewbauer Jul 9, 2018

Choose a reason for hiding this comment

zimbatm Jul 9, 2018

Choose a reason for hiding this comment

matthewbauer Jul 9, 2018

Choose a reason for hiding this comment

matthewbauer Jul 9, 2018

Choose a reason for hiding this comment

zimbatm Jul 10, 2018

Choose a reason for hiding this comment

matthewbauer Jul 10, 2018

Choose a reason for hiding this comment

matthewbauer commented Jul 9, 2018 •

edited