summary refs log tree commit diff
Commit message (Collapse)AuthorAge
* Merge commit '703a9f93c1254f7bdf0350ca0462de0d78033c62' into gcc-simplify-flagsJohn Ericson2017-12-05
|\
| * gcc6: Restore missing platform flagsTuomas Tynkkynen2017-11-29
| | | | | | | | | | | | This was missed in commit 1c1207220f06 ("gcc: Refactor treatment of configure flags"), all other GCC versions have it right.
| * gccSnapshot: Reduce diff to gcc7Tuomas Tynkkynen2017-11-29
| |
| * gcc7: Reduce diff to gcc6Tuomas Tynkkynen2017-11-29
| |
| * gcc48: Reduce diff to gcc49Tuomas Tynkkynen2017-11-29
| |
| * gcc49: Reduce diff to gcc5Tuomas Tynkkynen2017-11-29
| |
| * gcc5: Reduce diff to gcc6Tuomas Tynkkynen2017-11-29
| |
| * Merge pull request #32173 from dtzWill/fix/qt48-parallel-patch-tabsOrivej Desh2017-11-29
| |\ | | | | | | qt48: match whitespace in context of patch to better apply on @dtzWill's tree and maybe future nixpkgs too
| | * qt48: use tabs in the Makefile patchWill Dietz2017-11-29
| | | | | | | | | | | | Fixes application of the patch to a differently configured Qt.
| * | mesa_noglu: use llvm-5 on aarch64 as wellVladimír Čunát2017-11-29
| | |
| * | Merge branch 'master' into stagingVladimír Čunát2017-11-29
| |\ \ | | |/ | |/| | | | to fix llvm on aarch64
| | * Merge pull request #32154 from JamesTheAwesomeDude/palemoonJoachim F2017-11-29
| | |\ | | | | | | | | palemoon: 27.6.0 -> 27.6.2
| | | * palemoon: 27.6.0 -> 27.6.2James Edington2017-11-29
| | | | | | | | | | | | | | | | Small security and bugfix update
| | * | bazel: 0.7.0 -> 0.8.0Mateusz Kowalczyk2017-11-29
| | | |
| | * | llvm: Include aarch64 patch in repoTuomas Tynkkynen2017-11-29
| | | | | | | | | | | | | | | | The URL is already a dead link.
| | * | Merge pull request #32135 from phile314/fusion-inventoryOrivej Desh2017-11-29
| | |\ \ | | | | | | | | | | Fusion inventory: 2.3.18 -> 2.3.21, misc. fixes
| | | * | FusionInventory: Patch in NixOS supportPhilipp Hausmann2017-11-29
| | | | | | | | | | | | | | | | | | | | | | | | | Adds support for the /etc/os-release file and to read installed software from the Nix store.
| | | * | FusionInventory: 3.18 -> 3.21Philipp Hausmann2017-11-29
| | |/ /
| | * | Merge #32163: qemu: patch CVE-2017-15118Vladimír Čunát2017-11-29
| | |\ \
| | | * | qemu: fix CVE-2017-15118Antoine Eiche2017-11-29
| | | | | | | | | | | | | | | | | | | | See https://lists.gnu.org/archive/html/qemu-devel/2017-11/msg05045.html
| | * | | Merge pull request #32157 from womfoo/init/yq-2.3.3Jörg Thalheim2017-11-29
| | |\ \ \ | | | | | | | | | | | | yq: init at 2.3.3
| | | * | | yq: init at 2.3.3Kranium Gikos Mendoza2017-11-29
| | | | | |
| | * | | | perl-Log-Contextual: 0.007001 -> 0.008000Robert Helgesson2017-11-29
| | | | | |
| * | | | | Merge pull request #32161 from adisbladis/curl-7_57_0Orivej Desh2017-11-29
| |\ \ \ \ \ | | | | | | | | | | | | | | curl: 7.56.1 -> 7.57.0
| | * | | | | curl: 7.56.1 -> 7.57.0adisbladis2017-11-29
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CVEs: CVE-2017-8816 CVE-2017-8817 CVE-2017-8818
| * | | | | Merge branch 'master' into stagingOrivej Desh2017-11-29
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: libretro.mame: fix parallel building gnome3: add jtojnar as maintainer libskk: fix build gencfsm: fix build wkhtmltopdf: fix build gutenprint: fix build ghc-8.2.2: drop obsolete gold linker patch git-annex: update hash for new version 6.20171124 hackage-packages.nix: automatic Haskell package set update hackage2nix: disable failing builds hackage2nix: keep language-c-0.7.0 around in the package set for c2hs hack brotli: 0.6.0 -> 1.0.1 brotliUnstable: delete libbrotli: delete libbrotli: 1.0 -> 1.0.1.2017-10-30 nginxModules.brotli: 2015-11-18 -> 2016-12-02
| | * | | | libretro.mame: fix parallel buildingOrivej Desh2017-11-29
| | | | | |
| | * | | | Merge pull request #32123 from kosta/masterOrivej Desh2017-11-29
| | |\ \ \ \ | | | | | | | | | | | | | | brotli: 0.6.0 -> 1.0.1
| | | * | | | brotli: 0.6.0 -> 1.0.1Orivej Desh2017-11-29
| | | | | | |
| | | * | | | brotliUnstable: deleteOrivej Desh2017-11-29
| | | | | | |
| | | * | | | libbrotli: deleteOrivej Desh2017-11-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Its functionality was incorporatad into brotli.
| | | * | | | libbrotli: 1.0 -> 1.0.1.2017-10-30Orivej Desh2017-11-29
| | | | | | |
| | | * | | | nginxModules.brotli: 2015-11-18 -> 2016-12-02Orivej Desh2017-11-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This version bundles brotli.
| | * | | | | gnome3: add jtojnar as maintainerJan Tojnar2017-11-29
| | | | | | |
| | * | | | | libskk: fix buildOrivej Desh2017-11-29
| | | | | | |
| | * | | | | gencfsm: fix buildOrivej Desh2017-11-29
| | | | | | |
| | * | | | | wkhtmltopdf: fix buildOrivej Desh2017-11-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by not appling parallel-build.patch from a88146d308fb5fa8e3cc466fffecaf0fe9ff9a2e
| | * | | | | gutenprint: fix buildOrivej Desh2017-11-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | after "gnutls: 3.5.15 -> 3.6.1" became independent from zlib.
| | * | | | | ghc-8.2.2: drop obsolete gold linker patchPeter Simons2017-11-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Pointed out by @basvandijk in https://github.com/NixOS/nixpkgs/commit/b1a0f91afe64e4639022bea23c9ff49a4460f768.
| | * | | | | git-annex: update hash for new version 6.20171124Peter Simons2017-11-29
| | | | | | |
| | * | | | | hackage-packages.nix: automatic Haskell package set updatePeter Simons2017-11-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This update was generated by hackage2nix v2.7 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/7428a6b8944e5db563cb8c4087f4cd5f822d7400.
| | * | | | | hackage2nix: disable failing buildsPeter Simons2017-11-29
| | | | | | |
| | * | | | | hackage2nix: keep language-c-0.7.0 around in the package set for c2hs hackPeter Simons2017-11-29
| | | | | | |
| * | | | | | Merge branch 'master' into stagingOrivej Desh2017-11-29
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (32 commits) qt4: fix parallel building of moc_qtgradientviewdialog.o qt4: enable parallel building in the configure phase aseprite-unfree: 1.2.2 -> 1.2.4 peek: disable on darwin, add optional dependencies vdrsymbols: init at 20100612 xorg.bitmap: provide resource search path xorg.bitmap: init at 1.0.8 firefox-devedition-bin: 58.0b7 -> 58.0b7 firefox-beta-bin: 58.0b7 -> 58.0b7 lua-mpack: fix darwin build lua5_1: provide version libmpack: fix darwin build libamqpcpp: init at 2.7.4 nano: fix darwin build gnome3.gnome-software: enable parallel building dbus-broker: 3 -> 8 nix-exec: mark as broken peek: init at 1.2.0 gnucash: use nativeBuildInputs gnucash: 2.6.12 -> 2.6.18-1 ...
| | * | | | | qt4: fix parallel building of moc_qtgradientviewdialog.oOrivej Desh2017-11-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the last of these commands: ``` make -j sub-tools-bootstrap make -j sub-uic sub-moc sub-rcc make -C tools/designer/src/lib .obj/release-shared/moc_qtgradientviewdialog.o ``` failed with this error: ``` In file included from .uic/release-shared/ui_qtgradientviewdialog.h:63:0, from .moc/release-shared/../../../../../shared/qtgradienteditor/qtgradientviewdialog.h:47, from .moc/release-shared/moc_qtgradientviewdialog.cpp:9: ../../../shared/qtgradienteditor/qtgradientview.h:47:31: fatal error: ui_qtgradientview.h: No such file or directory ``` because uic did not ensure that the build of moc_qtgradientviewdialog.o happens after the build of moc_qtgradientview.o.
| | * | | | | qt4: enable parallel building in the configure phaseOrivej Desh2017-11-29
| | | | | | |
| | * | | | | Merge branch 'staging'Vladimír Čunát2017-11-29
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | There are security fixes in multiple packages /cc #32117, so I'm merging a little earlier, with a few thousand jobs still not finished on Hydra for x86_64-darwin and aarch64-linux.
| | * | | | | Merge pull request #31970 from The-M1k3y/masterOrivej Desh2017-11-29
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | nixos/factorio: add stateDir and requireUserVerification option
| | | * | | | | nixos/factorio: add stateDir and requireUserVerification optionThe-M1k3y2017-11-23
| | | | | | | |
| | * | | | | | aseprite-unfree: 1.2.2 -> 1.2.4Orivej Desh2017-11-29
| | | | | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-04 01:50:22 +0000