Merge staging-next into staging

doc/languages-frameworks/go.section.md

@@ -20,6 +20,7 @@ In the following is an example expression using `buildGoModule`, the following a
 
   To obtain the actual hash, set `vendorHash = lib.fakeSha256;` and run the build ([more details here](#sec-source-hashes)).
 - `proxyVendor`: Fetches (go mod download) and proxies the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build or if any dependency has case-insensitive conflicts which will produce platform dependant `vendorHash` checksums.
+- `modPostBuild`: Shell commands to run after the build of the go-modules executes `go mod vendor`, and before calculating fixed output derivation's `vendorHash` (or `vendorSha256`). Note that if you change this attribute, you need to update `vendorHash` (or `vendorSha256`) attribute.
 
 ```nix
 pet = buildGoModule rec {
@@ -114,7 +115,16 @@ done
 
 ## Attributes used by the builders {#ssec-go-common-attributes}
 
-Both `buildGoModule` and `buildGoPackage` can be tweaked to behave slightly differently, if the following attributes are used:
+Many attributes [controlling the build phase](#variables-controlling-the-build-phase) are respected by both `buildGoModule` and `buildGoPackage`. Note that `buildGoModule` reads the following attributes also when building the `vendor/` go-modules fixed output derivation as well:
+
+- [`sourceRoot`](#var-stdenv-sourceRoot)
+- [`prePatch`](#var-stdenv-prePatch)
+- [`patches`](#var-stdenv-patches)
+- [`patchFlags`](#var-stdenv-patchFlags)
+- [`postPatch`](#var-stdenv-postPatch)
+- [`preBuild`](#var-stdenv-preBuild)
+
+In addition to the above attributes, and the many more variables respected also by `stdenv.mkDerivation`, both `buildGoModule` and `buildGoPackage` respect Go-specific attributes that tweak them to behave slightly differently:
 
 ### `ldflags` {#var-go-ldflags}
 

pkgs/applications/misc/xmrig/moneroocean.nix

@@ -2,13 +2,13 @@
 
 xmrig.overrideAttrs (oldAttrs: rec {
   pname = "xmrig-mo";
-  version = "6.19.1-mo1";
+  version = "6.19.2-mo1";
 
   src = fetchFromGitHub {
     owner = "MoneroOcean";
     repo = "xmrig";
     rev = "v${version}";
-    sha256 = "sha256-wrjn1QhHI/OeSpPkwuwqQAsTOW8O/lNqIgKjkjxSbbA=";
+    sha256 = "sha256-L2upscNOTEQTbJ9ZnbXIpqPNmQDv56/7UYzlKndEulc=";
   };
 
   meta = with lib; {

pkgs/applications/networking/browsers/brave/default.nix

@@ -90,11 +90,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "brave";
-  version = "1.50.114";
+  version = "1.50.125";
 
   src = fetchurl {
     url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-    sha256 = "sha256-aZuNxO4whVRUb4Up0VwyMiI50OumWuCDfzm15ywGdIk=";
+    sha256 = "sha256-QVKCH8w593uF948tyavABI0g6sG0oteS/1O8Ncz77ps=";
   };
 
   dontConfigure = true;

pkgs/applications/networking/instant-messengers/signal-desktop/default.nix

@@ -1,12 +1,12 @@
 { callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {
   signal-desktop = {
     dir = "Signal";
-    version = "6.14.0";
-    hash = "sha256-dy/qzOv3x+nv3tIwHJUQ2BIwUNsvGbsKZOZxkgD3270=";
+    version = "6.15.0";
+    hash = "sha256-uZXFnbDe49GrjKm4A0lsOTGV8Xqg0+oC0+AwRMKykfY=";
   };
   signal-desktop-beta = {
     dir = "Signal Beta";
-    version = "6.15.0-beta.1";
-    hash = "sha256-aeJGwBoAs6iDpVjBzlcs7q9Jvn/h3KLcCV3m1yjMTNQ=";
+    version = "6.16.0-beta.1";
+    hash = "sha256-J7YPuQetfob8Ybab+c5W0Z4Urzi4AtEJAnIVRIGtv0Q=";
   };
 }

pkgs/applications/office/zotero/default.nix

@@ -41,12 +41,12 @@
 
 stdenv.mkDerivation rec {
   pname = "zotero";
-  version = "6.0.23";
+  version = "6.0.26";
 
   src = fetchurl {
     url =
       "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
-    hash = "sha256-DPuUSEhZM6gRO82eXalf1ucDBQh2KvTBwOPjR5DEsqM=";
+    hash = "sha256-Btrzv9trUFjCrQ+OEc7MUOzq7x3XW7jtgUJMitmPK0A=";
   };
 
   nativeBuildInputs = [ wrapGAppsHook ];

pkgs/applications/science/biology/subread/default.nix

@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "subread";
-  version = "2.0.4";
+  version = "2.0.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/subread/subread-${version}/subread-${version}-source.tar.gz";
-    sha256 = "sha256-xUs37YOzQxjY8Rm1wC+50KZcgRGVvMnhdF322vdMots=";
+    sha256 = "sha256-frZzd+IV4IxfPK44PWOgV9yPRPoUB3smPbxoDchbaSc=";
   };
 
   buildInputs = [

pkgs/build-support/go/module.nix

@@ -83,12 +83,16 @@ let
     inherit (args) src;
     inherit (go) GOOS GOARCH;
 
+    # The following inheritence behavior is not trivial to expect, and some may
+    # argue it's not ideal. Changing it may break vendor hashes in Nixpkgs and
+    # out in the wild. In anycase, it's documented in:
+    # doc/languages-frameworks/go.section.md
     prePatch = args.prePatch or "";
     patches = args.patches or [];
     patchFlags = args.patchFlags or [];
     postPatch = args.postPatch or "";
     preBuild = args.preBuild or "";
-    postBuild = args.postBuild or "";
+    postBuild = args.modPostBuild or "";
     sourceRoot = args.sourceRoot or "";
 
     GO111MODULE = "on";

pkgs/data/fonts/maple-font/default.nix

@@ -9,7 +9,7 @@ let
     rec{
 
       inherit pname desc;
-      version = "6.2";
+      version = "6.3";
       src = fetchurl {
         url = "https://github.com/subframe7536/Maple-font/releases/download/v${version}/${pname}.zip";
         inherit sha256;
@@ -21,6 +21,8 @@ let
       nativeBuildInputs = [ unzip ];
       installPhase = ''
         find . -name '*.ttf'    -exec install -Dt $out/share/fonts/truetype {} \;
+        find . -name '*.otf'    -exec install -Dt $out/share/fonts/opentype {} \;
+        find . -name '*.woff2'  -exec install -Dt $out/share/fonts/woff2 {} \;
       '';
 
       meta = with lib; {
@@ -38,22 +40,33 @@ in
 {
   Mono = maple-font {
     pname = "MapleMono";
-    sha256 = "sha256-KhG0gQRnHFvpoxdcySSEYWDtOgG4xIm8X0Ua9o1aGTw=";
+    sha256 = "sha256-Ap4OwP/QGFz9+xn12rekia1/pwRxZvv+H+ZmZiXcxcY=";
     desc = "monospace";
   };
 
   NF = maple-font {
     pname = "MapleMono-NF";
-    sha256 = "sha256-Ov6AEaLy80cwrFtmKWUceI809SwBlHsQf2F86/sc/6A=";
+    sha256 = "sha256-WZHFQRG+81TF5YgOT249c8VA8vAvYowiQx/pqsDuJ4o=";
     desc = "Nerd Font";
   };
 
   SC-NF = maple-font {
     pname = "MapleMono-SC-NF";
-    sha256 = "sha256-bb62YGzdE9qvlyuZG7YI16gOxWC+AijlRLY8ET+q5Rg=";
+    sha256 = "sha256-26odkmMljEwstRywDYJ7Dst5pfOXrtQTcrFFxbRwHcA=";
     desc = "Nerd Font SC";
   };
 
+  opentype = maple-font {
+    pname = "MapleMono-otf";
+    sha256 = "sha256-u2IuymjiosoSbdIW7h2QalagTI+eDMRSuhLgXy5RdRA=";
+    desc = "OpenType";
+  };
+
+  woff2 = maple-font {
+    pname = "MapleMono-woff2";
+    sha256 = "sha256-iv6Q/aYMlAkhaem8tFWAzqc9mVgWQXghBzcHJz1dg/Y=";
+    desc = "WOFF2.0";
+  };
 }
 
 

pkgs/data/themes/catppuccin-kde/default.nix

@@ -1,24 +1,47 @@
 { lib
 , stdenvNoCC
 , fetchFromGitHub
+, flavour ? [ "frappe" ]
+, accents ? [ "blue" ]
+, winDecStyles ? [ "modern" ]
 }:
 
+let
+  validFlavours = [ "mocha" "macchiato" "frappe" "latte" ];
+  validAccents = [ "rosewater" "flamingo" "pink" "mauve" "red" "maroon" "peach" "yellow" "green" "teal" "sky" "sapphire" "blue" "lavender" ];
+  validWinDecStyles = [ "modern" "classic" ];
+
+  installScript = ./install.sh;
+in
+
+  lib.checkListOfEnum "Invalid accent, valid accents are ${toString validAccents}" validAccents accents
+  lib.checkListOfEnum "Invalid flavour, valid flavours are ${toString validFlavours}" validFlavours flavour
+  lib.checkListOfEnum "Invalid window decoration style, valid styles are ${toString validWinDecStyles}" validWinDecStyles winDecStyles
+
 stdenvNoCC.mkDerivation rec {
   pname = "kde";
-  version = "unstable-2022-11-26";
+  version = "0.2.2";
 
   src = fetchFromGitHub {
     owner = "catppuccin";
     repo = pname;
-    rev = "249df3ec0cdae79af379f4a10b802c50feac89ba";
-    hash = "sha256-CH9GJnFqqdyIzW7VfGb3oB1YPULEZsfK3d1eyFALwKc=";
+    rev = "v${version}";
+    hash = "sha256-P5mLLaQzMhG6aHvAj9SizUFQFLjqNKj1T1kQ4dgiacI=";
   };
 
   installPhase = ''
-    mkdir -p $out/share/{plasma/look-and-feel,color-schemes}
-    find . -type f -name "Catppuccin*.colors" -exec cp "{}" $out/share/color-schemes \;
-    find . -type f -name "*.tar.gz" -exec tar -xzf "{}" \;
-    cp -R Catppuccin-* $out/share/plasma/look-and-feel
+    runHook preInstall
+
+    patchShebangs .
+    for WINDECSTYLE in ${toString winDecStyles}; do
+      for FLAVOUR in ${toString flavour}; do
+        for ACCENT in ${toString accents}; do
+          FLAVOUR=$FLAVOUR ACCENT=$ACCENT WINDECSTYLE=$WINDECSTYLE bash ${installScript}
+        done;
+      done;
+    done;
+
+    runHook postInstall
   '';
 
   meta = with lib; {

pkgs/data/themes/catppuccin-kde/install.sh

@@ -0,0 +1,263 @@
+COLORDIR=$out/share/color-schemes
+AURORAEDIR=$out/share/aurorae/themes
+LOOKANDFEELDIR=$out/share/plasma/look-and-feel
+DESKTOPTHEMEDIR=$out/share/plasma/desktoptheme
+
+FLAVOUR=${FLAVOUR^}
+ACCENT=${ACCENT^}
+WINDECSTYLE=${WINDECSTYLE^}
+
+echo "Creating theme directories.."
+mkdir -p $COLORDIR
+mkdir -p $AURORAEDIR
+mkdir -p $LOOKANDFEELDIR
+mkdir -p $DESKTOPTHEMEDIR
+mkdir ./dist
+
+# Sets accent based on the pallet selected (Best to fold this in your respective editor)
+if [[ $ACCENT == "Rosewater" ]]; then
+    if [[ $FLAVOUR == "Mocha" ]]; then
+        ACCENTCOLOR=#f5e0dc
+    elif [[ $FLAVOUR == "Macchiato" ]]; then
+        ACCENTCOLOR=#f4dbd6
+    elif [[ $FLAVOUR == "Frappe" ]]; then
+        ACCENTCOLOR=#f2d5cf
+    elif [[ $FLAVOUR == "Latte" ]]; then
+        ACCENTCOLOR=#dc8a78
+    fi
+    echo "Accent Rosewater(1) was selected!"
+elif [[ $ACCENT == "Flamingo" ]]; then
+    if [[ $FLAVOUR == "Mocha" ]]; then
+        ACCENTCOLOR=#f2cdcd
+    elif [[ $FLAVOUR == "Macchiato" ]]; then
+        ACCENTCOLOR=#f0c6c6
+    elif [[ $FLAVOUR == "Frappe" ]]; then
+        ACCENTCOLOR=#eebebe
+    elif [[ $FLAVOUR == "Latte" ]]; then
+        ACCENTCOLOR=#dd7878
+    fi
+    echo "Accent Flamingo(2) was selected!"
+    ACCENT="2"
+elif [[ $ACCENT == "Pink" ]]; then
+    if [[ $FLAVOUR == "Mocha" ]]; then
+        ACCENTCOLOR=#f5c2e7
+    elif [[ $FLAVOUR == "Macchiato" ]]; then
+        ACCENTCOLOR=#f5bde6
+    elif [[ $FLAVOUR == "Frappe" ]]; then
+        ACCENTCOLOR=#f4b8e4
+    elif [[ $FLAVOUR == "Latte" ]]; then
+        ACCENTCOLOR=#ea76cb
+    fi
+    echo "Accent Pink(3) was selected!"
+elif [[ $ACCENT == "Mauve" ]]; then
+    if [[ $FLAVOUR == "Mocha" ]]; then
+        ACCENTCOLOR=#cba6f7
+    elif [[ $FLAVOUR == "Macchiato" ]]; then
+        ACCENTCOLOR=#c6a0f6
+    elif [[ $FLAVOUR == "Frappe" ]]; then
+        ACCENTCOLOR=#ca9ee6
+    elif [[ $FLAVOUR == "Latte" ]]; then
+        ACCENTCOLOR=#8839ef
+    fi
+    echo "Accent Mauve(4) was selected!"
+elif [[ $ACCENT == "Red" ]]; then
+    if [[ $FLAVOUR == "Mocha" ]]; then
+        ACCENTCOLOR=#f38ba8
+    elif [[ $FLAVOUR == "Macchiato" ]]; then
+        ACCENTCOLOR=#ed8796
+    elif [[ $FLAVOUR == "Frappe" ]]; then
+        ACCENTCOLOR=#e78284
+    elif [[ $FLAVOUR == "Latte" ]]; then
+        ACCENTCOLOR=#d20f39
+    fi
+    echo "Accent Red(5) was selected!"
+elif [[ $ACCENT == "Maroon" ]]; then
+    if [[ $FLAVOUR == "Mocha" ]]; then
+        ACCENTCOLOR=#eba0ac
+    elif [[ $FLAVOUR == "Macchiato" ]]; then
+        ACCENTCOLOR=#ee99a0
+    elif [[ $FLAVOUR == "Frappe" ]]; then
+        ACCENTCOLOR=#ea999c
+    elif [[ $FLAVOUR == "Latte" ]]; then
+        ACCENTCOLOR=#e64553
+    fi
+    echo "Accent Maroon(6) was selected!"
+elif [[ $ACCENT == "Peach" ]]; then
+    if [[ $FLAVOUR == "Mocha" ]]; then
+        ACCENTCOLOR=#fab387
+    elif [[ $FLAVOUR == "Macchiato" ]]; then
+        ACCENTCOLOR=#f5a97f
+    elif [[ $FLAVOUR == "Frappe" ]]; then
+        ACCENTCOLOR=#ef9f76
+    elif [[ $FLAVOUR == "Latte" ]]; then
+        ACCENTCOLOR=#fe640b
+    fi
+    echo "Accent Peach(7) was selected!"
+elif [[ $ACCENT == "Yellow" ]]; then
+    if [[ $FLAVOUR == "Mocha" ]]; then
+        ACCENTCOLOR=#f9e2af
+    elif [[ $FLAVOUR == "Macchiato" ]]; then
+        ACCENTCOLOR=#eed49f
+    elif [[ $FLAVOUR == "Frappe" ]]; then
+        ACCENTCOLOR=#e5c890
+    elif [[ $FLAVOUR == "Latte" ]]; then
+        ACCENTCOLOR=#df8e1d
+    fi
+    echo "Accent Yellow(8) was selected!"
+elif [[ $ACCENT == "Green" ]]; then
+    if [[ $FLAVOUR == "Mocha" ]]; then
+        ACCENTCOLOR=#a6e3a1
+    elif [[ $FLAVOUR == "Macchiato" ]]; then
+        ACCENTCOLOR=#a6da95
+    elif [[ $FLAVOUR == "Frappe" ]]; then
+        ACCENTCOLOR=#a6d189
+    elif [[ $FLAVOUR == "Latte" ]]; then
+        ACCENTCOLOR=#40a02b
+    fi
+    echo "Accent Green(9) was selected!"
+elif [[ $ACCENT == "Teal" ]]; then
+    if [[ $FLAVOUR == "Mocha" ]]; then
+        ACCENTCOLOR=#94e2d5
+    elif [[ $FLAVOUR == "Macchiato" ]]; then
+        ACCENTCOLOR=#8bd5ca
+    elif [[ $FLAVOUR == "Frappe" ]]; then
+        ACCENTCOLOR=#81c8be
+    elif [[ $FLAVOUR == "Latte" ]]; then
+        ACCENTCOLOR=#179299
+    fi
+    echo "Accent Teal(10) was selected!"
+elif [[ $ACCENT == "Sky" ]]; then
+    if [[ $FLAVOUR == "Mocha" ]]; then
+        ACCENTCOLOR=#89dceb
+    elif [[ $FLAVOUR == "Macchiato" ]]; then
+        ACCENTCOLOR=#91d7e3
+    elif [[ $FLAVOUR == "Frappe" ]]; then
+        ACCENTCOLOR=#99d1db
+    elif [[ $FLAVOUR == "Latte" ]]; then
+        ACCENTCOLOR=#04a5e5
+    fi
+    echo "Accent Sky(11) was selected!"
+elif [[ $ACCENT == "Sapphire" ]]; then
+    if [[ $FLAVOUR == "Mocha" ]]; then
+        ACCENTCOLOR=#74c7ec
+    elif [[ $FLAVOUR == "Macchiato" ]]; then
+        ACCENTCOLOR=#7dc4e4
+    elif [[ $FLAVOUR == "Frappe" ]]; then
+        ACCENTCOLOR=#85c1dc
+    elif [[ $FLAVOUR == "Latte" ]]; then
+        ACCENTCOLOR=#209fb5
+    fi
+    echo "Accent Sapphire(12) was selected!"
+elif [[ $ACCENT == "Blue" ]]; then
+    if [[ $FLAVOUR == "Mocha" ]]; then
+        ACCENTCOLOR=#89b4fa
+    elif [[ $FLAVOUR == "Macchiato" ]]; then
+        ACCENTCOLOR=#8aadf4
+    elif [[ $FLAVOUR == "Frappe" ]]; then
+        ACCENTCOLOR=#8caaee
+    elif [[ $FLAVOUR == "Latte" ]]; then
+        ACCENTCOLOR=#1e66f5
+    fi
+    echo "Accent Blue(13) was selected!"
+elif [[ $ACCENT == "Lavender" ]]; then
+    if [[ $FLAVOUR == "Mocha" ]]; then
+        ACCENTCOLOR=#b4befe
+    elif [[ $FLAVOUR == "Macchiato" ]]; then
+        ACCENTCOLOR=#b7bdf8
+    elif [[ $FLAVOUR == "Frappe" ]]; then
+        ACCENTCOLOR=#babbf1
+    elif [[ $FLAVOUR == "Latte" ]]; then
+        ACCENTCOLOR=#7287fd
+    fi
+    echo "Accent Lavender(14) was selected!"
+else echo "Not a valid accent" && exit
+fi
+
+if [[ $WINDECSTYLE == "Modern" ]]; then
+    WINDECSTYLECODE=__aurorae__svg__Catppuccin$FLAVOUR-Modern
+elif [[ $WINDECSTYLE == "Classic" ]]; then
+    WINDECSTYLECODE=__aurorae__svg__Catppuccin$FLAVOUR-Classic
+fi
+
+function ModifyLightlyPlasma {
+
+    rm -rf $DESKTOPTHEMEDIR/lightly-plasma-git/icons/*
+    rm -rf $DESKTOPTHEMEDIR/lightly-plasma-git/translucent
+    rm $DESKTOPTHEMEDIR/lightly-plasma-git/widgets/tabbar.svgz
+    rm $DESKTOPTHEMEDIR/lightly-plasma-git/dialogs/background.svgz
+
+    # Copy Patches
+    cp $DESKTOPTHEMEDIR/lightly-plasma-git/solid/* $DESKTOPTHEMEDIR/lightly-plasma-git -Rf
+    cp ./Patches/glowbar.svg $DESKTOPTHEMEDIR/lightly-plasma-git/widgets -rf
+    cp ./Patches/background.svg $DESKTOPTHEMEDIR/lightly-plasma-git/widgets -rf
+    cp ./Patches/panel-background.svgz $DESKTOPTHEMEDIR/lightly-plasma-git/widgets
+
+    # Modify description to state that it has been modified by the KDE Catppuccin Installer
+    sed -e s/A\ plasma\ style\ with\ close\ to\ the\ look\ of\ the\ newest\ Lightly./*MODIFIED\ BY\ CATPPUCCIN\ KDE\ INSTALLER*\ A\ plasma\ style\ with\ close\ to\ the\ look\ of\ the\ newest\ Lightly./g $DESKTOPTHEMEDIR/lightly-plasma-git/metadata.desktop >> $DESKTOPTHEMEDIR/lightly-plasma-git/newMetadata.desktop
+    cp -f $DESKTOPTHEMEDIR/metadata.desktop $DESKTOPTHEMEDIR/lightly-plasma-git/metadata.desktop && rm $DESKTOPTHEMEDIR/metadata.desktop
+}
+
+function AuroraeInstall {
+    if [[ $WINDECSTYLE == "Modern" ]]; then
+        cp ./Resources/aurorae/Catppuccin$FLAVOUR-Modern $AURORAEDIR -r;
+    elif [[ $WINDECSTYLE == "Classic" ]]; then
+        cp ./Resources/aurorae/Catppuccin$FLAVOUR-Classic $AURORAEDIR -r;
+    fi
+}
+
+function BuildColorscheme {
+    # Add Metadata & Replace Accent in colors file
+    sed -e s/--accentColor/$ACCENTCOLOR/g -e s/--flavour/$FLAVOUR/g -e s/--accentName/$ACCENT/g ./Resources/base.colors > ./dist/base.colors
+    # Hydrate Metadata with Pallet + Accent Info
+    sed -e s/--accentName/$ACCENT/g -e s/--flavour/$FLAVOUR/g ./Resources/metadata.desktop > ./dist/Catppuccin-$FLAVOUR-$ACCENT/metadata.desktop
+    # Modify 'defaults' to set the correct Aurorae Theme
+    sed -e s/--accentName/$ACCENT/g -e s/--flavour/$FLAVOUR/g -e s/--aurorae/$WINDECSTYLECODE/g ./Resources/defaults > ./dist/Catppuccin-$FLAVOUR-$ACCENT/contents/defaults
+    # Hydrate Dummy colors according to Pallet
+    FLAVOURNAME=$FLAVOUR ACCENTNAME=$ACCENT ./Installer/color-build.sh -o ./dist/Catppuccin$FLAVOUR$ACCENT.colors -s ./dist/base.colors
+}
+
+function BuildSplashScreen {
+    # Hydrate Dummy colors according to Pallet
+    FLAVOURNAME=$FLAVOUR ./Installer/color-build.sh -s ./Resources/splash/images/busywidget.svg -o ./dist/$GLOBALTHEMENAME/contents/splash/images/_busywidget.svg
+    # Replace Accent in colors file
+    sed ./dist/$GLOBALTHEMENAME/contents/splash/images/_busywidget.svg -e s/REPLACE--ACCENT/$ACCENTCOLOR/g > ./dist/$GLOBALTHEMENAME/contents/splash/images/busywidget.svg
+    # Cleanup temporary file
+    rm ./dist/$GLOBALTHEMENAME/contents/splash/images/_busywidget.svg
+    # Hydrate Dummy colors according to Pallet (QML file)
+    FLAVOURNAME=$FLAVOUR ./Installer/color-build.sh -s ./Resources/splash/Splash.qml -o ./dist/$GLOBALTHEMENAME/contents/splash/Splash.qml
+    # Add CTP Logo
+    # TODO: Switch between latte & mocha logo based on Pallet
+    cp ./Resources/splash/images/Logo.png ./dist/$GLOBALTHEMENAME/contents/splash/images
+}
+
+# Prepare Global Theme Folder
+GLOBALTHEMENAME="Catppuccin-$FLAVOUR-$ACCENT"
+cp -r ./Resources/Catppuccin-$FLAVOUR-Global ./dist/$GLOBALTHEMENAME
+mkdir -p ./dist/$GLOBALTHEMENAME/contents/splash/images
+
+# Build SplashScreen
+echo "Building SplashScreen.."
+BuildSplashScreen
+
+# Build Colorscheme
+echo "Building Colorscheme.."
+# Generate Color scheme
+BuildColorscheme
+
+# Install Colorscheme
+echo "Installing Colorscheme.."
+mv ./dist/Catppuccin$FLAVOUR$ACCENT.colors $COLORDIR
+
+# Install Global Theme.
+echo "Installing Global Theme.."
+cp -r ./dist/$GLOBALTHEMENAME $LOOKANDFEELDIR
+
+# echo "Modifying lightly plasma theme.."
+# ModifyLightlyPlasma
+
+echo "Installing aurorae theme.."
+AuroraeInstall
+
+# Cleanup
+echo "Cleaning up.."
+rm -rf ./dist

pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix

@@ -0,0 +1,97 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, qmake
+, pkg-config
+, qttools
+, wrapQtAppsHook
+, dtkwidget
+, qt5integration
+, dde-qt-dbus-factory
+, dde-dock
+, qtbase
+, qtmultimedia
+, qtx11extras
+, image-editor
+, gsettings-qt
+, xorg
+, libusb1
+, libv4l
+, ffmpeg
+, ffmpegthumbnailer
+, portaudio
+, kwayland
+, udev
+, gst_all_1
+}:
+stdenv.mkDerivation rec {
+  pname = "deepin-screen-recorder";
+  version = "5.11.23";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-yKBF/MmhlgwO5GLwfGgs13ERuzOg8EYjc3bXZ8TvcBU=";
+  };
+
+  patches = [ ./dont_use_libPath.diff ];
+
+  postPatch = ''
+    substituteInPlace screen_shot_recorder.pro deepin-screen-recorder.desktop \
+      src/{src.pro,pin_screenshots/pin_screenshots.pro} \
+      src/dde-dock-plugins/{shotstart/shotstart.pro,recordtime/recordtime.pro} \
+      assets/com.deepin.Screenshot.service \
+     --replace "/usr" "$out"
+  '';
+
+  nativeBuildInputs = [
+    qmake
+    pkg-config
+    qttools
+    wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    dtkwidget
+    dde-qt-dbus-factory
+    dde-dock
+    qtbase
+    qtmultimedia
+    qtx11extras
+    image-editor
+    gsettings-qt
+    xorg.libXdmcp
+    xorg.libXtst
+    xorg.libXcursor
+    libusb1
+    libv4l
+    ffmpeg
+    ffmpegthumbnailer
+    portaudio
+    kwayland
+    udev
+  ] ++ (with gst_all_1; [
+    gstreamer
+    gst-plugins-base
+    gst-plugins-good
+  ]);
+
+  # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
+  qtWrapperArgs = [
+    "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
+    "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev gst_all_1.gstreamer ]}"
+  ];
+
+  preFixup = ''
+    qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
+  '';
+
+  meta = with lib; {
+    description = "Screen recorder application for dde";
+    homepage = "https://github.com/linuxdeepin/deepin-screen-recorder";
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = teams.deepin.members;
+  };
+}

pkgs/desktops/deepin/apps/deepin-screen-recorder/dont_use_libPath.diff

@@ -0,0 +1,36 @@
+diff --git a/src/gstrecord/gstinterface.cpp b/src/gstrecord/gstinterface.cpp
+index b269b01..c075295 100644
+--- a/src/gstrecord/gstinterface.cpp
++++ b/src/gstrecord/gstinterface.cpp
+@@ -48,6 +48,7 @@ gstInterface::gstInterface()
+ }
+ QString gstInterface::libPath(const QString &sLib)
+ {
++    return sLib;
+     qInfo() << "gstreamer lib name is " << sLib;
+     QDir dir;
+     QString path  = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
+diff --git a/src/main_window.cpp b/src/main_window.cpp
+index 7bfc78e..dcbbc2f 100755
+--- a/src/main_window.cpp
++++ b/src/main_window.cpp
+@@ -585,6 +585,7 @@ void MainWindow::initDynamicLibPath()
+ }
+ QString MainWindow::libPath(const QString &strlib)
+ {
++    return strlib;
+     QDir  dir;
+     QString path  = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
+     dir.setPath(path);
+diff --git a/src/waylandrecord/avlibinterface.cpp b/src/waylandrecord/avlibinterface.cpp
+index d7942d6..c5cfdf4 100644
+--- a/src/waylandrecord/avlibinterface.cpp
++++ b/src/waylandrecord/avlibinterface.cpp
+@@ -105,6 +105,7 @@ avlibInterface::avlibInterface()
+ 
+ QString avlibInterface::libPath(const QString &sLib)
+ {
++    return sLib;
+     //qDebug() << sLib;
+     QDir dir;
+     QString path  = QLibraryInfo::location(QLibraryInfo::LibrariesPath);

pkgs/desktops/deepin/default.nix

@@ -48,6 +48,7 @@ let
     deepin-movie-reborn = callPackage ./apps/deepin-movie-reborn { };
     deepin-music = callPackage ./apps/deepin-music { };
     deepin-picker = callPackage ./apps/deepin-picker { };
+    deepin-screen-recorder = callPackage ./apps/deepin-screen-recorder { };
     deepin-shortcut-viewer = callPackage ./apps/deepin-shortcut-viewer { };
     deepin-system-monitor = callPackage ./apps/deepin-system-monitor { };
     deepin-terminal = callPackage ./apps/deepin-terminal { };

pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix

@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wingpanel-indicator-ayatana";
-  version = "unstable-2021-12-18";
+  version = "unstable-2023-04-18";
 
   src = fetchFromGitHub {
     owner = "Lafydev";
     repo = pname;
-    rev = "5749f753ca64ce58232a46b9045949b3f8219827";
-    sha256 = "sha256-kuEVw62IDTyC3hRRcWv2RihPOohGqEt8YLr44SurwPM=";
+    rev = "d554663b4e199d44c1f1d53b5cc39b9a775b3f1c";
+    sha256 = "sha256-dEk0exLh+TGuQt7be2YRTS2EzPD55+edR8WibthXwhI=";
   };
 
   patches = [

pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin/default.nix

@@ -1,14 +1,29 @@
-{ lib, mkXfceDerivation, gtk3, libxfce4ui, libxfce4util, xfce4-panel, xfconf }:
+{ lib
+, mkXfceDerivation
+, glib
+, gtk3
+, libxfce4ui
+, libxfce4util
+, xfce4-panel
+, xfconf
+}:
 
 mkXfceDerivation {
   category = "panel-plugins";
   pname = "xfce4-battery-plugin";
-  version = "1.1.4";
+  version = "1.1.5";
   rev-prefix = "xfce4-battery-plugin-";
   odd-unstable = false;
-  sha256 = "sha256-LwwlyWhtVM+OHR9KtE4DPyU5V/dMOjcgSjsI3o7qfk8=";
+  sha256 = "sha256-X5EGDZaPZdTxiLXyeLwnMx97P6wPy+H09hi9+OFYyY0=";
 
-  buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ];
+  buildInputs = [
+    glib
+    gtk3
+    libxfce4ui
+    libxfce4util
+    xfce4-panel
+    xfconf
+  ];
 
   meta = with lib; {
     description = "Battery plugin for Xfce panel";

pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix

@@ -7,6 +7,7 @@
 , xfce4-panel
 , libxfce4ui
 , xfconf
+, glib
 , gtk3
 , gitUpdater
 }:
@@ -14,12 +15,12 @@
 let
   category = "panel-plugins";
 in stdenv.mkDerivation rec {
-  pname  = "xfce4-fsguard-plugin";
-  version = "1.1.2";
+  pname = "xfce4-fsguard-plugin";
+  version = "1.1.3";
 
   src = fetchurl {
     url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-Z9jmohmnEXxZaTrbxZw5puujHj8YpUmRie9O8otVQQU=";
+    sha256 = "sha256-hO+LtHUiktZMDvEBut97FESHkL+gqF3mRNv6Iphuwlg=";
   };
 
   nativeBuildInputs = [
@@ -32,6 +33,7 @@ in stdenv.mkDerivation rec {
     libxfce4ui
     xfce4-panel
     xfconf
+    glib
     gtk3
   ];
 

pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix

@@ -1,17 +1,30 @@
-{ lib, stdenv, fetchurl, pkg-config, intltool, xfce4-panel, libxfce4ui,
-  exo, gnutls, libgcrypt, gitUpdater }:
+{ lib
+, stdenv
+, fetchurl
+, pkg-config
+, intltool
+, xfce4-panel
+, libxfce4ui
+, libxfce4util
+, exo
+, glib
+, gtk3
+, gnutls
+, libgcrypt
+, gitUpdater
+}:
 
 let
   category = "panel-plugins";
 in
 
 stdenv.mkDerivation rec {
-  pname  = "xfce4-mailwatch-plugin";
-  version = "1.3.0";
+  pname = "xfce4-mailwatch-plugin";
+  version = "1.3.1";
 
   src = fetchurl {
     url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-IPkevv0ogLJ/Qh93MRWzdA9n3iv2D+rOOEG/0aCcvi4=";
+    sha256 = "sha256-BUlk6f5MpmhIZACZHOHqAdB6rHuiNfSxTUqPfZgABGo=";
   };
 
   nativeBuildInputs = [
@@ -21,8 +34,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     libxfce4ui
+    libxfce4util
     xfce4-panel
     exo
+    glib
+    gtk3
     gnutls
     libgcrypt
   ];

pkgs/development/libraries/level-zero/default.nix

@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "level-zero";
-  version = "1.9.9";
+  version = "1.10.0";
 
   src = fetchFromGitHub {
     owner = "oneapi-src";
     repo = "level-zero";
     rev = "refs/tags/v${version}";
-    hash = "sha256-zzlecBk7Mi3Nhj4eIAp81pq7+lIiKpvEaNeXuJKDPII=";
+    hash = "sha256-4eDLtlVhJW3SCvDlVWcvAImiHoW02IgLfZ57gocexEQ=";
   };
 
   nativeBuildInputs = [ cmake addOpenGLRunpath ];

pkgs/development/python-modules/django-redis/default.nix

@@ -1,5 +1,6 @@
 { lib
 , fetchFromGitHub
+, pythonAtLeast
 , pythonOlder
 , buildPythonPackage
 
@@ -66,6 +67,11 @@ buildPythonPackage {
     pytestCheckHook
   ];
 
+  pytestFlagsArray = lib.optionals (pythonAtLeast "3.11") [
+    # DeprecationWarning: 'cgi' is deprecated and slated for removal in Python 3.13
+    "-W" "ignore::DeprecationWarning"
+  ];
+
   disabledTests = [
     # ModuleNotFoundError: No module named 'test_cache_options'
     "test_custom_key_function"

pkgs/development/python-modules/google-cloud-bigquery/default.nix

@@ -28,14 +28,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-bigquery";
-  version = "3.9.0";
+  version = "3.10.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ObBVCHqEcbDrq3pL9U3s2oRbYIexBO8L4HjO0eHcyyY=";
+    hash = "sha256-SwLe8Hbi24zsZvZftifROQSp/Dz0/uMV7eQ9y3A4qN8=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/opencontainers/default.nix

@@ -0,0 +1,42 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "opencontainers";
+  version = "0.0.14";
+  format = "setuptools";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-/eO4CZtWtclWQV34kz4iJ+GRToBaJ3uETy+eUjQXOPI=";
+  };
+
+  postPatch = ''
+    sed -i "/pytest-runner/d" setup.py
+  '';
+
+  passthru.optional-dependencies.reggie = [
+    requests
+  ];
+
+  pythonImportsCheck = [
+    "opencontainers"
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ] ++ passthru.optional-dependencies.reggie;
+
+  __darwinAllowLocalNetworking = true;
+
+  meta = with lib; {
+    description = "Python module for oci specifications";
+    homepage = "https://github.com/vsoch/oci-python";
+    license = licenses.mpl20;
+    maintainers = with maintainers; [ hexa ];
+  };
+}

pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pysigma-backend-elasticsearch";
-  version = "1.0.1";
+  version = "1.0.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -19,9 +19,14 @@ buildPythonPackage rec {
     owner = "SigmaHQ";
     repo = "pySigma-backend-elasticsearch";
     rev = "refs/tags/v${version}";
-    hash = "sha256-7uaU4CYLqylVWsHPvQXQe5cATV6O5OgzkHQwbJhqkPo=";
+    hash = "sha256-NjMfJgM8YaJiQp8rucR099y4ZFG98XnxK1KZlnZb+MI=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace " --cov=sigma --cov-report term --cov-report xml:cov.xml" ""
+  '';
+
   nativeBuildInputs = [
     poetry-core
   ];

pkgs/development/python-modules/pysigma-backend-opensearch/default.nix

@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pysigma-backend-opensearch";
-  version = "0.1.6";
+  version = "1.0.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -20,9 +20,14 @@ buildPythonPackage rec {
     owner = "SigmaHQ";
     repo = "pySigma-backend-opensearch";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Vn0H6yDHo0zzAx9CtKCYmXxpWRd2g1Y2GZWkpPFvihs=";
+    hash = "sha256-erqKAtTNMQQy/zUkpOd0LoQT2MY2mgz5yGuSQJ0QTjI=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace " --cov=sigma --cov-report term --cov-report xml:cov.xml" ""
+  '';
+
   nativeBuildInputs = [
     poetry-core
   ];

pkgs/development/python-modules/sentry-sdk/default.nix

@@ -40,7 +40,7 @@
 
 buildPythonPackage rec {
   pname = "sentry-sdk";
-  version = "1.18.0";
+  version = "1.20.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -49,7 +49,7 @@ buildPythonPackage rec {
     owner = "getsentry";
     repo = "sentry-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-4HOJ6ouUU6RqtxYOsnoojT4aQ/h8YzcLHTO8lFZecZw=";
+    hash = "sha256-fAlEh3S95Dyw1xHK2XaqbA6xUsASXbhzELGZTH/G+kg=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/unittest-xml-reporting/default.nix

@@ -2,6 +2,7 @@
 , fetchFromGitHub
 , buildPythonPackage
 , lxml
+, pythonAtLeast
 , pythonOlder
 , pytestCheckHook
 }:
@@ -26,6 +27,12 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  pytestFlagsArray = lib.optionals (pythonAtLeast "3.11") [
+    # AttributeError: 'tuple' object has no attribute 'shortDescription'
+    "--deselect=tests/testsuite.py::XMLTestRunnerTestCase::test_basic_unittest_constructs"
+    "--deselect=tests/testsuite.py::XMLTestRunnerTestCase::test_unexpected_success"
+  ];
+
   pythonImportsCheck = [ "xmlrunner" ];
 
   meta = with lib; {

pkgs/development/tools/database/sqlfluff/default.nix

@@ -5,14 +5,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "sqlfluff";
-  version = "2.0.5";
+  version = "2.0.7";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-tv5f298MQepGuLPeqe4/7LtVZ77WjTOOZVEvde8ZbZQ=";
+    hash = "sha256-FXSGG13/Al8QVFy55f91+ZyQKeZA4wFGd06kIj6NjaI=";
   };
 
   propagatedBuildInputs = with python3.pkgs; [

pkgs/development/tools/language-servers/helm-ls/default.nix

@@ -0,0 +1,51 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, installShellFiles
+, testers
+, helm-ls
+}:
+
+buildGoModule rec {
+  pname = "helm-ls";
+  version = "0.0.3";
+
+  src = fetchFromGitHub {
+    owner = "mrjosh";
+    repo = "helm-ls";
+    rev = "v${version}";
+    hash = "sha256-MiDbV+mfr1wcc0e0iwFPL8WniWKbPnr4zb79qniT2Kc=";
+  };
+
+  vendorHash = "sha256-EqZlmOoQtC3Iuf0LG2PL0K2pluGqbyA6132lzgF4+ic=";
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.Version=${version}"
+  ];
+
+  postInstall = ''
+    mv $out/bin/helm-ls $out/bin/helm_ls
+    installShellCompletion --cmd roxctl \
+      --bash <($out/bin/helm_ls completion bash) \
+      --fish <($out/bin/helm_ls completion fish) \
+      --zsh <($out/bin/helm_ls completion zsh)
+  '';
+
+  passthru.tests.version = testers.testVersion {
+    package = helm-ls;
+    command = "helm_ls version";
+  };
+
+  meta = with lib; {
+    description = "Language server for Helm";
+    changelog = "https://github.com/mrjosh/helm-ls/releases/tag/v${version}";
+    homepage = "https://github.com/mrjosh/helm-ls";
+    license = licenses.mit;
+    maintainers = with maintainers; [ stehessel ];
+    mainProgram = "helm_ls";
+  };
+}

pkgs/development/tools/misc/clojure-lsp/default.nix

@@ -2,18 +2,18 @@
 
 buildGraalvmNativeImage rec {
   pname = "clojure-lsp";
-  version = "2023.02.27-13.12.12";
+  version = "2023.04.19-12.43.29";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = version;
-    sha256 = "sha256-QyXmjszXBBUFOAZTNgUYIWWv2v7v/QbsAglRjF0Frfo=";
+    sha256 = "sha256-Y3zBkNp8rTQY8yjSeZDIKHgpMEDLe3XBlEWeuc5H3mk=";
   };
 
   jar = fetchurl {
     url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar";
-    sha256 = "828339a66ad23692c71ca62a720ac036e4acdef90769a2cce588e89ed8ea9c36";
+    sha256 = "df6b582a39183c271a8d00ddf4e3cf020b9e872e6fad2c13bf7de46e940ff4d6";
   };
 
   extraNativeImageBuildArgs = [

pkgs/development/tools/pscale/default.nix

@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "pscale";
-  version = "0.134.0";
+  version = "0.138.0";
 
   src = fetchFromGitHub {
     owner = "planetscale";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "sha256-t9gTAtmBCoESotNO6vcaDcYEVIwHoZfN55MrWNaN3R8=";
+    sha256 = "sha256-MoZN1zvOdRoVSEemH+h64k7kID2g0KyHHXWhr2wc914=";
   };
 
-  vendorHash = "sha256-z/YjBpLw1tW0NJvIeQImYPxz4uDT59fxQW3+AYMBsVk=";
+  vendorHash = "sha256-kgLSUC+koGLfbxvwwsHzJXzL+4xrtZsraoKDLzGzrEA=";
 
   ldflags = [
     "-s" "-w"

pkgs/development/tools/steamos-devkit/default.nix

@@ -57,14 +57,14 @@ let
 in
 python3.pkgs.buildPythonPackage rec {
   pname = "steamos-devkit";
-  version = "0.20221101";
+  version = "0.20230411.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.steamos.cloud";
     owner = "devkit";
     repo = "steamos-devkit";
     rev = "v${version}";
-    sha256 = "sha256-VKnfcMF3WxkvqxlhJF+5j4Hso/TZpSS4dMOmSrWagRU=";
+    sha256 = "sha256-DQIyjEpUFnC0OjMjKMrGYs4+HoEDfcSc3m3rfXLPyZ0=";
   };
 
   propagatedBuildInputs = with python3.pkgs; [

pkgs/shells/zsh/zsh-fzf-tab/default.nix

@@ -4,13 +4,13 @@ let
   INSTALL_PATH="${placeholder "out"}/share/fzf-tab";
 in stdenv.mkDerivation rec {
   pname = "zsh-fzf-tab";
-  version = "unstable-2022-12-08";
+  version = "unstable-2023-05-19";
 
   src = fetchFromGitHub {
     owner = "Aloxaf";
     repo = "fzf-tab";
-    rev = "ffb7b776be492333b94cf0be87456b62a1f26e2f";
-    sha256 = "bIlnYKjjOC6h5/Gg7xBg+i2TBk+h82wmHgAJPhzMsek=";
+    rev = "5a81e13792a1eed4a03d2083771ee6e5b616b9ab";
+    sha256 = "sha256-bIlnYKjjOC6h5/Gg7xBg+i2TBk+h82wmHgAJPhzMsek=";
   };
 
   strictDeps = true;

pkgs/tools/graphics/wgpu-utils/default.nix

@@ -2,20 +2,20 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wgpu-utils";
-  version = "0.15.2";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "gfx-rs";
     repo = "wgpu";
     rev = "v${version}";
-    hash = "sha256-U2e7uOGaVpT/c9EXubkaKkROjog073hVfot2bbB34AY=";
+    hash = "sha256-2BS38Ybz/j6QnlI1G9zc/lFJKXj4Bh7+jlvyweUVhfA=";
   };
 
   cargoLock = {
     lockFile = ./Cargo.lock;
     outputHashes = {
       "d3d12-0.6.0" = "sha256-xCazXUriIQWMVa3DOI1aySBATmYwyDqsVYULRV2l/44=";
-      "naga-0.11.0" = "sha256-q5cYmsWUwLcVS2ZmKd6YvEz3Z8IPP1dRCgQhRhgadoE=";
+      "naga-0.12.0" = "sha256-EZ8ZKixOFPT9ZTKIC/UGh2B3F09ENbCTUi+ASamJzMM=";
     };
   };
 

pkgs/tools/misc/tagref/default.nix

@@ -1,16 +1,16 @@
 { lib, fetchFromGitHub, rustPlatform }:
 rustPlatform.buildRustPackage rec {
   pname = "tagref";
-  version = "1.6.0";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "stepchowfun";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-tAkRTHstXoGrSDX5h7xOpHHDOdCqdYu3AXoda84ha4g=";
+    sha256 = "sha256-ESImTR3CFe6ABCP7JHU7XQYvc2VsDN03lkVaKK9MUEU=";
   };
 
-  cargoHash = "sha256-3pD4hocvnfQziGtDvgc4QxnCEHlmsCFK32PI1zEh9z0=";
+  cargoHash = "sha256-vqRVD5RW0j2bMF/Zl+Ldc06zyDlzRpADWqxtkvKtydE=";
 
   meta = with lib; {
     description = "Tagref helps you refer to other locations in your codebase.";

pkgs/tools/package-management/nix/default.nix

@@ -69,7 +69,7 @@ let
     patches = (args.patches or [ ]) ++ [ ./patches/aws-sdk-cpp-TransferManager-ContentEncoding.patch ];
 
     # only a stripped down version is build which takes a lot less resources to build
-    requiredSystemFeatures = null;
+    requiredSystemFeatures = [ ];
   });
 
   aws-sdk-cpp-nix = (aws-sdk-cpp.override {
@@ -77,7 +77,7 @@ let
     customMemoryManagement = false;
   }).overrideAttrs (args: {
     # only a stripped down version is build which takes a lot less resources to build
-    requiredSystemFeatures = null;
+    requiredSystemFeatures = [ ];
   });
 
 

pkgs/tools/security/trufflehog/default.nix

@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "trufflehog";
-  version = "3.31.6";
+  version = "3.32.0";
 
   src = fetchFromGitHub {
     owner = "trufflesecurity";
     repo = "trufflehog";
     rev = "refs/tags/v${version}";
-    hash = "sha256-NlvDKpDuGjXEPINEBT+qDEwGWxJW32PAfpyezPt1Ucc=";
+    hash = "sha256-88O5G6AMAZm1feDw2fRab/RmDxoywVdafB/OJyO+Hro=";
   };
 
-  vendorHash = "sha256-mxOfHAaYCrwJT7I18iUHj0rK+MmJ4PX68Ln4cPO8sns=";
+  vendorHash = "sha256-NnYQGbG4R/Ar0goOtymuohHO36t3UQhjg53ufneCFxQ=";
 
   # Test cases run git clone and require network access
   doCheck = false;

pkgs/tools/text/mdbook-katex/default.nix

@@ -2,14 +2,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mdbook-katex";
-  version = "0.3.11";
+  version = "0.3.15";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-TeMB0+XjFSVg0kEV+uN7o0gc3PapkOAe+AI5AfcwczE=";
+    hash = "sha256-7PB6aYi8+cgoiN1zVBYWVIJgLlZFN8dGcY970iwPKWE=";
   };
 
-  cargoHash = "sha256-eu2B+YtSTwehU0bIRI1favDyLdth845xfi+y+jP40Hc=";
+  cargoHash = "sha256-JRRSeUGFDFSiaPxqegpQIGW8Q6Gs3GFHUx4+1jscZrU=";
 
   OPENSSL_DIR = "${lib.getDev openssl}";
   OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib";

pkgs/tools/text/topfew-rs/default.nix

@@ -0,0 +1,26 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "topfew-rs";
+  version = "0.2.3";
+
+  src = fetchFromGitHub {
+    owner = "djc";
+    repo = "topfew-rs";
+    rev = version;
+    hash = "sha256-VlSLPcKw3LYGnmKk5YOkcGIizw1tqtKF2BykY+1MtvY=";
+  };
+
+  cargoHash = "sha256-j+afSwDHau7H20siYtid7l8tq+iS24KJBsNZAEdNJlI=";
+
+  meta = with lib; {
+    description = "Rust implementation of Tim Bray's topfew tool";
+    homepage = "https://github.com/djc/topfew-rs";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ figsoda ];
+    mainProgram = "tf";
+  };
+}

pkgs/top-level/all-packages.nix

@@ -5281,6 +5281,8 @@ with pkgs;
   maple-mono = (callPackage ../data/fonts/maple-font { }).Mono;
   maple-mono-NF = (callPackage ../data/fonts/maple-font { }).NF;
   maple-mono-SC-NF = (callPackage ../data/fonts/maple-font { }).SC-NF;
+  maple-mono-otf = (callPackage ../data/fonts/maple-font { }).opentype;
+  maple-mono-woff2 = (callPackage ../data/fonts/maple-font { }).woff2;
 
   marl = callPackage ../development/libraries/marl { };
 
@@ -12898,6 +12900,8 @@ with pkgs;
 
   toml2nix = callPackage ../development/tools/toml2nix { };
 
+  topfew-rs = callPackage ../tools/text/topfew-rs { };
+
   topgrade = callPackage ../tools/misc/topgrade {
     inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation;
   };
@@ -17311,6 +17315,8 @@ with pkgs;
 
   gopls = callPackage ../development/tools/language-servers/gopls { };
 
+  helm-ls = callPackage ../development/tools/language-servers/helm-ls { };
+
   jdt-language-server = callPackage ../development/tools/language-servers/jdt-language-server { };
 
   jsonnet-language-server = callPackage ../development/tools/language-servers/jsonnet-language-server { };

pkgs/top-level/python-packages.nix

@@ -6855,6 +6855,8 @@ self: super: with self; {
 
   opencensus-context = callPackage ../development/python-modules/opencensus-context { };
 
+  opencontainers = callPackage ../development/python-modules/opencontainers { };
+
   opencv3 = toPythonModule (pkgs.opencv3.override {
     enablePython = true;
     pythonPackages = self;