Skip to content

Commit

Permalink
Merge pull request #456 from imincik/pkgs-weekly-update-2024-13
Browse files Browse the repository at this point in the history
pkgs: weekly update 2024-13
  • Loading branch information
imincik authored Mar 28, 2024
2 parents 64bb389 + fc8dcad commit c3c7166
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 14 deletions.
14 changes: 12 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,18 @@ gh pr create --title "pkgs: weekly update $(date "+%Y-%V")"
utils/pull-nixpkgs.sh <NIXPKGS-DIR>
```

* Review changes, identify related PRs in Nixpkgs, split changes to separate
commits (link to Nixpks PR in commit message)
* Review changes, identify related PRs in Nixpkgs and create separate commit for
each change (include Nixpkgs PR URL in commit message)
```
gh pr list --state all --search <NIXPKGS-COMMIT-HASH>
```
```
git commit
pkgs(<PACKAGE>): <CHANGE-DESCRIPTION>
Nixpkgs PR: <NIXPKGS-PR-URL>
```

* Optional: generate a reverse patch for changes which are not desired
```
Expand Down
12 changes: 6 additions & 6 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkgs/pdal/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@

stdenv.mkDerivation (finalAttrs: {
pname = "pdal";
version = "2.7.0";
version = "2.7.1";

src = fetchFromGitHub {
owner = "PDAL";
repo = "PDAL";
rev = finalAttrs.version;
sha256 = "sha256-knyDVUZH+X563UzKkvDpi08EcXU5s4+Jvya3Xprpt1A=";
sha256 = "sha256-JoHBxJ0hCWH7ZhmeJk4huT2k0AK5CzIV58NWCjWj5T0=";
};

nativeBuildInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/qgis/unwrapped-ltr.nix
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,14 @@ let
urllib3
];
in mkDerivation rec {
version = "3.34.4";
version = "3.34.5";
pname = "qgis-ltr-unwrapped";

src = fetchFromGitHub {
owner = "qgis";
repo = "QGIS";
rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
hash = "sha256-yEltpPhNFT/XB1EB5FvhCKcP0YY4j/q7luhd1mI0ZJU=";
hash = "sha256-TRSS1YclGUfBjNz+Lo8U8YlN4kdJ9JLcwd7qpgwRbG0=";
};

passthru = {
Expand Down
4 changes: 2 additions & 2 deletions pkgs/qgis/unwrapped.nix
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,14 @@ let
urllib3
];
in mkDerivation rec {
version = "3.36.0";
version = "3.36.1";
pname = "qgis-unwrapped";

src = fetchFromGitHub {
owner = "qgis";
repo = "QGIS";
rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
hash = "sha256-uO9Bu+7n8xzsjumbp0t/yYQNvyDgRH1bdfqpX9oLoTY=";
hash = "sha256-/0wVPcQoliJFgY8Kn506gUHfY+kDTdLgzbp/0KLSAkI=";
};

passthru = {
Expand Down

0 comments on commit c3c7166

Please sign in to comment.