Commit Graph

46 Commits

Author SHA1 Message Date
Artturin
d06382a73b treewide: more manual fixups for
treewide: move NIX_CFLAGS_COMPILE to the env attrset

`nix-eval-jobs --flake ".#legacyPackages.x86_64-linux" --workers 3 2>/dev/null --impure | jq 'select(.error?) | select(.error | match ("attribute set can only contain derivation") )'`
and
`nix-eval-jobs --flake ".#legacyPackages.aarch64-darwin" --workers 3 2>/dev/null --impure | jq 'select(.error?) | select(.error | match ("attribute set can only contain derivation") )'`

no longer has output so this could be all of the remaining issues
2023-02-24 06:26:02 +02:00
Artturin
226e149145 treewide: env.NIX_CFLAGS_COMPILE use optionalString instead of optional
env values must be strings
2023-02-22 21:23:05 +02:00
Artturin
f9fdf2d402 treewide: move NIX_CFLAGS_COMPILE to the env attrset
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper

this makes it clearer that NIX_CFLAGS_COMPILE must be a string as lists
in env cause a eval failure
2023-02-22 21:23:04 +02:00
Vladimír Čunát
00e91a5cf8
ocamlPackages.lablgtk: fixup build by using older make 2022-12-16 12:19:01 +01:00
Vincent Laporte
64686c25b7 ocamlPackages.lablgtk: 2.18.12 → 2.18.13 2022-11-05 15:30:20 +01:00
Vincent Laporte
ed50e17618 ocamlPackages.lablgtk_2_14: remove at 2.14.0 (broken) 2022-10-13 07:55:32 +02:00
Sergei Trofimovich
720b350730 ocaml-ng.ocamlPackages_4_05.lablgtk: add -fcommon workaround
Workaround build failure on -fno-common toolchains like upstream
gcc-10. Otherwise build fails as:

    ld: ml_gtktree.o:(.bss+0x0): multiple definition of
      `ml_table_extension_events'; ml_gdkpixbuf.o:(.bss+0x0): first defined here
2022-06-20 22:44:34 +01:00
Malo Bourgon
ba54ba9316 ocamlPackages: add meta.mainProgram to packages with multiple executables
where none of the executables match the package's `name` or `pname`, and
one of the executables is the obvious `mainProgram`.
2022-05-20 10:13:29 +02:00
Malo Bourgon
bca4ad0487 ocamlPackages: inherit ocaml.meta.platforms 2022-05-11 09:02:37 +02: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
Vincent Laporte
43bbef4978 ocamlPackages.lablgtk: 2.18.10 → 2.18.12 2022-01-23 10:23:53 +01:00
Vincent Laporte
e3183d75e3 ocamlPackages.lablgtk: disable glade support 2022-01-23 10:23:53 +01:00
Jonathan Ringer
9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08: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
Profpatsch
4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
Vincent Laporte
608dbf662c ocamlPackages.lablgtk: 2.18.8 → 2.18.10
This ensures compatibility with OCaml 4.10
2020-05-14 21:26:35 +02:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Merijn Broeren
133103d709
treewide: replace make/build/configure/patchFlags with nix lists 2019-12-30 12:58:11 +01:00
Marco Maggesi
ff1ed720e2 Rename z77z into maggesi
Make the "handle" of the maintainer match the name of the github account.
Also update the email address.
2019-10-07 17:05:25 +02:00
Jan Tojnar
cdf426488b
Merge branch 'master' into staging-next
Fixed trivial conflicts caused by removing rec.
2019-09-06 03:20:09 +02:00
Jan Tojnar
72e7d569a7
tree-wide: s/GTK+/GTK/g
GTK was renamed.
2019-09-06 02:54:53 +02:00
Vladimír Čunát
f21211ebfe
Merge branch 'master' into staging 2019-09-02 23:25:24 +02:00
Vincent Laporte
8d70f49cbd ocamlPackages.lablgtk: 2.18.6 -> 2.18.8
Ensures compatibility with OCaml 4.08.
2019-09-02 16:19:24 +00: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
John Ericson
db965063b3 treewide: Make configureFlags lists 2018-08-03 17:06:03 -04:00
Vincent Laporte
54d1e1412b
ocamlPackages.lablgtk: 2.18.5 -> 2.18.6 2017-10-31 01:02:59 +00:00
Vincent Laporte
34309999ed
ocamlPackages.lablgtk: remove unused dependency to campl4 2017-10-18 18:27:06 +00:00
John Ericson
531e4b80c9 misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs
Only acts on one-line dependency lists.
2017-09-21 15:49:53 -04:00
Vincent Laporte
4c0203b094 ocamlPackages.lablgtk_2_14: disable for OCaml ≥ 4.04 2017-06-26 08:39:05 +02:00
Vincent Laporte
8d8fdce611 ocamlPackages.lablgtk: don’t strip 2017-06-26 08:27:03 +02:00
Vincent Laporte
ebe19f5db0 lablgtk: 2.18.3 -> 2.18.5 2016-12-22 06:07:06 +00:00
Kirill Boltaev
3e646865f4 treewide: use ocaml.version (#19192) 2016-10-05 09:32:30 +02:00
Kirill Boltaev
bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03: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
3105b66dbd lablgtk-2.14: fix build with OCaml-4.02 (needs camlp4) 2015-06-25 08:55:30 +02:00
Vincent Laporte
3d049938c8 Adds some “branch” meta-data 2014-11-06 19:40:50 +00:00
Vincent Laporte
ca9097335d lablgtk: update from 2.18.2 to 2.18.3 2014-11-04 16:58:29 +00:00
Vincent Laporte
59a184824f lablgtk: update 2.16.0 -> 2.18.2 2014-10-08 20:24:41 +02: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
Vincent Laporte
40e79043b0 mkOcamlPackages: simpler rule for lablgtk 2014-09-20 18:53:43 +01:00
Vincent Laporte
d67588a5f1 Fixes coq-8.3: requires OCaml 3.12 2014-09-17 23:52:27 +01:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Austin Seipp
2d7fe68212 lablgtk: remove old patch
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-01 02:25:45 -05:00
Christophe Raffalli
b3fa714f1f upgraded lablgtk to version 2.16 to allow compilation with ocaml-4.00.1 2013-06-07 21:40:37 +02:00
Russell O'Connor
88ec92d14c Matita and its dependencies.
svn path=/nixpkgs/trunk/; revision=25328
2010-12-31 17:48:55 +00:00