about summary refs log tree commit diff
Commit message (Collapse)AuthorAge
* thermald: 1.7.2 -> 1.8R. RyanTM2018-10-03
| | | | | | | Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/thermald/versions
* Merge pull request #47604 from NixOS/staging-nextFrederik Rietdijk2018-10-02
|\ | | | | Staging next
| * firefox: drop patch that's applied alreadyVladimír Čunát2018-10-02
| | | | | | | | | | It's a bit weird that noone's noticed, but I guess it's because of a merge or rebase.
| * ffmpeg: unbreak build of older versions after #46078Vladimír Čunát2018-10-02
| | | | | | | | | | As in the other cases, I didn't care about passing the dependency if unused...
| * Merge branch 'master' into staging-nextDaiderd Jordan2018-10-01
| |\
| * | Revert "patch-shebangs: respect cross compilation"Daiderd Jordan2018-09-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This causes problems for packages built using a bootstrap stdenv, resulting in references to /bin/sh or even bootstrap-tools. The darwin stdenv is much stricter about what requisites/references are allowed but using /bin/sh on linux is also undesirable. eg. https://hydra.nixos.org/build/81754896 $ nix-build -A xz $ head -n1 result-bin/bin/xzdiff #!/nix/store/yvc7kmw98kq547bnqn1afgyxm8mxdwhp-bootstrap-tools/bin/sh This reverts commit f06942327ab60c0a546c7236cb718fd909430066.
| * | Merge pull request #47355 from obsidiansystems/numpy-fortranJohn Ericson2018-09-25
| |\ \ | | | | | | | | numpy, scipy: Fix some nativeBuildInputs
| | * | scipy: gfortran should be in nativeBuildInputsJohn Ericson2018-09-25
| | | |
| | * | numpy: gfortran and pytest should be nativeBuildInputsJohn Ericson2018-09-25
| | | |
| * | | Merge remote-tracking branch 'upstream/master' into stagingJohn Ericson2018-09-25
| |\ \ \
| * \ \ \ Merge pull request #47245 from dtzWill/fix/coreutils-8.30-bootstrapxeji2018-09-25
| |\ \ \ \ | | | | | | | | | | | | coreutils: try 8.30 again, fix bootstrap tools expression motivating revert before
| | * | | | make-bootstrap-tools: fix with latest coreutilsWill Dietz2018-09-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since gcc.lib/lib64 is a symlink to 'lib', the use of "lib*/libgcc_s.so*" triggered a warning (error) with the latest coreutils. Essentially we were doing: $ cp a/x b/x y/ And latest coreutils rejects such invocations. Just copy from 'lib', lib64 is a link to it anyway. * Nothing else in this file bothers looking at lib* * AFAICT lib* only ever possibly matched lib64 anyway
| | * | | | Revert "Revert "Merge #42880: coreutils: 8.29 -> 8.30""Will Dietz2018-09-23
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e3ee9c098a64deb30e8d9edb180e613b93046f45.
| * | | | | epoxy: 1.5.1 -> 1.5.2 (#47178)Alexander V. Nikolaev2018-09-25
| | | | | | | | | | | | | | | | | | | | | | | | libgl-path.patch was updated (it applied with little fuzz, because I am a bit lazy, and rebase it on master of epoxy, not 1.5.2)
| * | | | | curl: 7.61.0 -> 7.61.1 (#46295)R. RyanTM2018-09-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/curl/versions
| * | | | | nspr: 4.19 -> 4.20 (#46227)R. RyanTM2018-09-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from nspr
| * | | | | stdenv: Improve ELF detection for isELFaszlig2018-09-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The isELF function only checks whether ELF is contained within the first 4 bytes of the file, which is a bit fuzzy and will also return successful if it's a text file starting with ELF, for example: ELF headers ----------- Some text here about ELF headers... So instead, we're now doing a precise match on \x7fELF. Signed-off-by: aszlig <aszlig@nix.build> Acked-by: @Ericson2314 Closes: https://github.com/NixOS/nixpkgs/pull/47244
| * | | | | Merge pull request #47233 from oxij/tree/mass-rebuild-noop-cleanupsJohn Ericson2018-09-25
| |\ \ \ \ \ | | | | | | | | | | | | | | treewide: mass rebuild noop cleanups
| | * | | | | linuxHeaders: cleanup with a mass rebuildJan Malakhovski2018-09-23
| | | | | | |
| | * | | | | libdaemon: cleanup with a mass rebuildJan Malakhovski2018-09-23
| | | | | | |
| | * | | | | pkgconfig: cleanup with a mass rebuildJan Malakhovski2018-09-23
| | | | | | |
| | * | | | | newt: cleanup with a mass rebuildJan Malakhovski2018-09-23
| | | | | | |
| | * | | | | texinfo: cleanup with a mass rebuildJan Malakhovski2018-09-23
| | | | | | |
| | * | | | | llvmPackages_6.libcxx: cleanup with a mass rebuildJan Malakhovski2018-09-23
| | | | | | |
| | * | | | | llvm_5: cleanup with a mass rebuildJan Malakhovski2018-09-23
| | | | | | |
| | * | | | | gcc7: cleanup with a mass rebuildJan Malakhovski2018-09-23
| | | | | | |
| | * | | | | gcc-*: Clean up crossStageStatic logicJohn Ericson2018-09-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 54282b9610e80b1ed93136319e24cb79c5bbcc33 tread carefuly to avoid a mass rebuild. This embraces the mass rebuild to clean things up.
| | * | | | | bintools-wrapper, cc-wrapper, stdenv: infer propagateDoc automaticallyJan Malakhovski2018-09-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 02c09e01712ce0b61e5c8f7159047699a434f7fc (NixOS/nixpkgs#44558) was reverted in c981787db951afb11c1328461df82d4277ebec07 but, as it turns out, it fixed an issue I didn't know about at the time: the values of `propagateDoc` options were (and now again are) inconsistent with the underlying things those wrappers wrap (see NixOS/nixpkgs#46119), which was (and now is) likely to produce more instances of NixOS/nixpkgs#43547, if not now, then eventually as stdenv changes. This patch (which is a simplified version of the original reverted patch) is the simplest solution to this whole thing: it forces wrappers to directly inspect the outputs of the things they are wrapping instead of making stdenv guess the correct values.
| * | | | | | Merge pull request #46127 from obsidiansystems/gcc-crossStageStatic-cleanupJohn Ericson2018-09-25
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | gcc-*: Clean up crossStageStatic logic
| | * | | | | | gcc-*: Clean up crossStageStatic logicJohn Ericson2018-09-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 54282b9610e80b1ed93136319e24cb79c5bbcc33 tread carefuly to avoid a mass rebuild. This embraces the mass rebuild to clean things up.
| * | | | | | | valgrind: enable debug info (#47251)Ben Wolsieffer2018-09-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At least on ARM, valgrind produces no stack trace unless debug info is available for its own libraries.
| * | | | | | | Merge branch 'master' into stagingVladimír Čunát2018-09-24
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Hydra: ?compare=1480463
| * \ \ \ \ \ \ \ Merge pull request #47278 from dtzWill/fix/e2fsprogs-musl-patchWill Dietz2018-09-24
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | e2fsprogs: patch out glibc instead of local fix so headers are usable
| | * | | | | | | | e2fsprogs: patch out glibc instead of local fix so headers are usableWill Dietz2018-09-24
| |/ / / / / / / /
| * | | | | | | | Merge pull request #47129 from dtzWill/fix/cyrus-sasl-muslWill Dietz2018-09-24
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | cryus-sasl: cleanup, fix w/musl (although not at all musl-specific)
| | * | | | | | | | cyrus-sasl: set to null on non-musl per reviewer suggestionWill Dietz2018-09-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unclear what the problem is exactly regarding regenerating files, so this makes the change only impact build configs known to need it.
| | * | | | | | | | cryus-sasl: cleanup, fix w/musl (although not at all musl-specific)Will Dietz2018-09-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | musl is fixed by disabling update of config.{guess,sub}.
| * | | | | | | | | systemd: update to fix nspawn containers (#47264)Florian Klink2018-09-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes nspawn containers with older systemd inside currently failing to start. See: https://github.com/NixOS/systemd/pull/23 https://github.com/systemd/systemd/pull/10104 https://github.com/NixOS/nixpkgs/issues/47253
| * | | | | | | | | Merge pull request #47207 from matthewbauer/disallow-cc-in-perlMatthew Bauer2018-09-23
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | perl: disallow cc in perl
| | * | | | | | | | perl: disallow reference to ccMatthew Bauer2018-09-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #46077
| * | | | | | | | | Merge pull request #47147 from dtzWill/update/mesa-18.2Will Dietz2018-09-23
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | mesa: 18.1.8 -> 18.2.1
| | * | | | | | | | | mesa: add new required dep on libXrandrWill Dietz2018-09-21
| | | | | | | | | | |
| | * | | | | | | | | libxcb: 1.12 -> 1.13 (proto too)Will Dietz2018-09-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 5853e62637eb2aaa1f2ccbcbf62c2a4f232a4257)
| | * | | | | | | | | mesa: drop non-applying hunk, hopefully include no longer neededWill Dietz2018-09-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit b673b8987872adfd97fdb8821198450ff229118d)
| | * | | | | | | | | mesa: 18.1.8 -> 18.2.1Will Dietz2018-09-21
| | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit eb2b89a0a1901d4c89dcc6c0a36e1cabd1fcd002)
| * | | | | | | | | Merge pull request #47119 from dtzWill/update/libinput-1.12.0Will Dietz2018-09-23
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | libinput: 1.11.3 -> 1.12.0
| | * | | | | | | | | libinput: fix build w/1.12.0Will Dietz2018-09-21
| | | | | | | | | | |
| | * | | | | | | | | libinput: 1.11.3 -> 1.12.0Will Dietz2018-09-21
| | |/ / / / / / / /
| * | | | | | | | | Merge pull request #47219 from lheckemann/xcb-1.13Jörg Thalheim2018-09-23
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | xorg.libxcb: 1.12 -> 1.13
| | * | | | | | | | | xorg.libxcb: 1.12 -> 1.13Linus Heckemann2018-09-23
| | | | | | | | | | |