Commit Graph

86 Commits

Author SHA1 Message Date
R. Ryantm
aee50eddf3 postgresqlPackages.postgis: 3.6.3 -> 3.6.4 2026-06-18 06:01:35 +00:00
R. Ryantm
46dc938d4f postgresqlPackages.postgis: 3.6.2 -> 3.6.3 2026-04-18 05:23:45 +00:00
Marcin Serwin
6be279f84c maintainers: drop marcweber
Signed-off-by: Marcin Serwin <marcin@serwin.dev>
2026-03-06 17:35:25 +01:00
R. Ryantm
da17580c63 postgresqlPackages.postgis: 3.6.1 -> 3.6.2 2026-02-12 04:50:35 +00:00
Ivan Mincik
de34c567d9 postgresqlPackages.postgis: update osgeo git url
OSGeo git URL was changed from `git.osgeo.org/gitea` to `git.osgeo.org`
few months ago.
2026-01-13 14:12:10 +01:00
Ivan Mincik
ade59e6aa3 postgresqlPackages.postgis: build with upgrade scripts
Build PostGIS with upgrade scripts such as postgis--3.5.3--ANY.sql which
are mandatory for upgrades between versions.

Closes #466292
2025-11-30 20:04:43 +01:00
R. Ryantm
292a568c99 postgresqlPackages.postgis: 3.6.0 -> 3.6.1 2025-11-19 01:45:03 +00:00
Augustin Trancart
46bbd93784 postgresqlPackages.postgis: 3.5.3 -> 3.6.0 2025-09-26 15:04:29 +02:00
Wolfgang Walther
5a0711127c treewide: run nixfmt 1.0.0 2025-07-24 13:55:40 +02:00
Jonas Heinrich
24a2a22af6 postgresqlPackages.postgis: fix cross-compilation 2025-07-21 14:19:44 +02:00
Wolfgang Walther
c3a41f85e4 postgresqlPackages.postgis: 3.5.2 -> 3.5.3
Release notes:
https://git.osgeo.org/gitea/postgis/postgis/raw/tag/3.5.3/NEWS
2025-07-11 15:51:13 +02:00
Wolfgang Walther
065fefd975 postgresqlTestHook: shutdown on failure
Previously, the user of postgresqlTestHook would have needed to set
failureHook accordingly. However, this was not a clean solution, because
postgresqlStop would also run for configure or build failures, before
the server was even started. This gave odd errors from a failed shutdown
in the log.

Now postgresqlStop is only called when it makes sense - and whenever
postgresqlTestHook is used.
2025-05-11 10:44:20 +02:00
K900
578c3f18a7 postgis: backport patch to fix tests with GDAL 3.11 2025-05-10 16:45:38 +03:00
Fernando Rodrigues
05580f4b44 treewide: switch instances of lib.teams.*.members to the new meta.teams attribute
Follow-up to #394797.

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
2025-04-25 22:20:17 -03:00
Wolfgang Walther
8ebdf33624 postgresqlPackages.postgis: use postgresqlTestExtension's asserts option 2025-04-21 12:36:30 +02:00
K900
74d5b70eb2 Merge remote-tracking branch 'origin/master' into staging-next 2025-04-07 09:36:05 +03:00
Pol Dellaiera
f92efd3183 treewide: remove unneeded string interpolation 2025-04-07 08:08:12 +02:00
Wolfgang Walther
88dfade94b postgresql: replace pg_config with custom script
By replacing upstream's pg_config binary with a shell script, we:
- gain the ability to run pg_config easily when cross-compiling,
- can remove the fake pg_config in the default output,
- can remove the pg_config wrapper script dealing with special cases.

Some 20 years ago, pg_config *was* a shell script upstream, too. It was
changed to a binary, when it was made "relocatable", so it would return
paths depending on the location of the "postgres" binary. However, this
is exactly the thing that just hurts us in nixpkgs - we don't want those
paths to change, we want them to always point at the right outputs. By
writing the script ourselves, this becomes a lot less painful.

