summary refs log tree commit diff
Commit message (Collapse)AuthorAge
* python.pkgs.feedgen: init at 0.5.1Casey Rodarmor2017-08-07
|
* Merge pull request #28008 from alexandergall/add-cloud-imageWout Mertens2017-08-08
|\ | | | | nixos/cloud-image: add module
| * nixos/cloud-image: add moduleAlexander Gall2017-08-07
| | | | | | | | | | The module creates an image for an openstack-based cloud using the cloud-init package.
* | orackejdk: untie from gnome2volth2017-08-08
| | | | | | Nothing should change unless you override ```gtk2``` or ```gnome2.gtk``` so they become different
* | Merge pull request #28019 from Infinisil/fix-default-text-xmonadFranz Pletz2017-08-08
|\ \ | | | | | | xmonad service: add defaultText to extraPackages to fix rendering in docs
| * | xmonad service: add defaultText to extraPackages to fix rendering in docsSilvan Mosberger2017-08-08
| | |
* | | Merge pull request #28020 from michalrus/geekbenchFranz Pletz2017-08-08
|\ \ \ | | | | | | | | geekbench: init at 4.1.1
| * | | geekbench: init at 4.1.1Michal Rus2017-08-08
| | | |
* | | | Revert 0cf0d7186a5259ae59b852c109f31ab09af56cecTim Steinbach2017-08-07
| | | | | | | | | | | | | | | | | | | | Order common kernel config by functionality See #27949
* | | | Merge pull request #27960 from LnL7/clang-libgcryptDaniel Peebles2017-08-07
|\ \ \ \ | | | | | | | | | | libgcrypt: fix clang build
| * | | | libgcrypt: fix clang buildDaiderd Jordan2017-08-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #27906 Because #pragma GCC optimize ("O0") doesn't work for clang and NIX_CFLAGS_COMPILE bypasses the fixup done by the makefiles everything gets compiled with -O2. The build still uses optimisation for everything else.
* | | | | Merge pull request #27911 from LnL7/erlang-no-gccDaiderd Jordan2017-08-07
|\ \ \ \ \ | | | | | | | | | | | | erlang: remove explicit gcc dependency
| * | | | | erlang: remove explicit gcc dependencyDaiderd Jordan2017-08-03
| | | | | |
* | | | | | ffmpeg, ffmpeg-full: 3.3.2 -> 3.3.3Cray Elliott2017-08-07
| | | | | |
* | | | | | Merge pull request #28004 from moesasji/masterWout Mertens2017-08-07
|\ \ \ \ \ \ | | | | | | | | | | | | | | xfce4-session: fix lock screen not working with light-locker
| * | | | | | xfce4-session: fix lock screen not working with light-lockermoesasji2017-08-07
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #28003 from kamilchm/ponycWout Mertens2017-08-07
|\ \ \ \ \ \ | | | | | | | | | | | | | | ponyc: 0.16.1 -> 0.17.0
| * | | | | | ponyc: 0.16.1 -> 0.17.0Kamil Chmielewski2017-08-07
| |/ / / / / | | | | | | | | | | | | | | | | | | https://github.com/ponylang/ponyc/issues/2135
* | | | | | Merge pull request #28010 from womfoo/bump/facter-3.7.1Wout Mertens2017-08-07
|\ \ \ \ \ \ | | | | | | | | | | | | | | facter: 3.6.6 -> 3.7.1 and related deps
| * | | | | | facter: 3.6.6 -> 3.7.1Kranium Gikos Mendoza2017-08-08
| | | | | | |
| * | | | | | leatherman: 0.11.2 -> 1.0.0Kranium Gikos Mendoza2017-08-08
| | | | | | |
* | | | | | | Merge pull request #28011 from womfoo/bump/zabbix-cli-1.7.0Wout Mertens2017-08-07
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | zabbix-cli: 1.6.1 -> 1.7.0
| * | | | | | | zabbix-cli: 1.6.1 -> 1.7.0Kranium Gikos Mendoza2017-08-08
| |/ / / / / /
* | | | | | | Merge pull request #28013 from womfoo/bump/pick-1.7.0Wout Mertens2017-08-07
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | pick: 1.6.1 -> 1.7.0
| * | | | | | | pick: 1.6.1 -> 1.7.0Kranium Gikos Mendoza2017-08-08
| |/ / / / / /
* | | | | | | Merge pull request #27684 from gnidorah/bfqTim Steinbach2017-08-07
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | linux: BFQ Group Scheduling support
| * | | | | | | linux: BFQ Group Scheduling supportgnidorah2017-08-07
| | |/ / / / / | |/| | | | |
* | | | | | | gradle: 4.0.2 -> 4.1Tim Steinbach2017-08-07
| | | | | | |
* | | | | | | linux: 4.13-rc3 -> 4.13-rc4Tim Steinbach2017-08-07
| | | | | | |
* | | | | | | linux: 4.4.79 -> 4.4.80Tim Steinbach2017-08-07
| | | | | | |
* | | | | | | linux: 4.9.40 -> 4.9.41Tim Steinbach2017-08-07
| | | | | | |
* | | | | | | isabelle: use polyml 5.6Gabriel Ebner2017-08-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Isabelle 2016 does not work with newer PolyML versions.
* | | | | | | Merge pull request #27426 from rnhmjoj/nginxWout Mertens2017-08-07
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | nginx: make enabling SSL port-specific
| * | | | | | | nginx: make enabling SSL port-specificrnhmjoj2017-07-27
| | | | | | | |
* | | | | | | | Merge pull request #27615 from NickHu/cudaDomen Kožar2017-08-07
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | fix haskellPackages.cuda and some tools dependent on cudatoolkit
| * | | | | | | | fix haskellPackages.cuda and some tools dependent on cudatoolkitNick Hu2017-07-24
| | | | | | | | |
* | | | | | | | | ruby docs: fix text and example (#28006)nonsequitur2017-08-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. 'wrapper' has been renamed to 'wrappedRuby', so use this instead. 2. mkDerivation isn't called with a 'src' attribute, so skip the 'unpackPhase' to avoid an error. 3. Simplify the build command. 'mkdir' and 'patchShebangs' don't need to be called explicitly.
* | | | | | | | | Merge commit 'b679e14' into HEADFrederik Rietdijk2017-08-07
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | release.nix: resurrect stdenvBootstrapToolsVladimír Čunát2017-08-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13d6681ce7 crippled it unintentionally. Also remove the incorrect/non-existing stdenv.i686-linux; building the bootstrap tools should be a good-enough test anyway.
| * | | | | | | | | expat: fix build on aarchRobert Helgesson2017-08-06
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into stagingVladimír Čunát2017-08-06
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... to fix bugs in i686-linux removal.
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into stagingVladimír Čunát2017-08-06
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's drop i686-linux here as well.
| * \ \ \ \ \ \ \ \ \ \ Merge pull request #27320 from jtojnar/fix/unbreak-polariFrederik Rietdijk2017-08-05
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | polari: unbreak
| | * | | | | | | | | | | polari: unbreakJan Tojnar2017-08-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The build was failing due to missing telepathy_logger dependency, I added it. Additionally, the connection to server was failing due to telepathy executables not having an access to dconf, which was fixed in #26113. Lastly, when I tried running Polari directly, it terminated with SIGTRAP and the following error: (org.gnome.Polari:22998): GLib-GIO-ERROR **: Settings schema 'org.gnome.desktop.interface' is not installed adding `gnome3.gsettings_desktop_schemas` as a buildInput fixed that.
| | * | | | | | | | | | | wrap-gapps-hook: also wrap symlinks to executablesJan Tojnar2017-08-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some programs store the executable in a different place and link it from the `bin` directory. For example, Polari links `$out/bin/polari` to `$out/share/polari/org.gnome.Polari`. `wrapGAppsHook` did not follow symlinks so it was not able to wrap Polari, making it unable to access GObject introspection definitions required for running the program. I made the wrapping script follow symlinks to fix this corner case.
| * | | | | | | | | | | | Merge pull request #27879 from obsidiansystems/cc-wrapper-shellcheckJohn Ericson2017-08-04
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | cc-wrapper: Pass shellcheck and other cleanups
| | * | | | | | | | | | | | cc-wrapper: Pass shellcheck and other cleanupsJohn Ericson2017-08-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In many cases, this involved taking @orivej's and @edolstra's recent ld-wrapper improvements, and applying then elsewhere.
| * | | | | | | | | | | | | Merge commit 'refs/pull/27485/head' of github.com:NixOS/nixpkgs into stagingThomas Tuegel2017-08-04
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merges #27485.
| | * | | | | | | | | | | | | qt5: 5.9.0 -> 5.9.1adisbladis2017-07-18
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | expat: 2.2.2 -> 2.2.3Robert Helgesson2017-08-04
| | | | | | | | | | | | | | |