JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-02-01 18:31:01 +00:00 committed by GitHub
commit eca8c09a50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
113 changed files with 881 additions and 415 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/generators.nix
View File

@ -236,17 +236,12 @@ rec {
+ libStr.concatMapStringsSep introSpace (go (indent + " ")) v + libStr.concatMapStringsSep introSpace (go (indent + " ")) v
+ outroSpace + "]" + outroSpace + "]"
else if isFunction v then else if isFunction v then
# functionArgs throws in case of (partially applied) builtins let fna = lib.functionArgs v;
# on nix before commit b2748c6e99239ff6803ba0da76c362790c8be192
# which includes current nix stable
# TODO remove tryEval workaround when the issue is resolved on nix stable
let fna = builtins.tryEval (lib.functionArgs v);
showFnas = concatStringsSep ", " (libAttr.mapAttrsToList showFnas = concatStringsSep ", " (libAttr.mapAttrsToList
(name: hasDefVal: if hasDefVal then name + "?" else name) (name: hasDefVal: if hasDefVal then name + "?" else name)
fna.value); fna);
in if !fna.success || fna.value == {} in if fna == {} then "<function>"
then "<function>" else "<function, args: {${showFnas}}>"
else "<function, args: {${showFnas}}>"
else if isAttrs v then else if isAttrs v then
# apply pretty values if allowed # apply pretty values if allowed
if attrNames v == [ "__pretty" "val" ] && allowPrettyValues if attrNames v == [ "__pretty" "val" ] && allowPrettyValues

81
nixos/modules/hardware/sensor/hddtemp.nix Normal file
View File

@ -0,0 +1,81 @@
{ config, lib, pkgs, ... }:
let
inherit (lib) mkIf mkOption types;
cfg = config.hardware.sensor.hddtemp;
wrapper = pkgs.writeShellScript "hddtemp-wrapper" ''
set -eEuo pipefail
file=/var/lib/hddtemp/hddtemp.db
drives=(${toString (map (e: ''$(realpath ${lib.escapeShellArg e}) '') cfg.drives)})
cp ${pkgs.hddtemp}/share/hddtemp/hddtemp.db $file
${lib.concatMapStringsSep "\n" (e: "echo ${lib.escapeShellArg e} >> $file") cfg.dbEntries}
exec ${pkgs.hddtemp}/bin/hddtemp ${lib.escapeShellArgs cfg.extraArgs} \
--daemon \
--unit=${cfg.unit} \
--file=$file \
''${drives[@]}
'';
in
{
meta.maintainers = with lib.maintainers; [ peterhoeg ];
###### interface
options = {
hardware.sensor.hddtemp = {
enable = mkOption {
description = ''
Enable this option to support HDD/SSD temperature sensors.
'';
type = types.bool;
default = false;
};
drives = mkOption {
description = "List of drives to monitor. If you pass /dev/disk/by-path/* entries the symlinks will be resolved as hddtemp doesn't like names with colons.";
type = types.listOf types.str;
};
unit = mkOption {
description = "Celcius or Fahrenheit";
type = types.enum [ "C" "F" ];
default = "C";
};
dbEntries = mkOption {
description = "Additional DB entries";
type = types.listOf types.str;
default = [ ];
};
extraArgs = mkOption {
description = "Additional arguments passed to the daemon.";
type = types.listOf types.str;
default = [ ];
};
};
};
###### implementation
config = mkIf cfg.enable {
systemd.services.hddtemp = {
description = "HDD/SSD temperature";
wantedBy = [ "multi-user.target" ];
serviceConfig = {
Type = "forking";
ExecStart = wrapper;
StateDirectory = "hddtemp";
PrivateTmp = true;
ProtectHome = "tmpfs";
ProtectSystem = "strict";
};
};
};
}

1
nixos/modules/module-list.nix
View File

@ -46,6 +46,7 @@
./hardware/cpu/intel-microcode.nix ./hardware/cpu/intel-microcode.nix
./hardware/digitalbitbox.nix ./hardware/digitalbitbox.nix
./hardware/device-tree.nix ./hardware/device-tree.nix
./hardware/sensor/hddtemp.nix
./hardware/sensor/iio.nix ./hardware/sensor/iio.nix
./hardware/keyboard/zsa.nix ./hardware/keyboard/zsa.nix
./hardware/ksm.nix ./hardware/ksm.nix

4
nixos/modules/services/continuous-integration/buildbot/master.nix
View File

@ -223,7 +223,7 @@ in {
}; };
pythonPackages = mkOption { pythonPackages = mkOption {
type = types.listOf types.package; type = types.functionTo (types.listOf types.package);
default = pythonPackages: with pythonPackages; [ ]; default = pythonPackages: with pythonPackages; [ ];
defaultText = "pythonPackages: with pythonPackages; [ ]"; defaultText = "pythonPackages: with pythonPackages; [ ]";
description = "Packages to add the to the PYTHONPATH of the buildbot process."; description = "Packages to add the to the PYTHONPATH of the buildbot process.";
@ -283,5 +283,5 @@ in {
'') '')
]; ];
meta.maintainers = with lib.maintainers; [ nand0p mic92 ]; meta.maintainers = with lib.maintainers; [ nand0p mic92 lopsided98 ];
} }

1
nixos/modules/services/development/hoogle.nix
View File

@ -41,7 +41,6 @@ in {
haskellPackages = mkOption { haskellPackages = mkOption {
description = "Which haskell package set to use."; description = "Which haskell package set to use.";
default = pkgs.haskellPackages; default = pkgs.haskellPackages;
type = types.package;
defaultText = "pkgs.haskellPackages"; defaultText = "pkgs.haskellPackages";
}; };

1
nixos/modules/services/x11/window-managers/xmonad.nix
View File

@ -43,7 +43,6 @@ in {
haskellPackages = mkOption { haskellPackages = mkOption {
default = pkgs.haskellPackages; default = pkgs.haskellPackages;
defaultText = "pkgs.haskellPackages"; defaultText = "pkgs.haskellPackages";
type = types.package;
example = literalExample "pkgs.haskell.packages.ghc784"; example = literalExample "pkgs.haskell.packages.ghc784";
description = '' description = ''
haskellPackages used to build Xmonad and other packages. haskellPackages used to build Xmonad and other packages.

2
nixos/modules/services/x11/xserver.nix
View File

@ -650,7 +650,7 @@ in
xorg.xprop xorg.xprop
xorg.xauth xorg.xauth
pkgs.xterm pkgs.xterm
pkgs.xdg_utils pkgs.xdg-utils
xorg.xf86inputevdev.out # get evdev.4 man page xorg.xf86inputevdev.out # get evdev.4 man page
] ]
++ optional (elem "virtualbox" cfg.videoDrivers) xorg.xrefresh; ++ optional (elem "virtualbox" cfg.videoDrivers) xorg.xrefresh;

1
nixos/modules/virtualisation/docker.nix
View File

@ -157,6 +157,7 @@ in
systemd.services.docker = { systemd.services.docker = {
wantedBy = optional cfg.enableOnBoot "multi-user.target"; wantedBy = optional cfg.enableOnBoot "multi-user.target";
requires = [ "docker.socket" ];
environment = proxy_env; environment = proxy_env;
serviceConfig = { serviceConfig = {
Type = "notify"; Type = "notify";

4
pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix
View File

@ -3,7 +3,7 @@
, libbsd, libjack2, libpng, ffmpeg_3 , libbsd, libjack2, libpng, ffmpeg_3
, libxkbcommon , libxkbcommon
, makeWrapper, pixman, autoPatchelfHook , makeWrapper, pixman, autoPatchelfHook
, xdg_utils, zenity, zlib }: , xdg-utils, zenity, zlib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bitwig-studio"; pname = "bitwig-studio";
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
]; ];
binPath = lib.makeBinPath [ binPath = lib.makeBinPath [
xdg_utils zenity ffmpeg_3 xdg-utils zenity ffmpeg_3
]; ];
installPhase = '' installPhase = ''

4
pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, alsaLib, cairo, dpkg, freetype { stdenv, fetchurl, alsaLib, cairo, dpkg, freetype
, gdk-pixbuf, glib, gtk3, lib, xorg , gdk-pixbuf, glib, gtk3, lib, xorg
, libglvnd, libjack2, ffmpeg_3 , libglvnd, libjack2, ffmpeg_3
, libxkbcommon, xdg_utils, zlib, pulseaudio , libxkbcommon, xdg-utils, zlib, pulseaudio
, wrapGAppsHook, makeWrapper }: , wrapGAppsHook, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
]; ];
binPath = lib.makeBinPath [ binPath = lib.makeBinPath [
xdg_utils ffmpeg_3 xdg-utils ffmpeg_3
]; ];
ldLibraryPath = lib.strings.makeLibraryPath buildInputs; ldLibraryPath = lib.strings.makeLibraryPath buildInputs;

4
pkgs/applications/audio/faust/faust2firefox.nix
View File

@ -1,5 +1,5 @@
{ faust { faust
, xdg_utils , xdg-utils
}: }:
# This just runs faust2svg, then attempts to open a browser using # This just runs faust2svg, then attempts to open a browser using
@ -9,6 +9,6 @@ faust.wrap {
baseName = "faust2firefox"; baseName = "faust2firefox";
runtimeInputs = [ xdg_utils ]; runtimeInputs = [ xdg-utils ];
} }

1
pkgs/applications/graphics/emulsion/default.nix
View File

@ -15,7 +15,6 @@
, libxcb , libxcb
, libxkbcommon , libxkbcommon
, wayland , wayland
, xdg_utils
, AppKit , AppKit
, CoreGraphics , CoreGraphics
, CoreServices , CoreServices

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

@ -1,4 +1,4 @@
{ lib, stdenv, runtimeShell, fetchurl, unzip, mono, avrdude, gtk2, xdg_utils }: { lib, stdenv, runtimeShell, fetchurl, unzip, mono, avrdude, gtk2, xdg-utils }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "avrdudess-2.2.20140102"; name = "avrdudess-2.2.20140102";
@ -23,7 +23,7 @@ stdenv.mkDerivation {
export LD_LIBRARY_PATH="${lib.makeLibraryPath [gtk2 mono]}" export LD_LIBRARY_PATH="${lib.makeLibraryPath [gtk2 mono]}"
# We need PATH from user env for xdg-open to find its tools, which # We need PATH from user env for xdg-open to find its tools, which
# typically depend on the currently running desktop environment. # typically depend on the currently running desktop environment.
export PATH="${lib.makeBinPath [ avrdude xdg_utils ]}:\$PATH" export PATH="${lib.makeBinPath [ avrdude xdg-utils ]}:\$PATH"
# avrdudess must have its resource files in its current working directory # avrdudess must have its resource files in its current working directory
cd $out/avrdudess && exec ${mono}/bin/mono "$out/avrdudess/avrdudess.exe" "\$@" cd $out/avrdudess && exec ${mono}/bin/mono "$out/avrdudess/avrdudess.exe" "\$@"

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

@ -20,7 +20,7 @@
, python3Packages , python3Packages
, libusb1 , libusb1
, libmtp , libmtp
, xdg_utils , xdg-utils
, makeDesktopItem , makeDesktopItem
, removeReferencesTo , removeReferencesTo
}: }:
@ -84,7 +84,7 @@ mkDerivation rec {
poppler_utils poppler_utils
qtbase qtbase
sqlite sqlite
xdg_utils xdg-utils
] ++ ( ] ++ (
with python3Packages; [ with python3Packages; [
apsw apsw

4
pkgs/applications/misc/eureka-editor/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchzip, fltk, zlib, xdg_utils, xorg, libjpeg, libGL }: { lib, stdenv, fetchzip, fltk, zlib, xdg-utils, xorg, libjpeg, libGL }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "eureka-editor"; pname = "eureka-editor";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "0fpj13aq4wh3f7473cdc5jkf1c71jiiqmjc0ihqa0nm3hic1d4yv"; sha256 = "0fpj13aq4wh3f7473cdc5jkf1c71jiiqmjc0ihqa0nm3hic1d4yv";
}; };
buildInputs = [ fltk zlib xdg_utils libjpeg xorg.libXinerama libGL ]; buildInputs = [ fltk zlib xdg-utils libjpeg xorg.libXinerama libGL ];
enableParallelBuilding = true; enableParallelBuilding = true;

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

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkg-config, wxGTK30, glib, pcre, m4, bash, { lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkg-config, wxGTK30, glib, pcre, m4, bash,
xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick, darwin }: xdg-utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick, darwin }:
let let
newer-colorer-schemes = fetchFromGitHub { newer-colorer-schemes = fetchFromGitHub {
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
'' + '' '' + ''
echo 'echo ${version}' > far2l/bootstrap/scripts/vbuild.sh echo 'echo ${version}' > far2l/bootstrap/scripts/vbuild.sh
substituteInPlace far2l/bootstrap/open.sh \ substituteInPlace far2l/bootstrap/open.sh \
--replace 'xdg-open' '${xdg_utils}/bin/xdg-open' --replace 'xdg-open' '${xdg-utils}/bin/xdg-open'
substituteInPlace far2l/vtcompletor.cpp \ substituteInPlace far2l/vtcompletor.cpp \
--replace '"/bin/bash"' '"${bash}/bin/bash"' --replace '"/bin/bash"' '"${bash}/bin/bash"'
substituteInPlace multiarc/src/formats/zip/zip.cpp \ substituteInPlace multiarc/src/formats/zip/zip.cpp \

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

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper, bashInteractive, xdg_utils, file, coreutils, w3m, xdotool }: { lib, stdenv, fetchFromGitHub, makeWrapper, bashInteractive, xdg-utils, file, coreutils, w3m, xdotool }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fff"; pname = "fff";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "14ymdw6l6phnil0xf1frd5kgznaiwppcic0v4hb61s1zpf4wrshg"; sha256 = "14ymdw6l6phnil0xf1frd5kgznaiwppcic0v4hb61s1zpf4wrshg";
}; };
pathAdd = lib.makeSearchPath "bin" ([ xdg_utils file coreutils w3m xdotool ]); pathAdd = lib.makeSearchPath "bin" ([ xdg-utils file coreutils w3m xdotool ]);
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ bashInteractive ]; buildInputs = [ bashInteractive ];

2
pkgs/applications/misc/lutris/fhsenv.nix
View File

@ -97,7 +97,7 @@ in buildFHSUserEnv {
libcap libtiff libva libgphoto2 libxslt libsndfile giflib zlib glib libcap libtiff libva libgphoto2 libxslt libsndfile giflib zlib glib
alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils
readline gcc SDL SDL2 curl graphite2 gtk2 gtk3 udev ncurses wayland libglvnd readline gcc SDL SDL2 curl graphite2 gtk2 gtk3 udev ncurses wayland libglvnd
vulkan-loader xdg_utils sqlite gnutls p11-kit libbsd harfbuzz vulkan-loader xdg-utils sqlite gnutls p11-kit libbsd harfbuzz
# PCSX2 // TODO: "libgobject-2.0.so.0: wrong ELF class: ELFCLASS64" # PCSX2 // TODO: "libgobject-2.0.so.0: wrong ELF class: ELFCLASS64"

2
pkgs/applications/misc/nrsc5/default.nix
View File

@ -46,7 +46,7 @@ in stdenv.mkDerivation {
homepage = "https://github.com/theori-io/nrsc5"; homepage = "https://github.com/theori-io/nrsc5";
description = "HD-Radio decoder for RTL-SDR"; description = "HD-Radio decoder for RTL-SDR";
platforms = lib.platforms.linux; platforms = lib.platforms.linux;
license = licenses.gpl3; license = licenses.gpl3Plus;
maintainers = with maintainers; [ markuskowa ]; maintainers = with maintainers; [ markuskowa ];
}; };
} }

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

@ -1,5 +1,5 @@
{ lib, fetchFromGitHub, qmake { lib, fetchFromGitHub, qmake
, coreutils, xdg_utils, bash , coreutils, xdg-utils, bash
, makeWrapper, perlPackages, mkDerivation }: , makeWrapper, perlPackages, mkDerivation }:
let let
@ -28,7 +28,7 @@ mkDerivation {
for i in src/SysUtil.cpp src/FileSizeStatsWindow.cpp for i in src/SysUtil.cpp src/FileSizeStatsWindow.cpp
do do
substituteInPlace $i \ substituteInPlace $i \
--replace /usr/bin/xdg-open ${xdg_utils}/bin/xdg-open --replace /usr/bin/xdg-open ${xdg-utils}/bin/xdg-open
done done
for i in src/Cleanup.cpp src/cleanup-config-page.ui for i in src/Cleanup.cpp src/cleanup-config-page.ui
do do

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "xmenu"; pname = "xmenu";
version = "4.4.1"; version = "4.5.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "phillbush"; owner = "phillbush";
repo = "xmenu"; repo = "xmenu";
rev = "v${version}"; rev = "v${version}";
sha256 = "1s70zvsaqnsjqs298vw3py0vcvia68xlks1wcz37pb88bwligz1x"; sha256 = "1dy3aqqczs7d3f8rf6h7xssgr3881g8m5y4waskizjy9z7chs64q";
}; };
buildInputs = [ imlib2 libX11 libXft libXinerama ]; buildInputs = [ imlib2 libX11 libXft libXinerama ];

8
pkgs/applications/networking/browsers/brave/default.nix
View File

