nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-21 16:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into haskell-updates

Browse Source
This commit is contained in:
github-actions[bot]
2021-07-07 00:05:28 +00:00
committed by GitHub
parent f33e2ad480 3e03b1eb46
commit e68dfcb4a5
114 changed files with 1482 additions and 1304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
maintainers/maintainer-list.nix
View File

@@ -1731,6 +1731,12 @@
githubId = 977929;
name = "Cody Allen";
};
centromere = {
email = "nix@centromere.net";
github = "centromere";
githubId = 543423;
name = "Alex Wied";
};
cfouche = {
email = "chaddai.fouche@gmail.com";
github = "Chaddai";
@@ -8496,7 +8502,7 @@
email = "sibi@psibi.in";
github = "psibi";
githubId = 737477;
name = "Sibi";
name = "Sibi Prabakaran";
};
pstn = {
email = "philipp@xndr.de";

4
nixos/doc/manual/preface.xml
View File

@@ -20,8 +20,8 @@
<literal
xlink:href="https://discourse.nixos.org">Discourse</literal> or
on the <link
xlink:href="irc://irc.freenode.net/#nixos">
<literal>#nixos</literal> channel on Freenode</link>, or
xlink:href="irc://irc.libera.chat/#nixos">
<literal>#nixos</literal> channel on Libera.Chat</link>, or
consider
<link
xlink:href="#chap-contributing">

16
nixos/modules/security/acme.nix
View File

@@ -46,6 +46,7 @@ let
serviceConfig = commonServiceConfig // {
StateDirectory = "acme/.minica";
BindPaths = "/var/lib/acme/.minica:/tmp/ca";
UMask = 0077;
};
# Working directory will be /tmp
@@ -54,8 +55,6 @@ let
--ca-key ca/key.pem \
--ca-cert ca/cert.pem \
--domains selfsigned.local
chmod 600 ca/*
'';
};
@@ -196,6 +195,7 @@ let
serviceConfig = commonServiceConfig // {
Group = data.group;
UMask = 0027;
StateDirectory = "acme/${cert}";
@@ -220,10 +220,12 @@ let
cat cert.pem chain.pem > fullchain.pem
cat key.pem fullchain.pem > full.pem
chmod 640 *
# Group might change between runs, re-apply it
chown 'acme:${data.group}' *
# Default permissions make the files unreadable by group + anon
# Need to be readable by group
chmod 640 *
'';
};
@@ -340,8 +342,6 @@ let
fi
mv domainhash.txt certificates/
chmod 640 certificates/*
chmod -R u=rwX,g=,o= accounts/*
# Group might change between runs, re-apply it
chown 'acme:${data.group}' certificates/*
@@ -357,6 +357,10 @@ let
ln -sf fullchain.pem out/cert.pem
cat out/key.pem out/fullchain.pem > out/full.pem
fi
# By default group will have no access to the cert files.
# This chmod will fix that.
chmod 640 out/*
'';
};
};

31
nixos/modules/services/continuous-integration/jenkins/default.nix
View File

@@ -2,6 +2,7 @@
with lib;
let
cfg = config.services.jenkins;
jenkinsUrl = "http://${cfg.listenAddress}:${toString cfg.port}${cfg.prefix}";
in {
options = {
services.jenkins = {
@@ -141,14 +142,34 @@ in {
Additional command line arguments to pass to the Java run time (as opposed to Jenkins).
'';
};
withCLI = mkOption {
type = types.bool;
default = false;
description = ''
Whether to make the CLI available.
More info about the CLI available at
<link xlink:href="https://www.jenkins.io/doc/book/managing/cli">
https://www.jenkins.io/doc/book/managing/cli</link> .
'';
};
};
};
config = mkIf cfg.enable {
# server references the dejavu fonts
environment.systemPackages = [
pkgs.dejavu_fonts
];
environment = {
# server references the dejavu fonts
systemPackages = [
pkgs.dejavu_fonts
] ++ optional cfg.withCLI cfg.package;
variables = {}
// optionalAttrs cfg.withCLI {
# Make it more convenient to use the `jenkins-cli`.
JENKINS_URL = jenkinsUrl;
};
};
users.groups = optionalAttrs (cfg.group == "jenkins") {
jenkins.gid = config.ids.gids.jenkins;
@@ -215,7 +236,7 @@ in {
'';
postStart = ''
until [[ $(${pkgs.curl.bin}/bin/curl -L -s --head -w '\n%{http_code}' http://${cfg.listenAddress}:${toString cfg.port}${cfg.prefix} | tail -n1) =~ ^(200|403)$ ]]; do
until [[ $(${pkgs.curl.bin}/bin/curl -L -s --head -w '\n%{http_code}' ${jenkinsUrl} | tail -n1) =~ ^(200|403)$ ]]; do
sleep 1
done
'';

108
nixos/modules/services/misc/gitlab.nix
View File

@@ -140,6 +140,14 @@ let
port = 3807;
};
};
registry = lib.optionalAttrs cfg.registry.enable {
enabled = true;
host = cfg.registry.externalAddress;
port = cfg.registry.externalPort;
key = cfg.registry.keyFile;
api_url = "http://${config.services.dockerRegistry.listenAddress}:${toString config.services.dockerRegistry.port}/";
issuer = "gitlab-issuer";
};
extra = {};
uploads.storage_path = cfg.statePath;
};
@@ -156,7 +164,7 @@ let
prometheus_multiproc_dir = "/run/gitlab";
RAILS_ENV = "production";
MALLOC_ARENA_MAX = "2";
};
} // cfg.extraEnv;
gitlab-rake = pkgs.stdenv.mkDerivation {
name = "gitlab-rake";
@@ -277,6 +285,14 @@ in {
'';
};
extraEnv = mkOption {
type = types.attrsOf types.str;
default = {};
description = ''
Additional environment variables for the GitLab environment.
'';
};
backup.startAt = mkOption {
type = with types; either str (listOf str);
default = [];
@@ -508,6 +524,58 @@ in {
'';
};
registry = {
enable = mkOption {
type = types.bool;
default = false;
description = "Enable GitLab container registry.";
};
host = mkOption {
type = types.str;
default = config.services.gitlab.host;
description = "GitLab container registry host name.";
};
port = mkOption {
type = types.int;
default = 4567;
description = "GitLab container registry port.";
};
certFile = mkOption {
type = types.path;
default = null;
description = "Path to GitLab container registry certificate.";
};
keyFile = mkOption {
type = types.path;
default = null;
description = "Path to GitLab container registry certificate-key.";
};
defaultForProjects = mkOption {
type = types.bool;
default = cfg.registry.enable;
description = "If GitLab container registry should be enabled by default for projects.";
};
issuer = mkOption {
type = types.str;
default = "gitlab-issuer";
description = "GitLab container registry issuer.";
};
serviceName = mkOption {
type = types.str;
default = "container_registry";
description = "GitLab container registry service name.";
};
externalAddress = mkOption {
type = types.str;
default = "";
description = "External address used to access registry from the internet";
};
externalPort = mkOption {
type = types.int;
description = "External port used to access registry from the internet";
};
};
smtp = {
enable = mkOption {
type = types.bool;
@@ -905,6 +973,44 @@ in {
};
};
systemd.services.gitlab-registry-cert = optionalAttrs cfg.registry.enable {
path = with pkgs; [ openssl ];
script = ''
mkdir -p $(dirname ${cfg.registry.keyFile})
mkdir -p $(dirname ${cfg.registry.certFile})
openssl req -nodes -newkey rsa:4096 -keyout ${cfg.registry.keyFile} -out /tmp/registry-auth.csr -subj "/CN=${cfg.registry.issuer}"
openssl x509 -in /tmp/registry-auth.csr -out ${cfg.registry.certFile} -req -signkey ${cfg.registry.keyFile} -days 3650
chown ${cfg.user}:${cfg.group} $(dirname ${cfg.registry.keyFile})
chown ${cfg.user}:${cfg.group} $(dirname ${cfg.registry.certFile})
chown ${cfg.user}:${cfg.group} ${cfg.registry.keyFile}
chown ${cfg.user}:${cfg.group} ${cfg.registry.certFile}
'';
serviceConfig = {
ConditionPathExists = "!${cfg.registry.certFile}";
};
};
# Ensure Docker Registry launches after the certificate generation job
systemd.services.docker-registry = optionalAttrs cfg.registry.enable {
wants = [ "gitlab-registry-cert.service" ];
};
# Enable Docker Registry, if GitLab-Container Registry is enabled
services.dockerRegistry = optionalAttrs cfg.registry.enable {
enable = true;
enableDelete = true; # This must be true, otherwise GitLab won't manage it correctly
extraConfig = {
auth.token = {
realm = "http${if cfg.https == true then "s" else ""}://${cfg.host}/jwt/auth";
service = cfg.registry.serviceName;
issuer = cfg.registry.issuer;
rootcertbundle = cfg.registry.certFile;
};
};
};
# Use postfix to send out mails.
services.postfix.enable = mkDefault (cfg.smtp.enable && cfg.smtp.address == "localhost");

11
nixos/modules/tasks/filesystems/btrfs.nix
View File

@@ -55,7 +55,16 @@ in
(mkIf enableBtrfs {
system.fsPackages = [ pkgs.btrfs-progs ];
boot.initrd.kernelModules = mkIf inInitrd [ "btrfs" "crc32c" ];
boot.initrd.kernelModules = mkIf inInitrd [ "btrfs" ];
boot.initrd.availableKernelModules = mkIf inInitrd (
[ "crc32c" ]
++ optionals (config.boot.kernelPackages.kernel.kernelAtLeast "5.5") [
# Needed for mounting filesystems with new checksums
"xxhash_generic"
"blake2b_generic"
"sha256_generic" # Should be baked into our kernel, just to be sure
]
);
boot.initrd.extraUtilsCommands = mkIf inInitrd
''

24
nixos/tests/acme.nix
View File

@@ -330,30 +330,38 @@ in import ./make-test-python.nix ({ lib, ... }: {
with subtest("Can request certificate with HTTPS-01 challenge"):
webserver.wait_for_unit("acme-finished-a.example.test.target")
check_fullchain(webserver, "a.example.test")
check_issuer(webserver, "a.example.test", "pebble")
check_connection(client, "a.example.test")
with subtest("Certificates and accounts have safe + valid permissions"):
group = "${nodes.webserver.config.security.acme.certs."a.example.test".group}"
webserver.succeed(
f"test $(stat -L -c \"%a %U %G\" /var/lib/acme/a.example.test/* | tee /dev/stderr | grep '640 acme {group}' | wc -l) -eq 5"
f"test $(stat -L -c '%a %U %G' /var/lib/acme/a.example.test/*.pem | tee /dev/stderr | grep '640 acme {group}' | wc -l) -eq 5"
)
webserver.succeed(
f"test $(stat -L -c \"%a %U %G\" /var/lib/acme/.lego/a.example.test/**/* | tee /dev/stderr | grep '640 acme {group}' | wc -l) -eq 5"
f"test $(stat -L -c '%a %U %G' /var/lib/acme/.lego/a.example.test/**/a.example.test* | tee /dev/stderr | grep '600 acme {group}' | wc -l) -eq 4"
)
webserver.succeed(
f"test $(stat -L -c \"%a %U %G\" /var/lib/acme/a.example.test | tee /dev/stderr | grep '750 acme {group}' | wc -l) -eq 1"
f"test $(stat -L -c '%a %U %G' /var/lib/acme/a.example.test | tee /dev/stderr | grep '750 acme {group}' | wc -l) -eq 1"
)
webserver.succeed(
f"test $(find /var/lib/acme/accounts -type f -exec stat -L -c \"%a %U %G\" {{}} \\; | tee /dev/stderr | grep -v '600 acme {group}' | wc -l) -eq 0"
f"test $(find /var/lib/acme/accounts -type f -exec stat -L -c '%a %U %G' {{}} \\; | tee /dev/stderr | grep -v '600 acme {group}' | wc -l) -eq 0"
)
with subtest("Certs are accepted by web server"):
webserver.succeed("systemctl start nginx.service")
check_fullchain(webserver, "a.example.test")
check_issuer(webserver, "a.example.test", "pebble")
check_connection(client, "a.example.test")
# Selfsigned certs tests happen late so we aren't fighting the system init triggering cert renewal
with subtest("Can generate valid selfsigned certs"):
webserver.succeed("systemctl clean acme-a.example.test.service --what=state")
webserver.succeed("systemctl start acme-selfsigned-a.example.test.service")
check_fullchain(webserver, "a.example.test")
check_issuer(webserver, "a.example.test", "minica")
# Check selfsigned permissions
webserver.succeed(
f"test $(stat -L -c '%a %U %G' /var/lib/acme/a.example.test/*.pem | tee /dev/stderr | grep '640 acme {group}' | wc -l) -eq 5"
)
# Will succeed if nginx can load the certs
webserver.succeed("systemctl start nginx-config-reload.service")
@@ -376,6 +384,8 @@ in import ./make-test-python.nix ({ lib, ... }: {
webserver.wait_for_unit("acme-finished-a.example.test.target")
check_connection_key_bits(client, "a.example.test", "384")
webserver.succeed("grep testing /var/lib/acme/a.example.test/test")
# Clean to remove the testing file (and anything else messy we did)
webserver.succeed("systemctl clean acme-a.example.test.service --what=state")
with subtest("Correctly implements OCSP stapling"):
switch_to(webserver, "ocsp-stapling")

30
nixos/tests/jenkins-cli.nix Normal file
View File

@@ -0,0 +1,30 @@
import ./make-test-python.nix ({ pkgs, ...} : rec {
name = "jenkins-cli";
meta = with pkgs.lib.maintainers; {
maintainers = [ pamplemousse ];
};
nodes = {
machine =
{ ... }:
{
services.jenkins = {
enable = true;
withCLI = true;
};
};
};
testScript = ''
start_all()
machine.wait_for_unit("jenkins")
assert "JENKINS_URL" in machine.succeed("env")
assert "http://0.0.0.0:8080" in machine.succeed("echo $JENKINS_URL")
machine.succeed(
"jenkins-cli -auth admin:$(cat /var/lib/jenkins/secrets/initialAdminPassword)"
)
'';
})

7
pkgs/applications/audio/audacity/default.nix
View File

@@ -62,6 +62,13 @@ let
in
stdenv.mkDerivation rec {
pname = "audacity";
# nixpkgs-update: no auto update
# Humans too! Let's wait to see how the situation with
# https://github.com/audacity/audacity/issues/1213 develops before
# pulling any updates that are subject to this privacy policy. We
# may wish to switch to a fork, but at the time of writing
# (2021-07-05) it's too early to tell how well any of the forks will
# be maintained.
version = "3.0.2";
src = fetchFromGitHub {

4
pkgs/applications/audio/openmpt123/default.nix
View File

@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "openmpt123";
version = "0.5.9";
version = "0.5.10";
src = fetchurl {
url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz";
sha256 = "0h86p8mnpm98vc4v6jbvrmm02fch7dnn332i26fg3a2s1738m04d";
sha256 = "sha256-Waj6KNi432nLf6WXK9+TEIHatOHhFWxpoaU7ZcK+n/o=";
};
enableParallelBuilding = true;

37
pkgs/applications/blockchains/lightwalletd/default.nix Normal file
View File

@@ -0,0 +1,37 @@
{ buildGoModule, fetchFromGitHub, lib }:
buildGoModule rec {
pname = "lightwalletd";
version = "0.4.7";
src = fetchFromGitHub {
owner = "zcash";
repo = "lightwalletd";
rev = "v${version}";
sha256 = "0dwam3fhc4caga7kjg6cc06sz47g4ii7n3sa4j2ac4aiy21hsbjk";
};
vendorSha256 = null;
ldflags = [
"-s" "-w"
"-X github.com/zcash/lightwalletd/common.Version=v${version}"
"-X github.com/zcash/lightwalletd/common.GitCommit=v${version}"
"-X github.com/zcash/lightwalletd/common.BuildDate=1970-01-01"
"-X github.com/zcash/lightwalletd/common.BuildUser=nixbld"
];
postFixup = ''
shopt -s extglob
cd $out/bin
rm !(lightwalletd)
'';
meta = with lib; {
description = "A backend service that provides a bandwidth-efficient interface to the Zcash blockchain";
homepage = "https://github.com/zcash/lightwalletd";
maintainers = with maintainers; [ centromere ];
license = licenses.mit;
platforms = platforms.linux;
};
}

6
pkgs/applications/editors/jetbrains/common.nix
View File

@@ -38,7 +38,7 @@ with stdenv; lib.makeOverridable mkDerivation rec {
nativeBuildInputs = [ makeWrapper patchelf unzip ];
patchPhase = lib.optionalString (!stdenv.isDarwin) ''
postPatch = lib.optionalString (!stdenv.isDarwin) ''
get_file_size() {
local fname="$1"
echo $(ls -l $fname | cut -d ' ' -f5)
@@ -64,6 +64,8 @@ with stdenv; lib.makeOverridable mkDerivation rec {
'';
installPhase = ''
runHook preInstall
mkdir -p $out/{bin,$name,share/pixmaps,libexec/${name}}
cp -a . $out/$name
ln -s $out/$name/bin/${loName}.png $out/share/pixmaps/${mainProgram}.png
@@ -86,6 +88,8 @@ with stdenv; lib.makeOverridable mkDerivation rec {
--set ${hiName}_VM_OPTIONS ${vmoptsFile}
ln -s "$item/share/applications" $out/share
runHook postInstall
'';
} // lib.optionalAttrs (!(meta.license.free or true)) {

4
pkgs/applications/editors/jetbrains/default.nix
View File

@@ -193,7 +193,7 @@ let
platforms = platforms.linux;
};
}).overrideAttrs (attrs: {
patchPhase = lib.optionalString (!stdenv.isDarwin) (attrs.patchPhase + ''
postPatch = lib.optionalString (!stdenv.isDarwin) (attrs.postPatch + ''
rm -rf lib/ReSharperHost/linux-x64/dotnet
mkdir -p lib/ReSharperHost/linux-x64/dotnet/
ln -s ${dotnet-sdk_5}/bin/dotnet lib/ReSharperHost/linux-x64/dotnet/dotnet
@@ -229,7 +229,7 @@ let
platforms = platforms.linux;
};
}).overrideAttrs (attrs: {
patchPhase = (attrs.patchPhase or "") + optionalString (stdenv.isLinux) ''
postPatch = (attrs.postPatch or "") + optionalString (stdenv.isLinux) ''
# Webstorm tries to use bundled jre if available.
# Lets prevent this for the moment
rm -r jbr

6
pkgs/applications/editors/jetbrains/update.pl
View File

@@ -6,6 +6,8 @@ use List::Util qw(reduce);
use File::Slurp;
use LWP::Simple;
my $only_free = grep { $_ eq "--only-free" } @ARGV;
sub semantic_less {
my ($a, $b) = @_;
$a =~ s/\b(\d+)\b/sprintf("%010s", $1)/eg;
@@ -55,13 +57,15 @@ sub update_nix_block {
die "no version in $block" unless $version;
if ($version eq $latest_versions{$channel}) {
print("$channel is up to date at $version\n");
} elsif ($only_free && $block =~ /licenses\.unfree/) {
print("$channel is unfree, skipping\n");
} else {
print("updating $channel: $version -> $latest_versions{$channel}\n");
my ($url) = $block =~ /url\s*=\s*"([^"]+)"/;
# try to interpret some nix
my ($name) = $block =~ /name\s*=\s*"([^"]+)"/;
$name =~ s/\$\{version\}/$latest_versions{$channel}/;
# Some url paattern contain variables more than once
# Some url pattern contain variables more than once
$url =~ s/\$\{name\}/$name/g;
$url =~ s/\$\{version\}/$latest_versions{$channel}/g;
die "$url still has some interpolation" if $url =~ /\$/;

6
pkgs/applications/misc/electron-cash/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, python3Packages, qtbase, fetchpatch, wrapQtAppsHook
{ lib, stdenv, fetchFromGitHub, python3Packages, qtbase, fetchpatch, wrapQtAppsHook
, secp256k1 }:
python3Packages.buildPythonApplication rec {
@@ -61,7 +61,7 @@ python3Packages.buildPythonApplication rec {
pytest electroncash/tests
'';
postInstall = ''
postInstall = lib.optionalString stdenv.isLinux ''
substituteInPlace $out/share/applications/electron-cash.desktop \
--replace "Exec=electron-cash" "Exec=$out/bin/electron-cash"
'';
@@ -92,7 +92,7 @@ python3Packages.buildPythonApplication rec {
of the blockchain.
'';
homepage = "https://www.electroncash.org/";
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = with maintainers; [ lassulus nyanloutre oxalica ];
license = licenses.mit;
};

6
pkgs/applications/misc/hugo/default.nix
View File

@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "hugo";
version = "0.84.4";
version = "0.85.0";
src = fetchFromGitHub {
owner = "gohugoio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-nD2UBDSDG6OFfUvDBXCfhOCiJyFMP2pDXSlIESaEfqE=";
sha256 = "sha256-IW41e4imaXKcXJKa7dAB60ulvRrk3qvF1//Lo55TLVI=";
};
vendorSha256 = "sha256-ImXTOtN6kQL7Q8IBlmK7+i47cWtyZT0xcnQdCw3NvWM=";
vendorSha256 = "sha256-ZIGw349m6k8qqrzUN/oYV/HrgBvfOo/ovjo1SUDRmyk=";
doCheck = false;

17
pkgs/applications/misc/lutris/default.nix
View File

@@ -1,6 +1,8 @@
{ buildPythonApplication, lib, fetchFromGitHub
{ buildPythonApplication
, lib
, fetchFromGitHub
# build inputs
# build inputs
, atk
, gdk-pixbuf
, glib-networking
@@ -13,7 +15,7 @@
, webkitgtk
, wrapGAppsHook
# python dependencies
# python dependencies
, dbus-python
, distro
, evdev
@@ -25,7 +27,7 @@
, keyring
, python_magic
# commands that lutris needs
# commands that lutris needs
, xrandr
, pciutils
, psmisc
@@ -71,15 +73,16 @@ let
gstreamer
];
in buildPythonApplication rec {
in
buildPythonApplication rec {
pname = "lutris-original";
version = "0.5.8.3";
version = "0.5.8.4";
src = fetchFromGitHub {
owner = "lutris";
repo = "lutris";
rev = "v${version}";
sha256 = "sha256-NnWIP9oEndk/hDo5Z33pkmZ61pxT/ScmZ4YpS2ajK/8=";
sha256 = "sha256-5ivXIgDyM9PRvuUhPFPgziXDvggcL+p65kI2yOaiS1M=";
};
nativeBuildInputs = [ wrapGAppsHook ];

6
pkgs/applications/misc/makeself/default.nix
View File

@@ -12,10 +12,12 @@ stdenv.mkDerivation rec {
sha256 = "07cq7q71bv3fwddkp2863ylry2ivds00f8sjy8npjpdbkailxm21";
};
patches = [ ./tests-use-better-shell.patch ];
postPatch = "patchShebangs test";
doCheck = true;
# Issue #110149: our default /bin/sh apparently has 32-bit math only
# (attribute busybox-sandbox-shell), and that causes problems
# when running these tests inside build, based on free disk space.
doCheck = false;
checkTarget = "test";
checkInputs = [ which zstd pbzip2 ];

10
pkgs/applications/misc/makeself/tests-use-better-shell.patch
View File

@@ -1,10 +0,0 @@
Use full bash's sh in tests instead of /bin/sh, as that would be
too minimalist in the build sandbox. See issue:
https://github.com/NixOS/nixpkgs/issues/110149#issuecomment-874258128
diff --git a/test/extracttest b/test/extracttest
--- a/test/extracttest
+++ b/test/extracttest
@@ -9,2 +9,3 @@ setupTests() {
$SUT $* archive makeself-test.run "Test $*" echo Testing
+ sed "1s|/bin|$(dirname "$SHELL")|" -i ./makeself-test.run
}

4
pkgs/applications/misc/sfm/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, conf ? null }:
{ lib, stdenv, fetchFromGitHub, writeText, conf ? null }:
stdenv.mkDerivation rec {
pname = "sfm";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
hash = "sha256-DwXKrSqcebNI5N9REXyMV16W2kr72IH9+sKSVehc5zw=";
};
configFile = lib.optionalString (conf!=null) (lib.writeText "config.def.h" conf);
configFile = lib.optionalString (conf!=null) (writeText "config.def.h" conf);
postPatch = lib.optionalString (conf!=null) "cp ${configFile} config.def.h";

6
pkgs/applications/misc/xplr/default.nix
View File

@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "xplr";
version = "0.14.3";
version = "0.14.4";
src = fetchCrate {
inherit pname version;
sha256 = "012wyl6qvwca5r8kqf8j7r50r1lbv802c90m13xb7rqyb6jjfv0m";
sha256 = "1jfclwpip4xvwkvz5g0fb3v04pdnk3ddvkdll0yr7wm0g6p44xfd";
};
buildInputs = lib.optional stdenv.isDarwin libiconv;
cargoSha256 = "1mgi7hxsn9wajxr78kr3n4g7fa0rwp4riah8dq06cqwjlh0pkfjd";
cargoSha256 = "06iwx3s7h6l9kvd17hx0ihy6zrz4jbfjmdlkyij2fs0fhvas110x";
meta = with lib; {
description = "A hackable, minimal, fast TUI file explorer";

4
pkgs/applications/networking/cluster/kops/default.nix
View File

@@ -65,8 +65,8 @@ rec {
};
kops_1_20 = mkKops rec {
version = "1.20.1";
sha256 = "sha256-k6ODXbh7Bh+rBw6bjSNLxLY0fz7JLnrmJibnXz5qnSc=";
version = "1.20.2";
sha256 = "011ib3xkj6nn7qax8d0ns8y4jhkwwmry1qnzxklvzssaxhmzs557";
rev = "v${version}";
};
}

12
pkgs/applications/networking/cluster/nerdctl/default.nix
View File

@@ -10,23 +10,21 @@
buildGoModule rec {
pname = "nerdctl";
version = "0.8.3";
version = "0.10.0";
src = fetchFromGitHub {
owner = "containerd";
repo = pname;
rev = "v${version}";
sha256 = "sha256-mBoqyDfGho2e4RuFwkiU2R+zb38LzByWtH4pOhguueY=";
sha256 = "sha256-cqIIpdkQ6DF7DKXvwCoJBQKG0+lL8iP/Vx0q7rL8prg=";
};
vendorSha256 = "sha256-S3Gp7HkBIZNZ8rkp64XaUQUj1TggGwI9FMrVkyLCQWA=";
vendorSha256 = "sha256-0+k1e7Sn+NYGAJDVUbUm0oedc1t2blezUhsjDIuIKvA=";
nativeBuildInputs = [ makeWrapper installShellFiles ];
preBuild = let t = "github.com/containerd/nerdctl/pkg/version"; in
''
buildFlagsArray+=("-ldflags" "-s -w -X ${t}.Version=v${version} -X ${t}.Revision=<unknown>")
'';
ldflags = let t = "github.com/containerd/nerdctl/pkg/version"; in
[ "-s" "-w" "-X ${t}.Version=v${version}" "-X ${t}.Revision=<unknown>" ];
# Many checks require a containerd socket and running nerdctl after it's built
doCheck = false;

4
pkgs/applications/networking/cluster/tanka/default.nix
View File

@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "tanka";
version = "0.16.0";
version = "0.17.0";
src = fetchFromGitHub {
owner = "grafana";
repo = pname;
rev = "v${version}";
sha256 = "sha256-KvQIVJZD/VvLE5RocWLRVGbb8faLY2cBeFSE/6E7x50=";
sha256 = "sha256-9UfSKMyapmDyikRqs7UiA4YYcvj/Tin9pRqC9iFLPWE=";
};
vendorSha256 = "sha256-vpm2y/CxRNWkz6+AOMmmZH5AjRQWAa6WD5Fnx5lqJYw=";

32
pkgs/applications/networking/cluster/tfswitch/default.nix Normal file
View File

@@ -0,0 +1,32 @@
{ buildGoModule, lib, fetchFromGitHub }:
buildGoModule rec {
pname = "tfswitch";
version = "0.12.1119";
src = fetchFromGitHub {
owner = "warrensbox";
repo = "terraform-switcher";
rev = version;
sha256 = "1xsmr4hnmdg2il3rp39cyhv55ha4qcilcsr00iiija3bzxsm4rya";
};
vendorSha256 = "0mpm4m07v8w02g95cnj73m5gvd118id4ag2pym8d9r2svkyz5n70";
# Disable tests since it requires network access and relies on the
# presence of release.hashicorp.com
doCheck = false;
runVend = true;
postInstall = ''
# The binary is named tfswitch
mv $out/bin/terraform-switcher $out/bin/tfswitch
'';
meta = with lib; {
description = "A command line tool to switch between different versions of terraform";
homepage = "https://github.com/warrensbox/terraform-switcher";
license = licenses.mit;
maintainers = with maintainers; [ psibi ];
};
}

13
pkgs/applications/networking/instant-messengers/psi-plus/default.nix
View File

@@ -3,6 +3,10 @@
, libidn, qca-qt5, libXScrnSaver, hunspell
, libsecret, libgcrypt, libotr, html-tidy, libgpgerror, libsignal-protocol-c
, usrsctp
# Voice messages
, voiceMessagesSupport ? true
, gst_all_1
}:
mkDerivation rec {
@@ -27,8 +31,17 @@ mkDerivation rec {
libidn qca-qt5 libXScrnSaver hunspell
libsecret libgcrypt libotr html-tidy libgpgerror libsignal-protocol-c
usrsctp
] ++ lib.optionals voiceMessagesSupport [
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
];
preFixup = lib.optionalString voiceMessagesSupport ''
qtWrapperArgs+=(
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
)
'';
meta = with lib; {
homepage = "https://psi-plus.com";
description = "XMPP (Jabber) client";

2
pkgs/applications/networking/irc/weechat/scripts/default.nix
View File

@@ -24,4 +24,6 @@
weechat-go = callPackage ./weechat-go { };
buffer_autoset = callPackage ./buffer_autoset { };
highmon = callPackage ./highmon { };
}

31
pkgs/applications/networking/irc/weechat/scripts/highmon/default.nix Normal file
View File

@@ -0,0 +1,31 @@
{ lib, stdenv, fetchurl, weechat }:
stdenv.mkDerivation {
pname = "highmon";
version = "2.7";
src = fetchurl {
url = "https://raw.githubusercontent.com/KenjiE20/highmon/182e67d070c75efc81999e68c2ac7fdfe44d2872/highmon.pl";
sha256 = "1vvgzscb12l3cp2nq954fx6j3awvpjsb0nqylal51ps9cq9a3wir";
};
dontUnpack = true;
passthru.scripts = [ "highmon.pl" ];
installPhase = ''
runHook preInstall
install -D $src $out/share/highmon.pl
runHook postInstall
'';
meta = with lib; {
inherit (weechat.meta) platforms;
homepage = "https://github.com/KenjiE20/highmon/";
description = "highmon.pl is a weechat script that adds 'Highlight Monitor'.";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ govanify ];
};
}

4
pkgs/applications/science/chemistry/jmol/default.nix
View File

@@ -17,14 +17,14 @@ let
};
in
stdenv.mkDerivation rec {
version = "14.31.42";
version = "14.31.44";
pname = "jmol";
src = let
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
in fetchurl {
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
sha256 = "sha256-q81dUSxrKT3nzX0bFclolsyguQxXKlsiX9GCwEvOpAw=";
sha256 = "sha256-MHfqoQzUEL7nje7Y/hbaA8iktxfN7464TJXum5B6OCc=";
};
patchPhase = ''

4
pkgs/applications/version-management/git-and-tools/bit/default.nix
View File

@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "bit";
version = "1.1.1";
version = "1.1.2";
src = fetchFromGitHub {
owner = "chriswalz";
repo = pname;
rev = "v${version}";
sha256 = "sha256-85GEx9y8r9Fjgfcwh1Bi8WDqBm6KF7uidutlF77my60=";
sha256 = "sha256-18R0JGbG5QBDghF4SyhXaKe9UY5UzF7Ap0Y061Z1SZ8=";
};
vendorSha256 = "sha256-3Y/B14xX5jaoL44rq9+Nn4niGViLPPXBa8WcJgTvYTA=";

10
pkgs/applications/version-management/gitlab/data.json
View File

@@ -1,13 +1,13 @@
{
"version": "14.0.1",
"repo_hash": "185jzzlnghws958y15q7mzc7y42sxxq26p5i7j92bky9nkc1sa81",
"version": "14.0.2",
"repo_hash": "1wnlkbjy7hm5lq6qc12dncmz321nhcnm8wvaz0ni1v5xpp3hv286",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v14.0.1-ee",
"rev": "v14.0.2-ee",
"passthru": {
"GITALY_SERVER_VERSION": "14.0.1",
"GITALY_SERVER_VERSION": "14.0.2",
"GITLAB_PAGES_VERSION": "1.40.0",
"GITLAB_SHELL_VERSION": "13.19.0",
"GITLAB_WORKHORSE_VERSION": "14.0.1"
"GITLAB_WORKHORSE_VERSION": "14.0.2"
}
}

4
pkgs/applications/version-management/gitlab/gitaly/default.nix
View File

@@ -21,14 +21,14 @@ let
};
};
in buildGoModule rec {
version = "14.0.1";
version = "14.0.2";
pname = "gitaly";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "sha256-x9QTuEPLtiPJqk1UVwrlYvULIQ93TERSfslO2LB55cY=";
sha256 = "sha256-0mLGtvRHgMN3TtH/g4XLDubwZvtB0xr2U30fufj//KY=";
};
vendorSha256 = "sha256-U962bMmXNnenCYkSdk0Uy7Bz+b9JGU5rJHfblZoyC/I=";

2
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
View File

@@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "14.0.1";
version = "14.0.2";
src = fetchFromGitLab {
owner = data.owner;

4
pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
View File

@@ -157,7 +157,7 @@ gem 'github-markup', '~> 1.7.0', require: 'github/markup'
gem 'commonmarker', '~> 0.21'
gem 'kramdown', '~> 2.3.1'
gem 'RedCloth', '~> 4.3.2'
gem 'rdoc', '~> 6.1.2'
gem 'gitlab-rdoc', '~> 6.3.2', require: 'rdoc' # We need this fork until rdoc releases a new version. See https://gitlab.com/gitlab-org/gitlab/-/issues/334695
gem 'org-ruby', '~> 0.9.12'
gem 'creole', '~> 0.5.0'
gem 'wikicloth', '0.8.1'
@@ -168,7 +168,7 @@ gem 'asciidoctor-kroki', '~> 0.4.0', require: false
gem 'rouge', '~> 3.26.0'
gem 'truncato', '~> 0.7.11'
gem 'bootstrap_form', '~> 4.2.0'
gem 'nokogiri', '~> 1.11.1'
gem 'nokogiri', '~> 1.11.4'
gem 'escape_utils', '~> 1.1'
# Calendar rendering

8
pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
View File

@@ -493,6 +493,7 @@ GEM
openid_connect (~> 1.2)
gitlab-pg_query (2.0.4)
google-protobuf (>= 3.17.1)
gitlab-rdoc (6.3.2)
gitlab-sidekiq-fetcher (0.5.6)
sidekiq (~> 5)
gitlab-styles (6.2.0)
@@ -792,7 +793,7 @@ GEM
netrc (0.11.0)
nio4r (2.5.4)
no_proxy_fix (0.1.2)
nokogiri (1.11.3)
nokogiri (1.11.4)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
nokogumbo (2.0.2)
@@ -1017,7 +1018,6 @@ GEM
msgpack (>= 0.4.3)
optimist (>= 3.0.0)
rchardet (1.8.0)
rdoc (6.1.2)
re2 (1.2.0)
recaptcha (4.13.1)
json
@@ -1490,6 +1490,7 @@ DEPENDENCIES
gitlab-net-dns (~> 0.9.1)
gitlab-omniauth-openid-connect (~> 0.4.0)
gitlab-pg_query (~> 2.0.4)
gitlab-rdoc (~> 6.3.2)
gitlab-sidekiq-fetcher (= 0.5.6)
gitlab-styles (~> 6.2.0)
gitlab_chronic_duration (~> 0.10.6.2)
@@ -1549,7 +1550,7 @@ DEPENDENCIES
net-ldap (~> 0.16.3)
net-ntp
net-ssh (~> 6.0)
nokogiri (~> 1.11.1)
nokogiri (~> 1.11.4)
oauth2 (~> 1.4)
octokit (~> 4.15)
ohai (~> 16.10)
@@ -1597,7 +1598,6 @@ DEPENDENCIES
rainbow (~> 3.0)
rblineprof (~> 0.3.6)
rbtrace (~> 0.4)
rdoc (~> 6.1.2)
re2 (~> 1.2.0)
recaptcha (~> 4.11)
redis (~> 4.0)

24
pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
View File

@@ -2095,6 +2095,16 @@
};
version = "2.0.4";
};
gitlab-rdoc = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "04vdirkdj42as3rgj6qlgz5ly5vg45i9k184bmf5z556i3b1fyf9";
type = "gem";
};
version = "6.3.2";
};
gitlab-sidekiq-fetcher = {
dependencies = ["sidekiq"];
groups = ["default"];
@@ -3396,10 +3406,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19d78mdg2lbz9jb4ph6nk783c9jbsdm8rnllwhga6pd53xffp6x0";
sha256 = "05rfzi8wksps5pgaavq1n1vkngsrjhqz8rcd1qdb52hnpg9q9p9b";
type = "gem";
};
version = "1.11.3";
version = "1.11.4";
};
nokogumbo = {
dependencies = ["nokogiri"];
@@ -4306,16 +4316,6 @@
};
version = "1.8.0";
};
rdoc = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zh39dpsqlhhi4aba1sbrk504d88p38djk8cansjq0fwndq7w4zb";
type = "gem";
};
version = "6.1.2";
};
re2 = {
groups = ["default"];
platforms = [];

6
pkgs/applications/virtualization/lima/default.nix
View File

@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "lima";
version = "0.4.0";
version = "0.5.0";
src = fetchFromGitHub {
owner = "AkihiroSuda";
repo = pname;
rev = "v${version}";
sha256 = "sha256-vwAxVBy2SqghxJGscSZ1o1B8EMvQh1fz5CS1YG7Rq2g=";
sha256 = "sha256-1952xGSfVFI2Fs5HLJKCyB6ZxKFf5uPKXIlctM/T+8o=";
};
vendorSha256 = "sha256-xM9LLh5c5QBrcIptdqiNNp1nU9GcdQvwrCnnyuXWYfE=";
vendorSha256 = "sha256-rPL/jxMHMkKffoYLSI3FFtFRYGtARKmrODmL9w+rN0E=";
nativeBuildInputs = [ makeWrapper installShellFiles ];

4
pkgs/data/fonts/gentium/default.nix
View File

@@ -1,7 +1,7 @@
{ lib, fetchzip }:
let
version = "6.000";
version = "6.001";
in fetchzip rec {
name = "gentium-${version}";
@@ -23,7 +23,7 @@ in fetchzip rec {
-d $out/share/doc/${name}/documentation
'';
sha256 = "zhSpAYK3Lfzsx6Z1IA6aRFNNXdDGq/jWxsQ20c2HcxI=";
sha256 = "sha256-DeoMTJ2nhTBtNQYG55lIMvnulqpk/KTeIqgpb5eiTIA=";
meta = with lib; {
homepage = "https://software.sil.org/gentium/";

1
pkgs/development/beam-modules/default.nix
View File

@@ -38,6 +38,7 @@ let
mixRelease = callPackage ./mix-release.nix { };
erlang-ls = callPackage ./erlang-ls { };
erlfmt = callPackage ./erlfmt { };
# BEAM-based languages.
elixir = elixir_1_12;

20
pkgs/development/beam-modules/erlfmt/default.nix Normal file
View File

@@ -0,0 +1,20 @@
{ fetchFromGitHub, rebar3Relx, lib }:
rebar3Relx rec {
name = "erlfmt";
version = "1.0.0";
releaseType = "escript";
src = fetchFromGitHub {
owner = "WhatsApp";
repo = "erlfmt";
sha256 = "19apbs9xr4j8qjb3sv9ilknqjw4a7bvp8jvwrjiwvwnxzzm2kjm6";
rev = "v${version}";
};
meta = with lib; {
homepage = "https://github.com/WhatsApp/erlfmt";
description = "An automated code formatter for Erlang";
platforms = platforms.unix;
license = licenses.asl20;
maintainers = with lib.maintainers; [ dlesl ];
};
}

4
pkgs/development/beam-modules/rebar3-release.nix
View File

@@ -93,10 +93,10 @@ let
inherit (erlang.meta) platforms;
} // meta;
passthru = {
passthru = ({
packageName = name;
env = shell self;
};
} // (if attrs ? passthru then attrs.passthru else {}));
} // customPhases);
in
fix pkg

6
pkgs/development/compilers/gleam/default.nix
View File

@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "gleam";
version = "0.16.0";
version = "0.16.1";
src = fetchFromGitHub {
owner = "gleam-lang";
repo = pname;
rev = "v${version}";
sha256 = "sha256-QcJudP4zhtY1CxV3XLkiC06hrKOqlLdb+X6lHvqc7ZA=";
sha256 = "sha256-JivBYBhXTti285pO4HNhalj0WeR/Hly3IjxpA+qauWY=";
};
nativeBuildInputs = [ pkg-config ];
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ] ++
lib.optionals stdenv.isDarwin [ Security libiconv ];
cargoSha256 = "sha256-een2aI6gDVx450mQcwF1uRG/tn9FzahTMWpPdvUBumE=";
cargoSha256 = "sha256-SemHpvZ0lMqyMcgHPnmqI4C1krAJMM0hKCNNVMrulfI=";
meta = with lib; {
description = "A statically typed language for the Erlang VM";

57
pkgs/development/compilers/odin/default.nix Normal file
View File

@@ -0,0 +1,57 @@
{ lib
, fetchFromGitHub
, llvmPackages
, makeWrapper
, libiconv
}:
let
inherit (llvmPackages) stdenv;
in stdenv.mkDerivation rec {
pname = "odin";
version = "0.13.0";
src = fetchFromGitHub {
owner = "odin-lang";
repo = "Odin";
rev = "v${version}";
sha256 = "ke2HPxVtF/Lh74Tv6XbpM9iLBuXLdH1+IE78MAacfYY=";
};
nativeBuildInputs = [
makeWrapper
];
buildInputs = lib.optional stdenv.isDarwin libiconv;
postPatch = ''
sed -i 's/^GIT_SHA=.*$/GIT_SHA=/' Makefile
'';
dontConfigure = true;
buildFlags = [
"release"
];
installPhase = ''
mkdir -p $out/bin
cp odin $out/bin/odin
cp -r core $out/bin/core
wrapProgram $out/bin/odin --prefix PATH : ${lib.makeBinPath (with llvmPackages; [
bintools
llvm
clang
lld
])}
'';
meta = with lib; {
description = "A fast, concise, readable, pragmatic and open sourced programming language";
homepage = "https://odin-lang.org/";
license = licenses.bsd2;
maintainers = with maintainers; [ luc65r ];
platforms = platforms.x86_64;
};
}

24
pkgs/development/interpreters/nix-exec/default.nix
View File

@@ -1,24 +0,0 @@
{ lib, stdenv, fetchurl, pkg-config, nix, git }: let
version = "4.1.6";
in stdenv.mkDerivation {
pname = "nix-exec";
inherit version;
src = fetchurl {
url = "https://github.com/shlevy/nix-exec/releases/download/v${version}/nix-exec-${version}.tar.xz";
sha256 = "0slpsnzzzdkf5d9za7j4kr15jr4mn1k9klfsxibzy47b2bx1vkar";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ nix git ];
NIX_CFLAGS_COMPILE = "-std=c++1y";
meta = {
description = "Run programs defined in nix expressions";
homepage = "https://github.com/shlevy/nix-exec";
license = lib.licenses.mit;
platforms = nix.meta.platforms;
broken = true;
};
}

8
pkgs/development/python-modules/apispec/default.nix
View File

@@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "apispec";
version = "4.6.0";
version = "4.7.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "a896f97394b7d046d46c65262e51e45241dd8d9d71eedebcdb2d7024b775eec4";
sha256 = "sha256-v6G+yLWyzqZyfgIMOm/hHZYwiN0u1hbhFHXOry1naTc=";
};
propagatedBuildInputs = [
@@ -32,8 +32,10 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportsCheck = [ "apispec" ];
meta = with lib; {
description = "A pluggable API specification generator. Currently supports the OpenAPI Specification (f.k.a. the Swagger specification";
description = "A pluggable API specification generator with support for the OpenAPI Specification";
homepage = "https://github.com/marshmallow-code/apispec";
license = licenses.mit;
maintainers = [ maintainers.costrouc ];

33
pkgs/development/python-modules/bson/default.nix Normal file
View File

@@ -0,0 +1,33 @@
{ lib
, buildPythonPackage
, fetchPypi
, python-dateutil
, six
}:
buildPythonPackage rec {
pname = "bson";
version = "0.5.10";
src = fetchPypi {
inherit pname version;
sha256 = "14355m3dchz446fl54ym78bn4wi20hddx1614f8rl4sin0m1nlfn";
};
propagatedBuildInputs = [
python-dateutil
six
];
# 0.5.10 was not tagged, https://github.com/py-bson/bson/issues/108
doCheck = false;
pythonImportsCheck = [ "bson" ];
meta = with lib; {
description = "BSON codec for Python";
homepage = "https://github.com/py-bson/bson";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}

13
pkgs/development/python-modules/bytecode/default.nix
View File

@@ -2,23 +2,26 @@
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, aenum
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "bytecode";
version = "0.11.0";
version = "0.12.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "vstinner";
repo = pname;
rev = version;
sha256 = "097k83zr0z71pha7bafzhs4ink174wk9ls2883bic274rihsnc5r";
sha256 = "sha256-CEfDoJ+JlnxLLVnSxv7bEN891tmwG9zAvtT8GNvp8JU=";
};
disabled = pythonOlder "3.5";
checkInputs = [
pytestCheckHook
];
propagatedBuildInputs = lib.optionals (pythonOlder "3.6") [ aenum ];
pythonImportsCheck = [ "bytecode" ];
meta = with lib; {
homepage = "https://github.com/vstinner/bytecode";

49
pkgs/development/python-modules/cattrs/default.nix
View File

@@ -1,27 +1,70 @@
{ lib
, attrs
, bson
, buildPythonPackage
, fetchFromGitHub
, hypothesis
, immutables
, msgpack
, poetry-core
, pytestCheckHook
, pyyaml
, tomlkit
, ujson
}:
buildPythonPackage rec {
pname = "cattrs";
version = "1.1.2";
version = "1.7.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "Tinche";
repo = pname;
rev = "v${version}";
sha256 = "083d5mi6x7qcl26wlvwwn7gsp5chxlxkh4rp3a41w8cfwwr3h6l8";
sha256 = "sha256-7F4S4IeApbULXhkEZ0oab3Y7sk20Ag2fCYxsyi4WbWw=";
};
propagatedBuildInputs = [ attrs ];
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
attrs
];
checkInputs = [
bson
hypothesis
immutables
msgpack
pytestCheckHook
pyyaml
tomlkit
ujson
];
postPatch = ''
substituteInPlace setup.cfg \
--replace "-l --benchmark-sort=fullname --benchmark-warmup=true --benchmark-warmup-iterations=5 --benchmark-group-by=fullname" ""
substituteInPlace pyproject.toml \
--replace 'orjson = "^3.5.2"' ""
substituteInPlace tests/test_preconf.py \
--replace "from orjson import dumps as orjson_dumps" "" \
--replace "from orjson import loads as orjson_loads" ""
'';
disabledTestPaths = [
# Don't run benchmarking tests
"bench/test_attrs_collections.py"
"bench/test_attrs_nested.py"
"bench/test_attrs_primitives.py"
"bench/test_primitives.py"
];
disabledTests = [
# orjson is not available as it requires Rust nightly features to compile its requirements
"test_orjson"
];
pythonImportsCheck = [ "cattr" ];

4
pkgs/development/python-modules/celery/default.nix
View File

@@ -12,9 +12,13 @@ buildPythonPackage rec {
sha256 = "54436cd97b031bf2e08064223240e2a83d601d9414bcb1b702f94c6c33c29485";
};
# click is only used for the repl, in most cases this shouldn't impact
# downstream packages
postPatch = ''
substituteInPlace requirements/test.txt \
--replace "moto==1.3.7" moto
substituteInPlace requirements/default.txt \
--replace "click>=7.0,<8.0" click
'';
propagatedBuildInputs = [ billiard click click-didyoumean click-plugins click-repl kombu pytz vine ];

39
pkgs/development/python-modules/censys/default.nix
View File

@@ -2,49 +2,62 @@
, backoff
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, requests
, pytestcov
, requests-mock
, parameterized
, pytestCheckHook
, pythonOlder
, requests
, requests-mock
, responses
, rich
, types-requests
}:
buildPythonPackage rec {
pname = "censys";
version = "1.1.1";
version = "2.0.3";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "censys";
repo = "censys-python";
rev = version;
sha256 = "06jwk0ps80fjzbsy24qn5bsggfpgn4ccjzjz65cdh0ap1mfvh5jf";
rev = "v${version}";
sha256 = "0ga5f6xv6rylfvalnl3cflr0w30r771gb05n5cjhxisb8an0qcb6";
};
propagatedBuildInputs = [
backoff
requests
rich
types-requests
];
checkInputs = [
pytestcov
parameterized
pytestCheckHook
requests-mock
parameterized
responses
];
postPatch = ''
substituteInPlace setup.py \
--replace "rich==10.3.0" "rich" \
--replace "types-requests==0.1.11" "types-requests"
substituteInPlace pytest.ini --replace \
" --cov -rs -p no:warnings" ""
'';
# The tests want to write a configuration file
preCheck = ''
export HOME=$(mktemp -d)
mkdir -p $HOME
'';
# All other tests require an API key
pytestFlagsArray = [ "tests/test_config.py" ];
'';
pythonImportsCheck = [ "censys" ];
meta = with lib; {
description = "Python API wrapper for the Censys Search Engine (censys.io)";
homepage = "https://github.com/censys/censys-python";
license = with licenses; [ asl20 ];
maintainers = [ maintainers.fab ];
maintainers = with maintainers; [ fab ];
};
}

4
pkgs/development/python-modules/datadog/default.nix
View File

@@ -17,11 +17,11 @@
buildPythonPackage rec {
pname = "datadog";
version = "0.41.0";
version = "0.42.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-PeGkO4qNX2sZ0WLsG0gtxasmNsWc9l5gWJcCMEUQpok=";
sha256 = "sha256-em+sF6fQnxiDq5pFzk/3oWqhpes8xMbN2sf4xT59Hps=";
};
postPatch = ''

4
pkgs/development/python-modules/ecos/default.nix
View File

@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "ecos";
version = "2.0.7.post1";
version = "2.0.8";
disabled = pythonOlder "3.6";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "embotech";
repo = "ecos-python";
rev = version;
sha256 = "1wzmamz2r4xr2zxgfwnm5q283185d1q6a7zn30vip18lxpys70z0";
sha256 = "sha256-2OJqbcOZceeD2fO5cu9fohuUVaA2LwQOQSWR4jRv3mk=";
fetchSubmodules = true;
};

31
pkgs/development/python-modules/editdistance-s/default.nix Normal file
View File

@@ -0,0 +1,31 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, cffi
}:
buildPythonPackage rec {
pname = "editdistance-s";
version = "1.0.0";
src = fetchFromGitHub {
owner = "asottile";
repo = pname;
rev = "v${version}";
sha256 = "0w2qd5b6a3c3ahd0xy9ykq4wzqk0byqwdqrr26dyn8j2425j46lg";
};
propagatedBuildInputs = [ cffi ];
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "editdistance_s" ];
meta = with lib; {
description = "Fast implementation of the edit distance (Levenshtein distance)";
homepage = "https://github.com/asottile/editdistance-s";
license = with licenses; [ mit ];
maintainers = with maintainers; [ austinbutler ];
};
}

