Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | | | | | | | Merge pull request #80919 from hercules-ci/modules-add-file-context | Robert Hensing | 2020-03-05 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||
| * | | | | | | lib/modules.nix: Add file context to unmerged values in mergeDefinitions | Robert Hensing | 2020-02-24 | |
* | | | | | | | Merge pull request #68491 from roberth/fix-dontRecurseIntoAttrs | Robert Hensing | 2020-03-01 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||
| * | | | | | | Document attrsets.recurseIntoAttrs | Robert Hensing | 2019-09-11 | |
| * | | | | | | top-level: Fix dontRecurseIntoAttrs and include in lib | Robert Hensing | 2019-09-11 | |
| * | | | | | | lib: Add recurseIntoAttrs | Robert Hensing | 2019-09-11 | |
* | | | | | | | Merge pull request #80814 from matthewbauer/default-newlib-for-none | John Ericson | 2020-02-22 | |
|\ \ \ \ \ \ \ | ||||
| * | | | | | | | lib/systems: Assume newlib when no kernel and no libc is provided | Matthew Bauer | 2020-02-22 | |
| | |_|_|_|_|/ | |/| | | | | | ||||
* | | | | | | | 20.09 is Nightingale | worldofpeace | 2020-02-10 | |
| |_|_|_|/ / |/| | | | | | ||||
* | | | | | | Merge pull request #68897 from edolstra/master | Eelco Dolstra | 2020-02-10 | |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | ||||
| * | | | | | lib/tests/misc.nix: Don't make a copy on Nixpkgs | Eelco Dolstra | 2020-02-10 | |
| * | | | | | lib/tests/misc.nix: Fix dependency on currentSystem | Eelco Dolstra | 2020-02-10 | |
* | | | | | | Merge pull request #79291 from chkno/remove-isArm | worldofpeace | 2020-02-08 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||
| * | | | | | stdenv: Remove isArm (use isAarch32 instead) | Chuck | 2020-02-05 | |
| * | | | | | lib.systems.elaborate: isArm -> isAarch32 | Chuck | 2020-02-05 | |
* | | | | | | Revert "Revert "Merge master into staging-next"" | Frederik Rietdijk | 2020-02-05 | |
|/ / / / / | ||||
* | | | | | Revert "Merge master into staging-next" | Frederik Rietdijk | 2020-02-05 | |
* | | | | | lib/strings: fix comment typo | Robert Helgesson | 2020-02-05 | |
|/ / / / | ||||
* | | | | Merge pull request #78337 from Profpatsch/lib-improve-cli-module | Profpatsch | 2020-01-24 | |
|\ \ \ \ | ||||
| * | | | | lib/cli: mkKey -> mkOptionName, use generators.mkValueStringDefault | Profpatsch | 2020-01-23 | |
| * | | | | lib/generators: floats are not supported in mkValueStringDefault | Profpatsch | 2020-01-23 | |
| * | | | | lib/cli: rename `renderX` options to `mkX` | Profpatsch | 2020-01-23 | |
| * | | | | lib/cli,lib/tests/misc: somewhat more standard formatting | Profpatsch | 2020-01-23 | |
| * | | | | lib/cli: encodeGNUCommandLine -> toGNUCommandLineShell | Profpatsch | 2020-01-23 | |
| * | | | | lib/cli: unexport symbols & sort with generators | Profpatsch | 2020-01-23 | |
* | | | | | Merge pull request #78058 from mayflower/nixos/version-gitdir-symlink | Franz Pletz | 2020-01-24 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||
| * | | | | nixos/version: fix case where .git is a symlink | Franz Pletz | 2020-01-20 | |
* | | | | | Merge pull request #77855 from AndersonTorres/update/notion | Anderson Torres | 2020-01-22 | |
|\ \ \ \ \ | ||||
| * | | | | | Notion custom license: exclude | AndersonTorres | 2020-01-17 | |
| |/ / / / | ||||
* | | | | | nixos/lib: Inherit type for doRename options (#78135) | Silvan Mosberger | 2020-01-20 | |
|\ \ \ \ \ | ||||
| * | | | | | nixos/lib: Inherit type for doRename options | Janne Heß | 2020-01-20 | |
| |/ / / / | ||||
* / / / / | lib/attrsets: Fix error in comment for getAttrFromPath | Silvan Mosberger | 2020-01-20 | |
|/ / / / | ||||
* | | | | Merge pull request #77704 from mayflower/also-submodules | Silvan Mosberger | 2020-01-16 | |
|\ \ \ \ | ||||
| * | | | | lib.commitIdFromGitRepo: fix support for git-submodule | elseym | 2020-01-14 | |
* | | | | | Replace short URL from #63103 with full URL. | Drew Hess | 2020-01-15 | |
|/ / / / | ||||
* | | | | lib/types: prioritise coercedType in coercedTo | arcnmx | 2020-01-14 | |
* | | | | Merge pull request #77047 from NixOS/staging-next | Frederik Rietdijk | 2020-01-14 | |
|\ \ \ \ | ||||
| * \ \ \ | Merge master into staging-next | Frederik Rietdijk | 2020-01-14 | |
| |\ \ \ \ | ||||
| * \ \ \ \ | Merge master into staging-next | Frederik Rietdijk | 2020-01-13 | |
| |\ \ \ \ \ | ||||
| * \ \ \ \ \ | Merge master into staging-next | Frederik Rietdijk | 2020-01-10 | |
| |\ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ | Merge master into staging-next | Frederik Rietdijk | 2020-01-10 | |
| |\ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into staging-next | Vladimír Čunát | 2020-01-08 | |
| |\ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ | Merge master into staging-next | Frederik Rietdijk | 2020-01-07 | |
| |\ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ | Merge pull request #74284 from matthewbauer/ios-with-xcode-11 | Matthew Bauer | 2020-01-03 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into ios-with-xcode-11 | Matthew Bauer | 2020-01-03 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | lib/systems: use newer ios sdk | Matthew Bauer | 2020-01-03 | |
* | | | | | | | | | | | | | Merge pull request #75539 from Gabriel439/gabriel/renderOptions | Robert Hensing | 2020-01-14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | Export toGNUCommandLine | Gabriel Gonzalez | 2020-01-05 | |
| * | | | | | | | | | | | | Factor out a `toGNUCommandLine` utility | Gabriel Gonzalez | 2020-01-05 | |
| * | | | | | | | | | | | | Use a more realistic example that exercises all encodings | Gabriel Gonzalez | 2019-12-15 |