Merge master into staging-next

2023-05-21 06:01:17 +00:00
parent b3208fe3b2 2dee1073d9
commit fca8a92097
25 changed files with 177 additions and 62 deletions
@@ -38,13 +38,13 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "cudatext";
-  version = "1.194.0";
+  version = "1.194.4";

  src = fetchFromGitHub {
    owner = "Alexey-T";
    repo = "CudaText";
    rev = version;
-    hash = "sha256-+zdboXU4Tg6RLRVwjS2FQGLfYZu/A09eoZUrYX4SK0o=";
+    hash = "sha256-suZROvrbi02jRnueoet2wT2+dxNuWgv8X6tIvlOPHPI=";
  };

  postPatch = ''
@@ -11,13 +11,13 @@
  },
  "ATFlatControls": {
    "owner": "Alexey-T",
-    "rev": "2023.05.07",
-    "hash": "sha256-B1+de0ze17GTAFuWxgmk95sdYiUmDGdeNTJmyy74Vmc="
+    "rev": "2023.05.17",
+    "hash": "sha256-yt5i3txXqHs7MoQepY+tbzv1wxwAegm9C+rWZtxJ4zE="
  },
  "ATSynEdit": {
    "owner": "Alexey-T",
-    "rev": "2023.05.13",
-    "hash": "sha256-GP7qzCfL8KNXF/CvoeJshA3YbNE5+wuZ2VYn8hLEPlo="
+    "rev": "2023.05.17",
+    "hash": "sha256-6hz1oOnappiXktvvEBWXsaI/hnJ9mbnS5hWnyCVN2Ys="
  },
  "ATSynEdit_Cmp": {
    "owner": "Alexey-T",
@@ -26,8 +26,8 @@
  },
  "EControl": {
    "owner": "Alexey-T",
-    "rev": "2023.04.18",
-    "hash": "sha256-Eb8ynxZP3OQ7TGFZMbw8r0HXXvaoR6yotwnwK6nwZxg="
+    "rev": "2023.05.17",
+    "hash": "sha256-tzQEL23k7ZhnOxN9IOD0lG/2FNOdjuS8vP+0f6IU8Ks="
  },
  "ATSynEdit_Ex": {
    "owner": "Alexey-T",
@@ -2549,6 +2549,18 @@ final: prev:
    meta.homepage = "https://github.com/Shougo/denite.nvim/";
  };

+  denops-vim = buildVimPluginFrom2Nix {
+    pname = "denops.vim";
+    version = "2023-01-20";
+    src = fetchFromGitHub {
+      owner = "vim-denops";
+      repo = "denops.vim";
+      rev = "44baa0666e69976dd82311a67a220c7f71273368";
+      sha256 = "1wdl2sq6vl4lmyqrhnp0mspxbfaza3h8pgkgdhf27jdkavg793ij";
+    };
+    meta.homepage = "https://github.com/vim-denops/denops.vim/";
+  };
+
  deol-nvim = buildVimPluginFrom2Nix {
    pname = "deol.nvim";
    version = "2023-05-19";
@@ -18,6 +18,7 @@
 , Cocoa
 , code-minimap
 , dasht
+, deno
 , direnv
 , fish
 , fzf
@@ -408,6 +409,13 @@ self: super: {
    dependencies = with self; [ nvim-yarp ];
  });

+  denops-vim = super.denops-vim.overrideAttrs (old: {
+    postPatch = ''
+      # Use Nix's Deno instead of an arbitrary install
+      substituteInPlace ./autoload/denops.vim --replace "call denops#_internal#conf#define('denops#deno', 'deno')" "call denops#_internal#conf#define('denops#deno', '${deno}/bin/deno')"
+    '';
+  });
+
  deoplete-fish = super.deoplete-fish.overrideAttrs (old: {
    dependencies = with self; [ deoplete-nvim vim-fish ];
  });
@@ -213,6 +213,7 @@ https://github.com/Raimondi/delimitMate/,,
 https://github.com/neoclide/denite-extra/,,
 https://github.com/neoclide/denite-git/,,
 https://github.com/Shougo/denite.nvim/,,
+https://github.com/vim-denops/denops.vim/,HEAD,
 https://github.com/Shougo/deol.nvim/,,
 https://github.com/deoplete-plugins/deoplete-clang/,,
 https://github.com/deoplete-plugins/deoplete-dictionary/,,
@@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config";
 in
 buildGoModule rec {
  pname = "process-compose";
-  version = "0.43.1";
+  version = "0.45.0";

  src = fetchFromGitHub {
    owner = "F1bonacc1";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-yNYoVz6vITKkAkqH/0p7D4sifTpjtEZS4syFSwN4v98=";
+    hash = "sha256-VNt+47EN+7EoChJjpg7B5ziu54Xt7egjfOye1IZPEvw=";
    # populate values that require us to use git. By doing this in postFetch we
    # can delete .git afterwards and maintain better reproducibility of the src.
    leaveDotGit = true;
@@ -43,7 +43,7 @@ buildGoModule rec {
    installShellFiles
  ];

-  vendorHash = "sha256-iiGn0dYHNEp5Bs54X44sHbsG3HD92Xs4oah4iZXqqvQ=";
+  vendorHash = "sha256-9RvVBup07FHCjfV/Q6ryU28inqydL/pMGVUfbo2OG5s=";

  doCheck = false;

@@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "vhs";
-  version = "0.4.0";
+  version = "0.5.0";

  src = fetchFromGitHub {
    owner = "charmbracelet";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-qtewd4sm3urFwoDkqdUHfr2SvJRR1nVLLE5d28BocYg=";
+    hash = "sha256-d7oHPe1R0KZaVTTxmed27VZ2PphiQfy7CXYhVKHWUhE=";
  };

-  vendorHash = "sha256-s1ISU7VEH9o7SBF3Vy+2kVZNxOFUYLmh/le5vU8rOqg=";
+  vendorHash = "sha256-jrXdbxH5hJrd5yyVsTOeIYJciJ6wVTydkD6aSuWYKPQ=";

  nativeBuildInputs = [ installShellFiles makeWrapper ];

@@ -1,8 +1,8 @@
 {
  "stable": {
-    "version": "113.0.5672.92",
-    "sha256": "199vi4ay9yrvi95r0ccfih1i7wnnqfh5vkqbr35mpmr4r19hnlm4",
-    "sha256bin64": "0xx1c4wy0px2sndllkzbfgmjihfysxcxdpxk0zmy5yranfqbxvdv",
+    "version": "113.0.5672.126",
+    "sha256": "14rdvidabbh0abp932m747iribvpfcha8hhxh9spck9hjkaprvqd",
+    "sha256bin64": "1w8b41ij6xl8byh1977skxwwq0nivpfn8wb3gv12xvm7sw24jqka",
    "deps": {
      "gn": {
        "version": "2023-03-18",
@@ -19,9 +19,9 @@
    }
  },
  "beta": {
-    "version": "114.0.5735.26",
-    "sha256": "0v73vzgyg08683my0bc29nvbqqpq3zx9qdnxvdvp72rmyrbc5aiy",
-    "sha256bin64": "0viy4ibzh04vnkv111vcz4y0s7vg3f2470j2s1b4nzwxmqadxi3n",
+    "version": "114.0.5735.35",
+    "sha256": "1ik3d886pcpqs7fnqf7ck0y8x8dbi1d4aqm227qwv0jw2p4a0qyb",
+    "sha256bin64": "0xx53x6c7r8cji7d2663zn4p4yklzyc124abqlhyr14w8p2lfldq",
    "deps": {
      "gn": {
        "version": "2023-04-19",
@@ -32,15 +32,15 @@
    }
  },
  "dev": {
-    "version": "115.0.5762.4",
-    "sha256": "0jlqnd4cmbm3c4xz6dcgs7p8clraldl7hncm4wc28yxv5bsxhyqi",
-    "sha256bin64": "1zcpzji22fpb04bfhqlp0wy3rnjk3ylfh39r1c2zgqks31n6niz6",
+    "version": "115.0.5773.4",
+    "sha256": "18as1yqp7jyv92mn6lq4fl6mzq3w5qx4aqsw5nyixmgys4hfx6a6",
+    "sha256bin64": "0d0anrc2bdh9c8rs06jng45xd7sxw0raky3wrngbda2g4aqh817k",
    "deps": {
      "gn": {
        "version": "2023-05-09",
        "url": "https://gn.googlesource.com/gn",
-        "rev": "ad1e5ce10f06ef9a1a1d91b2e48231d6b3eecbe2",
-        "sha256": "1m00wqkkvgs52a9bikirnmvsw2d9kfzk59a45mg4n8m4sgpvmxc7"
+        "rev": "26aa46c283e40199b6f847ecca088dcea7099ded",
+        "sha256": "1z5w4fiypv4aq12qlc8in832n7k6wi4k64k4axardrsy24316r9d"
      }
    }
  },
@@ -1,9 +1,9 @@
 { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }:

 let
-  version = "2.0.0-rc.2";
-  sha256 = "0b7ls2amzmfjy6hw6kwcmhjj2wdara4igwk2wby6ah2yj5nipb45";
-  manifestsSha256 = "1xj0g65czl20j8axi6n07sm9ijzmr7vhczfdpx4xqx6m3bl9vqxs";
+  version = "2.0.0-rc.3";
+  sha256 = "1ag3w97kzgqkpkw2lipv9x7wccr69zq47giffliya4sayj1y371y";
+  manifestsSha256 = "0gg6n5d3a7sypms540k4ycnrbg6nqlwymphszwbcjahdsjcmi40p";

  manifests = fetchzip {
    url =
@@ -23,7 +23,7 @@ in buildGoModule rec {
    inherit sha256;
  };

-  vendorSha256 = "sha256-HWKpaMHBX8wvG2aDX/U9lI9KNMcbBNxxG3yigYa+VX8=";
+  vendorSha256 = "sha256-PFutjxDYwe9C52L3MfjFz9CJHbh77ADICaKXlKCuwuo=";

  postUnpack = ''
    cp -r ${manifests} source/cmd/flux/manifests
@@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "glooctl";
-  version = "1.14.2";
+  version = "1.14.4";

  src = fetchFromGitHub {
    owner = "solo-io";
    repo = "gloo";
    rev = "v${version}";
-    hash = "sha256-g/gn08Mpwocf5SBJu93bMNiAlg9osIWUy0skV3JzmMk=";
+    hash = "sha256-x9vF9JEx1NCc8g7QP1QxnzxTEyLHLoSFX9QUIy7St8o=";
  };

  subPackages = [ "projects/gloo/cli/cmd" ];
@@ -200,7 +200,7 @@ in stdenv.mkDerivation (finalAttrs: {
    cp ../TOOLS/mpv_identify.sh $out/bin
    cp ../TOOLS/umpv $out/bin
    cp $out/share/applications/mpv.desktop $out/share/applications/umpv.desktop
-    sed -i '/Icon=/ ! s/mpv/umpv/g' $out/share/applications/umpv.desktop
+    sed -i '/Icon=/ ! s/mpv/umpv/g; s/^Exec=.*/Exec=umpv %U/' $out/share/applications/umpv.desktop
  '' + lib.optionalString stdenv.isDarwin ''
    mkdir -p $out/Applications
    cp -r mpv.app $out/Applications
@@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "v2ray-geoip";
-  version = "202305110042";
+  version = "202305180042";

  src = fetchFromGitHub {
    owner = "v2fly";
    repo = "geoip";
-    rev = "d3e53c0849b499829dfb97af7e10552257277d2e";
-    sha256 = "sha256-jCktxDGMkRiG8tiNx27V9s1LLqaitWDBAB063+eLwmg=";
+    rev = "1addec5dde6df338d37f43ddc7e760b03fd9f6a2";
+    sha256 = "sha256-c1BCbqGMvzqz3NKs1J4qD5vhagz0BEnnBG5BmvEy9W0=";
  };

  installPhase = ''
@@ -2,9 +2,9 @@
 , stdenv
 , fetchFromGitHub
 , cmake
+, expat
 , pkg-config
 , systemd
-, expat
 }:

 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
    owner = "kistler-group";
    repo = "sdbus-cpp";
    rev = "v${version}";
-    sha256 = "sha256-EX/XLgqUwIRosLu3Jgtpp42Yt6Tf22Htj9JULoUL7ao=";
+    hash = "sha256-EX/XLgqUwIRosLu3Jgtpp42Yt6Tf22Htj9JULoUL7ao=";
  };

  nativeBuildInputs = [
@@ -24,27 +24,30 @@ stdenv.mkDerivation rec {
  ];

  buildInputs = [
-    systemd
    expat
+    systemd
  ];

  cmakeFlags = [
    "-DBUILD_CODE_GEN=ON"
  ];

-  meta = with lib; {
+  meta = {
    homepage = "https://github.com/Kistler-Group/sdbus-cpp";
    changelog = "https://github.com/Kistler-Group/sdbus-cpp/blob/v${version}/ChangeLog";
    description = "High-level C++ D-Bus library designed to provide easy-to-use yet powerful API";
    longDescription = ''
-      sdbus-c++ is a high-level C++ D-Bus library for Linux designed to provide expressive, easy-to-use API in modern C++.
-      It adds another layer of abstraction on top of sd-bus, a nice, fresh C D-Bus implementation by systemd.
-      It's been written primarily as a replacement of dbus-c++, which currently suffers from a number of (unresolved) bugs,
-      concurrency issues and inherent design complexities and limitations.
+      sdbus-c++ is a high-level C++ D-Bus library for Linux designed to provide
+      expressive, easy-to-use API in modern C++.
+      It adds another layer of abstraction on top of sd-bus, a nice, fresh C
+      D-Bus implementation by systemd.
+      It's been written primarily as a replacement of dbus-c++, which currently
+      suffers from a number of (unresolved) bugs, concurrency issues and
+      inherent design complexities and limitations.
    '';
+    license = lib.licenses.lgpl2Only;
+    maintainers = [ lib.maintainers.ivar ];
+    platforms = lib.platforms.linux;
    mainProgram = "sdbus-c++-xml2cpp";
-    license = licenses.lgpl2Only;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.ivar ];
  };
 }
@@ -1,6 +1,10 @@
 pkgs: lib: self: super:

 ### Deprecated aliases - for backward compatibility
+###
+### !!! NOTE !!!
+### Use `./remove-attr.py [attrname]` in this directory to remove your alias
+### from the `nodePackages` set without regenerating the entire file.

 with self;

@@ -279,7 +279,7 @@
 , "reveal-md"
 , "rimraf"
 , "rollup"
-, { "rust-analyzer-build-deps": "../../applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps" }
+, {"rust-analyzer-build-deps": "../../applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps"}
 , "rtlcss"
 , "s3http"
 , "sass"
@@ -0,0 +1,54 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i python3 -p
+
+import collections.abc
+import fileinput
+import json
+import os.path
+import re
+import sys
+
+
+def remove(attr):
+    with open(os.path.join(os.path.dirname(__file__), 'node-packages.json'), 'r+') as node_packages_json:
+        packages = json.load(node_packages_json)
+        idx = 0
+        while idx < len(packages):
+            if packages[idx] == attr or (isinstance(packages[idx], collections.abc.Mapping) and next(iter(packages[idx].keys())) == attr):
+                del packages[idx]
+            else:
+                idx += 1
+
+        node_packages_json.seek(0)
+        for idx, package in enumerate(packages):
+            if idx == 0:
+                node_packages_json.write('[\n  ')
+            else:
+                node_packages_json.write(', ')
+            json.dump(package, node_packages_json)
+            node_packages_json.write('\n')
+        node_packages_json.write(']\n')
+        node_packages_json.truncate()
+
+    with fileinput.input(os.path.join(os.path.dirname(__file__), 'node-packages.nix'), inplace=1) as node_packages:
+        safe_attr = re.escape(attr)
+        in_attr = False
+        for line in node_packages:
+            if in_attr:
+                if re.fullmatch(r'  \};\n', line):
+                    in_attr = False
+            else:
+                if re.fullmatch(rf'  (?:{safe_attr}|"{safe_attr}") = nodeEnv\.buildNodePackage \{{\n', line):
+                    in_attr = True
+                else:
+                    sys.stdout.write(line)
+
+
+if __name__ == '__main__':
+    import argparse
+
+    parser = argparse.ArgumentParser(description='Remove a given package from the node-packages.nix file')
+    parser.add_argument('attr', help='The package attribute to remove')
+    args = parser.parse_args()
+
+    remove(args.attr)
@@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "bimmer-connected";
-  version = "0.13.5";
+  version = "0.13.6";
  format = "setuptools";

  disabled = pythonOlder "3.6";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "bimmerconnected";
    repo = "bimmer_connected";
    rev = "refs/tags/${version}";
-    hash = "sha256-73wFWaOcf9/CQ7FgTmtg2ZiQ94W2wTDYZxWIRer2qWk=";
+    hash = "sha256-MQYS7EEBGgvIBjSQ80a49SQv1GNVgeriBtQn+O7hMtg=";
  };

  nativeBuildInputs = [
@@ -0,0 +1,31 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "darklua";
+  version = "0.9.0";
+
+  src = fetchFromGitHub {
+    owner = "seaofvoices";
+    repo = "darklua";
+    rev = "v${version}";
+    hash = "sha256-ABzhtAbWv2oM4VqxRUWC+xh2fwUw1s2iU1IWb5EEhiE=";
+  };
+
+  cargoHash = "sha256-36YN/7aI69xsnwGz8oQG5RZu8XjQ9vwQtRNMWQ7pT0Q=";
+
+  # error: linker `aarch64-linux-gnu-gcc` not found
+  postPatch = ''
+    rm .cargo/config.toml
+  '';
+
+  meta = with lib; {
+    description = "A command line tool that transforms Lua code";
+    homepage = "https://darklua.com";
+    changelog = "https://github.com/seaofvoices/darklua/blob/${src.rev}/CHANGELOG.md";
+    license = licenses.mit;
+    maintainers = with maintainers; [ tomodachi94 ];
+  };
+}
@@ -2,7 +2,7 @@

 buildGoModule rec {
  pname = "doctl";
-  version = "1.94.0";
+  version = "1.95.0";

  vendorHash = null;

@@ -31,7 +31,7 @@ buildGoModule rec {
    owner = "digitalocean";
    repo = "doctl";
    rev = "v${version}";
-    sha256 = "sha256-R/dy//e+DfyANoNtiPoAI9CF7k8ZviFgsnMrWryf0LY=";
+    sha256 = "sha256-gRkReaRDbFGDty8AjuXwoBPEF2wnXMcWVSFaUDideQs=";
  };

  meta = with lib; {
@@ -9,13 +9,13 @@

 buildDotnetModule rec {
  pname = "jackett";
-  version = "0.20.4145";
+  version = "0.20.4199";

  src = fetchFromGitHub {
    owner = pname;
    repo = pname;
    rev = "v${version}";
-    hash = "sha512-7zPrKKkqn4LllzRplxoAoOSSgRJGeE1D1p+42EZD+C9DKwsoToJ8RJlpF30lMoWbrul7a7h0fAjGPJvYwRovFQ==";
+    hash = "sha512-ApVvobAbv2ifma0CA/FftUokFMBDZBbFpG/JlZlrro4a2NfJPzxigyJNZVlZ860Exb5HCh6FFsXjAOtyDkEECA==";
  };

  projectFile = "src/Jackett.Server/Jackett.Server.csproj";
@@ -10,13 +10,13 @@
 }:
 let
  pname = "slskd";
-  version = "0.17.5";
+  version = "0.17.8";

  src = fetchFromGitHub {
    owner = "slskd";
    repo = "slskd";
    rev = version;
-    sha256 = "sha256-iIM29ZI3M9etbw4yzin+4f4cGHIt5qjIl7uzsTUCBc4=";
+    sha256 = "sha256-kqkJZNxg044RbgHFsRfvRMyFRBjnIubdHRqUuMjj2D0=";
  };

  meta = with lib; {
@@ -2,18 +2,18 @@

 buildGoModule rec {
  pname = "chamber";
-  version = "2.12.0";
+  version = "2.13.0";

  src = fetchFromGitHub {
    owner = "segmentio";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-asNzvHpDqKuLPy+TgjaiCZ96A/dy6em5EGmVRvyd1YU=";
+    sha256 = "sha256-1alRyAwT+vlzj7L6KG62R7PRKbMkevowUdD6he4ZQ/I=";
  };

  CGO_ENABLED = 0;

-  vendorHash = "sha256-ENsKm3D3URCrRUiqqebkgFS//2h9SlLbAQHdjisdGlE=";
+  vendorHash = "sha256-pyC2iMGx1seSBR3f316oNM0YiN3y1489uybpgHyN8NM=";

  ldflags = [ "-s" "-w" "-X main.Version=v${version}" ];

@@ -5,13 +5,13 @@

 buildGoModule rec {
  pname = "ooniprobe-cli";
-  version = "3.17.1";
+  version = "3.17.2";

  src = fetchFromGitHub {
    owner = "ooni";
    repo = "probe-cli";
    rev = "v${version}";
-    hash = "sha256-2BsgSsIIQPzqTfoAunBkwrshZd22aI/AXFfz2tk3/78=";
+    hash = "sha256-wPvWIeanozLQwgDlU3WR11NYhIpjw04vj7DlnFlacNw=";
  };

  vendorHash = "sha256-r8kyL9gpdDesY8Mbm4lONAhWC4We26Z9uG7QMt1JT9c=";
@@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "goawk";
-  version = "1.23.0";
+  version = "1.23.1";

  src = fetchFromGitHub {
    owner = "benhoyt";
    repo = "goawk";
    rev = "v${version}";
-    sha256 = "sha256-uqr4edYPe29YbUm52werxPa/eo1HkR2K34FI43itzVY=";
+    sha256 = "sha256-U7fJq9BiWHhyM/I8gVX+PjrGZKanhBgWQWIn9ynOvQI=";
  };

  vendorHash = null;
@@ -2607,6 +2607,8 @@ with pkgs;

  ctx = callPackage ../applications/terminal-emulators/ctx { };

+  darklua = callPackage ../development/tools/darklua { };
+
  darktile = callPackage ../applications/terminal-emulators/darktile { };

  dterm = callPackage ../applications/terminal-emulators/dterm { };