about summary refs log tree commit diff
path: root/lib
AgeCommit message (Collapse)AuthorFilesLines
2022-11-22Merge pull request #180964 from amjoseph-nixpkgs/pr/mkSkeletonFromList/simplifyJohn Ericson1-23/+23
lib/systems/parse.nix: mkSkeletonFromList: improve readability
2022-11-22Merge pull request #202370 from Artturin/revertpartof1Artturi1-2/+2
Revert "lib/trivial: fix 'error: cannot decode virtual path '/nix/sto…
2022-11-22Revert "lib/trivial: fix 'error: cannot decode virtual path ↵Artturin1-2/+2
'/nix/store/virtual0000000000000000000000005-source''" This reverts commit b67ee6e861903abb04e9024d605dfc7b00922633. https://github.com/NixOS/nixpkgs/issues/202244 error: a string that refers to a store path cannot be appended to a path, at /etc/nixos/nix/nixos-unstable/lib/sources.nix:193:30 appears to happen when there's a nixpkgs git submodule > So one of the things that is different for a git submodule is that the .git folder isn't a folder, it's a textfile that contains (in my case) this: > $ cat nix/nixos-unstable/.git > gitdir: ../../.git/modules/nixpkgs
2022-11-2123.05 is Stoat 23.05-preMartin Weinelt1-1/+1
2022-11-21Merge pull request #170737 from amjoseph-nixpkgs/fix-mips32-detectionArtturi1-1/+1
lib/systems/platforms.nix: fix broken mips32 detection
2022-11-21Merge pull request #201527 from figsoda/libfigsoda3-3/+39
lib/attrsets: add concatMapAttrs
2022-11-20Merge pull request #201946 from Artturin/splicingstuff2Artturi1-6/+9
lib.overrideDerivation: override attrs in __spliced && splice.nix: start deprecating nativeDrv and crossDrv
2022-11-19splice.nix: start deprecating nativeDrv and crossDrvArtturin1-0/+1
2022-11-18lib.overrideDerivation: override attrs in __splicedArtturin1-6/+8
2022-11-18lib/sources: make commitIdFromGitRepoOrError internal and use # for commentsArtturin1-8/+7
so that it doesn't make the manual build fail > Apparently this is related to the combination of this new function not getting exported from the file, while still getting documented.
2022-11-17lib/attrsets: add concatMapAttrsfigsoda3-2/+38
2022-11-17lib/attrsets: simplify chooseDevOutputsfigsoda1-1/+1
2022-11-17Merge pull request #199812 from Artturin/removeusagesoftostringonpath1Artturi2-11/+22
lib/sources: remove 2 usages of toString on a path which will be read using fileContents
2022-11-16licenses: add bsd2WithViewsGabriel Arazas1-0/+5
2022-11-13lib/systems/parse.nix: mkSkeletonFromList: improve readabilityAdam Joseph1-23/+23
The main purpose of this PR is to make the basis for `mkSkeletonFromList`'s decision between `cpu-kernel-libcabi` vs `cpu-vendor-os` clear, without changing its behavior. The existing code obscures this decision behind a sequence of prioritized matches (i.e. `if-then`) which jump around between different coordinates. Two side benefits of this PR: 1. It makes the root cause of #165836 obvious: we are missing a case for `cpu-vendor-libcabi`. This is why nixpkgs stumbles over `*-none-*`. 2. It illuminates some very weird corner cases in the existing logic, like `*-${vendor}-ghcjs` overriding the `vendor` field, and `mingw32` being transformed into `windows` in some cases. Co-authored-by: John Ericson <git@JohnEricson.me>
2022-11-13Merge pull request #82131 from Ericson2314/bsd-crossJohn Ericson6-11/+24
FreeBSD packages: Init at 13.1
2022-11-11Merge pull request #200667 from wegank/to-base-digits-typeSilvan Mosberger1-0/+2
lib.trivial.toBaseDigits: type check
2022-11-11lib.trivial.toBaseDigits: type checkWeijia Wang1-0/+2
2022-11-10Merge master into haskell-updatesgithub-actions[bot]1-15/+0
2022-11-09Merge pull request #196007 from wegank/fdl11-removeSandro1-15/+0
2022-11-09Merge master into haskell-updatesgithub-actions[bot]1-0/+1
2022-11-08lib/types: add `descriptionClass` for `path`Naïm Favier1-0/+1
2022-11-07haskell.compiler.ghc92: 9.2.4 -> 9.2.5sternenseemann1-1/+1
2022-11-07lib/sources: Make pathIsGitRepo not evaluate toString pathRobert Hensing1-7/+18
This requires us to avoid the `tryEval` + `throw` combination, because throw is strict in its error message, and we don't want to drop our single clue when `commitIdFromGitRepo` is used incorrectly.
2022-11-06cross/mingw: fix emulator for mingw32Jörg Thalheim1-3/+2
2022-11-06lib/sources: remove 2 usages of toString on a path which will be read using ↵Artturin1-2/+2
fileContents It gives a warning on the lazy-trees branch of Nix (NixOS/nix#6530) "warning: applying 'toString' to path '...' and then accessing it is deprecated, at '...'" 'else toString (/. + "${base}/${path}");' at line 183 may still cause a warning but i don't know how to reach that codepath and test so im leaving it untouched changing it to 'else /. + "${base}/${path}";' caused this error ``` error: a string that refers to a store path cannot be appended to a path at /home/systems/nixpkgs/lib/sources.nix:183:20: 182| then path 183| else /. + "${base}/${path}"; | ^ 184| in if pathIsRegularFile path ```
2022-11-06lib/trivial: fix 'error: cannot decode virtual path ↵Artturin1-2/+2
'/nix/store/virtual0000000000000000000000005-source'' happens on lazy-trees branch of Nix (NixOS/nix#6530)
2022-11-05Revert "lib,doc: remove obvious usages of toString on paths"Anderson Torres2-7/+7
2022-11-06lib,doc: remove obvious usages of toString on pathsArtturin2-7/+7
It gives a warning on the lazy-trees branch of Nix (NixOS/nix#6530) one of these was also giving me an error (the one in lib/trivial probably) ``` $ nix build warning: applying 'toString' to path '/home/artturin/nixgits/my-nixpkgs/nixos/modules/installer/sd-card/sd -image-aarch64.nix' and then accessing it is deprecated, at /home/artturin/nixgits/my-nixpkgs/lib/modules. nix:349:99 warning: applying 'toString' to path '/home/artturin/nixgits/my-nixpkgs/.git' and then accessing it is dep recated, at /home/artturin/nixgits/my-nixpkgs/lib/sources.nix:35:32 warning: applying 'toString' to path '/home/artturin/nixgits/my-nixpkgs/nixos/modules/system/etc/etc.nix' and then accessing it is deprecated, at «stdin»:0 warning: applying 'toString' to path '/home/artturin/nixgits/my-nixpkgs/nixos/modules/system/etc/etc-activ ation.nix' and then accessing it is deprecated, at «stdin»:0 warning: applying 'toString' to path '/home/artturin/nixgits/my-nixpkgs/nixos/modules/installer/sd-card/sd -image-aarch64.nix' and then accessing it is deprecated, at «stdin»:0 error: cannot decode virtual path '/nix/store/virtual0000000000000000000000005-source' (use '--show-trace' to show detailed location information) ```
2022-11-05Merge pull request #199244 from markuskowa/fix-licensesmarkuskowa1-0/+5
Fix licenses in various packages
2022-11-04lib/systems: Support FreeBSDJohn Ericson6-9/+24
A tricky thing about FreeBSD is that there is no stable ABI across versions. That means that putting in the version as part of the config string is paramount. We have a parsed represenation that separates name versus version to accomplish this. We include FreeBSD versions 12 and 13 to demonstrate how it works.
2022-11-04lib/systems: Simplify NetBSD examplesJohn Ericson1-2/+0
The libc will be inferred.
2022-11-03lib/tests/modules: Test doRenameRobert Hensing3-0/+32
2022-11-03lib.modules.doRename: Don't define warning, even as undefined, if not warning.Shea Levy1-2/+2
This fixes mkAliasOptionModule in systems with no warning option.
2022-11-02arkpandora_ttf: add licenseMarkus Kowalewski1-0/+5
2022-10-27licenses: remove fdl13Weijia Wang1-5/+0
2022-10-27licenses: remove fdl12Weijia Wang1-5/+0
2022-10-27licenses: remove fdl11Weijia Wang1-5/+0
2022-10-26lib: Automatically generate lib.filesytem docsSilvan Mosberger1-18/+40
2022-10-24Merge pull request #173949 from jacoblambda/fix-toInt-zero-paddingRobert Hensing4-8/+160
lib: add strings.toIntBase10 to parse zero-padded strings
2022-10-24lib.normalizePath: the empty string is not a valid regex on darwinGuillaume Girol1-1/+1
presumably due to using libc++'s regex lib instead of libstdc++ on linux Fixes https://github.com/NixOS/nixpkgs/pull/177273#issuecomment-1287562800
2022-10-23lib/strings: Update docs and restructured code to improve readability of ↵Jacob Abel3-22/+42
toInt and toIntBase10.
2022-10-23lib/strings: Improve error message for octal ambiguity in toIntJacob Abel1-3/+2
2022-10-23lib/strings: Refactor toInt into toInt and toIntBase10Jacob Abel4-21/+97
2022-10-23lib/strings: Update toInt to handle intermixed ws and zeros. Added testsJacob Abel3-8/+25
2022-10-23lib/strings: allow toInt to parse zero-padded stringsJacob Abel2-4/+44
2022-10-21Merge remote-tracking branch 'origin/master' into staging-nextMartin Weinelt1-0/+10
2022-10-21Merge pull request #196397 from fgaz/hikounomizu/initSandro1-0/+10
2022-10-21Merge master into staging-nextgithub-actions[bot]3-0/+149
2022-10-20lib/tests/misc: Add tests for charToInt, escapeC, and normalizePathDaniel Olsen1-0/+15