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

Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-01-22 01:17:55 +00:00 committed by GitHub
parent 7694c8cb5a fd0daed2e8
commit b30eaaf6b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
35 changed files with 209 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.editorconfig
View File

@ -55,11 +55,6 @@ trim_trailing_whitespace = unset
[*.lock] [*.lock]
indent_size = unset indent_size = unset
[deps.nix]
insert_final_newline = unset
[pkgs/tools/networking/dd-agent/*-deps.nix]
insert_final_newline = unset
[eggs.nix] [eggs.nix]
trim_trailing_whitespace = unset trim_trailing_whitespace = unset

2
lib/modules.nix
View File

@ -895,7 +895,7 @@ rec {
fromOpt = getAttrFromPath from options; fromOpt = getAttrFromPath from options;
toOf = attrByPath to toOf = attrByPath to
(abort "Renaming error: option `${showOption to}' does not exist."); (abort "Renaming error: option `${showOption to}' does not exist.");
toType = let opt = attrByPath to {} options; in opt.type or null; toType = let opt = attrByPath to {} options; in opt.type or (types.submodule {});
in in
{ {
options = setAttrByPath from (mkOption { options = setAttrByPath from (mkOption {

50
nixos/modules/services/desktops/gnome3/evolution-data-server.nix
View File

@ -15,31 +15,45 @@ with lib;
options = { options = {
services.gnome3.evolution-data-server = { services.gnome3.evolution-data-server = {
enable = mkEnableOption "Evolution Data Server, a collection of services for storing addressbooks and calendars.";
enable = mkOption { plugins = mkOption {
type = types.bool; type = types.listOf types.package;
default = false; default = [ ];
description = '' description = "Plugins for Evolution Data Server.";
Whether to enable Evolution Data Server, a collection of services for };
storing addressbooks and calendars. };
''; programs.evolution = {
enable = mkEnableOption "Evolution, a Personal information management application that provides integrated mail, calendaring and address book functionality.";
plugins = mkOption {
type = types.listOf types.package;
default = [ ];
example = literalExample "[ pkgs.evolution-ews ]";
description = "Plugins for Evolution.";
}; };
}; };
}; };
###### implementation ###### implementation
config = mkIf config.services.gnome3.evolution-data-server.enable { config =
let
bundle = pkgs.evolutionWithPlugins.override { inherit (config.services.gnome3.evolution-data-server) plugins; };
in
mkMerge [
(mkIf config.services.gnome3.evolution-data-server.enable {
environment.systemPackages = [ bundle ];
environment.systemPackages = [ pkgs.gnome3.evolution-data-server ]; services.dbus.packages = [ bundle ];
services.dbus.packages = [ pkgs.gnome3.evolution-data-server ];
systemd.packages = [ pkgs.gnome3.evolution-data-server ];
};
systemd.packages = [ bundle ];
})
(mkIf config.programs.evolution.enable {
services.gnome3.evolution-data-server = {
enable = true;
plugins = [ pkgs.evolution ] ++ config.programs.evolution.plugins;
};
services.gnome3.gnome-keyring.enable = true;
})
];
} }

10
nixos/tests/slurm.nix
View File

@ -109,12 +109,12 @@ in {
ensurePermissions = { "slurm_acct_db.*" = "ALL PRIVILEGES"; }; ensurePermissions = { "slurm_acct_db.*" = "ALL PRIVILEGES"; };
name = "slurm"; name = "slurm";
}]; }];
extraOptions = '' settings.mysqld = {
# recommendations from: https://slurm.schedmd.com/accounting.html#mysql-configuration # recommendations from: https://slurm.schedmd.com/accounting.html#mysql-configuration
innodb_buffer_pool_size=1024M innodb_buffer_pool_size="1024M";
innodb_log_file_size=64M innodb_log_file_size="64M";
innodb_lock_wait_timeout=900 innodb_lock_wait_timeout=900;
''; };
}; };
}; };

3
pkgs/applications/misc/almanah/default.nix
View File

@ -4,6 +4,7 @@
, cairo , cairo
, desktop-file-utils , desktop-file-utils
, evolution-data-server , evolution-data-server
, evolution
, gcr , gcr
, gettext , gettext
, glib , glib
@ -48,7 +49,7 @@ stdenv.mkDerivation rec {
evolution-data-server evolution-data-server
gcr gcr
glib glib
gnome3.evolution evolution
gpgme gpgme
gtk3 gtk3
gtksourceview3 gtksourceview3

2
pkgs/applications/networking/browsers/browsh/deps.nix generated
View File

@ -261,4 +261,4 @@
sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
}; };
} }
] ]

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

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, gnome3, cmake, gettext, intltool, pkg-config, evolution-data-server { lib, stdenv, fetchurl, gnome3, cmake, gettext, intltool, pkg-config, evolution-data-server, evolution
, sqlite, gtk3, webkitgtk, libgdata, libmspack }: , sqlite, gtk3, webkitgtk, libgdata, libmspack }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake gettext intltool pkg-config ]; nativeBuildInputs = [ cmake gettext intltool pkg-config ];
buildInputs = [ buildInputs = [
evolution-data-server gnome3.evolution evolution-data-server evolution
sqlite libgdata sqlite libgdata
gtk3 webkitgtk gtk3 webkitgtk
libmspack libmspack

10
pkgs/desktops/gnome-3/apps/evolution/default.nix → pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
View File

@ -12,8 +12,6 @@
, libnotify , libnotify
, gspell , gspell
, evolution-data-server , evolution-data-server
, adwaita-icon-theme
, gnome-desktop
, libgdata , libgdata
, libgweather , libgweather
, glib-networking , glib-networking
@ -61,7 +59,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
adwaita-icon-theme gnome3.adwaita-icon-theme
bogofilter bogofilter
db db
evolution-data-server evolution-data-server
@ -69,7 +67,7 @@ stdenv.mkDerivation rec {
gdk-pixbuf gdk-pixbuf
glib glib
glib-networking glib-networking
gnome-desktop gnome3.gnome-desktop
gsettings-desktop-schemas gsettings-desktop-schemas
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-base
gst_all_1.gstreamer gst_all_1.gstreamer
@ -115,6 +113,10 @@ stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
patches = [
./moduledir_from_env.patch
];
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {
packageName = "evolution"; packageName = "evolution";

21
pkgs/applications/networking/mailreaders/evolution/evolution/moduledir_from_env.patch Normal file
View File

@ -0,0 +1,21 @@
diff --git a/src/shell/main.c b/src/shell/main.c
index 5d089225ca..030908d684 100644
--- a/src/shell/main.c
+++ b/src/shell/main.c
@@ -407,7 +407,15 @@ create_default_shell (void)
}
/* Load all shared library modules. */
- module_types = e_module_load_all_in_directory (EVOLUTION_MODULEDIR);
+ const gchar *modules_directory = EVOLUTION_MODULEDIR;
+ const gchar *modules_directory_env;
+
+ modules_directory_env = g_getenv ("EVOLUTION_MODULEDIR");
+ if (modules_directory_env &&
+ g_file_test (modules_directory_env, G_FILE_TEST_IS_DIR))
+ modules_directory = g_strdup (modules_directory_env);
+
+ module_types = e_module_load_all_in_directory (modules_directory);
g_list_free_full (module_types, (GDestroyNotify) g_type_module_unuse);
flags = G_APPLICATION_HANDLES_OPEN |

41
pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix Normal file
View File

@ -0,0 +1,41 @@
{ lib, makeWrapper, symlinkJoin, gnome3, plugins }:
symlinkJoin {
name = "evolution-with-plugins";
paths = [ gnome3.evolution-data-server ] ++ plugins;
buildInputs = [ makeWrapper ];
postBuild = ''
for i in $out/bin/* $out/libexec/**; do
if [ ! -d $i ]; then
echo wrapping $i
wrapProgram $i \
--set LD_LIBRARY_PATH "$out/lib" \
--set EDS_ADDRESS_BOOK_MODULES "$out/lib/evolution-data-server/addressbook-backends/" \
--set EDS_CALENDAR_MODULES "$out/lib/evolution-data-server/calendar-backends/" \
--set EDS_CAMEL_PROVIDER_DIR "$out/lib/evolution-data-server/camel-providers/" \
--set EDS_REGISTRY_MODULES "$out/lib/evolution-data-server/registry-modules/" \
--set EVOLUTION_MODULEDIR "$out/lib/evolution/modules"
fi
done
fixSymlink () {
local link=$1
local target=$(readlink $link);
local newtarget=$(sed "s@/nix/store/[^/]*/@$out/@" <<< "$target")
if [[ $target != $newtarget ]] && [[ -d $newtarget ]]; then
echo fixing link to point to $newtarget instead of $target
rm $link
ln -s $newtarget $link
fi
}
fixSymlink $out/share/dbus-1/service
fixSymlink $out/lib/systemd/user
for i in $out/share/dbus-1/services/*.service $out/lib/systemd/user/*.service; do
echo fixing service file $i to point to $out
sed -i "s@/nix/store/[^/]*/@$out/@" $i
done
'';
}