@ -38,7 +38,7 @@
, udev , udev
, xorg , xorg
, zlib , zlib
, xdg_utils , xdg-utils
, wrapGAppsHook , wrapGAppsHook
}: }:
@ -79,7 +79,7 @@ rpath = lib.makeLibraryPath [
nss nss
pango pango
udev udev
xdg_utils xdg-utils
xorg.libxcb xorg.libxcb
zlib zlib
]; ];
@ -144,8 +144,8 @@ stdenv.mkDerivation rec {
done done
# Replace xdg-settings and xdg-mime # Replace xdg-settings and xdg-mime
ln -sf ${xdg_utils}/bin/xdg-settings $out/opt/brave.com/brave/xdg-settings ln -sf ${xdg-utils}/bin/xdg-settings $out/opt/brave.com/brave/xdg-settings
ln -sf ${xdg_utils}/bin/xdg-mime $out/opt/brave.com/brave/xdg-mime ln -sf ${xdg-utils}/bin/xdg-mime $out/opt/brave.com/brave/xdg-mime
''; '';
installCheckPhase = '' installCheckPhase = ''

6
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -4,7 +4,7 @@
, gnutar, bzip2, flac, speex, libopus , gnutar, bzip2, flac, speex, libopus
, libevent, expat, libjpeg, snappy , libevent, expat, libjpeg, snappy
, libpng, libcap , libpng, libcap
, xdg_utils, yasm, nasm, minizip, libwebp , xdg-utils, yasm, nasm, minizip, libwebp
, libusb1, pciutils, nss, re2 , libusb1, pciutils, nss, re2
, python2Packages, perl, pkg-config , python2Packages, perl, pkg-config
@ -89,7 +89,7 @@ let
bzip2 flac speex opusWithCustomModes bzip2 flac speex opusWithCustomModes
libevent expat libjpeg snappy libevent expat libjpeg snappy
libpng libcap libpng libcap
xdg_utils minizip libwebp xdg-utils minizip libwebp
libusb1 re2 libusb1 re2
ffmpeg libxslt libxml2 ffmpeg libxslt libxml2
nasm nasm
@ -196,7 +196,7 @@ let
'/usr/share/locale/' \ '/usr/share/locale/' \
'${glibc}/share/locale/' '${glibc}/share/locale/'
sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \ sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg-utils}/bin/xdg-@' \
chrome/browser/shell_integration_linux.cc chrome/browser/shell_integration_linux.cc
sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \ sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \

29
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -1,5 +1,5 @@
{ newScope, config, stdenv, fetchurl, makeWrapper { newScope, config, stdenv, fetchurl, makeWrapper
, llvmPackages_11, ed, gnugrep, coreutils, xdg_utils , llvmPackages_11, ed, gnugrep, coreutils, xdg-utils
, glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit , glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit
, libva ? null , libva ? null
, pipewire_0_2 , pipewire_0_2
@ -55,14 +55,23 @@ let
pkgSuffix = if channel == "dev" then "unstable" else pkgSuffix = if channel == "dev" then "unstable" else
(if channel == "ungoogled-chromium" then "stable" else channel); (if channel == "ungoogled-chromium" then "stable" else channel);
pkgName = "google-chrome-${pkgSuffix}"; pkgName = "google-chrome-${pkgSuffix}";
chromeSrc = fetchurl { chromeSrc =
urls = map (repo: "${repo}/${pkgName}/${pkgName}_${version}-1_amd64.deb") [ let
"https://dl.google.com/linux/chrome/deb/pool/main/g" # Use the latest stable Chrome version if necessary:
"http://95.31.35.30/chrome/pool/main/g" version = if chromium.upstream-info.sha256bin64 != null
"http://mirror.pcbeta.com/google/chrome/deb/pool/main/g" then chromium.upstream-info.version
"http://repo.fdzh.org/chrome/deb/pool/main/g" else (lib.importJSON ./upstream-info.json).stable.version;
]; sha256 = if chromium.upstream-info.sha256bin64 != null
sha256 = chromium.upstream-info.sha256bin64; then chromium.upstream-info.sha256bin64
else (lib.importJSON ./upstream-info.json).stable.sha256bin64;
in fetchurl {
urls = map (repo: "${repo}/${pkgName}/${pkgName}_${version}-1_amd64.deb") [
"https://dl.google.com/linux/chrome/deb/pool/main/g"
"http://95.31.35.30/chrome/pool/main/g"
"http://mirror.pcbeta.com/google/chrome/deb/pool/main/g"
"http://repo.fdzh.org/chrome/deb/pool/main/g"
];
inherit sha256;
}; };
mkrpath = p: "${lib.makeSearchPathOutput "lib" "lib64" p}:${lib.makeLibraryPath p}"; mkrpath = p: "${lib.makeSearchPathOutput "lib" "lib64" p}:${lib.makeLibraryPath p}";
@ -190,7 +199,7 @@ in stdenv.mkDerivation {
export XDG_DATA_DIRS=$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS export XDG_DATA_DIRS=$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS
# Mainly for xdg-open but also other xdg-* tools: # Mainly for xdg-open but also other xdg-* tools:
export PATH="${xdg_utils}/bin\''${PATH:+:}\$PATH" export PATH="${xdg-utils}/bin\''${PATH:+:}\$PATH"
. .
w w

15
pkgs/applications/networking/browsers/chromium/update.py
View File

@ -166,9 +166,18 @@ with urlopen(HISTORY_URL) as resp:
f'{DEB_URL}/google-chrome-{google_chrome_suffix}/' + f'{DEB_URL}/google-chrome-{google_chrome_suffix}/' +
f'google-chrome-{google_chrome_suffix}_{build["version"]}-1_amd64.deb') f'google-chrome-{google_chrome_suffix}_{build["version"]}-1_amd64.deb')
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
# This build isn't actually available yet. Continue to if (channel_name == 'ungoogled-chromium' and 'sha256' in channel and
# the next one. build['version'].split('.')[0] == last_channels['stable']['version'].split('.')[0]):
continue # Sometimes ungoogled-chromium is updated to a newer tag than
# the latest stable Chromium version. In this case we'll set
# sha256bin64 to null and the Nixpkgs code will fall back to
# the latest stable Google Chrome (only required for
# Widevine/DRM which is disabled by default):
channel['sha256bin64'] = None
else:
# This build isn't actually available yet. Continue to
# the next one.
continue
channel['deps'] = get_channel_dependencies(channel['version']) channel['deps'] = get_channel_dependencies(channel['version'])
if channel_name == 'stable': if channel_name == 'stable':

16
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@ -44,19 +44,19 @@
} }
}, },
"ungoogled-chromium": { "ungoogled-chromium": {
"version": "87.0.4280.141", "version": "88.0.4324.104",
"sha256": "0x9k809m36pfirnw2vnr9pk93nxdbgrvna0xf1rs3q91zkbr2x8l", "sha256": "0iq1rmfiqmxsj6skbi17g007zqgjsb50b59slfni2n4mz06xmgbx",
"sha256bin64": "0wq3yi0qyxzcid390w5rh4xjq92fjajvlifjl70g6sqnbk6vgvdp", "sha256bin64": null,
"deps": { "deps": {
"gn": { "gn": {
"version": "2020-09-09", "version": "2020-11-05",
"url": "https://gn.googlesource.com/gn", "url": "https://gn.googlesource.com/gn",
"rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2", "rev": "53d92014bf94c3893886470a1c7c1289f8818db0",
"sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk" "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9"
}, },
"ungoogled-patches": { "ungoogled-patches": {
"rev": "87.0.4280.141-1", "rev": "88.0.4324.104-1",
"sha256": "0r09d27jrdz01rcwifchbq7ksh2bac15h8svq18jx426mr56dzla" "sha256": "09x6kxd99a274mln3k3ckly6swyp5qdnkkp8p6grs9nr5jrgqqx5"
} }
} }
} }

4
pkgs/applications/networking/browsers/firefox/wrapper.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, makeDesktopItem, makeWrapper, lndir, config { stdenv, lib, makeDesktopItem, makeWrapper, lndir, config
, replace, fetchurl, zip, unzip, jq, xdg_utils, writeText , replace, fetchurl, zip, unzip, jq, xdg-utils, writeText
## various stuff that can be plugged in ## various stuff that can be plugged in
, flashplayer, hal-flash , flashplayer, hal-flash
@ -265,7 +265,7 @@ let
--suffix LD_LIBRARY_PATH ':' "$libs" \ --suffix LD_LIBRARY_PATH ':' "$libs" \
--suffix-each GTK_PATH ':' "$gtk_modules" \ --suffix-each GTK_PATH ':' "$gtk_modules" \
--suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \ --suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \
--prefix PATH ':' "${xdg_utils}/bin" \ --prefix PATH ':' "${xdg-utils}/bin" \
--prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \ --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \
--suffix PATH ':' "$out${browser.execdir or "/bin"}" \ --suffix PATH ':' "$out${browser.execdir or "/bin"}" \
--set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \ --set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \

4
pkgs/applications/networking/browsers/google-chrome/default.nix
View File

@ -22,7 +22,7 @@
# Additional dependencies according to other distros. # Additional dependencies according to other distros.
## Ubuntu ## Ubuntu
, liberation_ttf, curl, util-linux, xdg_utils, wget , liberation_ttf, curl, util-linux, xdg-utils, wget
## Arch Linux. ## Arch Linux.
, flac, harfbuzz, icu, libpng, libopus, snappy, speechd , flac, harfbuzz, icu, libpng, libopus, snappy, speechd
## Gentoo ## Gentoo
@ -57,7 +57,7 @@ let
dbus gdk-pixbuf gcc-unwrapped.lib dbus gdk-pixbuf gcc-unwrapped.lib
systemd systemd
libexif libexif
liberation_ttf curl util-linux xdg_utils wget liberation_ttf curl util-linux xdg-utils wget
flac harfbuzz icu libpng opusWithCustomModes snappy speechd flac harfbuzz icu libpng opusWithCustomModes snappy speechd
bzip2 libcap at-spi2-atk at-spi2-core bzip2 libcap at-spi2-atk at-spi2-core
kerberos libdrm mesa coreutils kerberos libdrm mesa coreutils

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

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "fluxcd"; pname = "fluxcd";
version = "0.7.3"; version = "0.7.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fluxcd"; owner = "fluxcd";
repo = "flux2"; repo = "flux2";
rev = "v${version}"; rev = "v${version}";
sha256 = "1y586704xckhyyqmmgq4g6csnf9iqi7xb2vqv5sqyz96ik3kg9vy"; sha256 = "110fb9h7h7hrflrrvwll04ymirrhciq8szm6g54msdjvffp61r4i";
}; };
vendorSha256 = "1kyj65fc2q1sc4aiy87i2wzf7kqybjf08mmmw0ajcxszcr0mcadb"; vendorSha256 = "1kyj65fc2q1sc4aiy87i2wzf7kqybjf08mmmw0ajcxszcr0mcadb";

3
pkgs/applications/networking/cluster/terragrunt/default.nix
View File

@ -23,8 +23,9 @@ buildGoModule rec {
]; ];
meta = with lib; { meta = with lib; {
homepage = "https://terragrunt.gruntwork.io";
changelog = "https://github.com/gruntwork-io/terragrunt/releases/tag/v${version}";
description = "A thin wrapper for Terraform that supports locking for Terraform state and enforces best practices"; description = "A thin wrapper for Terraform that supports locking for Terraform state and enforces best practices";
homepage = "https://github.com/gruntwork-io/terragrunt/";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ peterhoeg jk ]; maintainers = with maintainers; [ peterhoeg jk ];
}; };

4
pkgs/applications/networking/ftp/filezilla/default.nix
View File

@ -12,7 +12,7 @@
, sqlite , sqlite
, tinyxml , tinyxml
, wxGTK30-gtk3 , wxGTK30-gtk3
, xdg_utils , xdg-utils
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
tinyxml tinyxml
wxGTK30-gtk3 wxGTK30-gtk3
wxGTK30-gtk3.gtk wxGTK30-gtk3.gtk
xdg_utils xdg-utils
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/applications/networking/instant-messengers/franz/generic.nix
View File

@ -22,7 +22,7 @@
, expat , expat
, udev , udev
, libnotify , libnotify
, xdg_utils , xdg-utils
}: }:
# Helper function for building a derivation for Franz and forks. # Helper function for building a derivation for Franz and forks.
@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
postFixup = '' postFixup = ''
wrapProgram $out/opt/${name}/${pname} \ wrapProgram $out/opt/${name}/${pname} \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDependencies}" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDependencies}" \
--prefix PATH : ${xdg_utils}/bin \ --prefix PATH : ${xdg-utils}/bin \
"''${gappsWrapperArgs[@]}" "''${gappsWrapperArgs[@]}"
''; '';
} }

4
pkgs/applications/networking/instant-messengers/hipchat/default.nix
View File

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, xorg, freetype, fontconfig, openssl, glib, nss, nspr, expat { lib, stdenv, fetchurl, xorg, freetype, fontconfig, openssl, glib, nss, nspr, expat
, alsaLib, dbus, zlib, libxml2, libxslt, makeWrapper, xkeyboard_config, systemd , alsaLib, dbus, zlib, libxml2, libxslt, makeWrapper, xkeyboard_config, systemd
, libGL, xcbutilkeysyms, xdg_utils, libtool }: , libGL, xcbutilkeysyms, xdg-utils, libtool }:
let let
version = "4.30.5.1682"; version = "4.30.5.1682";
rpath = lib.makeLibraryPath [ rpath = lib.makeLibraryPath [
xdg_utils xdg-utils
xorg.libXext xorg.libXext
xorg.libSM xorg.libSM
xorg.libICE xorg.libICE

4
pkgs/applications/networking/instant-messengers/slack/default.nix
View File

@ -31,7 +31,7 @@
, nss , nss
, pango , pango
, systemd , systemd
, xdg_utils , xdg-utils
, xorg , xorg
}: }:
@ -151,7 +151,7 @@ let
rm $out/bin/slack rm $out/bin/slack
makeWrapper $out/lib/slack/slack $out/bin/slack \ makeWrapper $out/lib/slack/slack $out/bin/slack \
--prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \ --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \
--prefix PATH : ${xdg_utils}/bin --prefix PATH : ${xdg-utils}/bin
# Fix the desktop link # Fix the desktop link
substituteInPlace $out/share/applications/slack.desktop \ substituteInPlace $out/share/applications/slack.desktop \

4
pkgs/applications/networking/instant-messengers/teams/default.nix
View File

@ -10,7 +10,7 @@
, at-spi2-atk , at-spi2-atk
, coreutils , coreutils
, gawk , gawk
, xdg_utils , xdg-utils
, systemd }: , systemd }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
]; ];
preFixup = '' preFixup = ''
gappsWrapperArgs+=(--prefix PATH : "${coreutils}/bin:${gawk}/bin:${xdg_utils}/bin") gappsWrapperArgs+=(--prefix PATH : "${coreutils}/bin:${gawk}/bin:${xdg-utils}/bin")
''; '';
installPhase = '' installPhase = ''

4
pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix
View File

@ -1,5 +1,5 @@
{ mkDerivation, lib, fetchFromGitHub, pkg-config, python3, cmake, ninja { mkDerivation, lib, fetchFromGitHub, pkg-config, python3, cmake, ninja
, qtbase, qtimageformats, libdbusmenu, hunspell, xdg_utils, ffmpeg_3, openalSoft , qtbase, qtimageformats, libdbusmenu, hunspell, xdg-utils, ffmpeg_3, openalSoft
, lzma, lz4, xxHash, zlib, minizip, openssl, libtgvoip, microsoft_gsl, tl-expected , lzma, lz4, xxHash, zlib, minizip, openssl, libtgvoip, microsoft_gsl, tl-expected
, range-v3 , range-v3
}: }:
@ -26,7 +26,7 @@ mkDerivation rec {
]; ];
qtWrapperArgs = [ qtWrapperArgs = [
"--prefix PATH : ${xdg_utils}/bin" "--prefix PATH : ${xdg-utils}/bin"
]; ];
cmakeFlags = [ cmakeFlags = [

4
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View File

@ -5,7 +5,7 @@
, tl-expected, hunspell , tl-expected, hunspell
# TODO: Shouldn't be required: # TODO: Shouldn't be required:
, pcre, xorg, util-linux, libselinux, libsepol, epoxy, at-spi2-core, libXtst , pcre, xorg, util-linux, libselinux, libsepol, epoxy, at-spi2-core, libXtst
, xdg_utils , xdg-utils
}: }:
with lib; with lib;
@ -83,7 +83,7 @@ in mkDerivation rec {
wrapProgram $out/bin/telegram-desktop \ wrapProgram $out/bin/telegram-desktop \
"''${gappsWrapperArgs[@]}" \ "''${gappsWrapperArgs[@]}" \
"''${qtWrapperArgs[@]}" \ "''${qtWrapperArgs[@]}" \
--prefix PATH : ${xdg_utils}/bin \ --prefix PATH : ${xdg-utils}/bin \
--set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR" --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR"
sed -i $out/bin/telegram-desktop \ sed -i $out/bin/telegram-desktop \
-e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\"," -e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\","

4
pkgs/applications/networking/instant-messengers/wavebox/default.nix
View File

@ -1,5 +1,5 @@
{ alsaLib, autoPatchelfHook, fetchurl, gtk3, libnotify { alsaLib, autoPatchelfHook, fetchurl, gtk3, libnotify
, makeDesktopItem, makeWrapper, nss, lib, stdenv, udev, xdg_utils , makeDesktopItem, makeWrapper, nss, lib, stdenv, udev, xdg-utils
, xorg , xorg
}: }:
@ -54,7 +54,7 @@ in stdenv.mkDerivation {
postFixup = '' postFixup = ''
makeWrapper $out/opt/wavebox/Wavebox $out/bin/wavebox \ makeWrapper $out/opt/wavebox/Wavebox $out/bin/wavebox \
--prefix PATH : ${xdg_utils}/bin --prefix PATH : ${xdg-utils}/bin
''; '';
meta = with lib; { meta = with lib; {

4
pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "evolution-ews"; pname = "evolution-ews";
version = "3.36.5"; version = "3.38.3";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0h1wz4hxsasihdvvsaxnmzka4afjw7603gn0qcw8rxpw114ib1bl"; sha256 = "1s2jpviliazmhnpkh8dc57ga3c3612f2rnc0nfya5ndbi6lpzxhi";
}; };
nativeBuildInputs = [ cmake gettext intltool pkg-config ]; nativeBuildInputs = [ cmake gettext intltool pkg-config ];

5
pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
View File

@ -41,11 +41,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "evolution"; pname = "evolution";
version = "3.38.2"; version = "3.38.3";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1whjgfhcxpb5yhhvyqb8pv71vprw6fv02czin4k4z6dxrxsq32qx"; sha256 = "1kfshljvkpbh965rjlyy1qjjm0ic3rdxisyy9c5jjvv2qlk65b3z";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -120,7 +120,6 @@ stdenv.mkDerivation rec {
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {
packageName = "evolution"; packageName = "evolution";
attrPath = "gnome3.evolution";
}; };
}; };

