Commit Graph

446 Commits

Author SHA1 Message Date
Nikolay Korotkiy
9a4bd92026
grass: use default python version (#359762) 2024-12-12 02:14:20 +04: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
Ivan Mincik
395d59f54b qgis-ltr: 3.34.11 -> 3.34.13 2024-11-30 09:33:50 +00:00
Ivan Mincik
9fc2250e80 qgis-ltr: build with same pyqt version as qgis 2024-11-30 09:33:50 +00:00
Ivan Mincik
c989da7576 qgis: 3.38.3 -> 3.40.1 2024-11-30 09:32:38 +00:00
Ivan Mincik
5ceee66acc grass: use default python version 2024-11-28 08:52:11 +01:00
Ivan Mincik
145b28d899 qgis: use default python version 2024-11-28 08:39:07 +01:00
aleksana
571c71e6f7 treewide: migrate packages to pkgs/by-name, take 1
We are migrating packages that meet below requirements:

1. using `callPackage`
2. called path is a directory
3. overriding set is empty (`{ }`)
4. not containing path expressions other than relative path (to
makenixpkgs-vet happy)
5. not referenced by nix files outside of the directory, other
than`pkgs/top-level/all-packages.nix`
6. not referencing nix files outside of the directory
7. not referencing `default.nix` (since it's changed to `package.nix`)
8. `outPath` doesn't change after migration

The tool is here: https://github.com/Aleksanaa/by-name-migrate.
2024-11-09 20:04:51 +08:00
Weijia Wang
eae1f31968
gmt: fix build (#343919) 2024-11-03 17:24:18 +01:00
Augustin Trancart
b9dac9e515 whitebox-tools: adoption by the geospatial team 2024-10-30 17:03:35 +01:00
wxt
4bbec8c443 gmt: move to by-name; run nixfmt; dcw-gmt: move to by-name; run nixfmt; gshhg-gis: move to by-name; run nixfmt 2024-10-30 18:37:55 +08:00
Ivan Mincik
9067c29c9a qgis: add server support 2024-10-24 09:35:24 +02:00
Ivan Mincik
6b2e9097a4
qgis: don't build with grass by default (#350203) 2024-10-23 12:44:43 +00:00
Ivan Mincik
ddb45dcd05 qgis: don't build with grass by default
Update nixos/doc/manual/release-notes/rl-2411.section.md

Co-authored-by: zi3m5f <113244000+zi3m5f@users.noreply.github.com>
2024-10-23 14:43:22 +02:00
Augustin Trancart
3def589d71 gmt: make the geospatial team adopt it 2024-10-21 22:25:01 +02:00
Ivan Mincik
43012a8149 qgis: re-export unwrapped parameters
Re-export build configuration parameters from unwrapped package to allow
standard override using

```
  qgis.override { ... };
```

.
2024-10-17 11:40:57 +02:00
Doron Behar
eccfe1c0ad gmt: let it find libraries automatically 2024-09-29 19:46:53 +03:00
Doron Behar
6889e8eeee gmt: 6.4.0 -> 6.5.0
Diff: https://github.com/GenericMappingTools/gmt/compare/refs/tags/6.4.0...6.5.0
2024-09-29 19:46:53 +03:00
Doron Behar
eac660eb4b gmt: fix build by overriding netcdf 2024-09-29 19:46:53 +03:00
Doron Behar
ca6795545c gmt: modernize
Nixfmt; Use `finalAttrs:` pattern; don't use `with lib;` in meta; Switch
to fetchFromGitHub, for better automatic updates, with hash instead of
sha256.
2024-09-29 10:39:53 +03: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
Ivan Mincik
ff2818413a grass: disable opengl support on darwin 2024-09-19 11:13:46 +02:00
Ivan Mincik
23d10b2518 grass: fix openmp support on darwin 2024-09-19 11:12:46 +02:00
Ivan Mincik
160e8ad614 grass: drop clang integer patch
Problem is fixed in
https://github.com/OSGeo/grass/pull/3325

Closes #340475
2024-09-18 15:17:43 +02:00
Nikolay Korotkiy
6b0e8e8144
qgis-ltr: 3.34.10 -> 3.34.11 (#342254) 2024-09-17 02:53:23 +04:00
Ivan Mincik
5c771e30e3 qgis-ltr: drop redundant CMAKE_BUILD_TYPE setting
CMAKE_BUILD_TYPE=Release is set by default in

040bd3d95a/pkgs/by-name/cm/cmake/setup-hook.sh (L113)
2024-09-16 11:21:30 +02:00
Ivan Mincik
e21aecdc35 qgis-ltr: 3.34.10 -> 3.34.11 2024-09-16 11:21:30 +02:00
Ivan Mincik
dfc771e0b2 qgis: drop redundant CMAKE_BUILD_TYPE setting
CMAKE_BUILD_TYPE=Release is set by default in

040bd3d95a/pkgs/by-name/cm/cmake/setup-hook.sh (L113)
2024-09-16 11:05:35 +02:00
Ivan Mincik
418ba67326 qgis: 3.38.2 -> 3.38.3 2024-09-16 11:04:03 +02:00
Martin Joerg
a5e11d787b qgis-ltr: wrap all binaries
This is necessary to make GRASS and Python plugins usable with qgis_process.
2024-09-04 09:21:15 +00:00
Martin Joerg
ea8a9b515b qgis: wrap all binaries
This is necessary to make GRASS and Python plugins usable with qgis_process.
2024-09-03 20:08:05 +00:00
Ivan Mincik
db1fb55d82
Merge pull request #335610 from imincik/qgis-ltr-3.34.10
qgis-ltr: 3.34.9 -> 3.34.10
2024-08-19 10:12:49 +00:00
Ivan Mincik
19f6a13e78 qgis-ltr: 3.34.9 -> 3.34.10 2024-08-18 15:53:43 +02:00
Ivan Mincik
401a54f03c qgis: 3.38.1 -> 3.38.2 2024-08-18 15:47:41 +02:00
Alexis Hildebrandt
ba5fe710df spatialite-tools: add missing libz dependency
fixes #332723
2024-08-06 15:26:17 +02:00
adisbladis
e0816431a2 treewide: Pass self when overriding Python
Otherwise references to the Python interpreter inside the set are wrong, as demonstrated by:
``` nix
with import <nixpkgs> { };
let
  python' = python3.override {
    packageOverrides = final: prev: { requests = prev.requests.overridePythonAttrs(old: { version = "1337";  }); };
  };
in python'.pkgs.python.pkgs.requests
```
which returns the _non_ overriden requests.

And the same with `self`:
```
with import <nixpkgs> { };
let
  python' = python3.override {
    self = python';
    packageOverrides = final: prev: { requests = prev.requests.overridePythonAttrs(old: { version = "1337";  }); };
  };
in python'.pkgs.python.pkgs.requests
```
which returns the overriden requests.

This can manifest itself as file collisions when constructing environments or as subtly incorrect dependency graphs.
2024-08-03 12:18:56 +12:00
R. Ryantm
7ce56e26c4 grass: 8.3.2 -> 8.4.0 2024-07-31 10:14:10 +02:00
Ivan Mincik
40cfb49204
Merge pull request #326291 from imincik/grass-sync-with-upstream
grass: sync packaging with upstream
2024-07-31 08:11:36 +00:00
Ivan Mincik
309eb346d6 grass: fix build by using libxml2 with http support 2024-07-30 18:36:53 +02:00
Sigmanificient
6dd44107ac treewide: remove unused lib (and other) arguments 2024-07-26 11:18:09 +02:00
Peder Bergebakken Sundt
a2146bbda3
Merge pull request #329188 from imincik/qgis-ltr-3.34.9
qgis-ltr: 3.34.8 -> 3.34.9
2024-07-25 18:11:48 +02:00
Ivan Mincik
6f0bc966e9 qgis-ltr: 3.34.8 -> 3.34.9 2024-07-22 17:42:59 +02:00
Ivan Mincik
d928c104c6 qgis: 3.38.0 -> 3.38.1 2024-07-22 17:15:27 +02:00
Aleksana
3ea85ac338
Merge pull request #326827 from Aleksanaa/trivial-sha256-fix
treewide: sha256 -> hash attribute for gitlab.com,codeberg.org fetchers
2024-07-14 22:40:25 +08:00
aleksana
1a89942243 treewide: sha256 -> hash attribute for gitlab.com fetchers 2024-07-13 22:28:37 +08:00
Ivan Mincik
ec0ffbe5ce qgis-ltr: fix pyqt patch 2024-07-12 15:07:47 +02:00
Ivan Mincik
71b28e353c grass: sync packaging with upstream 2024-07-11 13:31:37 +02:00
Franz Pletz
5bdcce69a6
qgis-ltr: pin to python 3.11
Grass depends on Python 3.11 as wxwidgets doesn't support Python 3.12.
2024-07-09 23:06:59 +02:00
Franz Pletz
bf6402fcc3
qgis: pin to python 3.11
Grass depends on Python 3.11 as wxwidgets doesn't support Python 3.12.
2024-07-09 23:06:59 +02:00
Franz Pletz
1e0e33c132
grass: pin to python 3.11
Pin to Python 3.11 since wxpython is not yet compatible to Python 3.12.

Co-authored-by: Ivan Mincik <ivan.mincik@gmail.com>
2024-07-09 23:06:59 +02:00