summary refs log tree commit diff
Commit message (Collapse)AuthorAge
* Merge branch 'master' to resolve conflictsVladimír Čunát2016-05-05
|\
| * release-combined.nix: More Chromium test evaluation fixesTuomas Tynkkynen2016-05-05
| | | | | | | | Follow-up to f35e9386bd7e.
| * dbus-glibc: Set --exec-prefix to fix pkgconfig fileTuomas Tynkkynen2016-05-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this notify-osd fails to find dbus-binding-tool, since the pkgconfig file would contain e.g.: ```` prefix=/nix/store/hxsbjbjn7g1j1cf60n228yi9wnzrl4yk-dbus-glib-0.104 exec_prefix=${prefix} ```` ... and notify-osd is using `exec_prefix` to locate the binaries. Set it to $dev to match the location of installed binaries (we have `outputBin = "dev";`). Issue #15074.
| * dpkg: 1.18.5 -> 1.18.6Tobias Geerinckx-Rice2016-05-05
| |
| * eid-mw: 4.1.16 -> 4.1.17Tobias Geerinckx-Rice2016-05-05
| |
| * python-gui: init at 1.0.2, fixes #14958Tobias Pflug2016-05-05
| |
| * python-neovim: 0.0.38 -> 0.1.7Tobias Pflug2016-05-05
| | | | | | | | Disable for python3
| * Merge pull request #15229 from DamienCassou/notmuch-0.22Rok Garbas2016-05-05
| |\ | | | | | | notmuch: 0.21 -> 0.22
| | * notmuch: 0.21 -> 0.22Damien Cassou2016-05-04
| | |
| * | chromium+chrome: Don't import update.nix directlyaszlig2016-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression introduced by f28b71023cba59ba819b0978ebffa70e3e4d1785. Let's now expose and use the upstream-info attribute via the main Chromium derivation, so that other packages like the google-chrome package doesn't need to rely on internals of the Chromium implementation. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * | chromium/updater: Don't import <nixpkgs> againaszlig2016-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This effectively resets the attributes given at the point the main <nixpkgs> is imported and thus for example is also reading in stuff like ~/.nixpkgs/config.nix again, which might lead to unexpected results. We now only import <nixpkgs> now if the updater is auto-called (like in update.sh), otherwise the required attributes are passed by callPackage within the Chromium scope. I remember noting about this a while ago either on IRC or on GitHub, but I can't find it right now, so thanks to @obadz for reminding me about this in #15225. Tested this by running the updater and also using: NIXPKGS_CONFIG=$(pwd)/broken.nix nix-instantiate --arg config {} -A chromium The contents of broken.nix were: EVALERR{ Signed-off-by: aszlig <aszlig@redmoonstudios.org> Fixes: #15225
| * | Merge pull request #15135 from gpyh/asciidoctorzimbatm2016-05-04
| |\ \ | | | | | | | | asciidoctor: Init at 1.5.4
| | * | asciidoctor: Init at 1.5.4Yacine Hmito2016-05-04
| | | |
| | * | Added gpyh to the list of maintainersYacine Hmito2016-05-01
| | | |
| * | | rpm-ostree: bump version of libglnx to fix environment passing bugDan Peebles2016-05-04
| | | | | | | | | | | | | | | | | | | | See https://github.com/projectatomic/rpm-ostree/issues/277 for more details.
| * | | Merge pull request #15214 from taku0/lp_solve_isnanJoachim Fasting2016-05-04
| |\ \ \ | | | | | | | | | | lp_solve: fixed build error due to defining isnan
| | * | | lp_solve: change source URL to mirrortaku02016-05-04
| | | | |
| | * | | lp_solve: updated descriptiontaku02016-05-04
| | | | |
| | * | | lp_solve: fixed build error due to defining isnantaku02016-05-04
| | |/ /
| * | | nixos/tests/containers: Remove unused module argaszlig2016-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just removing the system argument because it doesn't exist (it's actually config.nixpkgs.system, which we're already using). We won't get an error anyway if we're not actually using it, so this is just an aesthetics fix. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * | | Merge pull request #15208 from taku0/firefox-bin-46.0.1Arseniy Seroka2016-05-04
| |\ \ \ | | | | | | | | | | firefox-bin: 45.0.2 -> 46.0.1
| | * | | firefox-bin: 45.0.2 -> 46.0.1taku02016-05-04
| | | | |
| * | | | Merge pull request #15215 from romildo/upd.xfce4-cpufreq-pluginArseniy Seroka2016-05-04
| |\ \ \ \ | | | | | | | | | | | | xfce4-cpufreq-plugin: 1.1.1 -> 1.1.3
| | * | | | xfce4-cpufreq-plugin: 1.1.1 -> 1.1.3José Romildo Malaquias2016-05-04
| | | | | |
| * | | | | Merge pull request #15221 from schneefux/masterArseniy Seroka2016-05-04
| |\ \ \ \ \ | | | | | | | | | | | | | | caddy: v0.8.2 -> v0.8.3
| | * | | | | caddy: v0.8.2 -> v0.8.3schneefux2016-05-04
| | | | | | |
| * | | | | | nixos/tests/containers-imperative: Fix testaszlig2016-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that we always have everything available within the store of the VM, so let's evaluate/build the test container fully on the host system and propagate all dependencies to the VM. This way, even if there are additional default dependencies that come with containers in the future we should be on the safe side as these dependencies should now be included for the test as well. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @kampfschlaefer, @edolstra
| * | | | | | Merge pull request #15223 from romildo/new.xfce4-weather-pluginJoachim Fasting2016-05-04
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | xfce4-weather-plugin: init at 0.8.7
| | * | | | | | xfce4-weather-plugin: init at 0.8.7José Romildo Malaquias2016-05-04
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #15217 from LumiGuide/fix-mdadm-sendmailJoachim Fasting2016-05-04
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | mdadm: call /var/setuid-wrappers/sendmail instead of /usr/sbin/sendmail
| | * | | | | | mdadm: call /var/setuid-wrappers/sendmail instead of /usr/sbin/sendmailBas van Dijk2016-05-04
| | | | | | | |
| * | | | | | | ocaml-oasis: 0.4.5 -> 0.4.6 (#15209)vbgl2016-05-04
| | | | | | | |
| * | | | | | | nixos/tests/chromium: Re-add map for all channelsaszlig2016-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This partially reverts f2d24b98408b48c2179b131fa4c3700dc41f5b52. Instead of disabling the channels via removing the channel mapping from the tests themselves, let's just explicitly reference the stable test in release.nix. That way it's still possible to run the beta and dev tests via something like "nix-build nixos/tests/chromium.nix -A beta" and achieve the same effect of not building beta and dev versions on Hydra. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| * | | | | | | makeself: fix patch to find the makeself header properlyDan Peebles2016-05-04
| | | | | | | |
| * | | | | | | Do some large, concurrency-capable builds on dedicated machinesEelco Dolstra2016-05-04
| | | | | | | |
| * | | | | | | chromium: Disable Hydra builds of -dev and -betaEelco Dolstra2016-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's not the job of Nixpkgs to distribute beta versions of upstream packages. More importantly, building these delays channel updates by several hours, which is bad for our security fix turnaround time.
| * | | | | | | imagemagick: libwebp just has to be a propagated inputMichael Raskin2016-05-04
| | | | | | | |
| * | | | | | | Merge pull request #15219 from ali-abrar/rxvt_unicode-9.22Nikolay Amiantov2016-05-04
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | rxvt_unicode: 9.21 -> 9.22
| | * | | | | | | rxvt_unicode: 9.21 -> 9.22Ali Abrar2016-05-04
| | |/ / / / / /
| * | | | | | | Merge pull request #15211 from romildo/upd.enlightenmentNikolay Amiantov2016-05-04
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | enlightenment: 0.20.6 -> 0.20.7
| | * | | | | | enlightenment: 0.20.6 -> 0.20.7José Romildo Malaquias2016-05-04
| | | | | | | |
| * | | | | | | Merge pull request #15210 from taku0/amarok_pcreJoachim Fasting2016-05-04
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | amarok: add pcre as a dependency to fix failing build
| | * | | | | | | amarok: add pcre as a dependency to fix failing buildtaku02016-05-04
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge pull request #15167 from deepfire/haskell-ghc8-configuration-updatesPeter Simons2016-05-04
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Haskell GHC 8.0.1-rc4 configuration updates
| | * | | | | | | ghc8 | config: turtle: jailbreakKosyrev Serge2016-05-04
| | | | | | | | |
| | * | | | | | | ghc8 | config: trifecta: jailbreakKosyrev Serge2016-05-04
| | | | | | | | |
| | * | | | | | | ghc8 | config: th-reify-many -> 0.1.4.1Kosyrev Serge2016-05-04
| | | | | | | | |
| | * | | | | | | ghc8 | config: th-desugar -> gitKosyrev Serge2016-05-04
| | | | | | | | |
| | * | | | | | | ghc8 | config: stm-conduit -> gitKosyrev Serge2016-05-04
| | | | | | | | |
| | * | | | | | | ghc8 | config: singletons -> gitKosyrev Serge2016-05-04
| | | | | | | | |