Merge remote-tracking branch 'origin/master' into staging-next

doc/languages-frameworks/haskell.section.md

@@ -71,8 +71,10 @@ $ nix-env -f '<nixpkgs>' -qaP -A haskell.compiler
 haskell.compiler.ghc810                  ghc-8.10.7
 haskell.compiler.ghc88                   ghc-8.8.4
 haskell.compiler.ghc90                   ghc-9.0.2
-haskell.compiler.ghc92                   ghc-9.2.4
+haskell.compiler.ghc924                  ghc-9.2.4
 haskell.compiler.ghc925                  ghc-9.2.5
+haskell.compiler.ghc926                  ghc-9.2.6
+haskell.compiler.ghc92                   ghc-9.2.7
 haskell.compiler.ghc942                  ghc-9.4.2
 haskell.compiler.ghc943                  ghc-9.4.3
 haskell.compiler.ghc94                   ghc-9.4.4
@@ -86,13 +88,15 @@ haskell.compiler.ghc924Binary            ghc-binary-9.2.4
 haskell.compiler.ghc924BinaryMinimal     ghc-binary-9.2.4
 haskell.compiler.integer-simple.ghc810   ghc-integer-simple-8.10.7
 haskell.compiler.integer-simple.ghc8107  ghc-integer-simple-8.10.7
-haskell.compiler.integer-simple.ghc884   ghc-integer-simple-8.8.4
 haskell.compiler.integer-simple.ghc88    ghc-integer-simple-8.8.4
+haskell.compiler.integer-simple.ghc884   ghc-integer-simple-8.8.4
 haskell.compiler.native-bignum.ghc90     ghc-native-bignum-9.0.2
 haskell.compiler.native-bignum.ghc902    ghc-native-bignum-9.0.2
-haskell.compiler.native-bignum.ghc92     ghc-native-bignum-9.2.4
 haskell.compiler.native-bignum.ghc924    ghc-native-bignum-9.2.4
 haskell.compiler.native-bignum.ghc925    ghc-native-bignum-9.2.5
+haskell.compiler.native-bignum.ghc926    ghc-native-bignum-9.2.6
+haskell.compiler.native-bignum.ghc92     ghc-native-bignum-9.2.7
+haskell.compiler.native-bignum.ghc927    ghc-native-bignum-9.2.7
 haskell.compiler.native-bignum.ghc942    ghc-native-bignum-9.4.2
 haskell.compiler.native-bignum.ghc943    ghc-native-bignum-9.4.3
 haskell.compiler.native-bignum.ghc94     ghc-native-bignum-9.4.4
@@ -105,15 +109,15 @@ Each of those compiler versions has a corresponding attribute set built using
 it. However, the non-standard package sets are not tested regularly and, as a
 result, contain fewer working packages. The corresponding package set for GHC
 9.4.4 is `haskell.packages.ghc944`. In fact `haskellPackages` is just an alias
-for `haskell.packages.ghc924`:
+for `haskell.packages.ghc927`:
 
 ```console
-$ nix-env -f '<nixpkgs>' -qaP -A haskell.packages.ghc924
+$ nix-env -f '<nixpkgs>' -qaP -A haskell.packages.ghc927
-haskell.packages.ghc924.a50                                                         a50-0.5
+haskell.packages.ghc927.a50                                                         a50-0.5
-haskell.packages.ghc924.AAI                                                         AAI-0.2.0.1
+haskell.packages.ghc927.AAI                                                         AAI-0.2.0.1
-haskell.packages.ghc924.aasam                                                       aasam-0.2.0.0
+haskell.packages.ghc927.aasam                                                       aasam-0.2.0.0
-haskell.packages.ghc924.abacate                                                     abacate-0.0.0.0
+haskell.packages.ghc927.abacate                                                     abacate-0.0.0.0
-haskell.packages.ghc924.abc-puzzle                                                  abc-puzzle-0.2.1
+haskell.packages.ghc927.abc-puzzle                                                  abc-puzzle-0.2.1
 …
 ```
 

lib/attrsets.nix

@@ -333,6 +333,66 @@ rec {
       ) (attrNames set)
     );
 