32
pkgs/development/python-modules/gibberish-detector/default.nix Normal file
View File

@@ -0,0 +1,32 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, isPy27
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "gibberish-detector";
version = "0.1.1";
disabled = isPy27;
src = fetchFromGitHub {
owner = "domanchi";
repo = pname;
rev = "v${version}";
sha256 = "1si0fkpnk9vjkwl31sq5jkyv3rz8a5f2nh3xq7591j9wv2b6dn0b";
};
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "gibberish_detector" ];
meta = with lib; {
description = "Python module to detect gibberish strings";
homepage = "https://github.com/domanchi/gibberish-detector";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

4
pkgs/development/python-modules/gssapi/default.nix
View File

@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "gssapi";
version = "1.6.12";
version = "1.6.14";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "pythongssapi";
repo = "python-${pname}";
rev = "v${version}";
sha256 = "0r6w52vji1095n3wgzjz9ddaqsvsf3f4gal0rv5i62hpqwlbzkn7";
sha256 = "sha256-pL8uvHUdev+nDG0nGh7j7VIJCIQv0egPoTa9hUMuEZc=";
};
# It's used to locate headers

8
pkgs/development/python-modules/identify/default.nix
View File

@@ -2,23 +2,23 @@
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, editdistance
, editdistance-s
}:
buildPythonPackage rec {
pname = "identify";
version = "1.6.1";
version = "2.2.10";
src = fetchFromGitHub {
owner = "pre-commit";
repo = pname;
rev = "v${version}";
sha256 = "1sqhqqjp53dwm8yq4nrgggxbvzs3szbg49z5sj2ss9xzlgmimclm";
sha256 = "017xcwm8m42a1v3v0fs8v3m2sga97rx9a7vk0cb2g14777f4w4si";
};
checkInputs = [
editdistance
editdistance-s
pytestCheckHook
];

4
pkgs/development/python-modules/itunespy/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchFromGitHub, requests, pycountry, mypy }:
{ lib, buildPythonPackage, fetchFromGitHub, requests, pycountry }:
buildPythonPackage rec {
pname = "itunespy";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
sha256 = "0yc3az5531qs8nbcw4rhgrszwczgy4bikfwfar7xb2044360sslw";
};
propagatedBuildInputs = [ requests pycountry mypy ];
propagatedBuildInputs = [ requests pycountry ];
# This module has no tests
doCheck = false;

