Commit Graph

74 Commits

Author SHA1 Message Date
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
Jack Cummings
2920bc8d9f recoll: 1.37.5 -> 1.39.1
switched to meson
  parallel building disabled, as there is a dependency bug somewhere in
   the build scripts
  update homepage
2024-07-31 09:43:48 +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
Frank Doepper
9ec2486208 recoll: wrap rcljoplin.py
rcljoplin.py uses module "recoll", so PYTHONPATH has to be set.

fixes #311619
2024-05-14 16:22:44 +02:00
R. Ryantm
686277819b python311Packages.recoll: 1.37.4 -> 1.37.5 2024-05-03 07:04:26 +00:00
annalee
5e29e79f8b
recoll: don't double wrap executables 2024-02-19 04:47:10 +00:00
annalee
2dfa764fba
recoll: fix darwin build 2024-02-19 04:47:10 +00:00
R. Ryantm
7dfa5ad068 recoll: 1.37.2 -> 1.37.4 2024-02-18 15:50:44 +00:00
R. Ryantm
7278e451df recoll: 1.36.2 -> 1.37.2 2024-02-09 12:33:01 +00:00
Vladimír Čunát
8b2d354abe
recoll: fixup build after libxml2 update 2024-01-11 17:03:06 +01:00
Mario Rodas
3c9e42e351 recoll: fix changelog 2023-12-02 10:20:43 +00:00
R. Ryantm
7084473d63 recoll: 1.36.0 -> 1.36.2 2023-12-02 10:20:43 +00:00
R. Ryantm
16b5253cac recoll: 1.35.0 -> 1.36.0 2023-11-11 10:02:08 +00:00
Emery Hemingway
46475b96c7 recoll: 1.33.4 -> 1.35.0 2023-09-15 10:32:17 +02:00
Adam Joseph
39e7ddaf19 recoll: use catdvi
This adds catdvi as a dependency of recoll.  According to the
comments in recoll, "dvitext no longer works".
2023-09-15 09:55:57 +02:00
Adam Joseph
486cc09058 recoll: simplify --with{out}-inotify expression
This cleanup commit uses `lib.withFeature` to simplify the
expression for recoll's `--with{out}-inotify` flags.
2023-06-17 10:39:28 +01:00
Adam Joseph
d77f9d908e recoll: use wrapProgram to set $PATH for recoll, recollindex
Many recoll filters assume that $PATH contains all their
dependencies.  Our current patching approach is a game of
whack-a-mole, and while we will continue trying to play it we ought
to set the $PATH as well.

This commit eliminates a huge number of extraneous error messages
from recoll's log, making it easier to see the remaining ones which
really matter.
2023-06-08 08:25:05 +01:00
Adam Joseph
8d2530ece4 recoll: factor out dependency list
This commit factors out a long repetitive list of `wrapProgram`
invocations into a Nix list which can be iterated upon for other
purposes.
2023-06-08 08:25:05 +01:00
Adam Joseph
d61bdc7ded recoll: fix cross
This commit fixes cross-compilation of recoll by:

1. Disabling the python module when cross compiling

2. Removing `file` from `nativeBuildInputs`, since it leaks into
   recoll-*.so, and forcing use of the hostPlatform `file` by adding
   the configureFlag that does that.

3. Adding `qtbase` to `nativeBuildInputs` if `withGui`
2023-06-07 21:10:09 +01:00
Adam Joseph
2c5682c927 recoll: add withPython parameter
Cross-compiling the recoll python modules does not work and is not
easy to fix; for now we disable them.
2023-06-07 21:10:09 +01:00
Artturin
cab4a24c34 treewide: fix lints
Arg to lib.optional is a list