4
pkgs/applications/networking/remote/teamviewer/default.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation, lib, fetchurl, autoPatchelfHook, makeWrapper, xdg_utils, dbus { mkDerivation, lib, fetchurl, autoPatchelfHook, makeWrapper, xdg-utils, dbus
, qtbase, qtwebkit, qtx11extras, qtquickcontrols, glibc , qtbase, qtwebkit, qtx11extras, qtquickcontrols, glibc
, libXrandr, libX11, libXext, libXdamage, libXtst, libSM, libXfixes , libXrandr, libX11, libXext, libXdamage, libXtst, libSM, libXfixes
, wrapQtAppsHook , wrapQtAppsHook
@ -36,7 +36,7 @@ mkDerivation rec {
ln -s $out/share/teamviewer/tv_bin/desktop/com.teamviewer.*.desktop $out/share/applications ln -s $out/share/teamviewer/tv_bin/desktop/com.teamviewer.*.desktop $out/share/applications
ln -s /var/lib/teamviewer $out/share/teamviewer/config ln -s /var/lib/teamviewer $out/share/teamviewer/config
ln -s /var/log/teamviewer $out/share/teamviewer/logfiles ln -s /var/log/teamviewer $out/share/teamviewer/logfiles
ln -s ${xdg_utils}/bin $out/share/teamviewer/tv_bin/xdg-utils ln -s ${xdg-utils}/bin $out/share/teamviewer/tv_bin/xdg-utils
for i in 16 20 24 32 48 256; do for i in 16 20 24 32 48 256; do
size=$i"x"$i size=$i"x"$i

4
pkgs/applications/office/mytetra/default.nix
View File

@ -1,4 +1,4 @@
{ lib, mkDerivation, fetchurl, qmake, qtsvg, makeWrapper, xdg_utils }: { lib, mkDerivation, fetchurl, qmake, qtsvg, makeWrapper, xdg-utils }:
let let
version = "1.44.55"; version = "1.44.55";
@ -26,7 +26,7 @@ in mkDerivation {
postFixup = '' postFixup = ''
wrapProgram $out/bin/mytetra \ wrapProgram $out/bin/mytetra \
--prefix PATH : ${xdg_utils}/bin --prefix PATH : ${xdg-utils}/bin
''; '';
meta = with lib; { meta = with lib; {

3
pkgs/applications/radio/multimon-ng/default.nix
View File

@ -37,7 +37,8 @@ stdenv.mkDerivation {
ZVEI3 DZVEI PZVEI EEA EIA CCIR MORSE CW ZVEI3 DZVEI PZVEI EEA EIA CCIR MORSE CW
''; '';
homepage = "https://github.com/EliasOenal/multimon-ng"; homepage = "https://github.com/EliasOenal/multimon-ng";
license = licenses.gpl2; license = licenses.gpl2Only;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.markuskowa ];
}; };
} }

2
pkgs/applications/radio/soapybladerf/default.nix
View File

@ -25,7 +25,7 @@ in stdenv.mkDerivation {
meta = with lib; { meta = with lib; {
homepage = "https://github.com/pothosware/SoapyBladeRF"; homepage = "https://github.com/pothosware/SoapyBladeRF";
description = "SoapySDR plugin for BladeRF devices"; description = "SoapySDR plugin for BladeRF devices";
license = licenses.lgpl21; license = licenses.lgpl21Only;
maintainers = with maintainers; [ markuskowa ]; maintainers = with maintainers; [ markuskowa ];
platforms = platforms.linux; platforms = platforms.linux;
}; };

2
pkgs/applications/radio/welle-io/default.nix
View File

@ -43,7 +43,7 @@ in mkDerivation {
description = "A DAB/DAB+ Software Radio"; description = "A DAB/DAB+ Software Radio";
homepage = "https://www.welle.io/"; homepage = "https://www.welle.io/";
maintainers = with maintainers; [ ck3d markuskowa ]; maintainers = with maintainers; [ ck3d markuskowa ];
license = licenses.gpl2; license = licenses.gpl2Only;
platforms = with platforms; [ "x86_64-linux" "i686-linux" ] ++ darwin; platforms = with platforms; [ "x86_64-linux" "i686-linux" ] ++ darwin;
}; };
} }

2
pkgs/applications/science/astronomy/gpredict/default.nix
View File

@ -26,7 +26,7 @@ in stdenv.mkDerivation {
well. Gpredict uses the SGP4/SDP4 algorithms, which are compatible with the well. Gpredict uses the SGP4/SDP4 algorithms, which are compatible with the
NORAD Keplerian elements. NORAD Keplerian elements.
''; '';
license = licenses.gpl2; license = licenses.gpl2Only;
platforms = platforms.linux; platforms = platforms.linux;
homepage = "http://gpredict.oz9aec.net/"; homepage = "http://gpredict.oz9aec.net/";
maintainers = [ maintainers.markuskowa maintainers.cmcdragonkai ]; maintainers = [ maintainers.markuskowa maintainers.cmcdragonkai ];

2
pkgs/applications/science/chemistry/openmolcas/default.nix
View File

@ -69,7 +69,7 @@ in stdenv.mkDerivation {
description = "Advanced quantum chemistry software package"; description = "Advanced quantum chemistry software package";
homepage = "https://gitlab.com/Molcas/OpenMolcas"; homepage = "https://gitlab.com/Molcas/OpenMolcas";
maintainers = [ maintainers.markuskowa ]; maintainers = [ maintainers.markuskowa ];
license = licenses.lgpl21; license = licenses.lgpl21Only;
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
}; };
} }

4
pkgs/applications/terminal-emulators/alacritty/default.nix
View File

@ -23,7 +23,7 @@
, libxcb , libxcb
, libxkbcommon , libxkbcommon
, wayland , wayland
, xdg_utils , xdg-utils
# Darwin Frameworks # Darwin Frameworks
, AppKit , AppKit
@ -87,7 +87,7 @@ rustPlatform.buildRustPackage rec {
postPatch = '' postPatch = ''
substituteInPlace alacritty/src/config/mouse.rs \ substituteInPlace alacritty/src/config/mouse.rs \
--replace xdg-open ${xdg_utils}/bin/xdg-open --replace xdg-open ${xdg-utils}/bin/xdg-open
''; '';
installPhase = '' installPhase = ''

4
pkgs/applications/terminal-emulators/wayst/default.nix
View File

@ -13,7 +13,7 @@
, wayland , wayland
, libnotify , libnotify
, xdg_utils , xdg-utils
, makeDesktopItem , makeDesktopItem
}: }:
@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
postPatch = '' postPatch = ''
substituteInPlace src/settings.c \ substituteInPlace src/settings.c \
--replace xdg-open ${xdg_utils}/bin/xdg-open --replace xdg-open ${xdg-utils}/bin/xdg-open
substituteInPlace src/main.c \ substituteInPlace src/main.c \
--replace notify-send ${libnotify}/bin/notify-send --replace notify-send ${libnotify}/bin/notify-send
''; '';

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

@ -1,4 +1,4 @@
{lib, stdenv, git, xdg_utils, gnugrep, fetchFromGitHub, makeWrapper}: {lib, stdenv, git, xdg-utils, gnugrep, fetchFromGitHub, makeWrapper}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "git-open"; pname = "git-open";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin mkdir -p $out/bin
cp git-open $out/bin cp git-open $out/bin
wrapProgram $out/bin/git-open \ wrapProgram $out/bin/git-open \
--prefix PATH : "${lib.makeBinPath [ git xdg_utils gnugrep ]}" --prefix PATH : "${lib.makeBinPath [ git xdg-utils gnugrep ]}"
''; '';
meta = with lib; { meta = with lib; {

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

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub, makeWrapper, xdg_utils, installShellFiles, git }: { lib, buildGoModule, fetchFromGitHub, makeWrapper, xdg-utils, installShellFiles, git }:
buildGoModule rec { buildGoModule rec {
pname = "lab"; pname = "lab";
@ -22,7 +22,7 @@ buildGoModule rec {
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
postInstall = '' postInstall = ''
wrapProgram $out/bin/lab --prefix PATH ":" "${lib.makeBinPath [ git xdg_utils ]}"; wrapProgram $out/bin/lab --prefix PATH ":" "${lib.makeBinPath [ git xdg-utils ]}";
for shell in bash fish zsh; do for shell in bash fish zsh; do
$out/bin/lab completion $shell > lab.$shell $out/bin/lab completion $shell > lab.$shell
installShellCompletion lab.$shell installShellCompletion lab.$shell

2
pkgs/applications/version-management/git-and-tools/qgit/default.nix
View File

@ -16,7 +16,7 @@ mkDerivation rec {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
meta = with lib; { meta = with lib; {
license = licenses.gpl2; license = licenses.gpl2Only;
homepage = "https://github.com/tibirna/qgit"; homepage = "https://github.com/tibirna/qgit";
description = "Graphical front-end to Git"; description = "Graphical front-end to Git";
maintainers = with maintainers; [ peterhoeg markuskowa ]; maintainers = with maintainers; [ peterhoeg markuskowa ];

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

@ -1,4 +1,4 @@
{ fetchFromGitHub, lib, python3Packages, meld, subversion, gvfs, xdg_utils, gtk3 }: { fetchFromGitHub, lib, python3Packages, meld, subversion, gvfs, xdg-utils, gtk3 }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "rabbitvcs"; pname = "rabbitvcs";
@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
}; };
buildInputs = [ gtk3 ]; buildInputs = [ gtk3 ];
pythonPath = with python3Packages; [ configobj pygobject3 pysvn dulwich tkinter gvfs xdg_utils ]; pythonPath = with python3Packages; [ configobj pygobject3 pysvn dulwich tkinter gvfs xdg-utils ];
prePatch = '' prePatch = ''
sed -ie 's|if sys\.argv\[1\] == "install":|if False:|' ./setup.py sed -ie 's|if sys\.argv\[1\] == "install":|if False:|' ./setup.py

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

@ -19,7 +19,7 @@
stdenv, stdenv,
symlinkJoin, symlinkJoin,
webkit2-sharp, webkit2-sharp,
xdg_utils, xdg-utils,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
mono mono
openssh openssh
openssl openssl
xdg_utils xdg-utils
]; ];
}}/bin \ }}/bin \
--set MONO_GAC_PREFIX ${lib.concatStringsSep ":" [ --set MONO_GAC_PREFIX ${lib.concatStringsSep ":" [

6
pkgs/applications/video/manim/default.nix
View File

@ -1,5 +1,5 @@
{ lib, buildPythonApplication, fetchFromGitHub, pythonOlder, file, fetchpatch { lib, buildPythonApplication, fetchFromGitHub, pythonOlder, file, fetchpatch
, cairo, ffmpeg_3, sox, xdg_utils, texlive , cairo, ffmpeg_3, sox, xdg-utils, texlive
, colour, numpy, pillow, progressbar, scipy, tqdm, opencv , pycairo, pydub , colour, numpy, pillow, progressbar, scipy, tqdm, opencv , pycairo, pydub
, pbr, fetchPypi , pbr, fetchPypi
}: }:
@ -28,14 +28,14 @@ buildPythonApplication rec {
pycairo pycairo
pydub pydub
cairo sox ffmpeg_3 xdg_utils cairo sox ffmpeg_3 xdg-utils
]; ];
# Test with texlive to see whether it works but don't propagate # Test with texlive to see whether it works but don't propagate
# because it's huge and optional # because it's huge and optional
# TODO: Use smaller TexLive distribution # TODO: Use smaller TexLive distribution
# Doesn't need everything but it's hard to figure out what it needs # Doesn't need everything but it's hard to figure out what it needs
checkInputs = [ cairo sox ffmpeg_3 xdg_utils texlive.combined.scheme-full ]; checkInputs = [ cairo sox ffmpeg_3 xdg-utils texlive.combined.scheme-full ];
# Simple test and complex test with LaTeX # Simple test and complex test with LaTeX
checkPhase = '' checkPhase = ''

4
pkgs/applications/video/mkvtoolnix/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitLab, pkg-config, autoconf, automake, libiconv, drake { lib, stdenv, fetchFromGitLab, pkg-config, autoconf, automake, libiconv, drake
, ruby, docbook_xsl, file, xdg_utils, gettext, expat, boost, libebml, zlib , ruby, docbook_xsl, file, xdg-utils, gettext, expat, boost, libebml, zlib
, fmt, libmatroska, libogg, libvorbis, flac, libxslt, cmark, pcre2 , fmt, libmatroska, libogg, libvorbis, flac, libxslt, cmark, pcre2
, withGUI ? true , withGUI ? true
, qtbase ? null , qtbase ? null
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
expat file xdg_utils boost libebml zlib fmt expat file xdg-utils boost libebml zlib fmt
libmatroska libogg libvorbis flac cmark pcre2 libmatroska libogg libvorbis flac cmark pcre2
] ++ optional stdenv.isDarwin libiconv ] ++ optional stdenv.isDarwin libiconv
++ optionals withGUI [ qtbase qtmultimedia wrapQtAppsHook ]; ++ optionals withGUI [ qtbase qtmultimedia wrapQtAppsHook ];

4
pkgs/applications/video/subtitleeditor/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, intltool, file, { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, intltool, file,
desktop-file-utils, enchant, gtk3, gtkmm3, gst_all_1, hicolor-icon-theme, desktop-file-utils, enchant, gtk3, gtkmm3, gst_all_1, hicolor-icon-theme,
libsigcxx, libxmlxx, xdg_utils, isocodes, wrapGAppsHook libsigcxx, libxmlxx, xdg-utils, isocodes, wrapGAppsHook
}: }:
let let
@ -41,7 +41,7 @@ stdenv.mkDerivation {
hicolor-icon-theme hicolor-icon-theme
libsigcxx libsigcxx
libxmlxx libxmlxx
xdg_utils xdg-utils
isocodes isocodes
]; ];

2
pkgs/build-support/appimage/default.nix
View File

@ -66,7 +66,7 @@ rec {
xorg.xrandr xorg.xrandr
which which
perl perl
xdg_utils xdg-utils
iana-etc iana-etc
krb5 krb5
]; ];

4
pkgs/data/documentation/anarchism/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitLab, xdg_utils }: { lib, stdenv, fetchFromGitLab, xdg-utils }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "anarchism"; pname = "anarchism";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
postPatch = '' postPatch = ''
substituteInPlace debian/anarchism.desktop \ substituteInPlace debian/anarchism.desktop \
--replace "/usr/bin/xdg-open" "${xdg_utils}/bin/xdg-open" --replace "/usr/bin/xdg-open" "${xdg-utils}/bin/xdg-open"
substituteInPlace debian/anarchism.desktop \ substituteInPlace debian/anarchism.desktop \
--replace "file:///usr" "file://$out" --replace "file:///usr" "file://$out"
''; '';

2
pkgs/data/fonts/inconsolata/default.nix
View File

