about summary refs log tree commit diff
Commit message (Collapse)AuthorAge
* misc pkgs: Basic sed to get fix `pkgconfig` and `autoreconfHook` `buildInputs`John Ericson2017-09-21
| | | | Only acts on one-line dependency lists.
* misc pkgs: Make solitary pkgconfig buildInputs nativeBuildInputsJohn Ericson2017-09-21
|
* treewide: Manually fix miscategorized `autoreconfHook` `buildInputs`John Ericson2017-09-21
| | | | These are the ones with odd indentation my script will mess up on.
* synfig: Make pkg-config, autoreconfHook, and gettext nativeBuildInputsJohn Ericson2017-09-21
|
* all-packages: Remove gccCrossStageFinal; any gcc will not workJohn Ericson2017-09-21
|
* wrapCC: Alias now does the right thing for crossJohn Ericson2017-09-21
| | | | | | Unfortunately this makes previously-barely-working overrides have infinite recursion, so I had to reinstantiate gcc for gccCrossStageFinal instead.
* gcc: Change default of `crossStageStatic` param to falseJohn Ericson2017-09-21
| | | | | | This gets us one step closer to removing `gccCrossStageFinal`. Care is taken to avoid a mass rebuild; will clean up with one later.
* stdenv cross adapater: Remove old `extraBuildInputs`John Ericson2017-09-21
| | | | | They, unlike their native counterparts, run on the wrong platform and are therefore invalid.
* stdenv cross adaptor: Add optional `overrides` parameterJohn Ericson2017-09-21
| | | | | | By default, all previous overrides are discarded as before, as they would only apply to the old host platform. But sometimes it is useful to add some new ones, and this optional parameter allows that.
* stdenv: Update autotools scripts on all Aarch64, not just LinuxJohn Ericson2017-09-21
| | | | | | | This is needed when cross-compiling for iOS (Aarch64 + Darwin). I also changed the syntax of the Linux stdenv for visual consistency, though that has no effect on semantics as the os is already guaranteed to be Linux.
* glibc: Grab the right linux headers when build != hostJohn Ericson2017-09-20
| | | | | | | | | | | | | | In #28519 / 791ce593ce065cf074edf1509ff52ebc69136d9e I made linux headers be intended to be used from the stage stage, as it would be if it were a library containing headers and code. I forgot to update glibc, however, so it was incorrectly using headers for the build platform, not host platform. This fixes that, basically reverting a small portion of changes I made a few months ago in 25edc476fd9fe1bd8bedf571d218ba4f27fb5a27 and its parent. No native hashes are changed.
* Merge pull request #29584 from obsidiansystems/no-wrapCCCrossJohn Ericson2017-09-20
|\ | | | | top-level: Remove useless abstractions
| * all-packages: get rid of wrapCCCrossJohn Ericson2017-09-20
| | | | | | | | It's unneeded
| * all-packages: Remove `forcedNativePackages`; we no longer need itJohn Ericson2017-09-20
| | | | | | | | | | Its kept around in the Hurd package set, but all that code is presumably broken.
| * vim: Properly categorize pkgconfig dependencyJohn Ericson2017-09-20
| |
* | libwebsockets: revert making libuv a propagated build inputJörg Thalheim2017-09-20
| | | | | | | | | | | | it is possible to use libwebsockets without libuv cc @volth
* | Merge pull request #29562 from LumiGuide/journalbeat-5.6.0Jörg Thalheim2017-09-20
|\ \ | | | | | | journalbeat: 5.5.0 -> 5.6.0
| * | journalbeat: 5.5.0 -> 5.6.0Bas van Dijk2017-09-19
| | |
* | | Merge pull request #29582 from eqyiel/flow-0.55.0Jörg Thalheim2017-09-20
|\ \ \ | | | | | | | | flow: 0.54.0 -> 0.55.0
| * | | flow: 0.54.0 -> 0.55.0Ruben Maher2017-09-20
| | | |
* | | | syncthing: 0.14.37 -> 0.14.38Peter Hoeg2017-09-20
|/ / /
* | | circumvent hdaps name clashFrank Doepper2017-09-19
| | |
* | | tp_smapi with hdapsFrank Doepper2017-09-19
| | |
* | | Merge pull request #29573 from disassembler/lenmusJörg Thalheim2017-09-19
|\ \ \ | | | | | | | | lenmus: removing custom cmakeFlags
| * | | lenmus: removing custom cmakeFlagsSamuel Leathers2017-09-19
| | | |
* | | | Merge pull request #29525 from aneeshusa/radicale_infcloud-initJörg Thalheim2017-09-19
|\ \ \ \ | | | | | | | | | | radicale_infcloud: init
| * | | | radicale_infcloud: initAneesh Agrawal2017-09-19
| | | | |
* | | | | alacritty: respect pre- and post-hooks of overridden phasesThomas Tuegel2017-09-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Failing to `runHook` when overriding phases can have unpredictable results. fixes #29572
* | | | | alacritty: install desktop iconThomas Tuegel2017-09-19
| |_|_|/ |/| | |
* | | | cc-wrapper, cc-wrapper-old: Simplify shell logicJohn Ericson2017-09-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. `crossDrv` is now the default so we don't need to worry about that in build != host builds. 2. shell is the build time shell, so `wrapCCCross` doesn't need to worry, as build == host. 3. `shell.shellPath` will always be appended where useful. 4. Complicated `shell == ""` logic served no purpose.
* | | | libwebsockets: fix evalJörg Thalheim2017-09-19
| | | |
* | | | mosquitto: 1.4 -> 1.4.14Volth2017-09-19
| | | | | | | | | | | | | | | | fixes #29567
* | | | libwebsockets: 1.4 -> 2.3.0volth2017-09-19
| | | |
* | | | Merge pull request #29570 from disassembler/libxmlxxJörg Thalheim2017-09-19
|\ \ \ \ | | | | | | | | | | libxmlxx: move glibmm to propagatedBuildInputs
| * | | | libxmlxx: move glibmm to propagatedBuildInputsSamuel Leathers2017-09-19
| | |/ / | |/| |
* | | | Merge pull request #29571 from obsidiansystems/better-spliceJohn Ericson2017-09-19
|\ \ \ \ | |/ / / |/| | | stdenv: Also splice unlisted default "out" output
| * | | stdenv: Also splice unlisted default "out" outputJohn Ericson2017-09-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, some cross builds will use the wrong type of dep. This won't affect native builds, and perhaps no extant cross buids either.
* | | | slack: 2.7.1 -> 2.8.0 (#29339)Benjamin Staffin2017-09-19
| | | |
* | | | Merge pull request #27797 from grahamc/fixed-libJohn Ericson2017-09-19
|\ \ \ \ | | | | | | | | | | Convert libs to a fixed-point
| * | | | Convert libs to a fixed-pointGraham Christensen2017-09-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This does break the API of being able to import any lib file and get its libs, however I'm not sure people did this. I made this while exploring being able to swap out docFn with a stub in #2305, to avoid functor performance problems. I don't know if that is going to move forward (or if it is a problem or not,) but after doing all this work figured I'd put it up anyway :) Two notable advantages to this approach: 1. when a lib inherits another lib's functions, it doesn't automatically get put in to the scope of lib 2. when a lib implements a new obscure functions, it doesn't automatically get put in to the scope of lib Using the test script (later in this commit) I got the following diff on the API: + diff master fixed-lib 11764a11765,11766 > .types.defaultFunctor > .types.defaultTypeMerge 11774a11777,11778 > .types.isOptionType > .types.isType 11781a11786 > .types.mkOptionType 11788a11794 > .types.setType 11795a11802 > .types.types This means that this commit _adds_ to the API, however I can't find a way to fix these last remaining discrepancies. At least none are _removed_. Test script (run with nix-repl in the PATH): #!/bin/sh set -eux repl() { suff=${1:-} echo "(import ./lib)$suff" \ | nix-repl 2>&1 } attrs_to_check() { repl "${1:-}" \ | tr ';' $'\n' \ | grep "\.\.\." \ | cut -d' ' -f2 \ | sed -e "s/^/${1:-}./" \ | sort } summ() { repl "${1:-}" \ | tr ' ' $'\n' \ | sort \ | uniq } deep_summ() { suff="${1:-}" depth="${2:-4}" depth=$((depth - 1)) summ "$suff" for attr in $(attrs_to_check "$suff" | grep -v "types.types"); do if [ $depth -eq 0 ]; then summ "$attr" | sed -e "s/^/$attr./" else deep_summ "$attr" "$depth" | sed -e "s/^/$attr./" fi done } ( cd nixpkgs #git add . #git commit -m "Auto-commit, sorry" || true git checkout fixed-lib deep_summ > ../fixed-lib git checkout master deep_summ > ../master ) if diff master fixed-lib; then echo "SHALLOW MATCH!" fi ( cd nixpkgs git checkout fixed-lib repl .types )
* | | | | haskell.lib: strip trailing whitespacePeter Simons2017-09-19
| | | | |
* | | | | haskell.lib: add doBenchmark helper functionPeter Simons2017-09-19
| | | | |
* | | | | hackage-packages.nix: automatic Haskell package set updatePeter Simons2017-09-19
| | | | | | | | | | | | | | | | | | | | | | | | | This update was generated by hackage2nix v2.5-8-ga66a429 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/511efbfbe74731306452290bb9a0f4994c49e866.
* | | | | LTS Haskell 9.5Peter Simons2017-09-19
| | | | |
* | | | | haskell-generic-builder: rename withBenchmarkDepends argument to doBenchmarkPeter Simons2017-09-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This partially undoes the change from 8788bfe762ab30952b67e09be2c001a9c022e1e3. The 'doBenchmark' name is more consistent with the naming scheme used for other phases, like 'doCheck', 'doHaddock', etc.
* | | | | Merge pull request #29563 from vdemeester/update-runcJörg Thalheim2017-09-19
|\ \ \ \ \ | | | | | | | | | | | | runc: 1.0.0-rc3 -> 1.0.0-rc4
| * | | | | runc: 1.0.0-rc3 -> 1.0.0-rc4Vincent Demeester2017-09-19
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Vincent Demeester <vincent@sbr.pm>
* | | | | dmtcp: fix buffer overflow due to too long ld-linux.so pathRobin Gloster2017-09-19
| | | | | | | | | | | | | | | | | | | | fixes #29565
* | | | | Merge pull request #29561 from dywedir/fdJörg Thalheim2017-09-19
|\ \ \ \ \ | | | | | | | | | | | | fd: 3.0.0 -> 3.1.0
| * | | | | fd: 3.0.0 -> 3.1.0dywedir2017-09-19
| | | | | |