build time tool in buildInputs
2023-03-11 00:55:17 +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
Artturin
6f6cc4a22d treewide: use toString on list NIX_CFLAGS_COMPILE
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
2023-02-22 21:23:04 +02:00
Emery Hemingway
961892a085 recoll: wrap some input handlers with extra deps 2023-02-12 21:32:48 -06:00
Fabian Affolter
26fff39e4f
python310Packages.recoll: add changelog to meta
- specify license
2023-01-04 09:12:48 +01:00
R. Ryantm
34c3093c20 python310Packages.recoll: 1.33.2 -> 1.33.4 2023-01-01 02:40:55 +00:00
Gabriel Arazas
41f4a69fd5 recoll: 1.32.7 -> 1.33.2 2022-12-22 14:01:45 -06:00
Jiajie Chen
4ed7e2a866 recoll: fix no/bad configuration error on darwin
Prior to this fix, running recoll fails with the following error:

No/bad main configuration file in /nix/store/.../Resources/examples.

The path is incorrect and RECOLL_DATADIR should be used.
2022-10-28 11:06:57 +08:00
Karthik Iyengar
20c9a9e87d
Remove kiyengar from maintainers (#187781) 2022-08-21 23:50:03 +02:00
R. Ryantm
a3d5cf1dd2 python310Packages.recoll: 1.32.5 -> 1.32.7 2022-08-16 21:48:46 +00:00
R. Ryantm
177a9e4f15 python310Packages.recoll: 1.32.0 -> 1.32.5 2022-08-02 00:11:29 +00:00
Mario Rodas
c1922f2381 recoll: 1.31.0 -> 1.32.0
https://www.lesbonscomptes.com/recoll/pages/release-1.32.html
2022-05-12 04:20:00 +00:00
R. RyanTM
4de6fe6a9d python38Packages.recoll: 1.28.6 -> 1.31.0 2021-09-14 10:08:29 +00:00
Robert Schütz
346af47879
Merge pull request #118574 from dotlambda/recoll-python
python3Packages.recoll: init
2021-04-08 18:21:06 +02:00
Robert Schütz
af9ea7040c python3Packages.recoll: init
Also move some stuff to recoll's nativeBuildInputs.
2021-04-05 15:08:25 +02:00
Dmitry Kalinkin
97bb239d9d
recoll: drop assert on hostPlatform.system
This was introduced in 05e5f5d5 ('Fix tarball') and no longer serves
the original purpose.
2021-04-04 20:23:56 -04:00
R. RyanTM
8789af1496 recoll: 1.27.12 -> 1.28.6 2021-03-09 11:12:25 +00:00
Ben Siraphob
badf51221d treewide: stdenv.lib -> lib 2021-01-16 17:58:11 +07: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
Fabián Heredia Montiel
3ec7527f6e recoll: refactor and 1.24.5 -> 1.27.12
Refactor Changes:

- name -> pname + version
- python2 -> python3
- add pkg-config (to find libxslt)
- patch /usr/share/recoll to $out/share/recoll
- remove Makefile patch for macOS that has been merged upstream (
  b5c5734d06 )
2020-11-23 14:01:56 -06:00
Frank Doepper
9cdfa8adc2 recoll: qt4 -> qt5, fix build 2020-09-09 19:28:32 +02:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
c0bw3b
9cb260d091 [treewide] delete unused patches 2019-05-04 19:52:24 +02: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
R. RyanTM
f8f14c9a63 recoll: 1.24.4 -> 1.24.5
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/recoll/versions
2019-02-03 20:02:35 -08:00
R. RyanTM
d121a13f67 recoll: 1.24.3 -> 1.24.4
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/recoll/versions
2018-12-14 03:50:48 -08:00
R. RyanTM
3caf460533 recoll: 1.23.7 -> 1.24.3 (#50563)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/recoll/versions
2018-11-18 12:31:12 +01:00
John Ericson
2c2f1e37d4 reewide: Purge all uses stdenv.system and top-level system
It is deprecated and will be removed after 18.09.
2018-08-30 17:20:32 -04:00
Mario Rodas
79b81c31d4 recoll: Add support to build without QT 2018-07-05 06:17:34 -05:00