summary refs log tree commit diff
path: root/pkgs/top-level
Commit message (Collapse)AuthorAge
* top-level: Splice in more package sets for new types of depsJohn Ericson2017-12-30
| | | | | This is done in preparation for the next commit where, among other changes, I add support for the new `dep*` attributes.
* top level: Clean up definitions of alternative stdenvsJohn Ericson2017-12-27
| | | | | | | | | | | | - Dispatch off more appropriate conditions---`stdenv.cc.is*` and `hostPlatform.is*` directly---rather than the OS as a proxy. - Don't worry about pulling in binutils from normal `stdenv.cc` for `gccMultiStdenv`. - Defining a `multiStdenv` that uses whatever compiler is default. - Define `stdenv_32bit` in terms of `multiStdenv`.
* top level: Stop hacking around #28223John Ericson2017-12-26
| | | | Clang stdenvs with either libc++ should work now.
* Merge branch 'staging'Vladimír Čunát2017-12-19
|\
| * perlPackages: use ld-is-cc-hook to fix buildOrivej Desh2017-12-19
| | | | | | | | | | | | | | | | | | | | | | | | | | after #29396 removed `-L path/to/dir/of/libstdc++.so` from ld flags See https://github.com/NixOS/nixpkgs/pull/29396#issuecomment-352600129 Module::Build build helper works correctly when LD is unset (taking LD from Perl config to be `cc`). However, we can not unset LD because this goes contrary to the cross compilation effort, and we can not make it propagate ld-is-cc-hook because it breaks e.g. the build of `libguestfs`. However, #29396 makes LD=ld incompatible with just 3 perl packages; they are individually fixed by this commit.
| * ld-is-cc-hook: initOrivej Desh2017-12-19
| | | | | | | | | | This hook sets LD to CC, for use with software that works as if LD=$CC when LD is unset, and does not work when LD=ld.
| * Merge branch 'master' into stagingOrivej Desh2017-12-18
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (125 commits) scummvm: fix eval tinycc: 0.9.27pre-20171016 -> 0.9.27 Update terraform provider versions vscode: 1.18.1 -> 1.19.0 linux: 4.14.6 -> 4.14.7 scummvm: 1.9.0 -> 2.0.0 cmst: 2017.03.18 -> 2017.09.19 albert: 0.14.7 -> 0.14.14 obs-studio: fix vlc plugin ffmpeg, ffmpeg-full: 3.4 -> 3.4.1 uchiwa: 0.26.3 -> 1.1.0 linux-testing: 4.15-rc3 -> 4.15-rc4 steam: override nss, nspr, fixes #32781 ponyc: 0.20.0 -> 0.21.0 pythonPackages.pwntools: disable tests gnome3.gnome-tweak-tool: 3.26.3 → 3.26.4 vim-rhubarb: init at 2017-06-28 atom: depend on libsecret nvidia-settings: Make sure binary can find libXv.so backblaze-b2: 0.6.2 -> 1.1.0 ...
| * | Revert "Reverting #32599"Vladimír Čunát2017-12-15
| | | | | | | | | | | | | | | This reverts commit 15d3d68a5ea819dd82784a9a44cfe26ed5eb74cd. The PR is moved from master to staging.
| * | Merge branch 'master' into stagingVladimír Čunát2017-12-15
| |\ \
| * \ \ Merge branch 'master' into stagingVladimír Čunát2017-12-15
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/staging' into binutils-wrapperJohn Ericson2017-12-13
| |\ \ \ \
| | * \ \ \ Merge remote-tracking branch 'origin/master' into stagingGraham Christensen2017-12-12
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into stagingVladimír Čunát2017-12-12
| | |\ \ \ \ \
| | * | | | | | clang_multi: fix incorrect leftover use of "callPackages"Will Dietz2017-12-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addresses problem identified by @orivej: https://github.com/NixOS/nixpkgs/pull/32215#issuecomment-350600045
| | * | | | | | Merge pull request #32544 from FRidh/pythonmoduleFrederik Rietdijk2017-12-11
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Python: rewrite requiredPythonModules to prevent stack overflows
| | | * | | | | | Python: simplify hasPythonModuleOrivej Desh2017-12-10
| | | | | | | | |
| | | * | | | | | python.pkgs.setuptools: mark as python moduleFrederik Rietdijk2017-12-10
| | | | | | | | |
| | | * | | | | | Python: rewrite requiredPythonModules. Add requiredPythonModules attribute ↵Frederik Rietdijk2017-12-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to derivation
| | * | | | | | | Merge branch 'ericson2314-cross-base' into stagingJohn Ericson2017-12-10
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All the underlying commits are already on master
| | * \ \ \ \ \ \ \ Merge branch 'master' into stagingOrivej Desh2017-12-10
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (39 commits) pythonPackages: rename dns -> dnspython awesome: fix LUA_PATH/LUA_CPATH to lgi [now for version 3.5] qt4: fix qmake on darwin and delete custom install phase python.buildEnv: always include the $out output nix-bash-completions: lazy load aware install borg: 1.1.1 -> 1.1.3 nixos/programs/bash: document that /etc/bash_completion.d is obsolete ocamlPackages.markup: 0.7.4 -> 0.7.5 hhvm: 3.21 -> 3.23.2 ocamlPackages.ulex: 1.1 -> 1.2 notmuch: 0.25.2 -> 0.25.3 gmime3: 3.0.1 -> 3.0.5 qt4: fix darwin install phase nixos/programs/bash: Let bash-completion lazy load scripts Revert "gmime: 3.0.1 -> 3.0.5" rawtherapee: delete unused files pythonPackages: rename dns -> dnspython nixpkgs: remove sqlite/kyotocabinet deps for leveldb tor-browser-bundle-bin: 7.0.10 -> 7.0.11 networkmanager: remove restart after suspend from resume ...
| | * \ \ \ \ \ \ \ \ Merge pull request #32215 from dtzWill/feature/clang-multilibOrivej Desh2017-12-09
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | multilib-capable clang, multilib tests
| * | \ \ \ \ \ \ \ \ \ Merge commit '9d8f9b2e531bf95a700a949d879927fb6996ffc9' into binutils-wrapperJohn Ericson2017-12-13
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Add clang multilib variants (x64_64-only, 64/32bit), basic multilib testsWill Dietz2017-12-05
| | | | | | | | | | | |
| * | | | | | | | | | | bintools-wrapper: Import separately from cc-wrapperJohn Ericson2017-12-13
| | | | | | | | | | | |
| * | | | | | | | | | | bintools-wrapper: InitJohn Ericson2017-12-13
| | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Factor a bintools (i.e. binutils / cctools) wrapper out of cc-wrapper. While only LD is wrapped, the setup hook defines environment variables on behalf of other utilites.
* | | | | | | | | | | Merge pull request #32737 from vbgl/coq-packages-filterVincent Laporte2017-12-19
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Tidy up the Coq package sets
| * | | | | | | | | | | coqPackages.multinomials: init at 1.0Vincent Laporte2017-12-18
| | | | | | | | | | | |
| * | | | | | | | | | | coq: minor cleaningVincent Laporte2017-12-18
| | | | | | | | | | | |
| * | | | | | | | | | | coqPackages: move to a separate file and filter the package setVincent Laporte2017-12-18
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #32447 from lsix/add_djano_hijack_adminLancelot SIX2017-12-19
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | pythonPackages.django_hijack_admin: init at 2.1.5
| * | | | | | | | | | | pythonPackages.django_hijack_admin: init at 2.1.5Lancelot SIX2017-12-12
| | | | | | | | | | | |
* | | | | | | | | | | | bmap-tools: init at 3.4Tuomas Tynkkynen2017-12-19
| | | | | | | | | | | |
* | | | | | | | | | | | signal-desktop-beta: init at 1.1.0-beta.5 (#32619)Benjamin Staffin2017-12-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signal is a bit like google-chrome, wherein the beta version is independent from the release builds and uses different data locations and binary names.
* | | | | | | | | | | | Merge pull request #32745 from davidak/elementary-xfceOrivej Desh2017-12-18
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | elementary-xfce-icon-theme: init at 2017-11-28
| * | | | | | | | | | | elementary-xfce-icon-theme: init at 2017-11-28davidak2017-12-18
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #32642 from rycee/bump/electron-cashJörg Thalheim2017-12-18
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | electron-cash: 2.9.4 -> 3.0
| * | | | | | | | | | | | electron-cash: 2.9.4 -> 3.0Robert Helgesson2017-12-15
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #32690 from thanegill/airtame-initOrivej Desh2017-12-18
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | airtame: init at 3.0.1
| * | | | | | | | | | | | | airtame: init at 3.0.1Thane Gill2017-12-17
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #32749 from jtojnar/gnome-gtk2-cleanupJan Tojnar2017-12-18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor GNOME cleanups
| * | | | | | | | | | | | | | libcanberra: init without gtkJan Tojnar2017-12-17
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | backblaze-b2: 0.6.2 -> 1.1.0David Tulig2017-12-17
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | lightdm-gtk-greeter: 2.0.1 -> 2.0.3Mateusz Kowalczyk2017-12-17
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #32375 from volth/oracle-jdk-remove-redundand-assertsJörg Thalheim2017-12-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | oraclejdk: remove redundant asserts
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into oracle-jdk-remove-redundand-assertsvolth2017-12-13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | oraclejdk: remove redundant assertsJohn Doe2017-12-06
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #32648 from berce/upstream-kicadOrivej Desh2017-12-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kicad: init unstable at version 2017-12-11
| * | | | | | | | | | | | | | | | | kicad: add support for oce, ngspice and scriptingBert Moens2017-12-17
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | kicad: add unstable versionBert Moens2017-12-17
| | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #32419 from ryneeverett/init-lynisOrivej Desh2017-12-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lynis: init at 2.5.7