@ -6,7 +6,7 @@ stdenv.mkDerivation {
inherit (google-fonts) src version; inherit (google-fonts) src version;
installPhase = '' installPhase = ''
install -m644 --target $out/share/fonts/truetype/inconsolata -D $src/ofl/inconsolata/*.ttf install -m644 --target $out/share/fonts/truetype/inconsolata -D $src/ofl/inconsolata/static/*.ttf
''; '';
meta = with lib; { meta = with lib; {

4
pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "evolution-data-server"; pname = "evolution-data-server";
version = "3.38.2"; version = "3.38.3";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0mflr8a3f2q55rirvqhizji0zinic75jk8mksflszqzgcdcph85z"; sha256 = "19rwgvjicfmd5zgabr5ns42rg8cqa05p8qf7684prajjna8gcclp";
}; };
patches = [ patches = [

10
pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, dbus, libgcrypt, pam, python2, glib, libxslt { lib, stdenv, fetchurl, fetchpatch, pkg-config, dbus, libgcrypt, pam, python2, glib, libxslt
, gettext, gcr, libcap_ng, libselinux, p11-kit, openssh, wrapGAppsHook , gettext, gcr, libcap_ng, libselinux, p11-kit, openssh, wrapGAppsHook
, docbook_xsl, docbook_xml_dtd_43, gnome3 }: , docbook_xsl, docbook_xml_dtd_43, gnome3 }:
@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
sha256 = "11sgffrrpss5cmv3b717pqlbhgq17l1xd33fsvqgsw8simxbar52"; sha256 = "11sgffrrpss5cmv3b717pqlbhgq17l1xd33fsvqgsw8simxbar52";
}; };
patches = [
# version 3.36.0 is incompatible with libncap_ng >= 0.8.1. remove patch after update.
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-keyring/-/commit/ebc7bc9efacc17049e54da8d96a4a29943621113.diff";
sha256 = "07bx7zmdswqsa3dj37m729g35n1prhylkw7ya8a7h64i10la12cs";
})
];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
buildInputs = [ buildInputs = [

4
pkgs/desktops/xfce/applications/catfish/default.nix
View File

@ -1,5 +1,5 @@
{ lib, fetchurl, file, which, intltool, gobject-introspection, { lib, fetchurl, file, which, intltool, gobject-introspection,
findutils, xdg_utils, dconf, gtk3, python3Packages, findutils, xdg-utils, dconf, gtk3, python3Packages,
wrapGAppsHook wrapGAppsHook
}: }:
@ -34,7 +34,7 @@ python3Packages.buildPythonApplication rec {
python3Packages.dbus-python python3Packages.dbus-python
python3Packages.pygobject3 python3Packages.pygobject3
python3Packages.pexpect python3Packages.pexpect
xdg_utils xdg-utils
findutils findutils
]; ];

5
pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
View File

@ -18,7 +18,6 @@
, config , config
, glib , glib
, libxml2 , libxml2
, libav_0_8
, ffmpeg_3 , ffmpeg_3
, libxslt , libxslt
, libGL , libGL
@ -171,8 +170,8 @@ let result = stdenv.mkDerivation rec {
* libXt is only needed on amd64 * libXt is only needed on amd64
*/ */
libraries = libraries =
[stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg_3 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++ [stdenv.cc.libc glib libxml2 ffmpeg_3 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++
(if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []); lib.optionals swingSupport [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc];
rpath = lib.strings.makeLibraryPath libraries; rpath = lib.strings.makeLibraryPath libraries;

4
pkgs/development/compilers/oraclejdk/jdk11-linux.nix
View File

@ -9,12 +9,12 @@
let result = stdenv.mkDerivation rec { let result = stdenv.mkDerivation rec {
pname = "oraclejdk"; pname = "oraclejdk";
version = "11.0.8"; version = "11.0.10";
src = requireFile { src = requireFile {
name = "jdk-${version}_linux-x64_bin.tar.gz"; name = "jdk-${version}_linux-x64_bin.tar.gz";
url = "https://www.oracle.com/java/technologies/javase-jdk11-downloads.html"; url = "https://www.oracle.com/java/technologies/javase-jdk11-downloads.html";
sha256 = "6390878c91e29bad7b2483eb0b470620bd145269600f3b6a9d65724e6f83b6fd"; sha256 = "94bd34f85ee38d3ef59e5289ec7450b9443b924c55625661fffe66b03f2c8de2";
}; };
installPhase = '' installPhase = ''

29
pkgs/development/libraries/cjson/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ stdenv, lib, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "cjson";
version = "1.7.14";
src = fetchFromGitHub {
owner = "DaveGamble";
repo = "cJSON";
rev = "v${version}";
sha256 = "1a3i9ydl65dgwgmlg79n5q8qilmjkaakq56sam1w25zcrd8jy11q";
};
nativeBuildInputs = [ cmake ];
# cJSON actually uses C99 standard, not C89
# https://github.com/DaveGamble/cJSON/issues/275
postPatch = ''
substituteInPlace CMakeLists.txt --replace -std=c89 -std=c99
'';
meta = with lib; {
homepage = "https://github.com/DaveGamble/cJSON";
description = "Ultralightweight JSON parser in ANSI C";
license = licenses.mit;
maintainers = [ maintainers.matthiasbeyer ];
platforms = platforms.unix;
};
}

2
pkgs/development/libraries/codec2/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Speech codec designed for communications quality speech at low data rates"; description = "Speech codec designed for communications quality speech at low data rates";
homepage = "http://www.rowetel.com/blog/?page_id=452"; homepage = "http://www.rowetel.com/blog/?page_id=452";
license = licenses.lgpl21; license = licenses.lgpl21Only;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ markuskowa ]; maintainers = with maintainers; [ markuskowa ];
}; };

16
pkgs/development/libraries/libschrift/default.nix
View File

@ -1,16 +1,24 @@
{ lib, stdenv, fetchFromGitHub }: { lib, stdenv, fetchFromGitHub, fetchpatch }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libschrift"; pname = "libschrift";
version = "0.9.1"; version = "0.10.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tomolt"; owner = "tomolt";
repo = pname; repo = pname;
rev = "c6d20460d6e602e8829d3a227fd7be4c4c3cda86"; rev = "c207585486b3e78ec5506f55f5d56178f421a53c";
hash = "sha256-BuTmWaWFZ0DXujlbhbmK3Woit8fR9F4DWmKszHX6gOI="; sha256 = "13qrplsi2a53s84giwnzqmn0zbslyaagvjn89wsn9fd90m2v2bs1";
}; };
# fix a compilation failure related to darwin integers, remove at next release
patches = [
(fetchpatch {
url = "https://github.com/tomolt/libschrift/commit/1b1292f2cf4b582d66b2f6c87105997391f9fa08.patch";
sha256 = "076l3n28famgi74nr5bz47yn192bm76p8c8558fm5zj5c21pcfsv";
})
];
postPatch = '' postPatch = ''
substituteInPlace config.mk \ substituteInPlace config.mk \
--replace "PREFIX = /usr/local" "PREFIX = $out" --replace "PREFIX = /usr/local" "PREFIX = $out"

4
pkgs/development/libraries/libsixel/default.nix
View File

@ -22,5 +22,9 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ vrthra ]; maintainers = with maintainers; [ vrthra ];
license = licenses.mit; license = licenses.mit;
platforms = with platforms; unix; platforms = with platforms; unix;
knownVulnerabilities = [
"CVE-2020-11721" # https://github.com/saitoha/libsixel/issues/134
"CVE-2020-19668" # https://github.com/saitoha/libsixel/issues/136
];
}; };
} }

4
pkgs/development/libraries/spglib/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "spglib"; pname = "spglib";
version = "1.16.0"; version = "1.16.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "atztogo"; owner = "atztogo";
repo = "spglib"; repo = "spglib";
rev = "v${version}"; rev = "v${version}";
sha256 = "1kzc956m1pnazhz52vspqridlw72wd8x5l3dsilpdxl491aa2nws"; sha256 = "1sk59nnar9npka4mdcfh4154ja46i35y4gbq892kwqidzyfs80in";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

4
pkgs/development/mobile/genymotion/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, makeWrapper, which, zlib, libGL, glib, xorg, libxkbcommon { stdenv, lib, fetchurl, makeWrapper, which, zlib, libGL, glib, xorg, libxkbcommon
, xdg_utils , xdg-utils
# For glewinfo # For glewinfo
, libXmu, libXi, libXext }: , libXmu, libXi, libXext }:
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
sha256 = "0lvfdlpmmsyq2i9gs4mf6a8fxkfimdr4rhyihqnfhjij3fzxz4lk"; sha256 = "0lvfdlpmmsyq2i9gs4mf6a8fxkfimdr4rhyihqnfhjij3fzxz4lk";
}; };
buildInputs = [ makeWrapper which xdg_utils ]; buildInputs = [ makeWrapper which xdg-utils ];
unpackPhase = '' unpackPhase = ''
mkdir -p phony-home $out/share/applications mkdir -p phony-home $out/share/applications

10
pkgs/development/ocaml-modules/cstruct/default.nix
View File

@ -1,8 +1,8 @@
{ lib, fetchurl, buildDunePackage, bigarray-compat }: { lib, fetchurl, buildDunePackage, bigarray-compat, alcotest, ocaml }:
buildDunePackage rec { buildDunePackage rec {
pname = "cstruct"; pname = "cstruct";
version = "5.0.0"; version = "6.0.0";
useDune2 = true; useDune2 = true;
@ -10,11 +10,15 @@ buildDunePackage rec {
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/ocaml-cstruct/releases/download/v${version}/cstruct-v${version}.tbz"; url = "https://github.com/mirage/ocaml-cstruct/releases/download/v${version}/cstruct-v${version}.tbz";
sha256 = "1z403q2nkgz5x07j0ypy6q0mk2yxgqbp1jlqkngbajna7124x2pb"; sha256 = "0xi6cj85z033fqrqdkwac6gg07629vzdhx03c3lhiwwc4lpnv8bq";
}; };
propagatedBuildInputs = [ bigarray-compat ]; propagatedBuildInputs = [ bigarray-compat ];
# alcotest isn't available for OCaml < 4.05 due to fmt
doCheck = lib.versionAtLeast ocaml.version "4.05";
checkInputs = [ alcotest ];
meta = { meta = {
description = "Access C-like structures directly from OCaml"; description = "Access C-like structures directly from OCaml";
license = lib.licenses.isc; license = lib.licenses.isc;

2
pkgs/development/ocaml-modules/cstruct/lwt.nix
View File

@ -8,7 +8,7 @@ buildDunePackage {
pname = "cstruct-lwt"; pname = "cstruct-lwt";
inherit (cstruct) version src useDune2 meta; inherit (cstruct) version src useDune2 meta;
minimumOCamlVersion = "4.02"; minimumOCamlVersion = "4.03";
propagatedBuildInputs = [ cstruct lwt ]; propagatedBuildInputs = [ cstruct lwt ];
} }

24
pkgs/development/ocaml-modules/cstruct/ppx.nix
View File

@ -1,4 +1,7 @@
{ lib, buildDunePackage, cstruct, sexplib, ppx_tools_versioned, ppxlib }: { lib, buildDunePackage, cstruct, sexplib, ppxlib, stdlib-shims
, ounit, cppo, ppx_sexp_conv, cstruct-unix, cstruct-sexp
, fetchpatch
}:
if !lib.versionAtLeast (cstruct.version or "1") "3" if !lib.versionAtLeast (cstruct.version or "1") "3"
then cstruct then cstruct
@ -8,7 +11,22 @@ buildDunePackage {
pname = "ppx_cstruct"; pname = "ppx_cstruct";
inherit (cstruct) version src useDune2 meta; inherit (cstruct) version src useDune2 meta;
minimumOCamlVersion = "4.03"; minimumOCamlVersion = "4.07";
propagatedBuildInputs = [ cstruct ppx_tools_versioned ppxlib sexplib ]; # prevent ANSI escape sequences from messing up the test cases
# https://github.com/mirage/ocaml-cstruct/issues/283
patches = [
(fetchpatch {
url = "https://github.com/mirage/ocaml-cstruct/pull/285/commits/60dfed98b4c34455bf339ac60e2ed5ef05feb48f.patch";
sha256 = "1x9i62nrlfy9l44vb0a7qjfrg2wyki4c8nmmqnzwpcbkgxi3q6n5";
})
];
propagatedBuildInputs = [ cstruct ppxlib sexplib stdlib-shims ];
# disable until ppx_sexp_conv uses ppxlib 0.20.0 (or >= 0.16.0)
# since the propagation of the older ppxlib breaks the ppx_cstruct
# build.
doCheck = false;
checkInputs = [ ounit cppo ppx_sexp_conv cstruct-sexp cstruct-unix ];
} }

7
pkgs/development/ocaml-modules/cstruct/sexp.nix
View File

@ -8,8 +8,11 @@ buildDunePackage rec {
pname = "cstruct-sexp"; pname = "cstruct-sexp";
inherit (cstruct) version src useDune2 meta; inherit (cstruct) version src useDune2 meta;
doCheck = lib.versionAtLeast ocaml.version "4.03"; minimumOCamlVersion = "4.03";
checkInputs = lib.optional doCheck alcotest;
# alcotest is only available on OCaml >= 4.05 due to fmt
doCheck = lib.versionAtLeast ocaml.version "4.05";
checkInputs = [ alcotest ];
propagatedBuildInputs = [ cstruct sexplib ]; propagatedBuildInputs = [ cstruct sexplib ];
} }

9
pkgs/development/ocaml-modules/ptime/default.nix
View File

@ -1,4 +1,6 @@
{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, result, js_of_ocaml }: { stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, result, js_of_ocaml
, jsooSupport ? true
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.8.5"; version = "0.8.5";
@ -10,11 +12,12 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ ocaml findlib ocamlbuild ]; nativeBuildInputs = [ ocaml findlib ocamlbuild ];
buildInputs = [ findlib topkg js_of_ocaml ]; buildInputs = [ findlib topkg ]
++ lib.optional jsooSupport js_of_ocaml;
propagatedBuildInputs = [ result ]; propagatedBuildInputs = [ result ];
buildPhase = "${topkg.run} build --with-js_of_ocaml true"; buildPhase = "${topkg.run} build --with-js_of_ocaml ${lib.boolToString jsooSupport}";
inherit (topkg) installPhase; inherit (topkg) installPhase;

4
pkgs/development/ocaml-modules/xenstore/default.nix
View File

@ -1,5 +1,5 @@
{ lib, buildDunePackage, fetchurl { lib, buildDunePackage, fetchurl
, cstruct, ppx_cstruct, lwt, ounit , cstruct, ppx_cstruct, lwt, ounit, stdlib-shims
}: }:
buildDunePackage rec { buildDunePackage rec {
@ -16,7 +16,7 @@ buildDunePackage rec {
}; };
nativeBuildInputs = [ ppx_cstruct ]; nativeBuildInputs = [ ppx_cstruct ];
propagatedBuildInputs = [ cstruct lwt ]; propagatedBuildInputs = [ stdlib-shims cstruct lwt ];
doCheck = true; doCheck = true;
checkInputs = [ ounit ]; checkInputs = [ ounit ];

23
pkgs/development/python-modules/cachetools/default.nix
View File

@ -1,17 +1,28 @@
{ lib, buildPythonPackage, fetchPypi, isPy27 }: { lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "cachetools"; pname = "cachetools";
version = "4.1.1"; version = "4.2.1";
src = fetchPypi { src = fetchFromGitHub {
inherit pname version; owner = "tkem";
sha256 = "bbaa39c3dede00175df2dc2b03d0cf18dd2d32a7de7beb68072d13043c9edb20"; repo = pname;
rev = "v${version}";
sha256 = "1b662ph8m2d05d2vi3izgnr6v7h9zfvscfsaaw8nhdmmm15ivfa6";
}; };
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "cachetools" ];
meta = with lib; { meta = with lib; {
description = "Extensible memoizing collections and decorators"; description = "Extensible memoizing collections and decorators";
homepage = "https://github.com/tkem/cachetools"; homepage = "https://github.com/tkem/cachetools";
license = licenses.mit; license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
}; };
} }

28
pkgs/development/python-modules/panflute/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ lib
, fetchPypi
, click
, pyyaml
, buildPythonPackage
, isPy3k
}:
buildPythonPackage rec{
version = "2.0.5";
pname = "panflute";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "1ssmqcyr91f0gpl49lz6a9jkl17l06h6qcik24rlmva28ii6aszz";
};
propagatedBuildInputs = [ click pyyaml ];
meta = with lib; {
description = "A Pythonic alternative to John MacFarlane's pandocfilters, with extra helper functions";
homepage = "http://scorreia.com/software/panflute";
license = licenses.bsd3;
maintainers = with maintainers; [ synthetica ];
};
}

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

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchFromGitHub, xdg_utils { lib, buildPythonPackage, fetchFromGitHub, xdg-utils
, requests, filetype, pyparsing, configparser, arxiv2bib , requests, filetype, pyparsing, configparser, arxiv2bib
, pyyaml, chardet, beautifulsoup4, colorama, bibtexparser , pyyaml, chardet, beautifulsoup4, colorama, bibtexparser
, click, python-slugify, habanero, isbnlib, typing-extensions , click, python-slugify, habanero, isbnlib, typing-extensions
@ -45,7 +45,7 @@ buildPythonPackage rec {
checkInputs = ([ checkInputs = ([
pytest pytestcov pytest pytestcov
]) ++ [ ]) ++ [
xdg_utils xdg-utils
]; ];
# most of the downloader tests and 4 other tests require a network connection # most of the downloader tests and 4 other tests require a network connection

50
pkgs/development/python-modules/pylink-square/default.nix Normal file
View File

@ -0,0 +1,50 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchFromGitHub
, mock
, psutil
, six
, future
}:
let
mock' = mock.overridePythonAttrs (old: rec {
version = "2.0.0";
src = fetchPypi {
inherit (old) pname;
inherit version;
sha256 = "1flbpksir5sqrvq2z0dp8sl4bzbadg21sj4d42w3klpdfvgvcn5i";
};
});
in buildPythonPackage rec {
pname = "pylink-square";
version = "0.8.1";
src = fetchFromGitHub {
owner = "square";
repo = "pylink";
rev = "v${version}";
sha256 = "1q5sm1017pcqcgwhsliiiv1wh609lrjdlc8f5ihlschk1d0qidpd";
};
buildInputs = [ mock' ];
propagatedBuildInputs = [ psutil six future ];
preCheck = ''
# For an unknown reason, `pylink --version` output is different
# inside the nix build environment across different python versions
substituteInPlace tests/unit/test_main.py --replace \
"expected = 'pylink %s' % pylink.__version__" \
"return"
'';
pythonImportsCheck = [ "pylink" ];
meta = with lib; {
description = "Python interface for the SEGGER J-Link";
homepage = "https://github.com/Square/pylink";
maintainers = with maintainers; [ dump_stack ];
license = licenses.asl20;
};
}

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

@ -2,12 +2,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyotp"; pname = "pyotp";
version = "2.4.1"; version = "2.5.1";
disabled = isPy27; disabled = isPy27;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "038a3f70b34eaad3f72459e8b411662ef8dfcdd95f7d9203fa489e987a75584b"; sha256 = "2a54d393aff3a244b566d78d597c9cb42e91b3b12f3169cec89d9dfff1c9c5bc";
}; };
pythonImportsCheck = [ "pyotp" ]; pythonImportsCheck = [ "pyotp" ];

