Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge staging-next into staging | Frederik Rietdijk | 2019-04-16 |
|\ | |||
| * | make-initrd: allow specifying name | Linus Heckemann | 2019-04-13 |
| * | Merge pull request #59338 from matthewbauer/llvm-libc++ | Matthew Bauer | 2019-04-12 |
| |\ | |||
| | * | llvm8: support c++ in cross case | Matthew Bauer | 2019-04-11 |
| * | | Merge pull request #58847 from bachp/fhs-locales | Joachim F | 2019-04-12 |
| |\ \ | |||
| | * | | nixos/fhsUserenv: make all locales available | Pascal Bach | 2019-04-02 |
| * | | | treewide: fixup bcf54ce | rnhmjoj | 2019-04-12 |
| | |/ | |/| | |||
* | | | Merge staging-next into staging | Frederik Rietdijk | 2019-04-11 |
|\| | | |||
| * | | Merge master into staging-next | Frederik Rietdijk | 2019-04-11 |
| |\ \ | |||
| | * \ | Merge pull request #59181 from Izorkin/nginx-format | Jörg Thalheim | 2019-04-10 |
| | |\ \ | |||
| | | * | | nixos/nginx: fix error in writeNginxConfig | Izorkin | 2019-04-08 |
* | | | | | Merge pull request #59024 from matthewbauer/hackage-mirrors | Matthew Bauer | 2019-04-10 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||
| * | | | | haskell: add more hackage mirrors, use mirrors in more places | Matthew Bauer | 2019-04-05 |
| | |_|/ | |/| | | |||
* | | | | Merge master into staging-next | Frederik Rietdijk | 2019-04-09 |
|\ \ \ \ | | |/ / | |/| | | |||
| * | | | Merge pull request #58394 from P-E-Meunier/carnix-0.10 | Andreas Rammhold | 2019-04-08 |
| |\ \ \ | | |_|/ | |/| | | |||
| | * | | Carnix: 0.9 -> 0.10 | Pierre-Étienne Meunier | 2019-03-26 |
| * | | | trivial-builders: Fix outdated comment on writeTextFile | Niklas Hambüchen | 2019-04-08 |
* | | | | Merge master into staging-next | Frederik Rietdijk | 2019-04-07 |
|\| | | | |||
| * | | | Merge pull request #58350 from xtruder/pkgs/dockerTools/storePathToLayer/runt... | lewo | 2019-04-06 |
| |\ \ \ | |||
| | * | | | dockerTools: storePathToLayer use runtimeShell in script | Jaka Hudoklin | 2019-03-26 |
| * | | | | Merge pull request #58360 from xtruder/pkgs/dockerTools/nix-prefetch-docker | Jaka Hudoklin | 2019-04-06 |
| |\ \ \ \ | |||
| | * | | | | dockerTools: add nix-prefetch-docker script | Jaka Hudoklin | 2019-04-06 |
| | |/ / / | |||
| * | | | | Merge branch 'staging-next' | Vladimír Čunát | 2019-04-06 |
| |\ \ \ \ | |||
| | * \ \ \ | Merge branch 'master' into staging-next | Vladimír Čunát | 2019-04-02 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||
* | | | | | | Merge branch 'master' into staging | Jan Tojnar | 2019-04-05 |
|\| | | | | | |||
| * | | | | | Merge pull request #57979 from 4z3/writeNginxConfig | Jörg Thalheim | 2019-04-04 |
| |\ \ \ \ \ | |||
| | * | | | | | build-support writers: add writeNginxConfig | tv | 2019-03-20 |
| * | | | | | | writeShellScriptBin: use build-time shell in check phase | Michael Eden | 2019-04-04 |
| | |_|/ / / | |/| | | | | |||
| * | | | | | Merge pull request #58330 from AerialX/msp430 | John Ericson | 2019-03-29 |
| |\ \ \ \ \ | |||
| | * | | | | | systems: support TI MSP430 microcontrollers | Aaron Lindsay | 2019-03-25 |
| | | |_|_|/ | | |/| | | | |||
| * | | | | | Merge pull request #57936 from andir/build-rust-crate-nix-build-cores | Andreas Rammhold | 2019-03-29 |
| |\ \ \ \ \ | |||
| | * | | | | | buildRustCrate: use $NIX_BUILD_CORES for each of the crates | Andreas Rammhold | 2019-03-20 |
| | | |_|_|/ | | |/| | | | |||
| * | | | | | Merge pull request #58345 from xtruder/pkgs/dockerTools/pullImage/finalImageName | lewo | 2019-03-28 |
| |\ \ \ \ \ | |||
| | * | | | | | dockerTools: add finalImageName parameter for pullImage | Jaka Hudoklin | 2019-03-26 |
| | | |/ / / | | |/| | | | |||
| * | | | | | Strip leading ./ in customization layer | Alex Biehl | 2019-03-27 |
| * | | | | | Add /nix/store to each layer.tar | Alex Biehl | 2019-03-27 |
| |/ / / / | |||
* | | | | | Merge branch 'staging' into rust-cross | John Ericson | 2019-04-01 |
|\ \ \ \ \ | |||
| * | | | | | Merge commit '18aa59b0f26fc707e7313f8467e67159e61600c2' from master into staging | John Ericson | 2019-04-01 |
| |\| | | | | |||
| * | | | | | Merge staging-next into staging | Frederik Rietdijk | 2019-03-23 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||
| | * | | | | Merge master into staging-next | Frederik Rietdijk | 2019-03-23 |
| | |\ \ \ \ | |||
| | * \ \ \ \ | Merge branch 'master' into staging-next | Vladimír Čunát | 2019-03-14 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||
| * | | | | | | Merge remote-tracking branch 'origin/master' into staging | Wael M. Nasreddine | 2019-03-21 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||
| * | | | | | | Merge pull request #57603 from jtojnar/wrap-gapps-hook-self-gio | Jan Tojnar | 2019-03-15 |
| |\ \ \ \ \ \ | |||
| | * | | | | | | wrapGAppsHook: add package’s own modules to GIO_EXTRA_MODULES | Jan Tojnar | 2019-03-13 |
| * | | | | | | | Merge branch 'staging-next' into staging | Vladimír Čunát | 2019-03-10 |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||
| | * | | | | | | Merge branch 'master' into staging-next | Vladimír Čunát | 2019-03-10 |
| | |\ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ | Merge master into staging-next | Frederik Rietdijk | 2019-03-05 |
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | |||
| * | | | | | | | | Merge pull request #56031 from matthewbauer/priorities | Matthew Bauer | 2019-03-09 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||
| | * | | | | | | | bintools-wrapper: set low priority | Matthew Bauer | 2019-02-18 |
| * | | | | | | | | Merge staging-next into staging | Frederik Rietdijk | 2019-03-01 |
| |\ \ \ \ \ \ \ \ |