6
pkgs/applications/version-management/git-and-tools/gh/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "gh"; pname = "gh";
version = "1.4.0"; version = "1.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cli"; owner = "cli";
repo = "cli"; repo = "cli";
rev = "v${version}"; rev = "v${version}";
sha256 = "08gxx9dwk24r1c5jkc9mqzcicxqmrdw0bi94nr517hk5cqsav2sl"; sha256 = "1f23b8bn867b4zihz8m91xmkclcw1jnqkwi06klhm5576akahigq";
}; };
vendorSha256 = "1ih7z883pffb6hnx51h8823d95b52d6dy1gk6ln7j25fqhcfvsy8"; vendorSha256 = "00adc0xjrkjrjh0gxk55vhpgxb5x0j5ialzrdvhlrvhpnb44qrcq";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

2
pkgs/desktops/gnome-3/default.nix
View File

@ -158,8 +158,6 @@ lib.makeScope pkgs.newScope (self: with self; {
cheese = callPackage ./apps/cheese { }; cheese = callPackage ./apps/cheese { };
evolution = callPackage ./apps/evolution { };
file-roller = callPackage ./apps/file-roller { }; file-roller = callPackage ./apps/file-roller { };
gedit = callPackage ./apps/gedit { }; gedit = callPackage ./apps/gedit { };

6
pkgs/development/compilers/ocaml/4.12.nix
View File

@ -1,9 +1,9 @@
import ./generic.nix { import ./generic.nix {
major_version = "4"; major_version = "4";
minor_version = "12"; minor_version = "12";
patch_version = "0-alpha3"; patch_version = "0-beta1";
src = fetchTarball { src = fetchTarball {
url = "http://caml.inria.fr/pub/distrib/ocaml-4.12/ocaml-4.12.0~alpha3.tar.xz"; url = "http://caml.inria.fr/pub/distrib/ocaml-4.12/ocaml-4.12.0~beta1.tar.xz";
sha256 = "1hqlf9fi5gmvb6r13z5819rg6k813bw9ihgbbji67hhh4q361wlw"; sha256 = "1rny74mi0knl8byqg2naw1mgvn22c2zihlwvzbkd56j97flqsxsm";
}; };
} }

5
pkgs/development/libraries/prometheus-cpp/default.nix
View File

@ -33,6 +33,11 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = "-ldl"; NIX_LDFLAGS = "-ldl";
postInstall = ''
mkdir -p $out/lib/pkgconfig
substituteAll ${./prometheus-cpp.pc.in} $out/lib/pkgconfig/prometheus-cpp.pc
'';
meta = { meta = {
description = "Prometheus Client Library for Modern C++"; description = "Prometheus Client Library for Modern C++";
homepage = "https://github.com/jupp0r/prometheus-cpp"; homepage = "https://github.com/jupp0r/prometheus-cpp";

10
pkgs/development/libraries/prometheus-cpp/prometheus-cpp.pc.in Normal file
View File

@ -0,0 +1,10 @@
prefix=@out@
includedir=${prefix}/include
libdir=${prefix}/lib
Name: prometheus-cpp
Description: Prometheus Client Library for Modern C++
URL: https://github.com/jupp0r/prometheus-cpp
Version: @version@
Cflags: -isystem${includedir}
Libs: -Wl,-rpath,${libdir} -L${libdir} -lprometheus-cpp-core -lprometheus-cpp-pull -lprometheus-cpp-push

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

@ -4,11 +4,11 @@ buildDunePackage rec {
minimumOCamlVersion = "4.08"; minimumOCamlVersion = "4.08";
pname = "mirage-crypto"; pname = "mirage-crypto";
version = "0.8.8"; version = "0.8.10";
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz"; url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz";
sha256 = "19czylfyakckfzzcbqgv9ygl243wix7ak8zkbdcb9hcl2k2shswb"; sha256 = "8a5976fe7837491d2fbd1917b77524776f70ae590e9f55cf757cc8951b5481fc";
}; };
useDune2 = true; useDune2 = true;

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

@ -1,4 +1,4 @@
{ lib, fetchurl, buildDunePackage { lib, fetchurl, buildDunePackage, fetchpatch
, alcotest, cstruct-unix , alcotest, cstruct-unix
, asn1-combinators, domain-name, fmt, gmap, rresult, mirage-crypto, mirage-crypto-pk , asn1-combinators, domain-name, fmt, gmap, rresult, mirage-crypto, mirage-crypto-pk
, logs, base64 , logs, base64
@ -15,6 +15,14 @@ buildDunePackage rec {
sha256 = "1b4lcphmlyjhdgqi0brakgjp3diwmrj1y9hx87svi5xklw3zik22"; sha256 = "1b4lcphmlyjhdgqi0brakgjp3diwmrj1y9hx87svi5xklw3zik22";
}; };
patches = [
# fix tests for mirage-crypto >= 0.8.9, can be removed at next release
(fetchpatch {
url = "https://github.com/mirleft/ocaml-x509/commit/ba1fdd4432950293e663416a0c454c8c04a71c0f.patch";
sha256 = "1rbjf7408772ns3ypk2hyw9v17iy1kcx84plr1rqc56iwk9zzxmr";
})
];
useDune2 = true; useDune2 = true;
buildInputs = [ alcotest cstruct-unix ]; buildInputs = [ alcotest cstruct-unix ];

2
pkgs/development/tools/fac/deps.nix generated
View File

@ -63,4 +63,4 @@
sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
}; };
} }
] ]