This approach means more lines of codes, but all of them are dead simple
and we have a lot less complexity overall.

Additionally, pg_config is now made a separate derivation, only exposed
as "postgresql.pg_config". This has the nice side-effect, that all users
of postgresql and libpq in nixpkgs must be very *explicit* about their
dependency on pg_config. This gives a lot more visibility into the state
of affairs regarding pkg-config support for libpq, which ultimately is
the much better solution.
2025-03-21 18:05:38 +01:00
Wolfgang Walther
72b8186ff7 postgresqlPackages: rename buildPostgresqlExtension to postgresqlBuildExtension
This is for consistency with postgresqlTestExtension and
postgresqlTestHook. Everything that is passed via postgresql's
generic.nix "packages scope" now is prefixed with "postgresql".
2025-03-18 18:17:24 +01:00
Wolfgang Walther
8f6d6a274c postgresqlPackages.postgis: modernize 2025-03-18 18:17:12 +01:00
Wolfgang Walther
7ab409bb28 postgresqlPackages: enable strictDeps 2025-02-01 19:48:27 +01:00
Ivan Mincik
7da0f0a12d postgresqlPackages.postgis: 3.5.0 -> 3.5.2 2025-01-20 10:30:23 +01:00
Augustin Trancart
007496f756 postgis: add withSfcgal option 2025-01-17 09:14:55 +01:00
Wolfgang Walther
b924334c41 postgresql: fix pgxs Makefile for darwin
The darwin specific Makefile contains a reference to the postgres
binary. Some extensions are able to set bindir to their own output
correctly for installation and will then fail to find the postgres
binaryin their own output during linking.

PostGIS worked around this by faking a postgres binary in their own
output, but we can do better by hardcoding the proper path in the
Makefile when PostgreSQL is built.
2024-11-23 21:43:33 +01:00
Wolfgang Walther
31b9d15443 postgresqlPackages.postgis: remove wolfgangwalther from maintainers
I am now notified as member of the NixOS/postgres team about changes.
2024-11-20 22:27:52 +01:00
Wolfgang Walther
68254e438c postgresqlPackages: enable update scripts by default
This enables update scripts via buildPostgresqlExtension. Extensions
must actively opt-out, if they don't support either the default
configuration or the unstable configuration.

