Commit Graph

27 Commits

Author SHA1 Message Date
Winter
a19cd4ffb1 Revert "treewide: replace rev with tag"
This reverts commit 65a333600d.

This wasn't tested for correctness with something like fodwatch [0],
and should not have been (self-)merged so quickly, especially without
further review.

It also resulted in the breakage of at least one package [1] (and that's
the one we know of and was caught).

A few packages that were updated in between this commit and this revert
were not reverted back to using `rev`, but other than that, this is a
1:1 revert.

[0]: https://codeberg.org/raphaelr/fodwatch
[1]: https://github.com/NixOS/nixpkgs/pull/396904 / 758551e458
2025-04-08 02:57:25 -04:00
Pol Dellaiera
65a333600d treewide: replace rev with tag 2025-04-07 16:57:22 +02:00
Silvan Mosberger
4f0dadbf38 treewide: format all inactive Nix files
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.

Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.

A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.

This commit was automatically created and can be verified using

    nix-build a08b3a4d19.tar.gz \
      --argstr baseRev b32a094368
    result/bin/apply-formatting $NIXPKGS_PATH
2024-12-10 20:26:33 +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
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
Vincent Laporte
b56f06f3e8 ocamlPackages.camomile: 1.0.2 → 2.0.0 2023-10-02 08:21:20 +02:00
Ulrik Strid
f12b9ea461 buildDunePackage: default to strictDeps = true 2023-02-03 08:59:34 +01:00
Daniel Olsen
c7b3a73f99 ocamlPackages.camomile: append version to META file 2022-03-08 11:54:06 +01:00
Ulrik Strid
a13cdfe520 ocamlPackages tree-wide: Move buildInputs that should be nativeBuildInputs
To keep this for the future we also strictDeps where possible, including for janePackages, topkg, oasis and ocamlbuild.
This makes some closures significantly smaller and makes cross compilation easier
2022-02-24 14:39:27 +01:00
Ryan Burns
3a5fc1aad4 ocamlPackages.camomile: fix output dest dir
Add missing pre/post hooks - preConfigure is now required to set
correct ocaml dest dir as findlib sets a necessary preConfigure hook
2021-09-06 22:41:05 +09:00
Vincent Laporte
caa23be256 ocamlPackages.camomile: use Dune 2 2021-02-27 21:19:06 +01:00
zowoq
8488ebab05 ocamlPackages.*: use spaces for indentation 2021-01-21 10:30:13 +10:00
sternenseemann
aad56c947f ocamlPackages: remove redundant stdenv imports 2021-01-12 16:33:18 +01:00
sternenseemann
4e42cac49d ocamlPackages: stdenv.lib → lib
This change was produced by searching for remaining occurrences of
stdenv.lib and replacing them manually.

Reference #108938.
2021-01-12 16:33:18 +01:00
Mario Rodas
00fe273cf9 ocamlPackages.camomile: 1.0.1 -> 1.0.2 2019-08-09 03:43:36 -05:00
Mario Rodas
88c2586958 dune: 1.9.2 -> 1.10.0 (#62256)
* dune: 1.9.2 -> 1.10.0

* ocamlPackages.camomile: use jbuilder executable

* ocamlPackages.sqlexpr: fix build

* ocamlPackages.lwt_camlp4: fix build
2019-07-05 12:28:06 +00:00
Théo Zimmermann
794158fcd5 buildDunePackage: new support function; use it to refactor some OCaml derivations 2018-11-07 10:08:03 +01:00
Bart Brouns
3f97539b42 camomile: 0.8.7 -> 1.0.1 2018-10-04 02:30:47 +02:00
Vincent Laporte
fc19401d67 jbuilder: 1.0.1 -> dune: 1.1.1 2018-09-15 19:32:32 +00:00
Vincent Laporte
d426e9097c ocamlPackages.camomile: 0.8.6 -> 0.8.7 2017-11-11 16:56:14 +00:00
Vincent Laporte
68ed8f685b ocamlPackages.camomile: 0.8.5 -> 0.8.6 2017-10-20 07:19:13 +00:00
Vincent Laporte
53a50dfa7a ocamlPackages.camomile: fix build for OCaml 4.05 2017-07-14 07:57:13 +02:00
Kirill Boltaev
3e646865f4 treewide: use ocaml.version (#19192) 2016-10-05 09:32:30 +02:00
Nicolas B. Pierron
72c6f8a140 Ensure that we can evaluate the platform attribute of ocaml packages. 2016-03-13 19:08:26 +00:00
Vincent Laporte
d274ee3f80 Adds camlp4
Camlp4 is a software system for writing extensible parsers for
programming languages.

Camlp4 was part of the official OCaml distribution until its version
4.01.0.

Homepage: https://github.com/ocaml/camlp4
2014-09-23 09:34:13 +01:00
Marco Maggesi
e634e4ae6b Update OCaml library Camomile to version 0.8.5 2014-01-18 20:56:45 +00:00
Marco Maggesi
5b730d301c Update ocaml_batteries and camomile (ocamlPackages)
*  Add camomile 0.8.3 and 0.8.2 (for ocaml_batteries).
  *  Remove obsolete camomile 0.7.3 and 0.8.1.
  *  Update ocaml_batteries to version 1.3.0 (also add fixes for Darwin).


svn path=/nixpkgs/trunk/; revision=27299
2011-05-24 18:21:13 +00:00