Merge pull request #428 from imincik/pkgs-weekly-update-2024-07

pkgs: weekly update 2024-07

README.md

@@ -133,15 +133,24 @@ nix why-depends .#<PACKAGE> .#<DEPENDENCY>
 
 #### Packages update process
 
-* Create a `pkgs-weekly-update` branch and collect all package updates
-  in this branch (Monday)
+* Create a `pkgs-weekly-update` branch to collect all package updates
+  in this branch and create PR (Monday)
 ```bash
-git checkout -b pkgs-weekly-update-$(date "+%Y-%U")
+git checkout -b pkgs-weekly-update-$(date "+%Y-%V")
+
+git push --set-upstream origin pkgs-weekly-update-$(date "+%Y-%V")
 ```
 
 * Merge automatically created flake update PR (`flake-update-action-pr` branch)
   in to `pkgs-weekly-update` branch
 
+* Submit `pkgs-weekly-update` PR
+```
+git pull
+
+gh pr create --title "pkgs: weekly update $(date "+%Y-%V")"
+```
+
 * Pull from the latest Nixpkgs master (Thursday - Friday)
 ```bash
 utils/pull-nixpkgs.sh <NIXPKGS-DIR>
@@ -165,9 +174,4 @@ nix build --json .\#test-qgis.x86_64-linux  | jq -r '.[].outputs | to_entries[].
 nix build --json .\#test-qgis-ltr.x86_64-linux  | jq -r '.[].outputs | to_entries[].value' | cachix push geonix
 ```
 
-* Submit PR (Friday)
-```
-gh pr create --title "pkgs: weekly update $(date "+%Y-%U")"
-```
-
-* Merge PR (Friday or Saturday)
+* Merge `pkgs-weekly-update` PR (Friday, Saturday)

pkgs/gdal/default.nix

@@ -198,8 +198,9 @@ stdenv.mkDerivation (finalAttrs: {
     ++ darwinDeps
     ++ nonDarwinDeps;
 
+  pythonPath = [ python3.pkgs.numpy ];
   postInstall = ''
-    wrapPythonPrograms
+    wrapPythonProgramsIn "$out/bin" "$out $pythonPath"
   '' + lib.optionalString useJava ''
     cd $out/lib
     ln -s ./jni/libgdalalljni${stdenv.hostPlatform.extensions.sharedLibrary}

pkgs/postgis/postgis.nix

@@ -20,13 +20,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "postgis";
-  version = "3.4.1";
+  version = "3.4.2";
 
   outputs = [ "out" "doc" ];
 
   src = fetchurl {
     url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz";
-    sha256 = "sha256-/vahQSE9D/J79FszuEnMOWwi3bH/xv7UNUacnokfyB0=";
+    sha256 = "sha256-yMh0wAukqYSocDCva/lUSCFQIGCtRz1clvHU0INcWJI=";
   };
 
   buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc pcre2.dev ]