+   /*
+    Like builtins.foldl' but for attribute sets.
+    Iterates over every name-value pair in the given attribute set.
+    The result of the callback function is often called `acc` for accumulator. It is passed between callbacks from left to right and the final `acc` is the return value of `foldlAttrs`.
+
+    Attention:
+      There is a completely different function
+      `lib.foldAttrs`
+      which has nothing to do with this function, despite the similar name.
+
+    Example:
+      foldlAttrs
+        (acc: name: value: {
+          sum = acc.sum + value;
+          names = acc.names ++ [name];
+        })
+        { sum = 0; names = []; }
+        {
+          foo = 1;
+          bar = 10;
+        }
+      ->
+        {
+          sum = 11;
+          names = ["bar" "foo"];
+        }
+
+      foldlAttrs
+        (throw "function not needed")
+        123
+        {};
+      ->
+        123
+
+      foldlAttrs
+        (_: _: v: v)
+        (throw "initial accumulator not needed")
+        { z = 3; a = 2; };
+      ->
+        3
+
+      The accumulator doesn't have to be an attrset.
+      It can be as simple as a number or string.
+
+      foldlAttrs
+        (acc: _: v: acc * 10 + v)
+        1
+        { z = 1; a = 2; };
+      ->
+        121
+
+    Type:
+      foldlAttrs :: ( a -> String -> b -> a ) -> a -> { ... :: b } -> a
+  */
+  foldlAttrs = f: init: set:
+    foldl'
+      (acc: name: f acc name set.${name})
+      init
+      (attrNames set);
+
   /* Apply fold functions to values grouped by key.
 
      Example:

lib/default.nix

@@ -78,7 +78,7 @@ let
       composeManyExtensions makeExtensible makeExtensibleWithCustomName;
     inherit (self.attrsets) attrByPath hasAttrByPath setAttrByPath
       getAttrFromPath attrVals attrValues getAttrs catAttrs filterAttrs
-      filterAttrsRecursive foldAttrs collect nameValuePair mapAttrs
+      filterAttrsRecursive foldlAttrs foldAttrs collect nameValuePair mapAttrs
       mapAttrs' mapAttrsToList concatMapAttrs mapAttrsRecursive mapAttrsRecursiveCond
       genAttrs isDerivation toDerivation optionalAttrs
       zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil

lib/systems/doubles.nix

@@ -22,7 +22,7 @@ let
     "x86_64-solaris"
 
     # JS
-    "js-ghcjs"
+    "javascript-ghcjs"
 
     # Linux
     "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux"

lib/systems/examples.nix

@@ -329,6 +329,9 @@ rec {
 
   # Ghcjs
   ghcjs = {
-    config = "js-unknown-ghcjs";
+    # This triple is special to GHC/Cabal/GHCJS and not recognized by autotools
+    # See: https://gitlab.haskell.org/ghc/ghc/-/commit/6636b670233522f01d002c9b97827d00289dbf5c
+    # https://github.com/ghcjs/ghcjs/issues/53
+    config = "javascript-unknown-ghcjs";
   };
 }

lib/systems/inspect.nix

@@ -49,7 +49,7 @@ rec {
     isM68k         = { cpu = { family = "m68k"; }; };
     isS390         = { cpu = { family = "s390"; }; };
     isS390x        = { cpu = { family = "s390"; bits = 64; }; };
-    isJavaScript   = { cpu = cpuTypes.js; };
+    isJavaScript   = { cpu = cpuTypes.javascript; };
 
     is32bit        = { cpu = { bits = 32; }; };
     is64bit        = { cpu = { bits = 64; }; };

lib/systems/parse.nix

@@ -131,7 +131,7 @@ rec {
 
     or1k     = { bits = 32; significantByte = bigEndian; family = "or1k"; };
 
-    js       = { bits = 32; significantByte = littleEndian; family = "js"; };
+    javascript = { bits = 32; significantByte = littleEndian; family = "javascript"; };
   };
 
   # GNU build systems assume that older NetBSD architectures are using a.out.

lib/tests/misc.nix

@@ -533,6 +533,37 @@ runTests {
     };
   };
 
+  # code from example
+  testFoldlAttrs = {
+    expr = {
+      example = foldlAttrs
+        (acc: name: value: {
+          sum = acc.sum + value;
+          names = acc.names ++ [ name ];
+        })
+        { sum = 0; names = [ ]; }
+        {
+          foo = 1;
+          bar = 10;
+        };
+      # should just return the initial value
+      emptySet = foldlAttrs (throw "function not needed") 123 { };
+      # should just evaluate to the last value
+      accNotNeeded = foldlAttrs (_acc: _name: v: v) (throw "accumulator not needed") { z = 3; a = 2; };
+      # the accumulator doesnt have to be an attrset it can be as trivial as being just a number or string
+      trivialAcc = foldlAttrs (acc: _name: v: acc * 10 + v) 1 { z = 1; a = 2; };
+    };
+    expected = {
+      example = {
+        sum = 11;
+        names = [ "bar" "foo" ];
+      };
+      emptySet = 123;
+      accNotNeeded = 3;
+      trivialAcc = 121;
+    };
+  };
+
   # code from the example
   testRecursiveUpdateUntil = {
     expr = recursiveUpdateUntil (path: l: r: path == ["foo"]) {

maintainers/maintainer-list.nix

@@ -578,6 +578,12 @@
     githubId = 43479487;
     name = "Titouan Biteau";
   };
+  aleksana = {
+    email = "me@aleksana.moe";
+    github = "Aleksanaa";
+    githubId = 42209822;
+    name = "Aleksana QwQ";
+  };
   alekseysidorov = {
     email = "sauron1987@gmail.com";
     github = "alekseysidorov";
@@ -9191,6 +9197,12 @@
     githubId = 50230945;
     name = "Marcus Boyd";
   };
+  marcusramberg = {
+    email = "marcus@means.no";
+    github = "marcusramberg";
+    githubId = 5526;
+    name = "Marcus Ramberg";
+  };
   marenz = {
     email = "marenz@arkom.men";
     github = "marenz2569";
@@ -15047,6 +15059,12 @@
       fingerprint = "7F3E EEAA EE66 93CC 8782  042A 7550 7BE2 56F4 0CED";
     }];
   };
+  Tungsten842 = {
+    name = "Tungsten842";
+    email = "886724vf@anonaddy.me";
+    github = "Tungsten842";
+    githubId = 24614168;
+  };
   tiagolobocastro = {
     email = "tiagolobocastro@gmail.com";
     github = "tiagolobocastro";

maintainers/scripts/haskell/hydra-report.hs

@@ -328,6 +328,7 @@ platformIcon (Platform x) = case x of
    "x86_64-linux" -> ":penguin:"
    "aarch64-linux" -> ":iphone:"
    "x86_64-darwin" -> ":apple:"
+   "aarch64-darwin" -> ":green_apple:"
    _ -> x
 
 data BuildResult = BuildResult {state :: BuildState, id :: Int} deriving (Show, Eq, Ord)
@@ -488,7 +489,8 @@ printBuildSummary eval@Eval{id} fetchTime summary topBrokenRdeps =
          if' (isNothing maintainedJob) "No `maintained` job found." <>
          if' (Unfinished > maybe Success worstState mergeableJob) "`mergeable` jobset failed." <>
          if' (outstandingJobs (Platform "x86_64-linux") > 100) "Too many outstanding jobs on x86_64-linux." <>
-         if' (outstandingJobs (Platform "aarch64-linux") > 100) "Too many outstanding jobs on aarch64-linux."
+         if' (outstandingJobs (Platform "aarch64-linux") > 100) "Too many outstanding jobs on aarch64-linux." <>
+         if' (outstandingJobs (Platform "aarch64-darwin") > 100) "Too many outstanding jobs on aarch64-darwin."
       if' p e = if p then [e] else mempty
       outstandingJobs platform | Table m <- numSummary = Map.findWithDefault 0 (platform, Unfinished) m
       maintainedJob = Map.lookup "maintained" summary

nixos/doc/manual/release-notes/rl-2305.section.md

@@ -69,6 +69,8 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - [sharing](https://github.com/parvardegr/sharing), a command-line tool to share directories and files from the CLI to iOS and Android devices without the need of an extra client app. Available as [programs.sharing](#opt-programs.sharing.enable).
 
+- [nimdow](https://github.com/avahe-kellenberger/nimdow), a window manager written in Nim, inspired by dwm.
+
 ## Backward Incompatibilities {#sec-release-23.05-incompatibilities}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
@@ -120,6 +122,8 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - Calling `makeSetupHook` without passing a `name` argument is deprecated.
 
+- `lib.systems.examples.ghcjs` and consequently `pkgsCross.ghcjs` now use the target triplet `javascript-unknown-ghcjs` instead of `js-unknown-ghcjs`. This has been done to match an [upstream decision](https://gitlab.haskell.org/ghc/ghc/-/commit/6636b670233522f01d002c9b97827d00289dbf5c) to follow Cabal's platform naming more closely. Nixpkgs will also reject `js` as an architecture name.
+
 - The `cosmoc` package has been removed. The upstream scripts in `cosmocc` should be used instead.
 
 - Qt 5.12 and 5.14 have been removed, as the corresponding branches have been EOL upstream for a long time. This affected under 10 packages in nixpkgs, largely unmaintained upstream as well, however, out-of-tree package expressions may need to be updated manually.

nixos/modules/module-list.nix

@@ -1273,6 +1273,7 @@
   ./services/x11/window-managers/bspwm.nix
   ./services/x11/window-managers/katriawm.nix
   ./services/x11/window-managers/metacity.nix
+  ./services/x11/window-managers/nimdow.nix
   ./services/x11/window-managers/none.nix
   ./services/x11/window-managers/twm.nix
   ./services/x11/window-managers/windowlab.nix

nixos/modules/services/x11/window-managers/nimdow.nix

@@ -0,0 +1,23 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.xserver.windowManager.nimdow;
+in
+{
+  options = {
+    services.xserver.windowManager.nimdow.enable = mkEnableOption (lib.mdDoc "nimdow");
+  };
+
+  config = mkIf cfg.enable {
+    services.xserver.windowManager.session = singleton {
+      name = "nimdow";
+      start = ''
+        ${pkgs.nimdow}/bin/nimdow &
+        waitPID=$!
+      '';
+    };
+    environment.systemPackages = [ pkgs.nimdow ];
+  };
+}

pkgs/applications/editors/neovim/neovim-gtk.nix

@@ -0,0 +1,40 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, wrapGAppsHook4
+, pkg-config
+, gdk-pixbuf
+, gtk4
+, pango
+, vte-gtk4
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "neovim-gtk";
+  version = "1.0.4";
+
+  src = fetchFromGitHub {
+    owner = "Lyude";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-inva7pYwOw3bXvFeKZ4aKSQ65iCat5HxM+NME8jN4/I=";
+  };
+
+  cargoHash = "sha256-9eZwCOP4xQtFOieqVRBAdXZrXmzdnae6PexGJ/eCyYc=";
+
+  nativeBuildInputs = [ wrapGAppsHook4 pkg-config ];
+
+  buildInputs = [ gdk-pixbuf gtk4 pango vte-gtk4 ];
+
+  postInstall = ''
+    make PREFIX=$out install-resources
+  '';
+
+  meta = with lib; {
+    description = "Gtk ui for neovim";
+    homepage = "https://github.com/Lyude/neovim-gtk";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ aleksana ];
+    mainProgram = "nvim-gtk";
+  };
+}

pkgs/applications/editors/vim/plugins/generated.nix

@@ -29,12 +29,12 @@ final: prev:
 
   ChatGPT-nvim = buildVimPluginFrom2Nix {
     pname = "ChatGPT.nvim";
-    version = "2023-03-11";
+    version = "2023-03-13";
     src = fetchFromGitHub {
       owner = "jackMort";
       repo = "ChatGPT.nvim";
-      rev = "3ad20aeee036378478bfb75788c6e287964ece8e";
+      rev = "783a23c70ca6b43b4591fce9bdfeda408e2d6415";
-      sha256 = "1wjj3gv3qpa9liy7sz14ah7np6k3qw5vnkx6qggm9rzcrqf7jidp";
+      sha256 = "0a9ys9d2b6hj0vi7x6x20s6dh09slm851wy9kn7ya43vycvx4v2h";
     };
     meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/";
   };
@@ -293,12 +293,12 @@ final: prev:
 
   SchemaStore-nvim = buildVimPluginFrom2Nix {
     pname = "SchemaStore.nvim";
-    version = "2023-03-10";
+    version = "2023-03-12";
     src = fetchFromGitHub {
       owner = "b0o";
       repo = "SchemaStore.nvim";
-      rev = "083485d0ec106c46eb38b525342dc8e23a9921c9";
+      rev = "1dc606bf07e1419d785e04d6dbb8585987d817cc";
-      sha256 = "1bcjh8a3mqvnbgp12c3ln7snwaarrdsn33bi1lwvcdas341gk23v";
+      sha256 = "0l7vmvr5rfn7bjaia505aqwwvvhpbc3f6mfn8q49an3nngwf2plh";
     };
     meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
   };
@@ -703,12 +703,12 @@ final: prev:
 
   aurora = buildVimPluginFrom2Nix {
     pname = "aurora";
-    version = "2023-03-08";
+    version = "2023-03-12";
     src = fetchFromGitHub {
       owner = "ray-x";
       repo = "aurora";
-      rev = "31113f89c8b558f59cf3867079c8c5520b6945ba";
+      rev = "560fb5aa401bee5f2ee86084f338f300ff57aede";
-      sha256 = "02ivk0fvgvryjnhgvh8la9minmrg90dgvmgbwav2y17ir5ypv45p";
+      sha256 = "1avznnh7z48nshxab7d3rlkcjqanwx9x95rxpzbg4vcn3fp1szb6";
     };
     meta.homepage = "https://github.com/ray-x/aurora/";
   };
@@ -835,12 +835,12 @@ final: prev:
 
   barbecue-nvim = buildVimPluginFrom2Nix {
     pname = "barbecue.nvim";
-    version = "2023-03-07";
+    version = "2023-03-11";
     src = fetchFromGitHub {
       owner = "utilyre";
       repo = "barbecue.nvim";
-      rev = "65df9a7d51f11df6bd4f8bd9f0d8b378e92bb9b0";
+      rev = "d60fb8d8e240e5be04a20636f5b35b05a0d4712c";
-      sha256 = "1kaa12cr02bc1p9ywr9l6zd0pb1dpjdcn6m4m65fxd97sdqn97wj";
+      sha256 = "1lf4kwzpx87hvihzgmmpgm83wpkpzf7iav5yb46b3bf3b4cfjl9j";
     };
     meta.homepage = "https://github.com/utilyre/barbecue.nvim/";
   };
@@ -1063,12 +1063,12 @@ final: prev:
 
   ccc-nvim = buildVimPluginFrom2Nix {
     pname = "ccc.nvim";
-    version = "2023-03-11";
+    version = "2023-03-13";
     src = fetchFromGitHub {
       owner = "uga-rosa";
       repo = "ccc.nvim";
-      rev = "4869fb385990ec0495e0f175fdd01bd388a7e839";
+      rev = "f99a9e49f2f3e929364850a1aaa1b23aef5fca62";
-      sha256 = "0bb79zj40792grrw1lzqd6ssxqacacblb3szxwvnm9pwps9nc1jw";
+      sha256 = "1942iipkm67ibyvwbll6prsfqhjxq638spcwdw4k9hgzb1f3n3cy";
     };
     meta.homepage = "https://github.com/uga-rosa/ccc.nvim/";
   };
@@ -2095,24 +2095,24 @@ final: prev:
 
   coq-artifacts = buildVimPluginFrom2Nix {
     pname = "coq.artifacts";
-    version = "2023-03-05";
+    version = "2023-03-12";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "coq.artifacts";
-      rev = "3a32343a473cce5288a9732f90df67c533642427";
+      rev = "ee1814e2183bd424ca5528f82f3d6ce8f64e6f90";
-      sha256 = "0vr3l8f251qdn986pnwl6pwl1mf66wddd0kj8bhzcfi4zjg5sp1q";
+      sha256 = "0r4hl4w29mg9yg847ivsv1xhm3lq664989l2s8gzxbwypfs3kv3v";
     };
     meta.homepage = "https://github.com/ms-jpq/coq.artifacts/";
   };
 
   coq-thirdparty = buildVimPluginFrom2Nix {
     pname = "coq.thirdparty";
-    version = "2023-03-05";
+    version = "2023-03-12";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "coq.thirdparty";
-      rev = "0c42b34cf7f53bd90c378cc9ddd5b85344ac08f6";
+      rev = "e7c186c9cca268e9337077256544fa9fb86e7bbb";
-      sha256 = "0m90yvbnr79xhj7jgkbj3qk7wdidmqf88bda94s5yl8rjjb50am7";
+      sha256 = "11wv9cgs7nbknvgc4nsgwgs4yv234wy7z78x0z58ci3r55zhablw";
     };
     meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/";
   };
@@ -2131,12 +2131,12 @@ final: prev:
 
   coq_nvim = buildVimPluginFrom2Nix {
     pname = "coq_nvim";
-    version = "2023-03-10";
+    version = "2023-03-12";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "coq_nvim";
-      rev = "b33c5e010067a2d9674ad5253858da6489ae65d6";
+      rev = "4b4b93dbbfc871a3d32a244a4276ee06696c21bb";
-      sha256 = "1s23c1j95a73cxc1fxwbncv4z74gf8pw9p0kk6qz22xpk6zcypv7";
+      sha256 = "1fkj6ps167sq12y96cdksf7ipfgrh01z1p107x7akynfnyrlny1r";
     };
     meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
   };
@@ -2167,12 +2167,12 @@ final: prev:
 
   crates-nvim = buildVimPluginFrom2Nix {
     pname = "crates.nvim";
-    version = "2023-03-11";
+    version = "2023-03-12";
     src = fetchFromGitHub {
       owner = "saecki";
       repo = "crates.nvim";
-      rev = "8d96e24fc244a04cd5a7de1666b077b1b4deef73";
+      rev = "aa94d3844d6a12b1a8bf73c8a242ff2f540fb749";
-      sha256 = "0y4nhwwwyp83gzax1klw5w72l8f3v89b7pkac3xph5qvxk06njn1";
+      sha256 = "19k9p5jamm5vax66swyy594am4zw97i2p8sx57b3xhwssp6mvx48";
     };
     meta.homepage = "https://github.com/saecki/crates.nvim/";
   };
@@ -2275,12 +2275,12 @@ final: prev:
 
   dashboard-nvim = buildVimPluginFrom2Nix {
     pname = "dashboard-nvim";
-    version = "2023-03-09";
+    version = "2023-03-12";
     src = fetchFromGitHub {
       owner = "glepnir";
       repo = "dashboard-nvim";
-      rev = "6e31bf683a1852399ace9914edfd3aa1be3e5e23";
+      rev = "937524714999c3c5a096f839dc22dd77344e1567";
-      sha256 = "17h3awklj9x8k3w09c8hzy01nv07i5hwg5qm3y443xi6gs578apv";
+      sha256 = "0fy0pqzifkf5wsaqskjn9ca3dbnm7s0p55an47y2z101b7akbrcs";
     };
     meta.homepage = "https://github.com/glepnir/dashboard-nvim/";
   };
@@ -2661,12 +2661,12 @@ final: prev:
 
   diffview-nvim = buildVimPluginFrom2Nix {
     pname = "diffview.nvim";
-    version = "2023-03-11";
+    version = "2023-03-12";
     src = fetchFromGitHub {
       owner = "sindrets";
       repo = "diffview.nvim";
-      rev = "e783ed49acc6b210b295af5c792de811f99559be";
+      rev = "ebcbe90401555272025006db00da0972f7e0db63";
-      sha256 = "0xngir0bsg9p9hkqk0sjhrarjrynd5vmyxx32ckdsvccxlqqiwqf";
+      sha256 = "1zcapd1dwwqz9035h3rg2z582v7z49d03h0g28yi208xjm1wmwih";
     };
     meta.homepage = "https://github.com/sindrets/diffview.nvim/";
   };
@@ -2757,12 +2757,12 @@ final: prev:
 
   editorconfig-vim = buildVimPluginFrom2Nix {
     pname = "editorconfig-vim";
-    version = "2023-03-10";
+    version = "2023-03-13";
     src = fetchFromGitHub {
       owner = "editorconfig";
       repo = "editorconfig-vim";
-      rev = "6e2b0920f5836aaf882b43ee52700d3f509cdd1d";
+      rev = "5b875ac1aeba22abce3c499c0d5e4f33558fdf2c";
-      sha256 = "0qq4v8ya84rnq6rhmfsannpczqyqb8jw1iflnyw6875fa3rf3qn3";
+      sha256 = "1pnbhhqbaxp5jhdgs4g1a6fym7x2855lss2ykj5wdd21wna77rhn";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/editorconfig/editorconfig-vim/";
@@ -2843,12 +2843,12 @@ final: prev:
 
   falcon = buildVimPluginFrom2Nix {
     pname = "falcon";
-    version = "2023-03-03";
+    version = "2023-03-12";
     src = fetchFromGitHub {
       owner = "fenetikm";
       repo = "falcon";
-      rev = "722deb460aae7f94e36bb3b069c787ed5fa357c3";
+      rev = "634cef5919b14d0c68cec6fc7b094554e8ef9d7f";
-      sha256 = "04fks4xz0f50dak837775dlydphg2hxhqm69v3k1950jw7nh20q4";
+      sha256 = "1vrnvn7xgzdz1zn0wi516l96nkmi5jnwqzar5v9x0xdszjhqa553";
     };
     meta.homepage = "https://github.com/fenetikm/falcon/";
   };
@@ -2988,12 +2988,12 @@ final: prev:
 
   flatten-nvim = buildVimPluginFrom2Nix {
     pname = "flatten.nvim";
-    version = "2023-03-11";
+    version = "2023-03-12";
     src = fetchFromGitHub {
       owner = "willothy";
       repo = "flatten.nvim";
-      rev = "438c8b8ff8bc02e5c6650d55ec0094f56697f70a";
+      rev = "17bbf3e51d67f77f6adacbfc965734a3dccb02a3";
-      sha256 = "1kby1448pqi3fgmmkkfd5ms1ln13hab3g4xnnm1cy9bppa441p24";
+      sha256 = "0jmkx1alfsz1xmf39alwky7l4nl2m79nsqwad7sfi1vp8y3b7p99";
     };
     meta.homepage = "https://github.com/willothy/flatten.nvim/";
   };
@@ -3022,6 +3022,18 @@ final: prev:
     meta.homepage = "https://github.com/ncm2/float-preview.nvim/";
   };
 
+  floating-input-nvim = buildVimPluginFrom2Nix {
+    pname = "floating-input.nvim";
+    version = "2023-03-09";
+    src = fetchFromGitHub {
+      owner = "liangxianzhe";
+      repo = "floating-input.nvim";
+      rev = "2ac3b4b75de72ea715a04d6d1b8d92c7718d2c64";
+      sha256 = "165jk5dhi8lv6fcbfwk395vw5yikmm1v2r74l0nvpa3j6xl1h7zm";
+    };
+    meta.homepage = "https://github.com/liangxianzhe/floating-input.nvim/";
+  };
+
   floating-nvim = buildVimPluginFrom2Nix {
     pname = "floating.nvim";
     version = "2021-07-19";
@@ -3048,12 +3060,12 @@ final: prev:
 
   flutter-tools-nvim = buildVimPluginFrom2Nix {
     pname = "flutter-tools.nvim";
-    version = "2023-03-05";
+    version = "2023-03-12";
     src = fetchFromGitHub {
       owner = "akinsho";
       repo = "flutter-tools.nvim";
-      rev = "31f75ae70780cb593bbd3b5179203a9e2b05cefa";
+      rev = "467847f694beb2e6496c83e56631d7dfae901a9d";
-      sha256 = "0yh8idxnsi9m6y33ma4a9zxailfvygag51i6g2nfcjx7jazijjbw";
+      sha256 = "0ydmd6yvwjrrsb1b13i4d2v26bdivfbzlv54ggylwyi7bzfm28xm";
     };
     meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/";
   };
@@ -3084,12 +3096,12 @@ final: prev:
 
   friendly-snippets = buildVimPluginFrom2Nix {
     pname = "friendly-snippets";
-    version = "2023-03-03";
+    version = "2023-03-12";
     src = fetchFromGitHub {
       owner = "rafamadriz";
       repo = "friendly-snippets";
-      rev = "009887b76f15d16f69ae1341f86a7862f61cf2a1";
+      rev = "2f5b8a41659a19bd602497a35da8d81f1e88f6d9";
-      sha256 = "01haswbnqmjb4lyg25kimy09bsnwf9dn78bgy6jib4fkhv598dpw";
+      sha256 = "11h9i5b675p9h7h92lcn7vkn2hnkmn1kifji1932xkh45rizyshl";
     };
     meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
   };
@@ -3192,12 +3204,12 @@ final: prev:
 
   fzf-lua = buildVimPluginFrom2Nix {
     pname = "fzf-lua";
-    version = "2023-03-11";
+    version = "2023-03-13";
     src = fetchFromGitHub {
       owner = "ibhagwan";
       repo = "fzf-lua";
-      rev = "a553b614f1b89fdbf645efef977f4b7aa0fa6c19";
+      rev = "60ce55d8546188de614cd111f4d26932c70f0fb7";
-      sha256 = "1b0xny4w8g9r1rr17lnl675qplb5smkx8jyq0z15192i2714ksgi";
+      sha256 = "15v9s2bq55nnirwpkkqb3d5ldfibnvqm4wf4afjkqj64bgk7kga2";
     };
     meta.homepage = "https://github.com/ibhagwan/fzf-lua/";
   };
@@ -3240,12 +3252,12 @@ final: prev:
 
   gentoo-syntax = buildVimPluginFrom2Nix {
     pname = "gentoo-syntax";
-    version = "2023-03-09";
+    version = "2023-03-11";
     src = fetchFromGitHub {
       owner = "gentoo";
       repo = "gentoo-syntax";
-      rev = "347fa38461e86eda45f10a275b038386d4f608e1";
+      rev = "d4659a919096a0488694338a9cf4fbb749080779";
-      sha256 = "0yhsch3z41jgnbi7972sqzycpfmirxp8mkfg383xkz1wbk62x1i6";
+      sha256 = "100qlgf6w0fpxfck77ag7m4rkx9k51dn2dk655rapzd1dnry241v";
     };
     meta.homepage = "https://github.com/gentoo/gentoo-syntax/";
   };
@@ -3408,12 +3420,12 @@ final: prev:
 
   go-nvim = buildVimPluginFrom2Nix {
     pname = "go.nvim";
-    version = "2023-03-10";
+    version = "2023-03-12";
     src = fetchFromGitHub {
       owner = "ray-x";
       repo = "go.nvim";
-      rev = "f80661a7109373aedee491acd8ddadc57e5c60aa";
+      rev = "3b5b6b8aacfa5be9944b4cfe2673feb68a08655a";
-      sha256 = "1fzc99r07hb5fis0jxzasblzwvczs6vpqldlj8nmcx06flis53ll";
+      sha256 = "1pd8lqqdmyy3lz8x9i6g5kh02w7wydr90rqgzdm4f4cl5lm80p96";
     };
     meta.homepage = "https://github.com/ray-x/go.nvim/";
   };
@@ -3528,24 +3540,24 @@ final: prev:
 
   gruvbox-material = buildVimPluginFrom2Nix {
     pname = "gruvbox-material";
-    version = "2023-02-27";
+    version = "2023-03-12";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "gruvbox-material";
-      rev = "a0dc84816b913e9afcf6b8a5ade304bfb47a6f65";
+      rev = "4a6582f4137f4f303eb7d54ee31403ac0b675774";
-      sha256 = "0i79v09f92vdznv2bad825kfqfa345jk81ls6imgak84vsigfvhf";
+      sha256 = "11n7hhwcjq5g583q6qq81ixhh3nprwbcgkz4r70p0sb9r6f0m1wj";
     };
     meta.homepage = "https://github.com/sainnhe/gruvbox-material/";
   };
 
   gruvbox-nvim = buildVimPluginFrom2Nix {
     pname = "gruvbox.nvim";
-    version = "2023-03-10";
+    version = "2023-03-13";
     src = fetchFromGitHub {
       owner = "ellisonleao";
       repo = "gruvbox.nvim";
-      rev = "331507561a46d6ce484f576299e0297e277bac7f";
+      rev = "c6ef9c5a3a2ece0f8635460291eb4a4c06ed3dcc";
-      sha256 = "1myvjfyh8dyy0rpnbfcpljyamlnphavjhw4mzbrrq4wwm2lwcwb4";
+      sha256 = "1cnjdzg8l1dvr8lw3d5m4v880z7wd2y08ac5cl93p6wyzkz9m12i";
     };
     meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/";
   };
@@ -3611,12 +3623,12 @@ final: prev:
 
   haskell-tools-nvim = buildNeovimPluginFrom2Nix {
     pname = "haskell-tools.nvim";
-    version = "2023-03-09";
+    version = "2023-03-12";
     src = fetchFromGitHub {
       owner = "MrcJkb";
       repo = "haskell-tools.nvim";
-      rev = "344a3d968987f8e347053a89daadc6b026c8c458";
+      rev = "47d30b754753da4b70a18dbfbcec89cf6f067dcd";
-      sha256 = "14111h5fgrwj33s9kng7nzz9j8656xqcylw55qdddd07d2clcyph";
+      sha256 = "1sb21nrbmyrl0ahqyjxksa34n9vbwwkd52bdhwj1nwp3yy7k4spb";
     };
     meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";
   };
@@ -4079,12 +4091,12 @@ final: prev:
 
   kanagawa-nvim = buildVimPluginFrom2Nix {
     pname = "kanagawa.nvim";
-    version = "2023-03-10";
+    version = "2023-03-13";
     src = fetchFromGitHub {
       owner = "rebelot";
       repo = "kanagawa.nvim";
-      rev = "3579d55c47366a536e07cf83df397a9f5f806813";
+      rev = "99d9f72122e92ba816c86e10ce8e97c555be99ba";
-      sha256 = "1h40m2scxi8cswdjdxm5wq6bpv5ciza7zd0x3zdwi01cg73r5gyr";
+      sha256 = "0g6kly4kxik3bqh7iisypawrp4hrp104bim72wqbik92b079swav";
     };
     meta.homepage = "https://github.com/rebelot/kanagawa.nvim/";
   };
@@ -4235,12 +4247,12 @@ final: prev:
 
   leap-nvim = buildVimPluginFrom2Nix {
     pname = "leap.nvim";
-    version = "2023-03-07";
+    version = "2023-03-11";
     src = fetchFromGitHub {
       owner = "ggandor";
       repo = "leap.nvim";
-      rev = "dd4cabf7699ae8e2e17cfc29910ec605da32226d";
+      rev = "2ff8eac67bed41005ea2032728a0336c784de611";
-      sha256 = "0ymgfbn7hgvb7d5fqpi3q4gxrmy7m5njb5cc7rnvfg9wi5ici7np";
+      sha256 = "1sfnxias9i1s3ppxpkg084bk1dpcxyd3f34sk9jxdr6v9101zpls";
     };
     meta.homepage = "https://github.com/ggandor/leap.nvim/";
   };
@@ -4690,12 +4702,12 @@ final: prev:
 
   luasnip = buildVimPluginFrom2Nix {
     pname = "luasnip";
-    version = "2023-03-08";
+    version = "2023-03-13";
     src = fetchFromGitHub {
       owner = "l3mon4d3";
       repo = "luasnip";
-      rev = "836d4f5a9970819b60b1010fd8709a2ff88416d8";
+      rev = "54e06334a440b476fcc184fcf555cfd4ad9110c0";
-      sha256 = "1kskc6wyw4f7l2vwyyrc9bww3h6r2mqdxqyj66p9bhip97qr4i3d";
+      sha256 = "1pl7rndvvgy143aj6xc4znihp7c8skx790kah5ww94cq4mk2x6zs";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/l3mon4d3/luasnip/";
@@ -4763,12 +4775,12 @@ final: prev:
 
   mason-lspconfig-nvim = buildVimPluginFrom2Nix {
     pname = "mason-lspconfig.nvim";
-    version = "2023-03-06";
+    version = "2023-03-12";
     src = fetchFromGitHub {
       owner = "williamboman";
       repo = "mason-lspconfig.nvim";
-      rev = "a31e011135a79d63c71254c250c9158e1056a1cb";
+      rev = "a81503f0019942111fe464209237f8b4e85f4687";
-      sha256 = "0wqkq7qa64xrpw58hymq4skpx23nzcsfbbjlm76kv7hz4pp9q5a7";
+      sha256 = "0cc6yb5nb9nf27dp6dzrk8ynzbzsjg0qxsagggiv1w6bk8npgj24";
     };
     meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/";
   };
@@ -4787,12 +4799,12 @@ final: prev:
 
   mason-nvim = buildVimPluginFrom2Nix {
     pname = "mason.nvim";
-    version = "2023-03-10";
+    version = "2023-03-13";
     src = fetchFromGitHub {
       owner = "williamboman";
       repo = "mason.nvim";
-      rev = "e52225531a8b622ff79c6e11ffd3df9acea8327b";
+      rev = "10ff879fc56160e10437da5c1ca558371ddb6989";
-      sha256 = "0k5c43jwxg4f0xpdrx4qzf83nc00170grx2crd593kij5aljmn50";
+      sha256 = "16m8iaikbfhff80f0yil330r7b0fcar346fkf1w8spkv6kj3qy3b";
     };
     meta.homepage = "https://github.com/williamboman/mason.nvim/";
   };
@@ -4859,12 +4871,12 @@ final: prev:
 
   mini-nvim = buildVimPluginFrom2Nix {
     pname = "mini.nvim";
-    version = "2023-03-10";
+    version = "2023-03-13";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.nvim";
-      rev = "82693318b691de0676c17457b5d7d26a7798f761";
+      rev = "59d743370aa623ba2c5c1e48f3718058b13ec7b6";
-      sha256 = "0vks9yl7a3314yfq8kjghxbl4ag3zaxnjgara075wm7x9nkn0ycf";
+      sha256 = "1zivc2pwr2k6ixqc8p86cf3ql0p2pf2nd7lvkhwj3904pkyfxk3h";
     };
     meta.homepage = "https://github.com/echasnovski/mini.nvim/";
   };
@@ -5195,12 +5207,12 @@ final: prev:
 
   neo-tree-nvim = buildVimPluginFrom2Nix {
     pname = "neo-tree.nvim";
-    version = "2023-03-01";
+    version = "2023-03-12";
     src = fetchFromGitHub {
       owner = "nvim-neo-tree";
       repo = "neo-tree.nvim";
-      rev = "aec592bb1f0cf67f7e1123053d1eb17700aa9ed4";
+      rev = "205184aa0e0f08e8a1249d9bb37b45bae85f01b9";
-      sha256 = "0axp9qaqczb3lir7ddb3i33c4nhyxckgln4vnv833a921hn0sg24";
+      sha256 = "166mgm7k7as2jppfw9x0mr64ynxqvkd4rbaq0hwbpq30najl2jlm";
     };
     meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/";
   };
@@ -5219,12 +5231,12 @@ final: prev:
 
   neoconf-nvim = buildVimPluginFrom2Nix {
     pname = "neoconf.nvim";
-    version = "2023-03-10";
+    version = "2023-03-13";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "neoconf.nvim";
-      rev = "36b0be969326e70143bcd878d4a27f574eabc292";
+      rev = "48178e12a8b722f36ca9f0e8ff0a5487b45de493";
-      sha256 = "0cr4s1j1crfqh6ds5abxa4miqjky5pv7h24824i51ji2yv7vz8mm";
+      sha256 = "03lnz99vg21qpraca8y6bkbmy1m04x5idxgxlad1y4gf9a6x1cag";
     };
     meta.homepage = "https://github.com/folke/neoconf.nvim/";
   };
@@ -5243,12 +5255,12 @@ final: prev:
 
   neodev-nvim = buildVimPluginFrom2Nix {
     pname = "neodev.nvim";
-    version = "2023-03-11";
+    version = "2023-03-13";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "neodev.nvim";
-      rev = "418c54441da2506ee9c99150c38e3f350bcad8c4";
+      rev = "abdc346ff59c414698de551f876bcf3f223ed224";
-      sha256 = "1g9dzf2dhfm4vxqpcr075nh6gb62l79gv88khiq1y5958qw095cr";
+      sha256 = "0vvhay3addl5pp48k2qifj88dimkspajx4am5lypiwifgq1gnjqk";
     };
     meta.homepage = "https://github.com/folke/neodev.nvim/";
   };
@@ -5399,24 +5411,24 @@ final: prev:
 
   neotest = buildVimPluginFrom2Nix {
     pname = "neotest";
-    version = "2023-02-23";
+    version = "2023-03-13";
     src = fetchFromGitHub {
       owner = "nvim-neotest";
       repo = "neotest";
-      rev = "95f95e346090ad96c657f021ad4d47f93c915598";
+      rev = "631a7ccc7072fdc76e3597c2fc8030faf35771d1";
-      sha256 = "1mimygy2815jd0k9fgh2f93dq3pgm44j6vibj5hbqz083vhvlp9m";
+      sha256 = "14vvs18g7cy8amvy6pnq5342ryvx5h1s5078ml6ql2y04avhs1xa";
     };
     meta.homepage = "https://github.com/nvim-neotest/neotest/";
   };
 
   neotest-haskell = buildVimPluginFrom2Nix {
     pname = "neotest-haskell";
-    version = "2023-03-10";
+    version = "2023-03-12";
     src = fetchFromGitHub {
       owner = "MrcJkb";
       repo = "neotest-haskell";
-      rev = "9776e8881e976a340f1df693a04fd570b9198193";
+      rev = "072f6fec596869b6cc5f58e86ef1ffd4d40135c4";
-      sha256 = "0kc7kqma8nz4hfy6c11mm2aa9jz2b5083qa38wqpshmz408va729";
+      sha256 = "1c9nmxcrlyf0qd027rdg5zhxpic8pkks7mqipkq86c23l3jyq483";
     };
     meta.homepage = "https://github.com/MrcJkb/neotest-haskell/";
   };
@@ -5543,12 +5555,12 @@ final: prev:
 
   nightfox-nvim = buildVimPluginFrom2Nix {
     pname = "nightfox.nvim";
-    version = "2023-03-11";
+    version = "2023-03-13";
     src = fetchFromGitHub {
       owner = "EdenEast";
       repo = "nightfox.nvim";
-      rev = "a8044b084e0114609ec2c59cc4fa94c709a457d4";
+      rev = "8bb6713c56458aae339575b205234d820ec2046a";
-      sha256 = "0pdszkzhlfi2fd3i04gxs8gy880qvbqicz6jf7db9abxby2zmfx3";
+      sha256 = "1895g32d00wgnfnj5r29q01ir0kgl3psa4bpwpqy6v4jzq45xz6g";
     };
     meta.homepage = "https://github.com/EdenEast/nightfox.nvim/";
   };
@@ -5567,24 +5579,24 @@ final: prev:
 
   nix-develop-nvim = buildVimPluginFrom2Nix {
     pname = "nix-develop.nvim";
-    version = "2023-01-11";
+    version = "2023-03-12";
     src = fetchFromGitHub {
       owner = "figsoda";
       repo = "nix-develop.nvim";
-      rev = "ce61f6d964232c86b522c292667841f42ebee618";
+      rev = "c66642813d1e31a6d133d78ecf964404e15a89fc";
-      sha256 = "0yfs2iws6d370scq4jgc7gq3n5r3a0lwqfs7awcliks524768c6j";
+      sha256 = "03qys9038ybc9062w5imdmrs6dlnbp1asggd5czzw7zccvw42db0";
     };
     meta.homepage = "https://github.com/figsoda/nix-develop.nvim/";
   };
 
   nlsp-settings-nvim = buildVimPluginFrom2Nix {
     pname = "nlsp-settings.nvim";
-    version = "2023-03-09";
+    version = "2023-03-12";
     src = fetchFromGitHub {
       owner = "tamago324";
       repo = "nlsp-settings.nvim";
-      rev = "1b9fed5dec33c6c731dc8ff91d337091930474be";
+      rev = "9d8dae1a780432e2bf6984515a77cc25697e45ae";
-      sha256 = "0bs6j61fjd4ycvhyr54h40v2rj3rymn2s7ncnzbdsczgp3y9wzxi";
+      sha256 = "1wygxab1sqinnnh527w1llcv1bb9qydns6w9vvh9bsbag7a9wgs6";
     };
     meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
   };
@@ -5627,24 +5639,24 @@ final: prev:
 
   noice-nvim = buildVimPluginFrom2Nix {
     pname = "noice.nvim";
-    version = "2023-03-03";
+    version = "2023-03-12";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "noice.nvim";
-      rev = "c22651651da01239fc4afac4cdb7261797d5f02e";
+      rev = "e2a04d480a9fba6b698c01998582ea17aa213ba3";
-      sha256 = "01zbk00di167npblpf126dqcsyc97k2w72nn88mkkhvhsna28x6x";
+      sha256 = "0m4iz32zr3mw8b7mdfqcrvz53xzsrf0dz17xw67knyia85m4h9l5";
     };
     meta.homepage = "https://github.com/folke/noice.nvim/";
   };
 
   nord-nvim = buildVimPluginFrom2Nix {
     pname = "nord.nvim";
-    version = "2023-01-20";
+    version = "2023-03-12";
     src = fetchFromGitHub {
       owner = "shaunsingh";
       repo = "nord.nvim";
-      rev = "9824b8511dcb7d89de628d7e9bab5fa65c9d59d1";
+      rev = "be318c83a233cb877ba08faa15380a54241272b1";
-      sha256 = "0y6paf8kyj30kkkwi9w2hank27b6f68l0swnly3w6abxfariwnpz";
+      sha256 = "1wk40p9sh6i7gljixnrx57ik8fw57dh8kzmf53kqigafxayzj0sa";
     };
     meta.homepage = "https://github.com/shaunsingh/nord.nvim/";
   };
@@ -5687,12 +5699,12 @@ final: prev:
 
   null-ls-nvim = buildVimPluginFrom2Nix {
     pname = "null-ls.nvim";
-    version = "2023-03-10";
+    version = "2023-03-12";
     src = fetchFromGitHub {
       owner = "jose-elias-alvarez";
       repo = "null-ls.nvim";
-      rev = "e172e1e3011e3d032dbeba6414644ba968570828";
+      rev = "09e99259f4cdd929e7fb5487bf9d92426ccf7cc1";
-      sha256 = "1srbfrjx1zzkkvvd9h9g0hyhrqs4yh6z8znwmzxr9xajg2f7m6kd";
+      sha256 = "05py2p82srijkvrr5nc8393v25hdgdgiqmnsy5qiiab82qkyvhhj";
     };
     meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
   };
@@ -6063,8 +6075,8 @@ final: prev:
     src = fetchFromGitHub {
       owner = "Iron-E";
       repo = "nvim-highlite";
-      rev = "6336cf91dcd7a3919a57d8cfba582b7651eb9d60";
+      rev = "9cce41f5b760ab98bb2c2b0b8a6daf353ec1bb43";
-      sha256 = "0w008x0xsn7rp94kpjnyx06hl730pp7fscj1dnwwgphwr41r41wz";
+      sha256 = "0wm61s1w25inx9spy8cdif1iwmcdijjiy0j8yiywld3q7ixvdbqq";
     };
     meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
   };
@@ -6203,12 +6215,12 @@ final: prev:
 
   nvim-luadev = buildVimPluginFrom2Nix {
     pname = "nvim-luadev";
-    version = "2022-01-26";
+    version = "2023-03-13";
     src = fetchFromGitHub {
       owner = "bfredl";
       repo = "nvim-luadev";
-      rev = "2a2c242bd751c289cfc1bc27f357925f68eba098";
+      rev = "395b7cf3af3e543332c74e883c33eb52364b0b4f";
-      sha256 = "0prwzxgg6fqkfmqqs41c1c81lch2x4qrs7287l5b104rz3alcinn";
+      sha256 = "0fxx7gn184l00hrskhcsr9dr39r4bwdkn9h5r2g79qp64i0cqmsh";
     };
     meta.homepage = "https://github.com/bfredl/nvim-luadev/";
   };
@@ -6443,36 +6455,36 @@ final: prev:
 
   nvim-tree-lua = buildVimPluginFrom2Nix {
     pname = "nvim-tree.lua";
-    version = "2023-03-05";
+    version = "2023-03-13";
     src = fetchFromGitHub {
       owner = "nvim-tree";
       repo = "nvim-tree.lua";
-      rev = "bbb6d4891009de7dab05ad8fc2d39f272d7a751c";
+      rev = "fe980baa945100d92f77fe55e2ca113cae1b1bd3";
-      sha256 = "1a7wjglszsssm8h31322bz05gfgp86pp4yral9za3gaib2p534v3";
+      sha256 = "12kkn975dj634yix140qjrx4n5dbx6ga50clgbrik74gmq07nj1d";
     };
     meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
   };
 
   nvim-treesitter = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter";
-    version = "2023-03-11";
+    version = "2023-03-13";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "5d59d18d3e6559e525fd933c41070303c5bae32b";
+      rev = "834f1dcb8736c82b1269227b4bfe830310b5b6a1";
-      sha256 = "10ppmv3ijr49g5k05lf1ydkxdi5v38aynm0y2mj89c2p83dps8gv";
+      sha256 = "1gdlypc4qkxh7fghac12562l54hzwlyq74y4p3gsvqzf49m0s9w3";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
   };
 
   nvim-treesitter-context = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter-context";
-    version = "2023-03-11";
+    version = "2023-03-13";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter-context";
-      rev = "67dcaf9d913d31a9e87d8deceb7eaecf1c33bb22";
+      rev = "cb6252b00d19c8b57e8e66de19a601df28455dd1";
-      sha256 = "1q56y6y3kf7by39nfsg1l466yzjwjjbdnrqfjiqrnjv32pm7nfa9";
+      sha256 = "06i741381w7hah0mlgg23hrlb57k3qvibgpnncqiw5c17mas01a6";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/";
   };
@@ -6503,12 +6515,12 @@ final: prev:
 
   nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter-textobjects";
-    version = "2023-03-09";
+    version = "2023-03-12";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter-textobjects";
-      rev = "542e0879d524ba717234fcba049b6c2da7989d5a";
+      rev = "5b2bcb9ca8315879181f468b37a897100d631005";
-      sha256 = "0v5rjjjlfh9rddn4w7g1b5ng5z613gsg650i6yqvpsl2z7bgxdyx";
+      sha256 = "0ij8jgvhyqrlw077296dx9ck0agjdd2p5r5fiizsvxrwv0jc6ikj";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
   };
@@ -6551,11 +6563,11 @@ final: prev:
 
   nvim-ts-rainbow2 = buildVimPluginFrom2Nix {
     pname = "nvim-ts-rainbow2";
-    version = "2023-03-07";
+    version = "2023-03-12";
     src = fetchgit {
       url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2";
-      rev = "6bcb1472c321a15eef5a7a015b4fefa8758e6513";
+      rev = "7711a873d1f16a9f3049715b63cdd71973108871";
-      sha256 = "1shym9028sv5zs2ianyvivm2ij3j013d098yc4vrs0yf5l9vpdy4";
+      sha256 = "0kwx3mcs3l56hvr1c0fapfdggfjg25z7nyxvn8v5ch087zfm5kjy";
     };
     meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2";
   };
@@ -6574,12 +6586,12 @@ final: prev:
 
   nvim-web-devicons = buildVimPluginFrom2Nix {
     pname = "nvim-web-devicons";
-    version = "2023-03-07";
+    version = "2023-03-13";
     src = fetchFromGitHub {
       owner = "nvim-tree";
       repo = "nvim-web-devicons";
-      rev = "4af94fec29f508159ceab5413383e5dedd6c24e3";
+      rev = "b8d0c99578dcb9d084a45ca4b3a4a502712c2741";
-      sha256 = "0v4ajp8s4450qfbbxradka0kbh1k4fdvia9h0r15ah9qrlczfaih";
+      sha256 = "1mm33s20x4mrxjzxacal2fjxjyqwc3rnbj1f7zvi4ml00wcwiaps";
     };
     meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/";
   };
@@ -6670,12 +6682,12 @@ final: prev:
 
   oil-nvim = buildVimPluginFrom2Nix {
     pname = "oil.nvim";
-    version = "2023-03-07";
+    version = "2023-03-13";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "oil.nvim";
-      rev = "33d5701a8de02bdba171d0795e4422e002f61742";
+      rev = "383971b0cfd8248ec3d00d4a3154d69ebd5e394e";
-      sha256 = "1x3x4dmvmjrsay4x0kfz18jkp1aq9cgndgmwnlli1f432hmf3nps";
+      sha256 = "149lcp5pjyw976r1a83mxfgz75kfnrb5nknqynjqlla191z13ddv";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/oil.nvim/";
@@ -6731,12 +6743,12 @@ final: prev:
 
   onedarkpro-nvim = buildVimPluginFrom2Nix {
     pname = "onedarkpro.nvim";
-    version = "2023-03-11";
+    version = "2023-03-12";
     src = fetchFromGitHub {
       owner = "olimorris";
       repo = "onedarkpro.nvim";
-      rev = "6e9afac9fc4e3c866086c7a73951683959bb04b0";
+      rev = "61cfeceb812ab2c616c3267090e38d0be00d0564";
-      sha256 = "0dmnph1lsv5lb79f6wwnhxz41yw499648j53q215vsjaqxql6drv";
+      sha256 = "0zpb4h4mx1xp0d68cl2ywd1w27ww6p5fh6xr68m9hj58gmpa5saj";
     };
     meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
   };
@@ -6755,12 +6767,12 @@ final: prev:
 
   onenord-nvim = buildVimPluginFrom2Nix {
     pname = "onenord.nvim";
-    version = "2023-03-08";
+    version = "2023-03-11";
     src = fetchFromGitHub {
       owner = "rmehri01";
       repo = "onenord.nvim";
-      rev = "c2181be38edea8c8629353163b528ed217f11116";
+      rev = "9a59d47db81e566d4e254904479f129cfffe5f21";
-      sha256 = "07hrppbj1njnjdyq4v6vxx3nfycr4dx45my23h0ix2kwqhw8f4ad";
+      sha256 = "07052ni5kjm5xcc6wl1hvrwayif1srjhlaggawpn8icahhrpn25r";
     };
     meta.homepage = "https://github.com/rmehri01/onenord.nvim/";
   };
@@ -7417,12 +7429,12 @@ final: prev:
 
   satellite-nvim = buildVimPluginFrom2Nix {
     pname = "satellite.nvim";
-    version = "2023-01-20";
+    version = "2023-03-13";
     src = fetchFromGitHub {
       owner = "lewis6991";
       repo = "satellite.nvim";
-      rev = "d522369aa50cf8c0116c952ddc55253c505e8bf7";
+      rev = "da81fe4573ed3f203fa7aa8db6f125b6a5380390";
-      sha256 = "1sbq1akv33sj3apqyw8sc7zpw36cyxk8m1inhmwdwgampzhl9sxc";
+      sha256 = "1dgdfwij1w0q2jcvyz56pav1fhzbihpkzgvgcx8hmlxx7p30hmby";
     };
     meta.homepage = "https://github.com/lewis6991/satellite.nvim/";
   };
@@ -8322,12 +8334,12 @@ final: prev:
 
   telescope-manix = buildNeovimPluginFrom2Nix {
     pname = "telescope-manix";
-    version = "2023-03-08";
+    version = "2023-03-12";
     src = fetchFromGitHub {
       owner = "MrcJkb";
       repo = "telescope-manix";
-      rev = "0f198947a50587119f678635a889d0461ada710b";
+      rev = "a7cfacda4dc8a56383b30d402ab9eedcffc24c49";
-      sha256 = "0l4sj1mdvf4q5skzjdwq564px6fsx64bdviwb9lkyn6crh65ffa1";
+      sha256 = "071fdpxqv0l2zxjy71p0xi8p84jacqfpi9wzv0nm5w5dv8irr304";
     };
     meta.homepage = "https://github.com/MrcJkb/telescope-manix/";
   };
@@ -8646,12 +8658,12 @@ final: prev:
 
   todo-comments-nvim = buildVimPluginFrom2Nix {
     pname = "todo-comments.nvim";
-    version = "2023-01-23";
+    version = "2023-03-12";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "todo-comments.nvim";
-      rev = "74c7d28cb50b0713c881ef69bcb6cdd77d8907d1";
+      rev = "6ccb0bebeb22dbe31940776a750db54b844ae653";
-      sha256 = "1k42l9ghpkds2fqxj8f0anlh4gkpiid28zwkhy29k2br21m7q5fq";
+      sha256 = "1dmvry7m4rdwrqmb7kaa4zx9mcda8n1yagabyg7nds7jyld671gw";
     };
     meta.homepage = "https://github.com/folke/todo-comments.nvim/";
   };
@@ -8683,24 +8695,24 @@ final: prev:
 
   toggleterm-nvim = buildVimPluginFrom2Nix {
     pname = "toggleterm.nvim";
-    version = "2023-03-11";
+    version = "2023-03-12";
     src = fetchFromGitHub {
       owner = "akinsho";
       repo = "toggleterm.nvim";
-      rev = "fd63194901fa80c65f6ff2951b8a975b0c13d9b1";
+      rev = "c8e982ad2739eeb0b13d0fecb14820c9bf5e3da0";
-      sha256 = "0mzhj00d6k4apzq2bl1cajx16pvcin0zpq0mhavlviwb1r37yri7";
+      sha256 = "1cg2qhzfdmw501v8w667n3i7kcl31ci3h71f7ia9p3c5fx85xbww";
     };
     meta.homepage = "https://github.com/akinsho/toggleterm.nvim/";
   };
 
   tokyonight-nvim = buildVimPluginFrom2Nix {
     pname = "tokyonight.nvim";
-    version = "2023-03-08";
+    version = "2023-03-12";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "tokyonight.nvim";
-      rev = "3ebc29df627c5cf70eb6acb8f0843c9ea9cf6348";
+      rev = "27203d70747094527d13575ed08f6a714e7a43f8";
-      sha256 = "16iq60snxaw6n7gxmcvahahzmb1b3pw07rc9cab597qh3vhhszy9";
+      sha256 = "0mrwy3519wb59g42aafnhn8xlpc7yhwdni0q91napcbnjrx8s4r5";
     };
     meta.homepage = "https://github.com/folke/tokyonight.nvim/";
   };
@@ -8731,12 +8743,12 @@ final: prev:
 
   treesj = buildVimPluginFrom2Nix {
     pname = "treesj";
-    version = "2023-03-05";
+    version = "2023-03-12";
     src = fetchFromGitHub {
       owner = "Wansmer";
       repo = "treesj";
-      rev = "19e1150d52ae16bac2465bcd7633c05702b5ae59";
+      rev = "bde69d35d37477dc1997f00cc08047f49aa90f7a";
-      sha256 = "0d1c0674v26lnwy1q9fg1jsiiyq6lxq49dxmgm3k37z9kw3j61jy";
+      sha256 = "0fc7kayzzvz8knmrdd4wsd3vppxkd8dsasp53lm3951xyjb18mlc";
     };
     meta.homepage = "https://github.com/Wansmer/treesj/";
   };
@@ -12730,12 +12742,12 @@ final: prev:
 
   vim-snipmate = buildVimPluginFrom2Nix {
     pname = "vim-snipmate";
-    version = "2022-06-11";
+    version = "2023-03-12";
     src = fetchFromGitHub {
       owner = "garbas";
       repo = "vim-snipmate";
-      rev = "525f331320427bf7aeb07651e2536b1f8a23df03";
+      rev = "074fe09bca0dbe49aea9c5202edba0d1c7ead10c";
-      sha256 = "0qfai0x9zg52n43ikgxx5x9y1nl3x420q8564csxirnbhnbn5xgx";
+      sha256 = "01h3cha6xh6srrkhsk89r7xfh577k5ivrgvnxakgnna95mf94r02";
     };
     meta.homepage = "https://github.com/garbas/vim-snipmate/";
   };
@@ -13367,24 +13379,24 @@ final: prev:
 
   vim-vsnip = buildVimPluginFrom2Nix {
     pname = "vim-vsnip";
-    version = "2022-12-20";
+    version = "2023-03-12";
     src = fetchFromGitHub {
       owner = "hrsh7th";
       repo = "vim-vsnip";
-      rev = "8dde8c0ef10bb1afdbb301e2bd7eb1c153dd558e";
+      rev = "7753ba9c10429c29d25abfd11b4c60b76718c438";
-      sha256 = "09vxb458xglzrmxjahxabnqkrkb0cbl6sf9jplp01v0cy3jjfmmw";
+      sha256 = "1l8myq6c5rckk6jr3s5rx9jpnrgzk1a65yky1b28mvayd6yff4vs";
     };
     meta.homepage = "https://github.com/hrsh7th/vim-vsnip/";
   };
 
   vim-vsnip-integ = buildVimPluginFrom2Nix {
     pname = "vim-vsnip-integ";
-    version = "2022-11-09";
+    version = "2023-03-12";
     src = fetchFromGitHub {
       owner = "hrsh7th";
       repo = "vim-vsnip-integ";
-      rev = "1cf89903f12777b90dd79eb4b3d7fbc0b9a254a1";
+      rev = "1930f0fc234521945afd48db2bff09d925211571";
-      sha256 = "00a5kdcdlfnn5f2yv6cavy91f91w0aqckcgpqvchgs631ypjqbp4";
+      sha256 = "1am4r68awdvjk51r6cyvvkkzj9zpiz394kn6qbjgz9qdc3xbsf1k";
     };
     meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/";
   };
@@ -13752,12 +13764,12 @@ final: prev:
 
   vimwiki = buildVimPluginFrom2Nix {
     pname = "vimwiki";
-    version = "2023-03-10";
+    version = "2023-03-12";
     src = fetchFromGitHub {
       owner = "vimwiki";
       repo = "vimwiki";
-      rev = "acff8a5b1dd0f9f29797d979819b6e96efa5a656";
+      rev = "34ceee8aaa760d2afc2b220916c8844575fd8d17";
-      sha256 = "1d39cqn1v2pzqc3znprsq27i79mvvyi1g0qk582965ha17569l0k";
+      sha256 = "1gfyi75xxphg6b2cikq3lh353nzyrkw54gflw1pglhcrfxb34y82";
     };
     meta.homepage = "https://github.com/vimwiki/vimwiki/";
   };
@@ -14113,12 +14125,12 @@ final: prev:
 
   catppuccin-nvim = buildVimPluginFrom2Nix {
     pname = "catppuccin-nvim";
-    version = "2023-03-09";
+    version = "2023-03-13";
     src = fetchFromGitHub {
       owner = "catppuccin";
       repo = "nvim";
-      rev = "90c4d1c6e1f8dd2cff9962b36a70b1e681947621";
+      rev = "839d015ce9b6c9447fd8b40e43a6411ccc87ebf1";
-      sha256 = "1y5sp0g2r3x9vmwp45p0rxd0369bvrc5z2f9fk54n278qrg3xi7l";
+      sha256 = "1xaq3pamnvxl0fwqxzppjddgmd9453kqqsj1y1mxiqvaphsifxya";
     };
     meta.homepage = "https://github.com/catppuccin/nvim/";
   };
@@ -14137,12 +14149,12 @@ final: prev:
 
   chad = buildVimPluginFrom2Nix {
     pname = "chad";
-    version = "2023-03-05";
+    version = "2023-03-12";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "chadtree";
-      rev = "1188c4a39167237d551d279c9f84a3e34c7c2329";
+      rev = "62028983c38d849f0b918e02538bd0feb524c5b7";
-      sha256 = "11igiz9l5r7qj6hj1xn5wgzx6a5acgldqq6vjs9w6viwc9cvvin7";
+      sha256 = "11sbp59d1p3a8842b8a8ib7pcfb21y3pfsj5cjy7k5mr156jzr5y";
     };
     meta.homepage = "https://github.com/ms-jpq/chadtree/";
   };
@@ -14233,12 +14245,12 @@ final: prev:
 
   rose-pine = buildVimPluginFrom2Nix {
     pname = "rose-pine";
-    version = "2023-03-09";
+    version = "2023-03-12";
     src = fetchFromGitHub {
       owner = "rose-pine";
       repo = "neovim";
-      rev = "63821c18a2840b3172fc5df15d9268d80f46fa17";
+      rev = "1883d8b417403f1d8c56d52d90445bbbe6be4b80";
-      sha256 = "1m85hwk6y321q7m95s4xd2alby7r3ipgybhf9jrkzjwi3z3yfmmq";
+      sha256 = "1wx9bb4qhd4ap030zrbninfwk409chlr8xsr88zw77pjhc1srzv2";
     };
     meta.homepage = "https://github.com/rose-pine/neovim/";
   };

pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix

@@ -299,7 +299,6 @@
       rev = "ea30a05d0f0446a96d8b096ad11828ad4f8ad849";
       hash = "sha256-ZiUMIsjVMxpchxmJQ3g2yXIn+/kAWPwTzMzx3IlW93o=";
     };
-    generate = true;
     meta.homepage = "https://github.com/joelspadin/tree-sitter-devicetree";
   };
   dhall = buildGrammar {
@@ -356,7 +355,7 @@
       hash = "sha256-Cch6WCYq9bsWGypzDGapxBLJ0ZB432uAl6YjEjBJ5yg=";
     };
     location = "crates/tree-sitter-ebnf";
-    meta.homepage = "https://github.com/RubixDev/ebnf.git";
+    meta.homepage = "https://github.com/RubixDev/ebnf";
   };
   eex = buildGrammar {
     language = "eex";
@@ -576,7 +575,6 @@
       rev = "f4685bf11ac466dd278449bcfe5fd014e94aa504";
       hash = "sha256-MjoY1tlVZgN6JqoTjhhg0zSdHzc8yplMr8824sfIKp8=";
     };
-    generate = true;
     meta.homepage = "https://github.com/shunsambongi/tree-sitter-gitignore";
   };
   gleam = buildGrammar {
@@ -632,7 +630,6 @@
       rev = "b6ef0768711086a86b3297056f9ffb5cc1d77b4a";
       hash = "sha256-ws/8nL+HOoPb6Hcdh4pihjPoRw90R1fy7MB0V9Lb9ik=";
     };
-    generate = true;
     meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-godot-resource";
   };
   gomod = buildGrammar {
@@ -1225,12 +1222,12 @@
   };
   php = buildGrammar {
     language = "php";
-    version = "f860e59";
+    version = "d5e7cac";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-php";
-      rev = "f860e598194f4a71747f91789bf536b393ad4a56";
+      rev = "d5e7cacb6c27e0e131c7f76c0dbfee56dfcc61e3";
-      hash = "sha256-j4RJUBbp2zvCHsZwnz62t2Tf6Cy1LOKrhg/pi8cqzAs=";
+      hash = "sha256-cSCHXREt3J6RSpug2EFKWYQNDUqrQeC0vDZ3SrRmLBY=";
     };
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";
   };
@@ -1390,12 +1387,12 @@
   };
   racket = buildGrammar {
     language = "racket";
-    version = "c2f7baa";
+    version = "ed5369a";
     src = fetchFromGitHub {
       owner = "6cdh";
       repo = "tree-sitter-racket";
-      rev = "c2f7baa22053a66b4dba852cdba3f14f34bb6985";
+      rev = "ed5369ad17166c0749ab7241d826c438bd69338d";
-      hash = "sha256-P6p2IOECsqCLBgtLE+xqzZuMS8d/lTfAHfTeONClVbY=";
+      hash = "sha256-/vvmVirIXH6uAtqEGvG//3XobLFzWCYXIGe4e0N1DsU=";
     };
     meta.homepage = "https://github.com/6cdh/tree-sitter-racket";
   };
@@ -1489,23 +1486,23 @@
   };
   scala = buildGrammar {
     language = "scala";
-    version = "2275b75";
+    version = "6f9bc5a";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-scala";
-      rev = "2275b754360de8539e02e84106fa38f7cb6de275";
+      rev = "6f9bc5ab749d90bb2ac4ad083891f9d0481d768d";
-      hash = "sha256-xc8/N2h9i7gZ+zPUzNpuwPg9++vZo8KvdOnjFF5YIo4=";
+      hash = "sha256-41cRG67Gb9qpaOEVtAtNkjvPurFGgtftHa0MedvJvnU=";
     };
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala";
   };
   scheme = buildGrammar {
     language = "scheme";
-    version = "38aef90";
+    version = "9a23ff3";
     src = fetchFromGitHub {
       owner = "6cdh";
       repo = "tree-sitter-scheme";
-      rev = "38aef90f54ef8f2e8e402b1f6f036ed19c636759";
+      rev = "9a23ff3df8f03da555f7679ab640a98a9e851c79";
-      hash = "sha256-RftYAEUwqlJrOnDs1Cmz5KmJMMBz5h5m7jXpNjWjDYQ=";
+      hash = "sha256-qEJgMSS6+q3lqks2CzG3XLZrd0Pl3b8jJiD/GA5TBOc=";
     };
     meta.homepage = "https://github.com/6cdh/tree-sitter-scheme";
   };
@@ -1644,12 +1641,12 @@
   };
   swift = buildGrammar {
     language = "swift";
-    version = "fe2e325";
+    version = "449d597";
     src = fetchFromGitHub {
       owner = "alex-pinkus";
       repo = "tree-sitter-swift";
-      rev = "fe2e325a45056cdb3fcda821c03b8cef0d79e508";
+      rev = "449d5974981d402181ca721e0573346f8c17f726";
-      hash = "sha256-ldPHpYhuAbodMPY8t8X7UiMY8kcds28r75R3Hqnlqv8=";
+      hash = "sha256-P7JEkB9MF9DmxQ/3G2IA2l4pzArzAP1rJQl4MNhu3Bo=";
     };
     generate = true;
     meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift";
@@ -1703,12 +1700,12 @@
   };
   thrift = buildGrammar {
     language = "thrift";
-    version = "e0c3e50";
+    version = "d4deb1b";
     src = fetchFromGitHub {
       owner = "duskmoon314";
       repo = "tree-sitter-thrift";
-      rev = "e0c3e50e17846230e88becdce28fbb1b41dcabba";
+      rev = "d4deb1bd9e848f2dbe81103a151d99e8546de480";
-      hash = "sha256-yqdGQabEE1unk7Rel+E3/MRXTEOz9XxrBVH9nj+mm/Q=";
+      hash = "sha256-MCa7319E8bo3r2kDClBmjOvvs+yZDlE1E+52WqJqvMI=";
     };
     meta.homepage = "https://github.com/duskmoon314/tree-sitter-thrift";
   };
@@ -1758,12 +1755,12 @@
   };
   tsx = buildGrammar {
     language = "tsx";
-    version = "c6e56d4";
+    version = "b66d19b";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-typescript";
-      rev = "c6e56d44c686a67c89e29e773e662567285d610f";
+      rev = "b66d19b9b6ec3edf3d8aff0c20646acbdaa0afb3";
-      hash = "sha256-usZAbf2sTNO78ldiiex6i94dh73kH6QOV0jjf5StuO0=";
+      hash = "sha256-YJrjxU2VmkVHTHta531fsJrx+K4Xih5kpFVEEqmvz34=";
     };
     location = "tsx";
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript";
@@ -1792,12 +1789,12 @@
   };
   typescript = buildGrammar {
     language = "typescript";
-    version = "c6e56d4";
+    version = "b66d19b";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-typescript";
-      rev = "c6e56d44c686a67c89e29e773e662567285d610f";
+      rev = "b66d19b9b6ec3edf3d8aff0c20646acbdaa0afb3";
-      hash = "sha256-usZAbf2sTNO78ldiiex6i94dh73kH6QOV0jjf5StuO0=";
+      hash = "sha256-YJrjxU2VmkVHTHta531fsJrx+K4Xih5kpFVEEqmvz34=";
     };
     location = "typescript";
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript";

pkgs/applications/editors/vim/plugins/vim-plugin-names

@@ -252,6 +252,7 @@ https://github.com/andviro/flake8-vim/,,
 https://github.com/willothy/flatten.nvim/,HEAD,
 https://github.com/ggandor/flit.nvim/,HEAD,
 https://github.com/ncm2/float-preview.nvim/,,
+https://github.com/liangxianzhe/floating-input.nvim/,HEAD,
 https://github.com/fhill2/floating.nvim/,,
 https://github.com/floobits/floobits-neovim/,,
 https://github.com/akinsho/flutter-tools.nvim/,HEAD,

pkgs/applications/graphics/ImageMagick/default.nix

@@ -47,13 +47,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "imagemagick";
-  version = "7.1.1-0";
+  version = "7.1.1-2";
 
   src = fetchFromGitHub {
     owner = "ImageMagick";
     repo = "ImageMagick";
     rev = finalAttrs.version;
-    hash = "sha256-FaoiB8qnzgREaslEXRituToIbU9tK3FnvC5ptFkctjA=";
+    hash = "sha256-5B8grg05n+MkHZU76QBsrrU5Z3VZRGMRHX35HXtTbe8=";
   };
 
   outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

pkgs/applications/misc/jetbrains-toolbox/default.nix

@@ -0,0 +1,74 @@
+{ stdenv
+, lib
+, fetchzip
+, copyDesktopItems
+, makeDesktopItem
+, makeWrapper
+, runCommand
+, appimageTools
+, patchelf
+}:
+let
+  pname = "jetbrains-toolbox";
+  version = "1.27.3.14493";
+
+  src = fetchzip {
+    url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}.tar.gz";
+    sha256 = "sha256-aK5T95Yg8Us8vkznWlDHnPiPAKiUtlU0Eswl9rD01VY=";
+    stripRoot = false;
+  };
+
+  appimageContents = runCommand "${pname}-extracted"
+    {
+      nativeBuildInputs = [ appimageTools.appimage-exec ];
+    }
+    ''
+      appimage-exec.sh -x $out ${src}/${pname}-${version}/${pname}
+    '';
+
+  appimage = appimageTools.wrapAppImage {
+    inherit pname version;
+    src = appimageContents;
+    extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.targetPkgs pkgs);
+  };
+
+  desktopItem = makeDesktopItem {
+    name = "JetBrains Toolbox";
+    exec = "jetbrains-toolbox";
+    comment = "JetBrains Toolbox";
+    desktopName = "JetBrains Toolbox";
+    type = "Application";
+    icon = "jetbrains-toolbox";
+    terminal = false;
+    categories = [ "Development" ];
+    startupWMClass = "jetbrains-toolbox";
+    startupNotify = false;
+  };
+in
+stdenv.mkDerivation {
+  inherit pname version src appimage;
+
+  nativeBuildInputs = [ makeWrapper copyDesktopItems ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm644 ${appimageContents}/.DirIcon $out/share/icons/hicolor/scalable/apps/jetbrains-toolbox.svg
+    makeWrapper ${appimage}/bin/${pname}-${version} $out/bin/${pname} --append-flags "--update-failed"
+
+    runHook postInstall
+  '';
+
+  desktopItems = [ desktopItem ];
+
+  # Disabling the tests, this seems to be very difficult to test this app.
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Jetbrains Toolbox";
+    homepage = "https://jetbrains.com/";
+    license = licenses.unfree;
+    maintainers = with maintainers; [ AnatolyPopov ];
+    platforms = [ "x86_64-linux" ];
+  };
+}

pkgs/applications/misc/megasync/default.nix

@@ -28,13 +28,13 @@
 }:
 mkDerivation rec {
   pname = "megasync";
-  version = "4.6.7.0";
+  version = "4.9.0.0";
 
   src = fetchFromGitHub {
     owner = "meganz";
     repo = "MEGAsync";
     rev = "v${version}_Linux";
-    sha256 = "sha256-vJSXvSTYEhxuG3KUQ+lBcppC8M70UnYlBLPHhYJSNOE=";
+    sha256 = "sha256-s0E8kJ4PJmhaxVcWPCyCk/KbcX4V3IESdZhSosPlZuM=";
     fetchSubmodules = true;
   };
 

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

@@ -38,7 +38,7 @@
   buildPythonApplication = if isQt6 then python3Packages.buildPythonApplication else mkDerivationWith python3Packages.buildPythonApplication;
 
   pname = "qutebrowser";
-  version = if isQt6 then "unstable-2022-09-16" else "2.5.2";
+  version = if isQt6 then "unstable-2022-09-16" else "2.5.3";
 
 in
 
@@ -60,7 +60,7 @@ buildPythonApplication {
   # the release tarballs are different from the git checkout!
    else fetchurl {
     url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
-    hash = "sha256-qb/OFN3EA94N6y7t+YPCMc4APgdZmV7H706jTkl06Qg=";
+    hash = "sha256-hF7yJDTQIztUcZJae20HVhfGlLprvz6GWrgpSwLJ14E=";
   };
 
   # Needs tox

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

@@ -23,9 +23,17 @@ in stdenv.mkDerivation rec {
   pname = "vivaldi";
   version = "5.7.2921.53";
 
+  suffix = {
+    aarch64-linux = "arm64";
+    x86_64-linux = "amd64";
+  }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+
   src = fetchurl {
-    url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_amd64.deb";
+    url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
-    sha256 = "sha256-qkKCoHJCRji3XfXk71n4BfjFyQpXZ+BariHmbYPAuv8=";
+    hash = {
+      aarch64-linux = "sha256-U8mRXXLqBxc+humj4Cz9x5q75KC+H3pXlVe0rp1Hat0=";
+      x86_64-linux = "sha256-qkKCoHJCRji3XfXk71n4BfjFyQpXZ+BariHmbYPAuv8=";
+    }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };
 
   unpackPhase = ''
@@ -106,6 +114,6 @@ in stdenv.mkDerivation rec {
     license     = licenses.unfree;
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     maintainers = with maintainers; [ otwieracz badmutex ];
-    platforms   = [ "x86_64-linux" ];
+    platforms   = [ "x86_64-linux" "aarch64-linux" ];
   };
 }

pkgs/applications/networking/cluster/kubedog/default.nix

@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "kubedog";
-  version = "0.9.6";
+  version = "0.9.9";
 
   src = fetchFromGitHub {
     owner = "werf";
     repo = "kubedog";
     rev = "v${version}";
-    hash = "sha256-mwITvv2MuqzH1aB4iTVaFfZljyqOAu7vl4cORHT/OXQ=";
+    hash = "sha256-j7LR6+c2ZZJCqmHihXodtiF5bJhNR8eizDEqwm9IUn0=";
   };
 
-  vendorHash = "sha256-HBo26cPiWJPDpsjPYUEBraHB2SZsUttrlBKpB9/SS6o=";
+  vendorHash = "sha256-UPfB3nOzJpqh14xLKZP2mLfg7C55nQivrkmh3B7aKzo=";
 
   subPackages = [ "cmd/kubedog" ];
 

pkgs/applications/networking/newsreaders/liferea/default.nix

@@ -24,11 +24,11 @@
 
 stdenv.mkDerivation rec {
   pname = "liferea";
-  version = "1.14.0";
+  version = "1.14.1";
 
   src = fetchurl {
     url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
-    sha256 = "uC3ksJ4nNXBjQYqNOS4qK6aCK6/Wzf27YXHbM73TpdU=";
+    sha256 = "5g74oN+NiKm/hnBLZvDxnAcBuP6B4y1Nsvb6nShZBnw=";
   };
 
   nativeBuildInputs = [

pkgs/applications/video/jellyfin-mpv-shim/default.nix

@@ -18,11 +18,11 @@
 
 buildPythonApplication rec {
   pname = "jellyfin-mpv-shim";
-  version = "2.5.0";
+  version = "2.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-B9orjQojiLwC90LZ4ynY7niw6fhJIaUn/DUXAYVMjfg=";
+    sha256 = "sha256-90Z2vgYT/9hBQZgfXeY7l6sGwT5KEY8X4rZMgrbTwrM=";
   };
 
   nativeBuildInputs = [

pkgs/applications/virtualization/lima/bin.nix

@@ -9,31 +9,31 @@
 }:
 
 let
-  version = "0.14.2";
+  version = "0.15.0";
 
   dist = {
     aarch64-darwin = rec {
       archSuffix = "Darwin-arm64";
       url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz";
-      sha256 = "8334d83ca9555271b9843040066057dd8462a774f60dfaedbe97fae3834c3894";
+      sha256 = "0da51d3c179e89bde404ea40be88b5c11aea8c7cf50cd030fd5b779e91462856";
     };
 
     x86_64-darwin = rec {
       archSuffix = "Darwin-x86_64";
       url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz";
-      sha256 = "3866113c92619f0041ff6fc68fef2bf16e751058b9237289b2bea8fb960bdab0";
+      sha256 = "c535bc21923bc290ac56fe3a9ea87e8740c7c51e030f05cc32d51e726a59673e";
     };
 
     aarch64-linux = rec {
       archSuffix = "Linux-aarch64";
       url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz";
-      sha256 = "373be7ebcf5932570c384c6bfb159cd418011b98a18c26ba0467827dad302230";
+      sha256 = "964c897f6dc2a6e203b0c109a7cd59102fe192837c792549b597d7ac301ecf54";
     };
 
     x86_64-linux = rec {
       archSuffix = "Linux-x86_64";
       url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz";
-      sha256 = "44cae71eae65673afcc22c557f6385aa98792aecbb43195de48217581ae39143";
+      sha256 = "5ec308716abe8833ce36d6e77cac44d98d7cfc8add8dbcbe053a91af01cecfa1";
     };
   };
 in

pkgs/applications/window-managers/herbstluftwm/default.nix

@@ -1,5 +1,6 @@
 { lib, stdenv, fetchurl, cmake, pkg-config, python3, libX11, libXext, libXinerama, libXrandr, libXft, libXrender, libXdmcp, libXfixes, freetype, asciidoc
 , xdotool, xorgserver, xsetroot, xterm, runtimeShell
+, fetchpatch
 , nixosTests }:
 
 stdenv.mkDerivation rec {
@@ -44,6 +45,12 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./test-path-environment.patch
+    # Adjust tests for compatibility with gcc 12 (https://github.com/herbstluftwm/herbstluftwm/issues/1512)
+    # Can be removed with the next release (>0.9.5).
+    (fetchpatch {
+      url = "https://github.com/herbstluftwm/herbstluftwm/commit/8678168c7a3307b1271e94974e062799e745ab40.patch";
+      hash = "sha256-uI6ErfDitT2Tw0txx4lMSBn/jjiiyL4Qw6AJa/CTh1E=";
+    })
   ];
 
   postPatch = ''

pkgs/applications/window-managers/nimdow/default.nix

@@ -0,0 +1,36 @@
+{ lib, fetchFromGitHub, nimPackages, libX11, libXft, libXinerama }:
+nimPackages.buildNimPackage rec {
+  pname = "nimdow";
+  version = "0.7.36";
+
+
+  src = fetchFromGitHub {
+    owner = "avahe-kellenberger";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-+36wxKgboOd3HvGnD555WySzJWGL39DaFXmIaFYtSN8=";
+  };
+
+
+  buildInputs = with nimPackages; [ parsetoml x11 safeset libX11 libXft libXinerama ];
+
+  postInstall = ''
+    install -D config.default.toml $out/share/nimdow/config.default.toml
+    install -D nimdow.desktop $out/share/applications/nimdow.desktop
+  '';
+
+  postPatch = ''
+    substituteInPlace src/nimdowpkg/config/configloader.nim --replace "/usr/share/nimdow" "$out/share/nimdow"
+  '';
+
+
+
+  doCheck = true;
+
+  meta = with lib;
+    src.meta // {
+      description = "Nim based tiling window manager";
+      license = [ licenses.gpl2 ];
+      maintainers = [ maintainers.marcusramberg ];
+    };
+}

pkgs/build-support/trivial-builders.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, stdenvNoCC, lndir, runtimeShell, shellcheck }:
+{ lib, stdenv, stdenvNoCC, lndir, runtimeShell, shellcheck, haskell }:
 
 let
   inherit (lib)
@@ -341,7 +341,9 @@ rec {
         if checkPhase == null then ''
           runHook preCheck
           ${stdenv.shellDryRun} "$target"
-          ${lib.getExe shellcheck} "$target"
+          # use shellcheck which does not include docs
+          # pandoc takes long to build and documentation isn't needed for in nixpkgs usage
+          ${lib.getExe (haskell.lib.compose.justStaticExecutables shellcheck.unwrapped)} "$target"
           runHook postCheck
         ''
         else checkPhase;

pkgs/data/misc/hackage/pin.json

@@ -1,6 +1,6 @@
 {
-  "commit": "1f7cec5b787f338430007a1176f686ddbd85cbc5",
+  "commit": "083bd4855df26eb1db1c38c31fdf79ccf67c2f13",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/1f7cec5b787f338430007a1176f686ddbd85cbc5.tar.gz",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/083bd4855df26eb1db1c38c31fdf79ccf67c2f13.tar.gz",
-  "sha256": "0ddnzb8l5gbpsar1pz2dq86xa1mv4840f9ppk5viwnzgyfiqzfv8",
+  "sha256": "0m0d33xd1zfpcdbyhq7akq73dpgwggi39l1wp99vpfgpi220ad5a",
-  "msg": "Update from Hackage at 2023-02-19T09:15:19Z"
+  "msg": "Update from Hackage at 2023-03-01T16:43:25Z"
 }

pkgs/development/beam-modules/erlang-ls/default.nix

@@ -30,10 +30,9 @@ rebar3Relx {
   releaseType = "escript";
   beamDeps = builtins.attrValues deps;
 
-  # Skip "els_hover_SUITE" test for Erlang/OTP 25+ while upstream hasn't fixed it
+  # https://github.com/erlang-ls/erlang_ls/issues/1429
-  # https://github.com/erlang-ls/erlang_ls/pull/1402
+  postPatch =  ''
-  postPatch = lib.optionalString (lib.versionOlder "25" erlang.version) ''
+    rm apps/els_lsp/test/els_diagnostics_SUITE.erl
-    rm apps/els_lsp/test/els_hover_SUITE.erl
   '';
 
   buildPlugins = [ rebar3-proper ];

pkgs/development/compilers/elm/default.nix

@@ -106,7 +106,7 @@ let
       elm-format-markdown = self.callPackage ./packages/elm-format-markdown.nix {};
 
       # elm-format requires text >= 2.0
-      text = self.text_2_0_1;
+      text = self.text_2_0_2;
       # elm-format-lib requires hspec-golden < 0.2
       hspec-golden = self.hspec-golden_0_1_0_3;
       # unorderd-container's tests indirectly depend on text < 2.0

pkgs/development/compilers/ghc/9.6.1.nix

@@ -0,0 +1,4 @@
+import ./common-hadrian.nix rec {
+  version = "9.6.1";
+  sha256 = "fe5ac909cb8bb087e235de97fa63aff47a8ae650efaa37a2140f4780e21f34cb";
+}

pkgs/development/compilers/ghc/common-hadrian.nix

@@ -62,7 +62,7 @@
 
 , # Whether to build dynamic libs for the standard library (on the target
   # platform). Static libs are always built.
-  enableShared ? with stdenv.targetPlatform; !isWindows && !useiOSPrebuilt && !isStatic
+  enableShared ? with stdenv.targetPlatform; !isWindows && !useiOSPrebuilt && !isStatic && !isGhcjs
 
 , # Whether to build terminfo.
   enableTerminfo ? !(stdenv.targetPlatform.isWindows
@@ -91,7 +91,7 @@
       transformers =
         lib.optionals useLLVM [ "llvm" ]
         ++ lib.optionals (!enableShared) [
-          "fully_static"
+          "no_dynamic_libs"
           "no_dynamic_ghc"
         ]
         ++ lib.optionals (!enableProfiledLibs) [ "no_profiled_libs" ]
@@ -182,7 +182,6 @@ let
     # be needed for TemplateHaskell. This solution was described in
     # https://www.tweag.io/blog/2020-09-30-bazel-static-haskell
     lib.optionals enableRelocatedStaticLibs [
-      "*.*.rts.*.opts += -fPIC -fexternal-dynamic-refs"
       "*.*.ghc.*.opts += -fPIC -fexternal-dynamic-refs"
     ]
     ++ lib.optionals targetPlatform.useAndroidPrebuilt [
@@ -396,16 +395,14 @@ stdenv.mkDerivation ({
 
   nativeBuildInputs = [
     perl ghc hadrian bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
-  ] ++ lib.optionals (rev != null) [
+    # autoconf and friends are necessary for hadrian to create the bindist
-    # We need to execute the boot script
+    autoconf automake m4
-    autoconf automake m4 python3
+    # Python is used in a few scripts invoked by hadrian to generate e.g. rts headers.
+    python3
   ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
     autoSignDarwinBinariesHook
   ] ++ lib.optionals enableDocs [
     sphinx
-  ] ++ lib.optionals targetPlatform.isGhcjs [
-    # emscripten itself is added via depBuildTarget / targetCC
-    python3
   ];
 
   # For building runtime libs
@@ -426,10 +423,10 @@ stdenv.mkDerivation ({
     runHook preBuild
 
     # hadrianFlagsArray is created in preConfigure
-    echo "hadrianFlags: $hadrianFlags ''${hadrianFlagsArray}"
+    echo "hadrianFlags: $hadrianFlags ''${hadrianFlagsArray[@]}"
 
     # We need to go via the bindist for installing
-    hadrian $hadrianFlags "''${hadrianFlagsArray}" binary-dist-dir
+    hadrian $hadrianFlags "''${hadrianFlagsArray[@]}" binary-dist-dir
 
     runHook postBuild
   '';

pkgs/development/compilers/ghc/head.nix

@@ -1,5 +1,5 @@
 import ./common-hadrian.nix {
-  version = "9.7.20221224";
+  version = "9.7.20230217";
-  rev = "a5bd0eb8dd1d03c54e1b0b476ebbc4cc886d6f19";
+  rev = "a203ad854ffee802e6bf0aca26e6c9a99bec3865";
-  sha256 = "1rrds9alzpy4vyh2isan32h1zmf44nsr8552wbsn1y3fg6bnpbxi";
+  sha256 = "06q6l7svdynvdv90yz6dxbsk3j5c8gh5ghwfl02rdwamcrzw7zic";
 }

pkgs/development/compilers/jetbrains-jdk/default.nix

@@ -29,8 +29,8 @@
 
 openjdk17.overrideAttrs (oldAttrs: rec {
   pname = "jetbrains-jdk-jcef";
-  javaVersion = "17.0.5";
+  javaVersion = "17.0.6";
-  build = "653.25";
+  build = "829.5";
   # To get the new tag:
   # git clone https://github.com/jetbrains/jetbrainsruntime
   # cd jetbrainsruntime
@@ -43,7 +43,7 @@ openjdk17.overrideAttrs (oldAttrs: rec {
     owner = "JetBrains";
     repo = "JetBrainsRuntime";
     rev = "jb${version}";
-    hash = "sha256-/3NzluFpzKC8mFQxrKY9WlgBh9asbEE7lrGJy/ZJXRU=";
+    hash = "sha256-LTwmuoKKwkuel0a1qcYNnb0d3HBFoABvmqCcrsPyh2I=";
   };
 
   BOOT_JDK = openjdk17-bootstrap.home;

pkgs/development/compilers/marst/default.nix

@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   version = "2.7";
 
   src = fetchurl {
-    url = "mirror://gnu/gnu/${pname}/${pname}-${version}.tar.gz";
+    url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
     hash = "sha256-Pue50cvjzZ+19iJxfae7VQbxpto7MPgS4jhLh7zk2lA=";
   };
 

pkgs/development/compilers/ocaml/generic.nix

@@ -12,6 +12,7 @@ in
 , flambdaSupport ? false
 , spaceTimeSupport ? false
 , unsafeStringSupport ? false
+, framePointerSupport ? false
 }:
 
 assert useX11 -> safeX11 stdenv;
@@ -19,6 +20,7 @@ assert aflSupport -> lib.versionAtLeast version "4.05";
 assert flambdaSupport -> lib.versionAtLeast version "4.03";
 assert spaceTimeSupport -> lib.versionAtLeast version "4.04" && lib.versionOlder version "4.12";
 assert unsafeStringSupport -> lib.versionAtLeast version "4.06" && lib.versionOlder version "5.0";
+assert framePointerSupport -> lib.versionAtLeast version "4.01";
 
 let
   src = args.src or (fetchurl {
@@ -28,9 +30,14 @@ let
 in
 
 let
-   useNativeCompilers = !stdenv.isMips;
+  useNativeCompilers = !stdenv.isMips;
-   inherit (lib) optional optionals optionalString;
+  inherit (lib) optional optionals optionalString strings concatStrings;
-   pname = "ocaml${optionalString aflSupport "+afl"}${optionalString spaceTimeSupport "+spacetime"}${optionalString flambdaSupport "+flambda"}";
+  pname = concatStrings [ "ocaml"
+    (optionalString aflSupport "+afl")
+    (optionalString spaceTimeSupport "+spacetime")
+    (optionalString flambdaSupport "+flambda")
+    (optionalString framePointerSupport "+fp")
+  ];
 in
 
 let
@@ -61,6 +68,7 @@ stdenv.mkDerivation (args // {
   ++ optional aflSupport (flags "--with-afl" "-afl-instrument")
   ++ optional flambdaSupport (flags "--enable-flambda" "-flambda")
   ++ optional spaceTimeSupport (flags "--enable-spacetime" "-spacetime")
+  ++ optional framePointerSupport (flags "--enable-frame-pointers" "-with-frame-pointers")
   ++ optionals unsafeStringSupport [
     "--disable-force-safe-string"
     "DEFAULT_STRING=unsafe"

pkgs/development/haskell-modules/configuration-common.nix

@@ -132,7 +132,7 @@ self: super: {
       name = "git-annex-${super.git-annex.version}-src";
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + super.git-annex.version;
-      sha256 = "1g1m18l7cx2y5d43k0vy5bqn4znybq0p345399zf9nkwhwhb7s20";
+      sha256 = "0ngvdcvskrhdq4m19h4b1cq3jhbzx0bqay6hvsppk6cb2y4wkfd9";
       # delete android and Android directories which cause issues on
       # darwin (case insensitive directory). Since we don't need them
       # during the build process, we can delete it to prevent a hash
@@ -285,6 +285,11 @@ self: super: {
   opencv = dontCheck (appendPatch ./patches/opencv-fix-116.patch super.opencv);
   opencv-extra = dontCheck (appendPatch ./patches/opencv-fix-116.patch super.opencv-extra);
 
+  # Too strict lower bound on hspec
+  graphql =
+    assert lib.versionOlder self.hspec.version "2.10";
+    doJailbreak super.graphql;
+
   # https://github.com/ekmett/structures/issues/3
   structures = dontCheck super.structures;
 
@@ -1329,20 +1334,6 @@ self: super: {
     })
   ] super.svgcairo;
 
-  # Espial is waiting for a hackage release to be compatible with GHC 9.X.
-  # [This issue](https://github.com/jonschoning/espial/issues/49) can be followed
-  # to track the status of the new release.
-  espial =
-    let ghc9-compat = fetchpatch {
-          url = "https://github.com/jonschoning/espial/commit/70177f9efb9666c3616e8a474681d3eb763d0e84.patch";
-          sha256 = "sha256-aJtwZGp9DUpACBV0WYRL7k32m6qWf5vq6eKBFq/G23s=";
-          excludes = ["package.yaml" "stack.yaml" "stack.yaml.lock"];
-        };
-    in overrideCabal (drv: {
-      jailbreak = assert super.espial.version == "0.0.11"; true;
-      patches = [ ghc9-compat ];
-    }) super.espial;
-
   # Upstream PR: https://github.com/jkff/splot/pull/9
   splot = appendPatch (fetchpatch {
     url = "https://github.com/jkff/splot/commit/a6710b05470d25cb5373481cf1cfc1febd686407.patch";
@@ -1352,7 +1343,7 @@ self: super: {
   # Fails with encoding problems, likely needs locale data.
   # Test can be executed by adding which to testToolDepends and
   # $PWD/dist/build/haskeline-examples-Test to $PATH.
-  haskeline_0_8_2 = dontCheck super.haskeline_0_8_2;
+  haskeline_0_8_2_1 = doDistribute (dontCheck super.haskeline_0_8_2_1);
 
   # Too strict upper bound on HTF
   # https://github.com/nikita-volkov/stm-containers/issues/29
@@ -1543,7 +1534,7 @@ self: super: {
   # 2022-03-19: strict upper bounds https://github.com/poscat0x04/hinit/issues/2
   hinit = doJailbreak
     (self.generateOptparseApplicativeCompletions [ "hi" ]
-      (super.hinit.override { haskeline = self.haskeline_0_8_2; }));
+      (super.hinit.override { haskeline = self.haskeline_0_8_2_1; }));
 
   # 2020-11-23: https://github.com/Rufflewind/blas-hs/issues/8
   blas-hs = dontCheck super.blas-hs;
@@ -1800,10 +1791,11 @@ self: super: {
   # https://github.com/serokell/haskell-crypto/issues/25
   crypto-sodium = dontCheck super.crypto-sodium;
 
-  # Too strict version bounds on a bunch of libraries:
+  taskell = super.taskell.override {
-  # https://github.com/smallhadroncollider/taskell/issues/100
+    # Does not support brick >= 1.0
-  # May be possible to remove at the next release (1.11.0)
+    # https://github.com/smallhadroncollider/taskell/issues/125
-  taskell = doJailbreak super.taskell;
+    brick = self.brick_0_70_1;
+  };
 
   # Polyfill for GHCs from the integer-simple days that don't bundle ghc-bignum
   ghc-bignum = super.ghc-bignum or self.mkDerivation {
@@ -2125,6 +2117,7 @@ self: super: {
       "-p" "!/Test Rendering/"
     ] ++ drv.testFlags or [];
   }) super.morpheus-graphql;
+  drunken-bishop = doJailbreak super.drunken-bishop;
   # https://github.com/SupercedeTech/dropbox-client/issues/1
   dropbox = overrideCabal (drv: {
     testFlags = [
@@ -2248,15 +2241,10 @@ self: super: {
   # Too strict bounds on chell: https://github.com/fpco/haskell-filesystem/issues/24
   system-fileio = doJailbreak super.system-fileio;
 
-  # Temporarily upgrade haskell-gi until our hackage pin advances
+  # Temporarily upgrade haskell-gi until stackage advances
   # Fixes build of gi-harfbuzz with harfbuzz >= 7.0
   # https://github.com/haskell-gi/haskell-gi/issues/396#issuecomment-1445181362
-  haskell-gi =
+  haskell-gi = doDistribute self.haskell-gi_0_26_3;
-    assert super.haskell-gi.version == "0.26.2";
-    overrideCabal {
-      version = "0.26.3";
-      sha256 = "sha256-jsAb3JCSHCmi2dp9bpi/J3NRO/EQFB8ar4GpxAuBGOo=";
-    } super.haskell-gi;
 
   # Bounds too strict on base and ghc-prim: https://github.com/tibbe/ekg-core/pull/43 (merged); waiting on hackage release
   ekg-core = assert super.ekg-core.version == "0.1.1.7"; doJailbreak super.ekg-core;
@@ -2503,4 +2491,7 @@ self: super: {
   # bytestring <0.11.0, optparse-applicative <0.13.0
   # https://github.com/kseo/sfnt2woff/issues/1
   sfnt2woff = doJailbreak super.sfnt2woff;
+
+  # 2023-03-05: restrictive bounds on base https://github.com/diagrams/diagrams-gtk/issues/11
+  diagrams-gtk = doJailbreak super.diagrams-gtk;
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix

@@ -39,7 +39,7 @@ self: super: {
   stm = null;
   template-haskell = null;
   # GHC only builds terminfo if it is a native compiler
-  terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5;
+  terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6;
   text = null;
   time = null;
   transformers = null;

pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix

@@ -38,7 +38,7 @@ self: super: {
   stm = null;
   template-haskell = null;
   # GHC only builds terminfo if it is a native compiler
-  terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5;
+  terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6;
   text = null;
   time = null;
   transformers = null;

pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix

@@ -38,7 +38,7 @@ self: super: {
   stm = null;
   template-haskell = null;
   # GHC only builds terminfo if it is a native compiler
-  terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5;
+  terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6;
   text = null;
   time = null;
   transformers = null;

pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix

@@ -40,7 +40,7 @@ self: super: {
   stm = null;
   template-haskell = null;
   # GHC only builds terminfo if it is a native compiler
-  terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5;
+  terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6;
   text = null;
   time = null;
   transformers = null;

pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix

@@ -40,7 +40,7 @@ self: super: {
   stm = null;
   template-haskell = null;
   # GHC only builds terminfo if it is a native compiler
-  terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5;
+  terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6;
   text = null;
   time = null;
   transformers = null;

pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix

@@ -46,7 +46,7 @@ in {
   system-cxx-std-lib = null;
   template-haskell = null;
   # GHC only builds terminfo if it is a native compiler
-  terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5;
+  terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6;
   text = null;
   time = null;
   transformers = null;
@@ -71,7 +71,8 @@ in {
 
   # Jailbreaks & Version Updates
 
-  aeson = self.aeson_2_1_1_0;
+  # Jailbreak to allow quickcheck-instances-0.3.28 (too strict lower bound)
+  aeson = doDistribute (doJailbreak self.aeson_2_1_2_1);
 
   assoc = doJailbreak super.assoc;
   async = doJailbreak super.async;
@@ -146,8 +147,7 @@ in {
     ] ++ drv.testFlags or [];
   }) (doJailbreak super.hpack);
 
-  # lens >= 5.1 supports 9.2.1
+  lens = doDistribute self.lens_5_2_1;
-  lens = doDistribute self.lens_5_2;
 
   # Apply patches from head.hackage.
   language-haskell-extract = appendPatch (pkgs.fetchpatch {

pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix

@@ -0,0 +1,50 @@
+{ pkgs, haskellLib }:
+
+let
+  inherit (pkgs) lib;
+in
+
+with haskellLib;
+
+self: super: {
+  llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages;
+
+  # Disable GHC core libraries
+  array = null;
+  base = null;
+  binary = null;
+  bytestring = null;
+  Cabal = null;
+  Cabal-syntax = null;
+  containers = null;
+  deepseq = null;
+  directory = null;
+  exceptions = null;
+  filepath = null;
+  ghc-bignum = null;
+  ghc-boot = null;
+  ghc-boot-th = null;
+  ghc-compact = null;
+  ghc-heap = null;
+  ghc-prim = null;
+  ghci = null;
+  haskeline = null;
+  hpc = null;
+  integer-gmp = null;
+  libiserv = null;
+  mtl = null;
+  parsec = null;
+  pretty = null;
+  process = null;
+  rts = null;
+  stm = null;
+  system-cxx-std-lib = null;
+  template-haskell = null;
+  # terminfo is not built if GHC is a cross compiler
+  terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5;
+  text = null;
+  time = null;
+  transformers = null;
+  unix = null;
+  xhtml = null;
+}

pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix

@@ -48,7 +48,7 @@ self: super: {
   stm = null;
   template-haskell = null;
   # GHC only builds terminfo if it is a native compiler
-  terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5;
+  terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6;
   text = null;
   time = null;
   transformers = null;

pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml

@@ -296,6 +296,7 @@ broken-packages:
   - azure-email
   - azurify
   - b9
+  - babl # wants pkg-config dependency `babl`, but pkgs.babl's pkg-config file is called babl-0.1.pc
   - backprop
   - backstop
   - backtracking-exceptions
@@ -471,6 +472,7 @@ broken-packages:
   - brians-brain
   - brick-dropdownmenu
   - brick-filetree
+  - brick-list-search #  failure  in job https://hydra.nixos.org/build/211236614 at 2023-03-13
   - bricks-internal
   - brick-tabular-list
   - brillig
@@ -487,6 +489,7 @@ broken-packages:
   - bson-generics
   - bson-mapping
   - bsparse
+  - btree-concurrent # dependency missing in job https://hydra.nixos.org/build/211250233 at 2023-03-13
   - btrfs
   - buffer
   - buffer-builder-aeson
@@ -731,6 +734,7 @@ broken-packages:
   - clone-all
   - closure
   - cloudfront-signer
+  - clplug #  failure  in job https://hydra.nixos.org/build/211239834 at 2023-03-13
   - clr-inline
   - clr-typed
   - cluss
@@ -1129,7 +1133,6 @@ broken-packages:
   - dia-base
   - diagrams-boolean
   - diagrams-builder
-  - diagrams-gtk
   - diagrams-pdf
   - diagrams-qrcode
   - diagrams-rubiks-cube
@@ -1237,7 +1240,6 @@ broken-packages:
   - drmaa
   - drone
   - dropbox
-  - drunken-bishop
   - dsc
   - ds-kanren
   - dsmc
@@ -1460,6 +1462,7 @@ broken-packages:
   - fastedit
   - fastly
   - fast-nats
+  - fastparser # failure building library in job https://hydra.nixos.org/build/211240748 at 2023-03-13
   - fastpbkdf2
   - FastPush
   - fast-tagsoup-utf8-only
@@ -2885,7 +2888,9 @@ broken-packages:
   - jvm-binary
   - jvm-parser
   - JYU-Utils
+  - k8s-wrapper # test failure in job https://hydra.nixos.org/build/211254982 at 2023-03-13
   - kademlia
+  - kafka-client # dependency missing in job https://hydra.nixos.org/build/211238496 at 2023-03-13
   - kafka-client-sync
   - kalman
   - Kalman
@@ -3287,6 +3292,7 @@ broken-packages:
   - medium-sdk-haskell
   - meep
   - megalisp
+  - megastore #  failure  in job https://hydra.nixos.org/build/211239200 at 2023-03-13
   - melf
   - mellon-core
   - melody
@@ -3598,6 +3604,7 @@ broken-packages:
   - neural-network-hmatrix
   - newbase60
   - newhope
+  - newline # dependency missing in job https://hydra.nixos.org/build/211250825 at 2023-03-13
   - newports
   - newsletter
   - newt
@@ -4283,6 +4290,7 @@ broken-packages:
   - quantification
   - quantum-arrow
   - quarantimer
+  - qudb # failure building executable 'qudb' in job https://hydra.nixos.org/build/211250260 at 2023-03-13
   - quenya-verb
   - querystring-pickle
   - questioner
@@ -4592,6 +4600,7 @@ broken-packages:
   - sandlib
   - sandman
   - sarasvati
+  - sasha # dependency missing in job https://hydra.nixos.org/build/211237944 at 2023-03-13
   - sat
   - satchmo-backends
   - satchmo-minisat
@@ -5210,7 +5219,6 @@ broken-packages:
   - tamarin-prover-utils
   - Tape
   - tapioca
-  - taskell
   - TaskMonad
   - tasty-auto
   - tasty-autocollect
@@ -5799,6 +5807,7 @@ broken-packages:
   - whiskers
   - whois
   - why3
+  - wide-word-instances # failure building library in job https://hydra.nixos.org/build/211245524 at 2023-03-13
   - WikimediaParser
   - willow
   - windns

pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml

@@ -120,6 +120,7 @@ extra-packages:
   - ShellCheck == 0.8.0                 # 2022-12-28: required by haskell-ci 0.14.3
   - retrie < 1.2.0.0                    # 2022-12-30: required for hls on ghc < 9.2
   - ghc-tags == 1.5.*                   # 2023-02-18: preserve for ghc-lib == 9.2.*
+  - primitive == 0.7.4.0                # 2023-03-04: primitive 0.8 is not compatible with too many packages on ghc 9.4 as of now
 
 package-maintainers:
   abbradar:

pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml

@@ -1,4 +1,4 @@
-# Stackage LTS 20.11
+# Stackage LTS 20.12
 # This file is auto-generated by
 # maintainers/scripts/haskell/update-stackage.sh
 default-package-overrides:
@@ -11,7 +11,7 @@ default-package-overrides:
   - acid-state ==0.16.1.1
   - action-permutations ==0.0.0.1
   - active ==0.2.0.16
-  - ad ==4.5.3
+  - ad ==4.5.4
   - ad-delcont ==0.3.0.0
   - adjunctions ==4.4.2
   - adler32 ==0.1.2.0
@@ -206,7 +206,7 @@ default-package-overrides:
   - Blammo ==1.1.1.1
   - blank-canvas ==0.7.3
   - blanks ==0.5.0
-  - blas-carray ==0.1.0.1
+  - blas-carray ==0.1.0.2
   - blas-comfort-array ==0.0.0.3
   - blas-ffi ==0.1
   - blas-hs ==0.1.1.0
@@ -253,7 +253,7 @@ default-package-overrides:
   - bugsnag-wai ==1.0.0.1
   - bugsnag-yesod ==1.0.0.1
   - bugzilla-redhat ==1.0.1
-  - burrito ==2.0.1.2
+  - burrito ==2.0.1.3
   - butcher ==1.3.3.2
   - bv ==0.5
   - byteable ==0.1.1
@@ -377,7 +377,7 @@ default-package-overrides:
   - colorize-haskell ==1.0.1
   - colour ==2.3.6
   - columnar ==1.0.0.0
-  - combinatorial ==0.1.0.1
+  - combinatorial ==0.1.1
   - comfort-array ==0.5.2.1
   - comfort-array-shape ==0.0
   - comfort-fftw ==0.0
@@ -447,8 +447,8 @@ default-package-overrides:
   - cookie ==0.4.6
   - copr-api ==0.1.0
   - core-data ==0.3.9.0
-  - core-program ==0.6.3.0
+  - core-program ==0.6.5.0
-  - core-telemetry ==0.2.7.3
+  - core-telemetry ==0.2.8.0
   - core-text ==0.3.8.0
   - countable ==1.2
   - country ==0.2.3
@@ -563,7 +563,7 @@ default-package-overrides:
   - Decimal ==0.5.2
   - declarative ==0.5.4
   - deepseq-generics ==0.2.0.0
-  - deferred-folds ==0.9.18.2
+  - deferred-folds ==0.9.18.3
   - dejafu ==2.4.0.4
   - dense-linear-algebra ==0.1.0.0
   - dependent-map ==0.4.0.0
@@ -603,7 +603,7 @@ default-package-overrides:
   - dimensional ==1.5
   - di-monad ==1.3.1
   - directory-tree ==0.12.1
-  - direct-sqlite ==2.3.27
+  - direct-sqlite ==2.3.28
   - dirichlet ==0.1.0.7
   - discount ==0.1.1
   - discover-instances ==0.1.0.0
@@ -713,7 +713,7 @@ default-package-overrides:
   - errors ==2.3.0
   - errors-ext ==0.4.2
   - ersatz ==0.4.13
-  - esqueleto ==3.5.8.1
+  - esqueleto ==3.5.8.2
   - essence-of-live-coding ==0.2.7
   - essence-of-live-coding-gloss ==0.2.7
   - essence-of-live-coding-pulse ==0.2.7
@@ -801,7 +801,7 @@ default-package-overrides:
   - flexible-defaults ==0.0.3
   - FloatingHex ==0.5
   - floatshow ==0.2.4
-  - flow ==2.0.0.1
+  - flow ==2.0.0.2
   - flush-queue ==1.0.0
   - fmlist ==0.9.4
   - fmt ==0.6.3.0
@@ -922,11 +922,11 @@ default-package-overrides:
   - ghc-prof ==1.4.1.12
   - ghc-source-gen ==0.4.3.0
   - ghc-syntax-highlighter ==0.0.8.0
-  - ghc-tcplugins-extra ==0.4.3
+  - ghc-tcplugins-extra ==0.4.4
   - ghc-trace-events ==0.1.2.6
-  - ghc-typelits-extra ==0.4.4
+  - ghc-typelits-extra ==0.4.5
-  - ghc-typelits-knownnat ==0.7.7
+  - ghc-typelits-knownnat ==0.7.8
-  - ghc-typelits-natnormalise ==0.7.7
+  - ghc-typelits-natnormalise ==0.7.8
   - ghc-typelits-presburger ==0.6.2.0
   - ghost-buster ==0.1.1.0
   - gi-atk ==2.0.25
@@ -953,7 +953,7 @@ default-package-overrides:
   - gi-pango ==1.0.27
   - githash ==0.1.6.3
   - github ==0.28.0.1
-  - github-release ==2.0.0.2
+  - github-release ==2.0.0.3
   - github-rest ==1.1.2
   - github-types ==0.2.1
   - github-webhooks ==0.16.0
@@ -1019,7 +1019,7 @@ default-package-overrides:
   - happstack-server ==7.7.2
   - happstack-server-tls ==7.2.1.3
   - happy ==1.20.1.1
-  - happy-meta ==0.2.0.11
+  - happy-meta ==0.2.1.0
   - harp ==0.4.3.6
   - HasBigDecimal ==0.2.0.0
   - hasbolt ==0.1.6.2
@@ -1027,7 +1027,7 @@ default-package-overrides:
   - hashids ==1.0.2.7
   - hashmap ==1.3.3
   - hashtables ==1.3.1
-  - haskeline ==0.8.2
+  - haskeline ==0.8.2.1
   - haskell-gi ==0.26.2
   - haskell-gi-base ==0.26.3
   - haskell-gi-overloading ==1.0
@@ -1063,7 +1063,7 @@ default-package-overrides:
   - hdaemonize ==0.5.6
   - HDBC ==2.4.0.4
   - HDBC-session ==0.1.2.0
-  - headed-megaparsec ==0.2.1
+  - headed-megaparsec ==0.2.1.1
   - heap ==1.0.4
   - heaps ==0.4
   - heatshrink ==0.1.0.0
@@ -1143,7 +1143,7 @@ default-package-overrides:
   - hruby ==0.5.0.0
   - hsass ==0.8.0
   - hs-bibutils ==6.10.0.0
-  - hsc2hs ==0.68.8
+  - hsc2hs ==0.68.9
   - hscolour ==1.24.4
   - hsdns ==1.8
   - hse-cpp ==0.2
@@ -1162,7 +1162,7 @@ default-package-overrides:
   - hslua-marshalling ==2.2.1
   - hslua-module-doclayout ==1.0.4
   - hslua-module-path ==1.0.3
-  - hslua-module-system ==1.0.2
+  - hslua-module-system ==1.0.3
   - hslua-module-text ==1.0.3.1
   - hslua-module-version ==1.0.3
   - hslua-objectorientation ==2.2.1
@@ -1182,7 +1182,7 @@ default-package-overrides:
   - hspec-expectations-json ==1.0.0.7
   - hspec-expectations-lifted ==0.10.0
   - hspec-expectations-pretty-diff ==0.7.2.6
-  - hspec-golden ==0.2.0.0
+  - hspec-golden ==0.2.0.1
   - hspec-golden-aeson ==0.9.0.0
   - hspec-hedgehog ==0.0.1.2
   - hspec-junit-formatter ==1.1.0.2
@@ -1330,14 +1330,14 @@ default-package-overrides:
   - interpolatedstring-perl6 ==1.0.2
   - interpolation ==0.1.1.2
   - Interpolation ==0.3.0
-  - IntervalMap ==0.6.1.2
+  - IntervalMap ==0.6.2.0
   - intervals ==0.9.2
   - intset-imperative ==0.1.0.0
   - invariant ==0.6
   - invert ==1.0.0.2
   - invertible-grammar ==0.1.3.3
   - io-machine ==0.2.0.0
-  - io-manager ==0.1.0.3
+  - io-manager ==0.1.0.4
   - io-memoize ==1.1.1.0
   - io-region ==0.1.1
   - io-storage ==0.3
@@ -1357,7 +1357,7 @@ default-package-overrides:
   - iso639 ==0.1.0.3
   - iso8601-time ==0.1.5
   - isocline ==1.0.9
-  - isomorphism-class ==0.1.0.7
+  - isomorphism-class ==0.1.0.9
   - iterable ==3.0
   - ixset ==1.1.1.2
   - ixset-typed ==0.5.1.0
@@ -1377,11 +1377,11 @@ default-package-overrides:
   - js-flot ==0.8.3
   - js-jquery ==3.3.1
   - json ==0.10
-  - json-feed ==2.0.0.4
+  - json-feed ==2.0.0.5
   - jsonifier ==0.2.1.2
   - jsonpath ==0.3.0.0
   - json-rpc ==1.0.4
-  - json-stream ==0.4.4.2
+  - json-stream ==0.4.5.2
   - JuicyPixels ==3.3.7
   - JuicyPixels-extra ==0.5.2
   - JuicyPixels-scale-dct ==0.1.2
@@ -1410,7 +1410,7 @@ default-package-overrides:
   - koji ==0.0.2
   - l10n ==0.1.0.1
   - labels ==0.3.3
-  - lackey ==2.0.0.3
+  - lackey ==2.0.0.4
   - LambdaHack ==0.11.0.0
   - lame ==0.2.0
   - language-avro ==0.1.4.0
@@ -1470,7 +1470,7 @@ default-package-overrides:
   - line ==4.0.1
   - linear ==1.21.10
   - linear-base ==0.3.0
-  - linear-generics ==0.2
+  - linear-generics ==0.2.1
   - linebreak ==1.1.0.2
   - linenoise ==0.3.2
   - linux-capabilities ==0.1.1.0
@@ -1742,7 +1742,7 @@ default-package-overrides:
   - nonempty-containers ==0.3.4.4
   - nonemptymap ==0.0.6.0
   - non-empty-sequence ==0.2.0.4
-  - nonempty-vector ==0.2.1.0
+  - nonempty-vector ==0.2.2.0
   - nonempty-zipper ==1.0.0.4
   - non-negative ==0.1.2
   - normaldistribution ==1.1.0.3
@@ -1794,7 +1794,7 @@ default-package-overrides:
   - opentelemetry-lightstep ==0.8.0
   - opentelemetry-wai ==0.8.0
   - open-witness ==0.6
-  - operational ==0.2.4.1
+  - operational ==0.2.4.2
   - operational-class ==0.3.0.0
   - opml-conduit ==0.9.0.0
   - optics ==0.4.2
@@ -1844,10 +1844,9 @@ default-package-overrides:
   - partial-isomorphisms ==0.2.3.0
   - partial-order ==0.2.0.0
   - partial-semigroup ==0.6.0.1
-  - password ==3.0.2.0
+  - password ==3.0.2.1
   - password-instances ==3.0.0.0
   - password-types ==1.0.0.0
-  - pasta-curves ==0.0.1.0
   - path ==0.9.2
   - path-binary-instance ==0.1.0.1
   - path-dhall-instance ==0.2.1.0
@@ -1944,7 +1943,7 @@ default-package-overrides:
   - polysemy-webserver ==0.2.1.1
   - polysemy-zoo ==0.8.1.0
   - pontarius-xmpp ==0.5.6.5
-  - pooled-io ==0.0.2.2
+  - pooled-io ==0.0.2.3
   - portable-lines ==0.1
   - port-utils ==0.2.1.0
   - posix-paths ==0.3.0.0
@@ -1987,13 +1986,13 @@ default-package-overrides:
   - primes ==0.2.1.0
   - primitive ==0.7.3.0
   - primitive-addr ==0.1.0.2
-  - primitive-extras ==0.10.1.5
+  - primitive-extras ==0.10.1.6
   - primitive-offset ==0.2.0.0
   - primitive-unaligned ==0.1.1.2
   - primitive-unlifted ==0.1.3.1
   - prim-uniq ==0.2
   - print-console-colors ==0.1.0.0
-  - probability ==0.2.7
+  - probability ==0.2.8
   - process-extras ==0.7.4
   - product-profunctors ==0.11.0.3
   - profiterole ==0.1
@@ -2019,7 +2018,7 @@ default-package-overrides:
   - proto-lens-protoc ==0.7.1.1
   - proto-lens-runtime ==0.7.0.3
   - proto-lens-setup ==0.4.0.6
-  - protolude ==0.3.2
+  - protolude ==0.3.3
   - proxied ==0.3.1
   - psql-helpers ==0.1.0.0
   - psqueues ==0.2.7.3
@@ -2051,7 +2050,7 @@ default-package-overrides:
   - quickcheck-special ==0.1.0.6
   - quickcheck-state-machine ==0.7.1
   - quickcheck-text ==0.1.2.1
-  - quickcheck-transformer ==0.3.1.1
+  - quickcheck-transformer ==0.3.1.2
   - quickcheck-unicode ==1.0.1.0
   - quicklz ==1.5.0.11
   - quiet ==0.2
@@ -2060,7 +2059,7 @@ default-package-overrides:
   - rainbow ==0.34.2.2
   - rainbox ==0.26.0.0
   - ral ==0.2.1
-  - rampart ==2.0.0.3
+  - rampart ==2.0.0.4
   - ramus ==0.1.2
   - rando ==0.0.0.4
   - random ==1.2.1.1
@@ -2077,8 +2076,8 @@ default-package-overrides:
   - rank2classes ==1.4.6
   - Rasterific ==0.7.5.4
   - rasterific-svg ==0.3.3.2
-  - ratel ==2.0.0.4
+  - ratel ==2.0.0.5
-  - ratel-wai ==2.0.0.1
+  - ratel-wai ==2.0.0.2
   - ratio-int ==0.1.2
   - rattle ==0.2
   - rattletrap ==11.2.14
@@ -2094,7 +2093,7 @@ default-package-overrides:
   - read-env-var ==1.0.0.0
   - reanimate-svg ==0.13.0.1
   - rebase ==1.16.1
-  - rec-def ==0.2
+  - rec-def ==0.2.1
   - record-dot-preprocessor ==0.2.15
   - record-hasfield ==1.0
   - rec-smallarray ==0.1.0.0
@@ -2199,7 +2198,7 @@ default-package-overrides:
   - safe-json ==1.1.3.1
   - safe-money ==0.9.1
   - SafeSemaphore ==0.10.1
-  - salve ==2.0.0.1
+  - salve ==2.0.0.2
   - sample-frame ==0.0.4
   - sample-frame-np ==0.0.5
   - sampling ==0.3.5
@@ -2268,7 +2267,7 @@ default-package-overrides:
   - servant-client-core ==0.19
   - servant-conduit ==0.15.1
   - servant-docs ==0.12
-  - servant-elm ==0.7.2
+  - servant-elm ==0.7.3
   - servant-exceptions ==0.2.1
   - servant-exceptions-server ==0.2.1
   - servant-foreign ==0.15.4
@@ -2356,7 +2355,7 @@ default-package-overrides:
   - skylighting-core ==0.13.2.1
   - skylighting-format-ansi ==0.1
   - skylighting-format-blaze-html ==0.1.1
-  - skylighting-format-context ==0.1.0.1
+  - skylighting-format-context ==0.1.0.2
   - skylighting-format-latex ==0.1
   - slack-progressbar ==0.1.0.1
   - slave-thread ==1.1.0.2
@@ -2404,12 +2403,12 @@ default-package-overrides:
   - srt-formatting ==0.1.0.0
   - stache ==2.3.3
   - stack ==2.9.1
-  - stack-all ==0.4.0.1
+  - stack-all ==0.4.1
   - stack-clean-old ==0.4.6
   - stack-templatizer ==0.1.0.2
   - state-codes ==0.1.3
   - stateref ==0.3
-  - statestack ==0.3.1
+  - statestack ==0.3.1.1
   - StateVar ==1.2.2
   - stateWriter ==0.3.0
   - static-text ==0.2.0.7
@@ -2423,14 +2422,14 @@ default-package-overrides:
   - stm-containers ==1.2
   - stm-delay ==0.1.1.1
   - stm-extras ==0.1.0.3
-  - stm-hamt ==1.2.0.8
+  - stm-hamt ==1.2.0.9
   - stm-lifted ==2.5.0.0
   - STMonadTrans ==0.4.6
   - stm-split ==0.0.2.1
   - stopwatch ==0.1.0.6
   - storable-complex ==0.2.3.0
   - storable-endian ==0.2.6.1
-  - storable-record ==0.0.6
+  - storable-record ==0.0.7
   - storable-tuple ==0.0.3.3
   - storablevector ==0.2.13.1
   - store ==0.7.16
@@ -2470,9 +2469,9 @@ default-package-overrides:
   - stripe-scotty ==1.1.0.3
   - stripe-signature ==1.0.0.15
   - stripe-wreq ==1.0.1.15
-  - strive ==6.0.0.4
+  - strive ==6.0.0.5
   - strongweak ==0.3.2
-  - structs ==0.1.7
+  - structs ==0.1.8
   - structured ==0.1.1
   - structured-cli ==2.7.0.1
   - stylish-haskell ==0.14.3.0
@@ -2530,7 +2529,7 @@ default-package-overrides:
   - tasty ==1.4.3
   - tasty-ant-xml ==1.1.8
   - tasty-autocollect ==0.3.2.0
-  - tasty-bench ==0.3.2
+  - tasty-bench ==0.3.3
   - tasty-dejafu ==2.1.0.0
   - tasty-discover ==4.2.2
   - tasty-expected-failure ==0.12.3
@@ -2763,7 +2762,7 @@ default-package-overrides:
   - universe-instances-extended ==1.1.3
   - universe-reverse-instances ==1.1.1
   - universe-some ==1.2.1
-  - universum ==1.8.1
+  - universum ==1.8.1.1
   - unix-bytestring ==0.3.7.8
   - unix-compat ==0.5.4
   - unix-time ==0.4.8
@@ -2896,12 +2895,12 @@ default-package-overrides:
   - webrtc-vad ==0.1.0.3
   - websockets ==0.12.7.3
   - weigh ==0.0.16
-  - wide-word ==0.1.4.0
+  - wide-word ==0.1.5.0
   - Win32 ==2.12.0.1
   - Win32-notify ==0.3.0.3
   - windns ==0.1.0.1
-  - witch ==1.1.6.0
+  - witch ==1.1.6.1
-with-compiler: ghc-9.2.5
+with-compiler: ghc-9.2.6
   - withdependencies ==0.3.0
   - witherable ==0.4.2
   - within ==0.2.0.1
@@ -2925,7 +2924,7 @@ with-compiler: ghc-9.2.5
   - writer-cps-mtl ==0.1.1.6
   - writer-cps-transformers ==0.5.6.1
   - wss-client ==0.3.0.0
-  - wuss ==2.0.1.0
+  - wuss ==2.0.1.1
   - X11 ==1.10.3
   - X11-xft ==0.3.4
   - x11-xim ==0.0.9.0
@@ -2950,7 +2949,7 @@ with-compiler: ghc-9.2.5
   - xmlgen ==0.6.2.2
   - xml-hamlet ==0.5.0.2
   - xml-helpers ==1.0.0
-  - xmlhtml ==0.2.5.3
+  - xmlhtml ==0.2.5.4
   - xml-html-qq ==0.1.0.1
   - xml-indexed-cursor ==0.1.1.0
   - xml-lens ==0.3.1
@@ -2964,8 +2963,8 @@ with-compiler: ghc-9.2.5
   - xor ==0.0.1.1
   - xss-sanitize ==0.3.7.1
   - xxhash-ffi ==0.2.0.0
-  - yaml ==0.11.10.0
+  - yaml ==0.11.11.0
-  - yaml-unscrambler ==0.1.0.12
+  - yaml-unscrambler ==0.1.0.13
   - Yampa ==0.13.7
   - yarn-lock ==0.6.5
   - yeshql-core ==4.2.0.0

pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml

@@ -676,10 +676,10 @@ dont-distribute-packages:
  - array-forth
  - arraylist
  - ascii-cows
- - ascii-superset_1_2_7_0
+ - ascii-superset_1_3_0_0
  - ascii-table
  - ascii-th_1_2_0_0
- - ascii_1_5_4_0
+ - ascii_1_6_0_0
  - asic
  - asil
  - assert4hs-hspec
@@ -1240,7 +1240,6 @@ dont-distribute-packages:
  - dingo-core
  - dingo-example
  - dingo-widgets
- - diohsc
  - diplomacy-server
  - direct-rocksdb
  - directory-contents
@@ -1398,6 +1397,7 @@ dont-distribute-packages:
  - eventuo11y-batteries
  - eventuo11y-json
  - eventuo11y-otel
+ - eventuo11y-prometheus
  - every-bit-counts
  - ewe
  - exference
@@ -1578,6 +1578,7 @@ dont-distribute-packages:
  - geniconvert
  - geniserver
  - genvalidity-appendful
+ - genvalidity-dirforest
  - genvalidity-network-uri
  - genvalidity-sydtest
  - genvalidity-sydtest-aeson
@@ -2200,6 +2201,8 @@ dont-distribute-packages:
  - hoppy-std
  - horizon-gen-nix
  - horizon-spec
+ - horizon-spec-lens
+ - horizon-spec-pretty
  - hotswap
  - hp2any-graph
  - hp2any-manager
@@ -2472,6 +2475,7 @@ dont-distribute-packages:
  - kansas-lava-shake
  - karakuri
  - katip-rollbar
+ - keelung
  - keera-hails-mvc-environment-gtk
  - keera-hails-mvc-model-lightmodel
  - keera-hails-mvc-model-protectedmodel
@@ -2555,6 +2559,7 @@ dont-distribute-packages:
  - latex-formulae-pandoc
  - latex-svg-hakyll
  - latex-svg-pandoc
+ - launchdarkly-server-sdk-redis-hedis
  - layered-state
  - layers-game
  - layouting
@@ -2803,7 +2808,6 @@ dont-distribute-packages:
  - morley-upgradeable
  - morloc
  - morphisms-functors-inventory
- - mosaico-lib
  - motor-diagrams
  - mp
  - mp3decoder
@@ -3006,7 +3010,7 @@ dont-distribute-packages:
  - padKONTROL
  - pairing
  - panda
- - pandoc-crossref_0_3_15_0
+ - pandoc-crossref_0_3_15_1
  - pandoc-highlighting-extensions
  - pandoc-japanese-filters
  - pandora-io
@@ -3989,7 +3993,6 @@ dont-distribute-packages:
  - type-sub-th
  - typed-admin
  - typed-encoding-encoding
- - typed-spreadsheet
  - typed-streams
  - typedflow
  - typelevel
@@ -4148,6 +4151,7 @@ dont-distribute-packages:
  - websockets-rpc
  - websockets-simple
  - websockets-simple-extra
+ - weierstrass-functions
  - weighted
  - werewolf-slack
  - wgpu-hs

pkgs/development/haskell-modules/configuration-nix.nix

@@ -1076,15 +1076,12 @@ self: super: builtins.intersectAttrs super {
   hint = dontCheck super.hint;
 
   # Make sure that Cabal 3.8.* can be built as-is
-  Cabal_3_8_1_0 = doDistribute (overrideCabal (old: {
+  Cabal_3_8_1_0 = doDistribute (super.Cabal_3_8_1_0.override ({
-    revision = assert old.revision == "1"; "2";
-    editedCabalFile = "179y365wh9zgzkcn4n6m4vfsfy6vk4apajv8jpys057z3a71s4kp";
-  }) (super.Cabal_3_8_1_0.override ({
     Cabal-syntax = self.Cabal-syntax_3_8_1_0;
   } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") {
     # Use process core package when possible
     process = self.process_1_6_17_0;
-  })));
+  }));
 
   # cabal-install switched to build type simple in 3.2.0.0
   # as a result, the cabal(1) man page is no longer installed

pkgs/development/libraries/libidn2/default.nix

@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   version = "2.3.2";
 
   src = fetchurl {
-    url = "mirror://gnu/gnu/libidn/${pname}-${version}.tar.gz";
+    url = "mirror://gnu/libidn/${pname}-${version}.tar.gz";
     sha256 = "sha256-dpQM1Od46Ak1eanRlbJf/16Tbp3GJCBoUotDenZ2T5E=";
   };
 

pkgs/development/libraries/webrtc-audio-processing/0.3.nix

@@ -21,9 +21,11 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    homepage = "http://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing";
+    homepage = "https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing";
     description = "A more Linux packaging friendly copy of the AudioProcessing module from the WebRTC project";
     license = licenses.bsd3;
-    platforms = platforms.unix;
+    # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/blob/v0.3.1/webrtc/rtc_base/system/arch.h
+    # + our patches
+    platforms = intersectLists platforms.unix (platforms.aarch64 ++ platforms.mips ++ platforms.power ++ platforms.riscv ++ platforms.x86);
   };
 }

pkgs/development/libraries/webrtc-audio-processing/default.nix

@@ -33,11 +33,13 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    homepage = "http://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing";
+    homepage = "https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing";
     description = "A more Linux packaging friendly copy of the AudioProcessing module from the WebRTC project";
     license = licenses.bsd3;
+    # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/blob/master/webrtc/rtc_base/system/arch.h
+    platforms = intersectLists platforms.unix (platforms.aarch64 ++ platforms.mips ++ platforms.riscv ++ platforms.x86);
     # attempts to inline 256bit AVX instructions on x86
     # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/5
-    platforms = lib.lists.subtractLists platforms.i686 platforms.unix;
+    broken = stdenv.isx86_32;
   };
 }

pkgs/development/nim-packages/safeset/default.nix

@@ -0,0 +1,22 @@
+{ lib, buildNimPackage, fetchFromGitHub }:
+buildNimPackage rec {
+  pname = "safeset";
+
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "avahe-kellenberger";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-ZLdStoNVoQhRkD2iEzKxhs1UPfgnbJM9QCDHdjH7vTU=";
+  };
+
+  doCheck = true;
+
+  meta = with lib;
+    src.meta // {
+      description = "safeset library for nim";
+      license = [ licenses.gpl2 ];
+      maintainers = [ maintainers.marcusramberg ];
+    };
+}

pkgs/development/nim-packages/x11/default.nix

@@ -0,0 +1,22 @@
+{ lib, buildNimPackage, fetchFromGitHub }:
+
+buildNimPackage rec {
+  pname = "x11";
+  version = "1.1";
+
+  src = fetchFromGitHub {
+    owner = "nim-lang";
+    repo = pname;
+    rev = "2093a4c01360cbb5dd33ab79fd4056e148b53ca1";
+    hash = "sha256-2XRyXiBxAc9Zx/w0zRBHRZ240qww0FJvIvOKZ8YH50A=";
+  };
+
+  doCheck = true;
+
+  meta = with lib;
+    src.meta // {
+      description = "X11 library for nim";
+      license = [ licenses.mit ];
+      maintainers = [ maintainers.marcusramberg ];
+    };
+}

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

@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "aiopvpc";
-  version = "4.0.1";
+  version = "4.1.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "azogue";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-E5z74/5VuFuOyAfeT4PQlHUNOiVT4sPgOdxoAIIymxU=";
+    hash = "sha256-ixHLFVPlDZKQkPMrOt8PG5z+e84UlygQutkyS8wCZR4=";
   };
 
   postPatch = ''

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

@@ -34,12 +34,12 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [
-    plotly
-    flask
-    flask-compress
     dash-core-components
     dash-html-components
     dash-table
+    flask
+    flask-compress
+    plotly
   ];
 
   passthru.optional-dependencies = {
@@ -55,9 +55,9 @@ buildPythonPackage rec {
   };
 
   nativeCheckInputs = [
-    pytestCheckHook
-    pytest-mock
     mock
+    pytest-mock
+    pytestCheckHook
     pyyaml
   ];
 
@@ -67,6 +67,11 @@ buildPythonPackage rec {
     "tests/integration"
   ];
 
+  disabledTests = [
+    # Failed: DID NOT RAISE <class 'ImportError'>
+    "test_missing_flask_compress_raises"
+  ];
+
   pythonImportsCheck = [
     "dash"
   ];
@@ -74,6 +79,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python framework for building analytical web applications";
     homepage = "https://dash.plot.ly/";
+    changelog = "https://github.com/plotly/dash/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ antoinerg ];
   };

pkgs/development/python-modules/dbus-python-client-gen/default.nix

@@ -4,11 +4,15 @@
 , into-dbus-python
 , dbus-python
 , pytestCheckHook
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "dbus-python-client-gen";
   version = "0.8.2";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "stratis-storage";
@@ -31,6 +35,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "A Python library for generating dbus-python client code";
     homepage = "https://github.com/stratis-storage/dbus-python-client-gen";
+    changelog = "https://github.com/stratis-storage/dbus-python-client-gen/blob/v${version}/CHANGES.txt";
     license = licenses.mpl20;
     maintainers = with maintainers; [ nickcao ];
   };

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

@@ -4,6 +4,7 @@
 , pythonOlder
 , pythonRelaxDepsHook
 , pytestCheckHook
+, cookiecutter
 , datasets
 , dill
 , fsspec
@@ -13,6 +14,7 @@
 , numpy
 , packaging
 , pandas
+, pyarrow
 , requests
 , responses
 , tqdm
@@ -37,6 +39,7 @@ buildPythonPackage rec {
   pythonRelaxDeps = [ "responses" ];
 
   propagatedBuildInputs = [
+    cookiecutter
     datasets
     numpy
     dill
@@ -48,6 +51,7 @@ buildPythonPackage rec {
     fsspec
     huggingface-hub
     packaging
+    pyarrow
     responses
   ] ++ lib.optionals (pythonOlder "3.8") [
     importlib-metadata
@@ -66,5 +70,6 @@ buildPythonPackage rec {
     changelog = "https://github.com/huggingface/evaluate/releases/tag/v${version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ bcdarwin ];
+    mainProgram = "evaluate-cli";
   };
 }

pkgs/development/python-modules/google-cloud-access-context-manager/default.nix

@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-access-context-manager";
-  version = "0.1.15";
+  version = "0.1.16";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-W6Nb+H2CaULQ7Hp1hYxtnF9ITYa++Usc7XVoPkQPnVk=";
+    hash = "sha256-+L5Rre6LHpSlc+yzdQpMLSvURLHd412apDes5zwzdgc=";
   };
 
   propagatedBuildInputs = [

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

@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-datastore";
-  version = "2.14.0";
+  version = "2.15.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-00SlS6iL65Z2N6tgNEaIcQ09WB8Jy8emOwlaZoKjNgA=";
+    hash = "sha256-HbIUo7JpYajnaESs7sZPuEpqyGiaYeB8ooYXgH/kqoE=";
   };
 
   propagatedBuildInputs = [

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

@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-dlp";
-  version = "3.11.1";
+  version = "3.12.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-TwVY6/4TSY8cPj3y/A7+cxpyVJ9+lPg+vAKNhfBNfqI=";
+    hash = "sha256-v874eaWthn7DD9Sxg+hrXr/93k7u591h0GL68wwmeP4=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/google-cloud-resource-manager/default.nix

@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-resource-manager";
-  version = "1.8.1";
+  version = "1.9.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-npTv+f533JK/J2ceJ6Na7mS90HfKaHORmGnFz1LBzLQ=";
+    hash = "sha256-LRSAJoqdqMbNlQhoH7YQ9cZ3g7Iq4pkItaxTQTGZw1E=";
   };
 
   propagatedBuildInputs = [

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

@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-tasks";
-  version = "2.12.1";
+  version = "2.13.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-2kRj5zlAPVO2U3EzN+opz5OBtwEru5RqGOXGqLUPaUA=";
+    hash = "sha256-7V57grRH2ysU765TDmqq7DOna9o8Nu9v4HjDAIf/ETA=";
   };
 
   propagatedBuildInputs = [

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

@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-trace";
-  version = "1.10.0";
+  version = "1.11.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-aU6XD+uj/X9Gs8z2vP0rhTlaqkg7u4H9CV/CJl2b7ak=";
+    hash = "sha256-i3jUbzivzXG9bIM06ZKG9olZubBOuCWz5kk5yPZRv4k=";
   };
 
   propagatedBuildInputs = [

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

@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-translate";
-  version = "3.10.1";
+  version = "3.11.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-++1k8lhJfJ7e/oK//IyYx9W/RacQa/1RwdrhyvCYWEM=";
+    hash = "sha256-phwMOu6YEndLOOvXDnoYvShXGMMR+O/CfUyp5+gMdKM=";
   };
 
   propagatedBuildInputs = [

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

@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-videointelligence";
-  version = "2.10.1";
+  version = "2.11.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-HlmuzMOaCl7z9NBVI5HoCH1vltQCeel30B5roX/+2HE=";
+    hash = "sha256-rkqKaHNzbcIjYyCe+AN1WCLvjZ1HjWHH4xeCs8/TkZI=";
   };
 
   propagatedBuildInputs = [

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

@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "openaiauth";
+  version = "0.3.2";
+
+  src = fetchPypi {
+    inherit version;
+    pname = "OpenAIAuth";
+    hash = "sha256-CPcBgGvxRO677EdPI3lNtJXkCW7el6N6N2GeaDo5ApU=";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "OpenAIAuth"
+  ];
+
+  meta = with lib; {
+    description = "A Python library for authenticating with the OpenAI API";
+    license = licenses.mit;
+    maintainers = with maintainers; [ realsnick ];
+    homepage = "https://github.com/acheong08/OpenAIAuth";
+    changelog = "https://github.com/acheong08/OpenAIAuth/releases/tag/${version}";
+  };
+}

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

@@ -26,6 +26,14 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTests = [
+    # test_benchmarks.py tests are actually benchmarks and may fail due to
+    # something being unexpectedly slow on a heavily loaded build machine
+    "test_lists_vs_dicts"
+    "test_call_vs_inline"
+    "test_startswith_vs_regex"
+  ];
+
   postPatch = ''
     substituteInPlace setup.py \
       --replace "regex>=2022.3.15" "regex"

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

@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "qualysclient";
-  version = "0.0.4.8.2";
+  version = "0.0.4.8.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -23,8 +23,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "woodtechie1428";
     repo = pname;
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
-    sha256 = "0hrbp5ci1l06j709k5y3z3ad9dryvrkvmc2wyb4a01gw7qzry7ys";
+    hash = "sha256-+SZICysgSC4XeXC9CCl6Yxb47V9c1eMp7KcpH8J7kK0=";
   };
 
   propagatedBuildInputs = [
@@ -49,6 +49,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python SDK for interacting with the Qualys API";
     homepage = "https://qualysclient.readthedocs.io/";
+    changelog = "https://github.com/woodtechie1428/qualysclient/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };

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

@@ -40,7 +40,7 @@
 
 buildPythonPackage rec {
   pname = "sentry-sdk";
-  version = "1.15.0";
+  version = "1.16.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -49,7 +49,7 @@ buildPythonPackage rec {
     owner = "getsentry";
     repo = "sentry-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-xUDMi2xoRMsDDe7LcQxIxxozo8vV5ZPzZp5zmNld3ew=";
+    hash = "sha256-hJ6OikRro9YUEX8rqMs/JkTvM9aTabEj4E8iNQ71gEc=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/types-ujson/default.nix

@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "types-ujson";
+  version = "5.7.0.1";
+  format = "setuptools";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-VDUaYuwbZVDvsXr2PvfwwA0O+pwJnefaXGJ+HvooBVM=";
+  };
+
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "ujson-stubs"
+  ];
+
+  meta = with lib; {
+    description = "Typing stubs for ujson";
+    homepage = "https://github.com/python/typeshed";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ centromere ];
+  };
+}

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

@@ -24,21 +24,18 @@
 
 buildPythonPackage rec {
   pname = "vdirsyncer";
-  version = "0.19.0";
+  version = "0.19.1";
-  format = "setuptools";
+  format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256:0995bavlv8s9j0127ncq3yzy5p72lam9qgpswyjfanc6l01q87lf";
+    hash = "sha256-qnbHclqlpxH2N0vFzYO+eKrmjHSCljWp7Qc81MCfA64=";
   };
 
   postPatch = ''
-    substituteInPlace setup.py \
+    sed -i -e '/--cov/d' -e '/--no-cov/d' pyproject.toml
-      --replace "click-log>=0.3.0, <0.4.0" "click-log>=0.3.0, <0.5.0"
-
-    sed -i -e '/--cov/d' -e '/--no-cov/d' setup.cfg
   '';
 
   propagatedBuildInputs = [
@@ -53,10 +50,6 @@ buildPythonPackage rec {
     aiohttp-oauthlib
   ];
 
-  nativeBuildInputs = [
-    setuptools-scm
-  ];
-
   nativeCheckInputs = [
     hypothesis
     pytestCheckHook

pkgs/development/tools/buildkit/default.nix

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "buildkit";
-  version = "0.11.2";
+  version = "0.11.4";
 
   src = fetchFromGitHub {
     owner = "moby";
     repo = "buildkit";
     rev = "v${version}";
-    hash = "sha256-P1hu60vjJJASWxgc9LOwdy7psqgIHi8Z/D5c++TProY=";
+    hash = "sha256-/9gP8ciHeFKjO0VAKXDor19Wm6wULLVlFYbHUYWFpWY=";
   };
 
   vendorHash = null;

pkgs/development/tools/database/pgsync/Gemfile.lock

@@ -2,13 +2,13 @@ GEM
   remote: https://rubygems.org/
   specs:
     parallel (1.22.1)
-    pg (1.4.5)
+    pg (1.4.6)
-    pgsync (0.7.3)
+    pgsync (0.7.4)
       parallel
       pg (>= 0.18.2)
-      slop (>= 4.8.2)
+      slop (>= 4.10.1)
       tty-spinner
-    slop (4.10.0)
+    slop (4.10.1)
     tty-cursor (0.7.1)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
@@ -20,4 +20,4 @@ DEPENDENCIES
   pgsync
 
 BUNDLED WITH
-   2.3.7
+   2.4.6

pkgs/development/tools/database/pgsync/gemset.nix

@@ -14,10 +14,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1wd6nl81nbdwck04hccsm7wf23ghpi8yddd9j4rbwyvyj0sbsff1";
+      sha256 = "07m6lxljabw9kyww5k5lgsxsznsm1v5l14r1la09gqka9b5kv3yr";
       type = "gem";
     };
-    version = "1.4.5";
+    version = "1.4.6";
   };
   pgsync = {
     dependencies = ["parallel" "pg" "slop" "tty-spinner"];
@@ -25,20 +25,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "18misp6iwjr3cd4jzhbnf2q058gnkxx27jx1b87z6p64bwkgr3x2";
+      sha256 = "1f2lzsa7l88skp18f8w1ch9w8a42pymc48rdaqjrrdgg0126kvj3";
       type = "gem";
     };
-    version = "0.7.3";
+    version = "0.7.4";
   };
   slop = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "052mhd76f4dshc36f2bd5pp807lgnaj5i6ai8jg075384wcfhcpb";
+      sha256 = "1iyrjskgxyn8i1679qwkzns85p909aq77cgx2m4fs5ygzysj4hw4";
       type = "gem";
     };
-    version = "4.10.0";
+    version = "4.10.1";
   };
   tty-cursor = {
     groups = ["default"];

pkgs/development/tools/mdk/default.nix

@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   pname = "gnu-mdk";
   version = "1.3.0";
   src = fetchurl {
-    url = "mirror://gnu/gnu/mdk/v${version}/mdk-${version}.tar.gz";
+    url = "mirror://gnu/mdk/v${version}/mdk-${version}.tar.gz";
     sha256 = "0bhk3c82kyp8167h71vdpbcr852h5blpnwggcswqqwvvykbms7lb";
   };
   nativeBuildInputs = [ pkg-config intltool ];

pkgs/development/tools/misc/topiary/default.nix

@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "topiary";
-  version = "unstable-2023-01-10";
+  version = "0.1.0";
 
   src = fetchFromGitHub {
     owner = "tweag";
     repo = pname;
-    rev = "c36d4a2253f337e1a28d497826a84754b8d833f6";
+    rev = "v${version}";
-    sha256 = "sha256-0uqDuEpL9JCXzD7sQ3PDv4N1KtCSkoMoD5i402uIfas=";
+    sha256 = "sha256-Gm6AzzVLUXZi2jzJ1b/c4yjIvRRA2e5mC2CMVyly2X8=";
   };
 
-  cargoSha256 = "sha256-PvMjLC133rlsPrgyESuVHIf2TPCtgGQQULCQvBTIJ20=";
+  cargoSha256 = "sha256-2Ovwntg3aZyR73rg8ruA/U1wVS1BO+B7r37D6/LPa/g=";
 
   postInstall = ''
     install -Dm444 languages/* -t $out/share/languages

pkgs/development/tools/protoc-gen-go/default.nix

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "protoc-gen-go";
-  version = "1.28.1";
+  version = "1.29.0";
 
   src = fetchFromGitHub {
     owner = "protocolbuffers";
     repo = "protobuf-go";
     rev = "v${version}";
-    sha256 = "sha256-7Cg7fByLR9jX3OSCqJfLw5PAHDQi/gopkjtkbobnyWM=";
+    sha256 = "sha256-su8upKXi7mvalk+Fa/sGGFizAXisHiBCc5OVIizujwI=";
   };
 
   vendorSha256 = "sha256-yb8l4ooZwqfvenlxDRg95rqiL+hmsn0weS/dPv/oD2Y=";

pkgs/development/web/lucky-cli/default.nix

@@ -2,13 +2,13 @@
 
 crystal.buildCrystalPackage rec {
   pname = "lucky-cli";
-  version = "0.30.0";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "luckyframework";
     repo = "lucky_cli";
     rev = "v${version}";
-    hash = "sha256-fgrfVqRcb8xdvZ33XW3lBwR1GhjF/WeAglrPH2Fw31I=";
+    hash = "sha256-Ky4DmClSyAVBAetpZM5tFnQZ74fchCOgcxBftd+gwlE=";
   };
 
   # the integration tests will try to clone a remote repos

pkgs/development/web/lucky-cli/shard.lock

@@ -2,7 +2,7 @@ version: 2.0
 shards:
   ameba:
     git: https://github.com/crystal-ameba/ameba.git
-    version: 1.0.0
+    version: 1.1.0
 
   lucky_task:
     git: https://github.com/luckyframework/lucky_task.git
@@ -10,7 +10,7 @@ shards:
 
   nox:
     git: https://github.com/matthewmcgarvey/nox.git
-    version: 0.2.0
+    version: 0.2.2
 
   teeplate:
     git: https://github.com/luckyframework/teeplate.git

pkgs/development/web/lucky-cli/shards.nix

@@ -1,8 +1,8 @@
 {
   ameba = {
     url = "https://github.com/crystal-ameba/ameba.git";
-    rev = "v1.0.0";
+    rev = "v1.1.0";
-    sha256 = "01cgapdpk8dg7sdgnq6ql42g3kv5z2fmsc90z07d9zvjp9vs2idp";
+    sha256 = "0famv413myrshgv6y24mr84ny53rcsr777x323jlaf2isnhdd0b8";
   };
   lucky_task = {
     url = "https://github.com/luckyframework/lucky_task.git";
@@ -11,8 +11,8 @@
   };
   nox = {
     url = "https://github.com/matthewmcgarvey/nox.git";
-    rev = "v0.2.0";
+    rev = "v0.2.2";
-    sha256 = "041wh7nbi8jxg314p5s4080ll9ywc48knpxmrzwj5h4rgmk7g231";
+    sha256 = "1dfq0aknrxwp9wc0glri4w5j8pfbc6b1xrsxkahci109p6dhcna5";
   };
   teeplate = {
     url = "https://github.com/luckyframework/teeplate.git";

pkgs/games/factorio/versions.json

@@ -2,20 +2,20 @@
   "x86_64-linux": {
     "alpha": {
       "experimental": {
+        "name": "factorio_alpha_x64-1.1.77.tar.xz",
+        "needsAuth": true,
+        "sha256": "1qcjp51sykq0ygq4j4zih3yp1x517b2j54xfyi8g4minfk57zwk9",
+        "tarDirectory": "x64",
+        "url": "https://factorio.com/get-download/1.1.77/alpha/linux64",
+        "version": "1.1.77"
+      },
+      "stable": {
         "name": "factorio_alpha_x64-1.1.76.tar.xz",
         "needsAuth": true,
         "sha256": "1kz93imyddivpp8zslggldm8zyb9j0zdj67pgkxazn8fd9avrq1p",
         "tarDirectory": "x64",
         "url": "https://factorio.com/get-download/1.1.76/alpha/linux64",
         "version": "1.1.76"
-      },
-      "stable": {
-        "name": "factorio_alpha_x64-1.1.74.tar.xz",
-        "needsAuth": true,
-        "sha256": "0ygnqlw92gz2s2c4pdhb11lvh86d7byhw5l3qw1fjsx0xv3qnxrs",
-        "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/1.1.74/alpha/linux64",
-        "version": "1.1.74"
       }
     },
     "demo": {
@@ -28,30 +28,30 @@
         "version": "1.1.76"
       },
       "stable": {
-        "name": "factorio_demo_x64-1.1.69.tar.xz",
+        "name": "factorio_demo_x64-1.1.76.tar.xz",
         "needsAuth": false,
-        "sha256": "08nakf6f31dra3rzv2l57pnww04i4ppil6c3vvvhjcv8j35b5k29",
+        "sha256": "0f3m0p5baakc6cv9fr3rwyq39bydraji9wh3ivblg1mj6dwpqnlj",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/1.1.69/demo/linux64",
+        "url": "https://factorio.com/get-download/1.1.76/demo/linux64",
-        "version": "1.1.69"
+        "version": "1.1.76"
       }
     },
     "headless": {
       "experimental": {
+        "name": "factorio_headless_x64-1.1.77.tar.xz",
+        "needsAuth": false,
+        "sha256": "1ygzlr26bp7l9znbjyqj7il6yq9faxjfr6cvfqbs8ls66qiv0ls6",
+        "tarDirectory": "x64",
+        "url": "https://factorio.com/get-download/1.1.77/headless/linux64",
+        "version": "1.1.77"
+      },
+      "stable": {
         "name": "factorio_headless_x64-1.1.76.tar.xz",
         "needsAuth": false,
         "sha256": "19xx6sv382ijwv8nbqw3c3izckvqkpsf949bn4g09qmg7b663g94",
         "tarDirectory": "x64",
         "url": "https://factorio.com/get-download/1.1.76/headless/linux64",
         "version": "1.1.76"
-      },
-      "stable": {
-        "name": "factorio_headless_x64-1.1.74.tar.xz",
-        "needsAuth": false,
-        "sha256": "1lqxprmai3vrm3hf9zdj9c9c6w05086nzn0vy88zy7xm2dgw7ylv",
-        "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/1.1.74/headless/linux64",
-        "version": "1.1.74"
       }
     }
   }

pkgs/games/openmw/tes3mp.nix

@@ -3,13 +3,9 @@
 , cmake
 , openmw
 , fetchFromGitHub
-, formats
 , luajit
 , makeWrapper
 , symlinkJoin
-, mygui
-, crudini
-, bullet
 }:
 
 # revisions are taken from https://github.com/GrimKriegor/TES3MP-deploy
@@ -18,17 +14,22 @@ let
   # raknet could also be split into dev and lib outputs
   raknet = stdenv.mkDerivation {
     pname = "raknet";
-    version = "unstable-2018-07-14";
+    version = "unstable-2020-01-19";
 
     src = fetchFromGitHub {
       owner = "TES3MP";
       repo = "CrabNet";
       # usually fixed:
       # https://github.com/GrimKriegor/TES3MP-deploy/blob/d2a4a5d3acb64b16d9b8ca85906780aeea8d311b/tes3mp-deploy.sh#L589
-      rev = "4eeeaad2f6c11aeb82070df35169694b4fb7b04b";
+      rev = "19e66190e83f53bcdcbcd6513238ed2e54878a21";
-      sha256 = "0p0li9l1i5lcliswm5w9jql0zff9i6fwhiq0bl130m4i7vpr4cr3";
+      sha256 = "WIaJkSQnoOm9T7GoAwmWl7fNg79coIo/ILUsWcbH+lA=";
     };
 
+    cmakeFlags = [
+      "-DCMAKE_BUILD_TYPE=Release"
+      "-DCRABNET_ENABLE_DLL=OFF"
+    ];
+
     nativeBuildInputs = [ cmake ];
 
     installPhase = ''
@@ -38,14 +39,14 @@ let
 
   coreScripts = stdenv.mkDerivation {
     pname = "corescripts";
-    version = "unstable-2020-07-27";
+    version = "0.8.1";
 
     src = fetchFromGitHub {
       owner = "TES3MP";
       repo = "CoreScripts";
       # usually latest in stable branch (e.g. 0.7.1)
-      rev = "3c2d31595344db586d8585db0ef1fc0da89898a0";
+      rev = "6ae0a2a5d16171de3764817a7f8b1067ecde3def";
-      sha256 = "sha256-m/pt2Et58HOMc1xqllGf4hjPLXNcc14+X0h84ouZDeg=";
+      sha256 = "8j/Sr9IRMNFPEVfFzdb42PckHS3KW7FH7x7rRxIh5gY=";
     };
 
     buildCommand = ''
@@ -59,20 +60,19 @@ let
   # case the scripts or wrapper scripts change.
   unwrapped = openmw.overrideAttrs (oldAttrs: rec {
     pname = "openmw-tes3mp-unwrapped";
-    version = "unstable-2020-08-07";
+    version = "0.8.1";
 
     src = fetchFromGitHub {
       owner = "TES3MP";
-      repo = "openmw-tes3mp";
+      repo = "TES3MP";
       # usually latest in stable branch (e.g. 0.7.1)
-      rev = "ce5df6d18546e37aac9746d99c00d27a7f34b00d";
+      rev = "68954091c54d0596037c4fb54d2812313b7582a1";
-      sha256 = "sha256-xLslShNA6rVFl9kt6BNGDpSYMpO25jBTCteLJoSTXdg=";
+      sha256 = "8/bV4sw7Q8l8bDTHGQ0t4owf6J6h9q468JFx4KegY5o=";
     };
 
     nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ makeWrapper ];
 
-    buildInputs = (builtins.map (x: if x.pname or "" == "bullet" then bullet else x) oldAttrs.buildInputs)
+    buildInputs = oldAttrs.buildInputs ++ [ luajit ];
-      ++ [ luajit ];
 
     cmakeFlags = oldAttrs.cmakeFlags ++ [
       "-DBUILD_OPENCS=OFF"
@@ -108,16 +108,24 @@ let
       license = licenses.gpl3Only;
       maintainers = with maintainers; [ peterhoeg ];
       platforms = [ "x86_64-linux" "i686-linux" ];
-      broken = true;
     };
   });
 
-  cfgFile = (formats.ini { }).generate "tes3mp-server.cfg" {
+  tes3mp-server-run = ''
-    Plugins.home = "${coreScripts}/share/openmw-tes3mp/CoreScripts";
+    config="''${XDG_CONFIG_HOME:-''$HOME/.config}"/openmw
-  };
+    data="''${XDG_DATA_HOME:-''$HOME/.local/share}"/openmw
+    if [[ ! -f "$config"/tes3mp-server.cfg && ! -d "$data"/server ]]; then
+      mkdir -p "$config"
+      echo [Plugins] > "$config"/tes3mp-server.cfg
+      echo "home = $data/server" >> "$config"/tes3mp-server.cfg
+      mkdir -p "$data"
+      cp -r ${coreScripts}/share/openmw-tes3mp/CoreScripts "$data"/server
+      chmod -R u+w "$data"/server
+    fi
+  '';
 
 in
-symlinkJoin rec {
+symlinkJoin {
   name = "openmw-tes3mp-${unwrapped.version}";
   inherit (unwrapped) version meta;
 
@@ -125,18 +133,14 @@ symlinkJoin rec {
 
   paths = [ unwrapped ];
 
-  # crudini --merge will create the file if it doesn't exist
   postBuild = ''
     mkdir -p $out/bin
 
-    dir=\''${XDG_CONFIG_HOME:-\$HOME/.config}/openmw
-
     makeWrapper ${unwrapped}/libexec/tes3mp-browser $out/bin/tes3mp-browser \
       --chdir "$out/bin"
 
     makeWrapper ${unwrapped}/libexec/tes3mp-server $out/bin/tes3mp-server \
-      --run "mkdir -p $dir" \
+      --run '${tes3mp-server-run}' \
-      --run "${crudini}/bin/crudini --merge $dir/${cfgFile.name} < ${cfgFile}" \
       --chdir "$out/bin"
   '';
 }

pkgs/os-specific/darwin/smimesign/default.nix

@@ -2,18 +2,21 @@
 
 buildGoModule rec {
   pname = "smimesign";
-  version = "0.1.0";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "github";
     repo = "smimesign";
     rev = "v${version}";
-    sha256 = "12f8vprp4v78l9ifrlql0mvpyw5qa8nlrh5ajq5js8wljzpx7wsv";
+    hash = "sha256-W9Hj/+snx+X6l95Gt9d8DiLnBPV9npKydc/zMN9G0vQ=";
   };
 
-  vendorSha256 = "1cldxykm9qj5rvyfafam45y5xj4f19700s2f9w7ndhxgfp9vahvz";
+  vendorHash = "sha256-wLqYUICL+gdvRCLNrA0ZNcFI4oV3Oik762q7xF115Lw=";
 
-  ldflags = [ "-X main.versionString=v${version}" ];
+  ldflags = [ "-s" "-w" "-X main.versionString=v${version}" ];
+
+  # Fails in sandbox
+  doCheck = false;
 
   meta = with lib; {
     description = "An S/MIME signing utility for macOS and Windows that is compatible with Git";

pkgs/os-specific/linux/firmware/linux-firmware/source.nix

@@ -1,6 +1,6 @@
 # This file is autogenerated! Run ./update.sh to regenerate.
 {
-  version = "20230210";
+  version = "20230310";
-  sourceHash = "sha256-sjUO+DTjAMszfCkNSYjLS+AbceIVPVVH0OEho5VOIFA=";
+  sourceHash = "sha256-a0Or/ov+YDbDbyUy65j95wgW1ZBo2LIxYWR7L6z6Usw=";
-  outputHash = "sha256-ZcmMLenblgQngdYui0wNANXhB5a/z635nNXo/MO83R8=";
+  outputHash = "sha256-BL1dSTAjg5F1JWhoVYelMJRv+lMZNA8S7FbGIQWemMo=";
 }

pkgs/os-specific/linux/kernel/linux-4.14.nix

@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "4.14.308";
+  version = "4.14.309";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "19lkw0izj0i63grzycvz6pdxvih0q7lml0h30zsxzb4vb7yj0v7i";
+    sha256 = "1rwhz9w5x2x3idy2f0bpk945qam6xxswbn69wmz8y1ik9b1nns09";
   };
 } // (args.argsOverride or {}))

pkgs/os-specific/linux/kernel/linux-4.19.nix

@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "4.19.276";
+  version = "4.19.277";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1f8lcd47pba4jfycbbrd8vsqpf038x19rf80g3grzpvsgyaq1k1f";
+    sha256 = "137mjk6hzpr120bb6ky3b8q4jnkbgqla0cpgnhzpcng00aidk0pn";
   };
 } // (args.argsOverride or {}))

pkgs/os-specific/linux/kernel/linux-5.10.nix

@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "5.10.173";
+  version = "5.10.174";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "099w115m2b1l99r4pn7ifjg6aqb8rsn888102qj8iv97qxsb901l";
+    sha256 = "092ai8ggplsa933s3qlayyjkw9d3z6sg782byh7rz0ym0380r2ig";
   };
 } // (args.argsOverride or {}))

pkgs/os-specific/linux/kernel/linux-5.15.nix

@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "5.15.101";
+  version = "5.15.102";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "0bf0s3qw1k0p13f5cnircajfyr3j22yp9jx4l62iarxbn1k20fdr";
+    sha256 = "1rh1kcvaz42brn5sxqq00mvy0b36fck196yvxfg7b5qbjzxxs724";
   };
 } // (args.argsOverride or { }))

pkgs/os-specific/linux/kernel/linux-5.4.nix

@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "5.4.235";
+  version = "5.4.236";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "1yqlvfw15mvmn6fh7gpck799pw4a2sip52ar9ammi0qdp96x1gxq";
+    sha256 = "0la92nvqihg4284risb2ljsrdh8x4wy0dwc3wsyq09bgm7x95j6c";
   };
 } // (args.argsOverride or {}))

pkgs/os-specific/linux/kernel/linux-6.1.nix

@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "6.1.18";
+  version = "6.1.19";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
-    sha256 = "07hlmv00wqi7497c3y6w7494qsxgd97kzy7xa30v0vqfzxgc2al4";
+    sha256 = "0iw6b9gmhpk6r1asds5kfg6drqvaxy15xicqx9ga873cbxp1r6cy";
   };
 } // (args.argsOverride or { }))

pkgs/os-specific/linux/kernel/linux-6.2.nix

@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "6.2.5";
+  version = "6.2.6";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
-    sha256 = "1fg5rq40fi7xkx3pw54538gydygbizg492aqfnh0hn3fry903av5";
+    sha256 = "179x1fqgi3drg1q1xy0648hvy7cpc79yzn2r248rq4mprvbz3qhz";
   };
 } // (args.argsOverride or { }))

pkgs/os-specific/linux/kernel/patches.nix

@@ -62,13 +62,4 @@
     name = "fix-em-ice-bonding";
     patch = ./fix-em-ice-bonding.patch;
   };
-
-  # https://lore.kernel.org/linux-wireless/ZAx0TWRBlGfv7pNl@kroah.com/T/#m11e6e0915ab8fa19ce8bc9695ab288c0fe018edf
-  fix-brcmfmac = {
-    name = "fix-brcmfmac";
-    patch = fetchpatch {
-      url = "https://lore.kernel.org/linux-wireless/20230311141914.24444-1-marcan@marcan.st/raw";
-      sha256 = "sha256-Fjap48Lef8Mi1i0t13/rT2SoYcbO8HJuXhJMn7HK3Ds=";
-    };
-  };
 }

pkgs/os-specific/linux/zfs/default.nix

@@ -17,6 +17,7 @@
 
 # for determining the latest compatible linuxPackages
 , linuxPackages_6_1 ? pkgs.linuxKernel.packages.linux_6_1
+, linuxPackages_6_2 ? pkgs.linuxKernel.packages.linux_6_2
 }:
 
 let
@@ -233,8 +234,17 @@ in {
 
   zfsUnstable = common {
     # check the release notes for compatible kernels
-    kernelCompatible = kernel.kernelOlder "6.2";
+    # NOTE:
-    latestCompatibleLinuxPackages = linuxPackages_6_1;
+    #   zfs-2.1.9<=x<=2.1.10 is broken with aarch64-linux-6.2
+    #   for future releases, please delete this condition.
+    kernelCompatible =
+      if kernel.stdenv.isx86_64
+      then kernel.kernelOlder "6.3"
+      else kernel.kernelOlder "6.2";
+    latestCompatibleLinuxPackages =
+      if kernel.stdenv.isx86_64
+      then linuxPackages_6_2
+      else linuxPackages_6_1;
 
     # this package should point to a version / git revision compatible with the latest kernel release
     # IMPORTANT: Always use a tagged release candidate or commits from the

pkgs/tools/admin/coldsnap/default.nix

@@ -9,15 +9,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "coldsnap";
-  version = "0.4.3";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-kL9u+IBlC9Pxm5yaJagY9dy0Pm0xlKfVxFVBmwDMSak=";
+    hash = "sha256-M3TzzaOTbe0VbAd2HSUC/S5Sfuanv8Ad17C6vBNb2og=";
   };
-  cargoHash = "sha256-eYBmke0FQ9CK3cCaM7ecmp1vkNlZO3SHRnxFzmelYhU=";
+  cargoHash = "sha256-N6066QMGA2XAQ7xr6d34Ts7lVcnRC0uFo0/xpPceNcQ=";
 
   buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
   nativeBuildInputs = [ pkg-config ];

pkgs/tools/compression/unzrip/default.nix

@@ -0,0 +1,35 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, zstd
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "unzrip";
+  version = "unstable-2023-03-13";
+
+  src = fetchFromGitHub {
+    owner = "quininer";
+    repo = "unzrip";
+    rev = "bd2dffd43c3235857500190571602f3ce58c5f70";
+    hash = "sha256-Ih47xF4JYQf10RuTnfJJGUAJwyxDxCAdTTCdwGf4i/U=";
+  };
+
+  cargoHash = "sha256-11UESSKvTcr6Wa0cASRSQ55kBbRL5AelI6thv3oi0sI=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    zstd
+  ];
+
+  meta = with lib; {
+    description = "Unzip implementation, support for parallel decompression, automatic detection encoding";
+    homepage = "https://github.com/quininer/unzrip";
+    license = licenses.mit;
+    maintainers = with maintainers; [ figsoda ];
+  };
+}