Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-06-30 06:04:18 +00:00 committed by GitHub
commit 7f05df0a91
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
58 changed files with 1661 additions and 1366 deletions

View file

@ -1701,6 +1701,18 @@
githubId = 3471749;
name = "Claudio Bley";
};
cburstedde = {
email = "burstedde@ins.uni-bonn.de";
github = "cburstedde";
githubId = 109908;
name = "Carsten Burstedde";
keys = [
{
longkeyid = "rsa2048/0x0704CD9E550A6BCD";
fingerprint = "1127 A432 6524 BF02 737B 544E 0704 CD9E 550A 6BCD";
}
];
};
cdepillabout = {
email = "cdep.illabout@gmail.com";
github = "cdepillabout";
@ -10872,6 +10884,12 @@
githubId = 608417;
name = "Jos van den Oever";
};
vanilla = {
email = "neko@hydev.org";
github = "VergeDX";
githubId = 25173827;
name = "Vanilla";
};
vanschelven = {
email = "klaas@vanschelven.com";
github = "vanschelven";

View file

@ -48,6 +48,14 @@
<link xlink:href="options.html#opt-networking.ucarp.enable">networking.ucarp</link>.
</para>
</listitem>
<listitem>
<para>
Users of flashrom should migrate to
<link xlink:href="options.html#opt-programs.flashrom.enable">programs.flashrom.enable</link>
and add themselves to the <literal>flashrom</literal> group to
be able to access programmers supported by flashrom.
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-21.11-incompatibilities">

View file

@ -16,6 +16,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- [ucarp](https://download.pureftpd.org/pub/ucarp/README), an userspace implementation of the Common Address Redundancy Protocol (CARP). Available as [networking.ucarp](options.html#opt-networking.ucarp.enable).
- Users of flashrom should migrate to [programs.flashrom.enable](options.html#opt-programs.flashrom.enable) and add themselves to the `flashrom` group to be able to access programmers supported by flashrom.
## Backward Incompatibilities {#sec-release-21.11-incompatibilities}
- The `staticjinja` package has been upgraded from 1.0.4 to 2.0.0

View file

@ -138,6 +138,7 @@
./programs/file-roller.nix
./programs/firejail.nix
./programs/fish.nix
./programs/flashrom.nix
./programs/flexoptix-app.nix
./programs/freetds.nix
./programs/fuse.nix

View file

@ -0,0 +1,26 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.programs.flashrom;
in
{
options.programs.flashrom = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Installs flashrom and configures udev rules for programmers
used by flashrom. Grants access to users in the "flashrom"
group.
'';
};
};
config = mkIf cfg.enable {
services.udev.packages = [ pkgs.flashrom ];
environment.systemPackages = [ pkgs.flashrom ];
users.groups.flashrom = { };
};
}

View file

@ -91,7 +91,7 @@ in
# before setting your PS1 and etc. Otherwise this will likely to interact with
# your ~/.zshrc configuration in unexpected ways as the default prompt sets
# a lot of different prompt variables.
autoload -U promptinit && promptinit && prompt walters && setopt prompt_sp
autoload -U promptinit && promptinit && prompt suse && setopt prompt_sp
'';
description = ''
Shell script code used to initialise the zsh prompt.

View file

@ -99,7 +99,8 @@ in
autoSuspend = mkOption {
default = true;
description = ''
Suspend the machine after inactivity.
On the GNOME Display Manager login screen, suspend the machine after inactivity.
(Does not affect automatic suspend while logged in, or at lock screen.)
'';
type = types.bool;
};

View file

@ -0,0 +1,99 @@
{ stdenv
, lib
, makeWrapper
, fetchurl
, makeDesktopItem
, copyDesktopItems
, imagemagick
, openjdk11
, dpkg
, writeScript
, coreutils
, bash
, tor
, psmisc
}:
let
bisq-launcher = writeScript "bisq-launcher" ''
#! ${bash}/bin/bash
# Setup a temporary Tor instance
TMPDIR=$(${coreutils}/bin/mktemp -d)
CONTROLPORT=$(${coreutils}/bin/shuf -i 9100-9499 -n 1)
SOCKSPORT=$(${coreutils}/bin/shuf -i 9500-9999 -n 1)
${coreutils}/bin/head -c 1024 < /dev/urandom > $TMPDIR/cookie
${tor}/bin/tor --SocksPort $SOCKSPORT --ControlPort $CONTROLPORT \
--ControlPortWriteToFile $TMPDIR/port --CookieAuthFile $TMPDIR/cookie \
--CookieAuthentication 1 >$TMPDIR/tor.log --RunAsDaemon 1
torpid=$(${psmisc}/bin/fuser $CONTROLPORT/tcp)
echo Temp directory: $TMPDIR
echo Tor PID: $torpid
echo Tor control port: $CONTROLPORT
echo Tor SOCKS port: $SOCKSPORT
echo Tor log: $TMPDIR/tor.log
echo Bisq log file: $TMPDIR/bisq.log
JAVA_TOOL_OPTIONS="-XX:MaxRAM=4g" bisq-desktop-wrapped \
--torControlCookieFile=$TMPDIR/cookie \
--torControlUseSafeCookieAuth \
--torControlPort $CONTROLPORT "$@" > $TMPDIR/bisq.log
echo Bisq exited. Killing Tor...
kill $torpid
'';
in
stdenv.mkDerivation rec {
version = "1.7.0";
pname = "bisq-desktop";
nativeBuildInputs = [ makeWrapper copyDesktopItems dpkg ];
src = fetchurl {
url = "https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb";
sha256 = "0crry5k7crmrqn14wxiyrnhk09ac8a9ksqrwwky7jsnyah0bx5k4";
};
desktopItems = [
(makeDesktopItem {
name = "Bisq";
exec = "bisq-desktop";
icon = "bisq";
desktopName = "Bisq";
genericName = "Decentralized bitcoin exchange";
categories = "Network;Utility;";
})
];
unpackPhase = ''
dpkg -x $src .
'';
installPhase = ''
mkdir -p $out/lib $out/bin
cp opt/bisq/lib/app/desktop-${version}-all.jar $out/lib
makeWrapper ${openjdk11}/bin/java $out/bin/bisq-desktop-wrapped \
--add-flags "-jar $out/lib/desktop-${version}-all.jar bisq.desktop.app.BisqAppMain"
makeWrapper ${bisq-launcher} $out/bin/bisq-desktop \
--prefix PATH : $out/bin
copyDesktopItems
for n in 16 24 32 48 64 96 128 256; do
size=$n"x"$n
${imagemagick}/bin/convert opt/bisq/lib/Bisq.png -resize $size bisq.png
install -Dm644 -t $out/share/icons/hicolor/$size/apps bisq.png
done;
'';
meta = with lib; {
description = "A decentralized bitcoin exchange network";
homepage = "https://bisq.network";
license = licenses.mit;
maintainers = with maintainers; [ juaningan emmanuelrosa ];
platforms = [ "x86_64-linux" ];
};
}

View file

@ -0,0 +1,25 @@
{ fetchFromGitHub, lib, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "helix";
version = "0.3.0";
src = fetchFromGitHub {
owner = "helix-editor";
repo = pname;
rev = "v${version}";
fetchSubmodules = true;
sha256 = "sha256-dI5yIP5uUmM9pyMpvvdrk8/0jE/REkU/m9BF081LwMU=";
};
cargoSha256 = "sha256-l3Ikr4IyUsHItJIC4BaIZZb6vio3bchumbbPI+nxIjQ=";
cargoBuildFlags = [ "--features embed_runtime" ];
meta = with lib; {
description = "A post-modern modal text editor";
homepage = "https://helix-editor.com";
license = licenses.mpl20;
maintainers = with maintainers; [ yusdacra ];
};
}

View file

@ -1,8 +1,8 @@
{ buildGoModule, fetchFromGitHub, installShellFiles, lib }:
let
humioCtlVersion = "0.28.3";
sha256 = "sha256-GUn5hg4gPGjQ6U2dboGE22u8XuZ578+EnkmHLASXd3Q=";
humioCtlVersion = "0.28.4";
sha256 = "sha256-X2pc15InfCzVbZ2fmBdr+GKgOySIruA1yD61HcLO164=";
vendorSha256 = "sha256-867x33Aq27D2m14NqqsdByC39pjjyJZbfX3jmwVU2yo=";
in buildGoModule {
name = "humioctl-${humioCtlVersion}";

View file

@ -1,4 +1,4 @@
{ callPackage, buildFHSUserEnv, undaemonize }:
{ callPackage, buildFHSUserEnv, undaemonize, unwrapped ? callPackage ./runtime.nix {} }:
let
houdini-runtime = callPackage ./runtime.nix { };
@ -9,6 +9,10 @@ in buildFHSUserEnv {
mkdir -p $out/usr/lib/sesi
'';
passthru = {
unwrapped = houdini-runtime;
};
runScript = "${undaemonize}/bin/undaemonize ${houdini-runtime}/bin/houdini";
}

View file

@ -1,6 +1,9 @@
{ lib, stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, libGL, alsa-lib, dbus, xkeyboardconfig, bc, addOpenGLRunpath }:
{ lib, stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, libGL, alsa-lib
, dbus, xkeyboardconfig, nss, nspr, expat, pciutils, libxkbcommon, bc, addOpenGLRunpath
}:
let
# NOTE: Some dependencies only show in errors when run with QT_DEBUG_PLUGINS=1
ld_library_path = builtins.concatStringsSep ":" [
"${stdenv.cc.cc.lib}/lib64"
(lib.makeLibraryPath [
@ -17,6 +20,8 @@ let
xorg.libXcomposite
xorg.libXdamage
xorg.libXtst
xorg.libxcb
xorg.libXScrnSaver
alsa-lib
fontconfig
libSM
@ -25,26 +30,22 @@ let
libpng
dbus
addOpenGLRunpath.driverLink
nss
nspr
expat
pciutils
libxkbcommon
])
];
license_dir = "~/.config/houdini";
in
stdenv.mkDerivation rec {
version = "17.5.327";
version = "18.0.460";
pname = "houdini-runtime";
src = requireFile rec {
name = "houdini-${version}-linux_x86_64_gcc6.3.tar.gz";
sha256 = "1byigmhmby8lgi2vmgxy9jlrrqk7jyr507zqkihq5bv8kfsanv1x";
message = ''
This nix expression requires that ${name} is already part of the store.
Download it from https://www.sidefx.com and add it to the nix store with:
nix-prefetch-url <URL>
This can't be done automatically because you need to create an account on
their website and agree to their license terms before you can download
it. That's what you get for using proprietary software.
'';
sha256 = "18rbwszcks2zfn9zbax62rxmq50z9mc3h39b13jpd39qjqdd3jsd";
url = meta.homepage;
};
buildInputs = [ bc ];
@ -82,7 +83,6 @@ stdenv.mkDerivation rec {
license = lib.licenses.unfree;
platforms = lib.platforms.linux;
hydraPlatforms = [ ]; # requireFile src's should be excluded
maintainers = [ lib.maintainers.canndrew ];
maintainers = with lib.maintainers; [ canndrew kwohlfahrt ];
};
}

View file

@ -0,0 +1,57 @@
{ lib, fetchFromGitHub
, python3Packages, wrapGAppsHook, gobject-introspection
, gtk-layer-shell, pango, gdk-pixbuf, atk
# Extra packages called by various internal nwg-panel modules
, sway # swaylock, swaymsg
, systemd # systemctl
, wlr-randr # wlr-randr
, nwg-menu # nwg-menu
, light # light
, pamixer # pamixer
, pulseaudio # pactl
}:
python3Packages.buildPythonApplication rec {
pname = "nwg-panel";
version = "0.3.2";
src = fetchFromGitHub {
owner = "nwg-piotr";
repo = "nwg-panel";
rev = "v${version}";
hash = "sha256-x5lGVF6eRhOVXrsBatdsiUiWs/+FxRlCtp79zA206RY=";
};
# No tests
doCheck = false;
# Because of wrapGAppsHook
strictDeps = false;
dontWrapGApps = true;
buildInputs = [ atk gdk-pixbuf gtk-layer-shell pango ];
nativeBuildInputs = [ wrapGAppsHook gobject-introspection ];
propagatedBuildInputs = with python3Packages; [ i3ipc netifaces psutil pybluez pygobject3 ];
postInstall = ''
mkdir -p $out/share/{applications,pixmaps}
cp $src/nwg-panel-config.desktop $out/share/applications/
cp $src/nwg-shell.svg $src/nwg-panel.svg $out/share/pixmaps/
'';
preFixup = ''
makeWrapperArgs+=(
"''${gappsWrapperArgs[@]}"
--prefix XDG_DATA_DIRS : "$out/share"
--prefix PATH : "${lib.makeBinPath [ light nwg-menu pamixer pulseaudio sway systemd wlr-randr ]}"
)
'';
meta = with lib; {
homepage = "https://github.com/nwg-piotr/nwg-panel";
description = "GTK3-based panel for Sway window manager";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ berbiche ];
};
}

View file

@ -2,20 +2,25 @@
buildGoModule rec {
pname = "helm";
version = "3.6.1";
version = "3.6.2";
gitCommit = "ee407bdf364942bcb8e8c665f82e15aa28009b71";
src = fetchFromGitHub {
owner = "helm";
repo = "helm";
rev = "v${version}";
sha256 = "sha256-MXMgCqdFNRMJaStoFMx8BO8OI1B7FqSETk0zW6a/vbE=";
sha256 = "1s40zbk83s1kylcglydw356282virf1828v9waj1zs1gjnjml69h";
};
vendorSha256 = "sha256-PTAyRG6PZK+vaiheUd3oiu4iBGlnFjoCrci0CYbXjBk=";
vendorSha256 = "06ccsy30kd68ml13l5k7d4225vlax3fm2pi8dapsyr4gdr234c1x";
doCheck = false;
subPackages = [ "cmd/helm" ];
buildFlagsArray = [ "-ldflags=-w -s -X helm.sh/helm/v3/internal/version.version=v${version}" ];
ldflags = [
"-w" "-s"
"-X helm.sh/helm/v3/internal/version.version=v${version}"
"-X helm.sh/helm/v3/internal/version.gitCommit=${gitCommit}"
];
nativeBuildInputs = [ installShellFiles ];
postInstall = ''

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "dnscontrol";
version = "3.9.0";
version = "3.10.0";
src = fetchFromGitHub {
owner = "StackExchange";
repo = pname;
rev = "v${version}";
sha256 = "sha256-9lIjQaMYy0FGMkR29Es3BMIAcn+jQYudyFJHwezlXKM=";
sha256 = "sha256-22wYc6W4a5P9+JW7NW+s85IlQ+tfLhYzDarN6PGkFk4=";
};
vendorSha256 = "sha256-thvbqDhLdY+g/byFHJ9Tdiw8WYRccu4X1Rb0pdhE34E=";
vendorSha256 = "sha256-TPvO/E/uOyVSMNRQ3zzt15+i0UK0uHvI4qM5PqmHY20=";
subPackages = [ "." ];

View file

@ -22,13 +22,13 @@ let
pname = "wire-desktop";
version = {
x86_64-darwin = "3.25.4095";
x86_64-linux = "3.25.2940";
x86_64-darwin = "3.26.4145";
x86_64-linux = "3.26.2941";
}.${system} or throwSystem;
sha256 = {
x86_64-darwin = "01gbmbxs3w7lwsy5wjpr7fgqkb20rj5fv1r3dsmjkfwy45pd835j";
x86_64-linux = "1vb2fy8hijjp0193d32d8hw7h00w6wympf3zc96skk8hz3ks6xz8";
x86_64-darwin = "1ck74a9z2mrwmljrqm347bqhjiaf1v0bf1jfnp58cqngh5ygqnf2";
x86_64-linux = "01gy84gr0gw5ap7hpy72azaf6hlzac7vxkn5cgad5sfbyzxgjgc9";
}.${system} or throwSystem;
meta = with lib; {

View file

@ -1,9 +1,10 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, nix-update-script
, pantheon
, pkg-config
, vala_0_46
, vala
, cmake
, ninja
, gtk3
@ -12,27 +13,28 @@
, gtkspell3
, glib
, libgee
, pcre
, sqlite
, discount
, wrapGAppsHook
, withPantheon ? false }:
, withPantheon ? false
}:
stdenv.mkDerivation rec {
pname = "notes-up";
version = "2.0.2";
version = "unstable-2020-12-29";
src = fetchFromGitHub {
owner = "Philip-Scott";
repo = "Notes-up";
rev = version;
sha256 = "0bklgp8qrrj9y5m77xqbpy1ld2d9ya3rlxklgzx3alffq5312i4s";
rev = "2ea9f35f588769758f5d2d4436d71c4059141a6f";
sha256 = "sha256-lKOM9+s34xYB9bF9pgip9DFu+6AaxSE4HjFVhoWtttk=";
};
nativeBuildInputs = [
cmake
ninja
# fails with newer vala: https://github.com/Philip-Scott/Notes-up/issues/349
vala_0_46
vala
pkg-config
wrapGAppsHook
];
@ -45,6 +47,7 @@ stdenv.mkDerivation rec {
gtkspell3
libgee
pantheon.granite
pcre
sqlite
webkitgtk
];
@ -60,9 +63,9 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Markdown notes editor and manager designed for elementary OS"
+ lib.optionalString withPantheon " - built with Contractor support";
+ lib.optionalString withPantheon " - built with Contractor support";
homepage = "https://github.com/Philip-Scott/Notes-up";
license = licenses.gpl2;
license = licenses.gpl2Only;
maintainers = with maintainers; [ davidak ];
platforms = platforms.linux;
};

View file

@ -19,16 +19,16 @@ let
maintainers = with maintainers; [ fliegendewurst ];
};
version = "0.47.4";
version = "0.47.5";
desktopSource = {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
sha256 = "0hvp6rpvgda12ficzqkj7kllgmpzc8n4rvpgv0zi6fa5alkr944x";
sha256 = "16sm93vzlsqmrykbzdvgwszbhq79brd74zp9n9q5wrf4s44xizzv";
};
serverSource = {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
sha256 = "01bbg7ssszrq27zk7xzil2mawk1659h1hw68yvk8lbgc4n9phkqk";
sha256 = "0jk9pf3ljzfdv7d91wxda8z9qz653qas58wsrx42gnf7zxn1l648";
};
in {

View file

@ -129,14 +129,15 @@ self = stdenv.mkDerivation {
++ optionals buildIde
(if versionAtLeast "8.10"
then [ ocamlPackages.lablgtk3-sourceview3 glib gnome.adwaita-icon-theme wrapGAppsHook ]
else [ ocamlPackages.lablgtk ]);
else [ ocamlPackages.lablgtk ])
++ optional (versionAtLeast "8.14") [ ocamlPackages.dune_2 ]
;
postPatch = ''
UNAME=$(type -tp uname)
RM=$(type -tp rm)
substituteInPlace configure --replace "/bin/uname" "$UNAME"
substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM"
substituteInPlace configure.ml --replace '"md5 -q"' '"md5sum"'
${if !versionAtLeast "8.7" then "substituteInPlace configure.ml --replace \"md5 -q\" \"md5sum\"" else ""}
${csdpPatch}
'';

View file

@ -0,0 +1,28 @@
{ lib, stdenv, wlroots, pkg-config
, libxkbcommon, pixman, udev, wayland, wayland-protocols
}:
stdenv.mkDerivation {
pname = "tinywl";
inherit (wlroots) version src;
sourceRoot = "source/tinywl";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libxkbcommon pixman udev wayland wayland-protocols wlroots ];
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp tinywl $out/bin
runHook postInstall
'';
meta = with lib; {
homepage = "https://github.com/swaywm/wlroots/tree/master/tinywl";
description = ''"minimum viable product" Wayland compositor based on wlroots.'';
maintainers = with maintainers; [ qyliss ];
license = licenses.cc0;
inherit (wlroots.meta) platforms;
};
}