32
pkgs/development/tools/htmltest/default.nix Normal file
View File

@ -0,0 +1,32 @@
{ buildGoModule
, fetchFromGitHub
, lib
}:
buildGoModule rec {
pname = "htmltest";
version = "0.14.0";
src = fetchFromGitHub {
owner = "wjdp";
repo = pname;
rev = "v${version}";
sha256 = "0z2j54ywim1nl10vidcnbwhywyzanj4qd93ai533808wrm3ghwb6";
};
vendorSha256 = "0zx3ii9crick647kslzwg4d39li6jds938f9j9dp287rhrlzjfbm";
# tests require network access
doCheck = false;
meta = with lib; {
description = "Tool to test generated HTML output";
longDescription = ''
htmltest runs your HTML output through a series of checks to ensure all your
links, images, scripts references work, your alt tags are filled in, etc.
'';
homepage = "https://github.com/wjdp/htmltest";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

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

@ -2,10 +2,10 @@
{ {
rust-analyzer-unwrapped = callPackage ./generic.nix rec { rust-analyzer-unwrapped = callPackage ./generic.nix rec {
rev = "2021-01-25"; rev = "2021-02-01";
version = "unstable-${rev}"; version = "unstable-${rev}";
sha256 = "1r42cnx5kplql810zc5bcpl0zzm9l8gls64h32nvd7fgad4ixapz"; sha256 = "sha256-bPv51Jp6zJRdNJehuR8LVaBw/hubSeHbI5BeMwqEn4M=";
cargoSha256 = "0ns26lddiaa1lanamcf8zawh287k4qg8n4brjpqi9s1bxbmd1kc2"; cargoSha256 = "sha256-5g9wFQ6qlkJgSHLSLS0pad00XT7KflyGAq8/BknF9/M=";
}; };
rust-analyzer = callPackage ./wrapper.nix {} { rust-analyzer = callPackage ./wrapper.nix {} {

2
pkgs/games/steam/fhsenv.nix
View File

@ -29,7 +29,7 @@ let
# Needed by gdialog, including in the steam-runtime # Needed by gdialog, including in the steam-runtime
perl perl
# Open URLs # Open URLs
xdg_utils xdg-utils
iana-etc iana-etc
# Steam Play / Proton # Steam Play / Proton
python3 python3

4
pkgs/misc/emulators/nestopia/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, SDL2, alsaLib, gtk3 { lib, stdenv, fetchFromGitHub, pkg-config, SDL2, alsaLib, gtk3
, makeWrapper, libGLU, libGL, libarchive, libao, unzip, xdg_utils , makeWrapper, libGLU, libGL, libarchive, libao, unzip, xdg-utils
, epoxy, gdk-pixbuf, gnome3, wrapGAppsHook , epoxy, gdk-pixbuf, gnome3, wrapGAppsHook
}: }:
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
libarchive libarchive
libao libao
unzip unzip
xdg_utils xdg-utils
gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme
]; ];

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

@ -65,12 +65,12 @@ let
ale = buildVimPluginFrom2Nix { ale = buildVimPluginFrom2Nix {
pname = "ale"; pname = "ale";
version = "2021-01-27"; version = "2021-01-31";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dense-analysis"; owner = "dense-analysis";
repo = "ale"; repo = "ale";
rev = "82c8e3a3a3740b520c748ff181e5c29f508b8455"; rev = "c747c277c2ead915b56be0f7e25a9f0c8b91b78e";
sha256 = "0dfd5428lrd5nb098gzsggfnl75v916q2vxzfbbpi2lms8slm60k"; sha256 = "0nf8d3rry75lkn2acn94pnpgmimd0gpi4yrqkrv1n7cns8lrjd7j";
}; };
meta.homepage = "https://github.com/dense-analysis/ale/"; meta.homepage = "https://github.com/dense-analysis/ale/";
}; };
@ -89,12 +89,12 @@ let
aniseed = buildVimPluginFrom2Nix { aniseed = buildVimPluginFrom2Nix {
pname = "aniseed"; pname = "aniseed";
version = "2021-01-16"; version = "2021-01-28";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Olical"; owner = "Olical";
repo = "aniseed"; repo = "aniseed";
rev = "9d3a5e926a5708039abcaf552c8ab3d133c37f80"; rev = "16d201f8a789a5591ae980ac707a31241062ed52";
sha256 = "0waa122pk1mcbbhj7zrsb9ch0xmg0x3mpm627k7knpi4q8krgrzy"; sha256 = "18fbqqjb0cn89wkm4dfhwh3xzpf6gdnav78lrs59kzfggppkpn8l";
}; };
meta.homepage = "https://github.com/Olical/aniseed/"; meta.homepage = "https://github.com/Olical/aniseed/";
}; };
@ -161,12 +161,12 @@ let
asyncomplete-vim = buildVimPluginFrom2Nix { asyncomplete-vim = buildVimPluginFrom2Nix {
pname = "asyncomplete-vim"; pname = "asyncomplete-vim";
version = "2020-12-23"; version = "2021-01-28";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "prabirshrestha"; owner = "prabirshrestha";
repo = "asyncomplete.vim"; repo = "asyncomplete.vim";
rev = "e546095e4ac7a20d06bcf16d207275dd4d6b4115"; rev = "4be3c16b33c27fce5372bf8bc74e42126c76fe61";
sha256 = "0jq5qrlijlqpfgi89249whvpmm140smflpprlq8as0pfyhpjn1d1"; sha256 = "1y5xlisby7a41naas7r09ins3k9arn5xc5bb6w8k7am6xz3vc3r6";
}; };
meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/"; meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/";
}; };
@ -221,12 +221,12 @@ let
awesome-vim-colorschemes = buildVimPluginFrom2Nix { awesome-vim-colorschemes = buildVimPluginFrom2Nix {
pname = "awesome-vim-colorschemes"; pname = "awesome-vim-colorschemes";
version = "2021-01-05"; version = "2021-01-29";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rafi"; owner = "rafi";
repo = "awesome-vim-colorschemes"; repo = "awesome-vim-colorschemes";
rev = "ae48abdd39e24e187dac904c14caf6458b76838c"; rev = "8f437c8960abbd4b29c05a19eaad8c3e792ace05";
sha256 = "12a31l2ggzihl1m1bjgmpmvw8zlqgvql01ryz1zrrhwmgzk8jk1h"; sha256 = "039xln6bwxa6mbwvzdfk32b3v8p4glghb3104nydscy9zbsmpick";
}; };
meta.homepage = "https://github.com/rafi/awesome-vim-colorschemes/"; meta.homepage = "https://github.com/rafi/awesome-vim-colorschemes/";
}; };
@ -305,12 +305,12 @@ let
brainfuck-vim = buildVimPluginFrom2Nix { brainfuck-vim = buildVimPluginFrom2Nix {
pname = "brainfuck-vim"; pname = "brainfuck-vim";
version = "2021-01-10"; version = "2021-01-28";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fruit-in"; owner = "fruit-in";
repo = "brainfuck-vim"; repo = "brainfuck-vim";
rev = "d58b673eaa3dbc58975e9b23c09eac57c3e1e4b5"; rev = "721bbe54df26906f79ed481069435596741f67f3";
sha256 = "178m0ada1a0gijdwikycszls41kzgx6ysbd2aavlkbnrvclrkfa9"; sha256 = "130njfiwbgd6gpy52xm5ayadh9q11ahsin1a60y54a99qd8jz6wi";
}; };
meta.homepage = "https://github.com/fruit-in/brainfuck-vim/"; meta.homepage = "https://github.com/fruit-in/brainfuck-vim/";
}; };
@ -341,12 +341,12 @@ let
calendar-vim = buildVimPluginFrom2Nix { calendar-vim = buildVimPluginFrom2Nix {
pname = "calendar-vim"; pname = "calendar-vim";
version = "2021-01-11"; version = "2021-01-30";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "itchyny"; owner = "itchyny";
repo = "calendar.vim"; repo = "calendar.vim";
rev = "289fe67f9a20a88b93b570671cf8a5d258fc7b69"; rev = "4e454c2ca9a489f2631df24845615744bd594b61";
sha256 = "17201r2nvy3jxf0f29ihqrln37xr4h3f2z20igjhajl3ajkg60h1"; sha256 = "12vmysyvavvf1173i0m7jfzh2jsfqx5p7mdm3iafg4iv0209rz66";
}; };
meta.homepage = "https://github.com/itchyny/calendar.vim/"; meta.homepage = "https://github.com/itchyny/calendar.vim/";
}; };
@ -377,12 +377,12 @@ let
chadtree = buildVimPluginFrom2Nix { chadtree = buildVimPluginFrom2Nix {
pname = "chadtree"; pname = "chadtree";
version = "2021-01-28"; version = "2021-02-01";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ms-jpq"; owner = "ms-jpq";
repo = "chadtree"; repo = "chadtree";
rev = "2081a39a7458b55ac396f3e27b4875b41521a387"; rev = "fa9ca44790510bca23a3b3f151b3cb7726e6d542";
sha256 = "0m79i175820lhng27v4jdz0pv3hfw5xv95kqhlifz6hbmc75mw61"; sha256 = "0fg49aw5wkb2sv4sipvr9041hd0z0czfg5yn5z7rz1m52i5j3cwz";
}; };
meta.homepage = "https://github.com/ms-jpq/chadtree/"; meta.homepage = "https://github.com/ms-jpq/chadtree/";
}; };
@ -413,12 +413,12 @@ let
ci_dark = buildVimPluginFrom2Nix { ci_dark = buildVimPluginFrom2Nix {
pname = "ci_dark"; pname = "ci_dark";
version = "2021-01-20"; version = "2021-01-31";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "chuling"; owner = "chuling";
repo = "ci_dark"; repo = "ci_dark";
rev = "ba5e404ded9f5bcfae68a6ad440ba3909eb7baff"; rev = "c7537d81a796b4559e03309aeec9cb8d6d7bda21";
sha256 = "1377apvlwq3i755ply54yi7wz96fflwc4w4aash3hjbjmv0r6ff4"; sha256 = "05p8viz5q7rknzyh7zp3k2qhl14nlamik5gvqy86bfgwmhbac350";
}; };
meta.homepage = "https://github.com/chuling/ci_dark/"; meta.homepage = "https://github.com/chuling/ci_dark/";
}; };
@ -473,12 +473,12 @@ let
coc-explorer = buildVimPluginFrom2Nix { coc-explorer = buildVimPluginFrom2Nix {
pname = "coc-explorer"; pname = "coc-explorer";
version = "2021-01-26"; version = "2021-01-31";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "weirongxu"; owner = "weirongxu";
repo = "coc-explorer"; repo = "coc-explorer";
rev = "3b4d3128328d20fcf683c76f1efc29b93001b9a6"; rev = "6d98eb18e2e11f7272fb4882e9d946da62322199";
sha256 = "1s3yma34qrpdz5mra7bspnd42kw6c3nqhl3ql5mmrabn0ry3ajvz"; sha256 = "0nfza3d7iji9ri3q0xvr38qdpp22j9is4djii95n8781l85fphay";
}; };
meta.homepage = "https://github.com/weirongxu/coc-explorer/"; meta.homepage = "https://github.com/weirongxu/coc-explorer/";
}; };
@ -497,12 +497,12 @@ let
coc-lua = buildVimPluginFrom2Nix { coc-lua = buildVimPluginFrom2Nix {
pname = "coc-lua"; pname = "coc-lua";
version = "2021-01-16"; version = "2021-01-29";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "josa42"; owner = "josa42";
repo = "coc-lua"; repo = "coc-lua";
rev = "07a533b2b1202beda8e07e4d605584a8b7525e3d"; rev = "9de6e72dca845727c1ef53a71a6cb07f7da4802c";
sha256 = "1r8yijfm9m0g4r2d1q3ja05vjy7li578ix2c2wbq8iy3i10g8lkl"; sha256 = "0csiisfwjn8rr4a9hi7law2fn1wp1fms9nf3h6f9ynqi2p63yxch";
}; };
meta.homepage = "https://github.com/josa42/coc-lua/"; meta.homepage = "https://github.com/josa42/coc-lua/";
}; };
@ -666,12 +666,12 @@ let
conjure = buildVimPluginFrom2Nix { conjure = buildVimPluginFrom2Nix {
pname = "conjure"; pname = "conjure";
version = "2021-01-16"; version = "2021-01-28";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Olical"; owner = "Olical";
repo = "conjure"; repo = "conjure";
rev = "94a55a46ecbbd169436f4f937060c8d449a74c51"; rev = "0aa1e8f78e8e0746a6026260f4d9a64a0bdfbf7a";
sha256 = "074ksnsisv1yvf3fcvgz9bl8s15q5z8h2hvfmymhf53rxbfh7dfk"; sha256 = "163hgvc64bjc18kf6biwy5slhkfg8rw7pvrjsq4kfmcszvkbhgap";
}; };
meta.homepage = "https://github.com/Olical/conjure/"; meta.homepage = "https://github.com/Olical/conjure/";
}; };
@ -846,12 +846,12 @@ let
defx-nvim = buildVimPluginFrom2Nix { defx-nvim = buildVimPluginFrom2Nix {
pname = "defx-nvim"; pname = "defx-nvim";
version = "2021-01-23"; version = "2021-01-31";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Shougo"; owner = "Shougo";
repo = "defx.nvim"; repo = "defx.nvim";
rev = "09c8f1bff43b0cc607f7aeab872f04fcf26b150b"; rev = "ff2b0af13c63fe22ea5653ee27e7b62716929623";
sha256 = "1sapg0az9vfd33vhxxi68hd23c01p8fy5yvx8fy0mvj5ak2gzbnn"; sha256 = "1kz77ab2i30ckz5kgf9bh8z92cn1kbrvmhcz8dbmlfyd7hmywm50";
}; };
meta.homepage = "https://github.com/Shougo/defx.nvim/"; meta.homepage = "https://github.com/Shougo/defx.nvim/";
}; };
@ -894,12 +894,12 @@ let
denite-nvim = buildVimPluginFrom2Nix { denite-nvim = buildVimPluginFrom2Nix {
pname = "denite-nvim"; pname = "denite-nvim";
version = "2021-01-28"; version = "2021-01-31";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Shougo"; owner = "Shougo";
repo = "denite.nvim"; repo = "denite.nvim";
rev = "50a2abf1aa4ca8e192752da55e4102590ce71d9b"; rev = "ee807bee58aee7d8477ef7179451124cc344ea01";
sha256 = "1bvmy8rz6wqrxb2xm1v5kzl95va8qjy8z719j3b562qg10igjyl9"; sha256 = "1pzpw5x25aj87xm1jkw87siff06h1mf1pbq6dwj9xvjgwjb5lw2n";
}; };
meta.homepage = "https://github.com/Shougo/denite.nvim/"; meta.homepage = "https://github.com/Shougo/denite.nvim/";
}; };
@ -1354,12 +1354,12 @@ let
fern-vim = buildVimPluginFrom2Nix { fern-vim = buildVimPluginFrom2Nix {
pname = "fern-vim"; pname = "fern-vim";
version = "2021-01-20"; version = "2021-01-31";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lambdalisue"; owner = "lambdalisue";
repo = "fern.vim"; repo = "fern.vim";
rev = "4ec2a38578726daed584a161450b1ead05b0c9db"; rev = "fa8a10607a39f41a16071561901b963836cd8706";
sha256 = "1k0cc39fb57hz9yv9w2bgbhciia91ls9931xqvr4jmvlx9z99b25"; sha256 = "0cg0ri14jmgx063j950m5kfvsy81qwzvxibar8fq9bkpk63xrip3";
}; };
meta.homepage = "https://github.com/lambdalisue/fern.vim/"; meta.homepage = "https://github.com/lambdalisue/fern.vim/";
}; };
@ -1487,12 +1487,12 @@ let
galaxyline-nvim = buildVimPluginFrom2Nix { galaxyline-nvim = buildVimPluginFrom2Nix {
pname = "galaxyline-nvim"; pname = "galaxyline-nvim";
version = "2021-01-27"; version = "2021-01-31";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "glepnir"; owner = "glepnir";
repo = "galaxyline.nvim"; repo = "galaxyline.nvim";
rev = "d49b8b16ce3a0765ff6e2a861b0205aec5fd946a"; rev = "fd3f069c6fb5eabc5dbad030b3c729bb0c6346ec";
sha256 = "0l5rdlfrcfywfchg3fkppdhzgm084cmrdiw3pms420rqvpdpr93l"; sha256 = "1wpx2wsq7fqabyv2cfgiqs835b6da0y1i4ajx1iyi727q39vm5qj";
}; };
meta.homepage = "https://github.com/glepnir/galaxyline.nvim/"; meta.homepage = "https://github.com/glepnir/galaxyline.nvim/";
}; };
@ -1523,12 +1523,12 @@ let
ghcid = buildVimPluginFrom2Nix { ghcid = buildVimPluginFrom2Nix {
pname = "ghcid"; pname = "ghcid";
version = "2021-01-12"; version = "2021-01-31";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ndmitchell"; owner = "ndmitchell";
repo = "ghcid"; repo = "ghcid";
rev = "52883ef368c97b013dad5c9afcf6cd9bdae9875a"; rev = "3f4a7cc9f50a179158cd8a9ea10ba56cae73514b";
sha256 = "06mw3y3idzsbr2kb74vlrwjds4pzgp1fknjbabdpw38y90ax0j8c"; sha256 = "1afgq5kj98qhgsvpf556zs478s3776i0kjq3zr6zwxr36dp8455n";
}; };
meta.homepage = "https://github.com/ndmitchell/ghcid/"; meta.homepage = "https://github.com/ndmitchell/ghcid/";
}; };
@ -1571,12 +1571,12 @@ let
gitsigns-nvim = buildVimPluginFrom2Nix { gitsigns-nvim = buildVimPluginFrom2Nix {
pname = "gitsigns-nvim"; pname = "gitsigns-nvim";
version = "2021-01-19"; version = "2021-01-31";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lewis6991"; owner = "lewis6991";
repo = "gitsigns.nvim"; repo = "gitsigns.nvim";
rev = "59f7091554378794229bccca1faef6cfcc662024"; rev = "24f0bc9d4ebedad374be608c10cd9b08e079c338";
sha256 = "05s2ln800gxw0xk53gf8zsv01hxdznhrqrkprp4iki4k28lay5kd"; sha256 = "0jb4kfz49a1q0lcc7kkg29y1mjga5i1iqglvb1jq9yrm1gvrk4yq";
}; };
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
}; };
@ -1847,12 +1847,12 @@ let
indentLine = buildVimPluginFrom2Nix { indentLine = buildVimPluginFrom2Nix {
pname = "indentLine"; pname = "indentLine";
version = "2020-11-27"; version = "2021-01-28";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Yggdroot"; owner = "Yggdroot";
repo = "indentLine"; repo = "indentLine";
rev = "a03953d4e89ebc372674f88303c5d4933709fea6"; rev = "5617a1cf7d315e6e6f84d825c85e3b669d220bfa";
sha256 = "0yxx925wrxf3hyllvqnbyiy39bw075vmzzys9jx0aimk7dmf1w9l"; sha256 = "1ns3v4r5m6ckchmkaqkpk8dymh7hwj22d7x23hagmk4zv4hc2mhq";
}; };
meta.homepage = "https://github.com/Yggdroot/indentLine/"; meta.homepage = "https://github.com/Yggdroot/indentLine/";
}; };
@ -1931,12 +1931,12 @@ let
jedi-vim = buildVimPluginFrom2Nix { jedi-vim = buildVimPluginFrom2Nix {
pname = "jedi-vim"; pname = "jedi-vim";
version = "2021-01-03"; version = "2021-01-30";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "davidhalter"; owner = "davidhalter";
repo = "jedi-vim"; repo = "jedi-vim";
rev = "960eaa8053e5516195966321e06568750b2feb28"; rev = "5d4615707fc7bce8a4f1fdaa5f7f07c11637bc30";
sha256 = "1ap9h7a6ybv6yvvszizyhzmgjhxd5xzaw2f6x7wn8dcsk7isy0a5"; sha256 = "0m8dafwz76glmgi7jvc3sxsxill5a3prf5qi0r9266swdw4v8ah3";
fetchSubmodules = true; fetchSubmodules = true;
}; };
meta.homepage = "https://github.com/davidhalter/jedi-vim/"; meta.homepage = "https://github.com/davidhalter/jedi-vim/";
@ -2160,12 +2160,12 @@ let
lightline-bufferline = buildVimPluginFrom2Nix { lightline-bufferline = buildVimPluginFrom2Nix {
pname = "lightline-bufferline"; pname = "lightline-bufferline";
version = "2020-12-28"; version = "2021-01-31";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mengelbrecht"; owner = "mengelbrecht";
repo = "lightline-bufferline"; repo = "lightline-bufferline";
rev = "510c8be3d78bb58f25976ff9e7415c8cdc2a3054"; rev = "936598633d19a2f171347494c3240e72da6db78a";
sha256 = "0bd44jkz07pdzzs1vh0lkkms1vw8cd96wlsh8sa37mkx8bk5js5n"; sha256 = "0j0swcbvhhy5gajl42z6g1dwr62b68l4c913fdfvdhjngq26wbyw";
}; };
meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/";
}; };
@ -2196,11 +2196,11 @@ let
lispdocs-nvim = buildVimPluginFrom2Nix { lispdocs-nvim = buildVimPluginFrom2Nix {
pname = "lispdocs-nvim"; pname = "lispdocs-nvim";
version = "2021-01-26"; version = "2021-01-27";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tami5"; owner = "tami5";
repo = "lispdocs.nvim"; repo = "lispdocs.nvim";
rev = "3c506bbffb2608f3671f0c41c28fb9f6626353d5"; rev = "0c45512ffabc6997f74c26b9c87d4b3cb021ab19";
sha256 = "0m4iscxwdglvlkxhzs9gzx1iqvnvgknqxgss5k00wr0nrax8q3pl"; sha256 = "0m4iscxwdglvlkxhzs9gzx1iqvnvgknqxgss5k00wr0nrax8q3pl";
}; };
meta.homepage = "https://github.com/tami5/lispdocs.nvim/"; meta.homepage = "https://github.com/tami5/lispdocs.nvim/";
@ -2232,24 +2232,24 @@ let
lspsaga-nvim = buildVimPluginFrom2Nix { lspsaga-nvim = buildVimPluginFrom2Nix {
pname = "lspsaga-nvim"; pname = "lspsaga-nvim";
version = "2021-01-28"; version = "2021-02-01";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "glepnir"; owner = "glepnir";
repo = "lspsaga.nvim"; repo = "lspsaga.nvim";
rev = "23320342240307163d50d96ed2509740db3b3684"; rev = "4235966fcc6fcbd3245af8be2a53fbe4c69ae435";
sha256 = "1pxld0gx5i6mzg367c1z3nag5pbqyf57syw88w64yjxxvn1h151h"; sha256 = "0sk3bv4ijrw8ac9icq4yi8vc5054hmxs7j42nirqp3la2qac6g0j";
}; };
meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; meta.homepage = "https://github.com/glepnir/lspsaga.nvim/";
}; };
lualine-nvim = buildVimPluginFrom2Nix { lualine-nvim = buildVimPluginFrom2Nix {
pname = "lualine-nvim"; pname = "lualine-nvim";
version = "2021-01-21"; version = "2021-01-31";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hoob3rt"; owner = "hoob3rt";
repo = "lualine.nvim"; repo = "lualine.nvim";
rev = "a2a9193296414aea13efa3a02fafb115f0226276"; rev = "8c09fc82283961169c37250f639117d729d038d5";
sha256 = "1n3c7zmpqv3xr750b7nbk1q08abhx2frhvbqhpd28vi2lf075bxa"; sha256 = "0k6pfns8cfjzy0rckmp249kk644y0nk8rfk4163xx3mi4p46741p";
}; };
meta.homepage = "https://github.com/hoob3rt/lualine.nvim/"; meta.homepage = "https://github.com/hoob3rt/lualine.nvim/";
}; };
@ -2626,6 +2626,18 @@ let
meta.homepage = "https://github.com/sbdchd/neoformat/"; meta.homepage = "https://github.com/sbdchd/neoformat/";
}; };
neogit = buildVimPluginFrom2Nix {
pname = "neogit";
version = "2021-01-25";
src = fetchFromGitHub {
owner = "TimUntersberger";
repo = "neogit";
rev = "f1ed542f846242e9cc052f43f730c1daf479dce6";
sha256 = "0xqy688h2kff2lp490qi9i7gmafy21bxx0dpq7j0bzy55ycw70q6";
};
meta.homepage = "https://github.com/TimUntersberger/neogit/";
};
neoinclude-vim = buildVimPluginFrom2Nix { neoinclude-vim = buildVimPluginFrom2Nix {
pname = "neoinclude-vim"; pname = "neoinclude-vim";
version = "2020-09-13"; version = "2020-09-13";
@ -2748,24 +2760,24 @@ let
nerdcommenter = buildVimPluginFrom2Nix { nerdcommenter = buildVimPluginFrom2Nix {
pname = "nerdcommenter"; pname = "nerdcommenter";
version = "2021-01-27"; version = "2021-01-31";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "preservim"; owner = "preservim";
repo = "nerdcommenter"; repo = "nerdcommenter";
rev = "2955d669dcb597dc9ced04cf1ee776983053b15e"; rev = "898de2de1bf78c16768a188f5b1a26f6e3252fd1";
sha256 = "1vkfyjbq8fn3p9wnw3s1l5fqs8lvjl5csbq5201djg2cihfddsm1"; sha256 = "0jm4a79fwvi9agh0bq3h0wnz6nis71p3v4a898dd74d224y36l8g";
}; };
meta.homepage = "https://github.com/preservim/nerdcommenter/"; meta.homepage = "https://github.com/preservim/nerdcommenter/";
}; };
nerdtree = buildVimPluginFrom2Nix { nerdtree = buildVimPluginFrom2Nix {
pname = "nerdtree"; pname = "nerdtree";
version = "2021-01-20"; version = "2021-01-31";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "preservim"; owner = "preservim";
repo = "nerdtree"; repo = "nerdtree";
rev = "b134f6518b902c7e0482ae770b804fd47c2d2426"; rev = "1b19089917cc3e0a81d3294fead2424c419d545c";
sha256 = "11gq7dcj8v6y1wlnyc6wfsh54qzd5am8lmjjk69jbbjsjzpb59xb"; sha256 = "0zm60spnz4nsn0g9zsdiapygr2nwnkrqcz0w2pr37sp9i91nxxvb";
}; };
meta.homepage = "https://github.com/preservim/nerdtree/"; meta.homepage = "https://github.com/preservim/nerdtree/";
}; };
@ -2868,12 +2880,12 @@ let
nvim-compe = buildVimPluginFrom2Nix { nvim-compe = buildVimPluginFrom2Nix {
pname = "nvim-compe"; pname = "nvim-compe";
version = "2021-01-28"; version = "2021-02-01";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hrsh7th"; owner = "hrsh7th";
repo = "nvim-compe"; repo = "nvim-compe";
rev = "c2247bceb2fba741800faaa98c0a7459c00e88da"; rev = "9dabee7364dfaf61091e80dc8574529e30ff7cc3";
sha256 = "0q6f0j36jjgxj5pnvgmkf3mm9yarw5a4cx2fhs4igd8hry8n6hw4"; sha256 = "0fr87v91p8smfdswm0f91ccna8awibnbx8240jdps17p6xr1ym55";
}; };
meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; meta.homepage = "https://github.com/hrsh7th/nvim-compe/";
}; };
@ -2904,12 +2916,12 @@ let
nvim-dap-virtual-text = buildVimPluginFrom2Nix { nvim-dap-virtual-text = buildVimPluginFrom2Nix {
pname = "nvim-dap-virtual-text"; pname = "nvim-dap-virtual-text";
version = "2021-01-25"; version = "2021-01-31";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "theHamsta"; owner = "theHamsta";
repo = "nvim-dap-virtual-text"; repo = "nvim-dap-virtual-text";
rev = "664482b6d1133e0a82d71db08965f8a07208c638"; rev = "3da747bbbaf3291838d984a26a423cc704794eca";
sha256 = "01nmpah4l99wv5kzm351qra8kacqdx77aplb4qqfmrmjzxgg6l5h"; sha256 = "1lmcjclvdhd4jq0lsgrzv7y7ry9yiqh6bsinwrla5fbh63rfwkzc";
}; };
meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/";
}; };
@ -2938,6 +2950,18 @@ let
meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
}; };
nvim-hlslens = buildVimPluginFrom2Nix {
pname = "nvim-hlslens";
version = "2021-01-21";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "nvim-hlslens";
rev = "492c61ccef4562687d319bba48f824426b4613d6";
sha256 = "1587mms2qr8n6igsln54vanpzhhm1s7mhrvr4iyszh47dlhjkvdi";
};
meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/";
};
nvim-hs-vim = buildVimPluginFrom2Nix { nvim-hs-vim = buildVimPluginFrom2Nix {
pname = "nvim-hs-vim"; pname = "nvim-hs-vim";
version = "2020-08-29"; version = "2020-08-29";
@ -2952,24 +2976,24 @@ let
nvim-jdtls = buildVimPluginFrom2Nix { nvim-jdtls = buildVimPluginFrom2Nix {
pname = "nvim-jdtls"; pname = "nvim-jdtls";
version = "2021-01-17"; version = "2021-01-30";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mfussenegger"; owner = "mfussenegger";
repo = "nvim-jdtls"; repo = "nvim-jdtls";
rev = "357d0b405235e3dfb0b15450f33ad6d10cbf2122"; rev = "a35ce80f0e618da0eceb0d5f6874608d58d3ec26";
sha256 = "1gd4kjxpb73d6ixxgg4qyzj5alca590whx1i905j3m8j4sjb7vib"; sha256 = "1m87v27721zdplpfk0dd8mag416dxmnqja2smwb7z29n18qh81sn";
}; };
meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
}; };
nvim-lspconfig = buildVimPluginFrom2Nix { nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig"; pname = "nvim-lspconfig";
version = "2021-01-27"; version = "2021-02-01";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "neovim"; owner = "neovim";
repo = "nvim-lspconfig"; repo = "nvim-lspconfig";
rev = "78a31c0ebc947c43a4bc349a0244fc8df3fbfa8c"; rev = "0fb71129de54577254a3ae143850d11b6902a279";
sha256 = "0p5wzq588mlbas2l3xli9v2fhvxp1y52297x510if8adl97pv67k"; sha256 = "0w5q4xwa22smgvfmba0j2k1bzihvvmqhpdlnjaap0g0jp69vcq99";
}; };
meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
}; };
@ -3024,12 +3048,12 @@ let
nvim-treesitter = buildVimPluginFrom2Nix { nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter"; pname = "nvim-treesitter";
version = "2021-01-27"; version = "2021-01-31";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-treesitter"; owner = "nvim-treesitter";
repo = "nvim-treesitter"; repo = "nvim-treesitter";
rev = "12181e236ee4e565f9746037793abe4ae65caf46"; rev = "a077f61b675367bddf00fda86d980125495b7dba";
sha256 = "0s9pdr142k5bsg6fp1pl15dcpmnafnncwg8rw4ix0c038dkgqwfn"; sha256 = "0scfa61cbswq1f4zmksasjih0vwb23wspwyz40k4crinxl1maxm7";
}; };
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
}; };
@ -3144,12 +3168,12 @@ let
one-nvim = buildVimPluginFrom2Nix { one-nvim = buildVimPluginFrom2Nix {
pname = "one-nvim"; pname = "one-nvim";
version = "2021-01-27"; version = "2021-01-30";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Th3Whit3Wolf"; owner = "Th3Whit3Wolf";
repo = "one-nvim"; repo = "one-nvim";
rev = "ad1e00ecb2623525e5b25adc984629fe02d5284a"; rev = "88916fbb81530a25f9a3f8bc02e1b4c91ff7be10";
sha256 = "1i2bvjvg60gw7jcafvwg2k63my7bshjlmx6by9xqh998s14db7vj"; sha256 = "0glp8z6v53sff7vff6h6cxix40zwp1m305jsd50ji1i4913m08lw";
}; };
meta.homepage = "https://github.com/Th3Whit3Wolf/one-nvim/"; meta.homepage = "https://github.com/Th3Whit3Wolf/one-nvim/";
}; };
@ -3168,12 +3192,12 @@ let
onehalf = buildVimPluginFrom2Nix { onehalf = buildVimPluginFrom2Nix {
pname = "onehalf"; pname = "onehalf";
version = "2021-01-15"; version = "2021-01-31";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sonph"; owner = "sonph";
repo = "onehalf"; repo = "onehalf";
rev = "ba6c71ee99dce0b505c430f2c2706dc5f97ad3a0"; rev = "141c775ace6b71992305f144a8ab68e9a8ca4a25";
sha256 = "10pbhaim4rcg0ljprfvqfw6k73jpp46yzhs8i9yn00bpi70frr89"; sha256 = "1p3kxf9abj0xpxwb8hrpy4h0457rvkfkv3zv7czh322vhma4hhd8";
}; };
meta.homepage = "https://github.com/sonph/onehalf/"; meta.homepage = "https://github.com/sonph/onehalf/";
}; };
@ -3204,12 +3228,12 @@ let
packer-nvim = buildVimPluginFrom2Nix { packer-nvim = buildVimPluginFrom2Nix {
pname = "packer-nvim"; pname = "packer-nvim";
version = "2021-01-27"; version = "2021-01-29";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wbthomason"; owner = "wbthomason";
repo = "packer.nvim"; repo = "packer.nvim";
rev = "41567d3535c70770e1b628d9ac9aedbf6350fc5b"; rev = "1d9eb05fb64b5b67a8599fce8687270949de87cb";
sha256 = "18szd5z101ji205lyqkf9hpbrqb7k32q89ckfydsizj1rnsgkq6d"; sha256 = "10169l3ysrqnrzzrkd1r2f0dcf2d1b97p3zxp21xanj98b9z4xjd";
}; };
meta.homepage = "https://github.com/wbthomason/packer.nvim/"; meta.homepage = "https://github.com/wbthomason/packer.nvim/";
}; };
@ -3300,12 +3324,12 @@ let
plenary-nvim = buildVimPluginFrom2Nix { plenary-nvim = buildVimPluginFrom2Nix {
pname = "plenary-nvim"; pname = "plenary-nvim";
version = "2021-01-25"; version = "2021-01-31";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-lua"; owner = "nvim-lua";
repo = "plenary.nvim"; repo = "plenary.nvim";
rev = "cf4537efbae62222d3cdd239b7105c8ed4361a14"; rev = "54ce65bc00d36c112b449db829ee36da9778f347";
sha256 = "0fg2jwqchyvhx52wavwk90i6dk9vf4i4xlbhz26g4a3pv7i5mhwj"; sha256 = "1h1z8daqycscdp1p1bmix1ifsgs725flly1pijn575ri6fd44n41";
}; };
meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
}; };
@ -3673,12 +3697,12 @@ let
sideways-vim = buildVimPluginFrom2Nix { sideways-vim = buildVimPluginFrom2Nix {
pname = "sideways-vim"; pname = "sideways-vim";
version = "2020-09-21"; version = "2021-01-31";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "AndrewRadev"; owner = "AndrewRadev";
repo = "sideways.vim"; repo = "sideways.vim";
rev = "19c5a21206b6c9f999004256a10e7381450ea83f"; rev = "6aae3517c612a96c59b5417984889bff388210b2";
sha256 = "14h8lf70wccafapifzf9c6cjprik9n1a1wmv5gpajyqqbvzh1yv6"; sha256 = "13d0jzzn7gr6c0zkpa5bkfp06246hbpfb6y7mmsw2waybw3hij9s";
}; };
meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/";
}; };
@ -3962,12 +3986,12 @@ let
tagbar = buildVimPluginFrom2Nix { tagbar = buildVimPluginFrom2Nix {
pname = "tagbar"; pname = "tagbar";
version = "2021-01-25"; version = "2021-02-01";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "preservim"; owner = "preservim";
repo = "tagbar"; repo = "tagbar";
rev = "7a968502d778ab86b01afd4c8b0d20f5af14fad0"; rev = "7e8aeb69709b73cdbdaf50f4d26ab45d7920b7f0";
sha256 = "1skszyhsbz4yv16nlrnhkdrrd51hpq1d2gn1h819m0vqgqz4qphn"; sha256 = "02mlr9aw4ppi4cs6r1v3d39j3l85sy7q2xm1dxg1ld6k1p5imk94";
}; };
meta.homepage = "https://github.com/preservim/tagbar/"; meta.homepage = "https://github.com/preservim/tagbar/";
}; };
@ -4010,12 +4034,12 @@ let
telescope-frecency-nvim = buildVimPluginFrom2Nix { telescope-frecency-nvim = buildVimPluginFrom2Nix {
pname = "telescope-frecency-nvim"; pname = "telescope-frecency-nvim";
version = "2021-01-26"; version = "2021-01-28";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-telescope"; owner = "nvim-telescope";
repo = "telescope-frecency.nvim"; repo = "telescope-frecency.nvim";
rev = "8b82406c94f587ebd900ec351a137322098bfc83"; rev = "7afdd3c32c222a359d6a906968dcbed5fbea2fb7";
sha256 = "0l5yz6kvpivlsg33h74hhc8axskq33wlkmlykak9wfxyq8ii4x6h"; sha256 = "0g8gb3agscp9g2dcmzqf77x2g7l4pm34k5s23laa7864jfjnpzvb";
}; };
meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/";
}; };
@ -4047,12 +4071,12 @@ let
telescope-nvim = buildVimPluginFrom2Nix { telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope-nvim"; pname = "telescope-nvim";
version = "2021-01-27"; version = "2021-01-31";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-telescope"; owner = "nvim-telescope";
repo = "telescope.nvim"; repo = "telescope.nvim";
rev = "5995a8be8faaa2c6e8693ca52f2320cb4a80e3fa"; rev = "ef3262f94ae95c8e91bcc79ff7ed149a420ba1b9";
sha256 = "0p06cl12gabr425xzn69smk8pwnqmkaj1qccy3zj1qvwymb03sxg"; sha256 = "17mkniwa1lic4clvfgw6hr823sir23nskb9kil06qakrwh7yakj7";
}; };
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
}; };
@ -4154,6 +4178,18 @@ let
meta.homepage = "https://github.com/markonm/traces.vim/"; meta.homepage = "https://github.com/markonm/traces.vim/";
}; };
train-nvim = buildVimPluginFrom2Nix {
pname = "train-nvim";
version = "2020-09-10";
src = fetchFromGitHub {
owner = "tjdevries";
repo = "train.nvim";
rev = "7b2e9a59af58385d88bf39c5311c08f839e2b1ce";
sha256 = "1pbv8c2wb6b2h9czx7c0c8v0q7v0wc4w9s6qgw7hcbqdl3jv1svh";
};
meta.homepage = "https://github.com/tjdevries/train.nvim/";
};
tslime-vim = buildVimPluginFrom2Nix { tslime-vim = buildVimPluginFrom2Nix {
pname = "tslime-vim"; pname = "tslime-vim";
version = "2020-09-09"; version = "2020-09-09";
@ -4216,12 +4252,12 @@ let
unicode-vim = buildVimPluginFrom2Nix { unicode-vim = buildVimPluginFrom2Nix {
pname = "unicode-vim"; pname = "unicode-vim";
version = "2020-11-19"; version = "2021-02-01";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "chrisbra"; owner = "chrisbra";
repo = "unicode.vim"; repo = "unicode.vim";
rev = "631c0850dd0fa36d29c9cd20169735a60b41bd71"; rev = "afb8db4f81580771c39967e89bc5772e72b9018e";
sha256 = "0ql1w6q8w48jxqf1fs1aphcjjfvh8br7sv26nk6kgsm9h4xamnp5"; sha256 = "05d15yr5r8265j3yr8yz1dxl8p4p4nack4ldn663rmp29wm1q5pi";
}; };
meta.homepage = "https://github.com/chrisbra/unicode.vim/"; meta.homepage = "https://github.com/chrisbra/unicode.vim/";
}; };
@ -4598,6 +4634,18 @@ let
meta.homepage = "https://github.com/osyo-manga/vim-anzu/"; meta.homepage = "https://github.com/osyo-manga/vim-anzu/";
}; };
vim-apm = buildVimPluginFrom2Nix {
pname = "vim-apm";
version = "2020-09-28";
src = fetchFromGitHub {
owner = "ThePrimeagen";
repo = "vim-apm";
rev = "2da35c35febbe98a6704495cd4e0b9526a0651e3";
sha256 = "09amrb7bzrnwga8cm21fm4ylp2l0jd7cyfsf43fcym3f1k0bycwb";
};
meta.homepage = "https://github.com/ThePrimeagen/vim-apm/";
};
vim-asterisk = buildVimPluginFrom2Nix { vim-asterisk = buildVimPluginFrom2Nix {
pname = "vim-asterisk"; pname = "vim-asterisk";
version = "2020-02-03"; version = "2020-02-03";
@ -4660,12 +4708,12 @@ let
vim-bazel = buildVimPluginFrom2Nix { vim-bazel = buildVimPluginFrom2Nix {
pname = "vim-bazel"; pname = "vim-bazel";
version = "2020-08-22"; version = "2021-01-31";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bazelbuild"; owner = "bazelbuild";
repo = "vim-bazel"; repo = "vim-bazel";
rev = "85a044d854e5e48f72414726c255112be31e2cac"; rev = "58c750d13ec2337ba3e5992f96891bbb843a9dbf";
sha256 = "1hcfbl958v39w00kyfg75rcxs9xzaqnd98i4y322ayqfgrhd95n8"; sha256 = "0xsgj1j8xamkri75cjnih5xzwp8y7g1i7hgbbbmknz5d8jm3p204";
}; };
meta.homepage = "https://github.com/bazelbuild/vim-bazel/"; meta.homepage = "https://github.com/bazelbuild/vim-bazel/";
}; };
@ -5296,12 +5344,12 @@ let
vim-erlang-tags = buildVimPluginFrom2Nix { vim-erlang-tags = buildVimPluginFrom2Nix {
pname = "vim-erlang-tags"; pname = "vim-erlang-tags";
version = "2021-01-09"; version = "2021-01-30";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vim-erlang"; owner = "vim-erlang";
repo = "vim-erlang-tags"; repo = "vim-erlang-tags";
rev = "22f7fbf1e4b669a305d93cedd85baf63253f3b78"; rev = "d9f2b8bd1f8478cce21084fde8b6b34f2564a54e";
sha256 = "1dvk0dim8vam8xsqlz9pjky22mhqi9ca5criyz7zvgj46hqj1wy3"; sha256 = "1w689p5ywf5ik074611ka5cd3iznmr87vpykp1y86k5628lcq2yh";
}; };
meta.homepage = "https://github.com/vim-erlang/vim-erlang-tags/"; meta.homepage = "https://github.com/vim-erlang/vim-erlang-tags/";
}; };
@ -5428,12 +5476,12 @@ let
vim-floaterm = buildVimPluginFrom2Nix { vim-floaterm = buildVimPluginFrom2Nix {
pname = "vim-floaterm"; pname = "vim-floaterm";
version = "2021-01-27"; version = "2021-02-01";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "voldikss"; owner = "voldikss";
repo = "vim-floaterm"; repo = "vim-floaterm";
rev = "5c3f06cbd323ffbae3cbc7ed86538293db35c0a5"; rev = "671f2aa87731ddeefe6573e4596c9f0d806e3b11";
sha256 = "0raz585m79pjw3y3kdqbnay7bz7dkgimb3a4x1khgxclidf10qv3"; sha256 = "1lla4wb3jrp14hbcb03va7ikigy05rncw30wy9zsq93hm2zazbsj";
}; };
meta.homepage = "https://github.com/voldikss/vim-floaterm/"; meta.homepage = "https://github.com/voldikss/vim-floaterm/";
}; };
@ -5728,12 +5776,12 @@ let
vim-hexokinase = buildVimPluginFrom2Nix { vim-hexokinase = buildVimPluginFrom2Nix {
pname = "vim-hexokinase"; pname = "vim-hexokinase";
version = "2021-01-25"; version = "2021-01-31";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "RRethy"; owner = "RRethy";
repo = "vim-hexokinase"; repo = "vim-hexokinase";
rev = "d2157749ed519661eb8605e1f19ca04b9cfa14cc"; rev = "9f7f4bad24f23d5284543a02349a5114e8b8f032";
sha256 = "0x33a6w1apmhncbp42m4mc7csjh1234k6d8zzk8pmk5csljhvsr7"; sha256 = "1i435avz23mclf1ag7v273xmpbgp66msvmi7mljkbs8k6xxygaks";
fetchSubmodules = true; fetchSubmodules = true;
}; };
meta.homepage = "https://github.com/RRethy/vim-hexokinase/"; meta.homepage = "https://github.com/RRethy/vim-hexokinase/";
@ -5861,12 +5909,12 @@ let
vim-illuminate = buildVimPluginFrom2Nix { vim-illuminate = buildVimPluginFrom2Nix {
pname = "vim-illuminate"; pname = "vim-illuminate";
version = "2021-01-25"; version = "2021-02-01";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "RRethy"; owner = "RRethy";
repo = "vim-illuminate"; repo = "vim-illuminate";
rev = "e763aabff734798599c40afef388c88cefbd2cba"; rev = "17cdf0311271b017e66c66c56c253b63db3a20d0";
sha256 = "1a59nbz9msjh8773rlpgvcxmljqnxnprb7f9xf6gj680wmfpcjc4"; sha256 = "1aivrwf7vhdsqcz4qbx3plqfw50myaphmidak1nb4zch1niqyypp";
}; };
meta.homepage = "https://github.com/RRethy/vim-illuminate/"; meta.homepage = "https://github.com/RRethy/vim-illuminate/";
}; };
@ -5957,12 +6005,12 @@ let
vim-javacomplete2 = buildVimPluginFrom2Nix { vim-javacomplete2 = buildVimPluginFrom2Nix {
pname = "vim-javacomplete2"; pname = "vim-javacomplete2";
version = "2021-01-04"; version = "2021-01-31";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "artur-shaik"; owner = "artur-shaik";
repo = "vim-javacomplete2"; repo = "vim-javacomplete2";
rev = "c59ac683bd2fd6164e8ab772ab16c1f4c82130a5"; rev = "fb39c1e6ab815270b9d1ba07f7d34059710b5035";
sha256 = "04mk200wbgg007qm3qxzckcz1nxrmvr6da31bf82ilzjf5vwhr52"; sha256 = "1n541shva0c7frihgv0ngg3vqm3d549wbqa15n2n6j1cfpsasbyd";
}; };
meta.homepage = "https://github.com/artur-shaik/vim-javacomplete2/"; meta.homepage = "https://github.com/artur-shaik/vim-javacomplete2/";
}; };
@ -6331,12 +6379,12 @@ let
vim-matchup = buildVimPluginFrom2Nix { vim-matchup = buildVimPluginFrom2Nix {
pname = "vim-matchup"; pname = "vim-matchup";
version = "2021-01-13"; version = "2021-01-29";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "andymass"; owner = "andymass";
repo = "vim-matchup"; repo = "vim-matchup";
rev = "c74467ea130f99bc97697f91b0e5369f958e6333"; rev = "52b3ec1ee8d0f78c69bae6cc32f3c2d1a023a8c8";
sha256 = "0w03l0iri8wsjm3fz3ysqqhl38gkfqci4b3dfkbshy2civpg2g7j"; sha256 = "1hn3w4hzx444cz5z7g2lkpzr90r9ngjpy5jirgs3c947njc24kr7";
}; };
meta.homepage = "https://github.com/andymass/vim-matchup/"; meta.homepage = "https://github.com/andymass/vim-matchup/";
}; };
@ -6655,12 +6703,12 @@ let
vim-oscyank = buildVimPluginFrom2Nix { vim-oscyank = buildVimPluginFrom2Nix {
pname = "vim-oscyank"; pname = "vim-oscyank";
version = "2021-01-17"; version = "2021-01-29";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ojroques"; owner = "ojroques";
repo = "vim-oscyank"; repo = "vim-oscyank";
rev = "a70de0f7830ff7238d122908583faf50d73a9f26"; rev = "4980c987647523defbc20b3377993d34526f3911";
sha256 = "0q00wqv4kbnwmnkawp4hm7mvk8p82mr4v5kf0m791gm7yy8gvb7x"; sha256 = "089gp0abfqipz8rrh5jdcgrzg1a65cxchq1cadkxncmb8vcymh0r";
}; };
meta.homepage = "https://github.com/ojroques/vim-oscyank/"; meta.homepage = "https://github.com/ojroques/vim-oscyank/";
}; };
@ -6955,12 +7003,12 @@ let
vim-puppet = buildVimPluginFrom2Nix { vim-puppet = buildVimPluginFrom2Nix {
pname = "vim-puppet"; pname = "vim-puppet";
version = "2021-01-26"; version = "2021-01-30";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rodjek"; owner = "rodjek";
repo = "vim-puppet"; repo = "vim-puppet";
rev = "8f588076dd026d029bb07c59fbbe8c11271d10a4"; rev = "b282072eb145c7719319bee1963c33ad876b0cea";
sha256 = "086vd56vh82bgka0j81fbj8lkb5fcr79z281m98cwz8lij9vnp5g"; sha256 = "1m6zbyg5hh3rhwq36836ldwhgcsmh4bl0lz5g4nzpc2ch83crrn8";
}; };
meta.homepage = "https://github.com/rodjek/vim-puppet/"; meta.homepage = "https://github.com/rodjek/vim-puppet/";
}; };
@ -7351,12 +7399,12 @@ let
vim-snippets = buildVimPluginFrom2Nix { vim-snippets = buildVimPluginFrom2Nix {
pname = "vim-snippets"; pname = "vim-snippets";
version = "2021-01-20"; version = "2021-01-30";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "honza"; owner = "honza";
repo = "vim-snippets"; repo = "vim-snippets";
rev = "d6f2d5728002456fac0075c2442695d25167f8d9"; rev = "adff0bf675e17d5b94ec7d10b5cd8a0dd74a61b0";
sha256 = "007jb9xmq5cz1lc79s8x1idknjfbzmikss0wmrfjqq5dbkibvv9s"; sha256 = "0yvk6d147rvp8gwsbls39dp3qblmkk0wz5prrx3k5j3dlh5l7fcp";
}; };
meta.homepage = "https://github.com/honza/vim-snippets/"; meta.homepage = "https://github.com/honza/vim-snippets/";
}; };
@ -7568,12 +7616,12 @@ let
vim-test = buildVimPluginFrom2Nix { vim-test = buildVimPluginFrom2Nix {
pname = "vim-test"; pname = "vim-test";
version = "2021-01-03"; version = "2021-01-28";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vim-test"; owner = "vim-test";
repo = "vim-test"; repo = "vim-test";
rev = "d170b48bd167ff06ac83d71834135f42bf4dad4a"; rev = "77d0b89fe5648d0881e8506d1949a9412201772b";
sha256 = "0pqh5zqn11fv0653zdkiad066clw29amhdqnm5nz1rcx8vmpparq"; sha256 = "14ny5gap1bij5fdwnxgwjpmjnw0xpydnjvvsf6525hbipxp258fr";
}; };
meta.homepage = "https://github.com/vim-test/vim-test/"; meta.homepage = "https://github.com/vim-test/vim-test/";
}; };
@ -7832,12 +7880,12 @@ let
vim-visual-multi = buildVimPluginFrom2Nix { vim-visual-multi = buildVimPluginFrom2Nix {
pname = "vim-visual-multi"; pname = "vim-visual-multi";
version = "2021-01-27"; version = "2021-01-29";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mg979"; owner = "mg979";
repo = "vim-visual-multi"; repo = "vim-visual-multi";
rev = "dbf8ab3ca9d16326ad4f1b3f154de78303299f4b"; rev = "4ca5978e327a8bc021ffd28fd2328ca8ce353305";
sha256 = "1j612450iip6vfr525nfp6arpb763j5ykjwqixs3b11jfnga268q"; sha256 = "1a2p5ij2gpkcn5jjwg6bna9gxmrdpg49ch6c52grzwzyw2lz2fjw";
}; };
meta.homepage = "https://github.com/mg979/vim-visual-multi/"; meta.homepage = "https://github.com/mg979/vim-visual-multi/";
}; };
@ -7856,12 +7904,12 @@ let
vim-vsnip = buildVimPluginFrom2Nix { vim-vsnip = buildVimPluginFrom2Nix {
pname = "vim-vsnip"; pname = "vim-vsnip";
version = "2021-01-28"; version = "2021-01-29";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hrsh7th"; owner = "hrsh7th";
repo = "vim-vsnip"; repo = "vim-vsnip";
rev = "c4f374de5f1a0a90db432ae19eb6361d336f656c"; rev = "3e79f6333c045c39588293664cc77f89d18a62e8";
sha256 = "04znlii5b92fdr8vcxsh1lnnljcljmvn94k0wijn5k4yh2vf6dm7"; sha256 = "053vp6mnj2daipfwy68168iadvng7w0xj1rg1mfsp83dws3x6g8y";
}; };
meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/";
}; };
@ -8133,12 +8181,12 @@ let
vimtex = buildVimPluginFrom2Nix { vimtex = buildVimPluginFrom2Nix {
pname = "vimtex"; pname = "vimtex";
version = "2021-01-25"; version = "2021-01-31";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lervag"; owner = "lervag";
repo = "vimtex"; repo = "vimtex";
rev = "b2e93e1ab44099d3344f81f22dfa0851444ac824"; rev = "fae465c4f2d219b7794caacbcd5bd2c06fc17e97";
sha256 = "19c4y4r8j8hvbwwqqj5f84p3i2ys21a7bdizffrpz05ds3zigwyi"; sha256 = "1lgsyjgpz4np74qp8xsmazp0rdsgprajms6nbgcsb7shn4ymc5rg";
}; };
meta.homepage = "https://github.com/lervag/vimtex/"; meta.homepage = "https://github.com/lervag/vimtex/";
}; };

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

