Commit Graph

55 Commits

Author SHA1 Message Date
Kate
fa8fa6d754 opam: 2.5.1 -> 2.5.2 2026-07-09 14:56:29 +01:00
Kate
9bba9915ce opam: 2.5.0 -> 2.5.1 2026-04-15 23:58:03 +01:00
R. Ryantm
c6bb2a921c opam: 2.4.1 -> 2.5.0 2025-11-27 13:21:17 +00:00
Kate
9bc4e5fd58 opam: 2.4.0 -> 2.4.1 2025-08-14 11:57:23 +02:00
Kate
4d2c18b7df opam: 2.3.0 -> 2.4.0 2025-08-14 11:57:23 +02:00
Wolfgang Walther
5a0711127c treewide: run nixfmt 1.0.0 2025-07-24 13:55:40 +02:00
Ihar Hrachyshka
dd0f03a56c treewide: remove usage of deprecated apple_sdk framework stubs
They are not doing anything right now. This is in preparation for their
complete removal from the tree.

Note: several changes that affect the derivation inputs (e.g. removal of
references to stub paths in build instructions) were left out. They will
be cleaned up the next iteration and will require special care.

Note: this PR is a result of a mix of ugly regex (not AST) based
automation and some manual labor. For reference, the regex automation
part was hacked in: https://github.com/booxter/nix-clean-apple_sdk

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
2025-04-19 20:28:20 -04:00
Silvan Mosberger
374e6bcc40 treewide: Format all Nix files
Format all Nix files using the officially approved formatter,
making the CI check introduced in the previous commit succeed:

  nix-build ci -A fmt.check