2
pkgs/development/tools/gopkgs/deps.nix generated
View File

@ -18,4 +18,4 @@
sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
}; };
} }
] ]

2
pkgs/development/tools/kube-prompt/deps.nix generated
View File

@ -306,4 +306,4 @@
sha256 = "06rszpgckx9gmqz9gbq8wnl39d1dnl28wdgrygj2fhz5prhj0x4s"; sha256 = "06rszpgckx9gmqz9gbq8wnl39d1dnl28wdgrygj2fhz5prhj0x4s";
}; };
} }
] ]

2
pkgs/development/tools/misc/binutils/default.nix
View File

@ -4,7 +4,7 @@
, withAllTargets ? false, libbfd, libopcodes , withAllTargets ? false, libbfd, libopcodes
, enableShared ? !stdenv.hostPlatform.isStatic , enableShared ? !stdenv.hostPlatform.isStatic
, noSysDirs , noSysDirs
, gold ? !stdenv.buildPlatform.isDarwin || stdenv.hostPlatform == stdenv.targetPlatform , gold ? true
, bison ? null , bison ? null
, flex , flex
, texinfo , texinfo

10
pkgs/development/tools/rust/bindgen/default.nix
View File

@ -1,5 +1,7 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin, { lib, stdenv, fetchFromGitHub, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin
runtimeShell }: , runtimeShell
, bash
}:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "rust-bindgen"; pname = "rust-bindgen";
@ -16,7 +18,9 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "1dv1ywdy701bnc2jv5jq0hnpal1snlizaj9w6k1wxyrp9szjd48w"; cargoSha256 = "1dv1ywdy701bnc2jv5jq0hnpal1snlizaj9w6k1wxyrp9szjd48w";
libclang = llvmPackages.libclang.lib; #for substituteAll #for substituteAll
libclang = llvmPackages.libclang.lib;
inherit bash;
buildInputs = [ libclang ]; buildInputs = [ libclang ];

