| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge pull request #240553 from tomodachi94/doc/prefer-maven.buildPackage•••doc/maven: prefer maven.buildMavenPackage over mvn2nix | Weijia Wang | 2023-08-01 | 1 | -53/+106 |
| |\ |
|
| | * | doc/maven: add stable-maven-plugins back | Weijia Wang | 2023-08-01 | 1 | -4/+34 |
| | * | doc/maven: prefer maven.buildMavenPackage over mvn2nix•••Manually calling `mvn2nix` was the preferred way of building
Java apps that use Maven, but `maven.buildMavenPackage` is now the
preferred way.
| Tomo | 2023-08-01 | 1 | -53/+76 |
| * | | doc/hooks/index.md: add zig.section.md•••A somewhat short documentation about zigHook.
| Anderson Torres | 2023-08-01 | 2 | -0/+60 |
| |/ |
|
| * | Merge pull request #245358 from asymmetric/nixpkgs-doc-build-instructions•••doc/contributing: update build instructions after nrd | pennae | 2023-07-29 | 1 | -18/+4 |
| |\ |
|
| | * | doc/contributing: update build instructions•••We have moved away from Make since nixos-render-docs was introduced to
build the nixpkgs manual in #239636.
| Lorenzo Manacorda | 2023-07-25 | 1 | -18/+4 |
| * | | Merge pull request #243062 from mobusoperandi/doc_watchexec•••nixpkgs/NixOS manuals: devmode feature | Silvan Mosberger | 2023-07-27 | 4 | -3/+37 |
| |\ \ |
|
| | * | | nixpkgs/NixOS manuals: devmode feature•••Co-authored-by: Alejandro Sanchez Medina <alejandrosanchzmedina@gmail.com>
| Shahar "Dawn" Or | 2023-07-25 | 2 | -0/+28 |
| | * | | nixpkgs manual: extract some build paths•••Co-authored-by: Shahar "Dawn" Or <mightyiampresence@gmail.com>
| Alejandro Sanchez Medina | 2023-07-25 | 2 | -3/+9 |
| | |/ |
|
| * | | Merge pull request #224068 from SomeoneSerge/respect-config-cudaSupport•••Respect global config.cudaSupport | Connor Baker | 2023-07-25 | 1 | -2/+5 |
| |\ \
| |/
|/| |
|
| | * | config.cudaSupport: init option | Someone Serge | 2023-07-20 | 1 | -1/+1 |
| | * | doc: update #cuda to reflect the recommended config.cudaSupport style | Someone Serge | 2023-07-20 | 1 | -2/+5 |
| * | | Merge pull request #244332 from SuperSandro2000/fonts-fonts•••nixos/fonts: rename fonts.fonts option to fonts.packages, other cleanups | asymmetric | 2023-07-25 | 1 | -1/+3 |
| |\ \ |
|
| | * | | treewide: rename fonts.fonts to fonts.packages | Sandro Jäckel | 2023-07-24 | 1 | -1/+3 |
| * | | | Merge pull request #243848 from SuperSandro2000/clarify-python-tools•••docs/python: clarify allowance of using toosl to autogenerate packages | Martin Weinelt | 2023-07-24 | 1 | -4/+4 |
| |\ \ \
| |/ /
|/| | |
|
| | * | | docs/python: clarify allowance of using toosl to autogenerate packages | Sandro Jäckel | 2023-07-24 | 1 | -4/+4 |
| * | | | Merge master into staging-next | github-actions[bot] | 2023-07-22 | 1 | -2/+2 |
| |\ \ \ |
|
| | * | | | Remove tailhook from maintainers | Paul Colomiets | 2023-07-22 | 1 | -2/+2 |
| | | |/
| |/| |
|
| * | | | Merge master into staging-next | github-actions[bot] | 2023-07-19 | 1 | -1/+1 |
| |\| | |
|
| | * | | docs/contributing: fix "ha256" -> "sha256" typo | Theodore Ni | 2023-07-18 | 1 | -1/+1 |
| * | | | Merge staging-next into staging | github-actions[bot] | 2023-07-16 | 1 | -1/+4 |
| |\| | |
|
| | * | | Merge pull request #240136 from NixOS/doc-review-patches•••doc/reviewing-contributions: Add points about patches | Robert Hensing | 2023-07-16 | 1 | -1/+4 |
| | |\ \ |
|
| | | * | | doc/reviewing-contributions: Remove wrong fetchpatch detail
•••
It may have to be fetchpatch, fetchpatch2, or fetchurl. We should link somewhere, but we don't have a link target yet, so until then, remove the inaccurate info.
Co-authored-by: Alyssa Ross <hi@alyssa.is>origin/doc-review-patches | Robert Hensing | 2023-06-27 | 1 | -2/+2 |
| | | * | | doc/reviewing-contributions: Add points about patches•••A weaker version of https://github.com/NixOS/nixpkgs/pull/186484#issuecomment-1608960696 | Robert Hensing | 2023-06-27 | 1 | -0/+3 |
| * | | | | Merge branch 'staging-next' into staging•••Conflicts:
- pkgs/tools/networking/shadowfox/default.nix between e989daa65f2dd9827d56bee6a14a1965471f0597 and 1c29673fcce3aecd0cb4f30058c266ea5480c8a3
- pkgs/tools/networking/wuzz/default.nix between 7d80417710a9077b9142b479b02d07200d71d9db and 1c29673fcce3aecd0cb4f30058c266ea5480c8a3
| Jan Tojnar | 2023-07-16 | 1 | -24/+32 |
| |\| | | |
|
| | * | | | doc/../haskell.section.md: Make a bit clearer and more beginner friendly | maralorn | 2023-07-15 | 1 | -24/+32 |
| * | | | | treewide: go-modules -> goModules•••In 787af0f79f128cb21b113d2eb37e64d913f18aae
I had to change ${go-modules} to $goModules to allow overrideAttrs to work;
However, env vars cannot contain -, so i had to change go-modules too.
This in turn broke nix-update because it uses the go-modules attr.
Instead of making nix-update more complicated, make go-modules naming match cargoDeps.
`fd --type f | xargs sd '\bgo-modules\b' 'goModules'`
and revert change to pkgs/applications/misc/dstask/default.nix
and pkgs/servers/http/dave/default.nix
and pkgs/os-specific/darwin/plistwatch/default.nix
release note added
| Artturin | 2023-07-14 | 1 | -2/+2 |
| |/ / / |
|
| * | | | Revert "Revert "submitting-changes.chapter.md: explain *why* we have three br...•••This reverts commit 7e6c518ce4f316cba803a40c19160606a8bfab9f.
I misinterpreted Github's CI failure in the notification tab and
thought that I had broken CI on origin/master, so I panic-reverted
before I merged it (I thought they had).
On closer inspection, it appears that the CI failure was not from
the tip that I merged. This PR resubmits the reverted change. I'll
wait for OfBorg to finish this time.
| Adam Joseph | 2023-06-29 | 1 | -10/+65 |
| * | | | Revert "submitting-changes.chapter.md: explain *why* we have three branches" | Adam Joseph | 2023-07-12 | 1 | -65/+10 |
| * | | | submitting-changes.chapter.md: explain *why* we have three branches•••The manual does an okay job of explaining the rules for each of the
three development branches, but really doesn't give any intuition as
to why there are three (why not four? or two?) or how we got where
we are today.
This commit attempts to fix that, by explaining that there is one
branch that allows mass-rebuild commits, and it has a fast-building
branch both upstream and downstream of it (from the perspective of
automated merges).
I have also removed the term "stabilization" from the arc labels.
This vague term is not defined anywhere, and does communicate any
useful information without a longer explanation. Therefore it is
not appropriate for use in a diagram.
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
| Adam Joseph | 2023-06-29 | 1 | -10/+65 |
| | |/
|/| |
|
| * | | buildLuarocksPackage: rename file to match its role | Matthieu Coudron | 2023-07-10 | 1 | -1/+1 |
| * | | Merge pull request #242312 from NixOS/doc-lib-render-fixedPoints•••doc: Render lib.fixedPoints | Robert Hensing | 2023-07-08 | 2 | -7/+11 |
| |\ \ |
|
| | * | | doc: Render lib.fixedPoints | Robert Hensing | 2023-07-08 | 2 | -7/+11 |
| * | | | Merge pull request #240860 from Atemu/fhsenv-no-multiarch•••buildFHSEnv: disable multiArch by default | Atemu | 2023-07-08 | 1 | -0/+2 |
| |\ \ \ |
|
| | * | | | buildFHSEnv: add multiArch flag•••The intention is to allow the user control over whether 32bit deps are supposed
to be included in the fhsenv
| Atemu | 2023-07-01 | 1 | -0/+2 |
| * | | | | Merge pull request #233804 from lilyinstarlight/feature/npm-workspaces•••buildNpmPackage: add npmWorkspace and npmPruneFlags args | Mario Rodas | 2023-07-08 | 1 | -1/+3 |
| |\ \ \ \
| |_|/ /
|/| | | |
|
| | * | | | doc/languages-frameworks/javascript: add npmWorkspace and npmPruneFlags args | Lily Foster | 2023-06-29 | 1 | -1/+3 |
| | |/ / |
|
| * | | | darwin.linux-builder: rename from `darwin.builder` | Michael Hoang | 2023-07-06 | 1 | -3/+7 |
| * | | | darwin.builder: use port 31022 by default | Michael Hoang | 2023-07-06 | 1 | -4/+10 |
| * | | | Merge pull request #239636 from pennae/nixpkgs-manual-nrd•••doc: dedocbookify nixpkgs manual | pennae | 2023-07-03 | 42 | -821/+480 |
| |\ \ \ |
|
| | * | | | doc: inline doc-support to main drv•••separating function docs out like this makes it less clear how library
documentation is generated and integrated into the build. if in the
future more parts of nixpkgs use nixdoc it will make sense to have all
information about library doc generation in the same place.
| pennae | 2023-07-01 | 2 | -31/+18 |
| | * | | | doc: pull option docs out of doc-support•••this leaves doc-support as a simple wrapper around function docs. this
wrapper will go away very soon as well.
| pennae | 2023-07-01 | 3 | -28/+27 |
| | * | | | doc: remove remnants of docbook times•••all xml-related tooling can go away. shell.nix is no longer useful since
the makefile is gone and the build runs entirely via a derivation, and
gitignore is thus also no longer that useful. it may filter out some
swap files, but its main reason to exist (keeping generated files out of
a concurrent build of the derivation) has gone away.
| pennae | 2023-07-01 | 12 | -323/+1 |
| | * | | | doc: render nixpkgs manual with nrd•••also updates nixdoc to 2.3.0. the nixdoc update is not a separate commit
because that would leave the manual build broken for one commit,
potentially breaking bisects and rebases.
| pennae | 2023-07-01 | 32 | -400/+389 |
| | * | | | doc-support: don't expose locationsXml•••nothing except function docs uses this, so we need not expose it. we'll
be reworking this entire section of the build anyway, with the target of
breaking up doc-support as it is now.
| pennae | 2023-07-01 | 2 | -5/+8 |
| | * | | | doc: build placeholder epub in its own derivation•••mostly to clean up the main manual build makefile and derivation a bit.
not technically necessary, but will make life easier later.
| pennae | 2023-07-01 | 2 | -41/+44 |
| * | | | | Merge pull request #239005 from Artturin/setorfunoverr•••stdenv: let overrideAttrs accept attrset OR function | Robert Hensing | 2023-07-01 | 1 | -4/+20 |
| |\ \ \ \ |
|
| | * | | | | doc/using/overrides: Relate addition to preceding text | Robert Hensing | 2023-07-01 | 1 | -1/+3 |
| | * | | | | doc/using/overrides: it is possible to use previous arguments in .override | Artturin | 2023-06-30 | 1 | -0/+6 |
| | * | | | | stdenv: let overrideAttrs accept attrset OR function•••Makes overrideAttrs usable in the same way that `override` can be used.
It allows the first argument of `overrideAttrs` to be either a function
or an attrset, instead of only a function:
hello.overrideAttrs (old: { postBuild = "echo hello"; })
hello.overrideAttrs { postBuild = "echo hello"; }
Previously only the first example was possible.
Co-authored-by: adisbladis <adisbladis@gmail.com>
Co-authored-by: matthewcroughan <matt@croughan.sh>
| Artturin | 2023-06-30 | 1 | -4/+12 |