@ -11,8 +11,8 @@ alx741/vim-stylishask
amiorin/ctrlp-z amiorin/ctrlp-z
andrep/vimacs andrep/vimacs
andreshazard/vim-logreview andreshazard/vim-logreview
AndrewRadev/sideways.vim AndrewRadev/sideways.vim@main
AndrewRadev/splitjoin.vim AndrewRadev/splitjoin.vim@main
andsild/peskcolor.vim andsild/peskcolor.vim
andviro/flake8-vim andviro/flake8-vim
andymass/vim-matchup andymass/vim-matchup
@ -258,6 +258,7 @@ kchmck/vim-coffee-script
KeitaNakamura/neodark.vim KeitaNakamura/neodark.vim
keith/investigate.vim keith/investigate.vim
keith/swift.vim keith/swift.vim
kevinhwang91/nvim-hlslens@main
kien/rainbow_parentheses.vim kien/rainbow_parentheses.vim
knubie/vim-kitty-navigator knubie/vim-kitty-navigator
konfekt/fastfold konfekt/fastfold
@ -552,6 +553,7 @@ terryma/vim-multiple-cursors
tex/vimpreviewpandoc tex/vimpreviewpandoc
Th3Whit3Wolf/one-nvim@main Th3Whit3Wolf/one-nvim@main
theHamsta/nvim-dap-virtual-text theHamsta/nvim-dap-virtual-text
ThePrimeagen/vim-apm
thinca/vim-ft-diff_fold thinca/vim-ft-diff_fold
thinca/vim-prettyprint thinca/vim-prettyprint
thinca/vim-quickrun thinca/vim-quickrun
@ -562,7 +564,9 @@ thirtythreeforty/lessspace.vim
thosakwe/vim-flutter thosakwe/vim-flutter
tiagofumo/vim-nerdtree-syntax-highlight tiagofumo/vim-nerdtree-syntax-highlight
tikhomirov/vim-glsl tikhomirov/vim-glsl
TimUntersberger/neogit
tjdevries/nlua.nvim tjdevries/nlua.nvim
tjdevries/train.nvim
tmhedberg/SimpylFold tmhedberg/SimpylFold
tmsvg/pear-tree tmsvg/pear-tree
tmux-plugins/vim-tmux tmux-plugins/vim-tmux