2
pkgs/development/tools/rust/bindgen/wrapper.sh
View File

@ -1,4 +1,4 @@
#!/usr/bin/env bash #!@bash@/bin/bash
sep='--' # whether to add -- before new options sep='--' # whether to add -- before new options
cxx=0 # whether cxx was explicitly requested cxx=0 # whether cxx was explicitly requested
lastWasx=0 # whether the last argument passed was -x lastWasx=0 # whether the last argument passed was -x

2
pkgs/development/tools/tychus/deps.nix generated
View File

@ -27,4 +27,4 @@
sha256 = "13mhx4i913jil32j295m3a36jzvq1y64xig0naadiz7q9ja011r2"; sha256 = "13mhx4i913jil32j295m3a36jzvq1y64xig0naadiz7q9ja011r2";
}; };
} }
] ]

14
pkgs/misc/emulators/ruffle/default.nix
View File

@ -1,5 +1,6 @@
{ alsaLib { alsaLib
, fetchFromGitHub , fetchFromGitHub
, makeWrapper
, openssl , openssl
, pkg-config , pkg-config
, python3 , python3
@ -7,20 +8,22 @@
, lib, stdenv , lib, stdenv
, wayland , wayland
, xorg , xorg
, vulkan-loader
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "ruffle"; pname = "ruffle";
version = "nightly-2020-11-30"; version = "nightly-2021-01-12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ruffle-rs"; owner = "ruffle-rs";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0z54swzy47laq3smficd3dyrs2zdi3cj2kb0b4hppjxpkkhiw4x0"; sha256 = "1lywxn61w0b3pb8vjpavd9f3v58gq35ypwp41b7rjkc4rjxmf3cd";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
makeWrapper
pkg-config pkg-config
python3 python3
]; ];
@ -35,9 +38,14 @@ rustPlatform.buildRustPackage rec {
xorg.libXi xorg.libXi
xorg.libxcb xorg.libxcb
xorg.libXrender xorg.libXrender
vulkan-loader
]; ];
cargoSha256 = "05kwfcbzjyyfhiqklhhlv06pinzw9bry4j8l9lk3k04c1q30gzkw"; postInstall = ''
wrapProgram $out/bin/ruffle_desktop --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib
'';
cargoSha256 = "113gh8nf2fs9shfvnzpwlc7zaq1l9l9jhlybcc4dq0wr4r8qpff5";
meta = with lib; { meta = with lib; {
description = "An Adobe Flash Player emulator written in the Rust programming language."; description = "An Adobe Flash Player emulator written in the Rust programming language.";

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

@ -381,8 +381,8 @@ let
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ms-jpq"; owner = "ms-jpq";
repo = "chadtree"; repo = "chadtree";
rev = "a351625c4029fb15b14eebe46016c9a6b1bc7d26"; rev = "4b1d61cc00baf7b5f77efb75d1973d453248153f";
sha256 = "0jmnsr1k9v7zpxkbd6h9i4cizbkm99vyr4366wdjiikbn29jx6pr"; sha256 = "1w166j4syxwv1qhm0s813rixgc83j6ba5m4db1n2a8bnqwgcc9i6";
}; };
meta.homepage = "https://github.com/ms-jpq/chadtree/"; meta.homepage = "https://github.com/ms-jpq/chadtree/";
}; };
@ -702,12 +702,12 @@ let
Coqtail = buildVimPluginFrom2Nix { Coqtail = buildVimPluginFrom2Nix {
pname = "Coqtail"; pname = "Coqtail";
version = "2021-01-18"; version = "2021-01-21";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "whonore"; owner = "whonore";
repo = "Coqtail"; repo = "Coqtail";
rev = "c58071ff5ad86baad107f43737c64a18b574cd3a"; rev = "ff42b26f69634ed9fb3001887d80c65a759458e5";
sha256 = "1pbkvxcwzvyy47bfv1r1ldzcf0qqkbbx2bq4jl93di5bg7kl57qb"; sha256 = "0b4pra6f83933kl1ys8k4q9y9mx6a7qc7z757s82b0jk92cs790b";
}; };
meta.homepage = "https://github.com/whonore/Coqtail/"; meta.homepage = "https://github.com/whonore/Coqtail/";
}; };
@ -1318,12 +1318,12 @@ let
far-vim = buildVimPluginFrom2Nix { far-vim = buildVimPluginFrom2Nix {
pname = "far-vim"; pname = "far-vim";
version = "2020-12-12"; version = "2021-01-21";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "brooth"; owner = "brooth";
repo = "far.vim"; repo = "far.vim";
rev = "f92a9ef537c195815ddc12ce919dae607f3d887b"; rev = "b3e7b62ef6820ccdcbdc6070f3573b658aafba43";
sha256 = "1i6mzbfylq3212saipq79s5yb00y9083wsi7dax37bcfb8ryl841"; sha256 = "0lf2vlsyk4ymhyscnpla417hvh6qdi8cablammnc5vsk1hmqvc3i";
}; };
meta.homepage = "https://github.com/brooth/far.vim/"; meta.homepage = "https://github.com/brooth/far.vim/";
}; };
@ -2220,12 +2220,12 @@ let
lualine-nvim = buildVimPluginFrom2Nix { lualine-nvim = buildVimPluginFrom2Nix {
pname = "lualine-nvim"; pname = "lualine-nvim";
version = "2021-01-20"; version = "2021-01-21";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hoob3rt"; owner = "hoob3rt";
repo = "lualine.nvim"; repo = "lualine.nvim";
rev = "09835e2a1a5404b4ee4b80fb8e3fa84ccbddfec4"; rev = "a2a9193296414aea13efa3a02fafb115f0226276";
sha256 = "0n4b8iyk9pk4ji0sw8lf973z2wg2lfb59yh0ry3hkl9g66vg5nkl"; sha256 = "1n3c7zmpqv3xr750b7nbk1q08abhx2frhvbqhpd28vi2lf075bxa";
}; };
meta.homepage = "https://github.com/hoob3rt/lualine.nvim/"; meta.homepage = "https://github.com/hoob3rt/lualine.nvim/";
}; };
@ -2980,8 +2980,8 @@ let
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-treesitter"; owner = "nvim-treesitter";
repo = "nvim-treesitter"; repo = "nvim-treesitter";
rev = "99ecb46592f8e9a3a8b56ff2c4fd18f1eff4a5af"; rev = "f84c93c484ec3f5fb2a7ca461bf5b93994662fda";
sha256 = "131k1p0qjwvm5d3s1670r9a4s053c7x2yi7n69jlljc6x57b3q9n"; sha256 = "0wh2rv1awlvm1d4fgvcgl0cg9sw20x5axmnq2ch0q18qca37v5i5";
}; };
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
}; };
@ -3204,12 +3204,12 @@ let
playground = buildVimPluginFrom2Nix { playground = buildVimPluginFrom2Nix {
pname = "playground"; pname = "playground";
version = "2021-01-19"; version = "2021-01-21";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-treesitter"; owner = "nvim-treesitter";
repo = "playground"; repo = "playground";
rev = "bcd83b5ce698e9ffdd27e64be16f04f0544ca047"; rev = "7e373e5706a2df71fd3a96b50d1f7b0c3e7a0b36";
sha256 = "0kmyx172v94m3193i3pmim79d6pk9zffbm50lvzpy7n0bi16608i"; sha256 = "1vrfjv22whdmwna4xlvpsajx69fs8dkfwk0ji1jnvbyxmhki8mik";
}; };
meta.homepage = "https://github.com/nvim-treesitter/playground/"; meta.homepage = "https://github.com/nvim-treesitter/playground/";
}; };
@ -5582,6 +5582,18 @@ let
meta.homepage = "https://github.com/enomsg/vim-haskellConcealPlus/"; meta.homepage = "https://github.com/enomsg/vim-haskellConcealPlus/";
}; };
vim-hcl = buildVimPluginFrom2Nix {
pname = "vim-hcl";
version = "2020-09-07";
src = fetchFromGitHub {
owner = "jvirtanen";
repo = "vim-hcl";
rev = "94fbd199c8a947ede62f98509f91d637d7967454";
sha256 = "0n2dmgfajji8nxxirb9q9jmqnzc1mjqnic5igs84pxmbc6r57zqq";
};
meta.homepage = "https://github.com/jvirtanen/vim-hcl/";
};
vim-hdevtools = buildVimPluginFrom2Nix { vim-hdevtools = buildVimPluginFrom2Nix {
pname = "vim-hdevtools"; pname = "vim-hdevtools";
version = "2018-11-19"; version = "2018-11-19";
@ -7207,12 +7219,12 @@ let
vim-snipmate = buildVimPluginFrom2Nix { vim-snipmate = buildVimPluginFrom2Nix {
pname = "vim-snipmate"; pname = "vim-snipmate";
version = "2021-01-13"; version = "2021-01-21";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "garbas"; owner = "garbas";
repo = "vim-snipmate"; repo = "vim-snipmate";
rev = "a5b5dd46e9c2b796599ff4530e1c8d29fdd77945"; rev = "d4554cd646c3c015d85bd44487a0e019f88c959a";
sha256 = "05k6irv1p8kglznz9pfdzlb3qplf6y1k4x9qr3zcidv79hldg0b5"; sha256 = "1jmyrlbwrljc6jnn44yqz5s090srykn3dp7w08iaq10vpxav987g";
}; };
meta.homepage = "https://github.com/garbas/vim-snipmate/"; meta.homepage = "https://github.com/garbas/vim-snipmate/";
}; };

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