This is the next step of the of the [implementation](https://github.com/NixOS/nixfmt/issues/153)
of the accepted [RFC 166](https://github.com/NixOS/rfcs/pull/166).

This commit will lead to merge conflicts for a number of PRs,
up to an estimated ~1100 (~33%) among the PRs with activity in the past 2
months, but that should be lower than what it would be without the previous
[partial treewide format](https://github.com/NixOS/nixpkgs/pull/322537).

Merge conflicts caused by this commit can now automatically be resolved while rebasing using the
[auto-rebase script](8616af08d9/maintainers/scripts/auto-rebase).

If you run into any problems regarding any of this, please reach out to the
[formatting team](https://nixos.org/community/teams/formatting/) by
pinging @NixOS/nix-formatting.
2025-04-01 20:10:43 +02:00
eilvelia
5a51e70e75 opam: fix opam sandboxing on nixos, cleanup
To make opam sandboxing (via bwrap) work on nixos, the following had been used
here:
  --set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/
However, OPAM_USER_PATH_RO has been removed in opam 2.2.0, requiring a
new workaround: 9b6370d6fe
(Before this commit, executing `opam init` would display that sandboxing fails
with "bwrap: execvp sh: No such file or directory".)

- Removes outdated workarounds for ocp-build and argv0, cleans postInstall
- Fixes link to the changelog which was broken because of "with lib;"
2025-01-10 01:20:55 +00:00
Vincent Laporte
e162d35f04 opam: 2.2.0 → 2.3.0 2024-11-25 17:32:55 +01: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
Kate
3f6b0d6956 opam: 2.1.5 -> 2.2.0 2024-07-16 13:06:18 +01: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
Mario Rodas
2becf6e837 maintainers: drop marsam 2024-04-24 04:20:00 +00:00
a-n-n-a-l-e-e
ce789e7e35 llvmPackages_{12,13,14,15,16,17,git}.{libcxx,libcxxabi}: merge libcxxabi into libcxx (#292043)
- merge libcxxabi into libcxx for LLVM 12, 13, 14, 15, 16, 17, and git.
- remove the link time workaround `-lc++ -lc++abi` from 58 packages as it is no longer required.
- fixes https://github.com/NixOS/nixpkgs/issues/166205
- provides alternative fixes for. https://github.com/NixOS/nixpkgs/issues/269548 https://github.com/NixOS/nix/issues/9640
- pkgsCross.x86_64-freebsd builds work again

This change can be represented in 3 stages
1. merge libcxxabi into libcxx -- files: pkgs/development/compilers/llvm/[12, git]/{libcxx, libcxxabi}
2. update stdenv to account for merge -- files: stdenv.{adapters, cc.wrapper, darwin}
3. remove all references to libcxxabi outside of llvm (about 58 packages modified)

### merging libcxxabi into libcxx
- take the union of the libcxxabi and libcxx cmake flags
- eliminate the libcxx-headers-only package - it was only needed to break libcxx <-> libcxxabi circular dependency
- libcxx.cxxabi is removed. external cxxabi (freebsd) will symlink headers / libs into libcxx.
- darwin will re-export the libcxxabi symbols into libcxx so linking `-lc++` is sufficient.
- linux/freebsd `libc++.so` is a linker script `LINK(libc++.so.1, -lc++abi)` making `-lc++` sufficient.
- libcxx/default.nix [12, 17] are identical except for patches and `LIBCXX_ADDITIONAL_LIBRARIES` (only used in 16+)
- git/libcxx/defaul.nix  does not link with -nostdlib when useLLVM is true so flag is removed. this is not much different than before as libcxxabi used -nostdlib where libcxx did not, so libc was linked in anyway.

### stdenv changes
- darwin bootstrap, remove references to libcxxabi and cxxabi
- cc-wrapper: remove c++ link workaround when libcxx.cxxabi doesn't exist (still exists for LLVM pre 12)
- adapter: update overrideLibcxx to account for a pkgs.stdenv that only has libcxx

### 58 package updates
- remove `NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}` as no longer needed
- swift, nodejs_v8 remove libcxxabi references in the clang override

https://github.com/NixOS/nixpkgs/pull/292043
2024-03-11 03:53:37 -07:00
Mario Rodas
ffa8947f4a opam: fix build on darwin 2023-11-30 04:20:00 +00:00
Henry Till
7ff193305b treewide: remove henrytill as maintainer from various pkgs 2023-11-28 10:52:47 -08:00
Mario Rodas
dd82e5716f opam: 2.1.4 -> 2.1.5
Changelog: https://github.com/ocaml/opam/releases/tag/2.1.5

Diff: https://github.com/ocaml/opam/compare/2.1.4...2.1.5
2023-05-27 04:20:00 +00:00
Ulrik Strid
c53a63adf1 ocamlPackages treewide: strictDeps all packages 2023-02-03 08:59:34 +01:00
Mario Rodas
b3f148a4d0 opam: 2.1.3 -> 2.1.4
https://github.com/ocaml/opam/releases/tag/2.1.4
2023-01-03 04:20:00 +00:00
Mario Rodas
a95655b7f5 opam: 2.1.2 -> 2.1.3
https://github.com/ocaml/opam/releases/tag/2.1.3
2022-08-12 04:20:00 +00:00
Yestin L. Harrison
fd04240ffe opam: remove aspcud from runtime 2022-08-05 19:02:26 -07:00
Mario Rodas
130ceb50bb opam: 2.1.1 -> 2.1.2
https://github.com/ocaml/opam/releases/tag/2.1.2
2021-12-08 13:35:00 -05:00
Mario Rodas
f487c6a5af opam: 2.1.0 -> 2.1.1
https://github.com/ocaml/opam/releases/tag/2.1.1
2021-11-06 16:38:36 -05:00
Mario Rodas
5a7e27afe1 opam: 2.0.8 -> 2.1.0
https://github.com/ocaml/opam/releases/tag/2.1.0
2021-07-26 04:20:00 +00:00
Ben Siraphob
127733211e treewide: unzip buildInputs to nativeBuildInputs (#112302) 2021-02-20 16:01:53 -05:00
Ben Siraphob
e03c068af5 treewide: makeWrapper buildInputs to nativeBuildInputs 2021-02-19 20:09:16 +07:00
Mario Rodas
0d01108677 opam: 2.0.7 -> 2.0.8
https://github.com/ocaml/opam/releases/tag/2.0.8
2021-02-09 04:20:00 +00:00
Ben Siraphob
c522fec274 pkgs/development/tools: stdenv.lib -> lib 2021-01-23 20:30:03 +07:00
Mario Rodas
9d81c54b31 opam: add marsam to maintainers 2020-04-21 15:49:43 +02:00
Mario Rodas
05cfa5ff99 opam: 2.0.6 -> 2.0.7 2020-04-21 15:49:43 +02:00
Mario Rodas
560f6943a2 opam: 2.0.5 -> 2.0.6
Changelog: https://github.com/ocaml/opam/blob/2.0.6/CHANGES
2020-01-16 15:35:29 +01:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Mario Rodas
a61db6075f opam: 2.0.4 -> 2.0.5 2019-07-15 04:20:00 -05:00
Daniel Schaefer
bac4d95aa2 treewide: Change URLs to HTTPS
Lots of URLs were HTTP redirect to HTTPS. Changed those and checked them
if there's actual content. Inspired by
https://github.com/NixOS/nixpkgs/issues/60004
2019-04-22 10:19:54 +02:00
Mario Rodas
a5a56e516c opam: 2.0.2 -> 2.0.4 2019-04-16 11:15:28 +02:00
Uma Zalakain
83e6a1c996 opam: put the whole /nix in OPAM_USER_PATH_RO
Some symlinks point to /nix/var/profiles/per-user/…, these have be
readable too.
2019-03-11 01:02:43 +01:00
Yucheng Zhang
1f433e51b6 opam: 2.0.0 -> 2.0.2 2019-01-25 12:15:16 +08:00
xplat
3fc7c5b591 opam: 1.2.2 -> 2.0.0 (#45806) 2018-09-06 19:18:34 +02:00
Pascal Wittmann
38923afae2 opam: add license
see issue #43716
2018-08-09 12:37:13 +02:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
James Deikun
1fa9e7defb fix opam tool support 2018-06-08 15:23:49 -04:00
Léo Gaspard
06c7d4d40d opam: propagate curl and unzip dependencies
These are required for `opam init` to succeed.

Closes #14466
Cc @henrytill
2018-04-27 20:42:09 +02:00
Winnie Quinn
331f5a75ce opam: use aspcud on darwin
aspcud is the recommended solver for OPAM and the `aspcud` package is
now building properly on Darwin. As such, we can remove the special case
for Darwin that required OPAM to fall back to the built-in solver.
2017-09-23 16:47:24 -04:00
Kirill Boltaev
e61663a233 treewide: move to ocaml-ng system 2016-09-26 02:36:49 +03:00
Jesse Haber-Kucharsky
99e06fe771 opam, aspcud: init packages for external solver (#16938)
The opam package manager relies on external solvers to determine package
management decisions it makes related to upgrades, new installations,
etc.

While, strictly speaking, an external solver is optional, aspcud is
highly recommended in documentation. Furthermore, even having a
relatively small number of packages installed quickly causes the limits
of the interal solver to be reached (before it times out).

Aspcud itself depends on two programs from the same suite: gringo, and
clasp.

On Darwin, Boost 1.55 (and thus Gringo) do not build, so we only support
Aspcud on non-Darwin platforms.
2016-09-12 10:44:50 +02:00
Eric Merritt
56627d5444 ocaml-opam: the sha hash of 1.2.2 changed
This is a bit scary. The sha of 1.2.2 changed, causing a crash on
download of the url. This updates to the current sha. Opam maintainer
why, oh why, do you change a released version without a version bump??
2015-05-24 12:31:44 -07:00
Vincent Laporte
1c19f91dd7 opam: update from 1.2.1 to 1.2.2 2015-05-14 09:32:32 +02:00
Henry Till
a5fb20d65a opam: update to 1.2.1 2015-03-22 16:33:15 -04:00