To make the update script work, some extensions had to be changed to
pull their code from GitHub instead. Those with PostgreSQL-style version
tags (REL_X_Y) had to be changed to make src.rev the source of truth.
2024-11-16 13:09:35 +01:00
Maximilian Bosch
0644d3be87 Merge branch 'master' into staging-next 2024-11-10 18:34:57 +01:00
Wolfgang Walther
ecffab1fda postgresqlPackages.postgis: move nixosTests.postgis into package
Same reasoning as commit before.
2024-11-09 18:24:51 +01:00
Wolfgang Walther
e24121ec20 postgresqlPackages: replace custom installPhase with buildPostgresqlExtension helper 2024-10-29 09:55:20 +01:00
Augustin Trancart
3d19c66a1f postgresqlPackages.postgis: 3.4.3 -> 3.5.0 2024-10-03 18:01:30 +02: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
Augustin Trancart
dc750b8237 postgresqlPackages.postgis: 3.4.2 -> 3.4.3 2024-09-20 23:58:45 +02:00
Rebecca Turner
6602decb96 postgis: Do not hardcode test suite path (#336889)
postgis: Fix test suite

Fixes this failure:

```
Creating database 'postgis_reg-3.4'.
sh: line 1: /tmp/pgis_reg/regress_log: Permission denied
2024-08-23 19:26:18.810 UTC [3295760] FATAL:  database "postgis_reg-3.4" does not exist
psql: error: FATAL:  database "postgis_reg-3.4" does not exist
Loading unpackaged components from /tmp/nix-build-postgis-3.4.2.drv-0/postgis-3.4.2/regress/00-regress-install/nix/store/kg8g82wxhar9iadxrd3pra3af174khpb-postgis-3.4.2/share/postgresql/contrib/postgis
Loading PostGIS into 'postgis_reg-3.4'
sh: line 1: /tmp/pgis_reg/regress_log: Permission denied
 failed (Error encountered loading /tmp/nix-build-postgis-3.4.2.drv-0/postgis-3.4.2/regress/00-regress-install/nix/store/kg8g82wxhar9iadxrd3pra3af174khpb-postgis-3.4.2/share/postgresql/contrib/postgis/postgis.sql: /tmp/pgis_reg/regress_log)
make: *** [regress/runtest.mk:24: check-regress] Error 1
```
2024-08-26 11:39:19 -07:00
Kirill Radzikhovskyy
b023a8a2f1 postgresqlPackages.postgis: sha256 -> hash 2024-08-15 13:56:01 +10:00
Kirill Radzikhovskyy
d3c9639c75 postgresqlPackages.postgis: nixfmt-rfc-style 2024-08-15 13:55:26 +10:00
Kirill Radzikhovskyy
068c11900f postgresqlPackages.postgis: enable tests 2024-08-15 13:55:12 +10:00
Jussi Kuokkanen
8064d28a4f pkgs/servers: remove licenses.gpl2 2024-05-23 11:49:42 +03:00
Wolfgang Walther
7a358ffd0e postgresqlPackages.postgis: add myself as maintainer 2024-03-31 19:32:31 +02:00
github-actions[bot]
c222aba0b8 Merge master into staging-next 2024-03-17 12:01:55 +00:00
Wolfgang Walther
14b3ea2789 postgresql: refactor to pass jitSupport/llvm via scope instead of passthru
This makes it less error-prone to use the llvm package in extensions, because
it will always match the package used by the postgresql derivation itself.

Previously, you could've accidentally used llvm instead of postgresql.llvm
with a different result.
2024-03-15 21:11:09 +01:00
Wolfgang Walther
719034f6f6 postgresql: refactor to move packages.nix to ext/default.nix (2/2)
This aligns more with the commonly used style in nixpkgs.
2024-03-15 18:51:01 +01:00
Wolfgang Walther
9ef7195e08 postgresql: refactor to move packages.nix to ext/default.nix (1/2)
This commit is split up into two commits to allow git to detect renames,
make rebasing easier and allow a working entry in .git-blame-ignore-revs.

To allow bisecting we allow evaluation on every commit by moving the extensions
into ext/ext/ first and back to ext/ with the next commit.
2024-03-15 18:50:20 +01:00
annalee
8e038835fe Merge remote-tracking branch 'upstream/master' into staging-next 2024-03-13 00:38:07 +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
Wolfgang Walther
a1896739f6 postgresql.pkgs: remove broken conditions for legacy versions
PostgreSQL older than v12 is not in nixpkgs anymore, so marking those as
still broken in that case doesn't make sense anymore.
2024-03-09 09:44:07 +01:00
R. Ryantm
6b99ea2eea postgresqlPackages.postgis: 3.4.1 -> 3.4.2 2024-02-09 12:32:05 +01:00
Ivan Mincik
afc2f0f7bc postgresqlPackages.postgis: build minimal gdal version
This change is reducing closure size from 1.5G to
544M.
2024-01-03 11:38:02 +01:00
Mario Rodas
00d4968679 Merge pull request #269340 from reckenrode/postgis-fix
postgresqlPackages.postgis: fix build on clang 12+
2023-11-23 22:57:08 -05:00
Randy Eckenrode
b6d4be13d0 postgresqlPackages.postgis: fix build on clang 12+
Work around https://github.com/NixOS/nixpkgs/issues/166205
2023-11-23 11:30:24 -05:00
R. Ryantm
c2ef75a0ad postgresql12JitPackages.postgis: 3.4.0 -> 3.4.1 2023-11-21 08:02:48 +00:00