@ -236,6 +236,7 @@ justincampbell/vim-eighties
justinj/vim-pico8-syntax justinj/vim-pico8-syntax
justinmk/vim-dirvish justinmk/vim-dirvish
justinmk/vim-sneak justinmk/vim-sneak
jvirtanen/vim-hcl
jvoorhis/coq.vim jvoorhis/coq.vim
KabbAmine/vCoolor.vim KabbAmine/vCoolor.vim
KabbAmine/zeavim.vim KabbAmine/zeavim.vim

2
pkgs/servers/cayley/deps.nix generated
View File

@ -468,4 +468,4 @@
sha256 = "1hj2ag9knxflpjibck0n90jrhsrqz7qvad4qnif7jddyapi9bqzl"; sha256 = "1hj2ag9knxflpjibck0n90jrhsrqz7qvad4qnif7jddyapi9bqzl";
}; };
} }
] ]

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

@ -9,7 +9,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "slurm"; pname = "slurm";
version = "20.11.2.1"; version = "20.11.3.1";
# N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
# because the latter does not keep older releases. # because the latter does not keep older releases.
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
repo = "slurm"; repo = "slurm";
# The release tags use - instead of . # The release tags use - instead of .
rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}";
sha256 = "02vz386ix28yr2lrn9z0hycqmw1d0npvwvx51fhp2mav66rrx79p"; sha256 = "1601h7gid7fyvgmvrmz0h0xkxd7whp06rmj03822bv1szqr20xyy";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

