Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | treewide: fix derivation names | Ryan Mulligan | 2018-05-28 |
| | |||
* | Merge staging into master | Frederik Rietdijk | 2018-05-27 |
|\ | |||
| * | Merge remote-tracking branch 'upstream/master' into staging | Tuomas Tynkkynen | 2018-05-26 |
| |\ | |||
| * \ | Merge branch 'master' into staging | Jan Malakhovski | 2018-05-26 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | Fixed conflicts: - lib/systems/for-meta.nix: in favor of staging - pkgs/os-specific/darwin/xcode/default.nix: in favor of master | ||
| * \ \ | Merge pull request #41009 from matthewbauer/normalize-names | Matthew Justin Bauer | 2018-05-25 |
| |\ \ \ | | | | | | | | | | | Add versions to packages missing it | ||
| | * | | | gimp: cleanup plugin name | Matthew Bauer | 2018-05-25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | All gimp plugins are now prefixed with "gimp-plugin-" to make them more clear. | ||
| | * | | | treewide: use appendToName where appropriate | Matthew Bauer | 2018-05-25 |
| | | | | | | | | | | | | | | | | | | | | Using appendToName preserves the version at the end of the name. | ||
| | * | | | renoise: srcVersion -> urlVersion | Yegor Timoshenko | 2018-05-25 |
| | | | | | |||
| | * | | | simgrid: cleanup | Yegor Timoshenko | 2018-05-25 |
| | | | | | |||
| | * | | | atlassian-cli: add some spaces, inherit meta.platforms from jre | Yegor Timoshenko | 2018-05-25 |
| | | | | | |||
| | * | | | okteta: add version attr, clean up | Yegor Timoshenko | 2018-05-25 |
| | | | | | |||
| | * | | | renoise: add platforms, derive src version from proper version string | Yegor Timoshenko | 2018-05-25 |
| | | | | | |||
| | * | | | treewide: add version to packages | Matthew Bauer | 2018-05-25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lots of packages are missing versions in their name. This adds them where appropriate. These were found with this command: $ nix-env -qa -f. | grep -v '\-[0-9A-Za-z.-_+]*$' | grep -v '^hook$' See issue #41007. | ||
| * | | | | Merge pull request #40728 from taku0/firefox-bin-60.0.1 | Joachim F | 2018-05-23 |
| |\ \ \ \ | | | | | | | | | | | | | firefox, firefox-bin: 60.0 -> 60.0.1, firefox-esr: 60.0esr -> 60.0.1esr | ||
| | * | | | | firefox-esr: 60.0esr -> 60.0.1esr | taku0 | 2018-05-18 |
| | | | | | | |||
| | * | | | | firefox: 60.0 -> 60.0.1 | taku0 | 2018-05-18 |
| | | | | | | |||
| | * | | | | firefox-bin: 60.0 -> 60.0.1 | taku0 | 2018-05-18 |
| | | | | | | |||
| * | | | | | Merge remote-tracking branch 'upstream/master' into staging | John Ericson | 2018-05-23 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into staging | John Ericson | 2018-05-23 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Use newer vagrant from master | ||
| * \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into staging | Tuomas Tynkkynen | 2018-05-22 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into staging | John Ericson | 2018-05-21 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into staging | Vladimír Čunát | 2018-05-20 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into staging | Robert Schütz | 2018-05-19 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | Revert "houdini: Fix libGL (#40736)" | Uli Baum | 2018-05-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f07c44bb7c8e71123cab80134eace62bc7ecc6dc. PR was incorrectly based on staging instead of master. | ||
| * | | | | | | | | | | | houdini: Fix libGL (#40736) | Kai Wohlfahrt | 2018-05-19 |
| | | | | | | | | | | | | |||
| * | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into staging | John Ericson | 2018-05-18 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |||
| * | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into staging | Tuomas Tynkkynen | 2018-05-18 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: pkgs/top-level/all-packages.nix | ||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #40610 from andir/firefox-60-aarch64 | Andreas Rammhold | 2018-05-17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | firefox: fix build on aarch64 with version >= 60 | ||
| | * | | | | | | | | | | | | firefox: fix build on aarch64 with version >= 60 | Andreas Rammhold | 2018-05-16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The firefox build fails with an error referring to ssse2 which doesn't exist on aarch64. | ||
| * | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into staging | John Ericson | 2018-05-16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep the dontCheck because the test suite fails, get rid of the LDFLAGS hack because we don't need it! | ||
| * | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into staging | Tuomas Tynkkynen | 2018-05-16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: pkgs/tools/networking/telnet/default.nix pkgs/top-level/aliases.nix | ||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into staging | John Ericson | 2018-05-14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into staging | John Ericson | 2018-05-14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into staging | John Ericson | 2018-05-14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge master into staging | Frederik Rietdijk | 2018-05-13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit '92b7a814f26ee1d37e989431c18518c67285a332' into staging | John Ericson | 2018-05-13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | firefox-esr: 52.7.4esr -> 52.8.0esr, 60.0esr | taku0 | 2018-05-12 |
| | | | | | | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | | | | firefox: 59.0.3 -> 60.0 | taku0 | 2018-05-12 |
| | | | | | | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | | | | firefox-bin: 59.0.3 -> 60.0 | taku0 | 2018-05-12 |
| | | | | | | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | | | | firefox: use fetchzip instead of fetchurl | taku0 | 2018-05-12 |
| | | | | | | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | | | | firefox-esr: 52.7.3esr -> 52.7.4esr | taku0 | 2018-05-12 |
| | | | | | | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | | | | firefox: 59.0.2 -> 59.0.3 | taku0 | 2018-05-12 |
| | | | | | | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | | | | firefox-bin: 59.0.2 -> 59.0.3 | taku0 | 2018-05-12 |
| | | | | | | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into staging | John Ericson | 2018-05-11 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into staging | John Ericson | 2018-05-11 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into staging | John Ericson | 2018-05-10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into staging | John Ericson | 2018-05-10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into staging | John Ericson | 2018-05-10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'fewer-crossAttrs' into staging | John Ericson | 2018-05-10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge master into staging | Frederik Rietdijk | 2018-05-10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |