diff options
110 files changed, 1632 insertions, 672 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b2bc591e16e..c18b30fd2d9 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2415,6 +2415,12 @@ githubId = 896182; name = "devhell"; }; + devins2518 = { + email = "drsingh2518@icloud.com"; + github = "devins2518"; + githubId = 17111639; + name = "Devin Singh"; + }; dezgeg = { email = "tuomas.tynkkynen@iki.fi"; github = "dezgeg"; @@ -4115,6 +4121,12 @@ githubId = 362833; name = "Hongchang Wu"; }; + hoppla20 = { + email = "privat@vincentcui.de"; + github = "hoppla20"; + githubId = 25618740; + name = "Vincent Cui"; + }; hoverbear = { email = "operator+nix@hoverbear.org"; github = "hoverbear"; @@ -5172,6 +5184,16 @@ githubId = 37185887; name = "Calvin Kim"; }; + kennyballou = { + email = "kb@devnulllabs.io"; + github = "kennyballou"; + githubId = 2186188; + name = "Kenny Ballou"; + keys = [{ + longkeyid = "rsa4096/0xB0CAA28A02958308"; + fingerprint = "932F 3E8E 1C0F 4A98 95D7 B8B8 B0CA A28A 0295 8308"; + }]; + }; kentjames = { email = "jameschristopherkent@gmail.com"; github = "kentjames"; @@ -8795,6 +8817,12 @@ githubId = 506953; name = "Ruud van Asseldonk"; }; + rvarago = { + email = "rafael.varago@gmail.com"; + github = "rvarago"; + githubId = 7365864; + name = "Rafael Varago"; + }; rvl = { email = "dev+nix@rodney.id.au"; github = "rvl"; diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index e216e566f28..6bbca95a97f 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -128,18 +128,18 @@ def create_vlan(vlan_nr: str) -> Tuple[str, str, "subprocess.Popen[bytes]", Any] return (vlan_nr, vde_socket, vde_process, fd) -def retry(fn: Callable) -> None: +def retry(fn: Callable, timeout: int = 900) -> None: """Call the given function repeatedly, with 1 second intervals, until it returns True or a timeout is reached. """ - for _ in range(900): + for _ in range(timeout): if fn(False): return time.sleep(1) if not fn(True): - raise Exception("action timed out") + raise Exception(f"action timed out after {timeout} seconds") class Logger: diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e51c833a01c..c45f3268b97 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1113,6 +1113,7 @@ ./virtualisation/openvswitch.nix ./virtualisation/parallels-guest.nix ./virtualisation/podman.nix + ./virtualisation/podman-network-socket-ghostunnel.nix ./virtualisation/qemu-guest-agent.nix ./virtualisation/railcar.nix ./virtualisation/spice-usb-redirection.nix diff --git a/nixos/modules/services/web-apps/trilium.nix b/nixos/modules/services/web-apps/trilium.nix index ae41ba50d2e..35383c992fe 100644 --- a/nixos/modules/services/web-apps/trilium.nix +++ b/nixos/modules/services/web-apps/trilium.nix @@ -9,7 +9,7 @@ let # Disable automatically generating desktop icon noDesktopIcon=true - noBackup=${cfg.noBackup} + noBackup=${lib.boolToString cfg.noBackup} [Network] # host setting is relevant only for web deployments - set the host on which the server will listen diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index d12169787c5..61ebc3ab8cf 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -160,7 +160,7 @@ in { etc."qemu/bridge.conf".text = lib.concatMapStringsSep "\n" (e: "allow ${e}") cfg.allowedBridges; systemPackages = with pkgs; [ libressl.nc iptables cfg.package cfg.qemuPackage ]; - etc.ethertypes.source = "${pkgs.iptables}/etc/ethertypes"; + etc.ethertypes.source = "${pkgs.ebtables}/etc/ethertypes"; }; boot.kernelModules = [ "tun" ]; diff --git a/nixos/modules/virtualisation/podman-network-socket-ghostunnel.nix b/nixos/modules/virtualisation/podman-network-socket-ghostunnel.nix new file mode 100644 index 00000000000..1f1ada7f089 --- /dev/null +++ b/nixos/modules/virtualisation/podman-network-socket-ghostunnel.nix @@ -0,0 +1,34 @@ +{ config, lib, pkg, ... }: +let + inherit (lib) + mkOption + types + ; + + cfg = config.virtualisation.podman.networkSocket; + +in +{ + options.virtualisation.podman.networkSocket = { + server = mkOption { + type = types.enum [ "ghostunnel" ]; + }; + }; + + config = { + + services.ghostunnel = lib.mkIf (cfg.enable && cfg.server == "ghostunnel") { + enable = true; + servers."podman-socket" = { + inherit (cfg.tls) cert key cacert; + listen = "${cfg.listenAddress}:${toString cfg.port}"; + target = "unix:/run/podman/podman.sock"; + allowAll = lib.mkDefault true; + }; + }; + systemd.services.ghostunnel-server-podman-socket.serviceConfig.SupplementaryGroups = ["podman"]; + + }; + + meta.maintainers = lib.teams.podman.members ++ [ lib.maintainers.roberth ]; +} diff --git a/nixos/modules/virtualisation/podman-network-socket.nix b/nixos/modules/virtualisation/podman-network-socket.nix new file mode 100644 index 00000000000..1429164630b --- /dev/null +++ b/nixos/modules/virtualisation/podman-network-socket.nix @@ -0,0 +1,91 @@ +{ config, lib, pkg, ... }: +let + inherit (lib) + mkOption + types + ; + + cfg = config.virtualisation.podman.networkSocket; + +in +{ + options.virtualisation.podman.networkSocket = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Make the Podman and Docker compatibility API available over the network + with TLS client certificate authentication. + + This allows Docker clients to connect with the equivalents of the Docker + CLI <code>-H</code> and <code>--tls*</code> family of options. + + For certificate setup, see https://docs.docker.com/engine/security/protect-access/ + + This option is independent of <xref linkend="opt-virtualisation.podman.dockerSocket.enable"/>. + ''; + }; + + server = mkOption { + type = types.enum []; + description = '' + Choice of TLS proxy server. + ''; + example = "ghostunnel"; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Whether to open the port in the firewall. + ''; + }; + + tls.cacert = mkOption { + type = types.path; + description = '' + Path to CA certificate to use for client authentication. + ''; + }; + + tls.cert = mkOption { + type = types.path; + description = '' + Path to certificate describing the server. + ''; + }; + + tls.key = mkOption { + type = types.path; + description = '' + Path to the private key corresponding to the server certificate. + + Use a string for this setting. Otherwise it will be copied to the Nix + store first, where it is readable by any system process. + ''; + }; + + port = mkOption { + type = types.port; + default = 2376; + description = '' + TCP port number for receiving TLS connections. + ''; + }; + listenAddress = mkOption { + type = types.str; + default = "0.0.0.0"; + description = '' + Interface address for receiving TLS connections. + ''; + }; + }; + + config = { + networking.firewall.allowedTCPPorts = + lib.optional (cfg.enable && cfg.openFirewall) cfg.port; + }; + + meta.maintainers = lib.teams.podman.members ++ [ lib.maintainers.roberth ]; +} diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman.nix index d485f993fb3..b16afb66894 100644 --- a/nixos/modules/virtualisation/podman.nix +++ b/nixos/modules/virtualisation/podman.nix @@ -25,6 +25,7 @@ let in { imports = [ + ./podman-network-socket.nix (lib.mkRenamedOptionModule [ "virtualisation" "podman" "libpod" ] [ "virtualisation" "containers" "containersConf" ]) ]; @@ -46,6 +47,20 @@ in ''; }; + dockerSocket.enable = mkOption { + type = types.bool; + default = false; + description = '' + Make the Podman socket available in place of the Docker socket, so + Docker tools can find the Podman socket. + + Podman implements the Docker API. + + Users must be in the <code>podman</code> group in order to connect. As + with Docker, members of this group can gain root access. + ''; + }; + dockerCompat = mkOption { type = types.bool; default = false; @@ -111,14 +126,36 @@ in }; systemd.sockets.podman.wantedBy = [ "sockets.target" ]; + systemd.sockets.podman.socketConfig.SocketGroup = "podman"; + + systemd.tmpfiles.packages = [ + # The /run/podman rule interferes with our podman group, so we remove + # it and let the systemd socket logic take care of it. + (pkgs.runCommand "podman-tmpfiles-nixos" { package = cfg.package; } '' + mkdir -p $out/lib/tmpfiles.d/ + grep -v 'D! /run/podman 0700 root root' \ + <$package/lib/tmpfiles.d/podman.conf \ + >$out/lib/tmpfiles.d/podman.conf + '') ]; - systemd.tmpfiles.packages = [ cfg.package ]; + systemd.tmpfiles.rules = + lib.optionals cfg.dockerSocket.enable [ + "L! /run/docker.sock - - - - /run/podman/podman.sock" + ]; + + users.groups.podman = {}; assertions = [ { assertion = cfg.dockerCompat -> !config.virtualisation.docker.enable; message = "Option dockerCompat conflicts with docker"; } + { + assertion = cfg.dockerSocket.enable -> !config.virtualisation.docker.enable; + message = '' + The options virtualisation.podman.dockerSocket.enable and virtualisation.docker.enable conflict, because only one can serve the socket. + ''; + } ]; } ]); diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index ab24c2c857a..f6417170a6f 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -335,6 +335,7 @@ in plotinus = handleTest ./plotinus.nix {}; podgrab = handleTest ./podgrab.nix {}; podman = handleTestOn ["x86_64-linux"] ./podman.nix {}; + podman-tls-ghostunnel = handleTestOn ["x86_64-linux"] ./podman-tls-ghostunnel.nix {}; pomerium = handleTestOn ["x86_64-linux"] ./pomerium.nix {}; postfix = handleTest ./postfix.nix {}; postfix-raise-smtpd-tls-security-level = handleTest ./postfix-raise-smtpd-tls-security-level.nix {}; diff --git a/nixos/tests/podman-tls-ghostunnel.nix b/nixos/tests/podman-tls-ghostunnel.nix new file mode 100644 index 00000000000..0e687b199b2 --- /dev/null +++ b/nixos/tests/podman-tls-ghostunnel.nix @@ -0,0 +1,150 @@ +/* + This test runs podman as a backend for the Docker CLI. + */ +import ./make-test-python.nix ( + { pkgs, lib, ... }: + + let gen-ca = pkgs.writeScript "gen-ca" '' + # Create CA + PATH="${pkgs.openssl}/bin:$PATH" + openssl genrsa -out ca-key.pem 4096 + openssl req -new -x509 -days 365 -key ca-key.pem -sha256 -subj '/C=NL/ST=Zuid-Holland/L=The Hague/O=Stevige Balken en Planken B.V./OU=OpSec/CN=Certificate Authority' -out ca.pem + + # Create service + openssl genrsa -out podman-key.pem 4096 + openssl req -subj '/CN=podman' -sha256 -new -key podman-key.pem -out service.csr + echo subjectAltName = DNS:podman,IP:127.0.0.1 >> extfile.cnf + echo extendedKeyUsage = serverAuth >> extfile.cnf + openssl x509 -req -days 365 -sha256 -in service.csr -CA ca.pem -CAkey ca-key.pem -CAcreateserial -out podman-cert.pem -extfile extfile.cnf + + # Create client + openssl genrsa -out client-key.pem 4096 + openssl req -subj '/CN=client' -new -key client-key.pem -out client.csr + echo extendedKeyUsage = clientAuth > extfile-client.cnf + openssl x509 -req -days 365 -sha256 -in client.csr -CA ca.pem -CAkey ca-key.pem -CAcreateserial -out client-cert.pem -extfile extfile-client.cnf + + # Create CA 2 + PATH="${pkgs.openssl}/bin:$PATH" + openssl genrsa -out ca-2-key.pem 4096 + openssl req -new -x509 -days 365 -key ca-2-key.pem -sha256 -subj '/C=NL/ST=Zuid-Holland/L=The Hague/O=Stevige Balken en Planken B.V./OU=OpSec/CN=Certificate Authority' -out ca-2.pem + + # Create client signed by CA 2 + openssl genrsa -out client-2-key.pem 4096 + openssl req -subj '/CN=client' -new -key client-2-key.pem -out client-2.csr + echo extendedKeyUsage = clientAuth > extfile-client.cnf + openssl x509 -req -days 365 -sha256 -in client-2.csr -CA ca-2.pem -CAkey ca-2-key.pem -CAcreateserial -out client-2-cert.pem -extfile extfile-client.cnf + + ''; + in + { + name = "podman-tls-ghostunnel"; + meta = { + maintainers = lib.teams.podman.members ++ [ lib.maintainers.roberth ]; + }; + + nodes = { + podman = + { pkgs, ... }: + { + virtualisation.podman.enable = true; + virtualisation.podman.dockerSocket.enable = true; + virtualisation.podman.networkSocket = { + enable = true; + openFirewall = true; + server = "ghostunnel"; + tls.cert = "/root/podman-cert.pem"; + tls.key = "/root/podman-key.pem"; + tls.cacert = "/root/ca.pem"; + }; + + environment.systemPackages = [ + pkgs.docker-client + ]; + + users.users.alice = { + isNormalUser = true; + home = "/home/alice"; + description = "Alice Foobar"; + extraGroups = ["podman"]; + }; + + }; + + client = { ... }: { + environment.systemPackages = [ + # Installs the docker _client_ only + # Normally, you'd want `virtualisation.docker.enable = true;`. + pkgs.docker-client + ]; + environment.variables.DOCKER_HOST = "podman:2376"; + environment.variables.DOCKER_TLS_VERIFY = "1"; + }; + }; + + testScript = '' + import shlex + + + def su_cmd(user, cmd): + cmd = shlex.quote(cmd) + return f"su {user} -l -c {cmd}" + + def cmd(command): + print(f"+{command}") + r = os.system(command) + if r != 0: + raise Exception(f"Command {command} failed with exit code {r}") + + start_all() + cmd("${gen-ca}") + + podman.copy_from_host("ca.pem", "/root/ca.pem") + podman.copy_from_host("podman-cert.pem", "/root/podman-cert.pem") + podman.copy_from_host("podman-key.pem", "/root/podman-key.pem") + + client.copy_from_host("ca.pem", "/root/.docker/ca.pem") + # client.copy_from_host("podman-cert.pem", "/root/podman-cert.pem") + client.copy_from_host("client-cert.pem", "/root/.docker/cert.pem") + client.copy_from_host("client-key.pem", "/root/.docker/key.pem") + + # TODO (ghostunnel): add file watchers so the restart isn't necessary + podman.succeed("systemctl reset-failed && systemctl restart ghostunnel-server-podman-socket.service") + + podman.wait_for_unit("sockets.target") + podman.wait_for_unit("ghostunnel-server-podman-socket.service") + + with subtest("Create default network"): + podman.succeed("docker network create default") + + with subtest("Root docker cli also works"): + podman.succeed("docker version") + + with subtest("A podman member can also still use the docker cli"): + podman.succeed(su_cmd("alice", "docker version")) + + with subtest("Run container remotely via docker cli"): + client.succeed("docker version") + + # via socket would be nicer + podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg") + + client.succeed( + "docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10" + ) + client.succeed("docker ps | grep sleeping") + podman.succeed("docker ps | grep sleeping") + client.succeed("docker stop sleeping") + client.succeed("docker rm sleeping") + + with subtest("Clients without cert will be denied"): + client.succeed("rm /root/.docker/{cert,key}.pem") + client.fail("docker version") + + with subtest("Clients with wrong cert will be denied"): + client.copy_from_host("client-2-cert.pem", "/root/.docker/cert.pem") + client.copy_from_host("client-2-key.pem", "/root/.docker/key.pem") + client.fail("docker version") + + ''; + } +) diff --git a/nixos/tests/podman.nix b/nixos/tests/podman.nix index 6078a936ede..7eae575fd7f 100644 --- a/nixos/tests/podman.nix +++ b/nixos/tests/podman.nix @@ -13,10 +13,23 @@ import ./make-test-python.nix ( { virtualisation.podman.enable = true; + # To test docker socket support + virtualisation.podman.dockerSocket.enable = true; + environment.systemPackages = [ + pkgs.docker-client + ]; + users.users.alice = { isNormalUser = true; home = "/home/alice"; description = "Alice Foobar"; + extraGroups = [ "podman" ]; + }; + + users.users.mallory = { + isNormalUser = true; + home = "/home/mallory"; + description = "Mallory Foobar"; }; }; @@ -26,9 +39,9 @@ import ./make-test-python.nix ( import shlex - def su_cmd(cmd): + def su_cmd(cmd, user = "alice"): cmd = shlex.quote(cmd) - return f"su alice -l -c {cmd}" + return f"su {user} -l -c {cmd}" podman.wait_for_unit("sockets.target") @@ -105,6 +118,27 @@ import ./make-test-python.nix ( assert pid == "1" pid = podman.succeed("podman run --rm --init busybox readlink /proc/self").strip() assert pid == "2" + + with subtest("A podman member can use the docker cli"): + podman.succeed(su_cmd("docker version")) + + with subtest("Run container via docker cli"): + podman.succeed("docker network create default") + podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg") + podman.succeed( + "docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10" + ) + podman.succeed("docker ps | grep sleeping") + podman.succeed("podman ps | grep sleeping") + podman.succeed("docker stop sleeping") + podman.succeed("docker rm sleeping") + podman.succeed("docker network rm default") + + with subtest("A podman non-member can not use the docker cli"): + podman.fail(su_cmd("docker version", user="mallory")) + + # TODO: add docker-compose test + ''; } ) diff --git a/pkgs/applications/audio/goattracker/default.nix b/pkgs/applications/audio/goattracker/default.nix index 30bb4099233..743417570c1 100644 --- a/pkgs/applications/audio/goattracker/default.nix +++ b/pkgs/applications/audio/goattracker/default.nix @@ -27,16 +27,16 @@ let in stdenv.mkDerivation rec { inherit pname; version = if isStereo - then "2.76" # stereo - else "2.75"; # normal + then "2.77" # stereo + else "2.76"; # normal src = fetchurl { url = "mirror://sourceforge/goattracker2/GoatTracker_${version}${optionalString isStereo "_Stereo"}.zip"; sha256 = if isStereo - then "12cz3780x5k047jqdv69n6rjgbfiwv67z850kfl4i37lxja432l7" # stereo - else "1km97nl7qvk6qc5l5j69wncbm76hf86j47sgzgr968423g0bxxlk"; # normal + then "1hiig2d152sv9kazwz33i56x1c54h5sh21ipkqnp6qlnwj8x1ksy" # stereo + else "0d7a3han4jw4bwiba3j87racswaajgl3pj4sb5lawdqdxicv3dn1"; # normal }; - sourceRoot = (if isStereo then "gt2stereo/trunk" else "goattrk2") + "/src"; + sourceRoot = "src"; nativeBuildInputs = [ copyDesktopItems unzip imagemagick ]; buildInputs = [ SDL ]; diff --git a/pkgs/applications/audio/gxplugins-lv2/default.nix b/pkgs/applications/audio/gxplugins-lv2/default.nix index d71d40f401c..5e8747f7656 100644 --- a/pkgs/applications/audio/gxplugins-lv2/default.nix +++ b/pkgs/applications/audio/gxplugins-lv2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "GxPlugins.lv2"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { owner = "brummer10"; repo = pname; rev = "v${version}"; - sha256 = "11iv7bwvvspm74pisqvcpsxpg9xi6b08hq4i8q67mri4mvy9hmal"; + sha256 = "02fksl8wr443ygwgcd1c2zab8kp67a6ps12k71ysqx7szv4zq877"; fetchSubmodules = true; }; @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/brummer10/GxPlugins.lv2"; description = "A set of extra lv2 plugins from the guitarix project"; maintainers = [ maintainers.magnetophon ]; - license = licenses.gpl3; + license = licenses.gpl3Plus; }; } diff --git a/pkgs/applications/audio/molot-lite/default.nix b/pkgs/applications/audio/molot-lite/default.nix index d30b6bcad2f..c44f597ef30 100644 --- a/pkgs/applications/audio/molot-lite/default.nix +++ b/pkgs/applications/audio/molot-lite/default.nix @@ -1,35 +1,31 @@ -{ lib, stdenv, fetchurl, unzip, lv2 }: +{ lib, stdenv, fetchFromGitHub, lv2 }: + +stdenv.mkDerivation rec { -stdenv.mkDerivation { pname = "molot-lite"; - version = "unstable-2014-04-23"; + version = "1.0.0"; - src = fetchurl { - # fetchzip does not accept urls that do not end with .zip. - url = "https://sourceforge.net/p/molot/code/ci/c4eddc426f8d5821e8ebcf1d67265365e4c8c52a/tree/molot_src.zip?format=raw"; - sha256 = "1c47dwfgrmn9459px8s5zikcqyr0777v226qzcxlr6azlcjwr51b"; + src = fetchFromGitHub { + owner = "magnetophon"; + repo = pname; + rev = version; + sha256 = "0xbvicfk1rgp01nlg6hlym9bnygry0nrbv88mv7w6hnacvl63ba4"; }; - nativeBuildInputs = [ unzip ]; buildInputs = [ lv2 ]; - unpackPhase = '' - unzip $src - ''; - - buildPhase = '' - make -C Molot_Mono_Lite - make -C Molot_Stereo_Lite - ''; + makeFlags = [ "INSTALL_DIR=$out/lib/lv2" ]; installPhase = '' + runHook preInstall make install INSTALL_DIR=$out/lib/lv2 -C Molot_Mono_Lite make install INSTALL_DIR=$out/lib/lv2 -C Molot_Stereo_Lite + runHook postInstall ''; meta = with lib; { description = "Stereo and mono audio signal dynamic range compressor in LV2 format"; - homepage = "https://sourceforge.net/projects/molot/"; + homepage = "https://github.com/magnetophon/molot-lite"; license = licenses.gpl3Plus; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix index 3b5708529e0..797d2c1d733 100644 --- a/pkgs/applications/audio/schismtracker/default.nix +++ b/pkgs/applications/audio/schismtracker/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "1n6cgjiw3vkv7a1h1nki5syyjxjb6icknr9s049w2jrag10bxssn"; }; - configureFlags = [ "--enable-dependency-tracking" ]; + configureFlags = [ "--enable-dependency-tracking" ] + ++ lib.optional stdenv.isDarwin "--disable-sdltest"; nativeBuildInputs = [ autoreconfHook python ]; diff --git a/pkgs/applications/backup/pika-backup/default.nix b/pkgs/applications/backup/pika-backup/default.nix index 63f197dd9c8..fd6c0f0cf83 100644 --- a/pkgs/applications/backup/pika-backup/default.nix +++ b/pkgs/applications/backup/pika-backup/default.nix @@ -19,20 +19,20 @@ stdenv.mkDerivation rec { pname = "pika-backup"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "pika-backup"; rev = "v${version}"; - sha256 = "0cr3axfp15nzwmsqyz6j781qhr2gsn9p69m0jfzy89pl83d6vcz0"; + sha256 = "sha256-dKVyvB4s1MZHri0dFJDBUXQKsi2KgP30ZhsJ486M+og="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "1z0cbrkhxyzwf7vjjsvdppb7zhflpkw4m5cy90a2315nbll3hpbp"; + sha256 = "1vsh8vqgmfady82d7wfxkknmrp7mq7nizpif2zwg3kqbl964mp3y"; }; patches = [ diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 4defc2d4327..7fa15efd82c 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -107,6 +107,7 @@ let '') + '' rm $out/bin/nvim + touch $out/rplugin.vim makeWrapper ${lib.escapeShellArgs finalMakeWrapperArgs} ${wrapperArgsStr} ''; diff --git a/pkgs/applications/kde/akonadi-calendar-tools.nix b/pkgs/applications/kde/akonadi-calendar-tools.nix new file mode 100644 index 00000000000..64fe3e1f438 --- /dev/null +++ b/pkgs/applications/kde/akonadi-calendar-tools.nix @@ -0,0 +1,24 @@ +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, akonadi +, calendarsupport +}: + +mkDerivation { + pname = "akonadi-calendar-tools"; + meta = { + homepage = "https://github.com/KDE/akonadi-calendar-tools"; + description = "Console applications and utilities for managing calendars in Akonadi"; + license = with lib.licenses; [ gpl2Plus cc0 ]; + maintainers = with lib.maintainers; [ kennyballou ]; + platforms = lib.platforms.linux; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + propagatedBuildInputs = [ + akonadi + calendarsupport + ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 18e857a2471..68600758841 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -68,6 +68,7 @@ let in { akonadi = callPackage ./akonadi {}; akonadi-calendar = callPackage ./akonadi-calendar.nix {}; + akonadi-calendar-tools = callPackage ./akonadi-calendar-tools.nix {}; akonadi-contacts = callPackage ./akonadi-contacts.nix {}; akonadi-import-wizard = callPackage ./akonadi-import-wizard.nix {}; akonadi-mime = callPackage ./akonadi-mime.nix {}; @@ -93,6 +94,7 @@ let incidenceeditor = callPackage ./incidenceeditor.nix {}; k3b = callPackage ./k3b.nix {}; kaccounts-integration = callPackage ./kaccounts-integration.nix {}; + kaccounts-providers = callPackage ./kaccounts-providers.nix {}; kaddressbook = callPackage ./kaddressbook.nix {}; kalarm = callPackage ./kalarm.nix {}; kalarmcal = callPackage ./kalarmcal.nix {}; @@ -137,6 +139,7 @@ let kipi-plugins = callPackage ./kipi-plugins.nix {}; kitinerary = callPackage ./kitinerary.nix {}; kio-extras = callPackage ./kio-extras.nix {}; + kio-gdrive = callPackage ./kio-gdrive.nix {}; kldap = callPackage ./kldap.nix {}; kleopatra = callPackage ./kleopatra.nix {}; klettres = callPackage ./klettres.nix {}; diff --git a/pkgs/applications/kde/kaccounts-providers.nix b/pkgs/applications/kde/kaccounts-providers.nix new file mode 100644 index 00000000000..e0e5ee3cd32 --- /dev/null +++ b/pkgs/applications/kde/kaccounts-providers.nix @@ -0,0 +1,44 @@ +{ mkDerivation +, lib +, accounts-qt +, extra-cmake-modules +, intltool +, kaccounts-integration +, kcmutils +, kcoreaddons +, kdeclarative +, kdoctools +, kio +, kpackage +, kwallet +, qtwebengine +, signond +}: + +mkDerivation { + pname = "kaccounts-providers"; + meta = with lib; { + homepage = "https://community.kde.org/KTp/Setting_up_KAccounts"; + description = "Online account providers"; + maintainers = with maintainers; [ kennyballou ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + nativeBuildInputs = [ + extra-cmake-modules + intltool + kdoctools + ]; + buildInputs = [ + accounts-qt + kaccounts-integration + kcmutils + kcoreaddons + kdeclarative + kio + kpackage + kwallet + qtwebengine + signond + ]; +} diff --git a/pkgs/applications/kde/kio-gdrive.nix b/pkgs/applications/kde/kio-gdrive.nix new file mode 100644 index 00000000000..0be35469d40 --- /dev/null +++ b/pkgs/applications/kde/kio-gdrive.nix @@ -0,0 +1,36 @@ +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, kio +, libkgapi +, kcalendarcore +, kcontacts +, qtkeychain +, libsecret +, kaccounts-integration +}: + +mkDerivation { + pname = "kio-gdrive"; + meta = with lib; { + homepage = "https://github.com/KDE/kio-gdrive"; + description = "KIO slave for Google APIs"; + maintainers = with maintainers; [ kennyballou ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + nativeBuildInputs = [ + extra-cmake-modules + kdoctools + ]; + buildInputs = [ + kcalendarcore + kcontacts + kaccounts-integration + libkgapi + libsecret + kio + qtkeychain + ]; +} diff --git a/pkgs/applications/misc/xplr/default.nix b/pkgs/applications/misc/xplr/default.nix index 56553a80e91..6bd2c60b09b 100644 --- a/pkgs/applications/misc/xplr/default.nix +++ b/pkgs/applications/misc/xplr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "xplr"; - version = "0.10.1"; + version = "0.13.1"; src = fetchCrate { inherit pname version; - sha256 = "17x514pwbkzkkrd47a66a4iz3bxrxvm8hk5hphsfbhgzqfnf9iy7"; + sha256 = "1aanw0l8b4ak0kikkixmb817qw48ypviq9dxdivzwc29rjvgp152"; }; buildInputs = lib.optional stdenv.isDarwin libiconv; - cargoSha256 = "03y2fk174rdjvw8wdzwc0hhj0zqwpap7qcga51yhq877rgyxbxir"; + cargoSha256 = "16iaj1pqvqwi0rq4k3lmqwd8skbjf55133ri69hj26gz88k4q43w"; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 2cf3556e7ea..7e95da747d1 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -165,14 +165,10 @@ let ./patches/widevine-79.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags # Fix the build by adding a missing dependency (s. https://crbug.com/1197837): ./patches/fix-missing-atspi2-dependency.patch - ] ++ optionals (chromiumVersionAtLeast "91") [ ./patches/closure_compiler-Use-the-Java-binary-from-the-system.patch ]; - postPatch = lib.optionalString (chromiumVersionAtLeast "91") '' - # Required for patchShebangs (unsupported): - chmod -x third_party/webgpu-cts/src/tools/deno - '' + '' + postPatch = '' # remove unused third-party for lib in ${toString gnSystemLibraries}; do if [ -d "third_party/$lib" ]; then @@ -191,6 +187,7 @@ let substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \ --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" fi + chmod -x third_party/webgpu-cts/src/tools/deno # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 2cb53eda3e3..995e4c9be61 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -44,19 +44,19 @@ } }, "ungoogled-chromium": { - "version": "90.0.4430.212", - "sha256": "17nmhrkl81qqvzbh861k2mmifncx4wg1mv1fmn52f8gzn461vqdb", - "sha256bin64": "1y33c5829s22yfj0qmsj8fpcxnjhcm3fsxz7744csfsa9cy4fjr7", + "version": "91.0.4472.77", + "sha256": "0c8vj3gq3nmb7ssiwj6875g0a8hcprss1a4gqw9h7llqywza9ma5", + "sha256bin64": "0caf47xam5igdnbhipal1iyicnxxvadhi61k199rwysrvyv5sdad", "deps": { "gn": { - "version": "2021-02-09", + "version": "2021-04-06", "url": "https://gn.googlesource.com/gn", - "rev": "dfcbc6fed0a8352696f92d67ccad54048ad182b3", - "sha256": "1941bzg37c4dpsk3sh6ga3696gpq6vjzpcw9rsnf6kdr9mcgdxvn" + "rev": "dba01723a441c358d843a575cb7720d54ddcdf92", + "sha256": "199xkks67qrn0xa5fhp24waq2vk8qb78a96cb3kdd8v1hgacgb8x" }, "ungoogled-patches": { - "rev": "90.0.4430.212-1", - "sha256": "05jh05a4g50ws7pr18dl5pwi95knygh6xywp7kyydir7wy1pbin8" + "rev": "91.0.4472.77-1", + "sha256": "1jfmmkw1y4rcjfgsm7b4v2lrgd3sks5qpajvq0djflbhkpsqxfk0" } } } diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index fa9416f927f..78d6ea1a1e7 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -19,13 +19,13 @@ let in buildGoModule rec { pname = "argo"; - version = "3.0.6"; + version = "3.0.7"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "sha256-QD5V6Bz/wfbyNPoXizjhPGyHN7ieotsYbwLTz2ADfcY="; + sha256 = "sha256-lZTSUNtmJZKONt0Bv42dBAc+87L14HaPxvPxhFe8nyc="; }; vendorSha256 = "sha256-YjVAoMyGKMHLGEPeOOkCKCzeWFiUsXfJIKcw5GYoljg="; diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index ccbe9d9a7ac..d717bd42652 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.18.10"; + version = "0.20.5"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SvvvHGR3UPyV61MaoFB68SaZKUT3ItYOPT1a7AddxlY="; + sha256 = "sha256-pUKKHrShED7yp5WSmHSbS+eiYs22Nm2/ouc2a8WYc38="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix index ee85bd8024e..f93b8ed50b7 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -35,6 +35,12 @@ stdenv.mkDerivation rec { hash = "sha256-qq8cZplt5YWUwsXUShMDhQm3RGH2kCEBk64x6bOa50E="; }; + # https://github.com/CasualX/obfstr/blob/v0.2.4/build.rs#L5 + # obfstr 0.2.4 fails to set RUSTC_BOOTSTRAP in its build script because cargo + # build scripts are forbidden from setting RUSTC_BOOTSTRAP since rustc 1.52.0 + # https://github.com/rust-lang/rust/blob/1.52.0/RELEASES.md#compatibility-notes + RUSTC_BOOTSTRAP = 1; + patches = [ # Post install tries to generate an icon cache & update the # desktop database. The gtk setup hook drop-icon-theme-cache.sh diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index e266265291b..daa97b68217 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -4,13 +4,13 @@ let arch = if stdenv.is64bit then "amd64" else "x86"; in stdenv.mkDerivation rec { pname = "teamspeak-server"; - version = "3.13.3"; + version = "3.13.5"; src = fetchurl { url = "https://files.teamspeak-services.com/releases/server/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2"; sha256 = if stdenv.is64bit - then "sha256-+b9S0ekQmXF5KwvVcmHIDpp0iZRO2W1ls8eYhDzjUUw=" - else "sha256-Qu6xPzbUdqO93j353cfQILlFYqmwFSnFWG9TjniX0+c="; + then "sha256-2tSX/ET2lZsi0mVB3KnbnBXMSTRsneGUA8w6mZ6TmlY=" + else "sha256-RdxG4nGXTTSY+P5oZu4uP5l7gKcU9C6uIILyNldSK50="; }; buildInputs = [ stdenv.cc.cc postgresql.lib ]; @@ -18,6 +18,8 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook ]; installPhase = '' + runHook preInstall + # Install files. mkdir -p $out/lib/teamspeak mv * $out/lib/teamspeak/ @@ -26,18 +28,20 @@ in stdenv.mkDerivation rec { mkdir -p $out/bin/ ln -s $out/lib/teamspeak/ts3server $out/bin/ts3server ln -s $out/lib/teamspeak/tsdns/tsdnsserver $out/bin/tsdnsserver + + runHook postInstall ''; passthru.updateScript = writeScript "update-teampeak-server" '' #!/usr/bin/env nix-shell - #!nix-shell -i bash -p common-updater-scripts curl gnugrep gnused + #!nix-shell -i bash -p common-updater-scripts curl gnugrep gnused jq pup set -eu -o pipefail version=$( \ - curl -s "https://www.teamspeak.de/download/teamspeak-3-amd64-server-linux/" \ - | grep softwareVersion \ - | sed -E -e 's/^.*<span itemprop="softwareVersion">([^<]+)<\/span>.*$/\1/' \ + curl https://www.teamspeak.com/en/downloads/ \ + | pup "#server .linux .version json{}" \ + | jq -r ".[0].text" ) versionOld=$(nix-instantiate --eval --strict -A "teamspeak_server.version") diff --git a/pkgs/applications/networking/irc/catgirl/default.nix b/pkgs/applications/networking/irc/catgirl/default.nix index afc308039de..d2e8e93d853 100644 --- a/pkgs/applications/networking/irc/catgirl/default.nix +++ b/pkgs/applications/networking/irc/catgirl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "catgirl"; - version = "1.7"; + version = "1.8"; src = fetchurl { url = "https://git.causal.agency/catgirl/snapshot/${pname}-${version}.tar.gz"; - sha256 = "sha256-3shSdeq4l6Y5DEJZEVMHAngp6vjnkPjzpLpcp407X/0="; + sha256 = "0svpd2nqsr55ac98vczyhihs6pvgw7chspf6bdlwl98gch39dxif"; }; nativeBuildInputs = [ ctags pkg-config ]; diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix index 278561e0e5f..f24ed3a51df 100644 --- a/pkgs/applications/networking/mailreaders/mblaze/default.nix +++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix @@ -1,10 +1,12 @@ -{ stdenv, lib, fetchFromGitHub, installShellFiles, libiconv, ruby ? null }: +{ coreutils, fetchFromGitHub, fetchpatch, file, gawk, gnugrep, gnused +, installShellFiles, less, lib, libiconv, makeWrapper, nano, stdenv, ruby +}: stdenv.mkDerivation rec { pname = "mblaze"; version = "1.1"; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ installShellFiles makeWrapper ]; buildInputs = [ ruby ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; src = fetchFromGitHub { @@ -22,6 +24,24 @@ stdenv.mkDerivation rec { installShellCompletion contrib/_mblaze '' + lib.optionalString (ruby != null) '' install -Dt $out/bin contrib/msuck contrib/mblow + + # The following wrappings are used to preserve the executable + # names (the value of $0 in a script). The script mcom is + # designed to be run directly or via symlinks such as mrep. Using + # symlinks changes the value of $0 in the script, and makes it + # behave differently. When using the wrapProgram tool, the resulting + # wrapper breaks this behaviour. The following wrappers preserve it. + + mkdir -p $out/wrapped + for x in mcom mbnc mfwd mrep; do + mv $out/bin/$x $out/wrapped + makeWrapper $out/wrapped/$x $out/bin/$x \ + --argv0 $out/bin/$x \ + --prefix PATH : $out/bin \ + --prefix PATH : ${lib.makeBinPath [ + coreutils file gawk gnugrep gnused + ]} + done ''; meta = with lib; { diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index b2187371f29..50b3b66f15d 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which +{ lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, fetchpatch , ncurses, perl , cyrus_sasl, gss, gpgme, libkrb5, libidn, libxml2, notmuch, openssl , lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, sqlite, zlib }: @@ -14,6 +14,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-ADg/+gmndOiuQHsncOzS5K4chthXeUFz6RRJsrZNeZY="; }; + patches = [ + (fetchpatch { + name = "CVE-2021-32055.patch"; + url = "https://github.com/neomutt/neomutt/commit/fa1db5785e5cfd9d3cd27b7571b9fe268d2ec2dc.patch"; + sha256 = "0bb7gisjynq3w7hhl6vxa469h609bcz6fkdi8vf740pqrwhk68yn"; + }) + ]; + buildInputs = [ cyrus_sasl gss gpgme libkrb5 libidn ncurses notmuch openssl perl lmdb diff --git a/pkgs/applications/radio/welle-io/default.nix b/pkgs/applications/radio/welle-io/default.nix index 97bf84a2bf3..cfd339c2d1e 100644 --- a/pkgs/applications/radio/welle-io/default.nix +++ b/pkgs/applications/radio/welle-io/default.nix @@ -1,20 +1,17 @@ { mkDerivation, lib, fetchFromGitHub, cmake, pkg-config , qtbase, qtcharts, qtmultimedia, qtquickcontrols, qtquickcontrols2, qtgraphicaleffects -, faad2, rtl-sdr, soapysdr-with-plugins, libusb-compat-0_1, fftwSinglePrec, lame, mpg123 }: -let - - version = "2.2"; - -in mkDerivation { +, faad2, rtl-sdr, soapysdr-with-plugins, libusb-compat-0_1, fftwSinglePrec, lame, mpg123 +} : +mkDerivation rec { pname = "welle-io"; - inherit version; + version = "2.3"; src = fetchFromGitHub { owner = "AlbrechtL"; repo = "welle.io"; rev = "v${version}"; - sha256 = "04fpm6sc431dl9i5h53xpd6k85j22sv8aawl7b6wv2fzpfsd9fwa"; + sha256 = "1xl1lanw0xgmgks67dbfb2h52jxnrd1i2zik56v0q8dwsr7f0daw"; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/science/math/sage/sagedoc.nix b/pkgs/applications/science/math/sage/sagedoc.nix index f4a8bf19b69..d53947d806d 100644 --- a/pkgs/applications/science/math/sage/sagedoc.nix +++ b/pkgs/applications/science/math/sage/sagedoc.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { mv html/en/_static{,.tmp} for _dir in `find -name _static` ; do rm -r $_dir - ln -s html/en/_static $_dir + ln -rs html/en/_static $_dir done mv html/en/_static{.tmp,} ''; diff --git a/pkgs/applications/science/physics/xfitter/default.nix b/pkgs/applications/science/physics/xfitter/default.nix index 4390826ccee..230f2f0e0ef 100644 --- a/pkgs/applications/science/physics/xfitter/default.nix +++ b/pkgs/applications/science/physics/xfitter/default.nix @@ -16,9 +16,6 @@ stdenv.mkDerivation rec { ./undefined_behavior.patch ]; - # patch needs to updated due to version bump - #CXXFLAGS = "-Werror=return-type"; - preConfigure = # Fix F77LD to workaround for a following build error: # @@ -48,8 +45,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - hardeningDisable = [ "format" ]; - NIX_CFLAGS_COMPILE = lib.optional (stdenv.hostPlatform.libc == "glibc") "-I${libtirpc.dev}/include/tirpc"; NIX_LDFLAGS = lib.optional (stdenv.hostPlatform.libc == "glibc") "-ltirpc"; diff --git a/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/pkgs/applications/version-management/git-and-tools/gitui/default.nix index 09587daf394..6331ab32acd 100644 --- a/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -1,16 +1,16 @@ { lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip }: rustPlatform.buildRustPackage rec { pname = "gitui"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "extrawurst"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KJXYkOHR50Zap0Ou+jVi09opHuZBfHN/ToZbasZ3IE4="; + sha256 = "sha256-XPXldkNLlxgUBdDDR+n3JAO75JQQOvKoduwnWvIompY="; }; - cargoSha256 = "sha256-N6Yr+TqxWwl/6SgjizIyZJoVsjn/R9yjxUKCqwt8UJg="; + cargoSha256 = "sha256-jHrjAdghuFADf/Gd3GeUOpPBG5tqsBG/Q4R0pNxHAps="; nativeBuildInputs = [ python3 perl ]; buildInputs = [ openssl ] diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index cd6d9b0fd51..7b29e466160 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper +{ lib, stdenv, fetchFromGitHub, makeWrapper, nix-update-script , python3, git, gnupg, less }: stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.14.5"; + version = "2.15.3"; src = fetchFromGitHub { owner = "android"; @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-3FSkWpHda1jVhy/633B+ippWcbKd83IlQcJYS9Qx5wQ="; }; - patches = [ ./import-ssl-module.patch ]; - nativeBuildInputs = [ makeWrapper ]; buildInputs = [ python3 ]; @@ -25,8 +23,12 @@ stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall + mkdir -p $out/bin cp repo $out/bin/repo + + runHook postInstall ''; # Important runtime dependencies @@ -35,6 +37,12 @@ stdenv.mkDerivation rec { "${lib.makeBinPath [ git gnupg less ]}" ''; + passthru = { + updateScript = nix-update-script { + attrPath = "gitRepo"; + }; + }; + meta = with lib; { description = "Android's repo management tool"; longDescription = '' @@ -45,7 +53,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://android.googlesource.com/tools/repo"; license = licenses.asl20; - maintainers = [ ]; + maintainers = with maintainers; [ otavio ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/version-management/git-repo/import-ssl-module.patch b/pkgs/applications/version-management/git-repo/import-ssl-module.patch deleted file mode 100644 index f1ec4e3a7dd..00000000000 --- a/pkgs/applications/version-management/git-repo/import-ssl-module.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/repo b/repo -index 8b05def..f394b3e 100755 ---- a/repo -+++ b/repo -@@ -236,6 +236,7 @@ import optparse - import re - import shutil - import stat -+import ssl - - if sys.version_info[0] == 3: - import urllib.request diff --git a/pkgs/applications/version-management/reposurgeon/default.nix b/pkgs/applications/version-management/reposurgeon/default.nix index 3e526d5ac7c..2f9ff92ad67 100644 --- a/pkgs/applications/version-management/reposurgeon/default.nix +++ b/pkgs/applications/version-management/reposurgeon/default.nix @@ -1,60 +1,38 @@ -{ lib, stdenv, fetchurl, makeWrapper, python27Packages, git -, docbook_xml_dtd_412, docbook_xsl, asciidoc, xmlto, pypy -, breezy ? null, cvs ? null, darcs ? null, fossil ? null -, mercurial ? null, monotone ? null, rcs ? null -, subversion ? null, cvs_fast_export ? null }: - -with stdenv; with lib; -let - inherit (python27Packages) python; -in mkDerivation rec { - name = "reposurgeon-${meta.version}"; - meta = { - description = "A tool for editing version-control repository history"; - version = "3.44"; - license = licenses.bsd3; - homepage = "http://www.catb.org/esr/reposurgeon/"; - maintainers = with maintainers; [ dfoxfranke ]; - platforms = platforms.all; - }; +{ lib, stdenv, fetchurl, makeWrapper, buildGoModule, git +, asciidoctor, ruby +}: + +buildGoModule rec { + pname = "reposurgeon"; + version = "4.26"; src = fetchurl { - url = "http://www.catb.org/~esr/reposurgeon/reposurgeon-3.44.tar.xz"; - sha256 = "0il6hwrsm2qgg0vp5fcjh478y2x4zyw3mx2apcwc7svfj86pf7pn"; + url = "http://www.catb.org/~esr/reposurgeon/reposurgeon-${version}.tar.xz"; + sha256 = "sha256-FuL5pvIM468hEm6rUBKGW6+WlYv4DPHNnpwpRGzMwlY="; }; - # install fails because the files README.md, NEWS, and TODO were not included in the source distribution - patches = [ ./fix-makefile.patch ]; + vendorSha256 = "sha256-KpdXI2Znhe0iCp0DjSZXzUYDZIz2KBRv1/SpaRTFMAc="; + + subPackages = [ "." ]; + + runVend = true; - buildInputs = - [ docbook_xml_dtd_412 docbook_xsl asciidoc xmlto makeWrapper pypy ]; + nativeBuildInputs = [ asciidoctor ruby ]; - preBuild = '' - makeFlagsArray=( - XML_CATALOG_FILES="${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml" - prefix="$out" - pyinclude="-I${python}/include/python2.7" - pylib="-L${python}/lib -lpython2.7" - ) + postBuild = '' + patchShebangs . + make all HTMLFILES= ''; - postInstall = - let - binpath = makeBinPath ( - filter (x: x != null) - [ out git breezy cvs darcs fossil mercurial - monotone rcs src subversion cvs_fast_export ] - ); - pythonpath = makeSearchPathOutput "lib" python.sitePackages ( - filter (x: x != null) - [ python27Packages.readline or null python27Packages.hglib or null ] - ); - in '' - for prog in reposurgeon repodiffer repotool; do - wrapProgram $out/bin/$prog \ - --prefix PATH : "${binpath}" \ - --prefix PYTHONPATH : "${pythonpath}" - done - '' - ; + postInstall = '' + make install prefix=$out HTMLFILES= + ''; + + meta = { + description = "A tool for editing version-control repository history"; + license = lib.licenses.bsd3; + homepage = "http://www.catb.org/esr/reposurgeon/"; + maintainers = with lib.maintainers; [ dfoxfranke ]; + platforms = lib.platforms.all; + }; } diff --git a/pkgs/applications/video/kooha/default.nix b/pkgs/applications/video/kooha/default.nix index 223ed132c92..6203041ed63 100644 --- a/pkgs/applications/video/kooha/default.nix +++ b/pkgs/applications/video/kooha/default.nix @@ -1,17 +1,17 @@ { lib, fetchFromGitHub, appstream-glib, desktop-file-utils, glib -, gobject-introspection, gst_all_1, gtk3, libhandy, librsvg, meson, ninja +, gobject-introspection, gst_all_1, gtk4, libadwaita, librsvg, meson, ninja , pkg-config, python3, wrapGAppsHook }: python3.pkgs.buildPythonApplication rec { pname = "kooha"; - version = "1.1.3"; + version = "1.2.1"; format = "other"; src = fetchFromGitHub { owner = "SeaDve"; repo = "Kooha"; rev = "v${version}"; - sha256 = "14lrx6wplvlk3cg3wij88h4ydp3m69pw7lvvzrq3j9qnh431bs36"; + sha256 = "1qwbzdn0n1nxcfci1bhhkfchdhw5yz74fdvsa84cznyyx2jils8w"; }; buildInputs = [ @@ -19,8 +19,8 @@ python3.pkgs.buildPythonApplication rec { gobject-introspection gst_all_1.gstreamer gst_all_1.gst-plugins-base - gtk3 - libhandy + gtk4 + libadwaita librsvg ]; @@ -48,6 +48,10 @@ python3.pkgs.buildPythonApplication rec { patchShebangs build-aux/meson/postinstall.py ''; + installCheckPhase = '' + $out/bin/kooha --help + ''; + meta = with lib; { description = "Simple screen recorder"; homepage = "https://github.com/SeaDve/Kooha"; diff --git a/pkgs/applications/video/webcamoid/default.nix b/pkgs/applications/video/webcamoid/default.nix index ef485fc8201..aea8266b1d0 100644 --- a/pkgs/applications/video/webcamoid/default.nix +++ b/pkgs/applications/video/webcamoid/default.nix @@ -4,10 +4,10 @@ , v4l-utils }: mkDerivation rec { pname = "webcamoid"; - version = "8.7.1"; + version = "8.8.0"; src = fetchFromGitHub { - sha256 = "1d8g7mq0wf0ycds87xpdhr3zkljgjmb94n3ak9kkxj2fqp9242d2"; + sha256 = "0a8M9GQ6Ea9jBCyfbORVyB6HC/O6jdcIZruQZj9Aai4="; rev = version; repo = "webcamoid"; owner = "webcamoid"; diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index c72a3577bf8..6c518ab8934 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -81,7 +81,11 @@ buildGoModule rec { patchelf --set-rpath "${lib.makeLibraryPath [ systemd ]}":$RPATH $out/bin/podman ''; - passthru.tests = { inherit (nixosTests) podman; }; + passthru.tests = { + inherit (nixosTests) podman; + # related modules + inherit (nixosTests) podman-tls-ghostunnel; + }; meta = with lib; { homepage = "https://podman.io/"; diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix index 9f3e1943b56..c9ec18593df 100644 --- a/pkgs/applications/virtualization/podman/wrapper.nix +++ b/pkgs/applications/virtualization/podman/wrapper.nix @@ -12,6 +12,7 @@ , util-linux # nsenter , cni-plugins # not added to path , iptables +, iproute2 }: let @@ -25,6 +26,7 @@ let fuse-overlayfs util-linux iptables + iproute2 ] ++ extraPackages); in runCommand podman.name { diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index fe66df0c6d9..2610e1f0fc6 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -15,11 +15,11 @@ with lib; buildGoPackage rec { pname = "singularity"; - version = "3.7.3"; + version = "3.7.4"; src = fetchurl { url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz"; - sha256 = "sha256-ZmfriHXStm1zUE9AyVa0KxNRdE9IjRZCBDdiFdiF2lw="; + sha256 = "sha256-wmY2movydH9E4HWYWMP8OyMluXWogYsmaPC5exJNAWQ="; }; goPackagePath = "github.com/sylabs/singularity"; diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index f6be1b299f6..cfc19c03cfd 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -822,45 +822,6 @@ rec { /* The set of supported Dpkg-based distributions. */ debDistros = { - - # Interestingly, the SHA-256 hashes provided by Ubuntu in - # http://nl.archive.ubuntu.com/ubuntu/dists/{gutsy,hardy}/Release are - # wrong, but the SHA-1 and MD5 hashes are correct. Intrepid is fine. - - ubuntu1204i386 = { - name = "ubuntu-12.04-precise-i386"; - fullName = "Ubuntu 12.04 Precise (i386)"; - packagesLists = - [ (fetchurl { - url = "mirror://ubuntu/dists/precise/main/binary-i386/Packages.bz2"; - sha256 = "18ns9h4qhvjfcip9z55grzi371racxavgqkp6b5kfkdq2wwwax2d"; - }) - (fetchurl { - url = "mirror://ubuntu/dists/precise/universe/binary-i386/Packages.bz2"; - sha256 = "085lkzbnzkc74kfdmwdc32sfqyfz8dr0rbiifk8kx9jih3xjw2jk"; - }) - ]; - urlPrefix = "mirror://ubuntu"; - packages = commonDebPackages ++ [ "diffutils" ]; - }; - - ubuntu1204x86_64 = { - name = "ubuntu-12.04-precise-amd64"; - fullName = "Ubuntu 12.04 Precise (amd64)"; - packagesLists = - [ (fetchurl { - url = "mirror://ubuntu/dists/precise/main/binary-amd64/Packages.bz2"; - sha256 = "1aabpn0hdih6cbabyn87yvhccqj44q9k03mqmjsb920iqlckl3fc"; - }) - (fetchurl { - url = "mirror://ubuntu/dists/precise/universe/binary-amd64/Packages.bz2"; - sha256 = "0x4hz5aplximgb7gnpvrhkw8m7a40s80rkm5b8hil0afblwlg4vr"; - }) - ]; - urlPrefix = "mirror://ubuntu"; - packages = commonDebPackages ++ [ "diffutils" ]; - }; - ubuntu1404i386 = { name = "ubuntu-14.04-trusty-i386"; fullName = "Ubuntu 14.04 Trusty (i386)"; @@ -929,119 +890,117 @@ rec { packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; - ubuntu1710i386 = { - name = "ubuntu-17.10-artful-i386"; - fullName = "Ubuntu 17.10 Artful (i386)"; + ubuntu1804i386 = { + name = "ubuntu-18.04-bionic-i386"; + fullName = "Ubuntu 18.04 Bionic (i386)"; packagesLists = [ (fetchurl { - url = "mirror://ubuntu/dists/artful/main/binary-i386/Packages.xz"; - sha256 = "18yrj4kqdzm39q0527m97h5ing58hkm9yq9iyj636zh2rclym3c8"; + url = "mirror://ubuntu/dists/bionic/main/binary-i386/Packages.xz"; + sha256 = "0f0v4131kwf7m7f8j3288rlqdxk1k3vqy74b7fcfd6jz9j8d840i"; }) (fetchurl { - url = "mirror://ubuntu/dists/artful/universe/binary-i386/Packages.xz"; - sha256 = "1v0njw2w80xfmxi7by76cs8hyxlla5h3gqajlpdw5srjgx2qrm2g"; + url = "mirror://ubuntu/dists/bionic/universe/binary-i386/Packages.xz"; + sha256 = "1v75c0dqr0wp0dqd4hnci92qqs4hll8frqdbpswadgxm5chn91bw"; }) ]; urlPrefix = "mirror://ubuntu"; packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; - ubuntu1710x86_64 = { - name = "ubuntu-17.10-artful-amd64"; - fullName = "Ubuntu 17.10 Artful (amd64)"; + ubuntu1804x86_64 = { + name = "ubuntu-18.04-bionic-amd64"; + fullName = "Ubuntu 18.04 Bionic (amd64)"; packagesLists = [ (fetchurl { - url = "mirror://ubuntu/dists/artful/main/binary-amd64/Packages.xz"; - sha256 = "104g57j1l3vi8wb5f7rgjvjhf82ccs0vwhc59jfc4ynd51z7fqjk"; + url = "mirror://ubuntu/dists/bionic/main/binary-amd64/Packages.xz"; + sha256 = "1ls81bjyvmfz6i919kszl7xks1ibrh1xqhsk6698ackndkm0wp39"; }) (fetchurl { - url = "mirror://ubuntu/dists/artful/universe/binary-amd64/Packages.xz"; - sha256 = "1qzs95wfy9inaskfx9cf1l5yd3aaqwzy72zzi9xyvkxi75k5gcn4"; + url = "mirror://ubuntu/dists/bionic/universe/binary-amd64/Packages.xz"; + sha256 = "1832nqpn4ap95b3sj870xqayrza9in4kih9jkmjax27pq6x15v1r"; }) ]; urlPrefix = "mirror://ubuntu"; packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; - ubuntu1804i386 = { - name = "ubuntu-18.04-bionic-i386"; - fullName = "Ubuntu 18.04 Bionic (i386)"; + ubuntu2004i386 = { + name = "ubuntu-20.04-focal-i386"; + fullName = "Ubuntu 20.04 Focal (i386)"; packagesLists = [ (fetchurl { - url = "mirror://ubuntu/dists/bionic/main/binary-i386/Packages.xz"; - sha256 = "0f0v4131kwf7m7f8j3288rlqdxk1k3vqy74b7fcfd6jz9j8d840i"; + url = "mirror://ubuntu/dists/focal/main/binary-i386/Packages.xz"; + sha256 = "sha256-7RAYURoN3RKYQAHpwBS9TIV6vCmpURpphyMJQmV4wLc="; }) (fetchurl { - url = "mirror://ubuntu/dists/bionic/universe/binary-i386/Packages.xz"; - sha256 = "1v75c0dqr0wp0dqd4hnci92qqs4hll8frqdbpswadgxm5chn91bw"; + url = "mirror://ubuntu/dists/focal/universe/binary-i386/Packages.xz"; + sha256 = "sha256-oA551xVE80volUPgkMyvzpQ1d+GhuZd4DAe7dXZnULM="; }) ]; urlPrefix = "mirror://ubuntu"; packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; - ubuntu1804x86_64 = { - name = "ubuntu-18.04-bionic-amd64"; - fullName = "Ubuntu 18.04 Bionic (amd64)"; + ubuntu2004x86_64 = { + name = "ubuntu-20.04-focal-amd64"; + fullName = "Ubuntu 20.04 Focal (amd64)"; packagesLists = [ (fetchurl { - url = "mirror://ubuntu/dists/bionic/main/binary-amd64/Packages.xz"; - sha256 = "1ls81bjyvmfz6i919kszl7xks1ibrh1xqhsk6698ackndkm0wp39"; + url = "mirror://ubuntu/dists/focal/main/binary-amd64/Packages.xz"; + sha256 = "sha256-d1eSH/j+7Zw5NKDJk21EG6SiOL7j6myMHfXLzUP8mGE="; }) (fetchurl { - url = "mirror://ubuntu/dists/bionic/universe/binary-amd64/Packages.xz"; - sha256 = "1832nqpn4ap95b3sj870xqayrza9in4kih9jkmjax27pq6x15v1r"; + url = "mirror://ubuntu/dists/focal/universe/binary-amd64/Packages.xz"; + sha256 = "sha256-RqdG2seJvZU3rKVNsWgLnf9RwkgVMRE1A4IZnX2WudE="; }) ]; urlPrefix = "mirror://ubuntu"; packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; - debian8i386 = { - name = "debian-8.11-jessie-i386"; - fullName = "Debian 8.11 Jessie (i386)"; + debian9i386 = { + name = "debian-9.13-stretch-i386"; + fullName = "Debian 9.13 Stretch (i386)"; packagesList = fetchurl { - url = "mirror://debian/dists/jessie/main/binary-i386/Packages.xz"; - sha256 = "0adblarhx50yga900il6m25ng0csa81i3wid1dxxmydbdmri7v7d"; + url = "https://snapshot.debian.org/archive/debian/20210526T143040Z/dists/stretch/main/binary-i386/Packages.xz"; + sha256 = "sha256-fFRumd20wuVaYxzw0VPkAw5mQo8kIg+eXII15VSz9wA="; }; urlPrefix = "mirror://debian"; packages = commonDebianPackages; }; - debian8x86_64 = { - name = "debian-8.11-jessie-amd64"; - fullName = "Debian 8.11 Jessie (amd64)"; + debian9x86_64 = { + name = "debian-9.13-stretch-amd64"; + fullName = "Debian 9.13 Stretch (amd64)"; packagesList = fetchurl { - url = "mirror://debian/dists/jessie/main/binary-amd64/Packages.xz"; - sha256 = "09y1mv4kqllhxpk1ibjsyl5jig5bp0qxw6pp4sn56rglrpygmn5x"; + url = "https://snapshot.debian.org/archive/debian/20210526T143040Z/dists/stretch/main/binary-amd64/Packages.xz"; + sha256 = "sha256-1p4DEVpTGlBE3PtbQ90kYw4QNHkW0F4rna/Xz+ncMhw="; }; urlPrefix = "mirror://debian"; packages = commonDebianPackages; }; - debian9i386 = { - name = "debian-9.8-stretch-i386"; - fullName = "Debian 9.8 Stretch (i386)"; + debian10i386 = { + name = "debian-10.9-buster-i386"; + fullName = "Debian 10.9 Buster (i386)"; packagesList = fetchurl { - url = "http://snapshot.debian.org/archive/debian/20200301T030401Z/dists/stretch/main/binary-i386/Packages.xz"; - sha256 = "1jglr1d1jys3xddp8f7w9j05db39fah8xy4gfkpqbd1b5d2caslz"; + url = "https://snapshot.debian.org/archive/debian/20210526T143040Z/dists/buster/main/binary-i386/Packages.xz"; + sha256 = "sha256-zlkbKV+IGBCyWKD4v4LFM/EUA4TYS9fkLBPuF6MgUDo="; }; urlPrefix = "mirror://debian"; packages = commonDebianPackages; }; - debian9x86_64 = { - name = "debian-9.8-stretch-amd64"; - fullName = "Debian 9.8 Stretch (amd64)"; + debian10x86_64 = { + name = "debian-10.9-buster-amd64"; + fullName = "Debian 10.9 Buster (amd64)"; packagesList = fetchurl { - url = "http://snapshot.debian.org/archive/debian/20190503T090946Z/dists/stretch/main/binary-amd64/Packages.xz"; - sha256 = "01q00nl47p12n7wx0xclx59wf3zlkzrgj3zxpshyvb91xdnw5sh6"; + url = "https://snapshot.debian.org/archive/debian/20210526T143040Z/dists/buster/main/binary-amd64/Packages.xz"; + sha256 = "sha256-k13toY1b3CX7GBPQ7Jm24OMqCEsgPlGK8M99x57o69o="; }; urlPrefix = "mirror://debian"; packages = commonDebianPackages; }; - - }; @@ -1168,7 +1127,7 @@ rec { "passwd" ]; - commonDebianPackages = commonDebPackages ++ [ "sysvinit" "diff" "mktemp" ]; + commonDebianPackages = commonDebPackages ++ [ "sysvinit" "diff" ]; /* A set of functions that build the Linux distributions specified diff --git a/pkgs/data/themes/numix-solarized/default.nix b/pkgs/data/themes/numix-solarized/default.nix index 0d965e8030a..532275e5f74 100644 --- a/pkgs/data/themes/numix-solarized/default.nix +++ b/pkgs/data/themes/numix-solarized/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, python3, sassc, glib, gdk-pixbuf, inkscape, gtk-engine-murrine }: stdenv.mkDerivation rec { - version = "20200910"; pname = "numix-solarized-gtk-theme"; + version = "20210522"; src = fetchFromGitHub { owner = "Ferdi265"; - repo = "numix-solarized-gtk-theme"; + repo = pname; rev = version; - sha256 = "05h1563sy6sfz76jadxsf730mav6bbjsk9xnadv49r16b8n8p9a9"; + sha256 = "0hin73fmfir4w1z0j87k5hahhf2blhcq4r7gf89gz4slnl18cvjh"; }; nativeBuildInputs = [ python3 sassc glib gdk-pixbuf inkscape ]; @@ -23,10 +23,11 @@ stdenv.mkDerivation rec { buildPhase = "true"; installPhase = '' - HOME="$NIX_BUILD_ROOT" # shut up inkscape's warnings + runHook preInstall for theme in *.colors; do make THEME="''${theme/.colors/}" install done + runHook postInstall ''; meta = with lib; { @@ -38,7 +39,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/Ferdi265/numix-solarized-gtk-theme"; downloadPage = "https://github.com/Ferdi265/numix-solarized-gtk-theme/releases"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.linux; maintainers = [ maintainers.offline ]; }; diff --git a/pkgs/data/themes/yaru-remix/default.nix b/pkgs/data/themes/yaru-remix/default.nix new file mode 100644 index 00000000000..87056583b55 --- /dev/null +++ b/pkgs/data/themes/yaru-remix/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub, meson, sassc, pkg-config, glib, ninja, python3, gtk3, gnome }: + +stdenv.mkDerivation rec { + pname = "yaru-remix"; + version = "40"; + + src = fetchFromGitHub { + owner = "Muqtxdir"; + repo = pname; + rev = "v${version}"; + sha256 = "0xilhw5gbxsyy80ixxgj0nw6w782lz9dsinhi24026li1xny804c"; + }; + + nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; + buildInputs = [ gtk3 gnome.gnome-themes-extra ]; + + dontDropIconThemeCache = true; + + postPatch = "patchShebangs ."; + + meta = with lib; { + description = "Fork of the Yaru GTK theme"; + homepage = "https://github.com/Muqtxdir/yaru-remix"; + license = with licenses; [ cc-by-sa-40 gpl3Plus lgpl21Only lgpl3Only ]; + platforms = platforms.linux; + maintainers = with maintainers; [ hoppla20 ]; + }; +} diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 203668c3cb8..0c184e0ba73 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -63,7 +63,7 @@ let }; elixir_1_8 = lib'.callElixir ../interpreters/elixir/1.8.nix { - inherit erlang; + erlang = pkgs.beam.interpreters.erlangR23; debugInfo = true; }; @@ -83,7 +83,6 @@ let # without helper functions buildRebar3 and buildMix. hex = callPackage ./hex { }; webdriver = callPackage ./webdriver { }; - relxExe = callPackage ../tools/erlang/relx-exe { }; }; in makeExtensible packages diff --git a/pkgs/development/compilers/halide/default.nix b/pkgs/development/compilers/halide/default.nix index 69b7cd4d868..916d8fa56f7 100644 --- a/pkgs/development/compilers/halide/default.nix +++ b/pkgs/development/compilers/halide/default.nix @@ -41,7 +41,17 @@ llvmPackages.stdenv.mkDerivation rec { # Note: only openblas and not atlas part of this Nix expression # see pkgs/development/libraries/science/math/liblapack/3.5.0.nix # to get a hint howto setup atlas instead of openblas - buildInputs = [ llvmPackages.llvm libpng libjpeg mesa eigen openblas ]; + buildInputs = [ + llvmPackages.llvm + llvmPackages.lld + llvmPackages.openmp + llvmPackages.libclang + libpng + libjpeg + mesa + eigen + openblas + ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index 543f443a796..e52d6c20b97 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "babashka"; - version = "0.4.1"; + version = "0.4.3"; reflectionJson = fetchurl { name = "reflection.json"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-tKMxi0umMmM99NusSSE9tT95TBcfXm1lfo95fQRUBrs="; + sha256 = "sha256-teZKAwSv9wliVFKdT76yQjMC5g7SGPAqcq/jZ07sYjQ="; }; dontUnpack = true; @@ -110,9 +110,15 @@ stdenv.mkDerivation rec { - Batteries included (tools.cli, cheshire, ...) - Library support via popular tools like the clojure CLI ''; - homepage = "https://github.com/borkdude/babashka"; + homepage = "https://github.com/babashka/babashka"; license = licenses.epl10; platforms = graalvm11-ce.meta.platforms; - maintainers = with maintainers; [ bandresen bhougland DerGuteMoritz jlesquembre ]; + maintainers = with maintainers; [ + bandresen + bhougland + DerGuteMoritz + jlesquembre + thiagokokada + ]; }; } diff --git a/pkgs/development/interpreters/luajit/2.0.nix b/pkgs/development/interpreters/luajit/2.0.nix index c0be721701c..528c14a8b24 100644 --- a/pkgs/development/interpreters/luajit/2.0.nix +++ b/pkgs/development/interpreters/luajit/2.0.nix @@ -1,10 +1,10 @@ { self, callPackage, lib }: callPackage ./default.nix { inherit self; - version = "2.0.5-2021-05-17"; - rev = "44684fa71d8af6fa8b3051c7d763bbfdcf7915d7"; + version = "2.0.5-2021-05-29"; + rev = "c2cfa04231785116d9d198462830f41ef94147c0"; isStable = true; - sha256 = "049d3l0miv4n0cnm35ml8flrb9vs12zvbda2743vypckymidliqp"; + sha256 = "1fw64pv0dvzb9bgr2zwcv9q8gqgsmfnvrcrmrdfgj4ncamgdnilj"; extraMeta = { # this isn't precise but it at least stops the useless Hydra build platforms = with lib; filter (p: p != "aarch64-linux") (platforms.linux ++ platforms.darwin); diff --git a/pkgs/development/interpreters/luajit/2.1.nix b/pkgs/development/interpreters/luajit/2.1.nix index 8be8aa82b08..f85fc0932cc 100644 --- a/pkgs/development/interpreters/luajit/2.1.nix +++ b/pkgs/development/interpreters/luajit/2.1.nix @@ -1,8 +1,8 @@ { self, callPackage }: callPackage ./default.nix { inherit self; - version = "2.1.0-2021-05-22"; - rev = "5783ba1bf73c53ca56e64ed0c462c62224f0393c"; + version = "2.1.0-2021-05-29"; + rev = "839fb5bd72341d8e67b6cfc2053e2acffdb75567"; isStable = false; - sha256 = "1j25xnbradks58lwsqnxcc7k29wsk2hnky0b1vjzpadrj0sxxc42"; + sha256 = "1gyzq4n0fwah0245wazv4c43q9in1mwbk3dhh6cb1ijnjcxp2bb6"; } diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index ac53ae3bbd4..a13ebf28193 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -22,12 +22,12 @@ let in stdenv.mkDerivation rec { pname = "arrow-cpp"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - sha256 = "1bj9jr0pgq9f2nyzqiyj3cl0hcx3c83z2ym6rpdkp59ff2zx0caa"; + sha256 = "0vl926i6jvsvj5vigdgqzp9v1i1h5zzj1abqr6qwc9drfsibzk3m"; }; sourceRoot = "apache-arrow-${version}/cpp"; @@ -146,11 +146,11 @@ in stdenv.mkDerivation rec { --exclude-regex '^(${builtins.concatStringsSep "|" excludedTests})$' ''; - meta = { + meta = with lib; { description = "A cross-language development platform for in-memory data"; homepage = "https://arrow.apache.org/"; - license = lib.licenses.asl20; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ tobim veprbl ]; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ tobim veprbl ]; }; } diff --git a/pkgs/development/libraries/getdata/default.nix b/pkgs/development/libraries/getdata/default.nix index de76924844f..25321c22434 100644 --- a/pkgs/development/libraries/getdata/default.nix +++ b/pkgs/development/libraries/getdata/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libtool }: +{ lib, stdenv, fetchurl, fetchpatch, libtool }: stdenv.mkDerivation rec { pname = "getdata"; version = "0.10.0"; @@ -7,6 +7,13 @@ stdenv.mkDerivation rec { sha256 = "18xbb32vygav9x6yz0gdklif4chjskmkgp06rwnjdf9myhia0iym"; }; + patches = [ + (fetchpatch { + url = "https://sources.debian.org/data/main/libg/libgetdata/0.10.0-10/debian/patches/CVE-2021-20204.patch"; + sha256 = "1lvp1c2pkk9kxniwlvax6d8fsmjrkpxawf71c7j4rfjm6dgvivzm"; + }) + ]; + buildInputs = [ libtool ]; meta = with lib; { diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index ac899ce26f1..d84b9f1df62 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "itk"; - version = "5.1.2"; + version = "5.2.0"; src = fetchFromGitHub { owner = "InsightSoftwareConsortium"; repo = "ITK"; rev = "v${version}"; - sha256 = "0db91pm1zy40h4qr5zsdfl94znk16w9ysddz5cxbl198iyyqii8f"; + sha256 = "19f65fc9spwvmywg43lkw9p2inrrzr1qrfzcbing3cjk0x2yrsnl"; }; postPatch = '' diff --git a/pkgs/development/libraries/libiio/cmake-fix-libxml2-find-package.patch b/pkgs/development/libraries/libiio/cmake-fix-libxml2-find-package.patch new file mode 100644 index 00000000000..25345bef90c --- /dev/null +++ b/pkgs/development/libraries/libiio/cmake-fix-libxml2-find-package.patch @@ -0,0 +1,13 @@ +diff --color -ur a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2021-05-30 13:46:22.256040282 +0200 ++++ b/CMakeLists.txt 2021-05-30 14:15:42.530181216 +0200 +@@ -333,7 +333,7 @@ + # So, try first to find the CMake module provided by libxml2 package, then fallback + # on the CMake's FindLibXml2.cmake module (which can lack some definition, especially + # in static build case). +-find_package(LibXml2 QUIET NO_MODULE) ++find_package(LibXml2 QUIET MODULE) + if(DEFINED LIBXML2_VERSION_STRING) + set(LIBXML2_FOUND ON) + set(LIBXML2_INCLUDE_DIR ${LIBXML2_INCLUDE_DIRS}) +Seulement dans b: good.patch diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix index 043e27fb4b2..e704076ab57 100644 --- a/pkgs/development/libraries/libiio/default.nix +++ b/pkgs/development/libraries/libiio/default.nix @@ -23,6 +23,10 @@ stdenv.mkDerivation rec { sha256 = "0psw67mzysdb8fkh8xpcwicm7z94k8plkcc8ymxyvl6inshq0mc7"; }; + # Revert after https://github.com/NixOS/nixpkgs/issues/125008 is + # fixed properly + patches = [ ./cmake-fix-libxml2-find-package.patch ]; + nativeBuildInputs = [ cmake flex diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index f2d4e00d1aa..1ac842e5593 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -40,6 +40,10 @@ stdenv.mkDerivation rec { "-DENABLE_SHARED=${if enableShared then "1" else "0"}" ] ++ lib.optionals enableJava [ "-DWITH_JAVA=1" + ] ++ lib.optionals stdenv.hostPlatform.isRiscV [ + # https://github.com/libjpeg-turbo/libjpeg-turbo/issues/428 + # https://github.com/libjpeg-turbo/libjpeg-turbo/commit/88bf1d16786c74f76f2e4f6ec2873d092f577c75 + "-DFLOATTEST=fp-contract" ]; doInstallCheck = true; diff --git a/pkgs/development/libraries/libxlsxwriter/default.nix b/pkgs/development/libraries/libxlsxwriter/default.nix index d323c2d962e..4bb80cb04a4 100644 --- a/pkgs/development/libraries/libxlsxwriter/default.nix +++ b/pkgs/development/libraries/libxlsxwriter/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "libxlsxwriter"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "jmcnamara"; repo = "libxlsxwriter"; rev = "RELEASE_${version}"; - sha256 = "1jjmwg1mk7pvf36q30rng42qphgz6qdjvn96agrym2q0hhwxc99v"; + sha256 = "03fdcbm0xnkxwv6fir4yy4x9q2p5h08j099w9xh5gc2ni7ygjlyx"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/vapoursynth/plugin-interface.nix b/pkgs/development/libraries/vapoursynth/plugin-interface.nix index 55b2b03c893..95df3c97747 100644 --- a/pkgs/development/libraries/vapoursynth/plugin-interface.nix +++ b/pkgs/development/libraries/vapoursynth/plugin-interface.nix @@ -8,10 +8,11 @@ plugins: let getRecursivePropagatedBuildInputs = pkgs: lib.flatten (map - (pkg: pkg.propagatedBuildInputs ++ (getRecursivePropagatedBuildInputs pkg.propagatedBuildInputs)) + (pkg: let cleanPropagatedBuildInputs = lib.filter lib.isDerivation pkg.propagatedBuildInputs; + in cleanPropagatedBuildInputs ++ (getRecursivePropagatedBuildInputs cleanPropagatedBuildInputs)) pkgs); - deepPlugins = plugins ++ (getRecursivePropagatedBuildInputs plugins); + deepPlugins = lib.unique (plugins ++ (getRecursivePropagatedBuildInputs plugins)); pluginsEnv = buildEnv { name = "vapoursynth-plugins-env"; diff --git a/pkgs/development/ocaml-modules/tyxml/default.nix b/pkgs/development/ocaml-modules/tyxml/default.nix index bf0e06507c9..c49327d7d33 100644 --- a/pkgs/development/ocaml-modules/tyxml/default.nix +++ b/pkgs/development/ocaml-modules/tyxml/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "tyxml"; - version = "4.4.0"; + version = "4.5.0"; useDune2 = true; src = fetchurl { url = "https://github.com/ocsigen/tyxml/releases/download/${version}/tyxml-${version}.tbz"; - sha256 = "0c150h2f4c4id73ickkdqkir3jya66m6c7f5jxlp4caw9bfr8qsi"; + sha256 = "0s30f72m457c3gbdmdwbx7ls9zg806nvm83aiz9qkpglbppwr6n6"; }; propagatedBuildInputs = [ uutf re ]; @@ -19,7 +19,7 @@ buildDunePackage rec { license = licenses.lgpl21; maintainers = with maintainers; [ gal_bolle vbgl - ]; + ]; }; } diff --git a/pkgs/development/ocaml-modules/uri/default.nix b/pkgs/development/ocaml-modules/uri/default.nix index 7933b3bd8d4..f669a98c4de 100644 --- a/pkgs/development/ocaml-modules/uri/default.nix +++ b/pkgs/development/ocaml-modules/uri/default.nix @@ -5,13 +5,13 @@ buildDunePackage rec { minimumOCamlVersion = "4.03"; pname = "uri"; - version = "4.0.0"; + version = "4.2.0"; useDune2 = true; src = fetchurl { url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "13r9nkgym9z3dqxkyf0yyaqlrk5r3pjdw0kfzvrc90bmhwl9j380"; + sha256 = "0szifda6yism5vn5jdizkha3ad0xk6zw4xgfl8g77dnv83ci7h65"; }; checkInputs = [ ounit ]; diff --git a/pkgs/development/python-modules/corsair-scan/default.nix b/pkgs/development/python-modules/corsair-scan/default.nix new file mode 100644 index 00000000000..e7c016be06b --- /dev/null +++ b/pkgs/development/python-modules/corsair-scan/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, click +, fetchFromGitHub +, mock +, pytestCheckHook +, pythonOlder +, requests +, tldextract +, urllib3 +, validators +}: + +buildPythonPackage rec { + pname = "corsair-scan"; + version = "0.2.0"; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "Santandersecurityresearch"; + repo = "corsair_scan"; + rev = "v${version}"; + sha256 = "09jsv5bag7mjy0rxsxjzmg73rjl7qknzr0d7a7himd7v6a4ikpmk"; + }; + + propagatedBuildInputs = [ + validators + requests + urllib3 + tldextract + click + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest-runner'," "" + ''; + + pythonImportsCheck = [ "corsair_scan" ]; + + meta = with lib; { + description = "Python module to check for Cross-Origin Resource Sharing (CORS) misconfigurations"; + homepage = "https://github.com/Santandersecurityresearch/corsair_scan"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/drf-jwt/default.nix b/pkgs/development/python-modules/drf-jwt/default.nix index ad3edc59246..2cf125c8df3 100644 --- a/pkgs/development/python-modules/drf-jwt/default.nix +++ b/pkgs/development/python-modules/drf-jwt/default.nix @@ -3,18 +3,17 @@ , fetchFromGitHub , pyjwt , djangorestframework -, pytestCheckHook }: buildPythonPackage rec { pname = "drf-jwt"; - version = "1.19.0"; + version = "1.19.1"; src = fetchFromGitHub { owner = "Styria-Digital"; repo = "django-rest-framework-jwt"; rev = version; - sha256 = "012rmm25w5gvkzi4lyyhn47y1n6g68q9gasga2mkv9i6mn8n4kp7"; + sha256 = "sha256-++8rFXVsA5WMTt+aC4di3Rpa0BAW285/qM087i9uQ0g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/powerline-mem-segment/default.nix b/pkgs/development/python-modules/powerline-mem-segment/default.nix new file mode 100644 index 00000000000..7bc38f2227a --- /dev/null +++ b/pkgs/development/python-modules/powerline-mem-segment/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, psutil +}: + +buildPythonPackage rec { + pname = "powerline-mem-segment"; + version = "2.4.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0507zw7g449zk7dcq56adcdp71inbqfdmp6y5yk4x4j7kkp6pii9"; + }; + + propagatedBuildInputs = [ psutil ]; + + pythonImportsCheck = [ "powerlinemem" ]; + + meta = with lib; { + description = "Segment for Powerline showing the current memory usage in percent or absolute values."; + homepage = "https://github.com/mKaloer/powerline_mem_segment"; + license = licenses.asl20; + maintainers = with maintainers; [ thomasjm ]; + }; +} diff --git a/pkgs/development/python-modules/purl/default.nix b/pkgs/development/python-modules/purl/default.nix index 43fd5b71ca6..aa85ea3965a 100644 --- a/pkgs/development/python-modules/purl/default.nix +++ b/pkgs/development/python-modules/purl/default.nix @@ -1,22 +1,19 @@ { lib, buildPythonPackage, fetchFromGitHub -, nose -, six +, pytestCheckHook }: buildPythonPackage rec { pname = "purl"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "codeinthehole"; repo = "purl"; rev = version; - sha256 = "0vi7xdm2xc1rbqrz5jwpr7x7dnkcrbjf1mb4w1q2c2f8jca0kk0g"; + sha256 = "sha256-Jb3JRW/PtQ7NlO4eQ9DmTPu/sjvFTg2mztphoIF79gc="; }; - propagatedBuildInputs = [ six ]; - - checkInputs = [ nose ]; + checkInputs = [ pytestCheckHook]; meta = with lib; { description = "Immutable URL class for easy URL-building and manipulation"; diff --git a/pkgs/development/python-modules/pygtfs/default.nix b/pkgs/development/python-modules/pygtfs/default.nix new file mode 100644 index 00000000000..735990c0944 --- /dev/null +++ b/pkgs/development/python-modules/pygtfs/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, docopt +, fetchPypi +, nose +, pytz +, setuptools-scm +, six +, sqlalchemy +}: + +buildPythonPackage rec { + pname = "pygtfs"; + version = "0.1.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0nx2idgza07kmvj7pcgpj3pqhw53v5rq63paw2ly51cjas2fv5pr"; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + docopt + pytz + six + sqlalchemy + ]; + + checkInputs = [ + nose + ]; + + pythonImportsCheck = [ "pygtfs" ]; + + meta = with lib; { + description = "Python module for GTFS"; + homepage = "https://github.com/jarondl/pygtfs"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pytube/default.nix b/pkgs/development/python-modules/pytube/default.nix index a557c623a07..086c3a8671b 100644 --- a/pkgs/development/python-modules/pytube/default.nix +++ b/pkgs/development/python-modules/pytube/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pytube"; - version = "10.8.2"; + version = "10.8.3"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "pytube"; repo = "pytube"; rev = "v${version}"; - sha256 = "sha256-LY1aDFzF0vHwEa3pfAoxZ3KM1l39PDo6S6F3xtqqspU="; + sha256 = "sha256-U/TXA/0y5tsuj0q3kxacHk76wjYG6k8mPX5F3MpADmk="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/solo-python/default.nix b/pkgs/development/python-modules/solo-python/default.nix index 8d84ce34eb9..88df4e50fbc 100644 --- a/pkgs/development/python-modules/solo-python/default.nix +++ b/pkgs/development/python-modules/solo-python/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "solo-python"; - version = "0.0.27"; + version = "0.0.30"; format = "flit"; disabled = pythonOlder "3.6"; # only python>=3.6 is supported @@ -22,7 +22,7 @@ owner = "solokeys"; repo = pname; rev = version; - sha256 = "sha256-OCiKa6mnqJGoNCC4KqI+hMw22tzhdN63x9/KujNJqcE="; + sha256 = "1i9kybp08qfcdx6m4wl7ij40y1v17mvvhcdg7zglwfakblf69w41"; }; # replaced pinned fido, with unrestricted fido version @@ -60,8 +60,5 @@ homepage = "https://github.com/solokeys/solo-python"; maintainers = with maintainers; [ wucke13 ]; license = with licenses; [ asl20 mit ]; - # solo-python v0.0.27 does not support fido2 >= v0.9 - # https://github.com/solokeys/solo-python/issues/110 - broken = true; }; } diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 067db74663e..f16a6d0bb4a 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -276,6 +276,7 @@ let jqr = [ pkgs.jq.dev ]; KFKSDS = [ pkgs.gsl_1 ]; kza = [ pkgs.fftw.dev ]; + lwgeom = [ pkgs.gdal pkgs.geos pkgs.proj ]; magick = [ pkgs.imagemagick.dev ]; ModelMetrics = lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp; mvabund = [ pkgs.gsl_1 ]; @@ -406,6 +407,7 @@ let gdtools = [ pkgs.pkg-config ]; jqr = [ pkgs.jq.lib ]; kza = [ pkgs.pkg-config ]; + lwgeom = [ pkgs.pkg-config pkgs.proj.dev pkgs.sqlite.dev ]; magick = [ pkgs.pkg-config ]; mwaved = [ pkgs.pkg-config ]; odbc = [ pkgs.pkg-config ]; diff --git a/pkgs/development/tools/build-managers/scons/common.nix b/pkgs/development/tools/build-managers/scons/common.nix index 8b5b608fdf3..6af30285123 100644 --- a/pkgs/development/tools/build-managers/scons/common.nix +++ b/pkgs/development/tools/build-managers/scons/common.nix @@ -43,6 +43,6 @@ python3Packages.buildPythonApplication rec { changelog = "https://raw.githubusercontent.com/SConsProject/scons/rel_${version}/src/CHANGES.txt"; license = licenses.mit; platforms = platforms.all; - maintainers = [ maintainers.primeos ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/erlang/relx-exe/default.nix b/pkgs/development/tools/erlang/relx-exe/default.nix deleted file mode 100644 index 0f9d973e677..00000000000 --- a/pkgs/development/tools/erlang/relx-exe/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ fetchHex, fetchRebar3Deps, rebar3Relx }: - -rebar3Relx rec { - name = "relx-exe"; - version = "3.32.1"; - releaseType = "escript"; - - src = fetchHex { - pkg = "relx"; - sha256 = "0693k8ac7hvpm9jd3ysbdn8bk97d68ini22p1fsqdsi9qv9f7nq7"; - inherit version; - }; - - checkouts = fetchRebar3Deps { - inherit name version; - src = "${src}/rebar.lock"; - sha256 = "0l7r3x7zwcz49013zv8z5v2i06p7wqkgzdyzrl8jk0hglscvhpf6"; - }; -} diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 2dfb58013dd..f0f8c156dbd 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.12.1"; + version = "0.12.5"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-X+mWuGm6hpTofoZSpM9U2GmYlETMH7MuYwk4ahFSyVE="; + sha256 = "sha256-9EVlmdolr189vdnuA01UUrcrmZ9W0FtvCcJuuSX1nLs="; }; vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index d5eb7a9b0e0..3a210ab174f 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -1,27 +1,30 @@ -{ stdenv, lib, fetchFromGitHub, scons, pkg-config, libX11, libXcursor -, libXinerama, libXrandr, libXrender, libpulseaudio ? null -, libXi ? null, libXext, libXfixes, freetype, openssl -, alsaLib, libGLU, zlib, yasm ? null }: +{ stdenv, lib, fetchFromGitHub, scons, pkg-config, udev, libX11 +, libXcursor , libXinerama, libXrandr, libXrender, libpulseaudio +, libXi, libXext, libXfixes, freetype, openssl +, alsaLib, libGLU, zlib, yasm +, withUdev ? true +}: let options = { touch = libXi != null; pulseaudio = false; + udev = withUdev; }; in stdenv.mkDerivation rec { pname = "godot"; - version = "3.2.3"; + version = "3.3.2"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; rev = "${version}-stable"; - sha256 = "19vrp5lhyvxbm6wjxzn28sn3i0s8j08ca7nani8l1nrhvlc8wi0v"; + sha256 = "0rfm6sbbwzvsn76a8aqagd7cqdzmk8qxphgl89k7y982l9a5sz50"; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - scons libX11 libXcursor libXinerama libXrandr libXrender + scons udev libX11 libXcursor libXinerama libXrandr libXrender libXi libXext libXfixes freetype openssl alsaLib libpulseaudio libGLU zlib yasm ]; diff --git a/pkgs/development/tools/godot/dont_clobber_environment.patch b/pkgs/development/tools/godot/dont_clobber_environment.patch index b7c1d3d6233..74e1241513b 100644 --- a/pkgs/development/tools/godot/dont_clobber_environment.patch +++ b/pkgs/development/tools/godot/dont_clobber_environment.patch @@ -1,18 +1,19 @@ diff --git a/SConstruct b/SConstruct -index b3d033dc90..04b8dcc832 100644 +index d138c7b250..c925bf908e 100644 --- a/SConstruct +++ b/SConstruct -@@ -62,10 +62,9 @@ elif platform_arg == "javascript": - custom_tools = ["cc", "c++", "ar", "link", "textfile", "zip"] - +@@ -65,10 +65,10 @@ elif platform_arg == "javascript": + # want to have to pull in manually. + # Then we prepend PATH to make it take precedence, while preserving SCons' own entries. env_base = Environment(tools=custom_tools) --if "TERM" in os.environ: +-env_base.PrependENVPath("PATH", os.getenv("PATH")) +-env_base.PrependENVPath("PKG_CONFIG_PATH", os.getenv("PKG_CONFIG_PATH")) +-if "TERM" in os.environ: # Used for colored output. - env_base["ENV"]["TERM"] = os.environ["TERM"] --env_base.AppendENVPath("PATH", os.getenv("PATH")) --env_base.AppendENVPath("PKG_CONFIG_PATH", os.getenv("PKG_CONFIG_PATH")) +for k in ("TERM", "PATH", "PKG_CONFIG_PATH"): + if (k in os.environ): + env_base["ENV"][k] = os.environ[k] ++ + env_base.disabled_modules = [] env_base.use_ptrcall = False - env_base.module_version_string = "" diff --git a/pkgs/development/tools/godot/pkg_config_additions.patch b/pkgs/development/tools/godot/pkg_config_additions.patch index 9e2e5c3536d..f5ab667f180 100644 --- a/pkgs/development/tools/godot/pkg_config_additions.patch +++ b/pkgs/development/tools/godot/pkg_config_additions.patch @@ -1,11 +1,11 @@ diff --git a/platform/x11/detect.py b/platform/x11/detect.py -index 5674e78350..7051d8e73c 100644 +index 91652aad55..d12389f9f2 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py -@@ -201,6 +201,11 @@ def configure(env): +@@ -218,6 +218,11 @@ def configure(env): env.ParseConfig("pkg-config xrender --cflags --libs") env.ParseConfig("pkg-config xi --cflags --libs") - + + env.ParseConfig("pkg-config xext --cflags --libs") + env.ParseConfig("pkg-config xfixes --cflags --libs") + env.ParseConfig("pkg-config glu --cflags --libs") @@ -13,13 +13,20 @@ index 5674e78350..7051d8e73c 100644 + if env["touch"]: env.Append(CPPDEFINES=["TOUCH_ENABLED"]) - -@@ -299,7 +304,7 @@ def configure(env): + +@@ -323,6 +328,7 @@ def configure(env): print("Enabling ALSA") + env["alsa"] = True env.Append(CPPDEFINES=["ALSA_ENABLED", "ALSAMIDI_ENABLED"]) - # Don't parse --cflags, we don't need to add /usr/include/alsa to include path -- env.ParseConfig("pkg-config alsa --libs") + env.ParseConfig("pkg-config alsa --cflags --libs") else: print("ALSA libraries not found, disabling driver") - + +@@ -340,6 +346,7 @@ def configure(env): + if os.system("pkg-config --exists libudev") == 0: # 0 means found + print("Enabling udev support") + env.Append(CPPDEFINES=["UDEV_ENABLED"]) ++ env.ParseConfig("pkg-config libudev --cflags --libs") + else: + print("libudev development libraries not found, disabling udev support") + else: diff --git a/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix b/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix index b857b910f0a..3ebbc9b0339 100644 --- a/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix +++ b/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix @@ -1,13 +1,13 @@ -{ mkDerivation, base, containers, fetchgit, hedgehog -, optparse-applicative, parsec, lib, template-haskell, text +{ mkDerivation, base, containers, fetchgit, hedgehog, lib +, optparse-applicative, parsec, template-haskell, text }: mkDerivation { pname = "dconf2nix"; - version = "0.0.7"; + version = "0.0.8"; src = fetchgit { url = "https://github.com/gvolpe/dconf2nix.git"; - sha256 = "04p8di1ckv5fkfa61pjg5xp8vcw091lz1kw39lh4w8ks2zjwaha1"; - rev = "34c523e920b79208c3b4c0ad371900b0948799f7"; + sha256 = "19jk3p0ys3lbqk21lm37a7alkg2vhnmkvcffjqfxrw8p4737hxid"; + rev = "6bf3d7d4ca9f553a9e1ba4a70a65640114d230b2"; fetchSubmodules = true; }; isLibrary = true; diff --git a/pkgs/development/tools/ijq/default.nix b/pkgs/development/tools/ijq/default.nix index 0b0af79301e..f3c0b6c7b1b 100644 --- a/pkgs/development/tools/ijq/default.nix +++ b/pkgs/development/tools/ijq/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ijq"; - version = "0.2.3"; + version = "0.3.4"; src = fetchgit { url = "https://git.sr.ht/~gpanders/ijq"; rev = "v${version}"; - sha256 = "14n54jh5387jf97zhc7aidn7w60zp5624xbvq4jdbsh96apg3bk1"; + sha256 = "ZKxEK6SPxEC0S5yXSzITPn0HhpJa4Bcf9X8/N+ZZAeA="; }; - vendorSha256 = "0xbni6lk6y3ig7pj2234fv7ra6b8qv0k8m3bvh59wwans8xpihzb"; + vendorSha256 = "04KlXE2I8ZVDbyo9tBnFskLB6fo5W5/lPzSpo8KGqUU="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/rust/cargo-bitbake/default.nix b/pkgs/development/tools/rust/cargo-bitbake/default.nix new file mode 100644 index 00000000000..ee29976eb98 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-bitbake/default.nix @@ -0,0 +1,26 @@ +{ lib, pkg-config, rustPlatform, fetchFromGitHub, openssl }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-bitbake"; + version = "0.3.15"; + + src = fetchFromGitHub { + owner = "meta-rust"; + repo = pname; + rev = "v${version}"; + sha256 = "1ffjkwaqvmyz374azrv6gna19z2fcg82is2k2n2gm50isbxw2aa5"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; + + cargoSha256 = "0mm6059wjh5p8923dwz55dpwi55gq2bcmpx7kn40pq5ppkiqjiw9"; + + meta = with lib; { + description = "Cargo extension that can generate BitBake recipes utilizing the classes from meta-rust"; + homepage = "https://github.com/meta-rust/cargo-bitbake"; + license = with licenses; [ mit asl20 ]; + maintainers = with maintainers; [ rvarago ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/games/rpg-cli/default.nix b/pkgs/games/rpg-cli/default.nix index 1e07c3418fc..0c3a58c98a9 100644 --- a/pkgs/games/rpg-cli/default.nix +++ b/pkgs/games/rpg-cli/default.nix @@ -2,17 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rpg-cli"; - version = "unstable-2021-05-27"; + version = "0.3.0"; src = fetchFromGitHub { owner = "facundoolano"; repo = pname; - # certain revision because the Cargo.lock was checked-in in that commit - rev = "4d8a1dac79a1d29d79c0c874475037769dcef5a1"; - sha256 = "sha256-qfj1uij9lYyfyHFUnVi9I0ELOoObjFG2NS9UreC/xio="; + rev = version; + sha256 = "sha256-pcVxUX6CPIE5GJniXbAiwZQjwv2eer8LevFl6gASKmM="; }; - cargoSha256 = "sha256-I+rSfuiGFdzA5zqPfvMPcERaQfiX92LW2NKjazWh9c4="; + cargoSha256 = "sha256-4DB3Zj9awmKX5t1zCgWxetz/+tl6ojpCEKxWpZFlMcw="; # tests assume the authors macbook, and thus fail doCheck = false; @@ -22,6 +21,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/facundoolano/rpg-cli"; license = licenses.mit; maintainers = with maintainers; [ legendofmiracles ]; - mainProgram = "rpg-cli"; }; } diff --git a/pkgs/misc/emulators/proton-caller/default.nix b/pkgs/misc/emulators/proton-caller/default.nix index f1770ba8906..f8295c6c5b4 100644 --- a/pkgs/misc/emulators/proton-caller/default.nix +++ b/pkgs/misc/emulators/proton-caller/default.nix @@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "caverym"; repo = pname; - rev = "version"; + rev = version; sha256 = "0968pmapg6157q4rvfp690l1sjnws8hm62lvm8kaaqysac339z7z"; }; diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index fa9e88db648..6103472a7cc 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -44,9 +44,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "6.7"; + version = "6.9"; url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz"; - sha256 = "sha256-wwUUt3YdRhFRSuAhyx41QSjXfv9UooPxQB7nAid7vqQ="; + sha256 = "sha256-GFVOYB3vhqmiAXKwhcZoMpFPwh511VX25U/4nn6uW/4="; inherit (stable) gecko32 gecko64; ## see http://wiki.winehq.org/Mono @@ -65,13 +65,17 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-fWriizSk2+U7Mpn6w/Dlrevd4vc5MnlSWSGxQDf2p+M="; + sha256 = "sha256-g0NmiypafOAmKDRoRf4uz5NnhFo6uga0fKYNCF29jbE="; owner = "wine-staging"; repo = "wine-staging"; - rev = "v${version}"; + #rev = "v${version}"; + # FIXME: replace with line above with 6.10 release + # Fix https://bugs.winehq.org/show_bug.cgi?id=51172 + rev = "5bbe3e47a559b3c04bc8791e0b398a271c772af7"; - # Just keep list empty, if current release haven't broken patchsets - disabledPatchsets = [ ]; + # Actually only "d3d11-Deferred_Context" cause problems, two others only dependencies + # see FIXME above + disabledPatchsets = [ "d3d11-Deferred_Context" "wined3d-CSMT_Main" "nvapi-Stub_DLL" "nvcuvid-CUDA_Video_Support" "nvencodeapi-Video_Encoder" ]; }; winetricks = fetchFromGitHub rec { diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index b213ff9089e..2e9710c016a 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-05-04"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "bee8eccb421968d1f2628c15e9f2bfcc3d0418aa"; - sha256 = "1kfj40rfgyvzjk1ic9ax21cb8a58qhjbqh7knxgljkv7jhaclj4y"; + rev = "a02a4f2811f810877f3c3859cca963f9578ff94a"; + sha256 = "0c96zhz8ia1yfgv58jrib49kp250kilv2awr2jgnriqznkl9l4h9"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -101,12 +101,12 @@ final: prev: ansible-vim = buildVimPluginFrom2Nix { pname = "ansible-vim"; - version = "2021-04-11"; + version = "2021-05-24"; src = fetchFromGitHub { owner = "pearofducks"; repo = "ansible-vim"; - rev = "bc9c3bf48961f5babb24243bd407c715ce551210"; - sha256 = "1pvjjxw3nz3s11f83rbmdhad5rvks0q2am09sfxns0x4rwiwcyrk"; + rev = "f351f0d36e1c8990d8bb1eb2f1d8c25e76ff99bb"; + sha256 = "1hsyk5zc0nmh0hv0c803giimgmx1nahs1zm4gw61bkq2dkjfb4dn"; }; meta.homepage = "https://github.com/pearofducks/ansible-vim/"; }; @@ -221,12 +221,12 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2021-05-14"; + version = "2021-05-26"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "0a71b6211ff2d367f012b484e8eba9ef433b85c3"; - sha256 = "1axn0glc40kqygd50m28layk16y28ah9bi6j36id6v0czhxfi475"; + rev = "c051b0d86395c3c4c9db5ddc1b116d43b5dce6c6"; + sha256 = "1006rnpprqh3xsmlas07ay4z743g2zd7z7pqwa4n1bb97y9k89ly"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -269,12 +269,12 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar-nvim"; - version = "2021-05-19"; + version = "2021-05-23"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "af49846c1422c454f98d3450282e02bf83d5f3bf"; - sha256 = "17hf26d2sqywkyq0j2ckfffsshjd132n3zqgr4n6qzdpnbdd668p"; + rev = "fc90a9bceba1ccacf8a5331bb7c508baac7d5110"; + sha256 = "0lwky1zbv4a4ng0bzbpz5v3b7lnk6xzj4sfzm6x5qyhagpw4812v"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -413,12 +413,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-05-22"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "dd54a707f372bc8f631d7c70f70f1b55a0f56926"; - sha256 = "16sbhn3711hqwv3qykg5lbf09fl6pn58aclsx5r3nnifdc531sc6"; + rev = "77f56c4938b512b20c2da76a54a362dffc5bc7d4"; + sha256 = "1hyadig7f0mjj3vwz6pxyzwa155knbqd9dcpk64p215wagc08nfm"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -557,12 +557,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-05-18"; + version = "2021-05-24"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "17494990ab110b70aec3d7c97707448c6d3e72c9"; - sha256 = "0krl2fn9d3kaczh124z3b1x3qkyq7vw51yim9a9v3raj6x73zynl"; + rev = "1a74bf3c57fec8442f837b3baad0d6fb75d1b97a"; + sha256 = "105jcl74k006dsslplp40yizfdjrj3p7qr23c53dgs2wlbzqc3kj"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1112,12 +1112,12 @@ final: prev: deoplete-lsp = buildVimPluginFrom2Nix { pname = "deoplete-lsp"; - version = "2021-02-07"; + version = "2021-05-23"; src = fetchFromGitHub { owner = "deoplete-plugins"; repo = "deoplete-lsp"; - rev = "e526dbecda137e37c45492ce72fa92ea32314154"; - sha256 = "03dwis03zx88j4dan1y39b03rvf7f2q7hykhgqsfcx1zj8lp8s7n"; + rev = "00937dd6e4270287c34cdd7f64e8dad5d16914aa"; + sha256 = "0fzp5zvwb85nx9nw1f2im1qllz7ihblgi8xi9mski19p40pgay3j"; }; meta.homepage = "https://github.com/deoplete-plugins/deoplete-lsp/"; }; @@ -1208,12 +1208,12 @@ final: prev: deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2021-05-19"; + version = "2021-05-24"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "27be5ec45cf52223b225b25517bc088cfcf3c959"; - sha256 = "0ixzly9pbgkwxghwqvpfl4smpk7875d0vwhkwcrnm1z8bhq9rypx"; + rev = "35e27c325ecf0afa28ca42bbda4793eb7ca5f383"; + sha256 = "0an2282ykdsb5v25dhd9r2f2s13pcma0i219nvfaf0qdprip57id"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1462,12 +1462,12 @@ final: prev: fern-vim = buildVimPluginFrom2Nix { pname = "fern-vim"; - version = "2021-05-02"; + version = "2021-05-23"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "5409f2ef04e1959b5a8d177c962a57f2f2cb78ae"; - sha256 = "125bnbyjdhdj2ynrnxwn55cpq8v73zd0idlwshyk2a93w6mrxy7b"; + rev = "5fe781e4a12101871bc778b977ce6b76685c1ab0"; + sha256 = "1220sclgczaqww0d2zdgr0lfpjwrrjyscjn2j40k8h4j1axah9zi"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -1559,12 +1559,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2021-05-20"; + version = "2021-05-22"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "5ace19a332efeb9a8a026c6647c30eff9cc4a42e"; - sha256 = "0bav74ax1841ar6g3m40vpm40n63z6rac0kx65838ls0b3yks2b8"; + rev = "01a175fb02be0097fbaea20af354e37b0586a5a3"; + sha256 = "03pxfiz2y5n8v1pych1g98k0kziajhwacx2agrr9c4wwf4rv467j"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -1607,24 +1607,24 @@ final: prev: fzf-lsp-nvim = buildVimPluginFrom2Nix { pname = "fzf-lsp-nvim"; - version = "2021-02-04"; + version = "2021-05-25"; src = fetchFromGitHub { owner = "gfanto"; repo = "fzf-lsp.nvim"; - rev = "1386cbae761415b9c7b45565d87283fb4d584aed"; - sha256 = "1ab4si6j6s6fimpr513mqbhc5nnlsqmazw26cl7r89lbq7jswhyv"; + rev = "fdbe8e8f447870c8693d81045031fc1d5812e38e"; + sha256 = "0rygh4dxrvz7cqsjvp7ymim24hv2czamb9jn1qbbaj33vn85403b"; }; meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/"; }; fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2021-05-09"; + version = "2021-05-25"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "a88311b222eb9f90fa9fa72292e61d15c6767866"; - sha256 = "1k0czvf81f8svbrsny8x57xy594pabi8yvgb3ixylx94fpb95ap3"; + rev = "e34f6c129d39b90db44df1107c8b7dfacfd18946"; + sha256 = "0rn0b48zxf46ak0a2dwbx4aas0fjiywhch0viffzhj5b61lvy218"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -1727,12 +1727,12 @@ final: prev: git-worktree-nvim = buildVimPluginFrom2Nix { pname = "git-worktree-nvim"; - version = "2021-05-13"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "git-worktree.nvim"; - rev = "77cb4e1ef26d4133ac0cdfd3d5563b1456b8bf81"; - sha256 = "1q4155rd3rs5qr8spm7lw4yavgpv67yqgy4615agmarh94syn4rx"; + rev = "b036b2f8a0f9cd973ab25292460e0c7b323616ef"; + sha256 = "1mn2pwcp482p7rrg0jk8i2g9pql58yqylzpp31308ssw32j8f9fj"; }; meta.homepage = "https://github.com/ThePrimeagen/git-worktree.nvim/"; }; @@ -1751,12 +1751,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-05-17"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "705d8376423bdf9aa3ef4f3237c25106ec4aa2e6"; - sha256 = "0fa1rw5zn0z6z106iy06wqnr0mksl3r7a3dl8fhwncmsil80dlg6"; + rev = "f4a4fbe04dd829317b7918367b061b54408049d5"; + sha256 = "15ma584q9s60nbi8nxg3cj10m3a1ly00y2xzxdnpy9ik4n04s911"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -1775,12 +1775,12 @@ final: prev: glow-nvim = buildVimPluginFrom2Nix { pname = "glow-nvim"; - version = "2021-05-06"; + version = "2021-05-26"; src = fetchFromGitHub { owner = "npxbr"; repo = "glow.nvim"; - rev = "7474d370ff5d9b4b62d8578c5c739f01b589767a"; - sha256 = "0kk5a3kskv3lb0143qdlshyd0phzivk7rdrh1234wdkcfw7llj8a"; + rev = "69bc59ab0bb1214234bbf06dbeb6233b21ff2fc5"; + sha256 = "0jqdalmaisj3gjlqa6kfh83va7a1gd7akggmr66vnccvfxfcdc54"; }; meta.homepage = "https://github.com/npxbr/glow.nvim/"; }; @@ -1845,6 +1845,18 @@ final: prev: meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; + gruvbox-flat-nvim = buildVimPluginFrom2Nix { + pname = "gruvbox-flat-nvim"; + version = "2021-05-28"; + src = fetchFromGitHub { + owner = "eddyekofo94"; + repo = "gruvbox-flat.nvim"; + rev = "521d9234d1c8c3a0e9dc782a8f2e5776483856b0"; + sha256 = "1k92z847ix3c7kwiyiw4x41z2sid2wyyjgv08myh93k0ivb5y4qh"; + }; + meta.homepage = "https://github.com/eddyekofo94/gruvbox-flat.nvim/"; + }; + gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox-nvim"; version = "2021-05-12"; @@ -1871,12 +1883,12 @@ final: prev: gv-vim = buildVimPluginFrom2Nix { pname = "gv-vim"; - version = "2020-10-16"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "junegunn"; repo = "gv.vim"; - rev = "486b5c4e960d5ec9e79888939534b7b2fc7453ad"; - sha256 = "07pj94s5kf8qgwdz73xbb7b2h3w6gkv4sw9faicdb6hla3i19d9b"; + rev = "5f902f4f7d06ef084ffd6cddcd1ee7d3c9a793c6"; + sha256 = "0am6sip4q14v2cvf9dmq6jkh37nhdhbvs466619qyd48qxcf9k9n"; }; meta.homepage = "https://github.com/junegunn/gv.vim/"; }; @@ -2328,12 +2340,12 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2021-05-21"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "dd16432f976086603ead281db36ff9d9dcf366fc"; - sha256 = "118kpi8ccpg89hp8sx932yy663jh04ml97474q8p01z5j1p4jw20"; + rev = "78bc54d4244854c399447bf9ebd0c8af5f455dc1"; + sha256 = "1wiyqf4h00lf029533byynh6ijz6a4y8al2061wfxp6690hbl488"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -2448,12 +2460,12 @@ final: prev: lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2021-05-17"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "d70d69b3418957cdf7c4993e484f8b9d3eb1603c"; - sha256 = "1kd9qna82az80ixrwxx5c7cvjqly7ahi8b1l74fp7iaxbr0p5m8w"; + rev = "d5cea5b04841aedd6e3e46c736f2724be03a43e9"; + sha256 = "0yixqn80dh0av0kshz0dw8gbd52096bgdg7gj74rir8hh48bsngx"; }; meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; @@ -2520,12 +2532,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature-nvim"; - version = "2021-05-17"; + version = "2021-05-24"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "eb08dfbce1b8623faff6bb9a2c5c7aa8ac710c80"; - sha256 = "0bhq25lv40832z80q1fvyqz6p6cxw47miffq6cxacd0hzahw4agx"; + rev = "1ebfa3e9c9168d7ee9201abdcc86c07a8f9b89db"; + sha256 = "17wqqhi9fslv3b7f79cx33bgvahx9mfl9f04vpm9417b0dc77359"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -2556,24 +2568,24 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine-nvim"; - version = "2021-05-20"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "hoob3rt"; repo = "lualine.nvim"; - rev = "0411f1c830812f071ab8d6b6251662de21d5322a"; - sha256 = "1p76xklayzfvi7bgj90sjcwfv2p708x59znkh6x7689ij0lcx1b5"; + rev = "9726824f1dcc8907632bc7c32f9882f26340f815"; + sha256 = "0gmbv0pbswkxjd4qw7dq66gp3fj594di0pgkb47yh3b46id8vkyj"; }; meta.homepage = "https://github.com/hoob3rt/lualine.nvim/"; }; lush-nvim = buildVimPluginFrom2Nix { pname = "lush-nvim"; - version = "2021-05-09"; + version = "2021-05-26"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "19b7cf9217abfc50c5ae9048d1cedd15e0349131"; - sha256 = "1gkng0nmis8xmfvywgv6gikjh4l0n5aqijhx0aqzi4k47pvp0cpi"; + rev = "b39af94cb4154a3f0887e94d0a4d5f4ae8f92656"; + sha256 = "015q2lkihhb8cgbxxc4f7d4w7sqc67wyaavjany3pj0528rrv97d"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -3000,12 +3012,12 @@ final: prev: neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2020-12-20"; + version = "2021-05-24"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "5e140db568eb2f7b88e4110cd4b651562e8878ab"; - sha256 = "0gvlpv7mfqrac10ccndl58axib42ack92m2simn78ksdap9g7n6n"; + rev = "df653c87bb04753755995579218c3b8bc1639383"; + sha256 = "1kn23xknakxx5r7n92cpzrvng0nh8gnf1kmr63d1gzsk6a3yh5aw"; }; meta.homepage = "https://github.com/neomake/neomake/"; }; @@ -3060,12 +3072,12 @@ final: prev: neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2020-12-01"; + version = "2021-05-26"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "1283da9f078669593f3828e4345b68b59ee9740f"; - sha256 = "1262bxgh6mcrm1w6w47hsngsaj2fn4dw8jwp433clxvzsf2myk38"; + rev = "cae4f19aeac40037039e914932da850443b7729f"; + sha256 = "0h3d36vj7sdx10f9gndplwkyqmjxq9frafyj9vmsjhj117nn8agh"; }; meta.homepage = "https://github.com/kassio/neoterm/"; }; @@ -3264,24 +3276,24 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-05-21"; + version = "2021-05-26"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "71d8397621d49adf28a38f362e9964a305196e92"; - sha256 = "1wsfjlnn7p6pcgw03l3balvr8gp0s7qy7syvkvc9cys5ksimp9yd"; + rev = "b5816204bd2f92f1c64dff132fbd67a1530c1751"; + sha256 = "1w0cw7pp7szqsgq734j4zv8c7jcjblpmfa6iw1r0bpi2jgplb5ha"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; nvim-base16 = buildVimPluginFrom2Nix { pname = "nvim-base16"; - version = "2021-05-19"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "08db07ed66d819f86f1e324ee245ccdd24ed378b"; - sha256 = "0vwwg9agx3j0phi6n4mjnvbwlzp4n1hb22pdhkjlyq6a89vlsjl4"; + rev = "4388bb114a9c153cbe8c5745f6c3cb92edc9bf4b"; + sha256 = "0ivgdl0biiz91g5s0riva77ybzp33driwm7p7fwl94czqgyjjqc4"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; @@ -3300,12 +3312,12 @@ final: prev: nvim-bufferline-lua = buildVimPluginFrom2Nix { pname = "nvim-bufferline-lua"; - version = "2021-05-18"; + version = "2021-05-26"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-bufferline.lua"; - rev = "1ac26a59bd6a2e76cda57a1cbdab75380ed22dbd"; - sha256 = "0f8kf513hd67vcq85lgcfvpvm1zba1xpdyhvndmd92c90sxjmw7k"; + rev = "026c12d7e4f85c570acf8be4c69c282acbe18953"; + sha256 = "0l4y15rzhjjgqkdryj399xgnmz1c3ga8li9j8m4qf98isbmqhsws"; }; meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/"; }; @@ -3336,12 +3348,12 @@ final: prev: nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-05-18"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "5001cd7632b50b65f04d59af85a9dd199ea73b3a"; - sha256 = "0zb6ckn02kd8i0pd6ds0zl369mrr3p9wf0abyba5pgyzl9k4vp42"; + rev = "c7cd3bf1380ce3c6ef2a55537ace40c3a3897c50"; + sha256 = "0pqka3wi169l8d58hlixhyi9yng62p1ic6fnl2vgbydi72xd1ngd"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -3372,12 +3384,12 @@ final: prev: nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2021-05-21"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "cf7a6bb4e7c93ef60a18097bd24a6db2baea7306"; - sha256 = "0mv7230xpcicaypmlfjsyhzwb6mp8vyp0sdzis5z2ixvm7rmh70a"; + rev = "bb291ba853759f455e421892a955d67cc8e88173"; + sha256 = "0wlfh0mgdhlnvwl7m7bdzj7kks9f5hnm2k3awnyl8a14rjl00i0i"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -3396,12 +3408,12 @@ final: prev: nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2021-05-15"; + version = "2021-05-24"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "c2fd4d042c94d4246e583d7d0231365790fdafac"; - sha256 = "1kkq8l2c9142vbr2lbs1gc95np8mfaxyldzkaabydh99bh4z72v2"; + rev = "9a6e8268878352b9ea3087ab745b894531e5e335"; + sha256 = "1mbjsab96r99hzjh78dsk7cwmn59mgzkr0y6mm6i81g0zz9d9cya"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; @@ -3420,12 +3432,12 @@ final: prev: nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2021-05-18"; + version = "2021-05-26"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "6ca5fc6cd9fab32039a73bba4f14d33d47e87953"; - sha256 = "1fm979m1g24pk9lx34wvdm4awvr08plhxb13c55j5fq24wf00y8h"; + rev = "1ec700d81aae9369ee16b5dfb421153377c4bdee"; + sha256 = "08vi23gaccm0whswg8jsb5pvbcdci51w61m7x079yfarablz1h6c"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -3444,12 +3456,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2021-05-21"; + version = "2021-05-25"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "36baba2afb7fcba25fa5c2d12421e3159e0154c1"; - sha256 = "19j6ss1z07i0669gm4rhyybxv3a225yv1yknc4c4gjls5zyzx2wn"; + rev = "f39758c426c9409ff35ef730b324bc8cd267a5ef"; + sha256 = "11md1s3yqyzr4w5ii6d2dqh9njjc6sglpfgh18mgnx8y6fk23r58"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -3468,24 +3480,24 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-05-21"; + version = "2021-05-25"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "2f26391ccf88cd4adff8f11e96412a3536624bd7"; - sha256 = "0y8r879lcpwjnk9rcrafkdh59gcxzpvid0rm80db22vpp6a9l9rq"; + rev = "6a25eb0d3fc77cd1b9ff11446dc52d50bc482155"; + sha256 = "0chb6d3v2n5wka4fgw49rzxqd1vwl7mwwb5z13hvylxbad098n1l"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; nvim-lsputils = buildVimPluginFrom2Nix { pname = "nvim-lsputils"; - version = "2021-02-05"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "RishabhRD"; repo = "nvim-lsputils"; - rev = "b68862afee6dfb611d866818cafdba41cf51d749"; - sha256 = "0w4kff5jrg6i55nqjnp52vb2jng4zql9s2r1jz75jfv2khdrw7dm"; + rev = "f34927f8ec777f4e91e14afc709de9da1cd70116"; + sha256 = "1s1pvddgkdslh3r9p08r3xjdpi93d15i4k1jssh8apxzm37gw7lm"; }; meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/"; }; @@ -3540,60 +3552,60 @@ final: prev: nvim-toggleterm-lua = buildVimPluginFrom2Nix { pname = "nvim-toggleterm-lua"; - version = "2021-05-19"; + version = "2021-05-26"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-toggleterm.lua"; - rev = "8c4da4a877a0eb49d40fed30c4a928f011d242de"; - sha256 = "0604gdsbnwfdrqra1ch14h8x880j31jfrajydfnfqiqy9dxvsab8"; + rev = "9215c1955c30b08779bcf1043964a49a9aaf0da8"; + sha256 = "1w1bxinkn1walx4svjcjwci2h6vwn2jyiyrykvzcr55gnm5dr5kd"; }; meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/"; }; nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree-lua"; - version = "2021-05-21"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "d6ab59fd5acb7c71b1a10ace5a522a720460ad6e"; - sha256 = "1vdg2kbmgshvz36j1x2ld92rmlqqdwbj4ji45kk90qvg2zjpq0cv"; + rev = "23935ff0036e26dbfe14e6aee96a7653ee704336"; + sha256 = "07pvxjijp1k932i1pzw0szd5dqxrh2g4br70z0h149252hya4fkf"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-05-22"; + version = "2021-05-26"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "9d1d9b1b9438f8c5b2d4c48fe040160b0ac6b316"; - sha256 = "1slhsnkza7wrm0vybfx98r7767hjlzlymy66hh6py27a8bazr5aj"; + rev = "6c2ff319b311fed0160875b878811431399889cf"; + sha256 = "0vl782k8p5l2gm3y247a70ksrdn863gsv1z47frfnpq30ayxz0mx"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2021-05-13"; + version = "2021-05-25"; src = fetchFromGitHub { owner = "romgrk"; repo = "nvim-treesitter-context"; - rev = "b497f282b3db3d3e8641d724c49aedff0d83924c"; - sha256 = "0n5mdni9pvxg1cj1ri0nch4wk28kx0sy0k2vcw7c8d0pw5hfadqb"; + rev = "af10a3251f3e826c3fb2062ddeb4c74f23a2f52d"; + sha256 = "1pl1v28wscdcns4cs2cv44rh0vrk8fwmr2banjgp5lcjynivzrwr"; }; meta.homepage = "https://github.com/romgrk/nvim-treesitter-context/"; }; nvim-treesitter-pyfold = buildVimPluginFrom2Nix { pname = "nvim-treesitter-pyfold"; - version = "2021-05-20"; + version = "2021-05-22"; src = fetchFromGitHub { owner = "eddiebergman"; repo = "nvim-treesitter-pyfold"; - rev = "9a50e33acf6b6e711e6d5cc82456adb6f9b9dc3d"; - sha256 = "0mbd5bp2c6kxn9dmc3vn3ia0silc7kb8mwwcm3q78n866ab4vpcc"; + rev = "01185457e9c0a118d5807998de624179bc605a2a"; + sha256 = "13dhix449mvbfsmg8j1554nv6i7gdr8d6143gdy3ihp8sx66bg6k"; }; meta.homepage = "https://github.com/eddiebergman/nvim-treesitter-pyfold/"; }; @@ -3624,12 +3636,12 @@ final: prev: nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2021-05-20"; + version = "2021-05-26"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "0d9648af426bdfc60b1387683b43b1aca1f7c950"; - sha256 = "02g0ryianwdsmfcfai73nc4l25jw5kz0zwbfhvwmcg2px6z5aif2"; + rev = "de234084fb82ff40ac593410409c77a542456415"; + sha256 = "1nw53jxdll34xml9064cl65p33cnv2pg9bbg4697wqdhs7rm4z27"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -3720,12 +3732,12 @@ final: prev: onedark-vim = buildVimPluginFrom2Nix { pname = "onedark-vim"; - version = "2021-05-06"; + version = "2021-05-24"; src = fetchFromGitHub { owner = "joshdick"; repo = "onedark.vim"; - rev = "bb949122420fd4ae7b29fdc467cf3a9c39d48882"; - sha256 = "1rrx97j4n1qmqfpc1shh00vw01ivhik70s50rdk9hsc7lmxnwxxh"; + rev = "ff7b30ebd2faed7bf2de599ec9f340cffb29a4a4"; + sha256 = "0irzprhgx5l6il45zw0ivg6fp38h73cd9x10mkn74jxa0djghp76"; }; meta.homepage = "https://github.com/joshdick/onedark.vim/"; }; @@ -3768,12 +3780,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer-nvim"; - version = "2021-05-20"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "b46aa481b9ab8ad9a152bda19b7f0cb3ffb0a85f"; - sha256 = "0czmv9gwv7xhmcc5dqi47dpgshavbxgqfg58dhrd10xnif7ci12s"; + rev = "a41f6abb3fd0479aab1957c7891531b933154a5f"; + sha256 = "0khylm6w46gs8j4czvfbgdbh5gdidvlgv4hm2vjglv2dblzm2vdn"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -3816,12 +3828,12 @@ final: prev: pears-nvim = buildVimPluginFrom2Nix { pname = "pears-nvim"; - version = "2021-05-21"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "steelsojka"; repo = "pears.nvim"; - rev = "658f9e25f46005aa0e12de81abbfadefaad56e39"; - sha256 = "11v92n6qpy7ryhyg6yqq4b48mskzm6ypc9vgfpr2l5irppai1x1r"; + rev = "14e6c47c74768b74190a529e41911ae838c45254"; + sha256 = "04kg7g6v6k6jv2pmapaqvkvf6py1i211l822m3lsvf26jcyfs3ag"; }; meta.homepage = "https://github.com/steelsojka/pears.nvim/"; }; @@ -4105,12 +4117,12 @@ final: prev: registers-nvim = buildVimPluginFrom2Nix { pname = "registers-nvim"; - version = "2021-05-22"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "c0b02c5d0884dcfdd1a4665a1eb55468f4e398d3"; - sha256 = "1z7pd77gi313asy5d2qvv8nc76rrf2zi18w6gwavygvfkpn3hf65"; + rev = "016d969788bf01dae310570868c4d1e04ab42e31"; + sha256 = "1sifwa97laaijssqnn6b691zckkybaprpschvm983k5awcswy4jd"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -4345,12 +4357,12 @@ final: prev: sideways-vim = buildVimPluginFrom2Nix { pname = "sideways-vim"; - version = "2021-05-17"; + version = "2021-05-24"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "8097848380b5aedb487bc20879bcb2ab3220a8bc"; - sha256 = "1cl25p3cpb5k36vpk11cr092i1hkhbd781xbfawvr42jfkx2170p"; + rev = "9ce855ab448467dc1468ef8b46bb86d38aa3d0fa"; + sha256 = "0ldz09hjck5pq0lhbk93gm1zvc0aifsfk75w5pzrwqmwidimzyid"; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; }; @@ -4550,24 +4562,24 @@ final: prev: srcery-vim = buildVimPluginFrom2Nix { pname = "srcery-vim"; - version = "2021-04-14"; + version = "2021-05-25"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "9c692e3f17b3485969b55d76a708136e2ccaa5de"; - sha256 = "1cd4vxx0zb4xcn2yp7kl5xgl8crfr0fwifn4apkn878lqx6ni7gj"; + rev = "44eadc74ff42ced89e85300d69f8297ffe11589e"; + sha256 = "1k090cy50z6rsh26z6bqw81h60jl7pnjjdfkv8wmzncy7zna86bs"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; stan-vim = buildVimPluginFrom2Nix { pname = "stan-vim"; - version = "2020-08-05"; + version = "2021-05-26"; src = fetchFromGitHub { owner = "eigenfoo"; repo = "stan-vim"; - rev = "9d3b6ec149f9559bd9bd021dfa827c29c5d1dc38"; - sha256 = "0qv748m1vrp1qcl41y7fj2jm8cac9b01ljq6ydq3z4syxdf7yzcc"; + rev = "0216d8eb8fba6c25a960fe940ca419e570789314"; + sha256 = "0xmkpnrn97y7fny90d57zrklyyhmh7q4ppp1dqdb9q74vikhsch5"; }; meta.homepage = "https://github.com/eigenfoo/stan-vim/"; }; @@ -4694,12 +4706,12 @@ final: prev: tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2021-05-17"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "fd4bc0f0e4e3a3bb09d48e7176e992b0613a4c68"; - sha256 = "0p3cd9qywx5xgas7mvn0a7qvsnmmpf8gpn8yix8r3vyhcg7ah5y6"; + rev = "225e6530c2b083e37744b23bac74ae40d7639d68"; + sha256 = "0qgks9li8zp7lvagq2wzhr4ahzzalgjzps4l9laj5rq3klmc270v"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -4827,24 +4839,24 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-05-16"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "69eb5eacff421e05aeb1e02ff97ef64bfd955c53"; - sha256 = "1yn5hzv57lld6zpxd7cqnjhj3qb5l9ngnnrb9kfp6c6gy137wlj8"; + rev = "904f84942384f988271cd40cc4b195263fe0763a"; + sha256 = "1dgzp5n6kaphhdm87k5vdbq3srj5dcp1rhnzd72d7n16x0xnki8h"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; tender-vim = buildVimPluginFrom2Nix { pname = "tender-vim"; - version = "2020-06-29"; + version = "2021-05-24"; src = fetchFromGitHub { owner = "jacoborus"; repo = "tender.vim"; - rev = "25924cb8b29a5158e56fb896a2540c70691c7a28"; - sha256 = "0mm5h5jhb6y0f1zsfhq0frvdm6s93skshi66rfrpn82l93zigw4c"; + rev = "7746453a045eaa97dc413a7209268345f33f3243"; + sha256 = "0yxgcnx5x82ak74nz3pvkd1z8i3c7lcl068lh5izdpx65fk7m5yh"; }; meta.homepage = "https://github.com/jacoborus/tender.vim/"; }; @@ -4923,12 +4935,12 @@ final: prev: todo-comments-nvim = buildVimPluginFrom2Nix { pname = "todo-comments-nvim"; - version = "2021-05-18"; + version = "2021-05-26"; src = fetchFromGitHub { owner = "folke"; repo = "todo-comments.nvim"; - rev = "219bc7ef4439b6fa53bc9db1dd14b11221e83d7d"; - sha256 = "0s2gspk994d6wg09c2042v37l8v2sd6lms9zi1nidf5fw61pz4y6"; + rev = "8560546c466d1f555573d37e062e95e7ae94bbab"; + sha256 = "1g0ypjdcj7sp433n933n3qazp7301b2q7p968v57mgmlh5saq6kb"; }; meta.homepage = "https://github.com/folke/todo-comments.nvim/"; }; @@ -4984,12 +4996,12 @@ final: prev: trouble-nvim = buildVimPluginFrom2Nix { pname = "trouble-nvim"; - version = "2021-05-15"; + version = "2021-05-26"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "4375f1f0b2457fcbb91d32de457e6e3b3bb7eba7"; - sha256 = "1szn4fklxm23nbi30arx6qqf96v0s1v0q11vqx886y9a6c2i325m"; + rev = "cf87622d661190157dfa7e28a19ee87bb205219b"; + sha256 = "082sd2x6v8ybyy1pa5jm2mm386c1mn23h9p3nd7fmip2cw9snhd0"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -5056,12 +5068,12 @@ final: prev: unicode-vim = buildVimPluginFrom2Nix { pname = "unicode-vim"; - version = "2021-04-22"; + version = "2021-05-24"; src = fetchFromGitHub { owner = "chrisbra"; repo = "unicode.vim"; - rev = "090e77e30e46aceafd53a3219fb2a81b79927d8d"; - sha256 = "136a8c4d4nrzvab2qa6sxc81x1mwg56nn8ajxikqgyvsr9fp1f9i"; + rev = "62f7a3558ee4402bcaaae8638e768268f1137a0f"; + sha256 = "1y5inpiaqvnq69n1dbpiwilqfq2hf56m7w5a6kj2fkav15pyczx7"; }; meta.homepage = "https://github.com/chrisbra/unicode.vim/"; }; @@ -5380,12 +5392,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2021-05-21"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "4a64fbfc4bdb2cf91b2b50ca3f41b852061d614e"; - sha256 = "1w2hb1dcmc7z3snj6xhqi993g9njf3l6dwdzr9m4jg669n8064ss"; + rev = "a8b3c254d0e5c43be24298ce16cd01f740fe8d42"; + sha256 = "1rbdmwah7zxjah5c3rx71h1d6skda0y6pyz7ysasyjj1dnb2kcsi"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -5416,12 +5428,12 @@ final: prev: vim-android = buildVimPluginFrom2Nix { pname = "vim-android"; - version = "2021-04-12"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "hsanson"; repo = "vim-android"; - rev = "a3158ec78e63e4858af2704d7a8127728639981e"; - sha256 = "0rpmsf3ykg6q848f0ahp7qrr33pfp1zzxkpc32w3najyqwsfmz6a"; + rev = "ae364eb950f6409de820ceb94619a51b724433dc"; + sha256 = "1b8h4qyvsmap8c2arvp2v1cjax5mskkn382s44ppr0s2dwhcg02b"; }; meta.homepage = "https://github.com/hsanson/vim-android/"; }; @@ -5476,12 +5488,12 @@ final: prev: vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2021-05-07"; + version = "2021-05-24"; src = fetchFromGitHub { owner = "vim-autoformat"; repo = "vim-autoformat"; - rev = "58bbc3c8751ba48d1c0ecba040ce43699272d800"; - sha256 = "0ylb8jljin1g5big1lfjrfww576fcb1wakz5shial8xgpw9w1hx1"; + rev = "728d42f93054e15d260e25da0255378f171df7d2"; + sha256 = "1r86100i30jqyxz1hc4z6ykx5s44iaapffs1xbv3pg8grz8fmf6x"; }; meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/"; }; @@ -5656,12 +5668,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-05-21"; + version = "2021-05-24"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "1c970361e49e974f93ef606ffd504b8e0c52f9fd"; - sha256 = "1nkqyk7q8lzgm8y4y62mm57s6hyvwfp7ia5p2vbfvls09z8qymk3"; + rev = "ff32ca1e08d3c934aadf21106b1ee623e5544912"; + sha256 = "0gkbav7icvcy411yaiav8vc4g1q6yk5gixbcwlaxib5c70zmvxlh"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -5781,7 +5793,7 @@ final: prev: owner = "flazz"; repo = "vim-colorschemes"; rev = "fd8f122cef604330c96a6a6e434682dbdfb878c9"; - sha256 = "1cg8q7w0vgl73aw1b9zz0zh5vw5d2pm8pm54fhfzva4azg56f416"; + sha256 = "0kpsf6j20fgblc8vhqn7ymr52v2d1h52vc7rbxmxfwdm80nvv3g5"; }; meta.homepage = "https://github.com/flazz/vim-colorschemes/"; }; @@ -6352,12 +6364,12 @@ final: prev: vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2021-04-29"; + version = "2021-05-26"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "1c63ac05e6bfe99cddcbf39dcdf84ff4660696e0"; - sha256 = "1yryf2dnkhphivnm1miakya8jq37iszgl97mjjar35819vrz7hab"; + rev = "808cb148d552d0369b0d2b74492086b1bfdbd22a"; + sha256 = "0mv56lb18zcjp18jfr9a8262bjsnsjsgirw8a2md8df60gd5jn5n"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -6412,12 +6424,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-05-18"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "c926aadfaf2cff0c684d305c8ff1a59378e7d7f5"; - sha256 = "00w1vdjq7hlgdq25ylxp13zdjnlf7lcl9sa4qjar8883z15z2yif"; + rev = "6ae064c5aa1cc24c78abc8d12ec236e99dc01316"; + sha256 = "017dm18dazg3svqyir1pncvnhczxcsnjdq85aypsrggf1mhd9m1a"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -6460,12 +6472,12 @@ final: prev: vim-git = buildVimPluginFrom2Nix { pname = "vim-git"; - version = "2021-05-06"; + version = "2021-05-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-git"; - rev = "0fe3f4eb4c4477d3dd09b155e20d128d99b1da3f"; - sha256 = "0viys51afhflfz3zjg769v7zxz422a3jra079ld94mn3kqan8lra"; + rev = "314fa6f289cec56d7d6e631f71b6d987832f0af4"; + sha256 = "0ar095jxrnfcfbg5gzwb82mz93hpwsdsclzam80424m0iapgl4li"; }; meta.homepage = "https://github.com/tpope/vim-git/"; }; @@ -6484,12 +6496,12 @@ final: prev: vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2021-04-22"; + version = "2021-05-24"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "f4bdaa4e9cf07f62ce1161a3d0ff70c8aad25bc5"; - sha256 = "0h00i0b8p0mnynp7hhj2vpgj9rhqmlx14y2kcskvac8i2wlyj30c"; + rev = "10998f303cd85405e51380f6dc406dd756c105e8"; + sha256 = "0520sqya9i2ry5yfryqi1q7h6yg2vgqw1qa042f1b2r8ddgvxibk"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -6532,12 +6544,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2021-05-21"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "92328dcface63223fc7b0a1a61377e4dcf942582"; - sha256 = "1fqhif14whq8rpadx8wqmbba1rb2vwaxld2s5p87kf9kn9g12yiw"; + rev = "696c4a4ef79fc1fb8f090353cf404df95614ce46"; + sha256 = "1z811b62f5pafv3zmqjjcvmphikml8hzspdb7nvkyrr561awzwab"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -6953,12 +6965,12 @@ final: prev: vim-javascript = buildVimPluginFrom2Nix { pname = "vim-javascript"; - version = "2021-05-20"; + version = "2021-05-23"; src = fetchFromGitHub { owner = "pangloss"; repo = "vim-javascript"; - rev = "3dc959f098029fafcb9add91397cfb65184cf066"; - sha256 = "0w4yw7d0rbbscvxxglw2kqbmnl4fi3p77053l1r45jyy6p442ybr"; + rev = "f8345cdb6734aefa5c0f9cb128c9efd005410a43"; + sha256 = "0s8bsfsjzc2djy2gvvf44g5ypsr7r3ax436xn0qpvhr58aa5m4dv"; }; meta.homepage = "https://github.com/pangloss/vim-javascript/"; }; @@ -7519,12 +7531,12 @@ final: prev: vim-ninja-feet = buildVimPluginFrom2Nix { pname = "vim-ninja-feet"; - version = "2019-05-12"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "tommcdo"; repo = "vim-ninja-feet"; - rev = "5b48f97bf4865a25f5f4568c45cdfd08f946ec4f"; - sha256 = "1i3n5nlwyg65k0f0qrimbfs67l2xx39cqp4gyrycw4vzp6hs0lsc"; + rev = "cb9b448dd468a338255aed474e6113ed115612c1"; + sha256 = "1aqmhqaxb72ih56mh85kv4fkxyqw5hfispd208lfyp4w3zhvli30"; }; meta.homepage = "https://github.com/tommcdo/vim-ninja-feet/"; }; @@ -8071,12 +8083,12 @@ final: prev: vim-rails = buildVimPluginFrom2Nix { pname = "vim-rails"; - version = "2021-05-07"; + version = "2021-05-25"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rails"; - rev = "e2c72b5cfb6a4e07e70806198c1ff491a6077fa8"; - sha256 = "1iyc8wjbr1iwch1vjzlw1x7q0vg7bnr4zwbga2rzw6lm0f8y4gkw"; + rev = "d556429fad4bf24d431be9f75322fd0d1a82bae2"; + sha256 = "0k1ffyy145nhmr9ad56vc10yy3jliyj8aahs0pm30fgi9q7qz7iy"; }; meta.homepage = "https://github.com/tpope/vim-rails/"; }; @@ -8636,12 +8648,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2021-05-18"; + version = "2021-05-24"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "0671670b1ee4bdc7552aba2972800bec66fffbe7"; - sha256 = "067sgc4qmplb3b1ddjwqzgfn4fvb7zgic330sygnbm6nq3nr0n92"; + rev = "4eb72005f87ff1bf3bc7e523b176bd6b391f6e24"; + sha256 = "1m42skcd6mn6gp5a6wrjg9zxsbdqa1qbg4d998js5chiwv2ajq4k"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -8862,6 +8874,18 @@ final: prev: meta.homepage = "https://github.com/sodapopcan/vim-twiggy/"; }; + vim-ultest = buildVimPluginFrom2Nix { + pname = "vim-ultest"; + version = "2021-05-27"; + src = fetchFromGitHub { + owner = "rcarriga"; + repo = "vim-ultest"; + rev = "2de66cbec0694da8f29a99e5c3167c7b9c4a7aff"; + sha256 = "0zxici08m9mk8ia1vr4pm0lgw2fg7p1v1dny89nd0x1r1xfwy4w2"; + }; + meta.homepage = "https://github.com/rcarriga/vim-ultest/"; + }; + vim-unimpaired = buildVimPluginFrom2Nix { pname = "vim-unimpaired"; version = "2020-04-26"; @@ -8912,12 +8936,12 @@ final: prev: vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2021-05-13"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "17fed1b0471e224c59b9ae1b8a3cbeea570dd14b"; - sha256 = "13ffj8jmbazw6s35ddwwfmbg33wqqpc823i45m0b4q9h4ybjn4ry"; + rev = "8041a909fc3f740e9d110dd2e95980ff4645785b"; + sha256 = "17zf839g8sr3i9amwvxx008m89m9hz3f34pbc90mpl5ksy4isdqv"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -9260,12 +9284,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-05-20"; + version = "2021-05-25"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "99c0c4f763314851b9dd550750cedc793859f7d7"; - sha256 = "1im3d5m9jplyy8jaxd35x31rdp8fswh3av4js2abs5n1x0scg7ya"; + rev = "a51b8b23c9b7e12c2899e423037458d46dbe196e"; + sha256 = "0w49lgmg880pzblwwkkrp24pyvd8dkjbqvsx9m6n3x5n4zmz1c1f"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -9273,24 +9297,24 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-05-21"; + version = "2021-05-25"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "dfec6def2d992f64411c2b4914f541b1d31f3737"; - sha256 = "0zg0fqnyph5pblramjsj7lpg0v7m09mphpi7qczqdak8mr61cwhm"; + rev = "8d3cbfff3d44e8af93948d3c7785130f54bc2386"; + sha256 = "0gwj70fxbpmwnrd78ralqq2nzk8gwqv6bd267kf64z9rxkwdhrs0"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; vimux = buildVimPluginFrom2Nix { pname = "vimux"; - version = "2021-04-29"; + version = "2021-05-25"; src = fetchFromGitHub { owner = "preservim"; repo = "vimux"; - rev = "ee0dfae33062419f2c9ef6a202b3ce415adf6e6a"; - sha256 = "079pfs0hp9x2j9c7va78fjw7afp13yirgw9ajsd98lvkzrj5sflc"; + rev = "a1650d5f9bc2d617bb546bb8014a206e41089dc8"; + sha256 = "0gdhhkpcq654c7jv5ycnss3fra2mysz3zl64n46cq17vmwczbcrh"; }; meta.homepage = "https://github.com/preservim/vimux/"; }; @@ -9369,12 +9393,12 @@ final: prev: which-key-nvim = buildVimPluginFrom2Nix { pname = "which-key-nvim"; - version = "2021-05-20"; + version = "2021-05-26"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "20a85bd8bc54a11cf040aafa5d60f8a735eecfbd"; - sha256 = "03c2xwi6ids3na904f3j8x3xca73kzg9wbv5wl79vzqpvz29waw4"; + rev = "db851981595fc360e9b6196a7c3995611aceac3b"; + sha256 = "0y3mq6vrpmpxa8f42cxxf1209ardb3qraf44vgxwdaqqgphm7zk9"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; @@ -9490,12 +9514,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2021-05-18"; + version = "2021-05-25"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "ab73ca25467625ea71f1ee9103fca55cc10ba27a"; - sha256 = "0znj2djajmb7jcsnbpqrigvnb9dbcx1d390cn198b2zfd27kbkby"; + rev = "4df6f35f0c9f9aec21a3f567397496b5dee6acc7"; + sha256 = "1ywdxm9sy57k9wp9gkcahhsy8r75ahxsgb7xcdjpzacg4iranj99"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 8184ee35aad..85ee704b056 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -107,6 +107,7 @@ eagletmt/ghcmod-vim eagletmt/neco-ghc easymotion/vim-easymotion eddiebergman/nvim-treesitter-pyfold +eddyekofo94/gruvbox-flat.nvim editorconfig/editorconfig-vim edluffy/hologram.nvim@main edluffy/specs.nvim@main @@ -531,6 +532,7 @@ ray-x/lsp_signature.nvim rbgrouleff/bclose.vim rbong/vim-flog rcarriga/nvim-dap-ui +rcarriga/vim-ultest rhysd/committia.vim rhysd/conflict-marker.vim rhysd/devdocs.vim diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 6f61a94ca14..09365d18869 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -36,6 +36,18 @@ let }; }; + alefragnani.project-manager = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "project-manager"; + publisher = "alefragnani"; + version = "12.1.0"; + sha256 = "sha256-fYBKmWn9pJh2V0fGdqVrXj9zIl8oTrZcBycDaMOXL/8="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + alexdima.copy-relative-path = buildVscodeMarketplaceExtension { mktplcRef = { name = "copy-relative-path"; @@ -87,6 +99,18 @@ let }; }; + B4dM4n.vscode-nixpkgs-fmt = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "nixpkgs-fmt"; + publisher = "B4dM4n"; + version = "0.0.1"; + sha256 = "sha256-vz2kU36B1xkLci2QwLpl/SBEhfSWltIDJ1r7SorHcr8="; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + baccata.scaladex-search = buildVscodeMarketplaceExtension { mktplcRef = { name = "scaladex-search"; @@ -111,6 +135,18 @@ let }; }; + bradlc.vscode-tailwindcss = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-tailwindcss"; + publisher = "bradlc"; + version = "0.6.6"; + sha256 = "sha256-CRd+caKHFOXBnePr/LqNkzw0kRGYvNSkf4ecNgedpdA="; + }; + meta = with lib; { + license = licenses.mpl20; + }; + }; + brettm12345.nixfmt-vscode = buildVscodeMarketplaceExtension { mktplcRef = { name = "nixfmt-vscode"; @@ -516,7 +552,7 @@ let }; }; - hashicorp.terraform = callPackage ./terraform {}; + hashicorp.terraform = callPackage ./terraform { }; hookyqr.beautify = buildVscodeMarketplaceExtension { mktplcRef = { @@ -698,15 +734,16 @@ let }; }; - ms-vscode.cpptools = callPackage ./cpptools {}; + ms-vscode.cpptools = callPackage ./cpptools { }; - ms-vscode-remote.remote-ssh = callPackage ./remote-ssh {}; + ms-vscode-remote.remote-ssh = callPackage ./remote-ssh { }; - ms-python.python = let - raw-package = callPackage ./python { - extractNuGet = callPackage ./python/extract-nuget.nix { }; - }; - in + ms-python.python = + let + raw-package = callPackage ./python { + extractNuGet = callPackage ./python/extract-nuget.nix { }; + }; + in buildEnv { name = "vscode-extension-ms-python-python-full"; paths = [ raw-package self.ms-toolsai.jupyter ]; @@ -786,7 +823,7 @@ let }; }; - matklad.rust-analyzer = callPackage ./rust-analyzer {}; + matklad.rust-analyzer = callPackage ./rust-analyzer { }; ocamllabs.ocaml-platform = buildVscodeMarketplaceExtension { meta = with lib; { @@ -955,6 +992,18 @@ let }; }; + svelte.svelte-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "svelte-vscode"; + publisher = "svelte"; + version = "105.0.0"; + sha256 = "sha256-my3RzwUW5MnajAbEnqxtrIR701XH+AKYLbnKD7ivASE="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + tamasfe.even-better-toml = buildVscodeMarketplaceExtension { mktplcRef = { name = "even-better-toml"; @@ -1029,7 +1078,7 @@ let }; }; - ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare-vsliveshare {}; + ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare-vsliveshare { }; vscodevim.vim = buildVscodeMarketplaceExtension { mktplcRef = { @@ -1094,7 +1143,7 @@ let llvm-org.lldb-vscode = llvmPackages_8.lldb; - WakaTime.vscode-wakatime = callPackage ./wakatime {}; + WakaTime.vscode-wakatime = callPackage ./wakatime { }; wholroyd.jinja = buildVscodeMarketplaceExtension { mktplcRef = { @@ -1109,17 +1158,17 @@ let }; }; - aliases = self: super: { - # aliases - ms-vscode = lib.recursiveUpdate super.ms-vscode { inherit (super.golang) Go; }; - }; + aliases = self: super: { + # aliases + ms-vscode = lib.recursiveUpdate super.ms-vscode { inherit (super.golang) Go; }; + }; - # TODO: add overrides overlay, so that we can have a generated.nix - # then apply extension specific modifcations to packages. + # TODO: add overrides overlay, so that we can have a generated.nix + # then apply extension specific modifcations to packages. - # overlays will be applied left to right, overrides should come after aliases. - overlays = lib.optionals (config.allowAliases or true) [ aliases ]; + # overlays will be applied left to right, overrides should come after aliases. + overlays = lib.optionals (config.allowAliases or true) [ aliases ]; - toFix = lib.foldl' (lib.flip lib.extends) baseExtensions overlays; + toFix = lib.foldl' (lib.flip lib.extends) baseExtensions overlays; in - lib.fix toFix +lib.fix toFix diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 6db953ae4ef..e41ae3bece2 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -206,9 +206,9 @@ in { kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.13"; # this package should point to a version / git revision compatible with the latest kernel release - version = "2.1.0-rc5"; + version = "2.1.0-rc6"; - sha256 = "sha256-cj0P2bw6sTO+Y74pYn/WEpBuVGMMYCreJQjUdC3DMTE="; + sha256 = "0q3vl9rid6a84pb85v38hnf17vws65jjb4slw8bhm8dq8fna2a86"; isUnstable = true; }; diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix index 7bd09569248..58335c79fe9 100644 --- a/pkgs/servers/gotty/default.nix +++ b/pkgs/servers/gotty/default.nix @@ -1,23 +1,29 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: -buildGoPackage rec { +buildGoModule rec { pname = "gotty"; - version = "2.0.0-alpha.3"; - rev = "v${version}"; - - goPackagePath = "github.com/yudai/gotty"; + version = "1.2.0"; src = fetchFromGitHub { - inherit rev; - owner = "yudai"; + owner = "sorenisanerd"; repo = "gotty"; - sha256 = "1vhhs7d4k1vpkf2k69ai2r3bp3zwnwa8l9q7vza0rck69g4nmz7a"; + rev = "v${version}"; + sha256 = "06ngxnblwkmiln9bxikg9q2wdlh45481pnz87bpsw2r7hc69bv9n"; }; + vendorSha256 = "0mzf5209r3fzqf9q98j3b2cdzvfa3kg62xn0spx5zr6nabmhaa79"; + + # upstream did not update the tests, so they are broken now + # https://github.com/sorenisanerd/gotty/issues/13 + doCheck = false; + meta = with lib; { description = "Share your terminal as a web application"; - homepage = "https://github.com/yudai/gotty"; - maintainers = with maintainers; [ ]; + homepage = "https://github.com/sorenisanerd/gotty"; + maintainers = with maintainers; [ prusnak ]; license = licenses.mit; }; } diff --git a/pkgs/servers/heisenbridge/default.nix b/pkgs/servers/heisenbridge/default.nix index b308e96cbec..2d98f377b3b 100644 --- a/pkgs/servers/heisenbridge/default.nix +++ b/pkgs/servers/heisenbridge/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonPackage rec { pname = "heisenbridge"; - version = "unstable-2021-05-23"; + version = "unstable-2021-05-29"; src = fetchFromGitHub { owner = "hifi"; repo = "heisenbridge"; - rev = "1f8df49b7e89aaeb2cbb5fee68bd29cf3eda079a"; - sha256 = "sha256-ta6n9hXRdIjfxsLy9jrzZkz6TS50/TYpFOb/BLrRWK4="; + rev = "980755226b0cb46ad9c7f40e0e940f354212a8b7"; + sha256 = "sha256-jO1Dqtv3IbV4FLI3C82pxssgrCf43hAEcPLYszX2GNI="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 0e952c444de..98e0781186b 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -331,7 +331,7 @@ "group" = ps: with ps; [ ]; "growatt_server" = ps: with ps; [ ]; # missing inputs: growattServer "gstreamer" = ps: with ps; [ ]; # missing inputs: gstreamer-player - "gtfs" = ps: with ps; [ ]; # missing inputs: pygtfs + "gtfs" = ps: with ps; [ pygtfs ]; "guardian" = ps: with ps; [ aioguardian ]; "habitica" = ps: with ps; [ ]; # missing inputs: habitipy "hangouts" = ps: with ps; [ ]; # missing inputs: hangups diff --git a/pkgs/servers/monitoring/icinga2/default.nix b/pkgs/servers/monitoring/icinga2/default.nix index e3ea1a80251..44c512196c6 100644 --- a/pkgs/servers/monitoring/icinga2/default.nix +++ b/pkgs/servers/monitoring/icinga2/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "icinga2${nameSuffix}"; - version = "2.12.3"; + version = "2.12.4"; src = fetchFromGitHub { owner = "icinga"; repo = "icinga2"; rev = "v${version}"; - sha256 = "0pq6ixv7d9bqys8qjxqq0jki3zncj8jdfavkp7qw125iyfjq48xk"; + sha256 = "sha256-SJBOZzLbmW4525G3w6BVS53kOd2bJ5rEbwwb4Lo5q8I="; }; patches = [ diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 6f29d336da1..32612d2e452 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.23.0.4482-62106842a"; + version = "1.23.1.4602-280ab6053"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "0i4cfnzlzxh3vwd8kivy0dy6wg102j96v7p3mpivkwj15kjrl01v"; + sha256 = "0q0drm9x7c1c14ja21pzy4cl03am37gp78s6djbpk4sgxwvvyhic"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "0yh30712m23hmpqc4b83pbmadgslq72z8lc4prx2kp01n3p5hfkq"; + sha256 = "0hz6572yj9wfq4sri76cjyzz4xmfvf8jlzvxqhsk4r05d8kbxrli"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix index fb690e96328..d2e7dd37be1 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_partman"; - version = "4.4.1"; + version = "4.5.1"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "pgpartman"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-jFG2Zna97FHZin2V3Cwy5JcdeFh09Yy/eoyHtcCorPA="; + sha256 = "182yqvgcpgw99swn7w516f6d1bid2gnmf6dfsgmldx5viz0d6vi0"; }; installPhase = '' diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index bd75a45154d..be3b4209eb9 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tailscale"; - version = "1.8.5"; + version = "1.8.6"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "0wr6zb8v5082gbh0isz8inmndvqfqgmh5bgaz8ij2id5qwx5znx6"; + sha256 = "1h3ry4y62wwcv4z3yjqal4ch4xy40k9s3rq20lqs3r58kblnaxs2"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/shells/oksh/default.nix b/pkgs/shells/oksh/default.nix index 8c2998ab54c..e0165fb3022 100644 --- a/pkgs/shells/oksh/default.nix +++ b/pkgs/shells/oksh/default.nix @@ -18,4 +18,8 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ siraben ]; platforms = platforms.all; }; + + passthru = { + shellPath = "/bin/oksh"; + }; } diff --git a/pkgs/tools/admin/fioctl/default.nix b/pkgs/tools/admin/fioctl/default.nix index c27b18ac6d5..0e0c977acd0 100644 --- a/pkgs/tools/admin/fioctl/default.nix +++ b/pkgs/tools/admin/fioctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fioctl"; - version = "0.16"; + version = "0.17"; src = fetchFromGitHub { owner = "foundriesio"; repo = "fioctl"; rev = "v${version}"; - sha256 = "1mm62piih7x2886wpgqd8ks22vpmrjgxs4alskiqz61bgshks9vw"; + sha256 = "sha256-u23BQ/sRAfUO36uqv7xY+DkseDnlVesgamsgne8N8kU="; }; - vendorSha256 = "170z5a1iwwcpz890nficqnz7rr7yzdxr5jx9pa7s31z17lr8kbz9"; + vendorSha256 = "sha256-6a+JMj3hh6GPuqnLknv7/uR8vsUsOgsS+pdxHoMqH5w="; runVend = true; diff --git a/pkgs/tools/audio/yabridge/default.nix b/pkgs/tools/audio/yabridge/default.nix index 048cac40972..0013fac23a0 100644 --- a/pkgs/tools/audio/yabridge/default.nix +++ b/pkgs/tools/audio/yabridge/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , substituteAll , meson , ninja @@ -79,6 +80,13 @@ in stdenv.mkDerivation rec { )''; patches = [ + # Fix for wine 6.8+ (remove patch in next release): + (fetchpatch { + url = "https://github.com/robbert-vdh/yabridge/commit/5577c4bfd842c60a8ae8ce2889bbfeb53a51c62b.patch"; + sha256 = "sha256-bTT08iWwDBVqi2PZPa7oal7/MqVu8t2Bh1gpjFMqLvQ="; + excludes = [ "CHANGELOG.md" ]; + }) + # Hard code wine path so wine version is correct in logs (substituteAll { src = ./hardcode-wine.patch; diff --git a/pkgs/tools/misc/bunnyfetch/default.nix b/pkgs/tools/misc/bunnyfetch/default.nix new file mode 100644 index 00000000000..37e1be80e3c --- /dev/null +++ b/pkgs/tools/misc/bunnyfetch/default.nix @@ -0,0 +1,28 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "bunnyfetch"; + version = "unstable-2021-05-24"; + + src = fetchFromGitHub { + owner = "Mewyuna"; + repo = pname; + rev = "7bcc45fb590b37f410e60af893e679eb0729ecb1"; + sha256 = "1lgqrwmxdxd1d99rr0akydfwcsbcmz75fkbq9zrl842rksnp5q3r"; + }; + + vendorSha256 = "1vv69y0x06kn99lw995sbkb7vgd0yb18flkr2ml8ss7q2yvz37vi"; + + # No upstream tests + doCheck = false; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Tiny system info fetch utility"; + homepage = "https://github.com/Mewyuna/bunnyfetch"; + license = licenses.mit; + maintainers = with maintainers; [ devins2518 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/capture/default.nix b/pkgs/tools/misc/capture/default.nix index d858e0fbc46..d8b2fe67651 100644 --- a/pkgs/tools/misc/capture/default.nix +++ b/pkgs/tools/misc/capture/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, slop, ffmpeg_3, fetchFromGitHub, makeWrapper}: +{ lib, stdenv, slop, ffmpeg, fetchFromGitHub, makeWrapper}: stdenv.mkDerivation { pname = "capture-unstable"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { patchShebangs $out/bin/capture wrapProgram $out/bin/capture \ - --prefix PATH : '${lib.makeBinPath [ slop ffmpeg_3 ]}' + --prefix PATH : '${lib.makeBinPath [ slop ffmpeg ]}' ''; meta = with lib; { diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index d53676f91d6..a7de0183b67 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.12.0"; + version = "2.12.1"; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "sha256-YCpWi5+p+d9YG8YEKRbppcX5/IizI1FnUfcnaoCGZNM="; + sha256 = "sha256-ZJCixDh2+H+G+lVgxw9H61Xy4hMg+3MbhI+e7sU4GQU="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-WFxDY4K257QE/tH4B2c3qOzVG3t1RUh4lWRMzqyBC14="; + cargoSha256 = "sha256-rwgvyfjCBPe20xN6gNXBexjN/BwNhZjT1RtabKhCkJs="; doCheck = false; diff --git a/pkgs/tools/misc/sacad/default.nix b/pkgs/tools/misc/sacad/default.nix index c5c48c271db..50599fbbabd 100644 --- a/pkgs/tools/misc/sacad/default.nix +++ b/pkgs/tools/misc/sacad/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "sacad"; - version = "2.3.4"; + version = "2.4.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1qv2mrz6vy2sl7zhrj9vw016pjd7hmjr2ls0w8bbv1hgrddicn9r"; + sha256 = "sha256-KLVkyiXjpqskM67W9uPl9aPKc3pYMu0nAfwI0OpOniE="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/misc/xjobs/default.nix b/pkgs/tools/misc/xjobs/default.nix new file mode 100644 index 00000000000..5edb365a332 --- /dev/null +++ b/pkgs/tools/misc/xjobs/default.nix @@ -0,0 +1,65 @@ +{ lib, stdenv, fetchurl +, flex, installShellFiles, ncurses, which +}: + +stdenv.mkDerivation rec { + pname = "xjobs"; + version = "20200726"; + + src = fetchurl { + url = "mirror://sourceforge//xjobs/files/${pname}-${version}.tgz"; + sha256 = "0ay6gn43pnm7r1jamwgpycl67bjg5n87ncl27jb01w2x6x70z0i3"; + }; + + nativeBuildInputs = [ + flex + installShellFiles + which + ]; + buildInputs = [ + ncurses + ]; + + checkPhase = '' + runHook preCheck + ./${pname} -V + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/{bin,etc} + install -m755 ${pname} $out/bin/${pname} + install -m644 ${pname}.rc $out/etc/${pname}.rc + installManPage ${pname}.1 + runHook postInstall + ''; + + meta = with lib; { + description = "A program which reads job descriptions line by line and executes them in parallel"; + homepage = "https://www.maier-komor.de/xjobs.html"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = [ maintainers.siriobalmelli ]; + longDescription = '' + xjobs reads job descriptions line by line and executes them in parallel. + + It limits the number of parallel executing jobs and starts new jobs when jobs finish. + + Therefore, it combines the arguments from every input line with the utility + and arguments given on the command line. + If no utility is given as an argument to xjobs, + then the first argument on every job line will be used as utility. + To execute utility xjobs searches the directories given in the PATH environment variable + and uses the first file found in these directories. + + xjobs is most useful on multi-processor/core machines when one needs to execute + several time consuming command several that could possibly be run in parallel. + With xjobs this can be achieved easily, and it is possible to limit the load + of the machine to a useful value. + + It works similar to xargs, but starts several processes simultaneously + and gives only one line of arguments to each utility call. + ''; + }; +} diff --git a/pkgs/tools/networking/s3rs/default.nix b/pkgs/tools/networking/s3rs/default.nix new file mode 100644 index 00000000000..2e707ed9916 --- /dev/null +++ b/pkgs/tools/networking/s3rs/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, rustPlatform, python3, perl, openssl, Security, fetchFromGitHub, pkg-config }: + +rustPlatform.buildRustPackage rec { + pname = "s3rs"; + version = "0.4.8"; + + src = fetchFromGitHub { + owner = "yanganto"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-lYIE5yR7UNUjpqfwT6R0C0ninNvVZdatYd/n+yyGsms="; + }; + + cargoSha256 = "sha256-vCTJ7TClvuIP9IoqXwNFH7/u9jXt/Ue/Dhefx5rCgmA="; + + nativeBuildInputs = [ python3 perl pkg-config ]; + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ Security ]; + + meta = with lib; { + description = "A s3 cli client with multi configs with diffent provider"; + homepage = "https://github.com/yanganto/s3rs"; + license = licenses.mit; + maintainers = with maintainers; [ yanganto ]; + }; +} diff --git a/pkgs/tools/networking/stevenblack-blocklist/default.nix b/pkgs/tools/networking/stevenblack-blocklist/default.nix new file mode 100644 index 00000000000..f3f37581884 --- /dev/null +++ b/pkgs/tools/networking/stevenblack-blocklist/default.nix @@ -0,0 +1,20 @@ +{ lib, fetchFromGitHub }: + +let + version = "3.7.6"; +in +fetchFromGitHub { + name = "stevenblack-blocklist-${version}"; + + owner = "StevenBlack"; + repo = "hosts"; + rev = version; + sha256 = "sha256-zjUdHzsjv16PHXfxTuVC6aNKfh+73dH1AABvq1MArXI="; + + meta = with lib; { + description = "Unified hosts file with base extensions"; + homepage = "https://github.com/StevenBlack/hosts"; + license = licenses.mit; + maintainers = with maintainers; [ fortuneteller2k ]; + }; +} diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix index 89e2f0f320d..4c4b46c2520 100644 --- a/pkgs/tools/networking/v2ray/default.nix +++ b/pkgs/tools/networking/v2ray/default.nix @@ -3,22 +3,22 @@ }: let - version = "4.38.3"; + version = "4.39.2"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - sha256 = "1vsq98h6zbm3wz1mgphl7dqlabgfg53fhkyn47vfbhhkbx6nwl7c"; + sha256 = "0rgwxsix2qy5w44s2ramalsn1bqznj2yra8bakcms8yl9yh0gbvd"; }; - vendorSha256 = "sha256-jXpGlJ30xBttysbUekMdw8fH0KVfPufWq0t7AXZrDEQ="; + vendorSha256 = "sha256-1LEKg9kyF4QBrzLP5TyKmFLPBprJRNqGxtkAI1mHx4Y="; assets = { # MIT licensed "geoip.dat" = let - geoipRev = "202104300531"; - geoipSha256 = "0srskpp0pmw4fzp4lgachjjvig4fy96523r7aj2bwig0ipfgr401"; + geoipRev = "202105270041"; + geoipSha256 = "0g67lggc41himpnbbghm4xlnbv4dl2fyidxplh3pl6ajqb4wxwd5"; in fetchurl { url = "https://github.com/v2fly/geoip/releases/download/${geoipRev}/geoip.dat"; sha256 = geoipSha256; @@ -26,8 +26,8 @@ let # MIT licensed "geosite.dat" = let - geositeRev = "20210430100800"; - geositeSha256 = "0wp111iip3lhkgpbrzzivl5flj44vj7slx9w7k307sls6hmjzlcb"; + geositeRev = "20210527065138"; + geositeSha256 = "1335zyc5zrwws46ldv0sqn51kpkfwfksbfw6hd53fakz0whxki0g"; in fetchurl { url = "https://github.com/v2fly/domain-list-community/releases/download/${geositeRev}/dlc.dat"; sha256 = geositeSha256; diff --git a/pkgs/tools/package-management/morph/default.nix b/pkgs/tools/package-management/morph/default.nix index 61e4a897f48..56d824059f5 100644 --- a/pkgs/tools/package-management/morph/default.nix +++ b/pkgs/tools/package-management/morph/default.nix @@ -1,18 +1,17 @@ -{ buildGoPackage, fetchFromGitHub, go-bindata, openssh, makeWrapper, lib }: +{ buildGoModule, fetchFromGitHub, go-bindata, openssh, makeWrapper, lib }: -buildGoPackage rec { +buildGoModule rec { pname = "morph"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "dbcdk"; repo = "morph"; rev = "v${version}"; - sha256 = "064ccvvq4yk17jy5jvi1nxfp5ajvnvn2k4zvh9v0n3ragcl3rd20"; + sha256 = "0aibs4gsb9pl21nd93bf963kdzf0661qn0liaw8v8ak2xbz7nbs8"; }; - goPackagePath = "github.com/dbcdk/morph"; - goDeps = ./deps.nix; + vendorSha256 = "08zzp0h4c4i5hk4whz06a3da7qjms6lr36596vxz0d8q0n7rspr9"; nativeBuildInputs = [ makeWrapper go-bindata ]; @@ -28,7 +27,7 @@ buildGoPackage rec { postInstall = '' mkdir -p $lib - cp -v go/src/$goPackagePath/data/*.nix $lib + cp -v ./data/*.nix $lib wrapProgram $out/bin/morph --prefix PATH : ${lib.makeBinPath [ openssh ]}; ''; diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index 8f264ef942e..daddf9a71b6 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -2,11 +2,11 @@ , autoPatchelfHook , dpkg , fetchurl +, lib , libsecret , makeDesktopItem , makeWrapper , stdenv -, lib , udev , wrapGAppsHook }: @@ -17,11 +17,11 @@ let pname = "bitwarden"; version = { - x86_64-linux = "1.24.6"; + x86_64-linux = "1.26.4"; }.${system} or ""; sha256 = { - x86_64-linux = "sha256-PaquU2CrtIJS1s9TKshmKxfs0L3Jhvs/sgO4ZrlJFzA="; + x86_64-linux = "sha256-PYqLf1Y3SwPFjq8JJMxHrKWKuCqbVpmzugi3DjRNWUg="; }.${system} or ""; meta = with lib; { diff --git a/pkgs/tools/security/gosh/default.nix b/pkgs/tools/security/gosh/default.nix new file mode 100644 index 00000000000..5c5ad25e6d9 --- /dev/null +++ b/pkgs/tools/security/gosh/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "gosh"; + # https://github.com/redcode-labs/GoSH/issues/4 + version = "2020523-${lib.strings.substring 0 7 rev}"; + rev = "7ccb068279cded1121eacc5a962c14b2064a1859"; + + src = fetchFromGitHub { + owner = "redcode-labs"; + repo = "GoSH"; + inherit rev; + sha256 = "143ig0lqnkpnydhl8gnfzhg613x4wc38ibdbikkqwfyijlr6sgzd"; + }; + + vendorSha256 = "06j6cj4m0w6n9vl7sxlxpsgk77k941npq9767rdzzgy2srfqlskq"; + + runVend = true; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Reverse/bind shell generator"; + homepage = "https://github.com/redcode-labs/GoSH"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix index b9b5e806a4e..e45eda3326a 100644 --- a/pkgs/tools/typesetting/lowdown/default.nix +++ b/pkgs/tools/typesetting/lowdown/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which ] ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; + preConfigure = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + echo 'HAVE_SANDBOX_INIT=0' > configure.local + ''; + configurePhase = '' runHook preConfigure ./configure PREFIX=''${!outputDev} \ @@ -30,6 +34,14 @@ stdenv.mkDerivation rec { patches = lib.optional (!stdenv.hostPlatform.isStatic) ./shared.patch; + doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform; + installCheckPhase = '' + runHook preInstallCheck + echo '# TEST' > test.md + $out/bin/lowdown test.md + runHook postInstallCheck + ''; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; checkTarget = "regress"; @@ -41,4 +53,3 @@ stdenv.mkDerivation rec { platforms = platforms.unix; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2e2faa3d83..9f46af73ea7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -994,6 +994,8 @@ in tilix = callPackage ../applications/terminal-emulators/tilix { }; + twine = with python3Packages; toPythonApplication twine; + wayst = callPackage ../applications/terminal-emulators/wayst { }; wezterm = callPackage ../applications/terminal-emulators/wezterm { @@ -1368,6 +1370,8 @@ in coolreader = libsForQt5.callPackage ../applications/misc/coolreader {}; + corsair = with python3Packages; toPythonApplication corsair-scan; + corsmisc = callPackage ../tools/security/corsmisc { }; cosign = callPackage ../tools/security/cosign { @@ -1617,6 +1621,8 @@ in git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { }; + gosh = callPackage ../tools/security/gosh { }; + gospider = callPackage ../tools/security/gospider { }; browserpass = callPackage ../tools/security/browserpass { }; @@ -4324,6 +4330,8 @@ in xkcdpass = with python3Packages; toPythonApplication xkcdpass; + xjobs = callPackage ../tools/misc/xjobs { }; + xob = callPackage ../tools/X11/xob { }; z-lua = callPackage ../tools/misc/z-lua { }; @@ -8347,6 +8355,10 @@ in s3cmd = python3Packages.callPackage ../tools/networking/s3cmd { }; + s3rs = callPackage ../tools/networking/s3rs { + inherit (darwin.apple_sdk.frameworks) Security; + }; + s4cmd = callPackage ../tools/networking/s4cmd { }; s5cmd = callPackage ../tools/networking/s5cmd { }; @@ -8827,6 +8839,8 @@ in staticjinja = with python3.pkgs; toPythonApplication staticjinja; + stevenblack-blocklist = callPackage ../tools/networking/stevenblack-blocklist { }; + stress = callPackage ../tools/system/stress { }; stress-ng = callPackage ../tools/system/stress-ng { }; @@ -11690,6 +11704,7 @@ in cargo-bisect-rustc = callPackage ../development/tools/rust/cargo-bisect-rustc { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-bitbake = callPackage ../development/tools/rust/cargo-bitbake { }; cargo-c = callPackage ../development/tools/rust/cargo-c { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; @@ -12088,8 +12103,7 @@ in inherit (beam.packages.erlang) erlang-ls rebar rebar3 rebar3WithPlugins - fetchHex beamPackages - relxExe; + fetchHex beamPackages; inherit (beam.packages.erlangR21) lfe lfe_1_3; @@ -14427,7 +14441,9 @@ in chromaprint = callPackage ../development/libraries/chromaprint { }; - cl = callPackage ../development/libraries/cl { }; + cl = callPackage ../development/libraries/cl { + erlang = erlangR23; + }; clanlib = callPackage ../development/libraries/clanlib { }; @@ -19679,7 +19695,7 @@ in rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server { inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa; elixir = beam_nox.interpreters.elixir_1_8; - erlang = erlang_nox; + erlang = beam_nox.interpreters.erlangR23; }; radicale1 = callPackage ../servers/radicale/1.x.nix { }; @@ -22409,6 +22425,8 @@ in yaru-theme = callPackage ../data/themes/yaru {}; + yaru-remix-theme = callPackage ../data/themes/yaru-remix {}; + zafiro-icons = callPackage ../data/icons/zafiro-icons { inherit (plasma5Packages) breeze-icons; }; @@ -25712,7 +25730,7 @@ in owamp = callPackage ../applications/networking/owamp { }; vieb = callPackage ../applications/networking/browsers/vieb { - electron = electron_12; + electron = electron_13; }; vivaldi = callPackage ../applications/networking/browsers/vivaldi {}; @@ -31620,6 +31638,8 @@ in kodelife = callPackage ../applications/graphics/kodelife {}; + bunnyfetch = callPackage ../tools/misc/bunnyfetch {}; + _3proxy = callPackage ../applications/networking/3proxy {}; pigeon = callPackage ../development/tools/pigeon {}; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index e4ce5b6d3c8..334aac359b3 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -6,11 +6,11 @@ rec { # Each interpreters = rec { - # R23 is the default version. - erlang = erlangR23; # The main switch to change default Erlang version. - erlang_odbc = erlangR23_odbc; - erlang_javac = erlangR23_javac; - erlang_odbc_javac = erlangR23_odbc_javac; + # R24 is the default version. + erlang = erlangR24; # The main switch to change default Erlang version. + erlang_odbc = erlangR24_odbc; + erlang_javac = erlangR24_javac; + erlang_odbc_javac = erlangR24_odbc_javac; # Standard Erlang versions, using the generic builder. diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 03ffc1a6bda..1625f24c98e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1584,6 +1584,8 @@ in { coronavirus = callPackage ../development/python-modules/coronavirus { }; + corsair-scan = callPackage ../development/python-modules/corsair-scan { }; + cot = callPackage ../development/python-modules/cot { }; covCore = callPackage ../development/python-modules/cov-core { }; @@ -5239,6 +5241,8 @@ in { powerline = callPackage ../development/python-modules/powerline { }; + powerlineMemSegment = callPackage ../development/python-modules/powerline-mem-segment { }; + pox = callPackage ../development/python-modules/pox { }; poyo = callPackage ../development/python-modules/poyo { }; @@ -5759,6 +5763,8 @@ in { pygrok = callPackage ../development/python-modules/pygrok { }; + pygtfs = callPackage ../development/python-modules/pygtfs { }; + pygtail = callPackage ../development/python-modules/pygtail { }; pygtrie = callPackage ../development/python-modules/pygtrie { }; |