2
pkgs/tools/backup/duplicacy/deps.nix generated
View File

@ -405,4 +405,4 @@
sha256 = "17zfx4xgqjamk7rc1sivm5gppkh3j4qp3i294w9rqbv0rqi0c9pq"; sha256 = "17zfx4xgqjamk7rc1sivm5gppkh3j4qp3i294w9rqbv0rqi0c9pq";
}; };
} }
] ]

2
pkgs/tools/networking/dd-agent/datadog-agent-deps.nix
View File

@ -1350,4 +1350,4 @@
sha256 = "1wpqijsvf8s4iqjrrzgbxi3gay6vaglscyq14vxma4iacg8fx1jk"; sha256 = "1wpqijsvf8s4iqjrrzgbxi3gay6vaglscyq14vxma4iacg8fx1jk";
}; };
} }
] ]

2
pkgs/tools/networking/dd-agent/datadog-process-agent-deps.nix
View File

@ -666,4 +666,4 @@
sha256 = "0bcsb7s4wlmrja35zvz4s10cf3w7dfn2ckjv6apxd1ykdjxnsk71"; sha256 = "0bcsb7s4wlmrja35zvz4s10cf3w7dfn2ckjv6apxd1ykdjxnsk71";
}; };
} }
] ]

2
pkgs/tools/networking/kail/deps.nix generated
View File

@ -405,4 +405,4 @@
sha256 = "1vkcjg80l49hxiadqmkkd031kj6kc10m8mwcnla3k1ml8fv4qna9"; sha256 = "1vkcjg80l49hxiadqmkkd031kj6kc10m8mwcnla3k1ml8fv4qna9";
}; };
} }
] ]

2
pkgs/tools/package-management/morph/deps.nix generated
View File

@ -63,4 +63,4 @@
sha256 = "06xrp05njwam4sn031fkmd4gym5wfsw5q0v24nqhs4883lsx9dwq"; sha256 = "06xrp05njwam4sn031fkmd4gym5wfsw5q0v24nqhs4883lsx9dwq";
}; };
} }
] ]

2
pkgs/top-level/all-packages.nix
View File

@ -21688,6 +21688,8 @@ in
inherit (gnome3) evince; inherit (gnome3) evince;
evolution-data-server = gnome3.evolution-data-server; evolution-data-server = gnome3.evolution-data-server;
evolution-ews = callPackage ../applications/networking/mailreaders/evolution/evolution-ews { }; evolution-ews = callPackage ../applications/networking/mailreaders/evolution/evolution-ews { };
evolution = callPackage ../applications/networking/mailreaders/evolution/evolution { };
evolutionWithPlugins = callPackage ../applications/networking/mailreaders/evolution/evolution/wrapper.nix { plugins = [ evolution evolution-ews ]; };
keepass = callPackage ../applications/misc/keepass { }; keepass = callPackage ../applications/misc/keepass { };