Merge branch 'master' into staging-next

* master: (77 commits)
  containerd: 1.7.2 -> 1.7.3
  python310Packages.transformers: 4.30.2 -> 4.31.0
  plasma-sdk: unbreak build, again
  stellarium: add patch for indi 2.0 compatibility
  indi-full: 1.9.8 -> 2.0.2, reenable Atik, Pentax and SX drivers
  indilib: 1.9.8 -> 2.0.2
  plasma: 5.27.6 -> 5.27.7
  alsa-scarlett-gui: light refactoring
  alsa-scarlett-gui: Change icons path back to relative in desktop entry file
  alsa-scarlet-gui: light refactoring Done some light refactoring for better consitence in the code.
  alsa-scarlett-gui: fix for deskop integration
  alsa-scarlett-gui: fixed desktop entry
  release-notes: note breaking woodpecker update
  woodpecker-*: 0.15.11 -> 1.0.0
  pnpm-lock-export: use fork with v6 support
  suricata: 6.0.13 -> 7.0.0
  rubyfmt: add support for macos arm64/x86
  rubyfmt: init at 0.8.1
  dayon: init at 11.0.7
  nixos/atuin: harden systemd unit
  ...

2 files changed, 8 insertions, 9 deletions

diff --git a/pkgs/data/misc/dbip-country-lite/default.nix b/pkgs/data/misc/dbip-country-lite/default.nix
index 73c8d441450..60d5e332c21 100644
--- a/pkgs/data/misc/dbip-country-lite/default.nix
+++ b/pkgs/data/misc/dbip-country-lite/default.nix
@@ -1,16 +1,15 @@
 { lib
 , stdenvNoCC
 , fetchurl
-, dbip-country-lite
 }:
 
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "dbip-country-lite";
-  version = "2023-07";
+  version = "2023-08";
 
   src = fetchurl {
-    url = "https://download.db-ip.com/free/dbip-country-lite-${version}.mmdb.gz";
-    hash = "sha256-WVsyhopYbBlCWDq9UoPe1rcGU3pBYsXkqNWbaQXzRFA=";
+    url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz";
+    hash = "sha256-+IQSHgfVZ2codxkOKwi23CLjm+rYDZOQq5EWJs0OLiQ=";
   };
 
   dontUnpack = true;
@@ -24,7 +23,7 @@ stdenvNoCC.mkDerivation rec {
     runHook postBuild
   '';
 
-  passthru.mmdb = "${dbip-country-lite}/share/dbip/dbip-country-lite.mmdb";
+  passthru.mmdb = "${finalAttrs.finalPackage}/share/dbip/dbip-country-lite.mmdb";
 
   meta = with lib; {
     description = "The free IP to Country Lite database by DB-IP";
@@ -33,4 +32,4 @@ stdenvNoCC.mkDerivation rec {
     maintainers = with maintainers; [ nickcao ];
     platforms = platforms.all;
   };
-}
+})
diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix
index 79b8a10d7d0..8864f3923f9 100644
--- a/pkgs/data/misc/v2ray-domain-list-community/default.nix
+++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix
@@ -3,12 +3,12 @@
 let
   generator = pkgsBuildBuild.buildGoModule rec {
     pname = "v2ray-domain-list-community";
-    version = "20230725085751";
+    version = "20230730120627";
     src = fetchFromGitHub {
       owner = "v2fly";
       repo = "domain-list-community";
       rev = version;
-      hash = "sha256-4D975ASoDoXjEi0kkwsUIIT6nwOE3ggBzNUVp0ojsbQ=";
+      hash = "sha256-lnTP8KDYdIa7iq14h0TEVfAlJDtsURfSZaEdQ8L1TRM=";
     };
     vendorHash = "sha256-dYaGR5ZBORANKAYuPAi9i+KQn2OAGDGTZxdyVjkcVi8=";
     meta = with lib; {