Commit Graph

443 Commits

Author SHA1 Message Date
Jörg Thalheim
5f9d2d9572 nixos-option: fix build against nix 2.24 2024-11-13 22:57:08 +01:00
Valentin Gagarin
50ff833cd8 devmode: move to pkgs/by-name
now one can use `devmode` from anywhere Nixpkgs is available:

    devmode = pkgs.devmode.override {
      buildArgs = toString ./.;
      open = "/index.html";
    };
2024-11-12 10:16:58 +01:00
Valentin Gagarin
b94f54b7a0 devmode: make reusable
the `devmode` helper made for the Nixpkgs/NixOS manual was exposed wrapped
in `mkShell`, which made it impossible to reuse.

this change strips that wrapper and reproduces it at the call site.

now one can use `devmode` from anywhere Nixpkgs is available:

    devmode = pkgs.callPackage "${pkgs.path}/pkgs/tools/nix/web-devmode.nix" {
      buildArgs = toString ./.;
      open = "/index.html";
    };
2024-11-12 10:16:58 +01:00
aleksana
571c71e6f7 treewide: migrate packages to pkgs/by-name, take 1
We are migrating packages that meet below requirements:

1. using `callPackage`
2. called path is a directory
3. overriding set is empty (`{ }`)
4. not containing path expressions other than relative path (to
makenixpkgs-vet happy)
5. not referenced by nix files outside of the directory, other
than`pkgs/top-level/all-packages.nix`
6. not referencing nix files outside of the directory
7. not referencing `default.nix` (since it's changed to `package.nix`)
8. `outPath` doesn't change after migration

The tool is here: https://github.com/Aleksanaa/by-name-migrate.
2024-11-09 20:04:51 +08:00
maralorn
56d03d86ed
nix-output-monitor: 2.1.3 -> 2.1.4
Changelog:

* bash: Add shell completion for `nom` command (thanks to @tomberek and @pdietl).
* zsh: Add shell completion for `nom` and `nom-shell` command (additionally to the existing completion for `nom-build`).
* Fix typo in README (thanks to @techie2000)
2024-10-17 01:23:57 +02:00
R. Ryantm
69bc7c632f fh: 0.1.17 -> 0.1.18 2024-10-09 12:58:51 +00:00
Artturin
e0464e4788 treewide: replace stdenv.is with stdenv.hostPlatform.is
In preparation for the deprecation of `stdenv.isX`.

These shorthands are not conducive to cross-compilation because they
hide the platforms.

Darwin might get cross-compilation for which the continued usage of `stdenv.isDarwin` will get in the way

One example of why this is bad and especially affects compiler packages
https://www.github.com/NixOS/nixpkgs/pull/343059

There are too many files to go through manually but a treewide should
get users thinking when they see a `hostPlatform.isX` in a place where it
doesn't make sense.

```
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv.is" "stdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv'.is" "stdenv'.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "clangStdenv.is" "clangStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "gccStdenv.is" "gccStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenvNoCC.is" "stdenvNoCC.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "inherit (stdenv) is" "inherit (stdenv.hostPlatform) is"
fd --type f "\.nix" | xargs sd --fixed-strings "buildStdenv.is" "buildStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "effectiveStdenv.is" "effectiveStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "originalStdenv.is" "originalStdenv.hostPlatform.is"
```
2024-09-25 00:04:37 +03:00
Jörg Thalheim
fd81e768a7 nixos-install-tools: make nixos-install/enter overridable 2024-09-20 11:19:01 +02:00
h7x4
9a6c76c4af
treewide: remove unused inputs (#342672) 2024-09-19 20:36:18 +02:00
R. Ryantm
cbda7ae070 fh: 0.1.16 -> 0.1.17 2024-09-18 03:09:05 +00:00
Peder Bergebakken Sundt
8c8c27bb19 treewide: remove unused inputs 2024-09-18 01:00:07 +02:00
figsoda
4e56dc29b5 nix-melt: 0.1.2 -> 0.1.3
Diff: https://github.com/nix-community/nix-melt/compare/v0.1.2...v0.1.3

Changelog: https://github.com/nix-community/nix-melt/blob/v0.1.3/CHANGELOG.md
2024-09-16 11:33:54 -04:00
Silvan Mosberger
e67ca390a3
nixdoc: 3.0.7 -> 3.0.8 (#339883) 2024-09-13 00:17:30 +02:00
Francesco Gazzetta
e84fdec7f0 nixdoc: 3.0.7 -> 3.0.8
Diff: https://github.com/nix-community/nixdoc/compare/v3.0.7...v3.0.8
2024-09-05 21:54:58 +02:00
Sandro Jäckel
ab8bf8c35b
lib/modules: improve error message when option is being accessed that isn't defined 2024-09-01 23:29:21 +02:00
Silvan Mosberger
65e7143039 nix-info: Format files with nixfmt
This is a rare case of a Nix file actually ending up in the build result.
We reformat this now, causing a rebuild, so that we won't cause a rebuild
in the treewide reformatting PR.
2024-08-25 04:59:04 +02:00
Bryan Lai
0d077cbecb nix-melt: bump deps harder to fix rust 1.80 build
With: cargo update time --recursive

It turns out that in this case a simple `cargo update time` is
not enough to fix the build; one also needs to add the `--recursive`
flag.
2024-08-24 17:49:34 +02:00
ghpzin
7f907528a8 fh: 0.1.10 -> 0.1.16, fix build 2024-08-19 08:11:23 +02:00
K900
11ce9983ff nix-init: 0.3.1 -> 0.3.2 2024-08-16 09:18:01 +03:00
Sandro
6c6d28888b
Merge pull request #334556 from bryango/nix-melt-rust-1.80-fix-build 2024-08-14 11:05:11 +02:00
Bryan Lai
1d28ed3c3a nix-melt: fix build for rust 1.80 2024-08-14 15:51:28 +08:00
R. Ryantm
e1822b634c nix-init: 0.3.0 -> 0.3.1 2024-08-14 05:16:12 +00:00
Julius Michaelis
6a9beaf893 treewide: skip generating shell completions using $out/bin/… when cross compiling
This focuses on Rust packages, since the most commonly used argument
parser library (clap/structopt) makes the following pattern natural and
thus common:

  postInstall = ''
    installShellCompletion --cmd foo \
      --bash <($out/bin/foo completion bash) \
      …

This commit just guards those with

lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform)

splitting the string where unrelated actions are performed.
2024-08-04 10:50:48 +09:00
adisbladis
e0816431a2 treewide: Pass self when overriding Python
Otherwise references to the Python interpreter inside the set are wrong, as demonstrated by:
``` nix
with import <nixpkgs> { };
let
  python' = python3.override {
    packageOverrides = final: prev: { requests = prev.requests.overridePythonAttrs(old: { version = "1337";  }); };
  };
in python'.pkgs.python.pkgs.requests
```
which returns the _non_ overriden requests.

And the same with `self`:
```
with import <nixpkgs> { };
let
  python' = python3.override {
    self = python';
    packageOverrides = final: prev: { requests = prev.requests.overridePythonAttrs(old: { version = "1337";  }); };
  };
in python'.pkgs.python.pkgs.requests
```
which returns the overriden requests.

This can manifest itself as file collisions when constructing environments or as subtly incorrect dependency graphs.
2024-08-03 12:18:56 +12:00
zimbatm
7266ad59ce nar-serve: move to by-name 2024-07-31 09:10:29 +02:00
zimbatm
31e5e88a93 nix-store-gcs-proxy: move to by-name 2024-07-31 09:10:29 +02:00
zimbatm
99dc6c2efa nixpkgs-fmt: move to by-name 2024-07-31 09:10:29 +02:00
Jörg Thalheim
5356420466 treewide: remove unused with statements from maintainer lists
$ find -type f -name '*.nix' -print0 | xargs -P "$(nproc)" -0 sed -i \
  -e 's!with lib.maintainers; \[ *\];![ ];!' \
  -e 's!with maintainers; \[ *\];![ ];!'
2024-07-29 10:06:20 +08:00
maralorn
86f523c59d
nix-output-monitor: 2.1.2 -> 2.1.3 2024-07-28 21:38:18 +02:00
Vladimír Čunát
64c6a981fe
Merge branch 'master' into staging-next 2024-07-27 09:18:58 +02:00
Philip Taron
849cf13725
web-devmode: call as package 2024-07-26 13:43:59 -07:00
github-actions[bot]
2567b049bd
Merge master into staging-next 2024-07-25 18:00:59 +00:00
Rohit Singh
103bd1c792 nixci: add rsrohitsingh682 as a maintainer 2024-07-25 13:05:04 +05:30
Rohit Singh
991fbf2f10 nixci: 0.5.0 -> 1.0.0 2024-07-25 01:05:30 +05:30
github-actions[bot]
0d7af056e2
Merge staging-next into staging 2024-07-14 12:02:04 +00:00
Vladimír Čunát
211398c03e
Merge branch 'staging-next' into staging 2024-07-14 08:35:35 +02:00
Sigmanificient
512e8afdb9 treewide: remove unused occurence of stdenv (and other) arguments
format (will squash)
2024-07-14 04:32:56 +02:00
K900
3eeff54780 nixos/alsa: kill sound.enable and friends with fire 2024-07-13 13:56:18 +03:00
Martin Weinelt
176a56c40f
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
- pkgs/applications/misc/blender/default.nix
- pkgs/development/web/nodejs/nodejs.nix
2024-07-11 01:06:28 +02:00
Thiago Kenji Okada
c62ade3aed
Merge pull request #311811 from abathur/move_lore_overrides_to_passthru_staging
binlore: migrate override lore to package passthru
2024-07-09 22:02:23 +00:00
Felix Buehler
588cf387b3 nixos-option: fix self inclusive src (move src) 2024-07-08 20:57:17 +02:00
Vladimír Čunát
4c09ae2416
Merge branch 'staging-next' into staging 2024-07-08 10:43:15 +02:00
Pol Dellaiera
9895432600
Merge pull request #322024 from xzfc/cached-nix-shell
cached-nix-shell: 0.1.5 -> 0.1.6
2024-07-08 07:31:47 +02:00
Albert Safin
e170ba17d1 cached-nix-shell: 0.1.5 -> 0.1.6 2024-07-07 22:28:05 +00:00
Travis A. Everett
8f413d8a44 binlore: migrate override lore to package passthru
Lore overrides have been included with binlore's source up to now, but
this hasn't worked very well. (It isn't as easy to self-service for
people working in nixpkgs, and its use of partial pnames for matching
breaks down around some edge cases like version numbers appearing
early in perl pnames, or multiple packages having identical pnames.)
2024-07-04 11:15:05 -05:00
aleksana
1862813d11 treewide: convert cargoSha256 to cargoHash
This is done with the following bash script:

```
#!/usr/bin/env bash
process_line() {
    local filename=${1%:}
    if [[ $4 =~ \"(.*)\"\; ]]; then
      local sha256="${BASH_REMATCH[1]}"
    fi
    [[ -z $sha256 ]] && return 0
    local hash=$(nix hash to-sri --type sha256 $sha256)
    echo "Processing: $filename"
    echo "  $sha256 => $hash"
    sed -i "s|cargoSha256 = \"$sha256\"|cargoHash = \"$hash\"|"
$filename
}

# split output by line
grep -r 'cargoSha256 = ' . | while IFS= read -r line; do
    # split them further by space
    read -r -a parts <<< "$line"
    process_line "${parts[@]}"
done

```
2024-07-03 21:54:10 +08:00
aleksana
a9709c299b treewide: change cargoSha256 with SRI hash to cargoHash 2024-07-03 21:53:11 +08:00
Silvan Mosberger
10f928a5cf
Merge pull request #318890 from r-ryantm/auto-update/nixdoc
nixdoc: 3.0.5 -> 3.0.7
2024-06-26 22:25:29 +02:00
shivaraj-bh
d7e3fe582a nixci: 0.4.0 -> 0.5.0 2024-06-17 11:37:43 +05:30
R. Ryantm
8f530a144c nixdoc: 3.0.5 -> 3.0.7 2024-06-10 19:13:26 +00:00