summary refs log tree commit diff
path: root/pkgs
Commit message (Collapse)AuthorAge
* Merge branch 'staging' into closure-sizeVladimír Čunát2016-01-19
|\
| * refactor to use autoreconfHook where possibleRobin Gloster2016-01-18
| | | | | | | | Close #12446.
| * Merge branch 'master' into stagingVladimír Čunát2016-01-18
| |\
| | * Merge pull request #12064 from FlorentBecker/eliom42vbgl2016-01-18
| | |\ | | | | | | | | Eliom42
| | | * cohttp: 0.17.1 -> 0.19.3Florent Becker2016-01-12
| | | |
| | | * js_of_ocaml: Allow caml >= 4.02 to find camlp4Florent Becker2016-01-08
| | | |
| | | * eliom: 4.1.0 -> 4.2.0Florent Becker2016-01-01
| | | |
| | | * js_of_ocaml: 2.5 -> 2.6Florent Becker2016-01-01
| | | |
| | | * ocsigen-server: 2.5 -> 2.6Florent Becker2016-01-01
| | | |
| | | * lwt: 2.4.6 -> 2.5.0Florent Becker2016-01-01
| | | |
| | | * ocaml-ssl: 0.4.7 -> 0.5.2Florent Becker2016-01-01
| | | |
| | * | Merge pull request #12450 from eduarrrd/pshsTobias Geerinckx-Rice2016-01-18
| | |\ \ | | | | | | | | | | pshs: 0.2.6 -> 0.3
| | | * | pshs: 0.2.6 -> 0.3Eduard Bachmakov2016-01-17
| | | | |
| | * | | simple-scan: 3.19.3 -> 3.19.4Tobias Geerinckx-Rice2016-01-18
| | | | |
| | * | | mdadm: Set allowedReferences to only include libc.aszlig2016-01-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The updates we had in the past (7719f7f and 1faf610) broke the mdadm installer test and systems in the wild using mdraid because newer mdadm versions contained a self-referenc to its own store path. Instead of putting a big warning about updating in the package expression, let's just add allowedReferences so the build immediately fails if there is a self-reference. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| | * | | mdadm: Clean up package expression.aszlig2016-01-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's use makeFlags directly instead of stitching together a makeFlagsArray in preBuild. This should make the expression much more readable and clean. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| | * | | mdadm: 3.3 -> 3.3.4aszlig2016-01-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Okay, this update is a bit more tricky and the patch I've included is not very nice to be honest. So the patch causes "mdadm --udev-rules" to search for the right store path using /proc/self/exec. This has the disadvantage that we could end up having /run/current-system/bin/mdadm in the rule file. But on the other hand, when we're on NixOS, we don't need to use that command *at*all*, so we should be safe. The patch also sets BINDIR to /sbin, which causes the included rule and systemd files to not work out of the box on NixOS. But we have a substituteInPlace where we do rewrite /sbin/mdadm to the right store path in our udev rule generator, so that shouldn't be an issue. I've tested this using the mdraid installer test and it succeeded. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| | * | | Merge pull request #12448 from jb55/terra-patchTobias Geerinckx-Rice2016-01-18
| | |\ \ \ | | | | | | | | | | | | terra: init at git-2016-01-06
| | | * | | terra: init at git-2016-01-06William Casarin2016-01-17
| | | | | |
| | * | | | chromium: Remove myself from maintainersaszlig2016-01-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Working on Chromium really drives me nuts due to its build time, also I really don't have quite a lot of time these days to properly maintain it anymore. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| | * | | | chromium: Do not rely on import-from-derivationaszlig2016-01-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has been introduced by me in 690a845 and discovered by @vcunat in his comment over at: https://github.com/NixOS/nixpkgs/commit/690a845de93a49e85480ad5fae492fa14658ce85#commitcomment-14209868 It's really a bit ugly to have builds running during evaluation, but back when I made that commit the reason was to avoid having to shell quote the hell out of it (see the comment in mkPluginInfo for the reason). Now we propagate plugin flags and environment variables as a list of arguments in a plain file that's appended verbatim to makeWrapper, so it shouldn't do any builds anymore during instantiation. I have tested this with both just WideVine and just Flash enabled as well as both in combination and none of the plugins and the output seems correct. However I didn't test to run Chromium with the new implementation. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Reported-by: Vladimír Čunát <vcunat@gmail.com>
| | * | | | tldr: use fetchFromGitHub; pkgconfigTobias Geerinckx-Rice2016-01-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pkgconfig is unrelated, but trivial (removes a harmless but distracting error message) and doesn't warrant its own commit.
| | * | | | hack-font: 2.018 -> 2.019Tobias Geerinckx-Rice2016-01-18
| | | | | |
| | * | | | tldr: 1.0 -> 1.1.0; maintainTobias Geerinckx-Rice2016-01-18
| | | | | |
| | * | | | Merge pull request #12447 from gpyh/fix-android-build-toolsTobias Geerinckx-Rice2016-01-18
| | |\ \ \ \ | | | |/ / / | | |/| | | Renamed subdirectories in Android SKD's build-tools
| | | * | | Renamed subdirectories in Android SKD's build-toolsYacine Hmito2016-01-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nix unzips the different components of the Android SDK one by one. It followed the directory structure of complete packages released for mainstream OS but the names of the directories in build-tools doesn't match those. As a result, some programs assuming the usual directory structure and naming conventions broke (in my case it is a gradle plugin). This is a fix. It may introduce a regression if some programs rely on the current behavior.
| | * | | | ms-sys: correct licenceTobias Geerinckx-Rice2016-01-18
| | | | | |
| | * | | | 4suite: remove dead packageTobias Geerinckx-Rice2016-01-18
| | | | | | | | | | | | | | | | | | | | | | | | Project abandoned in 2006. Broken since June 2014.
| | * | | | ms-sys: 2.5.1 -> 2.5.2; maintainTobias Geerinckx-Rice2016-01-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: - Added german man page, - added support for Grub2 and Grub4Dos MBR, - added support for KolibriOS MBR and FAT32 boot record, - added support for ReactOS MBR, FAT32 and FAT16 BR, - added support for Rufus MBR, - added experimental support for large sectors ( > 512), - now possible to alter OEM ID of FAT and NTFS boot records. - now possible to alter Windows Disk Signature in MBR.
| | * | | | Merge pull request #12363 from expipiplus1/llvm-enable-sharedTobias Geerinckx-Rice2016-01-18
| | |\ \ \ \ | | | |/ / / | | |/| | | llvm: Add enableSharedLibraries option to 3.5 and 3.6
| | | * | | llvm: Add enableSharedLibraries option to 3.5 and 3.6Joe Hermaszewski2016-01-13
| | | | | |
| | * | | | 3dfsb: Remove packageFranz Pletz2016-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Package is broken, old and not easily fixable. See #12397.
| | * | | | racerRust: 1.0.0 -> 1.1.0Robin Gloster2016-01-17
| | | | | |
| | * | | | rustRegistry: 2015-12-23 -> 2016-01-17Robin Gloster2016-01-17
| | | | | |
| | * | | | Merge pull request #12445 from 4z3/urlwatchRobin Gloster2016-01-17
| | |\ \ \ \ | | | | | | | | | | | | | | urlwatch: 1.18 -> 2.0 incl. its new dependency minidb-2.0.1
| | | * | | | urlwatch: 1.18 -> 2.0tv2016-01-17
| | | | | | |
| | | * | | | minidb: init at 2.0.1tv2016-01-17
| | | | | | |
| | * | | | | Merge pull request #12444 from erlang-nix/propagate-build-pluginsPeter Simons2016-01-17
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | Erlang: Pass buildPlugins to rebar3-nix-bootstrap from buildRebar3
| | | * | | | Pass buildPlugins to rebar3-nix-bootstrap.Gleb Peregud2016-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To successfully build rebar packages, it needs to be provided with rebar3 plugins used to build it. This change passes them to env variable. From there rebar3-nix-bootstrap takes them and symlinks into _build/default/plugins.
| | * | | | | sshuttle: 0.74 -> 0.76Tobias Geerinckx-Rice2016-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And back to fetchurl we go: “LookupError: setuptools-scm was unable to detect version for '/tmp/nix-build-.../sshuttle-v0.76-src'. Make sure you're not using GitHub's tarballs (or similar ones), as those don't contain the necessary metadata. Use PyPI's tarballs instead.”
| | * | | | | xorg.xorgserver: wrap Xvfb with required flagsDomen Kožar2016-01-17
| | | | | | |
| | * | | | | gajim: add extraPythonPackages optionNikolay Amiantov2016-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For exampole, this allows to add python-axolotl to PYTHONPATH, which is needed for OMEMO OTR messaging plugin.
| | * | | | | python-axolotl: init at 0.1.7Nikolay Amiantov2016-01-17
| | | | | | |
| | * | | | | python-axolotl-curve25519: init at 0.1Nikolay Amiantov2016-01-17
| | | | | | |
| | * | | | | spotify: 0.9.17.1 -> 1.0.19.106Christopher Lübbemeier2016-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes by @globin: used wrapper instead of propagatedUserEnvPkgs for zenity closes #12191 Signed-off-by: Robin Gloster <mail@glob.in>
| | * | | | | Merge pull request #12443 from gebner/lean-ninjaPascal Wittmann2016-01-17
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | lean: update and add wrapper for linja
| | | * | | | | lean: add wrapper for linjaGabriel Ebner2016-01-17
| | | | | | | |
| | | * | | | | lean: 20150821 -> 20160117Gabriel Ebner2016-01-17
| | | | | | | |
| | * | | | | | pygraphviz: init at 1.3Matthias Beyer2016-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes by @globin: 1.2 -> 1.3 correct license information Signed-off-by: Robin Gloster <mail@glob.in>
| | * | | | | | mates: remove packageRobin Gloster2016-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | see #11926 for context closes #11926