From d4115236cd138ee0f1ca1be0e21d6d0eefe7102f Mon Sep 17 00:00:00 2001 From: imincik Date: Mon, 25 Mar 2024 01:23:55 +0000 Subject: [PATCH 1/5] flake: update nix flake inputs --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 040abbea..1216573c 100644 --- a/flake.lock +++ b/flake.lock @@ -57,11 +57,11 @@ ] }, "locked": { - "lastModified": 1685908677, - "narHash": "sha256-E4zUPEUFyVWjVm45zICaHRpfGepfkE9Z2OECV9HXfA4=", + "lastModified": 1710868679, + "narHash": "sha256-V1o2bCZdeYKP/0zgVp4EN0KUjMItAMk6J7SvCXUI5IU=", "owner": "nix-community", "repo": "nixGL", - "rev": "489d6b095ab9d289fe11af0219a9ff00fe87c7c5", + "rev": "d709a8abcde5b01db76ca794280745a43c8662be", "type": "github" }, "original": { @@ -72,11 +72,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1710565619, - "narHash": "sha256-xu/EnZCNdIj7m/QjCNIG5vrCA4TYg5uwFReb9XDxET0=", + "lastModified": 1711124224, + "narHash": "sha256-l0zlN/3CiodvWDtfBOVxeTwYSRz93muVbXWSpaMjXxM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8ac30a39abc5ea67037dfbf090d6e89f187c6e50", + "rev": "56528ee42526794d413d6f244648aaee4a7b56c0", "type": "github" }, "original": { From 9650fdec0ad7ad1f181495dd23eeaef25abfe571 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 28 Mar 2024 10:46:10 +0100 Subject: [PATCH 2/5] pkgs(pdal): 2.7.0 -> 2.7.1 Nixpkgs PR: https://github.com/NixOS/nixpkgs/pull/299454 --- pkgs/pdal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/pdal/default.nix b/pkgs/pdal/default.nix index 6f362967..86d97653 100644 --- a/pkgs/pdal/default.nix +++ b/pkgs/pdal/default.nix @@ -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 = [ From 3985e25693e6ca79d7d34fb0a5fb36ef83fd37c7 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 28 Mar 2024 10:56:30 +0100 Subject: [PATCH 3/5] pkgs(qgis): 3.36.0 -> 3.36.1 Nixpkgs PR: https://github.com/NixOS/nixpkgs/pull/298091 --- pkgs/qgis/unwrapped.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/qgis/unwrapped.nix b/pkgs/qgis/unwrapped.nix index 8f4421b9..6e4161fb 100644 --- a/pkgs/qgis/unwrapped.nix +++ b/pkgs/qgis/unwrapped.nix @@ -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 = { From 45ca54f19c857c9bb8a44f486cd5b69b630b9c0d Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 28 Mar 2024 10:57:32 +0100 Subject: [PATCH 4/5] pkgs(qgis-ltr): 3.34.4 -> 3.34.5 Nixpkgs PR: https://github.com/NixOS/nixpkgs/pull/298094 --- pkgs/qgis/unwrapped-ltr.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/qgis/unwrapped-ltr.nix b/pkgs/qgis/unwrapped-ltr.nix index 81e146f6..ad3ceddd 100644 --- a/pkgs/qgis/unwrapped-ltr.nix +++ b/pkgs/qgis/unwrapped-ltr.nix @@ -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 = { From fc8dcadf4e427108bc69ecdd2aafbe2ca4b7e45f Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 28 Mar 2024 10:58:22 +0100 Subject: [PATCH 5/5] docs: update weekly nixpkgs pull process --- README.md | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7f56f92f..0ad3568d 100644 --- a/README.md +++ b/README.md @@ -161,8 +161,18 @@ gh pr create --title "pkgs: weekly update $(date "+%Y-%V")" utils/pull-nixpkgs.sh ``` -* 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 +``` +``` +git commit + +pkgs(): + +Nixpkgs PR: +``` * Optional: generate a reverse patch for changes which are not desired ```