2
pkgs/os-specific/linux/linuxptp/default.nix
View File

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
description = "Implementation of the Precision Time Protocol (PTP) according to IEEE standard 1588 for Linux"; description = "Implementation of the Precision Time Protocol (PTP) according to IEEE standard 1588 for Linux";
homepage = "http://linuxptp.sourceforge.net/"; homepage = "http://linuxptp.sourceforge.net/";
maintainers = [ maintainers.markuskowa ]; maintainers = [ maintainers.markuskowa ];
license = licenses.gpl2; license = licenses.gpl2Only;
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

2
pkgs/servers/computing/slurm-spank-x11/default.nix
View File

@ -30,7 +30,7 @@ stdenv.mkDerivation {
homepage = "https://github.com/hautreux/slurm-spank-x11"; homepage = "https://github.com/hautreux/slurm-spank-x11";
description = "Plugin for SLURM to allow for interactive X11 sessions"; description = "Plugin for SLURM to allow for interactive X11 sessions";
platforms = platforms.linux; platforms = platforms.linux;
license = licenses.gpl3; license = licenses.gpl3Only;
maintainers = with maintainers; [ markuskowa ]; maintainers = with maintainers; [ markuskowa ];
}; };
} }

2
pkgs/servers/computing/slurm/default.nix
View File

@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
homepage = "http://www.schedmd.com/"; homepage = "http://www.schedmd.com/";
description = "Simple Linux Utility for Resource Management"; description = "Simple Linux Utility for Resource Management";
platforms = platforms.linux; platforms = platforms.linux;
license = licenses.gpl2; license = licenses.gpl2Only;
maintainers = with maintainers; [ jagajaga markuskowa ]; maintainers = with maintainers; [ jagajaga markuskowa ];
}; };
} }

5
pkgs/servers/sql/mariadb/galera/default.nix
View File

@ -10,13 +10,13 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "mariadb-galera"; pname = "mariadb-galera";
version = "26.4.5"; version = "26.4.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "codership"; owner = "codership";
repo = "galera"; repo = "galera";
rev = "release_${version}"; rev = "release_${version}";
sha256 = "10sir0hxxglw9jsjrclfgrqm8n5zng6rwj2fgff141x9n9l55w7l"; sha256 = "0h7s670pcasq8wzprhyxqfca2cghi62b8xz2kikb2a86wd453qil";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -47,7 +47,6 @@ in stdenv.mkDerivation rec {
install -m 444 "scripts/packages/freebsd/LICENSE" "$out/$GALERA_LICENSE_DIR" install -m 444 "scripts/packages/freebsd/LICENSE" "$out/$GALERA_LICENSE_DIR"
install -m 444 "LICENSE" "$out/$GALERA_LICENSE_DIR/GPLv2" install -m 444 "LICENSE" "$out/$GALERA_LICENSE_DIR/GPLv2"
install -m 444 "asio/LICENSE_1_0.txt" "$out/$GALERA_LICENSE_DIR/LICENSE.asio" install -m 444 "asio/LICENSE_1_0.txt" "$out/$GALERA_LICENSE_DIR/LICENSE.asio"
install -m 444 "www.evanjones.ca/LICENSE" "$out/$GALERA_LICENSE_DIR/LICENSE.crc32c"
''; '';
meta = with lib; { meta = with lib; {

14
pkgs/servers/teleport/default.nix
View File

@ -4,21 +4,21 @@ let
webassets = fetchFromGitHub { webassets = fetchFromGitHub {
owner = "gravitational"; owner = "gravitational";
repo = "webassets"; repo = "webassets";
rev = "eb98cd28e34144c6473b79743066d1c63c6427ab"; rev = "2d79788dbcd005bdcfe5b5120007d0faf8f1fc82";
sha256 = "001a3bx8yyx1hq8y5yiy1jzp122q8gcl369lj0609gaxp6dk5bdw"; sha256 = "001a3bx8yyx1hq8y5yiy1jzp122q8gcl369lj0609gaxp6dk5bdw";
}; };
in in
buildGoPackage rec { buildGoPackage rec {
pname = "teleport"; pname = "teleport";
version = "5.1.0"; version = "5.1.2";
# This repo has a private submodule "e" which fetchgit cannot handle without failing. # This repo has a private submodule "e" which fetchgit cannot handle without failing.
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gravitational"; owner = "gravitational";
repo = "teleport"; repo = "teleport";
rev = "v${version}"; rev = "v${version}";
sha256 = "0jkr4max6mcn8k5nhlg71byb0yzr9kplpl1q96pdk2gbvkh7q6xb"; sha256 = "0h1hn2dpdsmhxac06gn6787z2mnfcwb3wn0c2l7l2qhw6iqpgmvh";
}; };
goPackagePath = "github.com/gravitational/teleport"; goPackagePath = "github.com/gravitational/teleport";
@ -43,6 +43,14 @@ buildGoPackage rec {
dontStrip = true; dontStrip = true;
doInstallCheck = true;
installCheckPhase = ''
$out/bin/tsh version | grep ${version} > /dev/null
$out/bin/tctl version | grep ${version} > /dev/null
$out/bin/teleport version | grep ${version} > /dev/null
'';
meta = { meta = {
description = "A SSH CA management suite"; description = "A SSH CA management suite";
homepage = "https://gravitational.com/teleport/"; homepage = "https://gravitational.com/teleport/";

6
pkgs/shells/fish/babelfish.nix
View File

@ -1,16 +1,16 @@
{ lib, buildGoModule, fetchFromGitHub }: { lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec { buildGoModule rec {
pname = "babelfish"; pname = "babelfish";
version = "1.0.1"; version = "1.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bouk"; owner = "bouk";
repo = "babelfish"; repo = "babelfish";
rev = "v${version}"; rev = "v${version}";
sha256 = "1sr6y79igyfc9ia33nyrjjm4my1jrpcw27iks37kygh93npsb3r1"; sha256 = "0b1knj9llwzwnl4w3d6akvlc57dp0fszjkq98w8wybcvkbpd3ip1";
}; };
vendorSha256 = "0xjy50wciw329kq1nkd7hhaipcp4fy28hhk6cdq21qwid6g21gag"; vendorSha256 = "0kspqwbgiqfkfj9a9pdwzc0jdi9p35abqqqjhcpvqwdxw378w5lz";
meta = with lib; { meta = with lib; {
description = "Translate bash scripts to fish"; description = "Translate bash scripts to fish";

4
pkgs/tools/audio/mpris-scrobbler/default.nix
View File

@ -10,7 +10,7 @@
, pkg-config , pkg-config
, scdoc , scdoc
, json_c , json_c
, xdg_utils , xdg-utils
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
postPatch = '' postPatch = ''
substituteInPlace src/signon.c \ substituteInPlace src/signon.c \
--replace "/usr/bin/xdg-open" "${xdg_utils}/bin/xdg-open" --replace "/usr/bin/xdg-open" "${xdg-utils}/bin/xdg-open"
''; '';
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/tools/bluetooth/blueman/default.nix
View File

@ -1,11 +1,11 @@
{ config, stdenv, lib, fetchurl, intltool, pkg-config, python3Packages, bluez, gtk3 { config, stdenv, lib, fetchurl, intltool, pkg-config, python3Packages, bluez, gtk3
, obex_data_server, xdg_utils, dnsmasq, dhcp, libappindicator, iproute , obex_data_server, xdg-utils, dnsmasq, dhcp, libappindicator, iproute
, gnome3, librsvg, wrapGAppsHook, gobject-introspection, autoreconfHook , gnome3, librsvg, wrapGAppsHook, gobject-introspection, autoreconfHook
, networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio, fetchpatch }: , networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio, fetchpatch }:
let let
pythonPackages = python3Packages; pythonPackages = python3Packages;
binPath = lib.makeBinPath [ xdg_utils dnsmasq dhcp iproute ]; binPath = lib.makeBinPath [ xdg-utils dnsmasq dhcp iproute ];
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "blueman"; pname = "blueman";

32
pkgs/tools/misc/hddtemp/default.nix
View File

@ -1,32 +1,38 @@
{ lib, stdenv, fetchurl }: { lib, stdenv, fetchurl }:
let
stdenv.mkDerivation { db = fetchurl {
name = "hddtemp-0.3_beta15";
db = fetchurl{
url = "mirror://savannah/hddtemp/hddtemp.db"; url = "mirror://savannah/hddtemp/hddtemp.db";
sha256 = "1fr6qgns6qv7cr40lic5yqwkkc7yjmmgx8j0z6d93csg3smzhhya"; sha256 = "1fr6qgns6qv7cr40lic5yqwkkc7yjmmgx8j0z6d93csg3smzhhya";
}; };
in
stdenv.mkDerivation rec {
pname = "hddtemp";
version = "0.3-beta15";
src = fetchurl { src = fetchurl {
url = "mirror://savannah/hddtemp/hddtemp-0.3-beta15.tar.bz2"; url = "mirror://savannah/hddtemp/hddtemp-${version}.tar.bz2";
sha256 = "0nzgg4nl8zm9023wp4dg007z6x3ir60rwbcapr9ks2al81c431b1"; sha256 = "sha256-YYVBWEBUCT1TvootnoHJcXTzDwCvkcuHAKl+RC1571s=";
}; };
# from Gentoo # from Gentoo
patches = [ ./byteswap.patch ./dontwake.patch ./execinfo.patch ./satacmds.patch ]; patches = [ ./byteswap.patch ./dontwake.patch ./execinfo.patch ./satacmds.patch ];
configurePhase = configureFlags = [
'' "--with-db-path=${placeholder "out"}/share/${pname}/hddtemp.db"
mkdir -p $out/nix-support ];
cp $db $out/nix-support/hddtemp.db
./configure --prefix=$out --with-db-path=$out/nix-support/hddtemp.db postInstall = ''
''; install -Dm444 ${db} $out/share/${pname}/hddtemp.db
'';
enableParallelBuilding = true;
meta = with lib; { meta = with lib; {
description = "Tool for displaying hard disk temperature"; description = "Tool for displaying hard disk temperature";
homepage = "https://savannah.nongnu.org/projects/hddtemp/"; homepage = "https://savannah.nongnu.org/projects/hddtemp/";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

2
pkgs/tools/misc/snapper/default.nix
View File

@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Tool for Linux filesystem snapshot management"; description = "Tool for Linux filesystem snapshot management";
homepage = "http://snapper.io"; homepage = "http://snapper.io";
license = licenses.gpl2; license = licenses.gpl2Only;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ tstrobel markuskowa ]; maintainers = with maintainers; [ tstrobel markuskowa ];
}; };

13
pkgs/tools/misc/wimboot/default.nix
View File

@ -14,12 +14,17 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-Wno-address-of-packed-member"; # Fails on gcc9 NIX_CFLAGS_COMPILE = "-Wno-address-of-packed-member"; # Fails on gcc9
patches = [ patches = [
# Fix for newer binutils # Fixes for newer binutils
# Add R_X86_64_PLT32 as known reloc target
(fetchpatch { (fetchpatch {
url = url = "https://github.com/ipxe/wimboot/commit/91be50c17d4d9f463109d5baafd70f9fdadd86db.patch";
"https://github.com/ipxe/wimboot/commit/91be50c17d4d9f463109d5baafd70f9fdadd86db.patch";
sha256 = "113448n49hmk8nz1dxbhxiciwl281zwalvb8z5p9xfnjvibj8274"; sha256 = "113448n49hmk8nz1dxbhxiciwl281zwalvb8z5p9xfnjvibj8274";
}) })
# Fix building with binutils 2.34 (bfd_get_section_* removed in favour of bfd_section_*)
(fetchpatch {
url = "https://github.com/ipxe/wimboot/commit/2f97e681703d30b33a4d5032a8025ab8b9f2de75.patch";
sha256 = "0476mp74jaq3k099b654al6yi2yhgn37d9biz0wv3ln2q1gy94yf";
})
]; ];
# We cannot use sourceRoot because the patch wouldn't apply # We cannot use sourceRoot because the patch wouldn't apply
@ -40,7 +45,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
homepage = "https://ipxe.org/wimboot"; homepage = "https://ipxe.org/wimboot";
description = "Windows Imaging Format bootloader"; description = "Windows Imaging Format bootloader";
license = licenses.gpl2; license = licenses.gpl2Plus;
maintainers = with maintainers; [ das_j ajs124 ]; maintainers = with maintainers; [ das_j ajs124 ];
platforms = platforms.x86; # Fails on aarch64 platforms = platforms.x86; # Fails on aarch64
}; };

2
pkgs/tools/networking/chisel/default.nix
View File

@ -17,6 +17,8 @@ buildGoModule rec {
vendorSha256 = "sha256-GzsQ6LXxe9UQc13XbsYFOWPe0EzlyHechchKc6xDkAc="; vendorSha256 = "sha256-GzsQ6LXxe9UQc13XbsYFOWPe0EzlyHechchKc6xDkAc=";
buildFlagsArray = [ "-ldflags=-s -w -X github.com/jpillora/chisel/share.BuildVersion=${version}" ];
# tests require access to the network # tests require access to the network
doCheck = false; doCheck = false;

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