6
pkgs/development/python-modules/liquidctl/default.nix
View File

@@ -9,18 +9,19 @@
, smbus-cffi
, i2c-tools
, pytestCheckHook
, colorlog
}:
buildPythonPackage rec {
pname = "liquidctl";
version = "1.6.1";
version = "1.7.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-FYpr1mYzPc0rOE75fUNjxe/57EWl+zcbIbkqFseDhzI=";
sha256 = "sha256-tpk8wCKyrj3dOkBxj9UWcyrAb31uKtl2fRwwh7dAQGE=";
};
nativeBuildInputs = [ installShellFiles ];
@@ -31,6 +32,7 @@ buildPythonPackage rec {
pyusb
smbus-cffi
i2c-tools
colorlog
];
outputs = [ "out" "man" ];

4
pkgs/development/python-modules/lmnotify/default.nix
View File

@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "lmnotify";
version = "0.0.4";
version = "0.0.6";
src = fetchPypi {
inherit pname version;
sha256 = "1l0h4yab7ix8psf65iygc1wy5xwq3v2rwwjixvd8rwk46d2477dx";
sha256 = "sha256-cCP7BU2f7QJe9gAI298cvkp3OGijvBv8G1RN7qfZ5PE=";
};
propagatedBuildInputs = [ oauthlib requests requests_oauthlib ];

27
pkgs/development/python-modules/nmigen/default.nix
View File

@@ -12,9 +12,9 @@
# for tests
, pytestCheckHook
, yosys
, symbiyosys
, yices
, yosys
}:
buildPythonPackage rec {
@@ -31,22 +31,35 @@ buildPythonPackage rec {
sha256 = "0cjs9wgmxa76xqmjhsw4fsb2mhgvd85jgs2mrjxqp6fwp8rlgnl1";
};
nativeBuildInputs = [ setuptools-scm git ];
SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}";
nativeBuildInputs = [
git
setuptools-scm
];
propagatedBuildInputs = [
setuptools
pyvcd
jinja2
pyvcd
setuptools
] ++
lib.optional (pythonOlder "3.9") importlib-resources ++
lib.optional (pythonOlder "3.8") importlib-metadata;
checkInputs = [ pytestCheckHook yosys symbiyosys yices ];
checkInputs = [
pytestCheckHook
symbiyosys
yices
yosys
];
preBuild = ''
export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}"
postPatch = ''
substituteInPlace setup.py \
--replace "Jinja2~=2.11" "Jinja2>=2.11"
'';
pythonImportsCheck = [ "nmigen" ];
meta = with lib; {
description = "A refreshed Python toolbox for building complex digital hardware";
homepage = "https://nmigen.info/nmigen";

6
pkgs/development/python-modules/pydes/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchFromGitHub }:
{ lib, buildPythonPackage, fetchFromGitHub, python }:
buildPythonPackage rec {
pname = "pydes";
@@ -11,7 +11,9 @@ buildPythonPackage rec {
sha256 = "0sic8wbyk5azb4d4m6zbc96lfqcw8s2pzcv9nric5yqc751613ww";
};
checkPhase = "python test_pydes.py";
checkPhase = ''
${python.interpreter} test_pydes.py
'';
pythonImportsCheck = [ "pyDes" ];

4
pkgs/development/python-modules/pyrituals/default.nix
View File

@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pyrituals";
version = "0.0.4";
version = "0.0.5";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
owner = "milanmeu";
repo = pname;
rev = version;
sha256 = "sha256-XJoSKGGwLoHMWxPGfXHeLg8VlIH1/j0ktzWe/pjd//0=";
sha256 = "sha256-iWJhjAUXkoH3MMJ5PFj2rjIy2e0nn57cRoEF6KMfrQg=";
};
propagatedBuildInputs = [ aiohttp ];

4
pkgs/development/python-modules/pytest-rerunfailures/default.nix
View File

@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "pytest-rerunfailures";
version = "9.1.1";
version = "10.1";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "1cb11a17fc121b3918414eb5eaf314ee325f2e693ac7cb3f6abf7560790827f2";
sha256 = "7617c06de13ee6dd2df9add7e275bfb2bcebbaaf3e450f5937cd0200df824273";
};
buildInputs = [ pytest ];

32
pkgs/development/python-modules/python-pidfile/default.nix Normal file
View File

@@ -0,0 +1,32 @@
{ lib
, buildPythonPackage
, fetchPypi
, psutil
}:
buildPythonPackage rec {
pname = "python-pidfile";
version = "3.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-HhCX30G8dfV0WZ/++J6LIO/xvfyRkdPtJkzC2ulUKdA=";
};
propagatedBuildInputs = [
psutil
];
pythonImportsCheck = [ "pidfile" ];
# no tests on the github mirror of the source code
# see this: https://github.com/mosquito/python-pidfile/issues/7
doCheck = false;
meta = with lib; {
description = "Python context manager for managing pid files";
homepage = "https://github.com/mosquito/python-pidfile";
license = with licenses; [ mit ];
maintainers = with maintainers; [ legendofmiracles ];
};
}

4
pkgs/development/python-modules/pytube/default.nix
View File

@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pytube";
version = "10.8.5";
version = "10.9.0";
disabled = pythonOlder "3.6";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
owner = "pytube";
repo = "pytube";
rev = "v${version}";
sha256 = "05w2jlrm1kqki3yq4ssf3ydmy0sf4zcychz94wxsppgr2xrghnhn";
sha256 = "sha256-9kKazy0Fg3YcNIkzgVFQ46Ipn3Dngfnh5DjwRP/fZGg=";
};
checkInputs = [

16
pkgs/development/python-modules/regenmaschine/default.nix
View File

@@ -7,33 +7,37 @@
, poetry-core
, pytest-aiohttp
, pytest-asyncio
, pytest-cov
, pytest-mock
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "regenmaschine";
version = "3.1.2";
version = "3.1.3";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "bachya";
repo = pname;
rev = version;
sha256 = "sha256-lARti3Sb/jh7h8x+lFLqkM/BlL6XmELm46owsL041Cw=";
sha256 = "sha256-3Q0JQQVspzuQQAn3S46uFbOYW2zQ7c1UL4zjEOnifDY=";
};
nativeBuildInputs = [ poetry-core ];
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [ aiohttp ];
propagatedBuildInputs = [
aiohttp
];
checkInputs = [
aresponses
asynctest
pytest-aiohttp
pytest-asyncio
pytest-cov
pytest-mock
pytestCheckHook
];

4
pkgs/development/python-modules/sqlmap/default.nix
View File

@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "sqlmap";
version = "1.5.6";
version = "1.5.7";
src = fetchPypi {
inherit pname version;
sha256 = "fc4be53bb7f64b1cc2e8058e7660059d8f5afb9857cc033084953ea615a10305";
sha256 = "sha256-HTayAlXehm3Azmbi+ar/Vav5bPYmGu9gflzZCwWZihw=";
};
postPatch = ''

26
pkgs/development/python-modules/types-decorator/default.nix Normal file
View File

