summary refs log tree commit diff
path: root/pkgs/top-level
Commit message (Expand)AuthorAge
* top-level: Splice in more package sets for new types of depsJohn Ericson2017-12-30
* top level: Clean up definitions of alternative stdenvsJohn Ericson2017-12-27
* top level: Stop hacking around #28223John Ericson2017-12-26
* Merge branch 'staging'Vladimír Čunát2017-12-19
|\
| * perlPackages: use ld-is-cc-hook to fix buildOrivej Desh2017-12-19
| * ld-is-cc-hook: initOrivej Desh2017-12-19
| * Merge branch 'master' into stagingOrivej Desh2017-12-18
| |\
| * | Revert "Reverting #32599"Vladimír Čunát2017-12-15
| * | 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
| | * | | | | | Merge pull request #32544 from FRidh/pythonmoduleFrederik Rietdijk2017-12-11
| | |\ \ \ \ \ \
| | | * | | | | | Python: simplify hasPythonModuleOrivej Desh2017-12-10
| | | * | | | | | python.pkgs.setuptools: mark as python moduleFrederik Rietdijk2017-12-10
| | | * | | | | | Python: rewrite requiredPythonModules. Add requiredPythonModules attribute to...Frederik Rietdijk2017-12-10
| | * | | | | | | Merge branch 'ericson2314-cross-base' into stagingJohn Ericson2017-12-10
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into stagingOrivej Desh2017-12-10
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge pull request #32215 from dtzWill/feature/clang-multilibOrivej Desh2017-12-09
| | |\ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ 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
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #32737 from vbgl/coq-packages-filterVincent Laporte2017-12-19
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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.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
* | | | | | | | | | | | Merge pull request #32745 from davidak/elementary-xfceOrivej Desh2017-12-18
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | 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.0Robert Helgesson2017-12-15
* | | | | | | | | | | | | Merge pull request #32690 from thanegill/airtame-initOrivej Desh2017-12-18
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | airtame: init at 3.0.1Thane Gill2017-12-17
* | | | | | | | | | | | | | Merge pull request #32749 from jtojnar/gnome-gtk2-cleanupJan Tojnar2017-12-18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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: 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \