Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Staging next #49742

Merged
merged 506 commits into from Nov 20, 2018
Merged

Staging next #49742

merged 506 commits into from Nov 20, 2018

Conversation

FRidh
Copy link
Member

@FRidh FRidh commented Nov 4, 2018

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

Lots of packages can use it. Here is the list:

- jackmix
- klick
- mixx
- nova-filters
- rhvoice
- giv
- mypaint
- swift-im
- bombono
- mapnik
- serf
- nuitka
- pyexiv2
- godot
- hammer
- toluapp
- btanks
- dxx-rebirth
- endless-sky
- globulation
- the-powder-toy
- fceux
- gpsd
- mongodb
- rippled
- mariadb
- lprof
There’s nothing wrong with unstable packages when they are maintained
and frequently updated. However, when they become out-of-date, as many
do, it is usually best to just get rid of them as the stable version
is become newer than the unstable version. This removes any packages
called "unstable" that have not been updated in over 1 year. Affected
packages include:

- isyncUnstable
- sxhkd-unstable
- dosbox-unstable

Revert "treewide: remove unstable packages"

This reverts commit df01b0b.
This flag seems to make things work again.
Add setup-hooks for scons and waf
@GrahamcOfBorg GrahamcOfBorg added the 6.topic: xfce The Xfce Desktop Environment label Nov 14, 2018
matthewbauer and others added 11 commits November 14, 2018 13:57
xboxdrv doesn’t use scons for installing, but instead using a
makefile! Everything else is in scons so we have to keep that. I’ve
added a dontUseSconsInstall flag to the scons setup-hook to skip the
automatic overwrite of default “make install” call.
This gives us support for the class autoconf “./configure && make &&
make install” build-style.
The postInstall phase should not run postInstall itself! My mistake in
renaming the old installPhase.
gsettingsschemedir only works in make where you can set any variable
from the command line as in “make VAR=VAL”. Other build systems may
not support this kind of loose overriding of variables. This broke a
scons build here:

  https://hydra.nixos.org/build/84073119/
Update metadata to reflect uncompyle6 and xdis relicensing to GPL (v3 and v2 respectively)
This requires pycodestyle when using python3 and adding it leads to test
failures for some reason. Maybe some patching we do. There is no reason to
test codestyle for a distro, so just disable it.
These two interpreters are needed for some runtime scripts.

Fixes #50570
ghc-split is a script that is written in perl. We need to have a perl interpreter around to use it.

Fixes #50569
@@ -46,6 +46,8 @@ stdenv.mkDerivation rec {
libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext
gsl poppler imagemagick libwpg librevenge
libvisio libcdr libexif potrace hicolor-icon-theme

python2Env perlPackages.perl
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is perl's XMLParser needed as well?

FRidh and others added 3 commits November 19, 2018 09:55
This is one of the rare times when flex is not just needed at build
time. When cross compiling, we will need 2 versions of flex - one for
the local system and one for the cross system.
@timokau timokau merged commit fd26e7b into master Nov 20, 2018
delroth added a commit to delroth/nixpkgs that referenced this pull request Nov 20, 2018
Regression from NixOS#49742. Invalid XML causes the manual to not build, leading
to many broken derivations.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet