Merge staging-next into staging

maintainers/maintainer-list.nix

@@ -11865,7 +11865,7 @@
     name = "Kartik Gokte";
   };
   nullishamy = {
-    email = "amy.codes@null.net";
+    email = "spam@amyerskine.me";
     name = "nullishamy";
     github = "nullishamy";
     githubId = 99221043;

nixos/modules/services/monitoring/netdata.nix

@@ -269,7 +269,7 @@ in {
         PrivateTmp = true;
         ProtectControlGroups = true;
         PrivateMounts = true;
-      } // (lib.optionalAttrs (cfg.claim_token_file != null) {
+      } // (lib.optionalAttrs (cfg.claimTokenFile != null) {
         LoadCredential = [
           "netdata_claim_token:${cfg.claimTokenFile}"
         ];

nixos/modules/services/ttys/kmscon.nix

@@ -99,6 +99,7 @@ in {
     systemd.units."kmsconvt@.service".aliases = [ "autovt@.service" ];
 
     systemd.services.systemd-vconsole-setup.enable = false;
+    systemd.services.reload-systemd-vconsole-setup.enable = false;
 
     services.kmscon.extraConfig =
       let

pkgs/applications/blockchains/snarkos/default.nix

@@ -10,16 +10,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "snarkos";
-  version = "2.0.2";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "AleoHQ";
     repo = "snarkOS";
     rev = "v${version}";
-    sha256 = "sha256-sS8emB+uhWuoq5ISuT8FgSSzX7/WDoOY8hHzPE/EX3o=";
+    sha256 = "sha256-ewWsiDyPaQ2GOMA31b1bc+wtRbkoWXyPzDhy0Qq2vKI=";
   };
 
-  cargoSha256 = "sha256-XS6dw6BIoJdigEso/J1dUaAp7AIAda3HrKnCoBynRv8=";
+  cargoHash = "sha256-HD+oVwFMUK00GQbJCrvLC+VWJ9p1L3j2f8rpQUIDKf8=";
 
   # buildAndTestSubdir = "cli";
 

pkgs/applications/editors/vscode/extensions/default.nix

@@ -914,8 +914,8 @@ let
         mktplcRef = {
           name = "composer-php-vscode";
           publisher = "devsense";
-          version = "1.33.13032";
+          version = "1.34.13295";
-          sha256 = "sha256-4SL7hPcnxN6Bq0Cclaszk2zlYF1xR2w/8zaJo16OT+U=";
+          sha256 = "sha256-1gmw9GKG6ak/TIDq8aI63KmiHhup9EsCS583Oc6jQ0I=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/DEVSENSE.composer-php-vscode/changelog";
@@ -932,25 +932,25 @@ let
           sources = {
             "x86_64-linux" = {
               arch = "linux-x64";
-              sha256 = "sha256-ccMkaXppkgdsN2XtSFaw85xLUCFMDF1z+XidP0KAHCA=";
+              sha256 = "sha256-L56vG9U2fqtaZIXQ5xepwLibOs/WyHQj/t2EIY7ZXvM=";
             };
             "x86_64-darwin" = {
               arch = "darwin-x64";
-              sha256 = "17lsf736jagw2q6dwxvpj2dspiqrlyvmmhv6p6cf81vxijpgmq9d";
+              sha256 = "0rx2dkaz0qpmck1k4hg0jpksixhwcrq0sndimx0f44jcnc7aby21";
             };
             "aarch64-linux" = {
               arch = "linux-arm64";
-              sha256 = "1cnfzzpikcsp1l1a8amim0fz5r1pkszn231cfl745ggiksbjyhsp";
+              sha256 = "13swwh1br6ry64hlq1yjbrbq71vyg44h0pb907zdjabwim27y88x";
             };
             "aarch64-darwin" = {
               arch = "darwin-arm64";
-              sha256 = "0jli6l9qrssnpm5a3m1g7g1dw2i5bv9wxd0gqg6vda7dwfs2f494";
+              sha256 = "0fsisxc3vcyqk634xbk2rdcw2g8ablv3n46y6bz20i0npa4clhpa";
             };
           };
         in {
           name = "phptools-vscode";
           publisher = "devsense";
-          version = "1.33.13032";
+          version = "1.34.13295";
         } // sources.${stdenv.system};
 
         nativeBuildInputs = [
@@ -981,8 +981,8 @@ let
         mktplcRef = {
           name = "profiler-php-vscode";
           publisher = "devsense";
-          version = "1.33.13032";
+          version = "1.34.13295";
-          sha256 = "sha256-P0lzZkCHtLHJI/gwB+wbrZPR3OOia5VxTMCC2ZQULBg=";
+          sha256 = "sha256-ZGklnPnSaHCGCRukVHie5ShvX94rXp2z3e/5PP2dq7I=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/DEVSENSE.profiler-php-vscode/changelog";

pkgs/applications/graphics/halftone/default.nix

@@ -15,13 +15,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "halftone";
-  version = "0.2.1";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "tfuxu";
     repo = pname;
     rev = version;
-    hash = "sha256-EYxnGpVKPV3Xg6dH3m1aC3/pDigUxkNF7C8U16n8al8=";
+    hash = "sha256-C/AzaKXZx/0mbrG5v2I5kKcw3N0gh/m/9zshbZfzECw=";
   };
 
   format = "other";

pkgs/applications/misc/furtherance/default.nix

@@ -4,21 +4,21 @@
 , dbus, gtk4, sqlite
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "furtherance";
-  version = "1.7.0";
+  version = "1.8.0";
 
   src = fetchFromGitHub {
     owner = "lakoliu";
     repo = "Furtherance";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-M3k2q32/vMG9uTHk2qqUz0E4ptzxfCOrs9NMjtyxZ5Y=";
+    hash = "sha256-l62k7aFyKfYWO+Z85KR8tpwts28pamINHYp/oKuHkhc=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
-    inherit src;
+    inherit (finalAttrs) src;
-    name = "${pname}-${version}";
+    name = "${finalAttrs.pname}-${finalAttrs.version}";
-    sha256 = "sha256-qLrX3X8wgNrI8G0RgWydVA35cdxcblSUxTKHty+eCds=";
+    hash = "sha256-AuXSX+64rJcTChpsE5tqk67bihKkSyimFAMhb1VdbBs=";
   };
 
   nativeBuildInputs = [
@@ -48,4 +48,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     maintainers = with maintainers; [ CaptainJawZ ];
   };
-}
+})

pkgs/applications/misc/pot/default.nix