View file

@ -9,6 +9,7 @@
, itstool
, libxml2
, glib
, shared-mime-info
}:
stdenv.mkDerivation rec {
@ -38,6 +39,9 @@ stdenv.mkDerivation rec {
pkg-config
gettext
itstool
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
libxml2
shared-mime-info
];
buildInputs = [

View file

@ -0,0 +1,38 @@
{ stdenv
, fetchFromGitHub
, glib
, lib
}:
stdenv.mkDerivation rec {
pname = "flat-remix-gnome";
version = "20210623";
src = fetchFromGitHub {
owner = "daniruiz";
repo = pname;
rev = version;
hash = "sha256-FKsbAvjhXb2ipe3XqACM6OwGYwbBbzvDjsUQYCIQ8NM=";
};
nativeBuildInputs = [ glib ];
makeFlags = [ "PREFIX=$(out)" ];
preInstall = ''
# make install will back up this file, it will fail if the file doesn't exist.
# https://github.com/daniruiz/flat-remix-gnome/blob/20210623/Makefile#L50
mkdir -p $out/share/gnome-shell/
touch $out/share/gnome-shell/gnome-shell-theme.gresource
'';
postInstall = ''
rm $out/share/gnome-shell/gnome-shell-theme.gresource.old
'';
meta = with lib; {
description = "GNOME Shell theme inspired by material design.";
homepage = "https://drasite.com/flat-remix-gnome";
license = licenses.cc-by-sa-40;
platforms = platforms.linux;
maintainers = [ maintainers.vanilla ];
};
}

View file

@ -43,7 +43,7 @@ lib.makePackageOverridable
"rev"
]);
prefix = lib.optionalString (directory != "") "${directory}/";
prefix = lib.optionalString (directory != "") "/${directory}";
in
buildDhallPackage
@ -51,9 +51,12 @@ lib.makePackageOverridable
name = versionedName;
code = "${src}/${prefix}${file}";
code = "${src}${prefix}/${file}";
}
// lib.optionalAttrs document
{ documentationRoot = "${src}/${prefix}"; }
{ documentationRoot = "${src}/${prefix}";
baseImportUrl = "https://raw.githubusercontent.com/${owner}/${repo}/${rev}${prefix}";
}
)
)