@@ -0,0 +1,26 @@
{ lib
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "types-decorator";
version = "0.1.5";
src = fetchPypi {
inherit pname version;
sha256 = "0rfg2s4y23w1xk0502sg2jqbzswalkg6infblyzgf94i4bsg1j48";
};
# Modules doesn't have tests
doCheck = false;
pythonImportsCheck = [ "decorator-stubs" ];
meta = with lib; {
description = "Typing stubs for decorator";
homepage = "https://github.com/python/typeshed";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}

26
pkgs/development/python-modules/types-requests/default.nix Normal file
View File

@@ -0,0 +1,26 @@
{ lib
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "types-requests";
version = "2.25.0";
src = fetchPypi {
inherit pname version;
sha256 = "022q31fgiyq6zfjv4pbpg10hh9m7x91wqfc6bdyin50hf980q3gf";
};
# Modules doesn't have tests
doCheck = false;
pythonImportsCheck = [ "requests-stubs" ];
meta = with lib; {
description = "Typing stubs for requests";
homepage = "https://github.com/python/typeshed";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}

15
pkgs/development/python-modules/youtube-search/default.nix
View File

@@ -1,20 +1,19 @@
{ lib, buildPythonPackage, fetchFromGitHub, requests }:
{ lib, buildPythonPackage, fetchPypi, requests }:
buildPythonPackage rec {
pname = "youtube-search";
version = "unstable-2021-02-27";
version = "2.1.0";
src = fetchFromGitHub {
owner = "joetats";
repo = "youtube_search";
rev = "886fe1b16c829215ee0984b6859f874b4a30d875";
sha256 = "sha256-3ECJ6iHNzx5PLgpTFraFzAYbKnyMYRf/iJ0zajU+hlo=";
src = fetchPypi {
inherit pname version;
sha256 = "1541120273996fa433698b2e57b73296dfb8e90536211f29ea997dcf161b66fe";
};
propagatedBuildInputs = [ requests ];
# Check disabled due to relative import with no known parent package
# tests require network connection
doCheck = false;
pythonImportsCheck = [ "youtube_search" ];
meta = with lib; {

12
pkgs/development/tools/analysis/tfsec/default.nix
View File

@@ -2,23 +2,27 @@
buildGoPackage rec {
pname = "tfsec";
version = "0.40.7";
version = "0.41.0";
src = fetchFromGitHub {
owner = "tfsec";
repo = pname;
rev = "v${version}";
sha256 = "1cdxpmlfh76k491ldzv2flxs2wikrryr63h0zw8f6yvhkpbqf4cc";
sha256 = "sha256-MK5cWRPGty7S4pkRZJRZF5qitoPM3im8JJW2J3yQqFo=";
};
goPackagePath = "github.com/tfsec/tfsec";
buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/version.Version=${version}" ];
ldflags = [
"-w"
"-s"
"-X ${goPackagePath}/version.Version=${version}"
];
meta = with lib; {
homepage = "https://github.com/tfsec/tfsec";
description = "Static analysis powered security scanner for your terraform code";
license = licenses.mit;
maintainers = [ maintainers.marsam ];
maintainers = with maintainers; [ marsam ];
};
}

61
pkgs/development/tools/apksigcopier/default.nix Normal file
View File

@@ -0,0 +1,61 @@
{ lib
, fetchFromGitHub
, python3
, installShellFiles
, bash
, pandoc
}:
# FIXME: how to "recommend" apksigner like the Debian package?
python3.pkgs.buildPythonApplication rec {
pname = "apksigcopier";
version = "1.0.0";
src = fetchFromGitHub {
owner = "obfusk";
repo = "apksigcopier";
rev = "v${version}";
sha256 = "1la1ml91jvqc1zakbqfpayjbs67pi3i18bsgz3mf11rxgphd3fpk";
};
nativeBuildInputs = [ installShellFiles pandoc ];
propagatedBuildInputs = with python3.pkgs; [ click ];
checkInputs = with python3.pkgs; [ flake8 mypy pylint ];
postPatch = ''
substituteInPlace Makefile \
--replace /bin/bash ${bash}/bin/bash \
--replace 'apksigcopier --version' '${python3.interpreter} apksigcopier --version'
'';
postBuild = ''
make ${pname}.1
'';
checkPhase = ''
make test
'';
postInstall = ''
installManPage ${pname}.1
'';
meta = with lib; {
description = "Copy/extract/patch apk signatures & compare apks";
longDescription = ''
apksigcopier is a tool for copying APK signatures from a signed APK
to an unsigned one (in order to verify reproducible builds). It can
also be used to compare two APKs with different signatures. Its
command-line tool offers four operations:
* copy signatures directly from a signed to an unsigned APK
* extract signatures from a signed APK to a directory
* patch previously extracted signatures onto an unsigned APK
* compare two APKs with different signatures (requires apksigner)
'';
homepage = "https://github.com/obfusk/apksigcopier";
license = with licenses; [ gpl3Plus ];
maintainers = [ maintainers.obfusk ];
};
}

2
pkgs/development/tools/build-managers/boot/default.nix
View File

@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Build tooling for Clojure";
homepage = "https://boot-clj.com/";
homepage = "https://boot-clj.github.io/";
license = licenses.epl10;
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ ragge ];

16
pkgs/development/tools/continuous-integration/jenkins/default.nix
View File

@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, common-updater-scripts, coreutils, git, gnused, nix
, nixfmt, writeScript, nixosTests, jq, cacert, curl }:
{ lib, stdenv, fetchurl, common-updater-scripts, coreutils, git, gnused, makeWrapper, nix
, nixfmt, openjdk, writeScript, nixosTests, jq, cacert, curl }:
stdenv.mkDerivation rec {
pname = "jenkins";
@@ -10,9 +10,19 @@ stdenv.mkDerivation rec {
sha256 = "0413ymfrb00ifxl8ww8nn8y4k07jhgsaxaw2h0qnfh9s6yxifpbf";
};
nativeBuildInputs = [ makeWrapper ];
buildCommand = ''
mkdir -p "$out/webapps"
mkdir -p "$out/bin" "$out/share" "$out/webapps"
cp "$src" "$out/webapps/jenkins.war"
# Create the `jenkins-cli` command.
${openjdk}/bin/jar -xf "$src" WEB-INF/lib/cli-${version}.jar \
&& mv WEB-INF/lib/cli-${version}.jar "$out/share/jenkins-cli.jar"
makeWrapper "${openjdk}/bin/java" "$out/bin/jenkins-cli" \
--add-flags "-jar $out/share/jenkins-cli.jar"
'';
passthru = {

39
pkgs/development/tools/detect-secrets/default.nix
View File

@@ -1,10 +1,7 @@
{ lib
, buildPythonApplication
, configparser
, enum34
, fetchFromGitHub
, functools32
, future
, gibberish-detector
, isPy27
, mock
, pyahocorasick
@@ -17,34 +14,54 @@
buildPythonApplication rec {
pname = "detect-secrets";
version = "0.14.3";
version = "1.1.0";
disabled = isPy27;
# PyPI tarball doesn't ship tests
src = fetchFromGitHub {
owner = "Yelp";
repo = pname;
rev = "v${version}";
sha256 = "0c4hxih9ljmv0d3izq5idyspk5zci26gdb6lv9klwcshwrfkvxj0";
sha256 = "sha256-dj0lqm9s8OKhM4OmNrmGVRc32/ZV0I9+5WcW2hvLwu0=";
};
propagatedBuildInputs = [
gibberish-detector
pyyaml
pyahocorasick
requests
];
checkInputs = [
mock
pyahocorasick
pytestCheckHook
responses
unidiff
];
preCheck = ''
export HOME=$(mktemp -d);
'';
disabledTests = [
"TestMain"
"TestPreCommitHook"
"TestInitializeBaseline"
# Tests are failing for various reasons. Needs to be adjusted with the next update
"test_baseline_filters_out_known_secrets"
"test_basic"
"test_does_not_modify_slim_baseline"
"test_handles_each_path_separately"
"test_handles_multiple_directories"
"test_load_and_output"
"test_make_decisions"
"test_modifies_baseline"
"test_no_files_in_git_repo"
"test_outputs_baseline_if_none_supplied"
"test_saves_to_baseline"
"test_scan_all_files"
"test_should_scan_all_files_in_directory_if_flag_is_provided"
"test_should_scan_specific_non_tracked_file"
"test_should_scan_tracked_files_in_directory"
"test_start_halfway"
"test_works_from_different_directory"
"TestModifiesBaselineFromVersionChange"
];
pythonImportsCheck = [ "detect_secrets" ];

11
pkgs/development/tools/rust/rust-analyzer/default.nix
View File

@@ -7,21 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "rust-analyzer-unwrapped";
version = "2021-06-28";
cargoSha256 = "sha256-Xpo/VK/w6BVbHUc+m/70AE0Cag8D3fT+wosOA8Lzz2A=";
version = "2021-07-05";
cargoSha256 = "sha256-HmvvDHi33JAYXON98mbb+MfmJizOL4cdTbc3QDtPkZo=";
src = fetchFromGitHub {
owner = "rust-analyzer";
repo = "rust-analyzer";
rev = version;
sha256 = "sha256-aWLqcCSeKRmCsETu4ri+SPQ5iB6nqaYELj0Qt3zW9/E=";
sha256 = "sha256-7pH38U+HMNPuO1BFP5kPTJoxGWTewRUoLrc9NXDdK2M=";
};
patches = [
# We have rustc 1.52.1 in nixpkgs.
./no-rust-1-53-features.patch
];
buildAndTestSubdir = "crates/rust-analyzer";
cargoBuildFlags = lib.optional useMimalloc "--features=mimalloc";

689
pkgs/development/tools/rust/rust-analyzer/no-rust-1-53-features.patch
View File

@@ -1,689 +0,0 @@
diff --git a/crates/hir/src/semantics.rs b/crates/hir/src/semantics.rs
index 43162797e..613266e07 100644
--- a/crates/hir/src/semantics.rs
+++ b/crates/hir/src/semantics.rs
@@ -51,14 +51,12 @@ impl PathResolution {
PathResolution::Def(ModuleDef::BuiltinType(builtin)) => {
Some(TypeNs::BuiltinType((*builtin).into()))
}
- PathResolution::Def(
- ModuleDef::Const(_)
- | ModuleDef::Variant(_)
- | ModuleDef::Function(_)
- | ModuleDef::Module(_)
- | ModuleDef::Static(_)
- | ModuleDef::Trait(_),
- ) => None,
+ PathResolution::Def(ModuleDef::Const(_))
+ | PathResolution::Def(ModuleDef::Variant(_))
+ | PathResolution::Def(ModuleDef::Function(_))
+ | PathResolution::Def(ModuleDef::Module(_))
+ | PathResolution::Def(ModuleDef::Static(_))
+ | PathResolution::Def(ModuleDef::Trait(_)) => None,
PathResolution::Def(ModuleDef::TypeAlias(alias)) => {
Some(TypeNs::TypeAliasId((*alias).into()))
}
@@ -67,7 +65,8 @@ impl PathResolution {
}
PathResolution::TypeParam(param) => Some(TypeNs::GenericParam((*param).into())),
PathResolution::SelfType(impl_def) => Some(TypeNs::SelfType((*impl_def).into())),
- PathResolution::AssocItem(AssocItem::Const(_) | AssocItem::Function(_)) => None,
+ PathResolution::AssocItem(AssocItem::Const(_))
+ | PathResolution::AssocItem(AssocItem::Function(_)) => None,
PathResolution::AssocItem(AssocItem::TypeAlias(alias)) => {
Some(TypeNs::TypeAliasId((*alias).into()))
}
diff --git a/crates/hir_def/src/item_tree/pretty.rs b/crates/hir_def/src/item_tree/pretty.rs
index 8b12e5a67..d03c11377 100644
--- a/crates/hir_def/src/item_tree/pretty.rs
+++ b/crates/hir_def/src/item_tree/pretty.rs
@@ -63,7 +63,7 @@ impl<'a> Printer<'a> {
fn blank(&mut self) {
let mut iter = self.buf.chars().rev().fuse();
match (iter.next(), iter.next()) {
- (Some('\n'), Some('\n') | None) | (None, None) => {}
+ (Some('\n'), Some('\n')) | (Some('\n'), None) | (None, None) => {}
(Some('\n'), Some(_)) => {
self.buf.push('\n');
}
@@ -77,7 +77,7 @@ impl<'a> Printer<'a> {
fn whitespace(&mut self) {
match self.buf.chars().next_back() {
- None | Some('\n' | ' ') => {}
+ None | Some('\n') | Some(' ') => {}
_ => self.buf.push(' '),
}
}
diff --git a/crates/hir_def/src/nameres/collector.rs b/crates/hir_def/src/nameres/collector.rs
index 634e02205..250eb1c3e 100644
--- a/crates/hir_def/src/nameres/collector.rs
+++ b/crates/hir_def/src/nameres/collector.rs
@@ -1260,7 +1260,7 @@ impl DefCollector<'_> {
for directive in &self.unresolved_imports {
if let ImportSource::Import { id: import, use_tree } = &directive.import.source {
match (directive.import.path.segments().first(), &directive.import.path.kind) {
- (Some(krate), PathKind::Plain | PathKind::Abs) => {
+ (Some(krate), PathKind::Plain) | (Some(krate), PathKind::Abs) => {
if diagnosed_extern_crates.contains(krate) {
continue;
}
diff --git a/crates/hir_def/src/resolver.rs b/crates/hir_def/src/resolver.rs
index a11439c3b..1841fe989 100644
--- a/crates/hir_def/src/resolver.rs
+++ b/crates/hir_def/src/resolver.rs
@@ -605,7 +605,8 @@ fn to_value_ns(per_ns: PerNs) -> Option<ValueNs> {
ModuleDefId::ConstId(it) => ValueNs::ConstId(it),
ModuleDefId::StaticId(it) => ValueNs::StaticId(it),
- ModuleDefId::AdtId(AdtId::EnumId(_) | AdtId::UnionId(_))
+ ModuleDefId::AdtId(AdtId::EnumId(_))
+ | ModuleDefId::AdtId(AdtId::UnionId(_))
| ModuleDefId::TraitId(_)
| ModuleDefId::TypeAliasId(_)
| ModuleDefId::BuiltinType(_)
diff --git a/crates/hir_def/src/visibility.rs b/crates/hir_def/src/visibility.rs
index aeb1e7726..83500f54e 100644
--- a/crates/hir_def/src/visibility.rs
+++ b/crates/hir_def/src/visibility.rs
@@ -172,8 +172,9 @@ impl Visibility {
/// visible in unrelated modules).
pub(crate) fn max(self, other: Visibility, def_map: &DefMap) -> Option<Visibility> {
match (self, other) {
- (Visibility::Module(_) | Visibility::Public, Visibility::Public)
- | (Visibility::Public, Visibility::Module(_)) => Some(Visibility::Public),
+ (Visibility::Module(_), Visibility::Public)
+ | (Visibility::Public, Visibility::Module(_))
+ | (Visibility::Public, Visibility::Public) => Some(Visibility::Public),
(Visibility::Module(mod_a), Visibility::Module(mod_b)) => {
if mod_a.krate != mod_b.krate {
return None;
diff --git a/crates/hir_expand/src/hygiene.rs b/crates/hir_expand/src/hygiene.rs
index 848522411..05c6c3fb1 100644
--- a/crates/hir_expand/src/hygiene.rs
+++ b/crates/hir_expand/src/hygiene.rs
@@ -146,11 +146,10 @@ impl HygieneInfo {
(&self.macro_arg.1, InFile::new(loc.kind.file_id(), arg_start))
}
mbe::Origin::Def => match (&*self.macro_def, self.def_start) {
- (
- TokenExpander::MacroDef { def_site_token_map, .. }
- | TokenExpander::MacroRules { def_site_token_map, .. },
- Some(tt),
- ) => (def_site_token_map, tt),
+ (TokenExpander::MacroDef { def_site_token_map, .. }, Some(tt))
+ | (TokenExpander::MacroRules { def_site_token_map, .. }, Some(tt)) => {
+ (def_site_token_map, tt)
+ }
_ => panic!("`Origin::Def` used with non-`macro_rules!` macro"),
},
};
diff --git a/crates/hir_expand/src/lib.rs b/crates/hir_expand/src/lib.rs
index c31426d7c..33107aa24 100644
--- a/crates/hir_expand/src/lib.rs
+++ b/crates/hir_expand/src/lib.rs
@@ -368,11 +368,10 @@ impl ExpansionInfo {
let (token_map, tt) = match origin {
mbe::Origin::Call => (&self.macro_arg.1, self.arg.clone()),
mbe::Origin::Def => match (&*self.macro_def, self.def.as_ref()) {
- (
- db::TokenExpander::MacroRules { def_site_token_map, .. }
- | db::TokenExpander::MacroDef { def_site_token_map, .. },
- Some(tt),
- ) => (def_site_token_map, tt.as_ref().map(|tt| tt.syntax().clone())),
+ (db::TokenExpander::MacroRules { def_site_token_map, .. }, Some(tt))
+ | (db::TokenExpander::MacroDef { def_site_token_map, .. }, Some(tt)) => {
+ (def_site_token_map, tt.as_ref().map(|tt| tt.syntax().clone()))
+ }
_ => panic!("`Origin::Def` used with non-`macro_rules!` macro"),
},
};
diff --git a/crates/hir_ty/src/consteval.rs b/crates/hir_ty/src/consteval.rs
index ab1afce08..6f0bf8f8c 100644
--- a/crates/hir_ty/src/consteval.rs
+++ b/crates/hir_ty/src/consteval.rs
@@ -38,7 +38,8 @@ impl ConstExt for Const {
// FIXME: support more than just evaluating literals
pub fn eval_usize(expr: &Expr) -> Option<u64> {
match expr {
- Expr::Literal(Literal::Uint(v, None | Some(BuiltinUint::Usize))) => (*v).try_into().ok(),
+ Expr::Literal(Literal::Uint(v, None))
+ | Expr::Literal(Literal::Uint(v, Some(BuiltinUint::Usize))) => (*v).try_into().ok(),
_ => None,
}
}
diff --git a/crates/hir_ty/src/diagnostics/match_check/deconstruct_pat.rs b/crates/hir_ty/src/diagnostics/match_check/deconstruct_pat.rs
index e3d640a79..471cd4921 100644
--- a/crates/hir_ty/src/diagnostics/match_check/deconstruct_pat.rs
+++ b/crates/hir_ty/src/diagnostics/match_check/deconstruct_pat.rs
@@ -84,7 +84,10 @@ impl IntRange {
#[inline]
fn is_integral(ty: &Ty) -> bool {
match ty.kind(&Interner) {
- TyKind::Scalar(Scalar::Char | Scalar::Int(_) | Scalar::Uint(_) | Scalar::Bool) => true,
+ TyKind::Scalar(Scalar::Char)
+ | TyKind::Scalar(Scalar::Int(_))
+ | TyKind::Scalar(Scalar::Uint(_))
+ | TyKind::Scalar(Scalar::Bool) => true,
_ => false,
}
}
@@ -378,7 +381,7 @@ impl Constructor {
// Wildcards cover anything
(_, Wildcard) => true,
// The missing ctors are not covered by anything in the matrix except wildcards.
- (Missing | Wildcard, _) => false,
+ (Missing, _) | (Wildcard, _) => false,
(Single, Single) => true,
(Variant(self_id), Variant(other_id)) => self_id == other_id,
@@ -520,7 +523,7 @@ impl SplitWildcard {
}
}
TyKind::Scalar(Scalar::Char) => unhandled(),
- TyKind::Scalar(Scalar::Int(..) | Scalar::Uint(..)) => unhandled(),
+ TyKind::Scalar(Scalar::Int(..)) | TyKind::Scalar(Scalar::Uint(..)) => unhandled(),
TyKind::Never if !cx.feature_exhaustive_patterns() && !pcx.is_top_level => {
smallvec![NonExhaustive]
}
diff --git a/crates/hir_ty/src/infer/coerce.rs b/crates/hir_ty/src/infer/coerce.rs
index 7be914451..4b7f31521 100644
--- a/crates/hir_ty/src/infer/coerce.rs
+++ b/crates/hir_ty/src/infer/coerce.rs
@@ -47,7 +47,10 @@ impl<'a> InferenceContext<'a> {
// pointers to have a chance at getting a match. See
// https://github.com/rust-lang/rust/blob/7b805396bf46dce972692a6846ce2ad8481c5f85/src/librustc_typeck/check/coercion.rs#L877-L916
let sig = match (ty1.kind(&Interner), ty2.kind(&Interner)) {
- (TyKind::FnDef(..) | TyKind::Closure(..), TyKind::FnDef(..) | TyKind::Closure(..)) => {
+ (TyKind::FnDef(..), TyKind::FnDef(..))
+ | (TyKind::Closure(..), TyKind::FnDef(..))
+ | (TyKind::FnDef(..), TyKind::Closure(..))
+ | (TyKind::Closure(..), TyKind::Closure(..)) => {
// FIXME: we're ignoring safety here. To be more correct, if we have one FnDef and one Closure,
// we should be coercing the closure to a fn pointer of the safety of the FnDef
cov_mark::hit!(coerce_fn_reification);
@@ -445,7 +448,8 @@ fn safe_to_unsafe_fn_ty(fn_ty: FnPointer) -> FnPointer {
fn coerce_mutabilities(from: Mutability, to: Mutability) -> Result<(), TypeError> {
match (from, to) {
- (Mutability::Mut, Mutability::Mut | Mutability::Not)
+ (Mutability::Mut, Mutability::Mut)
+ | (Mutability::Mut, Mutability::Not)
| (Mutability::Not, Mutability::Not) => Ok(()),
(Mutability::Not, Mutability::Mut) => Err(TypeError),
}
diff --git a/crates/hir_ty/src/infer/expr.rs b/crates/hir_ty/src/infer/expr.rs
index c3a5b979f..346e94128 100644
--- a/crates/hir_ty/src/infer/expr.rs
+++ b/crates/hir_ty/src/infer/expr.rs
@@ -593,11 +593,11 @@ impl<'a> InferenceContext<'a> {
UnaryOp::Neg => {
match inner_ty.kind(&Interner) {
// Fast path for builtins
- TyKind::Scalar(Scalar::Int(_) | Scalar::Uint(_) | Scalar::Float(_))
- | TyKind::InferenceVar(
- _,
- TyVariableKind::Integer | TyVariableKind::Float,
- ) => inner_ty,
+ TyKind::Scalar(Scalar::Int(_))
+ | TyKind::Scalar(Scalar::Uint(_))
+ | TyKind::Scalar(Scalar::Float(_))
+ | TyKind::InferenceVar(_, TyVariableKind::Integer)
+ | TyKind::InferenceVar(_, TyVariableKind::Float) => inner_ty,
// Otherwise we resolve via the std::ops::Neg trait
_ => self
.resolve_associated_type(inner_ty, self.resolve_ops_neg_output()),
@@ -606,7 +606,9 @@ impl<'a> InferenceContext<'a> {
UnaryOp::Not => {
match inner_ty.kind(&Interner) {
// Fast path for builtins
- TyKind::Scalar(Scalar::Bool | Scalar::Int(_) | Scalar::Uint(_))
+ TyKind::Scalar(Scalar::Bool)
+ | TyKind::Scalar(Scalar::Int(_))
+ | TyKind::Scalar(Scalar::Uint(_))
| TyKind::InferenceVar(_, TyVariableKind::Integer) => inner_ty,
// Otherwise we resolve via the std::ops::Not trait
_ => self
@@ -733,7 +735,7 @@ impl<'a> InferenceContext<'a> {
Expr::Array(array) => {
let elem_ty =
match expected.to_option(&mut self.table).as_ref().map(|t| t.kind(&Interner)) {
- Some(TyKind::Array(st, _) | TyKind::Slice(st)) => st.clone(),
+ Some(TyKind::Array(st, _)) | Some(TyKind::Slice(st)) => st.clone(),
_ => self.table.new_type_var(),
};
diff --git a/crates/hir_ty/src/infer/pat.rs b/crates/hir_ty/src/infer/pat.rs
index c79ed91ea..80ecd4ea9 100644
--- a/crates/hir_ty/src/infer/pat.rs
+++ b/crates/hir_ty/src/infer/pat.rs
@@ -297,11 +297,10 @@ fn is_non_ref_pat(body: &hir_def::body::Body, pat: PatId) -> bool {
Expr::Literal(Literal::String(..)) => false,
_ => true,
},
- Pat::Bind {
- mode: BindingAnnotation::Mutable | BindingAnnotation::Unannotated,
- subpat: Some(subpat),
- ..
- } => is_non_ref_pat(body, *subpat),
+ Pat::Bind { mode: BindingAnnotation::Mutable, subpat: Some(subpat), .. }
+ | Pat::Bind { mode: BindingAnnotation::Unannotated, subpat: Some(subpat), .. } => {
+ is_non_ref_pat(body, *subpat)
+ }
Pat::Wild | Pat::Bind { .. } | Pat::Ref { .. } | Pat::Box { .. } | Pat::Missing => false,
}
}
diff --git a/crates/hir_ty/src/op.rs b/crates/hir_ty/src/op.rs
index 5ef6342d5..0222de2bc 100644
--- a/crates/hir_ty/src/op.rs
+++ b/crates/hir_ty/src/op.rs
@@ -8,15 +8,17 @@ pub(super) fn binary_op_return_ty(op: BinaryOp, lhs_ty: Ty, rhs_ty: Ty) -> Ty {
match op {
BinaryOp::LogicOp(_) | BinaryOp::CmpOp(_) => TyKind::Scalar(Scalar::Bool).intern(&Interner),
BinaryOp::Assignment { .. } => TyBuilder::unit(),
- BinaryOp::ArithOp(ArithOp::Shl | ArithOp::Shr) => {
+ BinaryOp::ArithOp(ArithOp::Shl) | BinaryOp::ArithOp(ArithOp::Shr) => {
// all integer combinations are valid here
if matches!(
lhs_ty.kind(&Interner),
- TyKind::Scalar(Scalar::Int(_) | Scalar::Uint(_))
+ TyKind::Scalar(Scalar::Int(_))
+ | TyKind::Scalar(Scalar::Uint(_))
| TyKind::InferenceVar(_, TyVariableKind::Integer)
) && matches!(
rhs_ty.kind(&Interner),
- TyKind::Scalar(Scalar::Int(_) | Scalar::Uint(_))
+ TyKind::Scalar(Scalar::Int(_))
+ | TyKind::Scalar(Scalar::Uint(_))
| TyKind::InferenceVar(_, TyVariableKind::Integer)
) {
lhs_ty
@@ -30,15 +32,15 @@ pub(super) fn binary_op_return_ty(op: BinaryOp, lhs_ty: Ty, rhs_ty: Ty) -> Ty {
| (TyKind::Scalar(Scalar::Uint(_)), TyKind::Scalar(Scalar::Uint(_)))
| (TyKind::Scalar(Scalar::Float(_)), TyKind::Scalar(Scalar::Float(_))) => rhs_ty,
// ({int}, int) | ({int}, uint)
- (
- TyKind::InferenceVar(_, TyVariableKind::Integer),
- TyKind::Scalar(Scalar::Int(_) | Scalar::Uint(_)),
- ) => rhs_ty,
+ (TyKind::InferenceVar(_, TyVariableKind::Integer), TyKind::Scalar(Scalar::Int(_)))
+ | (TyKind::InferenceVar(_, TyVariableKind::Integer), TyKind::Scalar(Scalar::Uint(_))) => {
+ rhs_ty
+ }
// (int, {int}) | (uint, {int})
- (
- TyKind::Scalar(Scalar::Int(_) | Scalar::Uint(_)),
- TyKind::InferenceVar(_, TyVariableKind::Integer),
- ) => lhs_ty,
+ (TyKind::Scalar(Scalar::Int(_)), TyKind::InferenceVar(_, TyVariableKind::Integer))
+ | (TyKind::Scalar(Scalar::Uint(_)), TyKind::InferenceVar(_, TyVariableKind::Integer)) => {
+ lhs_ty
+ }
// ({float} | float)
(TyKind::InferenceVar(_, TyVariableKind::Float), TyKind::Scalar(Scalar::Float(_))) => {
rhs_ty
@@ -67,15 +69,21 @@ pub(super) fn binary_op_rhs_expectation(op: BinaryOp, lhs_ty: Ty) -> Ty {
BinaryOp::Assignment { op: None } => lhs_ty,
BinaryOp::CmpOp(CmpOp::Eq { .. }) => match lhs_ty.kind(&Interner) {
TyKind::Scalar(_) | TyKind::Str => lhs_ty,
- TyKind::InferenceVar(_, TyVariableKind::Integer | TyVariableKind::Float) => lhs_ty,
+ TyKind::InferenceVar(_, TyVariableKind::Integer)
+ | TyKind::InferenceVar(_, TyVariableKind::Float) => lhs_ty,
_ => TyKind::Error.intern(&Interner),
},
- BinaryOp::ArithOp(ArithOp::Shl | ArithOp::Shr) => TyKind::Error.intern(&Interner),
+ BinaryOp::ArithOp(ArithOp::Shl) | BinaryOp::ArithOp(ArithOp::Shr) => {
+ TyKind::Error.intern(&Interner)
+ }
BinaryOp::CmpOp(CmpOp::Ord { .. })
| BinaryOp::Assignment { op: Some(_) }
| BinaryOp::ArithOp(_) => match lhs_ty.kind(&Interner) {
- TyKind::Scalar(Scalar::Int(_) | Scalar::Uint(_) | Scalar::Float(_)) => lhs_ty,
- TyKind::InferenceVar(_, TyVariableKind::Integer | TyVariableKind::Float) => lhs_ty,
+ TyKind::Scalar(Scalar::Int(_))
+ | TyKind::Scalar(Scalar::Uint(_))
+ | TyKind::Scalar(Scalar::Float(_)) => lhs_ty,
+ TyKind::InferenceVar(_, TyVariableKind::Integer)
+ | TyKind::InferenceVar(_, TyVariableKind::Float) => lhs_ty,
_ => TyKind::Error.intern(&Interner),
},
}
diff --git a/crates/ide/src/join_lines.rs b/crates/ide/src/join_lines.rs
index ffa8bd182..93d3760bf 100644
--- a/crates/ide/src/join_lines.rs
+++ b/crates/ide/src/join_lines.rs
@@ -197,7 +197,7 @@ fn join_single_use_tree(edit: &mut TextEditBuilder, token: &SyntaxToken) -> Opti
}
fn is_trailing_comma(left: SyntaxKind, right: SyntaxKind) -> bool {
- matches!((left, right), (T![,], T![')'] | T![']']))
+ matches!((left, right), (T![,], T![')']) | (T![,], T![']']))
}
fn compute_ws(left: SyntaxKind, right: SyntaxKind) -> &'static str {
diff --git a/crates/ide/src/references.rs b/crates/ide/src/references.rs
index 2d3a0f598..7a7654b6c 100644
--- a/crates/ide/src/references.rs
+++ b/crates/ide/src/references.rs
@@ -79,7 +79,8 @@ pub(crate) fn find_all_refs(
});
usages.references.retain(|_, it| !it.is_empty());
}
- Definition::ModuleDef(hir::ModuleDef::Adt(_) | hir::ModuleDef::Variant(_)) => {
+ Definition::ModuleDef(hir::ModuleDef::Adt(_))
+ | Definition::ModuleDef(hir::ModuleDef::Variant(_)) => {
refs.for_each(|it| {
it.retain(|reference| {
reference.name.as_name_ref().map_or(false, is_lit_name_ref)
diff --git a/crates/ide/src/syntax_highlighting.rs b/crates/ide/src/syntax_highlighting.rs
index 5259d86d2..365d0c4de 100644
--- a/crates/ide/src/syntax_highlighting.rs
+++ b/crates/ide/src/syntax_highlighting.rs
@@ -295,7 +295,7 @@ fn traverse(
Some(parent) => {
// We only care Name and Name_ref
match (token.kind(), parent.kind()) {
- (IDENT, NAME | NAME_REF) => parent.into(),
+ (IDENT, NAME) | (IDENT, NAME_REF) => parent.into(),
_ => token.into(),
}
}
@@ -311,7 +311,7 @@ fn traverse(
Some(parent) => {
// We only care Name and Name_ref
match (token.kind(), parent.kind()) {
- (IDENT, NAME | NAME_REF) => parent.into(),
+ (IDENT, NAME) | (IDENT, NAME_REF) => parent.into(),
_ => token.into(),
}
}
diff --git a/crates/ide_assists/src/handlers/extract_function.rs b/crates/ide_assists/src/handlers/extract_function.rs
index 870d4f665..454de2645 100644
--- a/crates/ide_assists/src/handlers/extract_function.rs
+++ b/crates/ide_assists/src/handlers/extract_function.rs
@@ -1398,7 +1398,7 @@ fn fix_param_usages(ctx: &AssistContext, params: &[Param], syntax: &SyntaxNode)
for (param, usages) in usages_for_param {
for usage in usages {
match usage.syntax().ancestors().skip(1).find_map(ast::Expr::cast) {
- Some(ast::Expr::MethodCallExpr(_) | ast::Expr::FieldExpr(_)) => {
+ Some(ast::Expr::MethodCallExpr(_)) | Some(ast::Expr::FieldExpr(_)) => {
// do nothing
}
Some(ast::Expr::RefExpr(node))
diff --git a/crates/ide_assists/src/tests.rs b/crates/ide_assists/src/tests.rs
index 841537c77..d9d9124b6 100644
--- a/crates/ide_assists/src/tests.rs
+++ b/crates/ide_assists/src/tests.rs
@@ -181,10 +181,9 @@ fn check(handler: Handler, before: &str, expected: ExpectedResult, assist_label:
"unresolved assist should not contain source changes"
),
(Some(_), ExpectedResult::NotApplicable) => panic!("assist should not be applicable!"),
- (
- None,
- ExpectedResult::After(_) | ExpectedResult::Target(_) | ExpectedResult::Unresolved,
- ) => {
+ (None, ExpectedResult::After(_))
+ | (None, ExpectedResult::Target(_))
+ | (None, ExpectedResult::Unresolved) => {
panic!("code action is not applicable")
}
(None, ExpectedResult::NotApplicable) => (),
diff --git a/crates/ide_completion/src/completions/qualified_path.rs b/crates/ide_completion/src/completions/qualified_path.rs
index 1b8997ecf..aaaef27d2 100644
--- a/crates/ide_completion/src/completions/qualified_path.rs
+++ b/crates/ide_completion/src/completions/qualified_path.rs
@@ -65,11 +65,9 @@ pub(crate) fn complete_qualified_path(acc: &mut Completions, ctx: &CompletionCon
// Don't suggest attribute macros and derives.
hir::ScopeDef::MacroDef(mac) => mac.is_fn_like(),
// no values in type places
- hir::ScopeDef::ModuleDef(
- hir::ModuleDef::Function(_)
- | hir::ModuleDef::Variant(_)
- | hir::ModuleDef::Static(_),
- )
+ hir::ScopeDef::ModuleDef(hir::ModuleDef::Function(_))
+ | hir::ScopeDef::ModuleDef(hir::ModuleDef::Variant(_))
+ | hir::ScopeDef::ModuleDef(hir::ModuleDef::Static(_))
| hir::ScopeDef::Local(_) => !ctx.expects_type(),
// unless its a constant in a generic arg list position
hir::ScopeDef::ModuleDef(hir::ModuleDef::Const(_)) => {
@@ -83,13 +81,9 @@ pub(crate) fn complete_qualified_path(acc: &mut Completions, ctx: &CompletionCon
}
}
}
- hir::PathResolution::Def(
- def
- @
- (hir::ModuleDef::Adt(_)
- | hir::ModuleDef::TypeAlias(_)
- | hir::ModuleDef::BuiltinType(_)),
- ) => {
+ hir::PathResolution::Def(def @ hir::ModuleDef::Adt(_))
+ | hir::PathResolution::Def(def @ hir::ModuleDef::TypeAlias(_))
+ | hir::PathResolution::Def(def @ hir::ModuleDef::BuiltinType(_)) => {
if let hir::ModuleDef::Adt(hir::Adt::Enum(e)) = def {
add_enum_variants(acc, ctx, e);
}
diff --git a/crates/ide_completion/src/completions/unqualified_path.rs b/crates/ide_completion/src/completions/unqualified_path.rs
index 5abd6ee37..5e6a2e661 100644
--- a/crates/ide_completion/src/completions/unqualified_path.rs
+++ b/crates/ide_completion/src/completions/unqualified_path.rs
@@ -40,7 +40,7 @@ pub(crate) fn complete_unqualified_path(acc: &mut Completions, ctx: &CompletionC
ctx.scope.process_all_names(&mut |name, res| {
let add_resolution = match res {
ScopeDef::MacroDef(mac) => mac.is_fn_like(),
- ScopeDef::ModuleDef(hir::ModuleDef::Trait(_) | hir::ModuleDef::Module(_)) => true,
+ ScopeDef::ModuleDef(hir::ModuleDef::Trait(_)) | ScopeDef::ModuleDef(hir::ModuleDef::Module(_)) => true,
_ => false,
};
if add_resolution {
@@ -88,11 +88,9 @@ pub(crate) fn complete_unqualified_path(acc: &mut Completions, ctx: &CompletionC
// Don't suggest attribute macros and derives.
ScopeDef::MacroDef(mac) => mac.is_fn_like(),
// no values in type places
- ScopeDef::ModuleDef(
- hir::ModuleDef::Function(_)
- | hir::ModuleDef::Variant(_)
- | hir::ModuleDef::Static(_),
- )
+ ScopeDef::ModuleDef(hir::ModuleDef::Function(_))
+ | ScopeDef::ModuleDef(hir::ModuleDef::Variant(_))
+ | ScopeDef::ModuleDef(hir::ModuleDef::Static(_))
| ScopeDef::Local(_) => !ctx.expects_type(),
// unless its a constant in a generic arg list position
ScopeDef::ModuleDef(hir::ModuleDef::Const(_))
diff --git a/crates/ide_completion/src/context.rs b/crates/ide_completion/src/context.rs
index f0da98739..ea1e110da 100644
--- a/crates/ide_completion/src/context.rs
+++ b/crates/ide_completion/src/context.rs
@@ -242,23 +242,24 @@ impl<'a> CompletionContext<'a> {
}
pub(crate) fn expects_assoc_item(&self) -> bool {
- matches!(self.completion_location, Some(ImmediateLocation::Trait | ImmediateLocation::Impl))
+ matches!(
+ self.completion_location,
+ Some(ImmediateLocation::Trait) | Some(ImmediateLocation::Impl)
+ )
}
pub(crate) fn has_dot_receiver(&self) -> bool {
matches!(
&self.completion_location,
- Some(ImmediateLocation::FieldAccess { receiver, .. } | ImmediateLocation::MethodCall { receiver,.. })
+ Some(ImmediateLocation::FieldAccess { receiver, .. }) | Some(ImmediateLocation::MethodCall { receiver,.. })
if receiver.is_some()
)
}
pub(crate) fn dot_receiver(&self) -> Option<&ast::Expr> {
match &self.completion_location {
- Some(
- ImmediateLocation::MethodCall { receiver, .. }
- | ImmediateLocation::FieldAccess { receiver, .. },
- ) => receiver.as_ref(),
+ Some(ImmediateLocation::MethodCall { receiver, .. })
+ | Some(ImmediateLocation::FieldAccess { receiver, .. }) => receiver.as_ref(),
_ => None,
}
}
@@ -282,28 +283,28 @@ impl<'a> CompletionContext<'a> {
pub(crate) fn expects_ident_pat_or_ref_expr(&self) -> bool {
matches!(
self.completion_location,
- Some(ImmediateLocation::IdentPat | ImmediateLocation::RefExpr)
+ Some(ImmediateLocation::IdentPat) | Some(ImmediateLocation::RefExpr)
)
}
pub(crate) fn expect_field(&self) -> bool {
matches!(
self.completion_location,
- Some(ImmediateLocation::RecordField | ImmediateLocation::TupleField)
+ Some(ImmediateLocation::RecordField) | Some(ImmediateLocation::TupleField)
)
}
pub(crate) fn in_use_tree(&self) -> bool {
matches!(
self.completion_location,
- Some(ImmediateLocation::Use | ImmediateLocation::UseTree)
+ Some(ImmediateLocation::Use) | Some(ImmediateLocation::UseTree)
)
}
pub(crate) fn has_impl_or_trait_prev_sibling(&self) -> bool {
matches!(
self.prev_sibling,
- Some(ImmediatePrevSibling::ImplDefType | ImmediatePrevSibling::TraitDefName)
+ Some(ImmediatePrevSibling::ImplDefType) | Some(ImmediatePrevSibling::TraitDefName)
)
}
@@ -324,16 +325,14 @@ impl<'a> CompletionContext<'a> {
|| self.previous_token_is(T![unsafe])
|| matches!(
self.prev_sibling,
- Some(ImmediatePrevSibling::Attribute | ImmediatePrevSibling::Visibility)
+ Some(ImmediatePrevSibling::Attribute) | Some(ImmediatePrevSibling::Visibility)
)
|| matches!(
self.completion_location,
- Some(
- ImmediateLocation::Attribute(_)
- | ImmediateLocation::ModDeclaration(_)
- | ImmediateLocation::RecordPat(_)
- | ImmediateLocation::RecordExpr(_)
- )
+ Some(ImmediateLocation::Attribute(_))
+ | Some(ImmediateLocation::ModDeclaration(_))
+ | Some(ImmediateLocation::RecordPat(_))
+ | Some(ImmediateLocation::RecordExpr(_))
)
}
@@ -707,8 +706,8 @@ fn path_or_use_tree_qualifier(path: &ast::Path) -> Option<(ast::Path, bool)> {
fn has_ref(token: &SyntaxToken) -> bool {
let mut token = token.clone();
- for skip in [WHITESPACE, IDENT, T![mut]] {
- if token.kind() == skip {
+ for skip in &[WHITESPACE, IDENT, T![mut]] {
+ if token.kind() == *skip {
token = match token.prev_token() {
Some(it) => it,
None => return false,
diff --git a/crates/ide_completion/src/render/builder_ext.rs b/crates/ide_completion/src/render/builder_ext.rs
index 33d3a5ee1..749dfc665 100644
--- a/crates/ide_completion/src/render/builder_ext.rs
+++ b/crates/ide_completion/src/render/builder_ext.rs
@@ -32,7 +32,7 @@ impl Builder {
cov_mark::hit!(no_parens_in_use_item);
return false;
}
- if matches!(ctx.path_call_kind(), Some(CallKind::Expr | CallKind::Pat))
+ if matches!(ctx.path_call_kind(), Some(CallKind::Expr) | Some(CallKind::Pat))
| matches!(
ctx.completion_location,
Some(ImmediateLocation::MethodCall { has_parens: true, .. })
diff --git a/crates/mbe/src/expander/matcher.rs b/crates/mbe/src/expander/matcher.rs
index 0d694b1a7..5c4680d19 100644
--- a/crates/mbe/src/expander/matcher.rs
+++ b/crates/mbe/src/expander/matcher.rs
@@ -804,17 +804,33 @@ impl<'a> TtIter<'a> {
};
match (punct.char, second, third) {
- ('.', '.', Some('.' | '=')) | ('<', '<', Some('=')) | ('>', '>', Some('=')) => {
+ ('.', '.', Some('.'))
+ | ('.', '.', Some('='))
+ | ('<', '<', Some('='))
+ | ('>', '>', Some('=')) => {
let tt2 = self.next().unwrap().clone();
let tt3 = self.next().unwrap().clone();
Ok(tt::Subtree { delimiter: None, token_trees: vec![tt, tt2, tt3] }.into())
}
- ('-' | '!' | '*' | '/' | '&' | '%' | '^' | '+' | '<' | '=' | '>' | '|', '=', _)
- | ('-' | '=' | '>', '>', _)
+ ('-', '=', _)
+ | ('-', '>', _)
| (':', ':', _)
+ | ('!', '=', _)
| ('.', '.', _)
+ | ('*', '=', _)
+ | ('/', '=', _)
| ('&', '&', _)
+ | ('&', '=', _)
+ | ('%', '=', _)
+ | ('^', '=', _)
+ | ('+', '=', _)
| ('<', '<', _)
+ | ('<', '=', _)
+ | ('=', '=', _)
+ | ('=', '>', _)
+ | ('>', '=', _)
+ | ('>', '>', _)
+ | ('|', '=', _)
| ('|', '|', _) => {
let tt2 = self.next().unwrap().clone();
Ok(tt::Subtree { delimiter: None, token_trees: vec![tt, tt2] }.into())
diff --git a/crates/parser/src/grammar/params.rs b/crates/parser/src/grammar/params.rs
index 5a78675fb..e0c1d3b3a 100644
--- a/crates/parser/src/grammar/params.rs
+++ b/crates/parser/src/grammar/params.rs
@@ -184,7 +184,8 @@ fn opt_self_param(p: &mut Parser, m: Marker) -> Result<(), Marker> {
if !matches!(
(p.current(), la1, la2, la3),
(T![&], T![self], _, _)
- | (T![&], T![mut] | LIFETIME_IDENT, T![self], _)
+ | (T![&], LIFETIME_IDENT, T![self], _)
+ | (T![&], T![mut], T![self], _)
| (T![&], LIFETIME_IDENT, T![mut], T![self])
) {
return Err(m);
diff --git a/crates/vfs/src/vfs_path.rs b/crates/vfs/src/vfs_path.rs
index ef2d7657a..2b3d7fd84 100644
--- a/crates/vfs/src/vfs_path.rs
+++ b/crates/vfs/src/vfs_path.rs
@@ -389,7 +389,7 @@ impl VirtualPath {
match (file_stem, extension) {
(None, None) => None,
- (None | Some(""), Some(_)) => Some((file_name, None)),
+ (None, Some(_)) | (Some(""), Some(_)) => Some((file_name, None)),
(Some(file_stem), extension) => Some((file_stem, extension)),
}
}
diff --git a/xtask/src/install.rs b/xtask/src/install.rs
index 64ab12b42..7e2dccdfe 100644
--- a/xtask/src/install.rs
+++ b/xtask/src/install.rs
@@ -8,7 +8,7 @@ use xshell::{cmd, pushd};
use crate::flags;
// Latest stable, feel free to send a PR if this lags behind.
-const REQUIRED_RUST_VERSION: u32 = 53;
+const REQUIRED_RUST_VERSION: u32 = 52;
impl flags::Install {
pub(crate) fn run(self) -> Result<()> {

4
pkgs/development/web/nodejs/v12.nix
View File

@@ -8,7 +8,7 @@ let
in
buildNodejs {
inherit enableNpm;
version = "12.22.2";
sha256 = "1p281hdw3y32pnbfr7cdc9igv2yrzqg16pn4yj3g01pi3mbhbn3z";
version = "12.22.3";
sha256 = "143ihn30jd08nk19saxn6qp3ldc9yvy8w338i4cg9256wgx120im";
patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
}

4
pkgs/development/web/nodejs/v14.nix
View File

@@ -7,7 +7,7 @@ let
in
buildNodejs {
inherit enableNpm;
version = "14.17.2";
sha256 = "0gjq61l1lm15bv47w0phil44nbh0fsq3mmqf40xxlm92gswb4psg";
version = "14.17.3";
sha256 = "0j3zd5vavsapqs9h682mr8r5i7xp47n0w4vjvm8rw3rn3dg4p2sb";
patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
}

4
pkgs/development/web/nodejs/v16.nix
View File

@@ -8,6 +8,6 @@ let
in
buildNodejs {
inherit enableNpm;
version = "16.4.1";
sha256 = "1a1aygksmbafxvrs8g2jv0y1jj3cwyclk0qbqxkn5qfq5r1i943n";
version = "16.4.2";
sha256 = "048x4vznpi6dai6fripg0yk21kfxm9s2mw7jb0rzisyv5aw8v2dj";
}

4
pkgs/games/osu-lazer/default.nix
View File

@@ -16,13 +16,13 @@ let
in stdenv.mkDerivation rec {
pname = "osu-lazer";
version = "2021.612.0";
version = "2021.703.0";
src = fetchFromGitHub {
owner = "ppy";
repo = "osu";
rev = version;
sha256 = "1hrk8sfg4bdrrrqpwb5a8dhpy0lfnrx575z3l2jygzbwgqgr4jy4";
sha256 = "52wGjNVCh1dyPgDfKnsfPcCI1Jh1R70zRUs/jNyaBI8=";
};
patches = [ ./bypass-tamper-detection.patch ];

401
pkgs/games/osu-lazer/deps.nix generated
View File

@@ -1,4 +1,9 @@
{ fetchNuGet }: [
(fetchNuGet {
name = "AutoMapper";
version = "10.1.1";
sha256 = "1l1p9g7f7finr8laklbm7h2c45k0swl47iq0ik68js5s6pzvd6f8";
})
(fetchNuGet {
name = "DeltaCompressionDotNet";
version = "2.0.0.0";
@@ -19,6 +24,11 @@
version = "4.3.0.1";
sha256 = "0n6x57mnnvcjnrs8zyvy07h5zm4bcfy9gh4n4bvd9fx5ys4pxkvv";
})
(fetchNuGet {
name = "Fody";
version = "6.5.1";
sha256 = "08zpyrniajjba5isjb09spggfh0af2z6x4h2zy5ilk3y5bb9vdch";
})
(fetchNuGet {
name = "HidSharpCore";
version = "1.2.1.1";
@@ -26,18 +36,18 @@
})
(fetchNuGet {
name = "HtmlAgilityPack";
version = "1.11.33";
sha256 = "08valqp6hzdfy532kv70fgzhizyc3xs9y0sw0rsr3z2h7pk1vp6n";
version = "1.11.34";
sha256 = "078dad719hkv806qgj1f0hkn7di5zvvm594awfn5bsgb9afq94a7";
})
(fetchNuGet {
name = "Humanizer";
version = "2.10.1";
sha256 = "0bcs3vp028dq7hs0dxvqynichgbnhzwdx61phwl8yvls15hav05c";
version = "2.11.10";
sha256 = "057pqzvdxsbpnnc5f1xkqg7j3ywp68ggia3w74fgqp0158dm6rdk";
})
(fetchNuGet {
name = "Humanizer.Core";
version = "2.10.1";
sha256 = "1vn52y8pkg8ny7sz83nag4cwmna61jscs2n68bx7x4xkgialzhzy";
version = "2.11.10";
sha256 = "0z7kmd5rh1sb6izq0vssk6c2p63n00xglk45s7ga9z18z9aaskxv";
})
(fetchNuGet {
name = "Humanizer.Core";
@@ -46,238 +56,238 @@
})
(fetchNuGet {
name = "Humanizer.Core.af";
version = "2.10.1";
sha256 = "0a7x11kprn650kk3qzhsncyfxazwanqwmrizkxbzyc29y46bmsr3";
version = "2.11.10";
sha256 = "18fiixfvjwn8m1i8z2cz4aqykzylvfdqmmpwc2zcd8sr1a2xm86z";
})
(fetchNuGet {
name = "Humanizer.Core.ar";
version = "2.10.1";
sha256 = "0k40zj3jpscv0k780x5p8cc45ivd8pla1hqz8416qgywg9kc6b7z";
version = "2.11.10";
sha256 = "009fpm4jd325izm82ipipsvlwd31824gvskda68bdwi4yqmycz4p";
})
(fetchNuGet {
name = "Humanizer.Core.az";
version = "2.10.1";
sha256 = "1djhspqlxj6qys915bd8is1hfy87ykrpxpjwlwsw2gvrrc74p16c";
version = "2.11.10";
sha256 = "144b9diwprabxwgi5a98k5iy95ajq4p7356phdqi2lhzwbz7b6a9";
})
(fetchNuGet {
name = "Humanizer.Core.bg";
version = "2.10.1";
sha256 = "1z89a9sc3ny2bm2h3g8cnb6c77q2yhh4wmi18yj98y6irdmimn16";
version = "2.11.10";
sha256 = "1b9y40gvq2kwnj5wa40f8cbywv79jkajcwknagrgr27sykpfadl2";
})
(fetchNuGet {
name = "Humanizer.Core.bn-BD";
version = "2.10.1";
sha256 = "17cwk09h3fkjl76z0w3ihj3448h8lchf3l9l10zrjisjf918mxp8";
version = "2.11.10";
sha256 = "18pn4jcp36ygcx283l3fi9bs5d7q1a384b72a10g5kl0qckn88ay";
})
(fetchNuGet {
name = "Humanizer.Core.cs";
version = "2.10.1";
sha256 = "0403f5mbyzyjw8jm988rbw2xim353rd4lc0pnkdcn7qlhcrm3gbj";
version = "2.11.10";
sha256 = "03crw1lnzp32v2kcdmllkrsqh07r4ggw9gyc96qw7cv0nk5ch1h8";
})
(fetchNuGet {
name = "Humanizer.Core.da";
version = "2.10.1";
sha256 = "0am71dkxyzh40vqb7aa9k6p8whh4fwdrrwwjar9vc3c49wnw7nky";
version = "2.11.10";
sha256 = "0glby12zra3y3yiq4cwq1m6wjcjl8f21v8ghi6s20r48glm8vzy9";
})
(fetchNuGet {
name = "Humanizer.Core.de";
version = "2.10.1";
sha256 = "027iydimqnx5r7lw0661zyz41kd4nh6sxx75dmh9lcgawz8h8agy";
version = "2.11.10";
sha256 = "0a35xrm1f9p74x0fkr52bw9sd54vdy9d5rnvf565yh8ww43xfk7b";
})
(fetchNuGet {
name = "Humanizer.Core.el";
version = "2.10.1";
sha256 = "1k3g4ffv51da0p12xg7mw21zm6hdvz28x1vaqpspyb156042vxqq";
version = "2.11.10";
sha256 = "0bhwwdx5vc48zikdsbrkghdhwahxxc2lkff0yaa5nxhbhasl84h8";
})
(fetchNuGet {
name = "Humanizer.Core.es";
version = "2.10.1";
sha256 = "0rv3b39hwc1spb0r036sjcn8hkl9bfaka1p8bdh7zsnq21674pqb";
version = "2.11.10";
sha256 = "07bw07qy8nyzlgxl7l2lxv9f78qmkfppgzx7iyq5ikrcnpvc7i9q";
})
(fetchNuGet {
name = "Humanizer.Core.fa";
version = "2.10.1";
sha256 = "0v3ccydbf9cpv54lk65fqaiq1lfzz6cnxq0wyaa5014axwh9h8nn";
version = "2.11.10";
sha256 = "00d4hc1pfmhfkc5wmx9p7i00lgi4r0k6wfcns9kl1syjxv3bs5f2";
})
(fetchNuGet {
name = "Humanizer.Core.fi-FI";
version = "2.10.1";
sha256 = "0gvm0g24ccrk6081sz2ligbskn5rv2i0bfarndhf5k12zwvx0y67";
version = "2.11.10";
sha256 = "0z4is7pl5jpi4pfdvd2zvx5mp00bj26d9l9ksqyc0liax8nfzyik";
})
(fetchNuGet {
name = "Humanizer.Core.fr";
version = "2.10.1";
sha256 = "1307byhrygg45vrba5h30gmr94zp8spxqy75xi482y5va6vxv778";
version = "2.11.10";
sha256 = "0sybpg6kbbhrnk7gxcdk7ppan89lsfqsdssrg4i1dm8w48wgicap";
})
(fetchNuGet {
name = "Humanizer.Core.fr-BE";
version = "2.10.1";
sha256 = "11mdqwz3nx3a9rval2y9vhxyrfzas2rasbilljky3k893anrpr36";
version = "2.11.10";
sha256 = "1s25c86nl9wpsn6fydzwv4rfmdx5sm0vgyd7xhw5344k20gazvhv";
})
(fetchNuGet {
name = "Humanizer.Core.he";
version = "2.10.1";
sha256 = "1rvzgh6hky9gl55625a7pjd8n9rai4vxl05qbjg3icg86a27ia9b";
version = "2.11.10";
sha256 = "1nx61qkjd6p9r36dmnm4942khyv35fpdqmb2w69gz6463g4d7z29";
})
(fetchNuGet {
name = "Humanizer.Core.hr";
version = "2.10.1";
sha256 = "1adm2k7ydgbdhvy1wpilhclg3xvcbvcynh4g3qhl1zk7kpicwzy1";
version = "2.11.10";
sha256 = "02jhcyj72prkqsjxyilv04drm0bknqjh2r893jlbsfi9vjg2zay3";
})
(fetchNuGet {
name = "Humanizer.Core.hu";
version = "2.10.1";
sha256 = "19kznch1wm6pyy4dbinp0zn991s84ak4x9hpq9sjhd60azrc9vr9";
version = "2.11.10";
sha256 = "0yb6ly4s1wdyaf96h2dvifqyb575aid6irwl3qx8gcvrs0xpcxdp";
})
(fetchNuGet {
name = "Humanizer.Core.hy";
version = "2.10.1";
sha256 = "047427rspi90rbhzmzanfqkn6rzcgvnnhbn7h923kg07d4lky6l7";
version = "2.11.10";
sha256 = "0b7vaqldn7ca3xi4gkvkhjk900kw2zwb0m0d20bg45a83zdlx79c";
})
(fetchNuGet {
name = "Humanizer.Core.id";
version = "2.10.1";
sha256 = "0r3spq1in5y7dxkp3yk5695csair5w0jrc0xjlicqadgfk9j809f";
version = "2.11.10";
sha256 = "1yqxirknwga4j18k7ixwgqxlv20479afanhariy3c5mkwvglsr9b";
})
(fetchNuGet {
name = "Humanizer.Core.it";
version = "2.10.1";
sha256 = "1191qns3gpbq45phhaz9vy5bj0cdmznn3c2zgl4pn323knhgjfxf";
version = "2.11.10";
sha256 = "1skwgj5a6kkx3pm9w4f29psch69h1knmwbkdydlmx13h452p1w4l";
})
(fetchNuGet {
name = "Humanizer.Core.ja";
version = "2.10.1";
sha256 = "0a0gf2vkgnqyxa3fxzs7pq6almpzv6a53bi7yhn9w4ki1jqjjv6v";
version = "2.11.10";
sha256 = "1wpc3yz9v611dqbw8j5yimk8dpz0rvpnls4rmlnp1m47gavpj8x4";
})
(fetchNuGet {
name = "Humanizer.Core.ko-KR";
version = "2.10.1";
sha256 = "0x9x7134f8ikbvvalahrb3q080w2zxd9dx0k32gd10axcvqpgxq3";
version = "2.11.10";
sha256 = "1df0kd7vwdc3inxfkb3wsl1aw3d6vbab99dzh08p4m04g7i2c1a9";
})
(fetchNuGet {
name = "Humanizer.Core.ku";
version = "2.10.1";
sha256 = "0ry4fjfvwp13p1qq8hjykg60ga0vxirdl7l7czj56lwj29ll8zqa";
version = "2.11.10";
sha256 = "17b66xfgwjr0sffx0hw4c6l90h43z7ffylrs26hgav0n110q2nwg";
})
(fetchNuGet {
name = "Humanizer.Core.lv";
version = "2.10.1";
sha256 = "1v08ds9r2k7vx5b2rw9swc3gxfj7mb9r2as0sqg5n2wy04w9ki5j";
version = "2.11.10";
sha256 = "0czxx4b9g0w7agykdl82wds09zasa9y58dmgjm925amlfz4wkyzs";
})
(fetchNuGet {
name = "Humanizer.Core.ms-MY";
version = "2.10.1";
sha256 = "0cfb7wmffbwdv8w7j082mc3z59cj3hh6rnnii55wfrbziv1ci5yz";
version = "2.11.10";
sha256 = "0kix95nbw94fx0dziyz80y59i7ii7d21b63f7f94niarljjq36i3";
})
(fetchNuGet {
name = "Humanizer.Core.mt";
version = "2.10.1";
sha256 = "1pn00dmn1k3jp0s23rfzv8sj7fdbmy0i45ls0agvy1wxxjyg7cn9";
version = "2.11.10";
sha256 = "1rwy6m22pq65gxn86xlr9lv818fp5kb0wz98zxxfljc2iviw1f4p";
})
(fetchNuGet {
name = "Humanizer.Core.nb";
version = "2.10.1";
sha256 = "122b1wk8acnc7sm8bs3ww9kl6z8sw0ym7y1ar9wyiw9aw36a94f3";
version = "2.11.10";
sha256 = "0ra2cl0avvv4sylha7z76jxnb4pdiqfbpr5m477snr04dsjxd9q9";
})
(fetchNuGet {
name = "Humanizer.Core.nb-NO";
version = "2.10.1";
sha256 = "0mry95z4ch5bdl71k88wsswmcdxsckhp3d578l9fwy8kgj7dg597";
version = "2.11.10";
sha256 = "1qszib03pvmjkrg8za7jjd2vzrs9p4fn2rmy82abnzldkhvifipq";
})
(fetchNuGet {
name = "Humanizer.Core.nl";
version = "2.10.1";
sha256 = "03cm6vfsi5rgnc456b07vc7h3rfn3qjxfykq8f6cq61z1xgh9i53";
version = "2.11.10";
sha256 = "1i9bvy0i2yyasl9mgxiiwrkmfpm2c53d3wwdp9270r6120sxyy63";
})
(fetchNuGet {
name = "Humanizer.Core.pl";
version = "2.10.1";
sha256 = "1gsrfp8d3ay5kra95sk0sy8vcak0ncxmddpwh9vw2sdhlj453bzx";
version = "2.11.10";
sha256 = "0kggh4wgcic7wzgxy548n6w61schss2ccf9kz8alqshfi42xifby";
})
(fetchNuGet {
name = "Humanizer.Core.pt";
version = "2.10.1";
sha256 = "1z9asjsng8njvi8vr5ryklwdrfmgkjk2knd8q3hkf0k1zj4bkhsf";
version = "2.11.10";
sha256 = "09j90s8x1lpvhfiy3syfnj8slkgcacf3xjy3pnkgxa6g4mi4f4bd";
})
(fetchNuGet {
name = "Humanizer.Core.ro";
version = "2.10.1";
sha256 = "0r8b1yl5dby56x6q0vgkzdnb08q3ar9kvnqz7pxfld9zh03k0snp";
version = "2.11.10";
sha256 = "1jgidmqfly91v1k22gn687mfql5bz7gjzp1aapi93vq5x635qssy";
})
(fetchNuGet {
name = "Humanizer.Core.ru";
version = "2.10.1";
sha256 = "1nqgscy7wqfbpld3bb6g1hwy2zdl88as1kxcflfiyysmnysavviz";
version = "2.11.10";
sha256 = "13mmlh0ibxfyc85xrz3vx4mcg56mkzqql184iwdryq94p0g5ahil";
})
(fetchNuGet {
name = "Humanizer.Core.sk";
version = "2.10.1";
sha256 = "0wk4a7g87s26da57a4srwnmhm9d2x68afn961lkd2anz8wixr97x";
version = "2.11.10";
sha256 = "04ja06y5jaz1jwkwn117wx9cib04gpbi0vysn58a8sd5jrxmxai5";
})
(fetchNuGet {
name = "Humanizer.Core.sl";
version = "2.10.1";
sha256 = "1vsjl6nbk2mxlvkk0zi0igzmfxfhr3jmnnx8ljwpz8a501svksxl";
version = "2.11.10";
sha256 = "05hxk9v3a7fn7s4g9jp5zxk2z6a33b9fkavyb1hjqnl2i37q2wja";
})
(fetchNuGet {
name = "Humanizer.Core.sr";
version = "2.10.1";
sha256 = "03n64v7hl9awvq06y94wc0czqqf5nrw0d0k7xyx0l3lgw02jpgy2";
version = "2.11.10";
sha256 = "0x6l2msimrx72iywa1g0rqklgy209sdwg0r77i2lz0s1rvk5klm5";
})
(fetchNuGet {
name = "Humanizer.Core.sr-Latn";
version = "2.10.1";
sha256 = "0yw5k8g4672kcaia82aq36asjkjlkssi8lkkjn35hn9spq5734lc";
version = "2.11.10";
sha256 = "01hdyn7mmbyy7f3aglawgnsj3nblcdpqjgzdcvniy73l536mira0";
})
(fetchNuGet {
name = "Humanizer.Core.sv";
version = "2.10.1";
sha256 = "1n0631ka9cdikjyw9kr3vqwgd33g83chdabra50hnwcrykkigy4f";
version = "2.11.10";
sha256 = "0cbgchivw3d5ndib1zmgzmnymhyvfh9g9f0hijc860g5vaa9fkvh";
})
(fetchNuGet {
name = "Humanizer.Core.th-TH";
version = "2.10.1";
sha256 = "0s1v0sap22xzqis95wmg66vriaavf6fgk8hcpm3as185dn37gxwn";
version = "2.11.10";
sha256 = "1v7f9x3b04iwhz9lb3ir8az8128nvcw1gi4park5zh3fg0f3mni0";
})
(fetchNuGet {
name = "Humanizer.Core.tr";
version = "2.10.1";
sha256 = "063qr62a8cqa82xc3calv37x6d5v29wdssmrq9b7pas60vd5n7yd";
version = "2.11.10";
sha256 = "02c4ky0dskxkdrkc7vy8yzmvwjr1wqll1kzx0k21afhlx8xynjd4";
})
(fetchNuGet {
name = "Humanizer.Core.uk";
version = "2.10.1";
sha256 = "0n0zh9z19fwbb0dbpdld6jzydmwv7zj0nf2x0vpilrhcdhd4icfm";
version = "2.11.10";
sha256 = "0900ilhwj8yvhyzpg1pjr7f5vrl62wp8dsnhk4c2igs20qvnv079";
})
(fetchNuGet {
name = "Humanizer.Core.uz-Cyrl-UZ";
version = "2.10.1";
sha256 = "1q6z6c4hkxi5kq13k5qm6i6dx2namkdsysb09jvkvj2vl54gj074";
version = "2.11.10";
sha256 = "09b7p2m8y49j49ckrmx2difgyj6y7fm2mwca093j8psxclsykcyr";
})
(fetchNuGet {
name = "Humanizer.Core.uz-Latn-UZ";
version = "2.10.1";
sha256 = "1758m8b2kv1k5r26al9x4vhss1f7b7yhk971b41zqapw7z66sgmx";
version = "2.11.10";
sha256 = "029kvkawqhlln52vpjpvr52dhr18ylk01cgsj2z8lxnqaka0q9hk";
})
(fetchNuGet {
name = "Humanizer.Core.vi";
version = "2.10.1";
sha256 = "1z45zd7gpx20zaaxrv9ac6v0ig0s3d80nxdiig2pm1zrlx01ps33";
version = "2.11.10";
sha256 = "0q4d47plsj956ivn82qwyidfxppjr9dp13m8c66aamrvhy4q8ny5";
})
(fetchNuGet {
name = "Humanizer.Core.zh-CN";
version = "2.10.1";
sha256 = "02pdpzzwk4wnj1bvzl059ndh67i5yx5ab8ayq5qkrg2hfkid9nn5";
version = "2.11.10";
sha256 = "01dy5kf6ai8id77px92ji4kcxjc8haj39ivv55xy1afcg3qiy7mh";
})
(fetchNuGet {
name = "Humanizer.Core.zh-Hans";
version = "2.10.1";
sha256 = "1pm73sl5s1axzmwks68kdyskyv183z5yy020bhzcf0rwbrv3s2qi";
version = "2.11.10";
sha256 = "16gcxgw2g6gck3nc2hxzlkbsg7wkfaqsjl87kasibxxh47zdqqv2";
})
(fetchNuGet {
name = "Humanizer.Core.zh-Hant";
version = "2.10.1";
sha256 = "0fxyl2m05qgmnycdsbzv2dyzixq4jqnvvx7al87d6v5rvkrzwgik";
version = "2.11.10";
sha256 = "1rjg2xvkwjjw3c7z9mdjjvbnl9lcvvhh4fr7l61rla2ynzdk46cj";
})
(fetchNuGet {
name = "JetBrains.Annotations";
@@ -301,8 +311,8 @@
})
(fetchNuGet {
name = "Markdig";
version = "0.24.0";
sha256 = "03i0mw9717xwf3pffr8ar7k7fmyhgdw222j58l4x0xr4slpg94l7";
version = "0.25.0";
sha256 = "1f7iqkaphfyf6szjrp0633rj44wynqgiqyivbja5djyxjy4csfyy";
})
(fetchNuGet {
name = "MessagePack";
@@ -321,53 +331,53 @@
})
(fetchNuGet {
name = "Microsoft.AspNetCore.Connections.Abstractions";
version = "5.0.6";
sha256 = "1ggvdz6sq668w8nv99qg9pi2i3vx0vihfybjbyyywjgjppq93y8l";
version = "5.0.7";
sha256 = "119wk2aqnas2sfyawv0wkg20ygk1cr15lycvvnw2x42kwgcimmks";
})
(fetchNuGet {
name = "Microsoft.AspNetCore.Http.Connections.Client";
version = "5.0.6";
sha256 = "16xzbs1mvbgzblzmzxznr4fpkwk9lz318rnscj7498k1dmk972s4";
version = "5.0.7";
sha256 = "0jdpqmjv9w29ih13nprzvf2m6cjrg69x0kwyi3d7b371rvz7m66l";
})
(fetchNuGet {
name = "Microsoft.AspNetCore.Http.Connections.Common";
version = "5.0.6";
sha256 = "1zqvmcb1zc704zf246byhf3sm1isixrdr4hlrqpss7zwd89vznv3";
version = "5.0.7";
sha256 = "1h6bw9hs92xp505c9x0jn1mx1i86r3s6xs7yyycx905grwisga39";
})
(fetchNuGet {
name = "Microsoft.AspNetCore.Http.Features";
version = "5.0.6";
sha256 = "18y9np24ybhzgv5lmaaah98l9s53c07lawld4y3nnngy4a2l8byq";
version = "5.0.7";
sha256 = "1v89zxk15c7gswq10cbsf2yr974inpbk5npw2v6qj8vcs66qqwq3";
})
(fetchNuGet {
name = "Microsoft.AspNetCore.SignalR.Client";
version = "5.0.6";
sha256 = "0vyqd11b02vfh1xbkq01z4nsj73rqnjpms1xm461x2p1yajs3792";
version = "5.0.7";
sha256 = "13mqsa5nks9fcxv6kxm9j75mxafs3h5pikv35a56h7d9z8wdazsr";
})
(fetchNuGet {
name = "Microsoft.AspNetCore.SignalR.Client.Core";
version = "5.0.6";
sha256 = "0q2fcz6g1jqiwqy05va26wf6mn7vjd915igaiqgmhqzjc2rgif88";
version = "5.0.7";
sha256 = "033q9ijbbkh3crby96c62azyi61m0c7byiz89xbrdvagpj6ydqn5";
})
(fetchNuGet {
name = "Microsoft.AspNetCore.SignalR.Common";
version = "5.0.6";
sha256 = "1apa35dffb29w9fj79ypdyvwkz37v04bbsl51hxrx1pa66jj4ymx";
version = "5.0.7";
sha256 = "0s04flgfrljv3r8kxplc569mp3gsqd4nwda0h3yly3rqzwmbrnwp";
})
(fetchNuGet {
name = "Microsoft.AspNetCore.SignalR.Protocols.Json";
version = "5.0.6";
sha256 = "1yr94d8yry7i22a2zvcan7rr9lwbx298lz7k6wsgscj1isg5nrr7";
version = "5.0.7";
sha256 = "0nb3v6hhhlndagczac255v2iyjs40jfi9gnb0933zh01wqrgkrv7";
})
(fetchNuGet {
name = "Microsoft.AspNetCore.SignalR.Protocols.MessagePack";
version = "5.0.6";
sha256 = "1asz4kaa0c42z8lgsh6ywn0399v1w8axvhxjbb6m39w9xq596rdr";
version = "5.0.7";
sha256 = "06clfalw2xn7rfw53y8kiwcf2j3902iz0pl9fn2q4czhfwfp23ld";
})
(fetchNuGet {
name = "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson";
version = "5.0.6";
sha256 = "1l5bl8zqw9wnincd7yxghik0k3yzip02zz26bah7mwyqaf4nhbma";
version = "5.0.7";
sha256 = "1m2likbhq8mxv33yw5zl2ybgc11ksjzqi7nhjrnx1bc12amb3nw4";
})
(fetchNuGet {
name = "Microsoft.Bcl.AsyncInterfaces";
@@ -386,8 +396,8 @@
})
(fetchNuGet {
name = "Microsoft.Build.Framework";
version = "15.3.409";
sha256 = "1dhanwb9ihbfay85xj7cwn0byzmmdz94hqfi3q6r1ncwdjd8y1s2";
version = "16.5.0";
sha256 = "1xgr02r7s9i6s70n237hss4yi9zicssia3zd2ny6s8vyxb7jpdyb";
})
(fetchNuGet {
name = "Microsoft.Build.Locator";
@@ -396,8 +406,8 @@
})
(fetchNuGet {
name = "Microsoft.CodeAnalysis.Analyzers";
version = "3.0.0";
sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8";
version = "3.3.2";
sha256 = "162vb5894zxps0cf5n9gc08an7gwybzz87allx3lsszvllr9ldx4";
})
(fetchNuGet {
name = "Microsoft.CodeAnalysis.BannedApiAnalyzers";
@@ -406,18 +416,18 @@
})
(fetchNuGet {
name = "Microsoft.CodeAnalysis.Common";
version = "3.9.0";
sha256 = "1x6l6kn8iv5gk1545nxs2gwzkb8gj4sb9kryai132l7yg9afjqik";
version = "3.10.0";
sha256 = "12a7wq45liw89ylnf2b7v374s3m0lbknkx7kazk3bf6nd1b8ny81";
})
(fetchNuGet {
name = "Microsoft.CodeAnalysis.CSharp";
version = "3.9.0";
sha256 = "0crb9x5rhija8y7b0iya9axcvinz2hv3bgf80bvz7kv6zpbpszkz";
version = "3.10.0";
sha256 = "0plpvimh9drip1fvic3zfg1gmiw3q8xb85nqjqy1hq140p4him6k";
})
(fetchNuGet {
name = "Microsoft.CodeAnalysis.CSharp.Workspaces";
version = "3.9.0";
sha256 = "0cvg6lby34cnjg5a84dx7vnkvjkbvm5vd2p61in9frd6vk0pjwpz";
version = "3.10.0";
sha256 = "0g12hg6r8h2s99p8a0rx8h71rlmj9aff2hr26fkw7i734n39p070";
})
(fetchNuGet {
name = "Microsoft.CodeAnalysis.NetAnalyzers";
@@ -426,13 +436,13 @@
})
(fetchNuGet {
name = "Microsoft.CodeAnalysis.Workspaces.Common";
version = "3.9.0";
sha256 = "1ibr9k1qf93i7sjml0xhp03is7qqgfj91za9dp4i1w00fjnvyf37";
version = "3.10.0";
sha256 = "1hr3ndhb7sw0l63blgp2y0a6d1pgkxah0ls1v7kdxmkdazv35svc";
})
(fetchNuGet {
name = "Microsoft.CodeAnalysis.Workspaces.MSBuild";
version = "3.9.0";
sha256 = "1p8rgd9b9p49dkar97mjcmahkzvrdghw7m5a6csldx62nlknsc9m";
version = "3.10.0";
sha256 = "13h0wza8anac6snkry9fvzd188vnykifzy43ms8x07d40zmqnicd";
})
(fetchNuGet {
name = "Microsoft.CSharp";
@@ -444,6 +454,11 @@
version = "4.5.0";
sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l";
})
(fetchNuGet {
name = "Microsoft.CSharp";
version = "4.7.0";
sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j";
})
(fetchNuGet {
name = "Microsoft.Data.Sqlite.Core";
version = "2.2.6";
@@ -576,8 +591,8 @@
})
(fetchNuGet {
name = "Microsoft.Extensions.ObjectPool";
version = "5.0.6";
sha256 = "0kwhcnsagwn3x9ms2sfy5js25gfnipkrakqgn7bbg0a1k35qa5xx";
version = "5.0.7";
sha256 = "047wv490fjizknyhbmxwbbh9fns13pq2inpc9idxq42n2zj3zbij";
})
(fetchNuGet {
name = "Microsoft.Extensions.Options";
@@ -619,6 +634,11 @@
version = "1.1.0";
sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm";
})
(fetchNuGet {
name = "Microsoft.NETCore.Platforms";
version = "2.0.0";
sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0";
})
(fetchNuGet {
name = "Microsoft.NETCore.Platforms";
version = "2.1.2";
@@ -654,6 +674,11 @@
version = "5.0.0";
sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n";
})
(fetchNuGet {
name = "MongoDB.Bson";
version = "2.11.3";
sha256 = "0fn900i51rwgk3ywpcp4dsf7c9v5glch7hia9l9w8aj8s10qjf1r";
})
(fetchNuGet {
name = "Mono.Cecil";
version = "0.9.6.1";
@@ -696,48 +721,48 @@
})
(fetchNuGet {
name = "NuGet.Common";
version = "5.9.1";
sha256 = "0d919d15r6fzixfxz56xnayfbw9lfvpr99k7k2wlyh228l58xlng";
version = "5.10.0";
sha256 = "0qy6blgppgvxpfcricmvva3qzddk18dza5vy851jrbqshvf9g7kx";
})
(fetchNuGet {
name = "NuGet.Configuration";
version = "5.9.1";
sha256 = "13v3jmirwil1w74wwsspm31rzppb7fbnh99sfig6hrqxhxyzhgnc";
version = "5.10.0";
sha256 = "0xb1n94lrwa6k83i9xcsq68202086p2gj74gzlbhlvb8c2pw6lbb";
})
(fetchNuGet {
name = "NuGet.DependencyResolver.Core";
version = "5.9.1";
sha256 = "0bdmz886bmdgndy7101mq08idzwp8y73hf4l9az3jdndd6cia1ic";
version = "5.10.0";
sha256 = "0dhhclm281ihpfsjzxw34l6zlw49nwzyjiynkmsbcj9icfkp3y4r";
})
(fetchNuGet {
name = "NuGet.Frameworks";
version = "5.9.1";
sha256 = "12fjigazzlmh63479hralrfgdcqxq6qsdr57b9zj0ipwqj0s6l3i";
version = "5.10.0";
sha256 = "0gb6n8rg2jpjp52icgpb3wjdfs3qllh5vbcz8hbcix3l7dncy3v2";
})
(fetchNuGet {
name = "NuGet.LibraryModel";
version = "5.9.1";
sha256 = "1z1m6ik1sxsr129578dy22wspci4xavwjza0f08nm1vbb4v3y4va";
version = "5.10.0";
sha256 = "0b6mmq2mqfr06ypc772dmcd8bz55gkyfrgn0j3nrgkcdww4fzf9q";
})
(fetchNuGet {
name = "NuGet.Packaging";
version = "5.9.1";
sha256 = "0yknzgwmpkcddba3b2d1kq9yizxxdd08xcxv508brr2079g01q6d";
version = "5.10.0";
sha256 = "11g0v061axhp0nisclq5cm2mc92d69z92giz9l40ih478c5nishw";
})
(fetchNuGet {
name = "NuGet.ProjectModel";
version = "5.9.1";
sha256 = "0g3gxh0g6lcaczk9jczzkpmikxhdivfflpqw40jygs64r5837rbv";
version = "5.10.0";
sha256 = "1cqg319n986wciskrqsfawfhqp1d7a7i2qjd0qplpckyw8msng2i";
})
(fetchNuGet {
name = "NuGet.Protocol";
version = "5.9.1";
sha256 = "1wz7rv262wb42s1y866w9bcvpl22dr4s915dsky8sbc69y5646wn";
version = "5.10.0";
sha256 = "0cs9qp169zx6g2w5bzrlhxv0q1i8mb8dxlb2nkiq7pkvah86rxkc";
})
(fetchNuGet {
name = "NuGet.Versioning";
version = "5.9.1";
sha256 = "0vpswa6gz36z2vqwvbylmh7r9hjhlib91vbvkf0icjfkhzijjq08";
version = "5.10.0";
sha256 = "10vvw6vjpx0c26rlxh7dnpyp4prahn25717ccd8bzkjmyzhm90cs";
})
(fetchNuGet {
name = "NUnit";
@@ -756,13 +781,13 @@
})
(fetchNuGet {
name = "ppy.LocalisationAnalyser";
version = "2021.608.0";
sha256 = "1lsb7nr2gynz7llbl22f5mrd9hlxaq48gssfcn5qfji7afv8kwql";
version = "2021.614.0";
sha256 = "0b3b72lvjz8lfh0n5rilmf91j0phgmy1jjnw0v6l7qral72lhd4y";
})
(fetchNuGet {
name = "ppy.osu.Framework";
version = "2021.611.0";
sha256 = "14a2032khf2ys51rp6qs3ikp0lvqxgdqh0hbvchj34q0l3g40yv0";
version = "2021.702.0";
sha256 = "16lx73gikjl2bmndqh3vizfn1whjvvq2iwy8sll3yqwb20bg7kaa";
})
(fetchNuGet {
name = "ppy.osu.Framework.NativeLibs";
@@ -771,8 +796,8 @@
})
(fetchNuGet {
name = "ppy.osu.Game.Resources";
version = "2021.611.0";
sha256 = "01pbxccfrwzn47xg9xgjn91l6w3d0d3gqkkx53ak7ynxbbvx9q07";
version = "2021.701.0";
sha256 = "0ii5ki983vxjq0iq28nzb9xqkmg8iscwj77hcnpf14cj7xiyg454";
})
(fetchNuGet {
name = "ppy.osuTK.NS20";
@@ -789,6 +814,16 @@
version = "1.9.0.5";
sha256 = "0nmhrg3q6izapfpwdslq80fqkvjj12ad9r94pd0nr2xx1zw0x1zl";
})
(fetchNuGet {
name = "Realm";
version = "10.2.1";
sha256 = "14pi7vz7nl8ag0bmlbyds52z5nx9wbg154qkm6jai10rm02ws86l";
})
(fetchNuGet {
name = "Realm.Fody";
version = "10.2.1";
sha256 = "1zv57wb7zcgyigsxqikf2yq2h7an4c3dbydl9la5xdpa76dgmxdi";
})
(fetchNuGet {
name = "Remotion.Linq";
version = "2.2.0";
@@ -896,8 +931,8 @@
})
(fetchNuGet {
name = "Sentry";
version = "3.4.0";
sha256 = "0yivi1gmay29831parvsy4x9kzbv04754l0lgzv0v0p4l8m1gy6s";
version = "3.6.0";
sha256 = "1yjz3m8chg796izrdd9vlxvka60rmv6cmsxpnrv9llmsss2mqssz";
})
(fetchNuGet {
name = "SharpCompress";
@@ -906,8 +941,8 @@
})
(fetchNuGet {
name = "SharpCompress";
version = "0.28.2";
sha256 = "0pj30qm48m9vpq3i8wx9x11ficv36ki1973dk0873vqgvw8fwjj4";
version = "0.28.3";
sha256 = "1svymm2vyg3815p3sbwjdk563mz0a4ag1sr30pm0ki01brqpaaas";
})
(fetchNuGet {
name = "SharpFNT";
@@ -989,6 +1024,11 @@
version = "4.5.1";
sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3";
})
(fetchNuGet {
name = "System.CodeDom";
version = "4.5.0";
sha256 = "1js3h3ig0zwyynl1q88siynp8ra0gz0pfq1wmvls6ji83jrxsami";
})
(fetchNuGet {
name = "System.Collections";
version = "4.0.11";
@@ -1124,6 +1164,11 @@
version = "4.0.11";
sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9";
})
(fetchNuGet {
name = "System.Dynamic.Runtime";
version = "4.3.0";
sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk";
})
(fetchNuGet {
name = "System.Formats.Asn1";
version = "5.0.0";
@@ -1219,11 +1264,6 @@
version = "5.0.0";
sha256 = "08l85pi8jy65las973szqdnir2awxp0r16h21c0bgrz19gxhs11n";
})
(fetchNuGet {
name = "System.IO.Pipelines";
version = "5.0.0";
sha256 = "1kdvbzr98sdddm18r3gbsbcxpv58gm1yy3iig8zg9dvp7mli7453";
})
(fetchNuGet {
name = "System.IO.Pipelines";
version = "5.0.1";
@@ -1254,6 +1294,11 @@
version = "4.0.1";
sha256 = "11jn9k34g245yyf260gr3ldzvaqa9477w2c5nhb1p8vjx4xm3qaw";
})
(fetchNuGet {
name = "System.Management";
version = "4.5.0";
sha256 = "19z5x23n21xi94bgl531l9hrm64nyw9d5fpd7klfvr5xfsbh9jwr";
})
(fetchNuGet {
name = "System.Memory";
version = "4.5.1";
@@ -1344,6 +1389,11 @@
version = "4.6.0";
sha256 = "18h375q5bn9h7swxnk4krrxym1dxmi9bm26p89xps9ygrj4q6zqw";
})
(fetchNuGet {
name = "System.Reflection.Emit";
version = "4.7.0";
sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp";
})
(fetchNuGet {
name = "System.Reflection.Emit.ILGeneration";
version = "4.0.1";
@@ -1624,11 +1674,6 @@
version = "4.3.0";
sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy";
})
(fetchNuGet {
name = "System.Text.Encodings.Web";
version = "5.0.0";
sha256 = "144pgy65jc3bkar7d4fg1c0rq6qmkx68gj9k1ldk97558w22v1r1";
})
(fetchNuGet {
name = "System.Text.Encodings.Web";
version = "5.0.1";
@@ -1636,8 +1681,8 @@
})
(fetchNuGet {
name = "System.Text.Json";
version = "5.0.0";
sha256 = "1gpgl18z6qrgmqrikgh99xkjwzb1didrjp77bch7nrlra21gr4ks";
version = "4.7.0";
sha256 = "0fp3xrysccm5dkaac4yb51d793vywxks978kkl5x4db9gw29rfdr";
})
(fetchNuGet {
name = "System.Text.Json";

3
pkgs/games/the-powder-toy/default.nix
View File

@@ -29,7 +29,8 @@ stdenv.mkDerivation rec {
description = "A free 2D physics sandbox game";
homepage = "http://powdertoy.co.uk/";
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
license = licenses.gpl3;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ abbradar siraben ];
mainProgram = "powder";
};
}

4
pkgs/misc/tmux-plugins/default.nix
View File

@@ -127,12 +127,12 @@ in rec {
dracula = mkTmuxPlugin rec {
pluginName = "dracula";
version = "1.0";
version = "1.0.1";
src = fetchFromGitHub {
owner = "dracula";
repo = "tmux";
rev = "v${version}";
sha256 = "YINyER/HT3L7RpTclD3UNiCRj1CL4GPCBBEUJRqUyEQ=";
sha256 = "sha256-hq+sKA/EkiKia/31SY1zYPz/bxLuwm6sSrGlip1DULw=";
};
meta = with lib; {
homepage = "https://draculatheme.com/tmux";

1
pkgs/misc/vim-plugins/aliases.nix
View File

@@ -82,6 +82,7 @@ mapAliases (with prev; {
hlint-refactor = hlint-refactor-vim;
hoogle = vim-hoogle;
Hoogle = vim-hoogle;
indent-blankline-nvim-lua = indent-blankline-nvim; # backwards compat, added 2021-07-05
ipython = vim-ipython;
latex-live-preview = vim-latex-live-preview;
maktaba = vim-maktaba;

229
pkgs/misc/vim-plugins/generated.nix
View File

@@ -65,12 +65,12 @@ final: prev:
ale = buildVimPluginFrom2Nix {
pname = "ale";
version = "2021-07-04";
version = "2021-07-05";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
rev = "87e079a9b25ebf5818b8451874ce2a8bd614226f";
sha256 = "0hzss0yyj2g8bnqk2583y5llf6lclz3fgyjirw7wq22rscal6i4x";
rev = "958f30c1635ffc7cd47b929b382a791a9d0db37b";
sha256 = "1pbjqg8jn7nw3kn54mjfbm2bidwll1blay9aq70wpzcqvizn8fa0";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
};
@@ -413,12 +413,12 @@ final: prev:
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
version = "2021-07-04";
version = "2021-07-06";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "9773669b0cc041d843d595160f51b46968b42e16";
sha256 = "0c2b5qhcjd3r107a0va313z3rah4ngb711rzsmqifyq63mfcapaf";
rev = "7d1bae413ad45099d7b93592e738b47f7f50b4f2";
sha256 = "1dyi2wxl8k875lapwgmxymhg9jyfqnilp2kiyfqs9h45dmfpmxwk";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@@ -1607,12 +1607,12 @@ final: prev:
formatter-nvim = buildVimPluginFrom2Nix {
pname = "formatter-nvim";
version = "2021-07-03";
version = "2021-07-05";
src = fetchFromGitHub {
owner = "mhartington";
repo = "formatter.nvim";
rev = "83cd5a303564867a08d38013e12824021088c63a";
sha256 = "1mr7pcqk582f5ccwb827s221xqr4p9bqabdb16fygdaxybhv169m";
rev = "9866548f1c543ba90d7bb8a62c4fa939a5dcba46";
sha256 = "04289wv1zw7r30x7whzf2s9gis7g3a7l8wswsxiwf55zvrqr95j7";
};
meta.homepage = "https://github.com/mhartington/formatter.nvim/";
};
@@ -1823,12 +1823,12 @@ final: prev:
gitsigns-nvim = buildVimPluginFrom2Nix {
pname = "gitsigns-nvim";
version = "2021-06-26";
version = "2021-07-05";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
rev = "521e9357bdbd2cadf4863d5c67f2e816182bdecf";
sha256 = "1cd11gvbw2rs5vg6n5w7g22n8c46prsfd906ycld30zq5sm85fg5";
rev = "42c87b9ab34e0fd68fcc669137cd7b351e09a89f";
sha256 = "11f5hpzm0xdj2b5lfp65i5p6xbalkazpfxr4kir16v5n8q93azng";
};
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
};
@@ -1943,12 +1943,12 @@ final: prev:
gruvbox-nvim = buildVimPluginFrom2Nix {
pname = "gruvbox-nvim";
version = "2021-06-07";
version = "2021-07-05";
src = fetchFromGitHub {
owner = "npxbr";
repo = "gruvbox.nvim";
rev = "2dc25bb14fbd69f888dd0615c5576dd730de869a";
sha256 = "1i87f7vfgk1szy18cg7nng2yqvcny4v1wnh4dbw74lcqmmazgi7y";
rev = "ac0948e28203cba5d0510cf3443906228645e3eb";
sha256 = "0g9j2gqsgx7la96xhc72l7rb535phqjpb5mva191wjfn13j0hkda";
};
meta.homepage = "https://github.com/npxbr/gruvbox.nvim/";
};
@@ -2157,18 +2157,6 @@ final: prev:
meta.homepage = "https://github.com/haya14busa/incsearch.vim/";
};
indent-blankline-nvim-lua = buildVimPluginFrom2Nix {
pname = "indent-blankline-nvim-lua";
version = "2021-07-03";
src = fetchFromGitHub {
owner = "lukas-reineke";
repo = "indent-blankline.nvim";
rev = "1a61a0bb0e67675b0a4cf9ffbfca100e498a1d04";
sha256 = "1d20rzl2bzg9v70cz30g0z2ickqw6986sv32xsnpzmlwxdxkg959";
};
meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/";
};
indent-blankline-nvim = buildVimPluginFrom2Nix {
pname = "indent-blankline-nvim";
version = "2021-07-03";
@@ -2640,12 +2628,12 @@ final: prev:
lsp_signature-nvim = buildVimPluginFrom2Nix {
pname = "lsp_signature-nvim";
version = "2021-07-03";
version = "2021-07-05";
src = fetchFromGitHub {
owner = "ray-x";
repo = "lsp_signature.nvim";
rev = "c0884fb3f45df3c10c972d5dc7bae22252de9831";
sha256 = "0r2vvhilxy826zs1xijvp5hlji0651y3j32pzlazb2fgklb6rlwf";
rev = "e2f781f8dfebf6b21929dd8b326474a828e3f08b";
sha256 = "15p5k2kki4pp4hg8284f8hji1b406whhpxr0dws0lx5qc4vqwhwr";
};
meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
};
@@ -2688,12 +2676,12 @@ final: prev:
luasnip = buildVimPluginFrom2Nix {
pname = "luasnip";
version = "2021-07-04";
version = "2021-07-05";
src = fetchFromGitHub {
owner = "l3mon4d3";
repo = "luasnip";
rev = "1ad9f925b1455ea92829a261bf7bd75f1a635f03";
sha256 = "1bd0ky19lh5vn2xlyrbn25h5c9kcc2wa2q0mjn4v9ckvahcwrxiz";
rev = "8b9b689c247f236ad55153582342ecc788444f51";
sha256 = "1v24r0kqsqzd111c6ih5s2q0ckz56whqwpsq19awk3sqkvba17w3";
};
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
};
@@ -2796,12 +2784,12 @@ final: prev:
mkdx = buildVimPluginFrom2Nix {
pname = "mkdx";
version = "2021-05-28";
version = "2021-07-05";
src = fetchFromGitHub {
owner = "SidOfc";
repo = "mkdx";
rev = "e129e3c7d92477563aeb068628ee0ccdd46ed36e";
sha256 = "0q0cyigkszw0qsdvg9dxs293sf8hbmwwy6qxlknmrfiy5xyn6ik5";
rev = "439c518cea989c875eea44ce54a36f7e7dc561d9";
sha256 = "19b155lfiynm450cr9acm7dk58hh2ynrs3zpvrcll7slz8fgrhql";
};
meta.homepage = "https://github.com/SidOfc/mkdx/";
};
@@ -3432,24 +3420,36 @@ final: prev:
nvim-bqf = buildVimPluginFrom2Nix {
pname = "nvim-bqf";
version = "2021-06-21";
version = "2021-07-05";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "nvim-bqf";
rev = "6bfc90ca36dbe602ba0696eb6569803d44f437f9";
sha256 = "16c976gxs7lwxb8xs9iqcizmfznlilwrsaz7v32csfn38i4j77hr";
rev = "27641367360d64e67ea8f4d47e950a24c71a99e8";
sha256 = "0yjmf651gdyi6ngpbb7y8bjf43snv8di54yldfm6l7xgawrwn3nn";
};
meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";
};
nvim-bufdel = buildVimPluginFrom2Nix {
pname = "nvim-bufdel";
version = "2021-05-21";
src = fetchFromGitHub {
owner = "ojroques";
repo = "nvim-bufdel";
rev = "9a1f0f3ed55db86f66ad87f72639269ac1374169";
sha256 = "0f10pik2msm7rdi9lx9ll7jgh1gk9y3q8756ri6jdzk4bwd8j4is";
};
meta.homepage = "https://github.com/ojroques/nvim-bufdel/";
};
nvim-bufferline-lua = buildVimPluginFrom2Nix {
pname = "nvim-bufferline-lua";
version = "2021-07-04";
version = "2021-07-05";
src = fetchFromGitHub {
owner = "akinsho";
repo = "nvim-bufferline.lua";
rev = "33ad2ec9f51941317df407f98c509817805fe03b";
sha256 = "1fnmbxvdxf4d2rnsk6mxm05g06dnv6x500mil6b2ay6am9w8yp7q";
rev = "d66f0e45243a46fc3fd0d84ed7d54e37882207ba";
sha256 = "0rwihzz2lcyza86bgmmvny685g1nlz23yagz5agdqjzibqz973xf";
};
meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/";
};
@@ -3480,12 +3480,12 @@ final: prev:
nvim-compe = buildVimPluginFrom2Nix {
pname = "nvim-compe";
version = "2021-07-02";
version = "2021-07-05";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-compe";
rev = "077329e6bd1704d1acdff087ef1a73df23e92789";
sha256 = "0spnybax3zqcac1by0785v5zh4gl07lpgq6ivnnx1wyhfky87jx3";
rev = "00ebf180d01f7f020c6c19bd8caed59f722ccc04";
sha256 = "1qasn6qx4qna0p364b2kbyrd3bdw7zkzys0d2x9rgc5pn7jx80f0";
};
meta.homepage = "https://github.com/hrsh7th/nvim-compe/";
};
@@ -3504,12 +3504,12 @@ final: prev:
nvim-dap = buildVimPluginFrom2Nix {
pname = "nvim-dap";
version = "2021-07-02";
version = "2021-07-04";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-dap";
rev = "0bbf969a3ba05b6b325b9358b6c8a40d26617d75";
sha256 = "0hmzi54znxsy08pvccpncrp6synfcbribxbd34gimw8g7j9z5hi3";
rev = "6767b438023d63a42149ad5a79960504c9c67bd7";
sha256 = "14backs66fmfznrl86dxpvq7ipcawdql2ky30k9kisllpgzccaw6";
};
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
};
@@ -3612,12 +3612,12 @@ final: prev:
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
version = "2021-07-04";
version = "2021-07-05";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
rev = "5fe1b132534041e889278f081ff10c02b09c096f";
sha256 = "0gmmj3id4mbkhnhgvx8kbqr94gi7p6s0717i6ib4yf3nqs5d7g9r";
rev = "4e8a6bb35f80e5e37c14b92b5db9abaf2dc6605f";
sha256 = "1zz0jf3cv7v1v3ixklld6ls4fcj05d8yy7ww20s85nqvalv5l66r";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@@ -3648,12 +3648,12 @@ final: prev:
nvim-peekup = buildVimPluginFrom2Nix {
pname = "nvim-peekup";
version = "2021-04-04";
version = "2021-07-05";
src = fetchFromGitHub {
owner = "gennaro-tedesco";
repo = "nvim-peekup";
rev = "2f03df68bced26399b7576818b3cded3ce334ca0";
sha256 = "1bap28b9jbaywll50mwjfp91i0h671762ylgy3fxhnayf78py00d";
rev = "e8ad8c7160e1f8ed2a7e4e071110b8b18866b463";
sha256 = "1kjvz2hv05a2id72xi28n1iq7cclcvy3ql74h8f0vcpn10zqvfxx";
};
meta.homepage = "https://github.com/gennaro-tedesco/nvim-peekup/";
};
@@ -3684,12 +3684,12 @@ final: prev:
nvim-toggleterm-lua = buildVimPluginFrom2Nix {
pname = "nvim-toggleterm-lua";
version = "2021-06-26";
version = "2021-07-04";
src = fetchFromGitHub {
owner = "akinsho";
repo = "nvim-toggleterm.lua";
rev = "f8cf9ec7592e8b8c19a56f5985cec108e18c3101";
sha256 = "13ayc57q7r3bns0y6qqqhsi2rr1kqi0bxzdw4qz3my4nj3npqk9h";
rev = "fbf502a997db9bb97765cf5e69bd8749110e9139";
sha256 = "14w9xn2ns8zpsyiydqyia34dcdgvk1lhzvbvwriprrp0bhgzmq57";
};
meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/";
};
@@ -3708,12 +3708,12 @@ final: prev:
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2021-07-03";
version = "2021-07-05";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "9bcf658ca427665445a67c4b01d71c64d6f7e165";
sha256 = "1n0w9rpw6dn573j8glp45a56j7skb5725yr1969k9p8whjdbmlna";
rev = "53d92f65bddf6623000b81ca5beae5ee3a6a736e";
sha256 = "18irdbpwqpp6xjmqk7bjlvd8k2mzyg77xgw5k4y2y5vcjg8jazfq";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@@ -3744,24 +3744,24 @@ final: prev:
nvim-treesitter-refactor = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-refactor";
version = "2021-05-03";
version = "2021-07-04";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter-refactor";
rev = "1a377fafa30920fa974e68da230161af36bf56fb";
sha256 = "06vww83i73f4gyp3x0007qqdk06dd2i9v1v9dk12ky9d8r0pmxl6";
rev = "505e58a8b04596a073b326157490706ee63c3b81";
sha256 = "0z42rpnig6iq73d3mjfgadvqa03k02f4c89j5dp9dhpnrjja8nha";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-refactor/";
};
nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-textobjects";
version = "2021-06-28";
version = "2021-07-04";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter-textobjects";
rev = "63a6d3c85d6625f90093808d15c72c378f5fc2d5";
sha256 = "15l9624ggvbxrm4cr97p9hhsjpdli1iqkm32ffvvfhaa1kzv9lfd";
rev = "bebb977b80d7d6253e82804e05b1105a57382d12";
sha256 = "0ckszh3157jbzhqzyfa5gb6sixi7b66w3z3hjvl39z66dk9lf9l6";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
};
@@ -3912,12 +3912,12 @@ final: prev:
packer-nvim = buildVimPluginFrom2Nix {
pname = "packer-nvim";
version = "2021-07-04";
version = "2021-07-05";
src = fetchFromGitHub {
owner = "wbthomason";
repo = "packer.nvim";
rev = "a7ae69d007cbaddc636880ef451863b37f725a06";
sha256 = "1kcfh9xi9plfaandgdrv3yx2hcha3895nll0mc84rhmbjlnjyvcd";
rev = "5f7ce98b4c81dd8d4b727adc86f83b2339befd55";
sha256 = "1aphdri6hb9jamwjdkjybv0r3xbdr673jd4sibzj591r2ai6kzja";
};
meta.homepage = "https://github.com/wbthomason/packer.nvim/";
};
@@ -4008,12 +4008,12 @@ final: prev:
playground = buildVimPluginFrom2Nix {
pname = "playground";
version = "2021-05-28";
version = "2021-07-05";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "playground";
rev = "1e02dece0daa4bef6a24c7a8b6edd48169885b18";
sha256 = "182nkdzcviz3ap3vphcks4gzw99d4jsmxxlkmb42m0gzd54k1hwq";
rev = "6e0037c974d17b2883e3f0f38bb3cb6b1daa5feb";
sha256 = "0rsdk3ib2sxg6k4k33mcbfrqh7m612jzynzwx3kzh2rmrh1n7i31";
};
meta.homepage = "https://github.com/nvim-treesitter/playground/";
};
@@ -4261,12 +4261,12 @@ final: prev:
registers-nvim = buildVimPluginFrom2Nix {
pname = "registers-nvim";
version = "2021-07-03";
version = "2021-07-05";
src = fetchFromGitHub {
owner = "tversteeg";
repo = "registers.nvim";
rev = "8ef3c3f4323834a5796f2e893cdc6d4bddffbf83";
sha256 = "164i5bbg1k3lqsgin8nb06al8nz5napxp0x10ajmj0b2mrwb3l8k";
rev = "2208bcd4e73fd3b321ac52ce498ab679b8c959ab";
sha256 = "0qqskn8sg9jcpg9wvch0j8d28qjkz084hcc7hl7f1lfc70ksvc7h";
};
meta.homepage = "https://github.com/tversteeg/registers.nvim/";
};
@@ -4562,12 +4562,12 @@ final: prev:
snap = buildVimPluginFrom2Nix {
pname = "snap";
version = "2021-06-28";
version = "2021-07-04";
src = fetchFromGitHub {
owner = "camspiers";
repo = "snap";
rev = "1fbd674dc53401fd643a2bb8bf07dd3e7125d430";
sha256 = "0lwhl74yfzd34fv241i9ra6w72qhf1jxf6fkyl1h0c427sz09mmj";
rev = "4ed8f920f437138b7da38d5ad9003a1e2ca2ddb3";
sha256 = "15cxx8yz522kb8wdgcs95irqy7hlfniipzyxyd16hg69wycl64gx";
};
meta.homepage = "https://github.com/camspiers/snap/";
};
@@ -4837,6 +4837,19 @@ final: prev:
meta.homepage = "https://github.com/vim-scripts/tabmerge/";
};
tabnine-vim = buildVimPluginFrom2Nix {
pname = "tabnine-vim";
version = "2021-01-14";
src = fetchFromGitHub {
owner = "codota";
repo = "tabnine-vim";
rev = "fa891e62903501f7eeb2f00f6574ec9684e1c4ee";
sha256 = "0cra1l31fcngp3iyn61rlngz4qx7zwk68h07bgp9w5gjx59a7npz";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/codota/tabnine-vim/";
};
tabpagebuffer-vim = buildVimPluginFrom2Nix {
pname = "tabpagebuffer-vim";
version = "2014-09-30";
@@ -5092,12 +5105,12 @@ final: prev:
todo-comments-nvim = buildVimPluginFrom2Nix {
pname = "todo-comments-nvim";
version = "2021-06-28";
version = "2021-07-04";
src = fetchFromGitHub {
owner = "folke";
repo = "todo-comments.nvim";
rev = "12758792a0d207b5a4a4fb5a11a0d321a4608108";
sha256 = "1w4z3x1d36cf0zjlz5kshvf5d5lz126rhcl55p2qd4ibrcfw8cwg";
rev = "d5f9bfc164c7ea306710d1a0a9d2db255387b1db";
sha256 = "1rrfbdhkgmnyxfk3fjmkk7f5sjdq9mrcw346lrjldgfih5qbaycj";
};
meta.homepage = "https://github.com/folke/todo-comments.nvim/";
};
@@ -5849,12 +5862,12 @@ final: prev:
vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap";
version = "2021-07-02";
version = "2021-07-06";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
rev = "d49b6daa01b949237567bc683913f138bf07aa2b";
sha256 = "0s7fq4c2amjr23ky1ic03zwsi9fjxsz9l83jchmyhvs35dgiv952";
rev = "7b4d7f9f140bbb0860b37d23a16d6bb20797c06a";
sha256 = "04vws8szlynv0s35xs3w98li89wd48ps6hlssscmk59dmdmjg1m4";
};
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
};
@@ -6617,12 +6630,12 @@ final: prev:
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
version = "2021-07-03";
version = "2021-07-05";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
rev = "8e0a8abf08318f91f63da510087b3110f20e58bf";
sha256 = "0c0rld9r9d77lzbzv6hk83icbv2xvwcjkmqg2iyricbyhfpmbs5k";
rev = "b498607aa79cc7099d02c30ae72812c245cc7091";
sha256 = "1g20y3p5f99w20fkf2bfsliy9p5isml04ybxf8mmgzivcy1wpbrj";
};
meta.homepage = "https://github.com/tpope/vim-fugitive/";
};
@@ -7544,12 +7557,12 @@ final: prev:
vim-matchup = buildVimPluginFrom2Nix {
pname = "vim-matchup";
version = "2021-06-17";
version = "2021-07-05";
src = fetchFromGitHub {
owner = "andymass";
repo = "vim-matchup";
rev = "4cd3736a6869ab0b0a4b739dbde11f1f6129beea";
sha256 = "1i863kl9n2cwkdidn8gajm5n2hv0mfqir4xycva54fw28mads8ds";
rev = "05f4962c64c5dcd720b8cf5f7af777de33f2fa43";
sha256 = "10nfiban4ihsix2zf4qp38mcdmlz3zb6n01n5wkgz9yga28y9jxm";
};
meta.homepage = "https://github.com/andymass/vim-matchup/";
};
@@ -9081,12 +9094,12 @@ final: prev:
vim-ultest = buildVimPluginFrom2Nix {
pname = "vim-ultest";
version = "2021-06-27";
version = "2021-07-05";
src = fetchFromGitHub {
owner = "rcarriga";
repo = "vim-ultest";
rev = "8b551f7fe1f87c832a7aada741eac25d2944407c";
sha256 = "1vfns3srdskncy2s3z58s2k35vlz8gvf8yrh5s49r7d9nzrv45rq";
rev = "43ec7b40a83fcde104d3e5e69a2c112f9dc52325";
sha256 = "1q2rcqllip1raay9nj2cacn6vsairrywg7yxh783zf13n9bmr5vb";
};
meta.homepage = "https://github.com/rcarriga/vim-ultest/";
};
@@ -9177,12 +9190,12 @@ final: prev:
vim-vsnip = buildVimPluginFrom2Nix {
pname = "vim-vsnip";
version = "2021-07-01";
version = "2021-07-05";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "vim-vsnip";
rev = "a1d1841ecadc19eeab9efdd9fa17054cedcba6e6";
sha256 = "0zzqxxv2jqi71p76z0fsnc25kmclazb3x6rg248npsn8pnfwwi1s";
rev = "d9d3c2d2942b8e35aedc5c82552913b19958de77";
sha256 = "06hv1rf3br32n6ks5fic8x9c1m32n3wx4pj4xgmy9q58gf95sn2w";
};
meta.homepage = "https://github.com/hrsh7th/vim-vsnip/";
};
@@ -9501,12 +9514,12 @@ final: prev:
vimspector = buildVimPluginFrom2Nix {
pname = "vimspector";
version = "2021-06-24";
version = "2021-07-04";
src = fetchFromGitHub {
owner = "puremourning";
repo = "vimspector";
rev = "aa0cddc0da5b2547d20551dcffe1d9dc073b3904";
sha256 = "0niv2aa294ay0ifksg5ymrslbj9l6sxypyi3pnmgiigqj8m61yzs";
rev = "da39c4955c2ad0ffa28f5cba81651b568697629c";
sha256 = "02c7kxfalp52k2ij5r6hjnvqd2azkhx9sglqr85bc53rvh1rgi7y";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/puremourning/vimspector/";
@@ -9514,12 +9527,12 @@ final: prev:
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
version = "2021-06-30";
version = "2021-07-05";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
rev = "c9b3b50427d97403e8a36b3fe2d636d0a97db0d8";
sha256 = "1vpl02n2xy7b95mhagbsq7fiz55i0x3wpqpbmpmp16mva6r6agvr";
rev = "3807da1c530e46fb6a633a2268f6e435b16b657b";
sha256 = "0l05fkisvcq9p9jwbxpbb9svwi0h4gp84d7dc4zlkrin1jwnnxyd";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};
@@ -9610,12 +9623,12 @@ final: prev:
which-key-nvim = buildVimPluginFrom2Nix {
pname = "which-key-nvim";
version = "2021-06-26";
version = "2021-07-05";
src = fetchFromGitHub {
owner = "folke";
repo = "which-key.nvim";
rev = "e0dce1552ea37964ae6ac7144709867544eae7f3";
sha256 = "16xwpds1d1dc5p2rz17yqiyr0a844kqj5gnxwnrk2l56fhrhq8xx";
rev = "2d2954a1d05b4f074e022e64db9aa6093d439bb0";
sha256 = "0xpf889ijhrbnpjcky575k46nfh69m5dzcfnvw29vwhdikaz33ma";
};
meta.homepage = "https://github.com/folke/which-key.nvim/";
};
@@ -9731,12 +9744,12 @@ final: prev:
YouCompleteMe = buildVimPluginFrom2Nix {
pname = "YouCompleteMe";
version = "2021-05-25";
version = "2021-07-05";
src = fetchFromGitHub {
owner = "ycm-core";
repo = "YouCompleteMe";
rev = "4df6f35f0c9f9aec21a3f567397496b5dee6acc7";
sha256 = "1ywdxm9sy57k9wp9gkcahhsy8r75ahxsgb7xcdjpzacg4iranj99";
rev = "c83c240e1397291bf1babcba173253d7f753a0b6";
sha256 = "0lr2vl9rdjr2lgbs5vlbcjw3zrwv66w5bijlpk1xy45ccbrbq2nw";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";

2
pkgs/misc/vim-plugins/overrides.nix
View File

@@ -621,7 +621,7 @@ self: super: {
libiconv
];
cargoSha256 = "sha256-IKSnXNFdtykuajOxpw5CYsw2q/mkVLkRtPC49hiXsPc=";
cargoSha256 = "sha256-hcbNjp9KLJO0RANOvtopvdiK0w9ESUXk0KOTPvVcCX4=";
};
in
''

3
pkgs/misc/vim-plugins/vim-plugin-names
View File

@@ -73,6 +73,7 @@ clojure-vim/vim-jack-in
cloudhead/neovim-fuzzy
CoatiSoftware/vim-sourcetrail
cocopon/iceberg.vim
codota/tabnine-vim
cohama/lexima.vim
ConradIrwin/vim-bracketed-paste
crusoexia/vim-monokai
@@ -345,7 +346,6 @@ LucHermitte/lh-vim-lib
ludovicchabant/vim-gutentags
ludovicchabant/vim-lawrencium
lukas-reineke/indent-blankline.nvim
lukas-reineke/indent-blankline.nvim@lua as indent-blankline-nvim-lua
lukaszkorecki/workflowish
lumiliet/vim-twig
luochen1990/rainbow
@@ -489,6 +489,7 @@ nvim-treesitter/playground
oberblastmeister/termwrapper.nvim
ocaml/vim-ocaml
octol/vim-cpp-enhanced-highlight
ojroques/nvim-bufdel@main
ojroques/vim-oscyank@main
Olical/aniseed
Olical/conjure

4
pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix
View File

@@ -38,8 +38,8 @@ in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtens
mktplcRef = {
name = "vsliveshare";
publisher = "ms-vsliveshare";
version = "1.0.4419";
sha256 = "1r2xp8ggcrfsf4yzxjiss3hprk4dw7nchwxy920yn2iglvkaalsh";
version = "1.0.4498";
sha256 = "01gg9jqkq9z05ckw0mnqfr769359j6h3z8ay6r17jj6m4mhy2m5g";
};
}).overrideAttrs({ nativeBuildInputs ? [], buildInputs ? [], ... }: {
nativeBuildInputs = nativeBuildInputs ++ [

1
pkgs/os-specific/linux/busybox/sandbox-shell.nix
View File

@@ -8,6 +8,7 @@ busybox.override {
CONFIG_FEATURE_FANCY_ECHO y
CONFIG_FEATURE_SH_MATH y
CONFIG_FEATURE_SH_MATH_64 y
CONFIG_FEATURE_TEST_64 y
CONFIG_ASH y
CONFIG_ASH_OPTIMIZE_FOR_SIZE y

6
pkgs/os-specific/linux/kernel/linux-lqx.nix
View File

@@ -1,8 +1,8 @@
{ lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args:
let
version = "5.12.9";
suffix = "lqx1";
version = "5.12.14";
suffix = "lqx2";
in
buildLinux (args // {
@@ -14,7 +14,7 @@ buildLinux (args // {
owner = "zen-kernel";
repo = "zen-kernel";
rev = "v${version}-${suffix}";
sha256 = "sha256-qmX66nz+gVOt1RGsUT9fA3wPUT7I9Z4jhxpybP0I8Cw=";
sha256 = "sha256-pj5sSW4ggZEx2n7bVU2sfK3JOXG5n4Rsp3S66/+/wVU=";
};
extraMeta = {

4
pkgs/os-specific/linux/kernel/linux-zen.nix
View File

@@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, buildLinux, ... } @ args:
let
version = "5.12.9";
version = "5.12.14";
suffix = "zen1";
in
@@ -14,7 +14,7 @@ buildLinux (args // {
owner = "zen-kernel";
repo = "zen-kernel";
rev = "v${version}-${suffix}";
sha256 = "sha256-Sbe7pY/htLRRx5Qs78BpEzNCSIEsnZMj1+bkAftZdbQ=";
sha256 = "sha256-xmU2HNigSMb+xGkQ9XShBKfRxVHPHsz88JoTI2KsShQ=";
};
extraMeta = {

4
pkgs/servers/tailscale/default.nix
View File

@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "tailscale";
version = "1.10.0";
version = "1.10.1";
src = fetchFromGitHub {
owner = "tailscale";
repo = "tailscale";
rev = "v${version}";
sha256 = "0smc2xqbqc2p4jj1c98gzzxbr28sbx8z8625hbrng9m39vwylfxf";
sha256 = "1s4qpz4jwar3lcqyzkgyvgm4bghzass974lq1pw4fziqlsblh0vm";
};
nativeBuildInputs = [ makeWrapper ];

16
pkgs/tools/backup/partclone/default.nix
View File

@@ -1,21 +1,21 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook
, pkg-config, libuuid, e2fsprogs, nilfs-utils, ntfs3g
, pkg-config, libuuid, e2fsprogs, nilfs-utils, ntfs3g, openssl
}:
stdenv.mkDerivation rec {
pname = "partclone";
version = "0.3.11";
version = "0.3.17";
src = fetchFromGitHub {
owner = "Thomas-Tsai";
repo = "partclone";
rev = version;
sha256 = "0bv15i0gxym4dv48rgaavh8p94waryn1l6viis6qh5zm9cd08skg";
sha256 = "sha256-tMdBo26JvHxbVI/Y2KDMejH+YT4IVx2H/y36u9ss0C8=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [
e2fsprogs libuuid stdenv.cc.libc nilfs-utils ntfs3g
e2fsprogs libuuid stdenv.cc.libc nilfs-utils ntfs3g openssl
(lib.getOutput "static" stdenv.cc.libc)
];
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = {
meta = with lib; {
description = "Utilities to save and restore used blocks on a partition";
longDescription = ''
Partclone provides utilities to save and restore used blocks on a
@@ -43,8 +43,8 @@ stdenv.mkDerivation rec {
ext2 partition.
'';
homepage = "https://partclone.org";
license = lib.licenses.gpl2;
maintainers = [lib.maintainers.marcweber];
platforms = lib.platforms.linux;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ marcweber ];
platforms = platforms.linux;
};
}

4
pkgs/tools/filesystems/glusterfs/default.nix
View File

@@ -55,13 +55,13 @@ let
];
in stdenv.mkDerivation rec {
pname = "glusterfs";
version = "9.2";
version = "9.3";
src = fetchFromGitHub {
owner = "gluster";
repo = pname;
rev = "v${version}";
sha256 = "00y2xs7nj4d59x4fp6gq7qql3scykq9lppdvx7y3xbgfmkrwixx9";
sha256 = "sha256-xV7griN453f63jwX5jTdW0KJdLi14Km7JengbNeh4iI=";
};
inherit buildInputs propagatedBuildInputs;

12
pkgs/tools/misc/fluent-bit/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, flex, bison }:
{ lib, stdenv, fetchFromGitHub, cmake, flex, bison, systemd }:
stdenv.mkDerivation rec {
pname = "fluent-bit";
@@ -13,11 +13,17 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake flex bison ];
buildInputs = lib.optionals stdenv.isLinux [ systemd ];
cmakeFlags = [ "-DFLB_METRICS=ON" "-DFLB_HTTP_SERVER=ON" ];
patches = lib.optionals stdenv.isDarwin [ ./fix-luajit-darwin.patch ];
# _FORTIFY_SOURCE requires compiling with optimization (-O)
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-O";
outputs = [ "out" "dev" ];
postPatch = ''
substituteInPlace src/CMakeLists.txt \
--replace /lib/systemd $out/lib/systemd
@@ -26,9 +32,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Log forwarder and processor, part of Fluentd ecosystem";
homepage = "https://fluentbit.io";
maintainers = with maintainers; [
samrose
];
maintainers = with maintainers; [ samrose fpletz ];
license = licenses.asl20;
platforms = platforms.unix;
};

4
pkgs/tools/misc/pgcenter/default.nix
View File

@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "pgcenter";
version = "0.9.0";
version = "0.9.1";
src = fetchFromGitHub {
owner = "lesovsky";
repo = "pgcenter";
rev = "v${version}";
sha256 = "0l3da7migx1gprhlwc98x30qh6lmrn8hizanxgs3hxl0arbrn710";
sha256 = "18s102hv6qqlx0nra91srdlb5fyv6x3hwism6c2r6zbxh68pgsag";
};
vendorSha256 = "0mgq9zl56wlr37dxxa1sh53wfkhrl9ybjvxj5y9djspqkp4j45pn";

1
pkgs/tools/misc/rauc/default.nix
View File

@@ -35,6 +35,7 @@ stdenv.mkDerivation rec {
buildInputs = [ curl dbus glib json-glib openssl ];
configureFlags = [
"--with-systemdunitdir=${placeholder "out"}/lib/systemd/system"
"--with-dbusinterfacesdir=${placeholder "out"}/share/dbus-1/interfaces"
"--with-dbuspolicydir=${placeholder "out"}/share/dbus-1/systemd.d"
"--with-dbussystemservicedir=${placeholder "out"}/share/dbus-1/system-services"

6
pkgs/tools/misc/topgrade/default.nix
View File

@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "topgrade";
version = "7.0.1";
version = "7.1.0";
src = fetchFromGitHub {
owner = "r-darwish";
repo = pname;
rev = "v${version}";
sha256 = "sha256-86lBEtwybHrcm7G0ZIbfOHSZPBzNERHGqrTR4YbpDnE=";
sha256 = "sha256-MGu0rQhNEaToPY4o9fz9E3RlvcLKjDq76Mqoq4UeL08=";
};
cargoSha256 = "sha256-yZIh01A1yC1ZeDDyXeh1C3abPfbW2JuJ7TIsVO1weZk=";
cargoSha256 = "sha256-Nx0Mw+V8Hgtioi77sk7p/lq6KGJQ3zRXWMNEIzT4Xn8=";
buildInputs = lib.optional stdenv.isDarwin Foundation;

4
pkgs/tools/misc/trash-cli/default.nix
View File

@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "trash-cli";
version = "0.21.6.10.1";
version = "0.21.6.30";
src = fetchFromGitHub {
owner = "andreafrancia";
repo = "trash-cli";
rev = version;
sha256 = "0mhpzf3vmd876aldl5gazmk4si0zvrh0v1rwsz2hbrn0571zmzy9";
sha256 = "09vwg4jpx7pl7rd5ybq5ldgwky8zzf59msmzvmim9vipnmjgkxv7";
};
propagatedBuildInputs = [ python3Packages.psutil ];

Some files were not shown because too many files have changed in this diff Show More