summary refs log tree commit diff
Commit message (Expand)AuthorAge
* Merge pull request #27615 from NickHu/cudaDomen Kožar2017-08-07
|\
| * fix haskellPackages.cuda and some tools dependent on cudatoolkitNick Hu2017-07-24
* | ruby docs: fix text and example (#28006)nonsequitur2017-08-07
* | Merge commit 'b679e14' into HEADFrederik Rietdijk2017-08-07
|\ \
| * | release.nix: resurrect stdenvBootstrapToolsVladimír Čunát2017-08-06
| * | expat: fix build on aarchRobert Helgesson2017-08-06
| * | Merge branch 'master' into stagingVladimír Čunát2017-08-06
| |\ \
| * \ \ Merge branch 'master' into stagingVladimír Čunát2017-08-06
| |\ \ \
| * \ \ \ Merge pull request #27320 from jtojnar/fix/unbreak-polariFrederik Rietdijk2017-08-05
| |\ \ \ \
| | * | | | polari: unbreakJan Tojnar2017-08-05
| | * | | | wrap-gapps-hook: also wrap symlinks to executablesJan Tojnar2017-08-05
| * | | | | Merge pull request #27879 from obsidiansystems/cc-wrapper-shellcheckJohn Ericson2017-08-04
| |\ \ \ \ \
| | * | | | | cc-wrapper: Pass shellcheck and other cleanupsJohn Ericson2017-08-04
| * | | | | | Merge commit 'refs/pull/27485/head' of github.com:NixOS/nixpkgs into stagingThomas Tuegel2017-08-04
| |\ \ \ \ \ \
| | * | | | | | qt5: 5.9.0 -> 5.9.1adisbladis2017-07-18
| * | | | | | | expat: 2.2.2 -> 2.2.3Robert Helgesson2017-08-04
* | | | | | | | Merge pull request #27931 from gnidorah/kdeFrederik Rietdijk2017-08-07
|\ \ \ \ \ \ \ \
| * | | | | | | | nixos: add pathes for KDE applicationsgnidorah2017-08-06
| * | | | | | | | gwenview, k3b, konsole: propagate kinitgnidorah2017-08-06
| * | | | | | | | gwenview, spectacle: propagate libkipignidorah2017-08-04
| * | | | | | | | k3b: remove unused wrapper filegnidorah2017-08-04
* | | | | | | | | Merge pull request #27980 from romildo/upd.mateFrederik Rietdijk2017-08-07
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | mate-terminal: 1.18.0 -> 1.18.1romildo2017-08-06
| * | | | | | | | | caja: 1.18.0 -> 1.18.3romildo2017-08-06
| * | | | | | | | | mate-themes: 3.20.19 -> 3.20.22, 3.22.10 -> 3.22.13romildo2017-08-06
| * | | | | | | | | mate-icon-theme-faenza: 1.18.0 -> 1.18.1romildo2017-08-06
| * | | | | | | | | mate-icon-theme: 1.18.1 -> 1.18.2romildo2017-08-06
* | | | | | | | | | Merge pull request #28005 from romildo/upd.adaptaFrederik Rietdijk2017-08-07
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | adapta-gtk-theme: 3.90.0.125 -> 3.91.1.47romildo2017-08-07
* | | | | | | | | | | Merge pull request #27940 from bkchr/fix_qt56_ldFrederik Rietdijk2017-08-07
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | QT5.6: Fixes compile error with wrong LD env variableBastian Köcher2017-08-07
* | | | | | | | | | | | hackage-packages.nix: automatic Haskell package set updatePeter Simons2017-08-07
* | | | | | | | | | | | Merge pull request #27899 from matthewbauer/emscripten-updateGabriel Ebner2017-08-07
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | emscripten: 1.37.13 -> 1.37.16Matthew Bauer2017-08-03
* | | | | | | | | | | | | jsonnet: 0.8.9 -> 0.9.4 (#27989)Benjamin Staffin2017-08-06
* | | | | | | | | | | | | linux-copperhead: 4.12.4.a -> 4.12.5.aTim Steinbach2017-08-06
* | | | | | | | | | | | | linux: 4.12.4 -> 4.12.5Tim Steinbach2017-08-06
* | | | | | | | | | | | | Merge pull request #27876 from joachifm/libsodium-1_0_13Joachim F2017-08-07
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | libsodium: 1.0.12 -> 1.0.13Joachim Fasting2017-08-02
* | | | | | | | | | | | | | Merge pull request #27949 from NeQuissimus/common_kernel_configTim Steinbach2017-08-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | linux-common-config: Refactor, clean upTim Steinbach2017-08-06
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #27812 from tohl/masterMichael Raskin2017-08-07
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | sbcl: 1.3.19 -> 1.3.20Tomas Hlavaty2017-07-31
* | | | | | | | | | | | | | | Merge pull request #27985 from romildo/upd.elementary-icon-themeJoachim F2017-08-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | elementary-icon-theme: 4.1.0 -> 4.2.0romildo2017-08-06
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #27820 from dalaing/piwik-install-doc-fixJoachim F2017-08-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | nixos/piwik: clarifies setup documentationDave Laing2017-08-02
* | | | | | | | | | | | | | | | pigz: enable parallel buildingJoachim Fasting2017-08-06
* | | | | | | | | | | | | | | | pigz: 2.3.3 -> 2.3.4Joachim Fasting2017-08-06
* | | | | | | | | | | | | | | | dnscrypt-proxy: enable parallel buildingJoachim Fasting2017-08-06