Commit Graph

508 Commits

Author SHA1 Message Date
John Ericson
f43cc75868
Clean up cross bootstrapping, take 2 (#321525) 2024-09-06 14:56:54 -04:00
John Ericson
5f134ec6cf Clean up cross bootstrapping
For a long time, we've had `crossLibcStdenv`, `*Cross` libc attributes,
and `*bsdCross` pre-libc package sets. This was always bad because
having "cross" things is "not declarative": the naming doesn't reflect
what packages *need* but rather how we *provide* something. This is
ugly, and creates needless friction between cross and native building.

Now, almost all of these `*Cross` attributes are gone: just these are
kept:

- Glibc's and Musl's are kept, because those packages are widely used
  and I didn't want to risk changing the native builds of those at this
  time.

- generic `libcCross`, `theadsCross`, and friends, because these relate
  to the convolulted GCC bootstrap which still needs to be redone.

The BSD and obscure Linux or freestnanding libcs have conversely all
been made to use a new `stdenvNoLibc`, which is like the old
`crossLibcStdenv` except:

1. It usable for native and cross alike

2. It named according to what it *is* ("a standard environment without
   libc but with a C compiler"), rather than some non-compositional
   jargon ("the stdenv used for building libc when cross compiling",
   yuck).

I should have done this change long ago, but I was stymied because of
"infinite recursions". The problem was that in too many cases we are
overriding `stdenv` to *remove* things we don't need, and this risks
cyles since those more minimal stdenvs are used to build things in the
more maximal stdenvs.

The solution is to pass `stage.nix` `stdenvNoCC`, so we can override to
*build up* rather than *tear down*. For now, the full `stdenv` is also
passed, so I don't need to change the native bootstraps, but I can see
this changing as we make things more uniform and clean those up.

(adapted from commit 51f1ecaa59)
(adapted from commit 1743662e55)
2024-09-06 10:26:56 -04:00
Francesco Gazzetta
a750f6c588 changelog-d: 1.0 -> 1.0.1
Release: https://codeberg.org/fgaz/changelog-d/releases/tag/v1.0.1
2024-08-20 15:33:18 +02:00
Henner Zeller
b7b0f06c65 avr-libc: 2.2.0 -> 2.2.1 2024-08-17 16:00:00 -07:00
Sigmanificient
63d05d989e pkgs/development: remove unused arguments 2024-08-03 17:18:20 +02:00
K900
1410c766c8 Merge remote-tracking branch 'origin/master' into staging-next 2024-07-26 08:41:08 +03:00
Sigmanificient
de768c2b36 loc: remove overuse of with lib; 2024-07-26 01:20:38 +02:00
github-actions[bot]
0d7af056e2
Merge staging-next into staging 2024-07-14 12:02:04 +00:00
Sigmanificient
512e8afdb9 treewide: remove unused occurence of stdenv (and other) arguments
format (will squash)
2024-07-14 04:32:56 +02: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
Jan Tojnar
87a6bb325c yelp-xsl: Move from gnome scope to top-level 2024-07-01 08:26:49 +02:00
Vladimír Čunát
879821772c
Revert #320852: Clean up cross bootstrapping
It rebuilt stdenv on *-darwin; we can't do that in nixpkgs master.
This reverts commit 2f20501c5f, reversing
changes made to fd469c24af.
2024-06-21 07:48:24 +02:00
John Ericson
2f20501c5f
Merge pull request #320852 from obsidiansystems/fewer-cross-suffix-attrs
Clean up cross bootstrapping
2024-06-20 10:44:20 -04:00
Emily Trau
d11a62c809
Merge pull request #318395 from hzeller/feature-20240608-update-avr-libc
avr-libc: 2.1.0 -> 2.2.0
2024-06-20 07:30:21 +10:00
John Ericson
51f1ecaa59 Clean up cross bootstrapping
For a long time, we've had `crossLibcStdenv`, `*Cross` libc attributes,
and `*bsdCross` pre-libc package sets. This was always bad because
having "cross" things is "not declarative": the naming doesn't reflect
what packages *need* but rather how we *provide* something. This is
ugly, and creates needless friction between cross and native building.

Now, almost all of these `*Cross` attributes are gone: just these are
kept:

- Glibc's and Musl's are kept, because those packages are widely used
  and I didn't want to risk changing the native builds of those at this
  time.

- generic `libcCross`, `theadsCross`, and friends, because these relate
  to the convolulted GCC bootstrap which still needs to be redone.

The BSD and obscure Linux or freestnanding libcs have conversely all
been made to use a new `stdenvNoLibc`, which is like the old
`crossLibcStdenv` except:

1. It usable for native and cross alike

2. It named according to what it *is* ("a standard environment without
   libc but with a C compiler"), rather than some non-compositional
   jargon ("the stdenv used for building libc when cross compiling",
   yuck).

I should have done this change long ago, but I was stymied because of
"infinite recursions". The problem was that in too many cases we are
overriding `stdenv` to *remove* things we don't need, and this risks
cyles since those more minimal stdenvs are used to build things in the
more maximal stdenvs.

The solution is to pass `stage.nix` `stdenvNoCC`, so we can override to
*build up* rather than *tear down*. For now, the full `stdenv` is also
passed, so I don't need to change the native bootstraps, but I can see
this changing as we make things more uniform and clean those up.

Finally, the BSDs also had to be cleaned up, since they have a few
pre-libc dependencies, demanding a systematic approach. I realized what
rhelmot did in 61202561d9 (specify what
packages just need `stdenvNoLibc`) is definitely the right approach for
this, and adjusted NetBSD and OpenBSD to likewise use it.
2024-06-18 17:04:16 -04:00
R. Ryantm
6c51e12bfd cppreference-doc: 20230810 -> 20240610 2024-06-11 02:55:26 +00:00
Alexis Hildebrandt
755b915a15 treewide: Remove indefinite article from meta.description
nix run nixpkgs#silver-searcher -- -G '\.nix$' -0l 'description.*"[Aa]n?' pkgs \
  | xargs -0 nix run nixpkgs#gnused -- -i '' -Ee 's/(description.*")[Aa]n? (.)/\1\U\2/'
2024-06-09 23:07:45 +02:00
Henner Zeller
6e06ea9ca7 avr-libc: 2.1.0 -> 2.2.0 2024-06-08 18:13:52 -07:00
Robert Hensing
28bb1f896e
Merge pull request #312442 from fgaz/changelog-d/1.0
changelog-d: 0.1-git-2816ddb -> 1.0
2024-06-03 18:33:11 +02:00
Nick Cao
7eb31bf3f3
Merge pull request #316047 from r-ryantm/auto-update/brev-cli
brev-cli: 0.6.284 -> 0.6.287
2024-06-01 09:30:21 -04:00
R. Ryantm
48e4beac8e brev-cli: 0.6.284 -> 0.6.287 2024-05-31 02:03:45 +00:00
isabel
63aceac766 treewide: remove unused occurence of fetchFromGitHub argument 2024-05-30 05:56:07 +00:00
Francesco Gazzetta
31a42541af changelog-d: 0.1-git-2816ddb -> 1.0 2024-05-17 15:45:44 +02:00
Sigmanificient
97e7864fd3 loc: add sigmanificient to maitainers 2024-05-15 09:21:59 +02:00
Vladimír Čunát
9447fd7bc8
Merge #309297: staging-next 2024-05-05 2024-05-12 17:09:49 +02:00
R. Ryantm
8e8de99984 brev-cli: 0.6.279 -> 0.6.284 2024-05-12 00:30:01 +00:00
github-actions[bot]
4e3bc63c95
Merge staging-next into staging 2024-05-02 12:02:05 +00:00
Bobby Rong
736c6be462
treewide: Move away from wiki.gnome.org
The wiki.gnome.org site is planned for retirement.
2024-05-01 21:16:03 +08:00
Yt
c83afadf29
Merge pull request #305845 from abathur/resholve_0.10.5
resholve: 0.10.2 -> 0.10.5
2024-04-30 21:40:45 +00:00
Mario Rodas
2becf6e837 maintainers: drop marsam 2024-04-24 04:20:00 +00:00
Travis A. Everett
4908b1a604 resholve: 0.10.2 -> 0.10.5
Also:
- update README
- expand passthru tests to cover packages that depend on resholve
- drop temporary patches added to tests during bats update (so that
  PR didn't need to go through staging)
2024-04-22 14:02:51 -05:00
github-actions[bot]
5c2b2d5b74
Merge master into staging-next 2024-04-17 18:01:04 +00:00
Pol Dellaiera
7a445b4728
Merge pull request #303883 from abathur/bats_1_11
bats: 1.10.0 -> 1.11.0, resholve: fix related test breakage
2024-04-17 19:21:37 +02:00
Travis A. Everett
e0f9929a69 resholve: patch test breaks coming in bats 1.11
I'm preparing to update bats to 1.11.0, but a change it includes will
require updating 3 of resholve's tests. Since a full resholve source
bump would need to go through staging now, I'm just patching the tests
in the separate test derivation.
2024-04-13 12:34:27 -05:00
Vladimír Čunát
24d4f2cd52
Merge branch 'staging' into staging-next
Conflicts (tried to quickly resolve somehow, checked eval):
	pkgs/development/python-modules/apsw/default.nix
	pkgs/development/python-modules/mido/default.nix
	pkgs/development/python-modules/pytest-bdd/default.nix
	pkgs/development/python-modules/sparse/default.nix
2024-04-12 07:06:54 +02:00
Nikolai Schimke
848c691606 juce: 7.0.10 -> 7.0.11 2024-04-10 10:16:57 +02:00
Thiago Kenji Okada
e94a1e91f1
Merge pull request #298515 from abathur/resholve_0.10.1
resholve: 0.9.1 -> 0.10.2, ongoing cross fixes
2024-03-30 15:35:04 +00:00
R. Ryantm
ff44f3006c brev-cli: 0.6.277 -> 0.6.279 2024-03-29 14:26:36 +00:00
Travis A. Everett
56d5b181c9 resholve: 0.9.1 -> 0.10.2, ongoing cross fixes 2024-03-28 19:45:35 -05:00
Janne Heß
fcc95ff817 treewide: Fix all Nix ASTs in all markdown files
This allows for correct highlighting and maybe future automatic
formatting. The AST was verified to work with nixfmt only.
2024-03-28 09:28:12 +01:00
Weijia Wang
b8d85215de juce: 7.0.9 -> 7.0.10 2024-03-25 10:09:09 +01:00
stuebinm
ff1a94e523 treewide: add meta.mainProgram to packages with a single binary
The nixpkgs-unstable channel's programs.sqlite was used to identify
packages producing exactly one binary, and these automatically added
to their package definitions wherever possible.
2024-03-19 03:14:51 +01:00
maralorn
06f993f7e7 Merge branch 'master' into haskell-updates 2024-03-16 23:33:06 +01:00
Bjørn Forsman
6ff5b79096 Revert "avrlibc: hook up libdir for cc-wrapper"
This reverts commit b2844f89d1.

It broke simavr:

  $ nix-build -A simavr
  [...]
  /nix/store/3k4djrsq23m2yg9ar4h1lkkz1ijv0ghv-avr-binutils-2.41/bin/avr-ld: /nix/store/3rpyzla18mbj690hv7j5dang0kd3c1fq-avr-libc-avr-2.1.0/avr/lib/libc.a(vfprintf_std.o): in function `.L15':
  vfprintf.c:(.text.avr-libc+0xd8): undefined reference to `__mulqi3'
  /nix/store/3k4djrsq23m2yg9ar4h1lkkz1ijv0ghv-avr-binutils-2.41/bin/avr-ld: /nix/store/3rpyzla18mbj690hv7j5dang0kd3c1fq-avr-libc-avr-2.1.0/avr/lib/libc.a(vfprintf_std.o): in function `.L18':
  vfprintf.c:(.text.avr-libc+0xe4): undefined reference to `__mulqi3'
  collect2: error: ld returned 1 exit status
  make[1]: *** [../Makefile.common:161: atmega644_adc_test.axf] Error 1
  make[1]: Leaving directory '/build/source/tests'
  make: *** [Makefile:21: build-tests] Error 2

Fixes #295610.
2024-03-14 20:09:11 +01:00
github-actions[bot]
54e3ad5442
Merge master into haskell-updates 2024-03-09 00:11:53 +00:00
github-actions[bot]
a1ed79952d
Merge master into haskell-updates 2024-03-01 00:14:10 +00:00
github-actions[bot]
c7d7e4a7a5
Merge staging-next into staging 2024-02-29 18:01:30 +00:00
R. Ryantm
cc745d76ca brev-cli: 0.6.276 -> 0.6.277 2024-02-29 01:47:43 +00:00
github-actions[bot]
7e5ed63169
Merge master into haskell-updates 2024-02-27 00:12:52 +00:00
github-actions[bot]
50d12072e0
Merge staging-next into staging 2024-02-26 12:01:37 +00:00