View file

@ -37,6 +37,12 @@
#
# If `null`, then no documentation is generated.
, documentationRoot ? null
# Base URL prepended to paths copied to the clipboard
#
# This is used in conjunction with `documentationRoot`, and is unused if
# `documentationRoot` is `null`.
, baseImportUrl ? null
}:
let
@ -85,6 +91,12 @@ in
${lib.optionalString (documentationRoot != null) ''
mkdir -p $out/${dataDhall}
XDG_DATA_HOME=$out/${data} ${dhall-docs}/bin/dhall-docs --input '${documentationRoot}' --package-name '${name}' --output-link $out/docs
XDG_DATA_HOME=$out/${data} ${dhall-docs}/bin/dhall-docs --output-link $out/docs ${lib.cli.toGNUCommandLineShell { } {
base-import-url = baseImportUrl;
input = documentationRoot;
package-name = name;
}}
''}
''

View file

@ -1,5 +1,8 @@
{ lib, stdenv, fetchurl
, IOKit ? null }:
{ lib
, stdenv
, fetchurl
, IOKit
}:
stdenv.mkDerivation rec {
name = "libstatgrab-0.92";
@ -9,11 +12,12 @@ stdenv.mkDerivation rec {
sha256 = "15m1sl990l85ijf8pnc6hdfha6fqyiq74mijrzm3xz4zzxm91wav";
};
buildInputs = [] ++ lib.optional stdenv.isDarwin IOKit;
buildInputs = lib.optional stdenv.isDarwin IOKit;
meta = with lib; {
homepage = "https://www.i-scream.org/libstatgrab/";
description = "A library that provides cross platforms access to statistics about the running system";
maintainers = with maintainers; [ ];
license = licenses.gpl2;
platforms = platforms.unix;
};

View file

@ -0,0 +1,62 @@
{ lib, stdenv, fetchFromGitHub
, autoreconfHook, pkg-config
, p4est-sc-debugEnable ? true, p4est-sc-mpiSupport ? true
, mpi, openmpi, openssh, zlib
}:
let
dbg = if debugEnable then "-dbg" else "";
debugEnable = p4est-sc-debugEnable;
mpiSupport = p4est-sc-mpiSupport;
in
stdenv.mkDerivation {
pname = "p4est-sc${dbg}";
version = "unstable-2021-06-14";
# fetch an untagged snapshot of the prev3-develop branch
src = fetchFromGitHub {
owner = "cburstedde";
repo = "libsc";
rev = "1ae814e3fb1cc5456652e0d77550386842cb9bfb";
sha256 = "14vm0b162jh8399pgpsikbwq4z5lkrw9vfzy3drqykw09n6nc53z";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
propagatedBuildInputs = [ zlib ]
++ lib.optional mpiSupport mpi
++ lib.optional (mpiSupport && mpi == openmpi) openssh
;
inherit debugEnable mpiSupport;
postPatch = ''
echo "dist_scaclocal_DATA += config/sc_v4l2.m4" >> Makefile.am
'';
preConfigure = ''
echo "2.8.0" > .tarball-version
${if mpiSupport then "unset CC" else ""}
'';
configureFlags = lib.optional debugEnable "--enable-debug"
++ lib.optional mpiSupport "--enable-mpi"
;
makeFlags = [ "V=0" ];
dontDisableStatic = true;
enableParallelBuilding = true;
doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
meta = {
branch = "prev3-develop";
description = "Support for parallel scientific applications";
longDescription = ''
The SC library provides support for parallel scientific applications.
Its main purpose is to support the p4est software library, hence
this package is called p4est-sc, but it works standalone, too.
'';
homepage = "https://www.p4est.org/";
downloadPage = "https://github.com/cburstedde/libsc.git";
license = lib.licenses.lgpl21Plus;
maintainers = [ lib.maintainers.cburstedde ];
};
}

View file

@ -0,0 +1,59 @@
{ lib, stdenv, fetchFromGitHub
, autoreconfHook, pkg-config
, p4est-withMetis ? true, metis
, p4est-sc
}:
let
inherit (p4est-sc) debugEnable mpiSupport;
dbg = if debugEnable then "-dbg" else "";
withMetis = p4est-withMetis;
in
stdenv.mkDerivation {
pname = "p4est${dbg}";
version = "unstable-2021-06-22";
# fetch an untagged snapshot of the prev3-develop branch
src = fetchFromGitHub {
owner = "cburstedde";
repo = "p4est";
rev = "7423ac5f2b2b64490a7a92e5ddcbd251053c4dee";
sha256 = "0vffnf48rzw6d0as4c3x1f31b4kapmdzr1hfj5rz5ngah72gqrph";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
propagatedBuildInputs = [ p4est-sc ];
buildInputs = lib.optional withMetis metis;
inherit debugEnable mpiSupport withMetis;
patches = [ ./p4est-metis.patch ];
postPatch = ''
sed -i -e "s:\(^\s*ACLOCAL_AMFLAGS.*\)\s@P4EST_SC_AMFLAGS@\s*$:\1 -I ${p4est-sc}/share/aclocal:" Makefile.am
'';
preConfigure = ''
echo "2.8.0" > .tarball-version
${if mpiSupport then "unset CC" else ""}
'';
configureFlags = [ "--with-sc=${p4est-sc}" ]
++ lib.optional withMetis "--with-metis"
++ lib.optional debugEnable "--enable-debug"
++ lib.optional mpiSupport "--enable-mpi"
;
inherit (p4est-sc) makeFlags dontDisableStatic enableParallelBuilding doCheck;
meta = {
branch = "prev3-develop";
description = "Parallel AMR on Forests of Octrees";
longDescription = ''
The p4est software library provides algorithms for parallel AMR.
AMR refers to Adaptive Mesh Refinement, a technique in scientific
computing to cover the domain of a simulation with an adaptive mesh.
'';
homepage = "https://www.p4est.org/";
downloadPage = "https://github.com/cburstedde/p4est.git";
license = lib.licenses.gpl2Plus;
maintainers = [ lib.maintainers.cburstedde ];
};
}

View file

@ -0,0 +1,26 @@
diff --git a/src/p4est_connectivity.c b/src/p4est_connectivity.c
index 95339136..c93528f2 100644
--- a/src/p4est_connectivity.c
+++ b/src/p4est_connectivity.c
@@ -3715,6 +3715,7 @@ p4est_connectivity_reorder_newid (sc_MPI_Comm comm, int k,
sc_array_t * newid)
{
const int n = (int) conn->num_trees;
+ int metis_n;
int *xadj;
int *adjncy;
int *part;
@@ -3862,10 +3863,12 @@ p4est_connectivity_reorder_newid (sc_MPI_Comm comm, int k,
P4EST_GLOBAL_INFO ("Entering metis\n");
/* now call metis */
+ metis_n = n;
P4EST_EXECUTE_ASSERT_INT
- (METIS_PartGraphRecursive (&n, &ncon, xadj, adjncy, NULL, NULL,
+ (METIS_PartGraphRecursive (&metis_n, &ncon, xadj, adjncy, NULL, NULL,
NULL, &k, NULL, NULL, NULL, &volume, part),
METIS_OK);
+ P4EST_ASSERT (metis_n == n);
P4EST_GLOBAL_INFO ("Done metis\n");
P4EST_GLOBAL_STATISTICSF ("metis volume %d\n", volume);

File diff suppressed because it is too large Load diff

View file

@ -18,7 +18,8 @@ buildPerlPackage rec {
doCheck = false;
nativeBuildInputs = lib.optionals stdenv.isDarwin [ shortenPerlShebang ];
buildInputs = [ ArchiveZip ArchiveCpio file ];
buildInputs = [ ArchiveZip ArchiveCpio ];
propagatedNativeBuildInputs = [ file ];
perlPostHook = ''
# we dont need the debhelper script

View file

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "Adafruit-PureIO";
version = "1.1.8";
version = "1.1.9";
src = fetchPypi {
pname = "Adafruit_PureIO";
inherit version;
sha256 = "1mfa6sfz7qwgajz3lqw0s69ivvwbwvblwkjzbrwdrxjbma4jaw66";
sha256 = "0yd8hw676s7plq75gac4z0ilfcfydjkk3wv76bc73xy70zxj5brc";
};
nativeBuildInputs = [ setuptools-scm ];

View file

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "aiosignal";
version = "1.1.1";
version = "1.1.2";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "aio-libs";
repo = pname;
rev = "v${version}";
sha256 = "0a9md2dy83qwg2an57nqrzp9nb7krq27y9zz0f7qxcrv0xd42djy";
sha256 = "1gyvisccx25py85wwwlljai5qa20jvwyvacgrgkk1h18dkc262fw";
};
propagatedBuildInputs = [

View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "asyncstdlib";
version = "3.9.1";
version = "3.9.2";
disabled = pythonOlder "3.7";
format = "flit";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "maxfischer2781";
repo = pname;
rev = "v${version}";
sha256 = "13ranr7zi61w52vfrxwkf32bbhk88j0r5c5z2x2h5vw268001lk2";
sha256 = "04z0x2n4a7503h6xf853p7if218magi98x397648wb21l4gh3zwv";
};
propagatedBuildInputs = [

View file

@ -3,21 +3,27 @@
, async-timeout
, buildPythonPackage
, fetchFromGitHub
, poetry-core
, pythonOlder
}:
buildPythonPackage rec {
pname = "enturclient";
version = "0.2.1";
disabled = pythonOlder "3.7";
version = "0.2.2";
disabled = pythonOlder "3.8";
format = "pyproject";
src = fetchFromGitHub {
owner = "hfurubotten";
repo = pname;
rev = "v${version}";
sha256 = "158xzv9c2drjgrdhfqm0xzx2d34v45gr5rnjfsi94scffvprgwrg";
sha256 = "1kl44ch8p31pr70yv6na2m0w40frackdwzph9rpb05sc83va701i";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
aiohttp
async-timeout

View file

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "mcstatus";
version = "6.1.0";
version = "6.1.2";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "Dinnerbone";
repo = pname;
rev = "v${version}";
sha256 = "068dc2ilw1kkvw394vqhqgkia5smnvzaca5zbdd2xyl3nch3rk4x";
sha256 = "sha256-RSxysVIP/niQh8WRSk6Z9TSz/W97PkPYIR0NXIZfAbQ=";
};
propagatedBuildInputs = [

View file

@ -25,12 +25,18 @@ buildPythonPackage rec {
pathlib2
];
# upstream doesn't update this requirement probably because they use pip
postPatch = ''
substituteInPlace setup.py \
--replace "portalocker~=1.0" "portalocker"
'';
# No tests found
doCheck = false;
meta = with lib; {
description = "The Microsoft Authentication Library Extensions (MSAL-Extensions) for Python";
homepage = "https://github.com/AzureAD/microsoft-authentication-library-for-python";
homepage = "https://github.com/AzureAD/microsoft-authentication-extensions-for-python";
license = licenses.mit;
maintainers = with maintainers; [
kamadorueda

View file

@ -1,34 +1,27 @@
{ lib, buildPythonPackage, fetchPypi, fetchpatch
, sphinx
, pytest
{ lib, buildPythonPackage, fetchPypi
, pytestCheckHook
, pytestcov
, pytest-flake8
, pytest-mypy
, redis
}:
buildPythonPackage rec {
version = "1.7.0";
version = "2.3.0";
pname = "portalocker";
src = fetchPypi {
inherit pname version;
sha256 = "1p32v16va780mjjdbyp3v702aqg5s618khlila7bdyynis1n84q9";
sha256 = "0k08c0qg21mwz3iqbd20ab22nq705q7cal4a1qr8qnd6ga03v4af";
};
patches = [
# remove pytest-flakes from test dependencies
# merged into master, remove > 1.7.0 release
(fetchpatch {
url = "https://github.com/WoLpH/portalocker/commit/42e4c0a16bbc987c7e33b5cbc7676a63a164ceb5.patch";
sha256 = "01mlr41nhh7mh3qhqy5fhp3br4nps745iy4ns9fjcnm5xhabg5rr";
excludes = [ "pytest.ini" ];
})
propagatedBuildInputs = [
redis
];
checkInputs = [
sphinx
pytest
pytestcov
pytest-flake8
pytestCheckHook
pytest-mypy
];
meta = with lib; {

View file

@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "python_http_client";
version = "3.3.1";
version = "3.3.2";
src = fetchFromGitHub {
owner = "sendgrid";
repo = "python-http-client";
rev = version;
sha256 = "0mbcg0vb9v41v7hbvycrxx5wyrf3ysvfgxkix8hn8c4x5l2lmidc";
sha256 = "0z7nvfq9wdcprwh88xn9p3vm15gb3ijdc8pxn0a133ini9hxxlpx";
};
checkInputs = [

View file

@ -0,0 +1,41 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, future
, mock
, nose
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "python-ipmi";
version = "0.5.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "kontron";
repo = pname;
rev = version;
sha256 = "0rcix3q845zsmfj5857kq1r5b8m7m3sad34i23k65m0p58clwdqm";
};
propagatedBuildInputs = [
future
];
checkInputs = [
mock
nose
pytestCheckHook
];
pythonImportsCheck = [ "pyipmi" ];
meta = with lib; {
description = "Python IPMI Library";
homepage = "https://github.com/kontron/python-ipmi";
license = with licenses; [ lgpl2Plus ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -1,14 +1,12 @@
{ lib, stdenv, fetchgit, sqlite, pkg-config, perl
, buildllvmsparse ? true
, buildc2xml ? true
, llvm ? null, libxml2 ? null
, llvm, libxml2
}:
assert buildllvmsparse -> llvm != null;
assert buildc2xml -> libxml2 != null;
stdenv.mkDerivation {
name = "smatch-20120924";
pname = "smatch";
version = "20120924";
src = fetchgit {
url = "git://repo.or.cz/smatch.git";
@ -17,19 +15,20 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [sqlite perl]
buildInputs = [ sqlite perl ]
++ lib.optional buildllvmsparse llvm
++ lib.optional buildc2xml libxml2;
preBuild =
'' sed -i Makefile \
-e "s|^PREFIX=.*|PREFIX = $out|g"
'';
preBuild = ''
sed -i Makefile \
-e "s|^PREFIX=.*|PREFIX = $out|g"
'';
meta = {
meta = with lib; {
description = "A semantic analysis tool for C";
homepage = "http://smatch.sourceforge.net/";
license = lib.licenses.free; /* OSL, see http://www.opensource.org */
platforms = lib.platforms.linux;
maintainers = with maintainers; [];
license = licenses.free; /* OSL, see http://www.opensource.org */
platforms = platforms.linux;
};
}

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "esbuild";
version = "0.12.11";
version = "0.12.12";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
sha256 = "sha256-fn1PQZxZbizer226c9bI1kQ7/p8Z5PbdPiYv2ekll7U=";
sha256 = "sha256-4Ooadv8r6GUBiayiv4WKVurUeRPIv6LPlMhieH4VL8o=";
};
vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg=";

View file

@ -7,14 +7,14 @@
rustPlatform.buildRustPackage rec {
pname = "rust-analyzer-unwrapped";
version = "2021-06-21";
cargoSha256 = "sha256-OpfcxBeNwXSD830Sz3o07kgIdXTbZNNVGpaPeCIGGV8=";
version = "2021-06-28";
cargoSha256 = "sha256-Xpo/VK/w6BVbHUc+m/70AE0Cag8D3fT+wosOA8Lzz2A=";
src = fetchFromGitHub {
owner = "rust-analyzer";
repo = "rust-analyzer";
rev = version;
sha256 = "sha256-nL5lSvxpOS+fw4iH/Gnl/DI86T9tUtguOy+wLGRkoeY=";
sha256 = "sha256-aWLqcCSeKRmCsETu4ri+SPQ5iB6nqaYELj0Qt3zW9/E=";
};
patches = [

View file

@ -34,7 +34,7 @@ index 43162797e..613266e07 100644
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 e63bc8232..b1e1b70d0 100644
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> {
@ -56,7 +56,7 @@ index e63bc8232..b1e1b70d0 100644
}
}
diff --git a/crates/hir_def/src/nameres/collector.rs b/crates/hir_def/src/nameres/collector.rs
index 927a7b6e8..fc2c50fb8 100644
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<'_> {
@ -69,7 +69,7 @@ index 927a7b6e8..fc2c50fb8 100644
continue;
}
diff --git a/crates/hir_def/src/resolver.rs b/crates/hir_def/src/resolver.rs
index 49c573087..5edd93a2a 100644
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> {
@ -362,7 +362,7 @@ index ffa8bd182..93d3760bf 100644
fn compute_ws(left: SyntaxKind, right: SyntaxKind) -> &'static str {
diff --git a/crates/ide/src/references.rs b/crates/ide/src/references.rs
index 5808562a7..945c9b9e1 100644
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(
@ -376,10 +376,10 @@ index 5808562a7..945c9b9e1 100644
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 d44a1b45f..e186b82b7 100644
index 5259d86d2..365d0c4de 100644
--- a/crates/ide/src/syntax_highlighting.rs
+++ b/crates/ide/src/syntax_highlighting.rs
@@ -294,7 +294,7 @@ fn traverse(
@@ -295,7 +295,7 @@ fn traverse(
Some(parent) => {
// We only care Name and Name_ref
match (token.kind(), parent.kind()) {
@ -388,7 +388,7 @@ index d44a1b45f..e186b82b7 100644
_ => token.into(),
}
}
@@ -310,7 +310,7 @@ fn traverse(
@@ -311,7 +311,7 @@ fn traverse(
Some(parent) => {
// We only care Name and Name_ref
match (token.kind(), parent.kind()) {
@ -398,10 +398,10 @@ index d44a1b45f..e186b82b7 100644
}
}
diff --git a/crates/ide_assists/src/handlers/extract_function.rs b/crates/ide_assists/src/handlers/extract_function.rs
index ac7f0959b..9b78cf4b1 100644
index 870d4f665..454de2645 100644
--- a/crates/ide_assists/src/handlers/extract_function.rs
+++ b/crates/ide_assists/src/handlers/extract_function.rs
@@ -1384,7 +1384,7 @@ fn fix_param_usages(ctx: &AssistContext, params: &[Param], syntax: &SyntaxNode)
@@ -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) {
@ -429,7 +429,7 @@ index 841537c77..d9d9124b6 100644
}
(None, ExpectedResult::NotApplicable) => (),
diff --git a/crates/ide_completion/src/completions/qualified_path.rs b/crates/ide_completion/src/completions/qualified_path.rs
index f5dbd203b..88f4d940d 100644
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
@ -465,10 +465,19 @@ index f5dbd203b..88f4d940d 100644
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 81c4fb305..8ea5a2d5b 100644
index 5abd6ee37..5e6a2e661 100644
--- a/crates/ide_completion/src/completions/unqualified_path.rs
+++ b/crates/ide_completion/src/completions/unqualified_path.rs
@@ -74,11 +74,9 @@ pub(crate) fn complete_unqualified_path(acc: &mut Completions, ctx: &CompletionC
@@ -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
@ -484,7 +493,7 @@ index 81c4fb305..8ea5a2d5b 100644
// 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 7b76600df..09eb953fd 100644
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> {
@ -518,7 +527,7 @@ index 7b76600df..09eb953fd 100644
_ => None,
}
}
@@ -282,7 +283,7 @@ impl<'a> CompletionContext<'a> {
@@ -282,28 +283,28 @@ impl<'a> CompletionContext<'a> {
pub(crate) fn expects_ident_pat_or_ref_expr(&self) -> bool {
matches!(
self.completion_location,
@ -527,7 +536,14 @@ index 7b76600df..09eb953fd 100644
)
}
@@ -293,14 +294,14 @@ impl<'a> CompletionContext<'a> {
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,
@ -544,7 +560,7 @@ index 7b76600df..09eb953fd 100644
)
}
@@ -321,16 +322,14 @@ impl<'a> CompletionContext<'a> {
@@ -324,16 +325,14 @@ impl<'a> CompletionContext<'a> {
|| self.previous_token_is(T![unsafe])
|| matches!(
self.prev_sibling,
@ -566,7 +582,7 @@ index 7b76600df..09eb953fd 100644
)
}
@@ -704,8 +703,8 @@ fn path_or_use_tree_qualifier(path: &ast::Path) -> Option<(ast::Path, bool)> {
@@ -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();
@ -591,7 +607,7 @@ index 33d3a5ee1..749dfc665 100644
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 b4f2fe9a4..c2a9a38c9 100644
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> {

View file

@ -58,8 +58,8 @@ let
inherit version;
src = fetchurl {
url = "https://dl.xonotic.org/${pname}-${version}-source.zip";
sha256 = "0axxw04fyz6jlfqd0kp7hdrqa0li31sx1pbipf2j5qp9wvqicsay";
url = "https://dl.xonotic.org/xonotic-${version}.zip";
sha256 = "sha256-oi9yMPSGxYJbVc/a3XM5nJsPrpjJ4IHdisduygg1mtU=";
};
nativeBuildInputs = [ unzip ];

View file

@ -10,10 +10,10 @@
}:
let
version = "1.17";
version = "1.18";
prebuilt_server = fetchurl {
url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}";
sha256 = "sha256-EbWtLRvJuXMPtyVKeO/XGo/0axk4/0aOR6IbZTobZyU=";
sha256 = "18si7k9hyqa77yy9w747kl2x2pivyigny49dwzx9sfd9xmmmq734";
};
in
stdenv.mkDerivation rec {
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
owner = "Genymobile";
repo = pname;
rev = "v${version}";
sha256 = "sha256-xCzrbWhMve0bJerFNHiUdSzp5O1pSaKRkcJSs/0nHpk=";
sha256 = "019948v63qhmp742hmar7a98ss673m0wdycpphjhfl1kg4iihiya";
};
# postPatch:

View file

@ -65,12 +65,12 @@ final: prev:
ale = buildVimPluginFrom2Nix {
pname = "ale";
version = "2021-06-22";
version = "2021-06-29";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
rev = "a4ba421803d030a8967ede111ce921d439aa5fbb";
sha256 = "115n81dssyxsi3hlrfbga2w2vkyshf3jiy8m27pafl4adp7n3yqf";
rev = "7862633d9d0e35157d54ad1487bd5a73c618fc7f";
sha256 = "0m7hh7h4jxfw9j5fq00a11qaz8khyrxcn4ka81qn73wzg28hdv11";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
};
@ -413,12 +413,12 @@ final: prev:
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
version = "2021-06-27";
version = "2021-06-30";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "9bac6b4623c8b24615bc1f0cfb582e1a8578060f";
sha256 = "0f0birbvd4s28bqb6jp8pc8r24f4k5789gqqg7mwgrf06zhsa8dh";
rev = "01507625b76291bb41a3c92ca8a056d655b674cb";
sha256 = "16n1vdgrn9rv7pzwzgisdhin81d5fhlyicp0m0md4g6sd6jfydqh";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@ -557,12 +557,12 @@ final: prev:
coc-nvim = buildVimPluginFrom2Nix {
pname = "coc-nvim";
version = "2021-06-25";
version = "2021-06-29";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc.nvim";
rev = "91b144b090311c29e40832e76ec8624e5e3599b0";
sha256 = "0cwhzk9lkwj0mndjmxny1y5hps0qgmib50flkvlvhl39j6zbrixx";
rev = "34d9d52f4e030a7f1c5e15afa1928cad6d9d903d";
sha256 = "0mp71zwaiavn8crw64srgcg4fic69dl0rssd1y5jkwfy25r7jnfv";
};
meta.homepage = "https://github.com/neoclide/coc.nvim/";
};
@ -858,12 +858,12 @@ final: prev:
csv-vim = buildVimPluginFrom2Nix {
pname = "csv-vim";
version = "2021-05-09";
version = "2021-06-29";
src = fetchFromGitHub {
owner = "chrisbra";
repo = "csv.vim";
rev = "a7baf1ce934e725fbcd61b7e6aa27572c0439681";
sha256 = "1bfi90h3xn0iz9kp2jglxsw22aq72si6xccvsfhxhjsz329rw239";
rev = "7555c28930686b36071c96cca51477f332224231";
sha256 = "0dr4yvv319aydcfaww8xyrvrh1x7g99c3k7wvvayfa1qwsi2w0bl";
};
meta.homepage = "https://github.com/chrisbra/csv.vim/";
};
@ -1014,12 +1014,12 @@ final: prev:
denite-nvim = buildVimPluginFrom2Nix {
pname = "denite-nvim";
version = "2021-06-25";
version = "2021-06-27";
src = fetchFromGitHub {
owner = "Shougo";
repo = "denite.nvim";
rev = "cfee6f43aaead875bdc5351627e344698064108c";
sha256 = "1yciacr1fh5d155b5d2an4hjy8h0kdp94qrkp9vdi4a46ljrcy9s";
rev = "54abca453ae90607a3f70cc316cba9b384bfaac1";
sha256 = "0hhsrw2pkp0pb8sjdr4hmqnnbnfviir56mdwl8m0vzci7zx4409x";
};
meta.homepage = "https://github.com/Shougo/denite.nvim/";
};
@ -1256,12 +1256,12 @@ final: prev:
deoplete-nvim = buildVimPluginFrom2Nix {
pname = "deoplete-nvim";
version = "2021-06-24";
version = "2021-06-27";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deoplete.nvim";
rev = "a25b3262f7b5ec7e7188560202b680b2763a8359";
sha256 = "0q9cc641x0jwdvd51dwm3grmgj9y9lhlgz5zpgnwwwbx894i55sn";
rev = "6fc33bed8f5c75a08b14af285d7775d893037cc4";
sha256 = "1cg4lvb1py6q838rvd2z3kvcr3xa9cziz0wgsjlg7392ivkss8hd";
};
meta.homepage = "https://github.com/Shougo/deoplete.nvim/";
};
@ -1304,12 +1304,12 @@ final: prev:
diffview-nvim = buildVimPluginFrom2Nix {
pname = "diffview-nvim";
version = "2021-06-15";
version = "2021-06-28";
src = fetchFromGitHub {
owner = "sindrets";
repo = "diffview.nvim";
rev = "f06495b12ba47460c61e8ad1388326e3f94e5637";
sha256 = "0lxv2c8wa0a6nknw2vfms9fzgjrmjk8klavhs8ay1qcgzis9s1iq";
rev = "451fdee6e4c0f32ccfde89081bc73bacf0ee05a0";
sha256 = "0zpkqdg1cd5a9lr0cqwf50x3jx55dkkbdv0sijfighrx9fxs7ixl";
};
meta.homepage = "https://github.com/sindrets/diffview.nvim/";
};
@ -1619,12 +1619,12 @@ final: prev:
friendly-snippets = buildVimPluginFrom2Nix {
pname = "friendly-snippets";
version = "2021-06-25";
version = "2021-06-27";
src = fetchFromGitHub {
owner = "rafamadriz";
repo = "friendly-snippets";
rev = "3dca3fc854b72a72233341f4ae51cebd7a864234";
sha256 = "1saasvazmxq5ll0fna0a8kx5q8lq9mg0ldkj1k4g13h9g34sdwgg";
rev = "3361919766dde206849b901163abd7cb820e59a7";
sha256 = "0q25v9qlyjv58wlq6yzjajmnzi3rw8yiz9amjia6h0bzhnfxwn3l";
};
meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
};
@ -2039,12 +2039,12 @@ final: prev:
hop-nvim = buildVimPluginFrom2Nix {
pname = "hop-nvim";
version = "2021-06-23";
version = "2021-06-27";
src = fetchFromGitHub {
owner = "phaazon";
repo = "hop.nvim";
rev = "a6cd8df18dc2f667e2d10b5fea79d73a7d084cd7";
sha256 = "1j5l012vxrcqs5x4ry8cfpvz3a289xsr6h969avd4b8ic8w7dkwb";
rev = "00b0f865efdcb329629315c63e9dac5aa6a6e736";
sha256 = "1c3bzhrsdbkwj9hj832bb9snr7b78yf8mbx9gm4fc2lbbnrxqvvp";
};
meta.homepage = "https://github.com/phaazon/hop.nvim/";
};
@ -2316,12 +2316,12 @@ final: prev:
julia-vim = buildVimPluginFrom2Nix {
pname = "julia-vim";
version = "2021-06-17";
version = "2021-06-29";
src = fetchFromGitHub {
owner = "JuliaEditorSupport";
repo = "julia-vim";
rev = "c3c35958e56993337d6517cf5d6e974aca1da99f";
sha256 = "0qlx267mpyphpxzfr6y0x87hkxisfmsivd2617sbbwxkv05z2kw1";
rev = "26beb1213019d56767e7f14ba1f2cbc33cb315b8";
sha256 = "05bqimb70r646q9v7nshwapqs8n9hvbx55cxx6khd6gwvpckh22w";
};
meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/";
};
@ -2556,12 +2556,12 @@ final: prev:
lightspeed-nvim = buildVimPluginFrom2Nix {
pname = "lightspeed-nvim";
version = "2021-06-26";
version = "2021-06-29";
src = fetchFromGitHub {
owner = "ggandor";
repo = "lightspeed.nvim";
rev = "1a213ae1a9587afd4083309098b3a3e63cf6ea80";
sha256 = "053drg668sbp0q7xfjm9cx29d87brf02xn86ind81vd039csjd7z";
rev = "b93922421bd41e8349cf46640b5742feb5e0031a";
sha256 = "1sb0z6nrq9nmrqlv6p6xvk1plndc347s3ydsgq6n6p8c2xgfb1ch";
};
meta.homepage = "https://github.com/ggandor/lightspeed.nvim/";
};
@ -2628,12 +2628,12 @@ final: prev:
lsp_signature-nvim = buildVimPluginFrom2Nix {
pname = "lsp_signature-nvim";
version = "2021-06-25";
version = "2021-06-29";
src = fetchFromGitHub {
owner = "ray-x";
repo = "lsp_signature.nvim";
rev = "69142caa4e48a265467d1c43112de0790f0e5090";
sha256 = "0m69fdblnxydlix5cx1rnrcyxsfvl85ica2vn0d58vpls20hnibd";
rev = "ef20fad69270f4d3df356be3c01bd079739e72c4";
sha256 = "0whmqkz6k27hrsjmbw841bsdg8xkiv8gj01sw40cg99mcdyags70";
};
meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
};
@ -2676,24 +2676,24 @@ final: prev:
luasnip = buildVimPluginFrom2Nix {
pname = "luasnip";
version = "2021-06-26";
version = "2021-06-27";
src = fetchFromGitHub {
owner = "l3mon4d3";
repo = "luasnip";
rev = "8c96627d42aeb00b7595bb9fd812762ca4a27019";
sha256 = "0cjphgly8y2gb5izwl670qy58ky6wjfw1qzarfkxi5wmbk1mawv9";
rev = "1e79310e57404e86e00ceca2c4657bb9a9072673";
sha256 = "0v6kgjjy9ygr2vygh4zizfbnms33w3bn1b4zdljx79c358firgcx";
};
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
};
lush-nvim = buildVimPluginFrom2Nix {
pname = "lush-nvim";
version = "2021-06-01";
version = "2021-06-28";
src = fetchFromGitHub {
owner = "rktjmp";
repo = "lush.nvim";
rev = "684c06d4879a38e50a247ce23b32beaacc75c4d1";
sha256 = "1khws788sww2dw4s3nqyigyxi7099kqh60dabs66hj9byb84irql";
rev = "850a2aa8366bbe8b07088a19e6b6f2e8e76f2c9f";
sha256 = "048fjsxrshlgcscs9c1y29fgpcb9l9cnhpghkj9ailpzjv4j5hxf";
};
meta.homepage = "https://github.com/rktjmp/lush.nvim/";
};
@ -2772,12 +2772,12 @@ final: prev:
minimap-vim = buildVimPluginFrom2Nix {
pname = "minimap-vim";
version = "2021-06-21";
version = "2021-06-29";
src = fetchFromGitHub {
owner = "wfxr";
repo = "minimap.vim";
rev = "14f0a76ccb965bd935818039168cbb4df87f53e4";
sha256 = "0cphjh7p8j4i2q89q4lisbs1ir017h1pphg95d4x5ds4ms4rnbjg";
rev = "8ff65412c76eb25731d96089660c9591b87f104b";
sha256 = "1r2n1mvs5zxxz0khg2dsy6m2w6d3wj7jds9swg5n08wa4m8zl05w";
};
meta.homepage = "https://github.com/wfxr/minimap.vim/";
};
@ -3084,24 +3084,24 @@ final: prev:
neoformat = buildVimPluginFrom2Nix {
pname = "neoformat";
version = "2021-06-26";
version = "2021-06-28";
src = fetchFromGitHub {
owner = "sbdchd";
repo = "neoformat";
rev = "cdf38b33fc4a78c5aa369b8074956a3ebf184f4b";
sha256 = "1cp3p117ij5k2zsmyrg3c01n9hv2a6h5p09i2gllz88ii5x3965y";
rev = "b03c121c66d859fa165aaab05ba9c1c1b2098007";
sha256 = "0b72c14sqjq8bb0xz1spp5lq2bs1fsbp651qiwvvcdlma5yf5vxk";
};
meta.homepage = "https://github.com/sbdchd/neoformat/";
};
neogit = buildVimPluginFrom2Nix {
pname = "neogit";
version = "2021-06-25";
version = "2021-06-27";
src = fetchFromGitHub {
owner = "TimUntersberger";
repo = "neogit";
rev = "6bf4bfcf36e701658ddb062f1214e3942e339442";
sha256 = "1wgchrv6piykzpwg42yl23qn1qxangf58cv97rj73m80ws8hhwb8";
rev = "3b5fa08467a77c289027bbc01ce8f8341f8d911c";
sha256 = "1q1dz06msbw68wf7vs482y77nlmbz797hsdpqimfh65liz6bjh77";
};
meta.homepage = "https://github.com/TimUntersberger/neogit/";
};
@ -3144,12 +3144,12 @@ final: prev:
neorg = buildVimPluginFrom2Nix {
pname = "neorg";
version = "2021-06-26";
version = "2021-06-27";
src = fetchFromGitHub {
owner = "vhyrro";
repo = "neorg";
rev = "950ed23a61ba0b4bb455033f191f15b9b8170fd6";
sha256 = "0c8zqkyjlkbz109k3321ys7jjggwk9w13p72907k64ypfmr70p30";
rev = "639a2deb5e3783aeb8f7cddaade8e84575f3bc1e";
sha256 = "0q890252cpcjy5a9xy6m5qlziqbqmfgy43l305aslv05yxbckk11";
};
meta.homepage = "https://github.com/vhyrro/neorg/";
};
@ -3396,12 +3396,12 @@ final: prev:
nvim-autopairs = buildVimPluginFrom2Nix {
pname = "nvim-autopairs";
version = "2021-06-26";
version = "2021-06-29";
src = fetchFromGitHub {
owner = "windwp";
repo = "nvim-autopairs";
rev = "3069e5a6cea7e69a75f042740e66fc15169336e8";
sha256 = "1ldsx96x8asc6hlywkba4rn2dx9j1fl682pv1gyjr1x9m9pgjvg0";
rev = "b64fa0d85e9e1b6aa86c8c44cf8a604840a571af";
sha256 = "1sqjxf5w77aa0jxzk3yz9l2qw9xja7i9vxnrajajf1m7wa3zm4nl";
};
meta.homepage = "https://github.com/windwp/nvim-autopairs/";
};
@ -3432,12 +3432,12 @@ final: prev:
nvim-bufferline-lua = buildVimPluginFrom2Nix {
pname = "nvim-bufferline-lua";
version = "2021-06-20";
version = "2021-06-29";
src = fetchFromGitHub {
owner = "akinsho";
repo = "nvim-bufferline.lua";
rev = "fad981fd11b68b1a7a48b9283bc04ea5b48e55ff";
sha256 = "1i2zm5rrx65dzrmxlc89szr7dghjgd7cwcdd4wm1b0hdv0if89p8";
rev = "165114f65c267ee912018ef3565d70cba7183fc3";
sha256 = "07km6dn0mc60zzqbyymxmzgy2wjrw6q2a8lmzc55iqyflfhza8qn";
};
meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/";
};
@ -3468,12 +3468,12 @@ final: prev:
nvim-compe = buildVimPluginFrom2Nix {
pname = "nvim-compe";
version = "2021-06-19";
version = "2021-06-29";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-compe";
rev = "f176c41f1e67bffe2dbd28f371fa55c172cf1c56";
sha256 = "1yys3m1wmpwr44zx2my975rg2bj2d7j4pzcvfkyccqi36z3g7d8m";
rev = "9a1ab398bfdb4bda1134b7a0e7a379017d3bdefa";
sha256 = "04khvbxx5qsfzhg5ari55ka8ff9gpd2kh7s3vc27z1jz43vizrsa";
};
meta.homepage = "https://github.com/hrsh7th/nvim-compe/";
};
@ -3504,12 +3504,12 @@ final: prev:
nvim-dap-ui = buildVimPluginFrom2Nix {
pname = "nvim-dap-ui";
version = "2021-06-19";
version = "2021-06-29";
src = fetchFromGitHub {
owner = "rcarriga";
repo = "nvim-dap-ui";
rev = "be9e71d7809f3b1e6a2f5765d782ce74b6b76b64";
sha256 = "1648nn9h4h8fiszm626iq09kswsr644mr6kkjy2gnrkrqwkw76l7";
rev = "e32b33dae9d8d738f86f84699d4f978f8d9deb02";
sha256 = "0sdx890gk79qyyjs946kq3anyq8yyxvkg9sfphiavq5xs9840ps1";
};
meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/";
};
@ -3540,12 +3540,12 @@ final: prev:
nvim-highlite = buildVimPluginFrom2Nix {
pname = "nvim-highlite";
version = "2021-06-14";
version = "2021-06-29";
src = fetchFromGitHub {
owner = "Iron-E";
repo = "nvim-highlite";
rev = "d0bdf0cb2d11064ac09d57bcfd48b53f0ee77124";
sha256 = "0smkmaz36zjisnlfzjmqgvljb0xk7j07xja69va3bf7k4kcg326y";
rev = "20ff07b00545daad1c3e90c6484d838b43cf3660";
sha256 = "1pb8v2yzrljqmgjhqzhv03zvdqwbqqyly6vkfdscbq7ra9afiw2j";
};
meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
};
@ -3576,12 +3576,12 @@ final: prev:
nvim-jdtls = buildVimPluginFrom2Nix {
pname = "nvim-jdtls";
version = "2021-06-15";
version = "2021-06-29";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-jdtls";
rev = "a26e1818fa62cfbcbd9728ad11bc3fc312d6e50e";
sha256 = "00w6jdpqfzxi9kfvwig052g8c0184pq71fs9p2dryx9klcxkcjnb";
rev = "018b013d5ee873dfaa9fa2d487d166c5f6dd3aee";
sha256 = "0liwxdfalm85i2ck9hx5pj4ih58ypil8fw3ricrc6r7czfv6gfmf";
};
meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
};
@ -3600,12 +3600,12 @@ final: prev:
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
version = "2021-06-20";
version = "2021-06-29";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
rev = "48e47b4d26e45977d27c06dc1bc116416ca9276d";
sha256 = "1zf4sv91i3qkr9d8cbn9vzk2sc5bknjsjdhzvpf1zjr72bxx3q37";
rev = "234a8cdad1104dd562796e6ca2c6c41e22e5f77a";
sha256 = "0w10mx66p9sil1aa6jhkfb7k2p4m2vwjbyr8f1dr2apn07cr72w8";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@ -3684,24 +3684,24 @@ final: prev:
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree-lua";
version = "2021-06-15";
version = "2021-06-29";
src = fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-tree.lua";
rev = "bfeaf4c8ef5ff24e93005da2561407a13ba69d4d";
sha256 = "0sqydjvcjrqzw91b7sk7y9rrcs0l2j34hshcbwwwz8nrilfk6ak7";
rev = "a80ea23b4c765efe3b6eaa9440d19d298e4c709b";
sha256 = "11m62asv3qrv5kh4gb8xvhjmxwbzxf26902cxn8gncclc79cr42i";
};
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
};
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2021-06-26";
version = "2021-06-29";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "c04aa172a3feab61f8f4fbfa0e3d47fa12513485";
sha256 = "00sp2v423j10rh6hfiwkl7cfnq5y1zjzsfi87sy01phcw5i4aa25";
rev = "917ae3da7c0d827c819405cc747aafc8bb041dbd";
sha256 = "00mh980ffh3k0cp4dm1qvx5x803kw8xajgvv86hw0yspmjb98d5d";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@ -3744,12 +3744,12 @@ final: prev:
nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-textobjects";
version = "2021-06-25";
version = "2021-06-28";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter-textobjects";
rev = "2271ffecd5fad9c74fb12c125f39a21ffb5a7673";
sha256 = "1acmhal848jjxv12cp4ihd3jmg6rj8q31v2si15chzap4iizhchc";
rev = "63a6d3c85d6625f90093808d15c72c378f5fc2d5";
sha256 = "15l9624ggvbxrm4cr97p9hhsjpdli1iqkm32ffvvfhaa1kzv9lfd";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
};
@ -3900,12 +3900,12 @@ final: prev:
packer-nvim = buildVimPluginFrom2Nix {
pname = "packer-nvim";
version = "2021-06-22";
version = "2021-06-28";
src = fetchFromGitHub {
owner = "wbthomason";
repo = "packer.nvim";
rev = "40663b4e515ea65c51a17d1135cbda516e0e0917";
sha256 = "1yfl16a7vdj6g3k2mg1f805xzxdfsnkqfgccbppzbpqy7m2896cr";
rev = "78a42c3bc7b153a621b5f9d35623db88d6d0d0ee";
sha256 = "0awmwcj3a27m81180k52i5gvvbf6r115qkbfskpxbvrsc8h5qqx5";
};
meta.homepage = "https://github.com/wbthomason/packer.nvim/";
};
@ -4550,12 +4550,12 @@ final: prev:
snap = buildVimPluginFrom2Nix {
pname = "snap";
version = "2021-06-26";
version = "2021-06-28";
src = fetchFromGitHub {
owner = "camspiers";
repo = "snap";
rev = "9410aa77fb8771288ef0a882cd7e8ee81af51107";
sha256 = "165a8hdkg0ma5s6gbnrhw0sqx37ilmfka6lq5k843sm5h98xyad7";
rev = "1fbd674dc53401fd643a2bb8bf07dd3e7125d430";
sha256 = "0lwhl74yfzd34fv241i9ra6w72qhf1jxf6fkyl1h0c427sz09mmj";
};
meta.homepage = "https://github.com/camspiers/snap/";
};
@ -4682,12 +4682,12 @@ final: prev:
splitjoin-vim = buildVimPluginFrom2Nix {
pname = "splitjoin-vim";
version = "2021-06-07";
version = "2021-06-28";
src = fetchFromGitHub {
owner = "AndrewRadev";
repo = "splitjoin.vim";
rev = "a8c4af3d69839cd2c03d458044fb3d3b128e450d";
sha256 = "0s87vzdb3j3hna5yda4jay1k4zw419mqd8yn3h4q22qhhsr36q0k";
rev = "03af68c1ecec4a01b4fe713393c1b3fa4dd21e77";
sha256 = "15qja2ywi83qv365b19xrcw02j693bhrdn0wanxdhbqzpp9kwsb9";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/";
@ -4984,12 +4984,12 @@ final: prev:
telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope-nvim";
version = "2021-06-14";
version = "2021-06-27";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
rev = "6ac5ee0854fe02d651cadf2fc97a2463ff92f322";
sha256 = "1k2glya8cd000kzfvx5fif9fcqvcq1k2vrkwyzhfm4yngz7bxm1p";
rev = "e5bd4963da81b5d044749ee4507061801aeb0f78";
sha256 = "1dskr91qiark1z08yfjkbrnf1zvy2mci4avkdn574b7pz8v72lzb";
};
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
};
@ -5080,12 +5080,12 @@ final: prev:
todo-comments-nvim = buildVimPluginFrom2Nix {
pname = "todo-comments-nvim";
version = "2021-06-17";
version = "2021-06-28";
src = fetchFromGitHub {
owner = "folke";
repo = "todo-comments.nvim";
rev = "edbe161856eacc859987eaf28d41b67163d49791";
sha256 = "0mq5bx767zw1k7sxxrkijz3rz5hwi93xsxidppfg13qybi519jai";
rev = "12758792a0d207b5a4a4fb5a11a0d321a4608108";
sha256 = "1w4z3x1d36cf0zjlz5kshvf5d5lz126rhcl55p2qd4ibrcfw8cwg";
};
meta.homepage = "https://github.com/folke/todo-comments.nvim/";
};
@ -6725,12 +6725,12 @@ final: prev:
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
version = "2021-06-26";
version = "2021-06-28";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
rev = "e32b1a46ad5fc1fcb6765ef6150726c0af174c68";
sha256 = "04pbqwi4n0dyhhfwi3kp78dnyxdza2bg5pn7wbbkz7c6k3jhjysa";
rev = "32bcf757e455ab3b87c9201247b9a6b091d44ea0";
sha256 = "1ymd4dqd8725962iz12slrdgjp2sxqrrmznq18za4q14psy6dcin";
};
meta.homepage = "https://github.com/fatih/vim-go/";
};
@ -7844,12 +7844,12 @@ final: prev:
vim-orgmode = buildVimPluginFrom2Nix {
pname = "vim-orgmode";
version = "2021-01-20";
version = "2021-06-29";
src = fetchFromGitHub {
owner = "jceb";
repo = "vim-orgmode";
rev = "3aeea0648f485f002cfcaf1b3e6a25ef43a12a66";
sha256 = "0jx5vw72p8s5np31g0macwx3iqghfgzvx30akyk5fspfayjivaxl";
rev = "4ad432d7da4e01e7fce86d25528a6587efce6ca4";
sha256 = "0lhgph6hp130sbbc1frsmrjp9qrf6gqk12azjq63bb0rs5884q5h";
};
meta.homepage = "https://github.com/jceb/vim-orgmode/";
};
@ -8060,12 +8060,12 @@ final: prev:
vim-polyglot = buildVimPluginFrom2Nix {
pname = "vim-polyglot";
version = "2021-06-09";
version = "2021-06-27";
src = fetchFromGitHub {
owner = "sheerun";
repo = "vim-polyglot";
rev = "4899585281beab51e5dff1d9ae4d3159244a8275";
sha256 = "1518dvxf99nvky0mrvgv65if0wjhpiv3021rddhn52j04vri4pdd";
rev = "4f5388350be1052f610b830c8fce8fbc17370ec6";
sha256 = "04cljqrywz3y3r336ahri2b2jig9a6pvxljkkjnlssgjlx0azvv9";
};
meta.homepage = "https://github.com/sheerun/vim-polyglot/";
};
@ -8216,12 +8216,12 @@ final: prev:
vim-quickrun = buildVimPluginFrom2Nix {
pname = "vim-quickrun";
version = "2021-06-18";
version = "2021-06-29";
src = fetchFromGitHub {
owner = "thinca";
repo = "vim-quickrun";
rev = "e5e83bfd613bd58aa6bbbfaaed2f7eef1ed0b378";
sha256 = "1zcjlz5d4bp0y28mxlzlyb76klpwr49i0kgzpab2v5vy8qlzsvxb";
rev = "b39b1f6c69f7086e500ad7a6318c7bc97249b944";
sha256 = "1cwsbscbfmjjr9grxgdprfydlybmwdf7qxdmcwbfj18xqbjx6cjq";
};
meta.homepage = "https://github.com/thinca/vim-quickrun/";
};
@ -8600,12 +8600,12 @@ final: prev:
vim-snippets = buildVimPluginFrom2Nix {
pname = "vim-snippets";
version = "2021-06-24";
version = "2021-06-28";
src = fetchFromGitHub {
owner = "honza";
repo = "vim-snippets";
rev = "7bb2385aca2288845999c05d9eca83e2e8eaed90";
sha256 = "0r41cd27dzfq4pnafr4an1zlafwmi7sa44w4yxmxyn7wky4rhf61";
rev = "749460bc5b05b1f4015a041508031d99b1b24982";
sha256 = "0f1n0gg8asz0sg81dwc3gg5nl5j142qyd960f7fzdiv7grv7l0xk";
};
meta.homepage = "https://github.com/honza/vim-snippets/";
};
@ -8684,12 +8684,12 @@ final: prev:
vim-startuptime = buildVimPluginFrom2Nix {
pname = "vim-startuptime";
version = "2021-05-29";
version = "2021-06-28";
src = fetchFromGitHub {
owner = "dstein64";
repo = "vim-startuptime";
rev = "7a97baae32bedbf6f62d5a573777e4d1652787d1";
sha256 = "1sphykwbjd35kwsibm9wcxbs2iwjkzkg7madqvlxzi7sqh4vkc7y";
rev = "3b8fcc0b21fd28eaabb5feac786462926e5a5069";
sha256 = "19aj7d24qwkpyfgk8adrr5nz30inblsrhm56vp6l3phai1c7rbn2";
};
meta.homepage = "https://github.com/dstein64/vim-startuptime/";
};
@ -9069,12 +9069,12 @@ final: prev:
vim-ultest = buildVimPluginFrom2Nix {
pname = "vim-ultest";
version = "2021-06-24";
version = "2021-06-27";
src = fetchFromGitHub {
owner = "rcarriga";
repo = "vim-ultest";
rev = "eaa0eeaaa2bcc8f4400a7d2e8ff56cf1141074e4";
sha256 = "148yy7f88jvavz8n0r2lfjn51bfdi2pbs192srf82kikmfg0lxk7";
rev = "8b551f7fe1f87c832a7aada741eac25d2944407c";
sha256 = "1vfns3srdskncy2s3z58s2k35vlz8gvf8yrh5s49r7d9nzrv45rq";
};
meta.homepage = "https://github.com/rcarriga/vim-ultest/";
};
@ -9502,12 +9502,12 @@ final: prev:
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
version = "2021-06-25";
version = "2021-06-28";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
rev = "78789f5c9e73d7b66f87104544d521333b09a33b";
sha256 = "1rrblrip8xa1wxp8kj0kjry63n4pbja4fnnjbvw07bnihr6igjx1";
rev = "299363d651c5a8c26a4440f434df613cdf66a4c4";
sha256 = "18c9b35cjjrw2bf62j6ss5i7i21rz32nrm102bljybf2cfs700lf";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};

View file

@ -4,7 +4,7 @@
"dependencies": {
"https-proxy-agent": "^5.0.0",
"node-fetch": "^2.6.1",
"vscode-languageclient": "^7.1.0-next.4",
"vscode-languageclient": "^7.1.0-next.5",
"@rollup/plugin-commonjs": "^17.0.0",
"@rollup/plugin-node-resolve": "^11.0.0",
"@types/glob": "^7.1.3",

View file

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "tuigreet";
version = "0.4.0";
version = "0.5.0";
src = fetchFromGitHub {
owner = "apognu";
repo = pname;
rev = version;
sha256 = "1v16gl6ajqdbl265nh8akr2far5qhiqv7787hvqlzpr3rd39vnij";
sha256 = "sha256-Ip/GhpHgTgWFyCdujcCni1CLFDDirUbJuzCj8QiUsFc=";
};
cargoSha256 = "072zvvgf9m1afjz15m8pwslh2mav37ahjqgg33pdvzdnvg5j1q2h";
cargoSha256 = "sha256-G/E/2wjeSY57bQJgrZYUA1sWUwtk5mRavmLwy1EgHRM=";
meta = with lib; {
description = "Graphical console greter for greetd";

View file

@ -3,12 +3,12 @@ let
py = python3.override {
packageOverrides = self: super: {
botocore = super.botocore.overridePythonAttrs (oldAttrs: rec {
version = "2.0.0dev112";
version = "2.0.0dev122";
src = fetchFromGitHub {
owner = "boto";
repo = "botocore";
rev = "221c0aa5dbad42f096e00fed45d2e2071561b1da";
sha256 = "sha256-uJCP3bUK/xACQVG4kMBDIIP+zPjre+uWbqWEC/gBTD4=";
rev = "8dd916418c8193f56226b7772f263b2435eae27a";
sha256 = "sha256-iAZmqnffqrmFuxlQyOpEQzSCcL/hRAjuXKulOXoy4hY=";
};
});
prompt_toolkit = super.prompt_toolkit.overridePythonAttrs (oldAttrs: rec {
@ -18,34 +18,29 @@ let
sha256 = "1nr990i4b04rnlw1ghd0xmgvvvhih698mb6lb6jylr76cs7zcnpi";
};
});
s3transfer = super.s3transfer.overridePythonAttrs (oldAttrs: rec {
version = "0.4.2";
src = oldAttrs.src.override {
inherit version;
sha256 = "sha256-ywIvSxZVHt67sxo3fT8JYA262nNj2MXbeXbn9Hcy4bI=";
};
});
};
};
in
with py.pkgs; buildPythonApplication rec {
pname = "awscli2";
version = "2.2.4"; # N.B: if you change this, change botocore to a matching version too
version = "2.2.14"; # N.B: if you change this, change botocore to a matching version too
src = fetchFromGitHub {
owner = "aws";
repo = "aws-cli";
rev = version;
sha256 = "sha256-MctW31X012DXY16qS6AP6nLiaAt/cuA8iMwGm0oXi6M=";
sha256 = "sha256-LU9Tqzdi8ULZ5y3FbfSXdrip4NcxFkXRCTpVGo05LcM=";
};
postPatch = ''
substituteInPlace setup.py --replace "colorama>=0.2.5,<0.4.4" "colorama>=0.2.5"
substituteInPlace setup.py --replace "cryptography>=3.3.2,<3.4.0" "cryptography>=3.3.2"
substituteInPlace setup.py --replace "docutils>=0.10,<0.16" "docutils>=0.10"
substituteInPlace setup.py --replace "ruamel.yaml>=0.15.0,<0.16.0" "ruamel.yaml>=0.15.0"
substituteInPlace setup.py --replace "wcwidth<0.2.0" "wcwidth"
substituteInPlace setup.py \
--replace "awscrt==0.11.13" "awscrt" \
--replace "colorama>=0.2.5,<0.4.4" "colorama" \
--replace "cryptography>=3.3.2,<3.4.0" "cryptography" \
--replace "docutils>=0.10,<0.16" "docutils" \
--replace "ruamel.yaml>=0.15.0,<0.16.0" "ruamel.yaml" \
--replace "wcwidth<0.2.0" "wcwidth"
'';
checkInputs = [ jsonschema mock nose ];

View file

@ -6,7 +6,7 @@ let
prePatch = (attrs.prePatch or "") + ''
rm -f azure_bdist_wheel.py tox.ini
substituteInPlace setup.py \
--replace "cryptography>=2.3.1,<3.0.0" "cryptography"
--replace "cryptography>=3.2,<3.4" "cryptography"
sed -i "/azure-namespace-package/c\ " setup.cfg
'';
@ -119,6 +119,12 @@ let
portalocker
];
# upstream doesn't update this requirement probably because they use pip
postPatch = ''
substituteInPlace setup.py \
--replace "portalocker~=1.6" "portalocker"
'';
# ignore flaky test
checkPhase = ''
cd azure

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper,
maim, slop, ffmpeg_3, byzanz, libnotify, xdpyinfo }:
maim, slop, ffmpeg, byzanz, libnotify, xdpyinfo }:
stdenv.mkDerivation rec {
pname = "yaxg";
@ -13,13 +13,13 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ maim slop ffmpeg_3 byzanz libnotify xdpyinfo ];
buildInputs = [ maim slop ffmpeg byzanz libnotify xdpyinfo ];
installPhase = ''
mkdir -p $out/bin/
mv yaxg $out/bin/
chmod +x $out/bin/yaxg
wrapProgram $out/bin/yaxg --prefix PATH : ${ lib.makeBinPath [ maim slop ffmpeg_3 byzanz libnotify xdpyinfo ]}
wrapProgram $out/bin/yaxg --prefix PATH : ${ lib.makeBinPath [ maim slop ffmpeg byzanz libnotify xdpyinfo ]}
'';
meta = with lib; {

View file

@ -19,11 +19,17 @@ stdenv.mkDerivation rec {
sha256 = "0ax4kqnh7kd3z120ypgp73qy1knz47l6qxsqzrfkd97mh5cdky71";
};
postPatch = ''
substituteInPlace util/z60_flashrom.rules \
--replace "plugdev" "flashrom"
'';
# Meson build doesn't build and install manpage. Only Makefile can.
# Build manpage from source directory. Here we're inside the ./build subdirectory
postInstall = ''
make flashrom.8 -C ..
installManPage ../flashrom.8
install -Dm644 ../util/z60_flashrom.rules $out/etc/udev/rules.d/flashrom.rules
'';
mesonFlags = lib.optionals stdenv.isAarch64 [ "-Dpciutils=false" ];

View file

@ -1,36 +1,32 @@
{ lib, python }:
{ lib, python3Packages }:
with python.pkgs;
let
pypkgs = python3Packages;
buildPythonApplication rec {
in
pypkgs.buildPythonApplication rec {
pname = "tmuxp";
version = "1.7.2";
version = "1.9.2";
src = fetchPypi {
src = pypkgs.fetchPypi {
inherit pname version;
sha256 = "14296b62db260420d4600dcd805408ea908b3a78d4ea0a6a403d092fdbf6d075";
sha256 = "sha256-3RlTbIq7UGvEESMvncq97bhjJw8O4m+0aFVZgBQOwkM=";
};
postPatch = ''
sed -i 's/==.*$//' requirements/base.txt requirements/test.txt
'';
checkInputs = [
pytest
pytest-rerunfailures
];
# No tests in archive
doCheck = false;
propagatedBuildInputs = [
click colorama kaptan libtmux
propagatedBuildInputs = with pypkgs; [
click
colorama
kaptan
libtmux
];
meta = with lib; {
description = "Manage tmux workspaces from JSON and YAML";
homepage = "https://tmuxp.git-pull.com/";
license = licenses.bsd3;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ peterhoeg ];
};
}

View file

@ -1,7 +1,7 @@
{ lib, fetchFromGitHub }:
let
version = "3.7.10";
version = "3.7.11";
in
fetchFromGitHub {
name = "stevenblack-blocklist-${version}";
@ -9,7 +9,7 @@ fetchFromGitHub {
owner = "StevenBlack";
repo = "hosts";
rev = version;
sha256 = "sha256-22k52aW7Uu41414tGOHViBM8zxAwoZYY5Mi/TJH9mtE=";
sha256 = "sha256-hoYh2FdZGY/4/QmrqZubJYHP3bBcnUQFR9C7dfVTnWE=";
meta = with lib; {
description = "Unified hosts file with base extensions";

View file

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "natscli";
version = "0.0.22";
version = "0.0.24";
src = fetchFromGitHub {
owner = "nats-io";
repo = pname;
rev = version;
sha256 = "1qc6lpgl878kc316z10x59px6jyfzdwsj7fdr8k4ayln0lplvbq3";
sha256 = "11rpgvcnd2m4g0jnv6g0zdvnhs37jwn1c4hc86xgnk2vipvy0nw2";
};
vendorSha256 = "1a9d7hqj43qdh0h7pc5wckqshi8lacf6m2107wymzzz62j1msy26";
vendorSha256 = "0nrgbwc10pp7adj0w1jjj6677y2dpqq969ij7i0pmvr08ni95sxw";
meta = with lib; {
description = "NATS Command Line Interface";

View file

@ -3,25 +3,29 @@
}:
stdenv.mkDerivation rec {
pname = "bento4";
version = "1.6.0-637";
version = "1.6.0-638";
src = fetchFromGitHub {
owner = "axiomatic-systems";
repo = "Bento4";
rev = "v${version}";
sha256 = "0iwqi71nj0iczffvpxmz0prvmmnyiqypfwvzivkh38wl0br82bkp";
sha256 = "1hxr4lds4dl46advshk7azg28fcpcjaa5pzk2zzpsc9l69s0bnxk";
};
patches = [ ./libap4.patch ];
patches = [
./libap4.patch # include all libraries as shared, not static
];
nativeBuildInputs = [ cmake ];
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
installPhase = ''
runHook preInstall
mkdir -p $out/{lib,bin}
find -iname '*.so' -exec mv --target-directory="$out/lib" {} \;
find -maxdepth 1 -executable -type f -exec mv --target-directory="$out/bin" {} \;
runHook postInstall
'';
meta = with lib; {

View file

@ -1300,6 +1300,8 @@ in
bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { };
bisq-desktop = callPackage ../applications/blockchains/bisq-desktop { };
bit = callPackage ../applications/version-management/git-and-tools/bit { };
bitwarden = callPackage ../tools/security/bitwarden { };
@ -22084,6 +22086,7 @@ in
inherit (plasma5Packages) breeze-icons;
};
flat-remix-gtk = callPackage ../data/themes/flat-remix-gtk { };
flat-remix-gnome = callPackage ../data/themes/flat-remix-gnome { };
font-awesome_4 = (callPackage ../data/fonts/font-awesome-5 { }).v4;
font-awesome_5 = (callPackage ../data/fonts/font-awesome-5 { }).v5;
@ -23659,6 +23662,8 @@ in
haruna = libsForQt5.callPackage ../applications/video/haruna { };
helix = callPackage ../applications/editors/helix { };
icesl = callPackage ../applications/misc/icesl { };
keepassx = callPackage ../applications/misc/keepassx { };
@ -25712,6 +25717,8 @@ in
nwg-menu = callPackage ../applications/misc/nwg-menu { };
nwg-panel = callPackage ../applications/misc/nwg-panel { };
ocenaudio = callPackage ../applications/audio/ocenaudio { };
onlyoffice-bin = callPackage ../applications/office/onlyoffice-bin { };
@ -27258,6 +27265,8 @@ in
trayer = callPackage ../applications/window-managers/trayer { };
tinywl = callPackage ../applications/window-managers/tinywl { };
tinywm = callPackage ../applications/window-managers/tinywm { };
tree-from-tags = callPackage ../applications/audio/tree-from-tags { };
@ -29881,6 +29890,18 @@ in
rubiks = callPackage ../development/libraries/science/math/rubiks { };
p4est-sc = callPackage ../development/libraries/science/math/p4est-sc {
p4est-sc-debugEnable = false;
};
p4est-sc-dbg = callPackage ../development/libraries/science/math/p4est-sc { };
p4est = callPackage ../development/libraries/science/math/p4est { };
p4est-dbg = callPackage ../development/libraries/science/math/p4est {
p4est-sc = p4est-sc-dbg;
};
petsc = callPackage ../development/libraries/science/math/petsc { };
parmetis = callPackage ../development/libraries/science/math/parmetis { };

View file

@ -5363,6 +5363,8 @@ in {
python-ecobee-api = callPackage ../development/python-modules/python-ecobee-api { };
python-ipmi = callPackage ../development/python-modules/python-ipmi { };
python-izone = callPackage ../development/python-modules/python-izone { };
python-juicenet = callPackage ../development/python-modules/python-juicenet { };