@@ -23,17 +23,22 @@
 
 stdenv.mkDerivation rec {
   pname = "pot";
-  version = "1.1.0";
+  version = "1.6.1";
 
   src = fetchFromGitHub {
     owner = "pot-app";
     repo = "pot-desktop";
     rev = version;
-    hash = "sha256-MDBIChljWlztzjdyrdkzvrLuuJ0PAUonHj1hCJkqYCc=";
+    hash = "sha256-AiDQleRMuLExaVuiLvubebobDaK2YJTWjZ00F5UptuQ=";
   };
 
   sourceRoot = "source/src-tauri";
 
+  postUnpack = ''
+    sed -i -e 's/dev/v1/' source/src-tauri/Cargo.toml
+    cp ${./Cargo.lock} source/src-tauri/Cargo.lock
+  '';
+
   postPatch = ''
     substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
       --replace "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
@@ -70,16 +75,16 @@ stdenv.mkDerivation rec {
 
     dontFixup = true;
     outputHashMode = "recursive";
-    outputHash = "sha256-2kQuhlQnt1gGajPWXG9rj/T/SYkJStql1h4rgkZFhXc=";
+    outputHash = "sha256-HJdVAjvHmhvztJMR9rVniWl12sGQYTyZojEYaoKnn5M=";
   };
 
   cargoDeps = rustPlatform.importCargoLock {
     lockFile = ./Cargo.lock;
     outputHashes = {
-      "tauri-plugin-single-instance-0.0.0" = "sha256-M6uGcf4UWAU+494wAK/r2ta1c3IZ07iaURLwJJR9F3U=";
+      "tauri-plugin-single-instance-0.0.0" = "sha256-9eclolp+Gb8qF/KYIRiOoCJbMJLI8LyWLQu82npI7mQ=";
-      "tauri-plugin-autostart-0.0.0" = "sha256-M6uGcf4UWAU+494wAK/r2ta1c3IZ07iaURLwJJR9F3U=";
+      "tauri-plugin-autostart-0.0.0" = "sha256-9eclolp+Gb8qF/KYIRiOoCJbMJLI8LyWLQu82npI7mQ=";
       "enigo-0.1.2" = "sha256-99VJ0WYD8jV6CYUZ1bpYJBwIE2iwOZ9SjOvyA2On12Q=";
-      "selection-0.1.0" = "sha256-xHLMkxYWsvnxTwchwrga8eizmSP730rE+MC8hOinMC8=";
+      "selection-0.1.0" = "sha256-85NUACRi7TjyMNKVz93G+W1EXKIVZZge/h/HtDwiW/Q=";
     };
   };
 
@@ -104,12 +109,12 @@ stdenv.mkDerivation rec {
 
   ESBUILD_BINARY_PATH = "${lib.getExe (esbuild.override {
     buildGoModule = args: buildGoModule (args // rec {
-      version = "0.17.15";
+      version = "0.17.19";
       src = fetchFromGitHub {
         owner = "evanw";
         repo = "esbuild";
         rev = "v${version}";
-        hash = "sha256-AzkjVw3o+yP/l6jiMmgzaymb0el2/OcAl8WQYbuMprw=";
+        hash = "sha256-PLC7OJLSOiDq4OjvrdfCawZPfbfuZix4Waopzrj8qsU=";
       };
       vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
     });

pkgs/applications/networking/giara/default.nix

@@ -18,7 +18,7 @@
 }:
 python3.pkgs.buildPythonApplication rec {
   pname = "giara";
-  version = "1.0.1";
+  version = "1.1.0";
 
   format = "other";
 
@@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "World";
     repo = pname;
     rev = version;
-    hash = "sha256-hKaniW+bbuKUrETMQGWwvC2kyudK9tCE/R69dOFzdQM=";
+    hash = "sha256-FTy0ElcoTGXG9eV85pUrF35qKDKOfYIovPtjLfTJVOg=";
   };
 
   nativeBuildInputs = [
@@ -62,6 +62,9 @@ python3.pkgs.buildPythonApplication rec {
   postPatch = ''
     substituteInPlace meson_post_install.py \
       --replace "gtk-update-icon-cache" "gtk4-update-icon-cache"
+    # blueprint-compiler expects "profile" to be a string.
+    substituteInPlace data/ui/headerbar.blp \
+      --replace "item { custom: profile; }" 'item { custom: "profile"; }'
   '';
 
   meta = with lib; {

pkgs/applications/networking/maestral-qt/default.nix

@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "maestral-qt";
-  version = "1.7.2";
+  version = "1.7.3";
   disabled = python3.pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "SamSchott";
     repo = "maestral-qt";
     rev = "refs/tags/v${version}";
-    hash = "sha256-o2KuqKiy+8fbzogR3ATPVkK60JAKYXQ9dogU/g6CS/M=";
+    hash = "sha256-IzE+rCudMskJuPIWsz+u2D5KC8mc1JhNDVSHXixUEZA=";
   };
 
   format = "pyproject";

pkgs/applications/video/losslesscut-bin/build-from-dmg.nix

@@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation {
   '';
 
   meta = metaCommon // (with lib; {
-    platforms = singleton (if isAarch64 then "aarch64-darwin" else "x86_64-darwin");
+    platforms = if isAarch64 then [ "aarch64-darwin" ] else platforms.darwin;
     mainProgram = "losslesscut";
   });
 }

pkgs/applications/video/losslesscut-bin/default.nix

@@ -6,7 +6,7 @@
 
 let
   pname = "losslesscut";
-  version = "3.48.2";
+  version = "3.55.2";
   metaCommon = with lib; {
     description = "The swiss army knife of lossless video/audio editing";
     homepage = "https://mifi.no/losslesscut/";
@@ -15,22 +15,22 @@ let
   };
   x86_64-appimage = callPackage ./build-from-appimage.nix {
     inherit pname version metaCommon;
-    hash = "sha256-5T5+eBVbyOI89YA9NMLWweHagD09RB3P03HFvaDAOZ8=";
+    hash = "sha256-oQYDK/BHxC/zJuocDH+HcItcPQIsxAaKoD+49TAA+ds=";
     inherit (buildPackages) makeWrapper;
   };
   x86_64-dmg = callPackage ./build-from-dmg.nix {
     inherit pname version metaCommon;
-    hash = "sha256-PzjE0oJOuPG0S+mA7pgNU3MRgaE2jAPxWEN9J4PfqMQ=";
+    hash = "sha256-dmtnGv5XQn2ANpYyFu9jtTGr1b7GdDrV3Oajd5bMr0k=";
     isAarch64 = false;
   };
   aarch64-dmg = callPackage ./build-from-dmg.nix {
     inherit pname version metaCommon;
-    hash = "sha256-927CSczgFJcbBJm2cYXucFRidkGAtcowoLMlm2GTafc=";
+    hash = "sha256-uU48Clhk4FllM7osHRR4D7xGZCmcvylqlUt6JqCrm/8=";
     isAarch64 = true;
   };
   x86_64-windows = callPackage ./build-from-windows.nix {
     inherit pname version metaCommon;
-    hash = "sha256-+isxkGKxW7H+IjuA5G4yXuvDmX+4UlsD8sXwoHxgLM8=";
+    hash = "sha256-YkPF6sgL/oGXSXCdQt+7iW2n5f9Tk2ItchwRAwq7IPY=";
   };
 in
 (

pkgs/build-support/rust/build-rust-crate/build-crate.nix

@@ -7,7 +7,7 @@
   dependencies,
   crateFeatures, crateRenames, libName, release, libPath,
   crateType, metadata, crateBin, hasCrateBin,
-  extraRustcOpts,
+  extraRustcOpts, verbose, colors,
   buildTests,
   codegenUnits
 }:
@@ -40,7 +40,9 @@
       ++ (map (x: "--crate-type ${x}") crateType)
     );
 
-    binRustcOpts = lib.concatStringsSep " " baseRustcOpts;
+    binRustcOpts = lib.concatStringsSep " " (
+      baseRustcOpts
+    );
 
     build_bin = if buildTests then "build_bin_test" else "build_bin";
   in ''

pkgs/build-support/rust/build-rust-crate/default.nix

@@ -300,7 +300,7 @@ crate_: lib.makeOverridable
           (crate.features ++ features)
         );
 
-      libName = crate.libName or crate.crateName;
+      libName = if crate ? libName then crate.libName else crate.crateName;
       libPath = lib.optionalString (crate ? libPath) crate.libPath;
 
       # Seed the symbol hashes with something unique every time.
@@ -329,7 +329,7 @@ crate_: lib.makeOverridable
       colors = lib.attrByPath [ "colors" ] "always" crate;
       extraLinkFlags = lib.concatStringsSep " " (crate.extraLinkFlags or [ ]);
       edition = crate.edition or null;
-      codegenUnits = crate.codegenUnits or 1;
+      codegenUnits = if crate ? codegenUnits then crate.codegenUnits else 1;
       extraRustcOpts =
         lib.optionals (crate ? extraRustcOpts) crate.extraRustcOpts
           ++ extraRustcOpts_

pkgs/build-support/rust/build-rust-package/default.nix

@@ -34,6 +34,7 @@
 , buildInputs ? []
 , nativeBuildInputs ? []
 , cargoUpdateHook ? ""
+, cargoDepsHook ? ""
 , buildType ? "release"
 , meta ? {}
 , cargoLock ? null

pkgs/development/compilers/gforth/default.nix

@@ -9,13 +9,13 @@ let
 in stdenv.mkDerivation rec {
 
   pname = "gforth";
-  version = "0.7.9_20220127";
+  version = "0.7.9_20230518";
 
   src = fetchFromGitHub {
     owner = "forthy42";
     repo = "gforth";
     rev = version;
-    sha256 = "sha256-3+ObHhsPvW44UFiN0GWOhwo7aiqhjwxNY8hw2Wv4MK0=";
+    hash = "sha256-rXtmmENBt9RMdLPq8GDyndh4+CYnCmz6NYpe3kH5OwU=";
   };
 
   nativeBuildInputs = [

pkgs/development/libraries/gstreamer/rs/default.nix

@@ -118,7 +118,7 @@ in
 
 stdenv.mkDerivation rec {
   pname = "gst-plugins-rs";
-  version = "0.10.7";
+  version = "0.10.8";
 
   outputs = [ "out" "dev" ];
 
@@ -127,7 +127,7 @@ stdenv.mkDerivation rec {
     owner = "gstreamer";
     repo = "gst-plugins-rs";
     rev = version;
-    hash = "sha256-b+j7nAMK66+msRnIaj1S1DSvES5Gid3QazXgqO1II/Q=";
+    hash = "sha256-UxmfyqbQwkQjwHiARRpFJiGsrsNjv6V129lIHPk7gRk=";
     # TODO: temporary workaround for case-insensitivity problems with color-name crate - https://github.com/annymosse/color-name/pull/2
     nativeBuildInputs = [ yq moreutils ];
     postFetch = ''
@@ -138,15 +138,19 @@ stdenv.mkDerivation rec {
     '';
   };
 
+  postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 ''
+    rm net/raptorq/tests/raptorq.rs
+  '';
+
   cargoDeps = rustPlatform.importCargoLock {
     lockFile = ./Cargo.lock;
     outputHashes = {
-      "cairo-rs-0.17.9" = "sha256-LiIb6y/Ks/o+rZhU8RpXN7jSo7JzBGmcNumxyx/lZs0=";
+      "cairo-rs-0.17.10" = "sha256-5lWlDHlMco380tRaxyApdNv5DDKJL9QrKI2DvHM3868=";
       "color-name-1.1.0" = "sha256-RfMStbe2wX5qjPARHIFHlSDKjzx8DwJ+RjzyltM5K7A=";
       "ffv1-0.0.0" = "sha256-af2VD00tMf/hkfvrtGrHTjVJqbl+VVpLaR0Ry+2niJE=";
       "flavors-0.2.0" = "sha256-zBa0X75lXnASDBam9Kk6w7K7xuH9fP6rmjWZBUB5hxk=";
       "gdk4-0.6.6" = "sha256-TI4F9MjIpxFEZItoewP/Zem1vM4MsKNJTzfgah1vjmI=";
-      "gstreamer-0.20.5" = "sha256-IQ56Upe73egId1IJRfzvqrJIzTc1x5FgAEbva9kuqPE=";
+      "gstreamer-0.20.6" = "sha256-IyzqCQ5oQt5QgFp6liGyDaFhteCceR1KPzJCE4R6zus=";
     };
   };
 

pkgs/development/libraries/libsidplayfp/default.nix

@@ -1,6 +1,7 @@
 { stdenv
 , lib
 , fetchFromGitHub
+, makeFontsConf
 , nix-update-script
 , autoreconfHook
 , pkg-config
@@ -16,28 +17,30 @@
 
 stdenv.mkDerivation rec {
   pname = "libsidplayfp";
-  version = "2.4.2";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "libsidplayfp";
     repo = "libsidplayfp";
     rev = "v${version}";
     fetchSubmodules = true;
-    sha256 = "sha256-e+blEdO2KA/noW9pq56qZ0/vvtqQwiDbBJoQR0cQeds=";
+    sha256 = "sha256-KCp/8UjVl8e3+4s1FD4GvHP7AUAS+eIB7RWhmgm5GIA=";
   };
 
   postPatch = ''
     patchShebangs .
   '';
 
+  strictDeps = true;
+
   nativeBuildInputs = [ autoreconfHook pkg-config perl xa ]
     ++ lib.optionals docSupport [ doxygen graphviz ];
 
   buildInputs = [ libgcrypt libexsid ];
 
-  doCheck = true;
+  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
 
-  nativeCheckInputs = [ unittest-cpp ];
+  checkInputs = [ unittest-cpp ];
 
   enableParallelBuilding = true;
 
@@ -54,6 +57,13 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optional doCheck "--enable-tests";
 
+  FONTCONFIG_FILE = lib.optionalString docSupport (makeFontsConf { fontDirectories = [ ]; });
+
+  preBuild = ''
+    # Reduce noise from fontconfig during doc building
+    export XDG_CACHE_HOME=$TMPDIR
+  '';
+
   postInstall = lib.optionalString docSupport ''
     mkdir -p $doc/share/doc/libsidplayfp
     mv docs/html $doc/share/doc/libsidplayfp/

pkgs/development/libraries/science/math/lrs/default.nix

@@ -1,6 +1,6 @@
-{lib, stdenv, fetchurl, gmp}:
+{ lib, stdenv, fetchurl, gmp }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "lrs";
   version = "7.2";
 
@@ -11,14 +11,15 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gmp ];
 
-  preBuild = ''
+  makeFlags = [
-    export makeFlags="$makeFlags prefix=$out";
+    "prefix=${placeholder "out"}"
-  '';
+    "CC:=$(CC)"
+  ];
 
   meta = {
     description = "Implementation of the reverse search algorithm for vertex enumeration/convex hull problems";
-    license = lib.licenses.gpl2 ;
+    license = lib.licenses.gpl2;
-    maintainers = [lib.maintainers.raskin];
+    maintainers = [ lib.maintainers.raskin ];
     platforms = lib.platforms.linux;
     homepage = "http://cgm.cs.mcgill.ca/~avis/C/lrs.html";
   };

pkgs/development/python-modules/django-admin-datta/default.nix

@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, django
+, fetchPypi
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "django-admin-datta";
+  version = "1.0.7";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-Onk9T+QKsl8y68eJ2ikrUEeMc9ljzzvSw7cjjP4D3sE=";
+  };
+
+  propagatedBuildInputs = [
+    django
+  ];
+
+  # no tests
+  doCheck = false;
+
+  pythonImportCheck = [
+    "admin-datta"
+  ];
+
+  meta = with lib; {
+    description = "Modern template for Django that covers Admin Section";
+    homepage = "https://appseed.us/product/datta-able/django";
+    changelog = "https://github.com/app-generator/django-admin-datta/releases/tag/v${version}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ derdennisop ];
+  };
+}

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

@@ -0,0 +1,45 @@
+{ lib
+, buildPythonPackage
+, django
+, fetchFromGitHub
+, polib
+, pythonOlder
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "django-rosetta";
+  version = "0.9.8";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "mbi";
+    repo = "django-rosetta";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-3AXwRxNWVkqW65xdqUwjHM1W5qhHXTjapqaM0Wmsebw=";
+  };
+
+  propagatedBuildInputs = [
+    django
+    polib
+    requests
+  ];
+
+  # require internet connection
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "rosetta"
+  ];
+
+  meta = with lib; {
+    description = "Rosetta is a Django application that facilitates the translation process of your Django projects";
+    homepage = "https://github.com/mbi/django-rosetta";
+    changelog = "https://github.com/jazzband/django-rosetta/releases/tag/v${version}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ derdennisop ];
+  };
+}
+

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

@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "schemdraw";
-  version = "0.16";
+  version = "0.17";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "cdelker";
     repo = pname;
     rev = version;
-    hash = "sha256-W9sXtYI8gEwQPRo50taEGT6AQG1tdAbeCtX49eHVvFQ=";
+    hash = "sha256-wa/IeNGZynU/xKwyFwebXcFaruhBFqGWsrZYaIEVa8Q=";
   };
 
   propagatedBuildInputs = [

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

@@ -10,7 +10,8 @@
 
 buildPythonPackage rec {
   pname = "ziamath";
-  version = "0.7";
+  version = "0.8.1";
+  format = "pyproject";
 
   disabled = pythonOlder "3.8";
 
@@ -18,7 +19,7 @@ buildPythonPackage rec {
     owner = "cdelker";
     repo = pname;
     rev = version;
-    hash = "sha256-JuuCDww0EZEHZLxB5oQrWEJpv0szjwe4iXCRGl7OYTA=";
+    hash = "sha256-Bbwq4Ods3P/724KO94jSmMLD1ubfaMHP/gTlOL/2pnE=";
   };
 
   propagatedBuildInputs = [
@@ -33,6 +34,13 @@ buildPythonPackage rec {
 
   pytestFlagsArray = [ "--nbval-lax" ];
 
+  # Prevent the test suite from attempting to download fonts
+  postPatch = ''
+    substituteInPlace test/styles.ipynb \
+      --replace '"def testfont(exprs, fonturl):\n",' '"def testfont(exprs, fonturl):\n", "    return\n",' \
+      --replace "mathfont='FiraMath-Regular.otf', " ""
+  '';
+
   pythonImportsCheck = [ "ziamath" ];
 
   meta = with lib; {

pkgs/development/ruby-modules/gem-config/default.nix

@@ -573,9 +573,14 @@ in
   };
 
   pg = attrs: {
-    buildFlags = [
+    # Force pkg-config lookup for libpq.
-      "--with-pg-config=${postgresql}/bin/pg_config"
+    # See https://github.com/ged/ruby-pg/blob/6629dec6656f7ca27619e4675b45225d9e422112/ext/extconf.rb#L34-L55
-    ];
+    #
+    # Note that setting --with-pg-config=${postgresql}/bin/pg_config would add
+    # an unnecessary reference to the entire postgresql package.
+    buildFlags = [ "--with-pg-config=ignore" ];
+    nativeBuildInputs = [ pkg-config ];
+    buildInputs = [ postgresql ];
   };
 
   psych = attrs: {

pkgs/development/tools/analysis/tflint/default.nix

@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "tflint";
-  version = "0.46.1";
+  version = "0.47.0";
 
   src = fetchFromGitHub {
     owner = "terraform-linters";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-oMf1uUD+7z42Z6bfMxNCWNFu/WwdEqBocVbbfe2OPbo=";
+    hash = "sha256-YKsX+dAnVRiD48CRHaXzUzfqsqpi/bWHNH9lqzC/TZQ=";
   };
 
-  vendorHash = "sha256-1S3my0/77LiiGZDemVrYzN1jMcZdTyd404y67euraeI=";
+  vendorHash = "sha256-dgK7o2DJUwAynfekrn6mN8IVxCpJa9b+kiYMQSo0RIg=";
 
   doCheck = false;
 
@@ -46,7 +46,7 @@ buildGoModule rec {
   meta = with lib; {
     description = "Terraform linter focused on possible errors, best practices, and so on";
     homepage = "https://github.com/terraform-linters/tflint";
-    changelog = "https://github.com/terraform-linters/tflint/raw/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/terraform-linters/tflint/blob/v${version}/CHANGELOG.md";
     license = licenses.mpl20;
     maintainers = [ maintainers.marsam ];
   };

pkgs/development/tools/build-managers/moon/default.nix

@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "moon";
-  version = "v1.5.1";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "moonrepo";
     repo = pname;
-    rev = version;
+    rev = "v${version}";
     hash = "sha256-TA27e0W0XSOC326lnO/mSlJNLGn6roJhd1CrQadWb/U=";
   };
 
-  cargoHash = "sha256-Q044nxI6VGGal9I31VuZeGLho4KIz/Rzg4Lrn1prj4Y=";
+  cargoHash = "sha256-HbZsCP54uuiWQsUf0ChoVA4HOQbr7rZ63ThNro7QyLA=";
 
   env = {
     RUSTFLAGS = "-C strip=symbols";

pkgs/servers/onlyoffice-documentserver/default.nix

@@ -15,11 +15,11 @@ let
   # var/www/onlyoffice/documentserver/server/DocService/docservice
   onlyoffice-documentserver = stdenv.mkDerivation rec {
     pname = "onlyoffice-documentserver";
-    version = "7.3.3";
+    version = "7.4.0";
 
     src = fetchurl {
       url = "https://github.com/ONLYOFFICE/DocumentServer/releases/download/v${lib.concatStringsSep "." (lib.take 3 (lib.splitVersion version))}/onlyoffice-documentserver_amd64.deb";
-      sha256 = "sha256-WeDXIDrjICGDVnpkdGLyA9plW50Kz3bHXU48DdHReHM=";
+      sha256 = "sha256-FL09EXxQlUZuJMMHYu9tSOH8ARPgzoqAKmQYV6225PU=";
     };
 
     preferLocalBuild = true;

pkgs/tools/misc/graylog/plugins.nix

@@ -216,6 +216,20 @@ in {
       description = "Can notify Slack or Mattermost channels about triggered alerts in Graylog (Alarm Callback)";
     };
   };
+  smseagle = glPlugin rec {
+    name = "graylog-smseagle-${version}";
+    pluginName = "graylog-plugin-smseagle";
+    version = "1.0.1";
+    src = fetchurl {
+      url = "https://bitbucket.org/proximus/smseagle-graylog/raw/b99cfc349aafc7c94d4c2503f7c3c0bde67684d1/jar/graylog-plugin-smseagle-1.0.1.jar";
+      sha256 = "sha256-rvvftzPskXRGs1Z9dvd/wFbQoIoNtEQIFxMIpSuuvf0=";
+    };
+    meta = {
+      homepage = "https://bitbucket.org/proximus/smseagle-graylog/";
+      description = "Alert/notification callback plugin for integrating the SMSEagle into Graylog.";
+      license = lib.licenses.gpl3Only;
+    };
+  };
   snmp = glPlugin rec {
     name = "graylog-snmp-${version}";
     pluginName = "graylog-plugin-snmp";

pkgs/tools/networking/udp2raw/default.nix

@@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     echo 'const char *gitversion = "${version}";' > git_version.h
+    # Adress sanitization crashes the application, reported upstream at https://github.com/wangyu-/udp2raw/issues/474
+    substituteInPlace CMakeLists.txt --replace "sanitize=address," "sanitize="
   '';
 
   nativeBuildInputs = [

pkgs/tools/text/shfmt/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "shfmt";
-  version = "3.6.0";
+  version = "3.7.0";
 
   src = fetchFromGitHub {
     owner = "mvdan";
     repo = "sh";
     rev = "v${version}";
-    sha256 = "sha256-hu08TouICK9tg8+QrAUWpzEAkJ1hHJEIz/UXL+jexrQ=";
+    sha256 = "sha256-5/WGYsmZAFFdONpViRaqjL/KXyOu618A8S/SqcgZoEU=";
   };
 
-  vendorSha256 = "sha256-De/8PLio63xn2byfVzGVCdzRwFxzFMy0ftjB+VEBLrQ=";
+  vendorSha256 = "sha256-V/6wiC0oanytzMGW/lP+t+uz6cMgXRuviDEj7ErQh5k=";
 
   subPackages = [ "cmd/shfmt" ];
 

pkgs/top-level/python-packages.nix

@@ -2645,6 +2645,8 @@ self: super: with self; {
   # Current latest
   django_4 = callPackage ../development/python-modules/django/4.nix { };
 
+  django-admin-datta = callPackage ../development/python-modules/django-admin-datta { };
+
   django-admin-sortable2 = callPackage ../development/python-modules/django-admin-sortable2 { };
 
   django-allauth = callPackage ../development/python-modules/django-allauth { };
@@ -2825,6 +2827,8 @@ self: super: with self; {
 
   django-rest-registration = callPackage ../development/python-modules/django-rest-registration { };
 
+  django-rosetta = callPackage ../development/python-modules/django-rosetta { };
+
   django-rq = callPackage ../development/python-modules/django-rq { };
 
   djangorestframework = callPackage ../development/python-modules/djangorestframework { };