Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' into staging | Jan Tojnar | 2019-06-25 |
|\ | |||
| * | mkshell: improve mergeInputs | Bas van Dijk | 2019-06-23 |
| * | mkShell: compose shellHooks | Bas van Dijk | 2019-06-23 |
| * | buildBazelPackage: disable multithreaded fetching | Timo Kaufmann | 2019-06-20 |
| * | buildBazelPackage: fix directory symlink handling | Timo Kaufmann | 2019-06-20 |
| * | Merge pull request #63447 from jtojnar/sublime-cleanup | Jan Tojnar | 2019-06-19 |
| |\ | |||
| | * | libredirect: add posix_spawnp support | Maximilian Bosch | 2019-06-18 |
| * | | Merge pull request #63349 from seppeljordan/update-nix-prefetch-github | worldofpeace | 2019-06-18 |
| |\ \ | |||
| | * | | nix-prefetch-github: Remove propagatedBuildInputs `requests' | Sebastian Jordan | 2019-06-19 |
| | * | | nix-prefetch-github: 2.2 -> 2.3 | Sebastian Jordan | 2019-06-17 |
| | |/ | |||
| * | | Merge pull request #54543 from thefloweringash/git-prefetch-errors | Matthew Bauer | 2019-06-18 |
| |\ \ | |||
| | * | | nix-prefetch-git: propagate errors under --quiet | Andrew Childs | 2019-01-25 |
* | | | | Merge staging-next into staging | Frederik Rietdijk | 2019-06-18 |
|\| | | | |||
| * | | | treewide: remove unused variables (#63177) | volth | 2019-06-16 |
| * | | | Merge branch 'master' into staging-next | Vladimír Čunát | 2019-06-14 |
| |\ \ \ | | | |/ | | |/| | |||
* | | | | Merge pull request #62167 from matthewbauer/alias-libgl | Matthew Bauer | 2019-06-17 |
|\ \ \ \ | |||
| * | | | | treewide: mesa_noglu, mesa_drivers, libGL_driver -> mesa | Matthew Bauer | 2019-06-17 |
* | | | | | Merge pull request #63035 from rvolosatovs/update/go | Wael Nasreddine | 2019-06-12 |
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | |||
| * | | | Merge pull request #62783 from Izorkin/php-packages | Elis Hirwing | 2019-06-12 |
| |\ \ \ | |||
| | * | | | phpPackages: build phpPackages with re2c | Izorkin | 2019-06-11 |
* | | | | | Merge master into staging-next | Frederik Rietdijk | 2019-06-12 |
|\| | | | | |||
| * | | | | Merge pull request #54921 from grabango/master | Matthew Bauer | 2019-06-10 |
| |\ \ \ \ | |||
| | * | | | | Use nativeBuildInputs for building Docker images | Kevin Rauwolf | 2019-01-29 |
| * | | | | | Merge pull request #56161 from coreyoconnor/appimage-run-xcbutil | Matthew Bauer | 2019-06-10 |
| |\ \ \ \ \ | |||
| | * | | | | | appimage build-support: add xorg.xcbutil* | Corey O'Connor | 2019-04-21 |
| * | | | | | | mirrors: add osdn mirrors | Mario Rodas | 2019-06-08 |
| * | | | | | | mirrors: rename sourceforgejp to osdn | Mario Rodas | 2019-06-08 |
* | | | | | | | Merge master into staging-next | Frederik Rietdijk | 2019-06-10 |
|\| | | | | | | |||
| * | | | | | | writeScript: fix docstring | Jaakko Luttinen | 2019-06-09 |
| | |_|_|/ / | |/| | | | | |||
* | | | | | | Merge master into staging-next | Frederik Rietdijk | 2019-06-09 |
|\| | | | | | |||
| * | | | | | Merge pull request #62773 from danieldk/docker-shared-layer-test | lewo | 2019-06-08 |
| |\ \ \ \ \ | |||
| | * | | | | | nixos/tests/docker-tools: check layer sharing with buildLayeredImage | Daniël de Kok | 2019-06-06 |
| * | | | | | | Merge branch 'staging-next' (PR #62209) | Vladimír Čunát | 2019-06-07 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||
| * | | | | | | dockerTools.buildLayeredImage: restore layer sharing | Daniël de Kok | 2019-06-06 |
| | |_|_|/ / | |/| | | | | |||
* | | | | | | Merge pull request #60559 from JohnAZoidberg/patchshebangs-multiple-args | Matthew Bauer | 2019-06-05 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||
| * | | | | | patchShebangs: Exit if no arguments were given | Daniel Schaefer | 2019-05-26 |
| * | | | | | patchShebangs: Allow for multiple arguments | Daniel Schaefer | 2019-05-25 |
| * | | | | | patchShebangs: Explain that script must be executable | Daniel Schaefer | 2019-05-25 |
* | | | | | | Merge branch 'master' into staging-next | Vladimír Čunát | 2019-06-05 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||
| * | | | | | Merge pull request #53991 from arianvp/fix-initrd | Danylo Hlynskyi | 2019-06-05 |
| |\ \ \ \ \ | |||
| | * | | | | | build-support/make-initrd: Don't derive derivation name from file name | Arian van Putten | 2019-05-29 |
* | | | | | | | Merge branch 'master' into staging-next | Vladimír Čunát | 2019-06-03 |
|\| | | | | | | |||
| * | | | | | | chrootenv: propagate nested chrootenv /host | Nikolay Amiantov | 2019-05-30 |
| * | | | | | | chrootenv: small improvements | Nikolay Amiantov | 2019-05-30 |
| * | | | | | | chrootenv: make stackable | Nikolay Amiantov | 2019-05-30 |
| |/ / / / / | |||
* | | | | | | Merge staging into staging-next | Frederik Rietdijk | 2019-05-29 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||
| * | | | | | Merge staging-next into staging | Frederik Rietdijk | 2019-05-28 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'staging-next' into staging | Vladimír Čunát | 2019-05-26 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||
| * | | | | | | Merge pull request #60877 from veprbl/pr/nuke-refs-quotemeta-fix | Dmitry Kalinkin | 2019-05-23 |
| |\ \ \ \ \ \ | |||
| | * | | | | | | nukeReferences: fix for store paths with special characters (like '+' or '.') | Dmitry Kalinkin | 2019-05-03 |