Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: daf3297cb46f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 73951bc0c8c0
Choose a head ref
  • 7 commits
  • 73 files changed
  • 1 contributor

Commits on Nov 14, 2018

  1. wafHook: init 

    The waf build system is python-based and hosted locally in each package in the executable file named "waf". Unlike CMake, it cannot generate makefiles so we end up having to override the configure, build, and install phases. I've tried to keep these as close to what's in setup.sh as possible. If there is no waf file in the root directory, then we just copy the one hosted in Nixpkgs. Otherwise the only thing you have to add to a package using Waf is "wafHook" into nativeBuildInputs. wafFlags controls the flags specifically passed to waf while configureFlags, buildFlags, and installFlags are still used as in the generic builder.
    @matthewbauer
    matthewbauer committed Nov 14, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    schneefux
    GPG key ID: 50F2BF336737C2F0
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    92ebfa1 View commit details

  2. treewide: use wafHook 

    Replace "waf" phases with wafHook that manages everything
automatically. Should make things more modular.

Packages affected here are:

- a2jmidid
- ams-lv2
- ardour
- fomp
- guitarix
- ingen
- jalv
- mda-lv2
- non
- patchage
- hamster-time-tracker
- kupfer
- xiphos
- xfce4-dockbarx-plugin
- xfce4-namebar-plugin
- dropbox
- clasp
- aubio
- liliv
- lv2
- lvtk
- ntk
- raul
- sratom
- suil
- ganv
- ndn-cxx
- ns3
- serd
- sord
- termbox
- wxmupen64plus
- jackaudio
- pflask
- blockhash
- glmark2
- weighttp
    @matthewbauer
    matthewbauer committed Nov 14, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f2a20b6 View commit details

  3. scons: add setup hook 

    The scons build system is python-based and has a binary named scons. Unlike CMake, it cannot generate makefiles so we end up having to override the build, install, and check phases. I have added the setupHook to the scons package so that integration requires no unique steps - just putting scons in nativeBuildInputs should be enough. sconsFlags controls the flags specifically passed to scons while buildFlags, installFlags, and checkFlags should still be usable. Some packages use different names for the prefix flag. In those cases you will have to set "prefixKey" to something like "PREFIX=" as there are multiple names for the "prefix" used in scons.
    @matthewbauer
    matthewbauer committed Nov 14, 2018
    Copy the full SHA
    1ba9fd3 View commit details

  4. treewide: use scons setup hook 

    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
    @matthewbauer
    matthewbauer committed Nov 14, 2018
    Copy the full SHA
    bfbfe94 View commit details

  5. treewide: remove unstable packages 

    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.
    @matthewbauer
    matthewbauer committed Nov 14, 2018
    Copy the full SHA
    06c403e View commit details

  6. wxmupen64plus: fix with fpermissive 

    This flag seems to make things work again.
    @matthewbauer
    matthewbauer committed Nov 14, 2018
    Copy the full SHA
    83d02fa View commit details

  7. Merge pull request #50293 from matthewbauer/cleanups2 

    Add setup-hooks for scons and waf
    @matthewbauer
    matthewbauer authored Nov 14, 2018
    Copy the full SHA
    73951bc View commit details
Loading