| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge pull request #119092 from numinit/update-androidenv | John Ericson | 2021-04-25 |
| |\ | | | | | androidenv: Allow multiple ndkVersions to be specified | ||
| | * | androidenv: Allow multiple ndkVersions to be specified | Morgan Jones | 2021-04-24 |
| | | | | | | | | | | | | | Android is deprecating ndk.dir in favor of specifying exact NDK version in Gradle configuration. Ensure that we can support multiple NDKs, and link them into the location the Android Gradle Plugin expects. | ||
| * | | Merge branch 'master' into staging-next | Jan Tojnar | 2021-04-25 |
| |\ \ | | | | | | | | | | Choose binwalk 2.3.1, 27 is legacy version for Python 2. | ||
| | * \ | Merge pull request #120231 from bobby285271/master | Jan Tojnar | 2021-04-24 |
| | |\ \ | | | | | | | | | doc: Convert builders/images/* to markdown | ||
| | | * | | doc/builders/images/*.xml: Convert to markdown | Bobby Rong | 2021-04-24 |
| | | | | | |||
| * | | | | Merge remote-tracking branch 'nixpkgs/master' into staging-next | Alyssa Ross | 2021-04-23 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: pkgs/development/python-modules/pyvex/default.nix pkgs/top-level/python-packages.nix | ||
| | * | | | doc/contributing/*.xml: Convert to markdown | Bobby Rong | 2021-04-23 |
| | |/ / | |||
| * | | | Merge master into staging-next | github-actions[bot] | 2021-04-22 |
| |\| | | |||
| | * | | Merge pull request #108919 from bryanasdev000/doc-dlib | Sandro | 2021-04-22 |
| | |\ \ | | | | | | | | | dlib: Update doc to use CommonMark | ||
| | | * | | doc/builders/packages/dlib.xml: Convert to markdown | Bryan A. S | 2021-04-13 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Bryan A. S <bryanasdev000@gmail.com> | ||
| | * | | | Merge pull request #118269 from midchildan/feat/fuse/add-darwin | Sandro | 2021-04-22 |
| | |\ \ \ | |||
| | | * | | | docs: add FUSE packaging tip for Darwin | midchildan | 2021-04-20 |
| | | | | | | |||
| * | | | | | Merge master into staging-next | github-actions[bot] | 2021-04-22 |
| |\| | | | | |||
| | * | | | | Merge pull request #116475 from davidak/doc-remove-packages | Samuel Dionne-Riel | 2021-04-21 |
| | |\ \ \ \ | | | | | | | | | | | | | doc: add instructions to remove a package | ||
| | | * | | | | doc: add instructions to remove a package | davidak | 2021-04-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-authored-by: Sandro <sandro.jaeckel@gmail.com> Co-authored-by: Ben Siraphob <bensiraphob@gmail.com> | ||
| * | | | | | | Merge master into staging-next | github-actions[bot] | 2021-04-21 |
| |\| | | | | | |||
| | * | | | | | Include custom package in vim docs (#92811) | Adrian Hesketh | 2021-04-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Describe how to package a plugin that doesn't exist in nixpkgs (and also how to include an external file). Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com> | ||
| * | | | | | | Merge master into staging-next | github-actions[bot] | 2021-04-20 |
| |\| | | | | | |||
| | * | | | | | docs: correct some english | Evils | 2021-04-20 |
| | | | | | | | |||
| * | | | | | | Merge remote-tracking branch 'upstream/staging-next' into down-integrate-staging | Luke Granger-Brown | 2021-04-12 |
| |\| | | | | | |||
| | * | | | | | Merge pull request #103546 from mnacamura/cdda-small-fix | Sandro | 2021-04-12 |
| | |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||
| | | * | | | | doc: add usage for `cataclysmDDA.attachPkgs` | Mitsuhiro Nakamura | 2020-11-13 |
| | | | | | | | |||
| | * | | | | | Merge pull request #112477 from happysalada/fix_build_mix | Alexander Bantyev | 2021-04-09 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | buildMix: fix: initial try | ||
| | | * | | | | | beam-modules: buildMix -> mixRelease | happysalada | 2021-04-08 |
| | | | | | | | | |||
| * | | | | | | | Fix "platfrom" typos | Emery Hemingway | 2021-04-10 |
| |/ / / / / / | |||
| * | | | | | | Merge pull request #116749 from vroad/docker-layered-image-fakeroot | Robert Hensing | 2021-04-07 |
| |\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | dockerTools.streamLayeredImage: add fakeRootCommands option | ||
| | * | | | | | dockerTools.streamLayeredImage: Update documentation | vroad | 2021-03-24 |
| | | | | | | | | | | | | | | | | | | | Co-authored-by: Robert Hensing <roberth@users.noreply.github.com> | ||
| | * | | | | | dockerTools.streamLayeredImage: document fakeRootCommands | vroad | 2021-03-19 |
| | | |_|/ / | |/| | | | |||
| * | | | | | Merge pull request #116257 from SuperSandro2000/code-fences | Sandro | 2021-04-05 |
| |\ \ \ \ \ | | | | | | | | | | | | | doc/languages-frameworks/*: add missing languages to code fences | ||
| | * | | | | | doc/languages-frameworks/*: add missing languages to code fences | Sandro Jäckel | 2021-04-05 |
| | | | | | | | | | | | | | | | | | | | | | | | | | convert shell -> ShellSession | ||
| * | | | | | | doc/stdenv/cross: fix typo | sternenseemann | 2021-04-02 |
| | | | | | | | |||
| * | | | | | | Delete citrix.xml | Sandro | 2021-04-01 |
| | | | | | | | |||
| * | | | | | | Merge pull request #108918 from bryanasdev000/doc-citrix | Ryan Mulligan | 2021-03-31 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | citrix: Update doc to use CommonMark | ||
| | * | | | | | | doc/builders/packages/citrix.xml: Convert to markdown | Bryan A. S | 2021-03-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bryan A. S <bryanasdev000@gmail.com> | ||
| * | | | | | | | Merge pull request #108917 from bryanasdev000/doc-ocitools | Ryan Mulligan | 2021-03-31 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | ocitools: Update doc to use CommonMark | ||
| | * | | | | | | | doc/builders/images/ocitools.xml: Convert to markdown | Bryan A. S | 2021-03-22 |
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bryan A. S <bryanasdev000@gmail.com> | ||
| * | | | | | | | Merge master into staging-next | github-actions[bot] | 2021-03-29 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||
| | * | | | | | | Merge pull request #98734 from ju1m/zerobin | Doron Behar | 2021-03-29 |
| | |\ \ \ \ \ \ | |||
| | | * | | | | | | zerobin: 20160108 -> 1.0.5 | Julien Moutinho | 2021-03-13 |
| | | | | | | | | | |||
| * | | | | | | | | Merge master into staging-next | github-actions[bot] | 2021-03-25 |
| |\| | | | | | | | |||
| | * | | | | | | | Merge pull request #117360 from midchildan/feat/fuse/darwin | Bernardo Meurer | 2021-03-24 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | fuse: use macfuse-stubs instead on Darwin | ||
| | | * | | | | | | | doc: add section for FUSE | midchildan | 2021-03-24 |
| | | | |/ / / / / | | |/| | | | | | |||
| * | | | | | | | | Merge master into staging-next | github-actions[bot] | 2021-03-24 |
| |\| | | | | | | | |||
| | * | | | | | | | doc: improve Python section (#116344) | Robert Schütz | 2021-03-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Avoid confusion as in https://github.com/NixOS/nixpkgs/pull/116325#discussion_r593946638. | ||
| * | | | | | | | | Merge master into staging-next | github-actions[bot] | 2021-03-24 |
| |\| | | | | | | | |||
| | * | | | | | | | Merge pull request #115857 from lbpdt/feature/docker-tools-layered-base-image | Benjamin Hipple | 2021-03-23 |
| | |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | dockerTools.buildLayeredImage: support fromImage | ||
| | | * | | | | | | dockerTools.buildLayeredImage: support fromImage | Louis Blin | 2021-03-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is now possible to pass a `fromImage` to `buildLayeredImage` and `streamLayeredImage`, similar to what `buildImage` currently supports. This will prepend the layers of the given base image to the resulting image, while ensuring that at most `maxLayers` are used. It will also ensure that environment variables from the base image are propagated to the final image. | ||
| * | | | | | | | | Merge master into staging-next | github-actions[bot] | 2021-03-21 |
| |\| | | | | | | | |||
| | * | | | | | | | Merge pull request #108921 from bryanasdev000/doc-ibus | Sandro | 2021-03-21 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | ibus: Update doc to use CommonMark | ||
| | | * | | | | | | | doc/builders/packages/ibus.xml: Convert to markdown | Bryan A. S | 2021-02-14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bryan A. S <bryanasdev000@gmail.com> | ||