Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-10-07 00:01:33 +00:00 committed by GitHub
commit dbb89f41fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
41 changed files with 364 additions and 183 deletions

View file

@ -82,6 +82,15 @@ in
nix = {
enable = mkOption {
type = types.bool;
default = true;
description = ''
Whether to enable Nix.
Disabling Nix makes the system hard to modify and the Nix programs and configuration will not be made available by NixOS itself.
'';
};
package = mkOption {
type = types.package;
default = pkgs.nix;
@ -499,7 +508,7 @@ in
###### implementation
config = {
config = mkIf cfg.enable {
nix.binaryCachePublicKeys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
nix.binaryCaches = [ "https://cache.nixos.org/" ];

View file

@ -478,6 +478,7 @@ in
wasabibackend = handleTest ./wasabibackend.nix {};
wiki-js = handleTest ./wiki-js.nix {};
wireguard = handleTest ./wireguard {};
without-nix = handleTest ./without-nix.nix {};
wmderland = handleTest ./wmderland.nix {};
wpa_supplicant = handleTest ./wpa_supplicant.nix {};
wordpress = handleTest ./wordpress.nix {};

View file

@ -11,10 +11,6 @@ import ./make-test-python.nix (
meta.maintainers = with pkgs.lib.maintainers; [ pborzenkov ];
nodes = {
default = { ... }: {
services.calibre-web.enable = true;
};
customized = { pkgs, ... }: {
services.calibre-web = {
enable = true;
@ -33,12 +29,6 @@ import ./make-test-python.nix (
testScript = ''
start_all()
default.wait_for_unit("calibre-web.service")
default.wait_for_open_port(${toString defaultPort})
default.succeed(
"curl --fail 'http://localhost:${toString defaultPort}/basicconfig' | grep 'Basic Configuration'"
)
customized.succeed(
"mkdir /tmp/books && calibredb --library-path /tmp/books add -e --title test-book"
)

View file

@ -0,0 +1,23 @@
import ./make-test-python.nix ({ lib, ... }: {
name = "without-nix";
meta = with lib.maintainers; {
maintainers = [ ericson2314 ];
};
nixpkgs.overlays = [
(self: super: {
nix = throw "don't want to use this";
})
];
nodes.machine = { ... }: {
nix.enable = false;
};
testScript = ''
start_all()
machine.succeed("which which")
machine.fail("which nix")
'';
})

View file

@ -2,7 +2,7 @@
, extra-cmake-modules, kdoctools
, qtscript, qtsvg, qtquickcontrols, qtwebengine
, krunner, shared-mime-info, kparts, knewstuff
, gpsd, perl
, gpsd, perl, fetchpatch
}:
mkDerivation {
@ -18,6 +18,15 @@ mkDerivation {
qtscript qtsvg qtquickcontrols qtwebengine shared-mime-info krunner kparts
knewstuff gpsd
];
patches = [
(fetchpatch {
# Backport fix to allow compilation with gpsd 3.23.1
# Remove when marble compiles without the patch.
# See: https://invent.kde.org/education/marble/-/merge_requests/57
url = "https://invent.kde.org/education/marble/-/commit/8aadc3eb8f9484a65d497d442cd8c61fe1462bef.diff";
sha256 = "sha256-ZkPXyunVItSRctv6SLGIonvyZwLDhCz+wfJrIXeHcDo=";
})
];
preConfigure = ''
cmakeFlags+=" -DINCLUDE_INSTALL_DIR=''${!outputDev}/include"
'';

View file

@ -6,8 +6,8 @@ let
srcs = {
foxtrot = fetchbzr {
url = "lp:foxtrotgps";
rev = "329";
sha256 = "0fwgnsrah63h1xdgm5xdi5ancrz89shdp5sdzw1qc1m7i9a03rid";
rev = "331";
sha256 = "sha256-/kJv6a3MzAzzwIl98Mqi7jrUJC1kDvouigf9kGtv868=";
};
screenshots = fetchbzr {
url = "lp:foxtrotgps/screenshots";
@ -17,7 +17,7 @@ let
};
in stdenv.mkDerivation rec {
pname = "foxtrotgps";
version = "1.2.2+329";
version = "1.2.2+331";
# Pull directly from bzr because gpsd API version 9 is not supported on latest release
src = srcs.foxtrot;
@ -39,12 +39,20 @@ in stdenv.mkDerivation rec {
];
postUnpack = ''
cp -R ${srcs.screenshots} $sourceRoot/doc/screenshots
chmod -R u+w $sourceRoot/doc/screenshots
cp -R ${srcs.screenshots} $sourceRoot/doc/screenshots
chmod -R u+w $sourceRoot/doc/screenshots
'';
# Remove when foxtrotgps supports gpsd 3.23.1
# Patch for compatibility with gpsd 3.23.1. This was added for foxtrotgps
# 1.2.2+331. The command can be removed if the build of a newer version
# succeeds without it.
postPatch = ''
substituteInPlace src/gps_functions.c --replace "STATUS_NO_FIX" "STATUS_UNK"
'';
preConfigure = ''
intltoolize --automake --copy --force
intltoolize --automake --copy --force
'';
meta = with lib; {

View file

@ -47,7 +47,7 @@ let
k3sCommit = "3e250fdbab72d88f7e6aae57446023a0567ffc97"; # k3s git commit at the above version
k3sRepoSha256 = "1w7drvk0bmlmqrxh1y6dxjy7dk6bdrl72pkd25lc1ir6wbzb05h9";
traefikChartVersion = "9.18.2"; # taken from ./scripts/download at TRAEFIK_VERSION
traefikChartVersion = "9.18.2"; # taken from ./manifests/traefik.yaml at spec.version
traefikChartSha256 = "sha256-9d7p0ngyMN27u4OPgz7yI14Zj9y36t9o/HMX5wyDpUI=";
k3sRootVersion = "0.9.1"; # taken from ./scripts/download at ROOT_VERSION

View file

@ -10,19 +10,16 @@ cd $(dirname "${BASH_SOURCE[0]}")
LATEST_TAG_RAWFILE=${WORKDIR}/latest_tag.json
curl --silent ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \
https://api.github.com/repos/k3s-io/k3s/releases/latest > ${LATEST_TAG_RAWFILE}
LATEST_TAG_NAME=$(jq -r '.tag_name' ${LATEST_TAG_RAWFILE})
https://api.github.com/repos/k3s-io/k3s/releases > ${LATEST_TAG_RAWFILE}
LATEST_TAG_NAME=$(jq 'map(.tag_name)' ${LATEST_TAG_RAWFILE} | grep -v -e rc -e engine | sed 's/["|,| ]//g' | sort -r | head -n1)
K3S_VERSION=$(echo ${LATEST_TAG_NAME} | sed 's/^v//')
LATEST_TAG_TARBALL_URL=$(jq -r '.tarball_url' ${LATEST_TAG_RAWFILE})
K3S_COMMIT=$(curl --silent ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \
https://api.github.com/repos/k3s-io/k3s/tags \
| jq -r "map(select(.name == \"${LATEST_TAG_NAME}\")) | .[0] | .commit.sha")
K3S_REPO_SHA256=$(nix-prefetch-url --quiet --unpack ${LATEST_TAG_TARBALL_URL})
K3S_REPO_SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/k3s-io/k3s/archive/refs/tags/${LATEST_TAG_NAME}.tar.gz)
FILE_SCRIPTS_DOWNLOAD=${WORKDIR}/scripts-download
curl --silent https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/scripts/download > $FILE_SCRIPTS_DOWNLOAD
@ -30,16 +27,19 @@ curl --silent https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/scripts
FILE_SCRIPTS_VERSION=${WORKDIR}/scripts-version.sh
curl --silent https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/scripts/version.sh > $FILE_SCRIPTS_VERSION
TRAEFIK_CHART_VERSION=$(grep TRAEFIK_VERSION= $FILE_SCRIPTS_DOWNLOAD \
| cut -d'=' -f2 | cut -d' ' -f1)
FILE_MANIFESTS_TRAEFIK=${WORKDIR}/manifests-traefik.yaml
curl --silent https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/manifests/traefik.yaml > $FILE_MANIFESTS_TRAEFIK
TRAEFIK_CHART_VERSION=$(awk -F/ '/traefik-([[:digit:]]+\.)/ {sub(/traefik-/, "", $6) ; sub(/\.tgz/, "", $6); print $6}' $FILE_MANIFESTS_TRAEFIK)
TRAEFIK_CHART_SHA256=$(nix-prefetch-url --quiet "https://helm.traefik.io/traefik/traefik-${TRAEFIK_CHART_VERSION}.tgz")
K3S_ROOT_VERSION=$(grep ROOT_VERSION= $FILE_SCRIPTS_DOWNLOAD \
K3S_ROOT_VERSION=$(grep 'ROOT_VERSION=' ${FILE_SCRIPTS_DOWNLOAD} \
| cut -d'=' -f2 | cut -d' ' -f1 | sed 's/^v//')
K3S_ROOT_SHA256=$(nix-prefetch-url --quiet --unpack \
"https://github.com/k3s-io/k3s-root/releases/download/v${K3S_ROOT_VERSION}/k3s-root-amd64.tar")
CNIPLUGINS_VERSION=$(grep VERSION_CNIPLUGINS= $FILE_SCRIPTS_VERSION \
CNIPLUGINS_VERSION=$(grep 'VERSION_CNIPLUGINS=' ${FILE_SCRIPTS_VERSION} \
| cut -d'=' -f2 | cut -d' ' -f1 | sed -e 's/"//g' -e 's/^v//')
CNIPLUGINS_SHA256=$(nix-prefetch-url --quiet --unpack \
"https://github.com/rancher/plugins/archive/refs/tags/v${CNIPLUGINS_VERSION}.tar.gz")

View file

@ -18,14 +18,12 @@ let
# E.g. "de_DE" -> "de-de" (spellcheckerLanguage -> hunspellDict)
spellLangComponents = splitString "_" spellcheckerLanguage;
hunspellDict = elemAt spellLangComponents 0 + "-" + toLower (elemAt spellLangComponents 1);
in if spellcheckerLanguage != null
then ''
--set HUNSPELL_DICTIONARIES "${hunspellDicts.${hunspellDict}}/share/hunspell" \
--set LC_MESSAGES "${spellcheckerLanguage}"''
else "");
in lib.optionalString (spellcheckerLanguage != null) ''
--set HUNSPELL_DICTIONARIES "${hunspellDicts.${hunspellDict}}/share/hunspell" \
--set LC_MESSAGES "${spellcheckerLanguage}"'');
in stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "5.18.1"; # Please backport all updates to the stable channel.
version = "5.19.0"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@ -35,7 +33,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "0x1wrzxyspghv0hwdh3sw8536c9qi7211d2g5cr3f33kz9db5xp4";
sha256 = "0avns5axcfs8x9sv7hyjxi1cr7gag00avfj0h99wgn251b313g1a";
};
nativeBuildInputs = [

View file

@ -118,7 +118,6 @@ stdenv.mkDerivation rec {
'';
platforms = platforms.all;
hydraPlatforms = platforms.linux;
maintainers = with maintainers; [ peti ] ++ teams.sage.members;
};

View file

@ -49,6 +49,7 @@ let
, meta
, buildInputs ? []
, everythingFile ? "./Everything.agda"
, includePaths ? []
, libraryName ? pname
, libraryFile ? "${libraryName}.agda-lib"
, buildPhase ? null
@ -57,6 +58,7 @@ let
, ...
}: let
agdaWithArgs = withPackages (builtins.filter (p: p ? isAgdaDerivation) buildInputs);
includePathArgs = concatMapStrings (path: "-i" + path + " ") (includePaths ++ [(dirOf everythingFile)]);
in
{
inherit libraryName libraryFile;
@ -67,7 +69,7 @@ let
buildPhase = if buildPhase != null then buildPhase else ''
runHook preBuild
agda -i ${dirOf everythingFile} ${everythingFile}
agda ${includePathArgs} ${everythingFile}
runHook postBuild
'';

View file

@ -15,8 +15,9 @@
"--remap-path-prefix=$NIX_BUILD_TOP=/"
(mkRustcDepArgs dependencies crateRenames)
(mkRustcFeatureArgs crateFeatures)
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"--target" (rust.toRustTargetSpec stdenv.hostPlatform)
] ++ extraRustcOpts
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--target ${rust.toRustTargetSpec stdenv.hostPlatform} -C linker=${stdenv.hostPlatform.config}-gcc"
# since rustc 1.42 the "proc_macro" crate is part of the default crate prelude
# https://github.com/rust-lang/cargo/commit/4d64eb99a4#diff-7f98585dbf9d30aa100c8318e2c77e79R1021-R1022
++ lib.optional (lib.elem "proc-macro" crateType) "--extern proc_macro"

View file

@ -13,7 +13,7 @@
, crateRenames
, crateVersion
, extraLinkFlags
, extraRustcOpts
, extraRustcOptsForBuildRs
, libName
, libPath
, release
@ -24,7 +24,7 @@ let version_ = lib.splitString "-" crateVersion;
version = lib.splitVersion (lib.head version_);
rustcOpts = lib.foldl' (opts: opt: opts + " " + opt)
(if release then "-C opt-level=3" else "-C debuginfo=2")
(["-C codegen-units=$NIX_BUILD_CORES"] ++ extraRustcOpts);
(["-C codegen-units=$NIX_BUILD_CORES"] ++ extraRustcOptsForBuildRs);
buildDeps = mkRustcDepArgs buildDependencies crateRenames;
authors = lib.concatStringsSep ":" crateAuthors;
optLevel = if release then 3 else 0;

View file

@ -172,6 +172,11 @@ crate_: lib.makeOverridable
# Example: [ "-Z debuginfo=2" ]
# Default: []
, extraRustcOpts
# A list of extra options to pass to rustc when building a build.rs.
#
# Example: [ "-Z debuginfo=2" ]
# Default: []
, extraRustcOptsForBuildRs
# Whether to enable building tests.
# Use true to enable.
# Default: false
@ -228,6 +233,7 @@ crate_: lib.makeOverridable
nativeBuildInputs_ = nativeBuildInputs;
buildInputs_ = buildInputs;
extraRustcOpts_ = extraRustcOpts;
extraRustcOptsForBuildRs_ = extraRustcOptsForBuildRs;
buildTests_ = buildTests;
# crate2nix has a hack for the old bash based build script that did split
@ -308,12 +314,16 @@ crate_: lib.makeOverridable
lib.optionals (crate ? extraRustcOpts) crate.extraRustcOpts
++ extraRustcOpts_
++ (lib.optional (edition != null) "--edition ${edition}");
extraRustcOptsForBuildRs =
lib.optionals (crate ? extraRustcOptsForBuildRs) crate.extraRustcOptsForBuildRs
++ extraRustcOptsForBuildRs_
++ (lib.optional (edition != null) "--edition ${edition}");
configurePhase = configureCrate {
inherit crateName buildDependencies completeDeps completeBuildDeps crateDescription
crateFeatures crateRenames libName build workspace_member release libPath crateVersion
extraLinkFlags extraRustcOpts
extraLinkFlags extraRustcOptsForBuildRs
crateAuthors crateHomepage verbose colors;
};
buildPhase = buildCrate {
@ -337,6 +347,7 @@ crate_: lib.makeOverridable
release = crate_.release or true;
verbose = crate_.verbose or true;
extraRustcOpts = [ ];
extraRustcOptsForBuildRs = [ ];
features = [ ];
nativeBuildInputs = [ ];
buildInputs = [ ];

View file

@ -1,4 +1,4 @@
import ./common.nix {
version = "2.1.2";
sha256 = "sha256-t3EFUJOYVe1JWYxKAUSD7RILaZFliio7avpHcT3OTAs=";
version = "2.0.8";
sha256 = "1xwrwvps7drrpyw3wg5h3g2qajmkwqs9gz0fdw1ns9adp7vld390";
}

View file

@ -94,8 +94,6 @@ self: super: builtins.intersectAttrs super {
# Won't find it's header files without help.
sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL";
hercules-ci-agent = disableLibraryProfiling super.hercules-ci-agent;
# avoid compiling twice by providing executable as a separate output (with small closure size)
niv = enableSeparateBinOutput super.niv;
ormolu = enableSeparateBinOutput super.ormolu;

View file

@ -8,32 +8,30 @@
stdenv.mkDerivation rec {
pname = "dbqn" + lib.optionalString buildNativeImage "-native";
version = "0.0.0+unstable=2021-10-02";
version = "0.0.0+unstable=2021-10-05";
src = fetchFromGitHub {
owner = "dzaima";
repo = "BQN";
rev = "d6bd66d26a89b8e9f956ec4f6b6bc5dcb5861a09";
hash = "sha256-BLRep7OGHfDFowIAsBS19PTzgIhrdKMnO2JSjKuwGYo=";
rev = "c31ceef52bbf380e747723f5ffd09c5f006b21c5";
sha256 = "1nzqgwpjawcky85mfrz5izs9lfb3aqlm96dc8syrxhgg20xrziwx";
};
buildInputs = lib.optional (!buildNativeImage) jdk;
nativeBuildInputs = [
makeWrapper
] ++ lib.optional buildNativeImage jdk;
jdk
];
dontConfigure = true;
buildPhase = ''
runHook preBuild
mkdir -p output
javac --release 8 -encoding UTF-8 -d ./output $(find src -name '*.java')
(cd output; jar cvfe ../BQN.jar BQN.Main *)
rm -fr output
patchShebangs --build ./build8
./build8
'' + lib.optionalString buildNativeImage ''
native-image --report-unsupported-elements-at-runtime \
-H:CLibraryPath=${lib.getLib jdk}/lib \
-J-Dfile.encoding=UTF-8 -jar BQN.jar dbqn
'' + ''
runHook postBuild
@ -64,7 +62,6 @@ stdenv.mkDerivation rec {
license = licenses.mit;
maintainers = with maintainers; [ AndersonTorres sternenseemann ];
inherit (jdk.meta) platforms;
priority = if buildNativeImage then 10 else 0;
};
}
# TODO: Processing app

View file

@ -1,14 +1,14 @@
{ lib, mkDerivation, fetchFromGitHub }:
mkDerivation rec {
version = "compat-2.6.1";
version = "compat-2.6.2";
pname = "agda-prelude";
src = fetchFromGitHub {
owner = "UlfNorell";
repo = "agda-prelude";
rev = version;
sha256 = "128rbhd32qlq2nq3wgqni4ih58zzwvs9pkn9j8236ycxxp6x81sl";
sha256 = "0j2nip5fbn61fpkm3qz4dlazl4mzdv7qlgw9zm15bkcvaila0h14";
};
preConfigure = ''
@ -19,8 +19,6 @@ mkDerivation rec {
'';
meta = with lib; {
# Remove if a version compatible with agda 2.6.2 is made
broken = true;
homepage = "https://github.com/UlfNorell/agda-prelude";
description = "Programming library for Agda";
license = lib.licenses.mit;

View file

@ -0,0 +1,28 @@
{ lib, mkDerivation, fetchFromGitHub
, standard-library }:
mkDerivation rec {
pname = "agdarsec";
version = "0.4.1";
src = fetchFromGitHub {
owner = "gallais";
repo = "agdarsec";
rev = "v${version}";
sha256 = "02fqkycvicw6m2xsz8p01aq8n3gj2d2gyx8sgj15l46f8434fy0x";
};
everythingFile = "./index.agda";
includePaths = [ "src" "examples" ];
buildInputs = [ standard-library ];
meta = with lib; {
homepage = "https://gallais.github.io/agdarsec/";
description = "Total Parser Combinators in Agda";
license = licenses.gpl3;
platforms = platforms.unix;
maintainers = with maintainers; [ turion ];
};
}

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libnsl";
version = "1.3.0";
version = "2.0.0";
src = fetchFromGitHub {
owner = "thkukuk";
repo = pname;
rev = "v${version}";
sha256 = "1dayj5i4bh65gn7zkciacnwv2a0ghm6nn58d78rsi4zby4lyj5w5";
sha256 = "sha256-f9kNzzR8baf5mLgrh+bKO/rBRZA5ZYc1tJdyLE7Bi1w=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];

View file

@ -0,0 +1,52 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchurl
, pytestCheckHook
, python
}:
let
table = fetchurl {
# See https://github.com/dahlia/iso4217/blob/main/setup.py#L18
url = "http://www.currency-iso.org/dam/downloads/lists/list_one.xml";
sha256 = "0frhicc7s8gqglr41hzx61fic3ckvr4sg773ahp1s28n5by3y7ac";
};
in
buildPythonPackage rec {
pname = "iso4217";
version = "1.6";
src = fetchFromGitHub {
owner = "dahlia";
repo = pname;
rev = version;
sha256 = "0mdpf5a0xr5lrcfgvqi1sdn7ln2w6pkc3lg0laqkbx5mhxky0fla";
};
checkInputs = [
pytestCheckHook
];
preBuild = ''
# The table is already downloaded
export ISO4217_DOWNLOAD=0
# Copy the table file to satifiy the build process
cp -r ${table} $pname/table.xml
'';
postInstall = ''
# Copy the table file
cp -r ${table} $out/${python.sitePackages}/$pname/table.xml
'';
pytestFlagsArray = [ "$pname/test.py" ];
pythonImportsCheck = [ "iso4217" ];
meta = with lib; {
description = "ISO 4217 currency data package for Python";
homepage = "https://github.com/dahlia/iso4217";
license = with licenses; [ publicDomain ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "mypy-boto3-s3";
version = "1.18.54";
version = "1.18.55";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "fdbb7ff1687fba8e7ac521502cb2d2ca4b845e1a331f5b4fe55aff7c17e1f985";
sha256 = "45519e811bbd284fc7d69e932abcaa9c551071db4fb6e69502736b81dcc72a7d";
};
propagatedBuildInputs = [

View file

@ -34,7 +34,13 @@ buildPythonPackage rec {
owner = "jbarlow83";
repo = "OCRmyPDF";
rev = "v${version}";
sha256 = "sha256-gFlQztrRN69HtR6sTJl8tryuTibxQrz97QcS5UkFOVs=";
# The content of .git_archival.txt is substituted upon tarball creation,
# which creates indeterminism if master no longer points to the tag.
# See https://github.com/jbarlow83/OCRmyPDF/issues/841
extraPostFetch = ''
rm "$out/.git_archival.txt"
'';
sha256 = "0zw7c6l9fkf128gxsbd7v4abazlxiygqys6627jpsjbmxg5jgp5w";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -24,12 +24,12 @@
buildPythonPackage rec {
pname = "pikepdf";
version = "3.1.0";
version = "3.1.1";
disabled = ! isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "aeb813b5f36534d2bedf08487ab2b022c43f4c8a3e86e611c5f7c8fb97309db5";
sha256 = "sha256-klSUszWsIIz7o0/Ql8K4CWYujBH0mAbqyUcabpn1SkQ=";
};
patches = [

View file

@ -0,0 +1,42 @@
{ lib
, aiohttp
, buildPythonPackage
, fetchFromGitHub
, iso4217
, pytestCheckHook
, pythonOlder
, pytz
}:
buildPythonPackage rec {
pname = "pyefergy";
version = "0.1.0";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "tkdrob";
repo = pname;
rev = version;
sha256 = "0nm7dc5q4wvdpqxpirlc4nwm68lf3n2df6j5yy4m8wr294yb7a1k";
};
propagatedBuildInputs = [
aiohttp
iso4217
pytz
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "pyefergy" ];
meta = with lib; {
description = "Python API library for Efergy energy meters";
homepage = "https://github.com/tkdrob/pyefergy";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "pypinyin";
version = "0.42.0";
version = "0.43.0";
src = fetchFromGitHub {
owner = "mozillazg";
repo = "python-pinyin";
rev = "v${version}";
sha256 = "0i0ggizkgd809ylz74j1v5lfpyifz3wypj6f8l8fr5ad7a7r9s09";
sha256 = "0h3lpb8bw9zp8is5sx2zg931wz12x0zfan1kksnbhx16vwv1kgw3";
};
postPatch = ''

View file

@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "sqlite-utils";
version = "3.17";
version = "3.17.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "77acd202aa568a1f6888c5d8879f306bb3f8acedc82df0df98eb615caa491abb";
sha256 = "0cfde0c46a2d4c09d6df8609fe53642bc3ab443bcef3106d8f1eabeb3fccbe3d";
};
postPatch = ''

View file

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "transitions";
version = "0.8.9";
version = "0.8.10";
src = fetchPypi {
inherit pname version;
sha256 = "fc2ec6d6b6f986cd7e28e119eeb9ba1c9cc51ab4fbbdb7f2dedad01983fd2de0";
sha256 = "b0385975a842e885c1a55c719d2f90164471665794d39d51f9eb3f11e1d9c8ac";
};
propagatedBuildInputs = [

View file

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "urlextract";
version = "1.3.0";
version = "1.4.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-yxOuiswFOJnAvxwTT++Zhk8nZWK2f4ePsQpUYI7EYS4=";
sha256 = "669f07192584b841b49ba8868fbd6b00e7ddc28367d36a3d8ca8c8e429420748";
};
propagatedBuildInputs = [

View file

@ -22,7 +22,7 @@ let
doCheck ? true,
requireX ? false,
broken ? false,
hydraPlatforms ? R.meta.hydraPlatforms
hydraPlatforms ? R.meta.platforms
}: buildRPackage {
name = "${name}-${version}";
src = fetchurl {

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "rslint";
version = "0.3.0";
version = "0.3.1";
src = fetchFromGitHub {
owner = "rslint";
repo = pname;
rev = "v${version}";
sha256 = "12329x39zqmgl8zf228msdcdjfv3h11dmfha1kiwq71jvfga2v10";
sha256 = "sha256-AkSQpGbhRVmDuDAbMzx00BELpI2szJ+rjKo8Qjcug1E=";
};
cargoSha256 = "sha256-/pZ6jQ/IdLLFdFTvmbXZKCw9HhnTkSSh6q79Rpbtfz8=";
cargoSha256 = "sha256-U8Uf7LG6+dOi+XxRpJrpy0kAqyr8fAlVchE9ZJ+ex/s=";
cargoBuildFlags = [
"-p" "rslint_cli"

View file

@ -233,12 +233,12 @@ final: prev:
auto-session = buildVimPluginFrom2Nix {
pname = "auto-session";
version = "2021-09-07";
version = "2021-10-05";
src = fetchFromGitHub {
owner = "rmagatti";
repo = "auto-session";
rev = "3909c7805ee3c140c6bbc16ec001046a07eada15";
sha256 = "03ay788vacs65cylp0ly7clpzhrx8vzc7zn94mk15hr9843s1kkd";
rev = "dc7619fc3c6e3368ae449bf8ae1ad7630a720406";
sha256 = "0izpxbwa144r9wjiy1m0r19hfwdlm2r3pggn178gj56ll7y2njnk";
};
meta.homepage = "https://github.com/rmagatti/auto-session/";
};
@ -449,12 +449,12 @@ final: prev:
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
version = "2021-10-05";
version = "2021-10-06";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "33828c635ef856919889b229ab771268089d4c36";
sha256 = "0645p6mwgnhdp5lnri4c4h6ryyfn1s3487ydnhkr4p629vnrsl4k";
rev = "d84f60a07871fa8efef59d350f9884fd8a542a98";
sha256 = "1y9pkgwkc0cga25afknn5xrbn2kx46kg97348gjnk9bg297qm05g";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@ -641,12 +641,12 @@ final: prev:
cmp-path = buildVimPluginFrom2Nix {
pname = "cmp-path";
version = "2021-09-11";
version = "2021-10-06";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "cmp-path";
rev = "0016221b6143fd6bf308667c249e9dbdee835ae2";
sha256 = "03k43xavw17bbjzmkknp9z4m8jv9hn6wyvjwaj1gpyz0n21kn5bb";
rev = "8d88c92dd5a202a996b4caac7284e4ea2f086765";
sha256 = "0m7wmnanhmvx4ww5xiz6rfjzk3ci10gk4dda8qd87kdiszq1zay7";
};
meta.homepage = "https://github.com/hrsh7th/cmp-path/";
};
@ -906,12 +906,12 @@ final: prev:
compe-tmux = buildVimPluginFrom2Nix {
pname = "compe-tmux";
version = "2021-08-24";
version = "2021-09-16";
src = fetchFromGitHub {
owner = "andersevenrud";
repo = "compe-tmux";
rev = "881b5255e12fef6c28e1039f4afeb77626205b24";
sha256 = "1l2bvjhwi2s33cp6m58gvi9k2hpg3sdv9048ah8xk0rjd7kb2adn";
rev = "b80706c31711db5ef0fab9e141733a7e95203d22";
sha256 = "1874rzhxylqqkbv7sdkfq5dpbpqzpwf0r90yx3gxa4mipnjd22sm";
};
meta.homepage = "https://github.com/andersevenrud/compe-tmux/";
};
@ -2495,12 +2495,12 @@ final: prev:
indent-blankline-nvim = buildVimPluginFrom2Nix {
pname = "indent-blankline.nvim";
version = "2021-10-04";
version = "2021-10-06";
src = fetchFromGitHub {
owner = "lukas-reineke";
repo = "indent-blankline.nvim";
rev = "31fe9b4ac3eaaac0bf5e90d607662c32f59dc0b7";
sha256 = "1fwyrp5w7q4pz4a5dh24j2v8qrm4pr71p7qm14hj7xw3a80s9bci";
rev = "948b6ac3303b9e2e75daad0bd0ec844ed6b06d4a";
sha256 = "1adsy4nkl8dm6bqkc2chy47na3kqh8g1lkmxzvc5wdfw0c27z0i0";
};
meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/";
};
@ -2892,12 +2892,12 @@ final: prev:
lightline-bufferline = buildVimPluginFrom2Nix {
pname = "lightline-bufferline";
version = "2021-09-17";
version = "2021-10-05";
src = fetchFromGitHub {
owner = "mengelbrecht";
repo = "lightline-bufferline";
rev = "4d1ddf0508069395ed54e7eb38a47f04fb03a387";
sha256 = "06x3zdfss58ky5z8kgca1gq2zvdqv1nfw3mgnlsj0qq52mj0jwgj";
rev = "61c7c8668b80537aefa69654a6e5a5e63095be61";
sha256 = "0aa7cwzaqzma1w5xyvppj6g3i8kc7199zwd4nhc9ydx9isn885sh";
};
meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/";
};
@ -2928,12 +2928,12 @@ final: prev:
lightspeed-nvim = buildVimPluginFrom2Nix {
pname = "lightspeed.nvim";
version = "2021-09-28";
version = "2021-10-05";
src = fetchFromGitHub {
owner = "ggandor";
repo = "lightspeed.nvim";
rev = "0bc3acda929b946e175d83a5f702d28d231b0089";
sha256 = "1n7wa3hirmrm83w4f9m9wns3alsfmfpzc2r77l9kda012iigm51i";
rev = "9340b1bb6ec9f92939a323889200e3032f8ed6fe";
sha256 = "1w9x9g3l0hnc157fjq0qyz52mr4s6m56zwsmc0l0b53z9prma5mz";
};
meta.homepage = "https://github.com/ggandor/lightspeed.nvim/";
};
@ -3036,12 +3036,12 @@ final: prev:
lspkind-nvim = buildVimPluginFrom2Nix {
pname = "lspkind-nvim";
version = "2021-08-19";
version = "2021-10-06";
src = fetchFromGitHub {
owner = "onsails";
repo = "lspkind-nvim";
rev = "9cc326504e566f467407bae2669a98963c5404d2";
sha256 = "0bbczy2hhdl79g749d41vv5fyfcdd3rsxhi8mbq6avc0vhw72m8c";
rev = "0df591f3001d8c58b7d71a8dc7e006b8cea4959d";
sha256 = "02w8wagfssbail50p1pb6bdjig6y9ns0bbmdal4kfdq797sh4c3n";
};
meta.homepage = "https://github.com/onsails/lspkind-nvim/";
};
@ -3084,12 +3084,12 @@ final: prev:
luasnip = buildVimPluginFrom2Nix {
pname = "luasnip";
version = "2021-10-04";
version = "2021-10-05";
src = fetchFromGitHub {
owner = "l3mon4d3";
repo = "luasnip";
rev = "2f7e2b173386c9a5f26fbc22a765301784893e1c";
sha256 = "02w690fhlhmbjb03958kz5migh8iv5rnmhh3lg8sb08haclh14g3";
rev = "7ae2627a8088f879272f85b9ac97d346ec554521";
sha256 = "0agwval3hpkmgr56jnf6x2yhdy5bqzw4z1vcnh2qbp34yi0r5a07";
};
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
};
@ -3648,12 +3648,12 @@ final: prev:
neovim-ayu = buildVimPluginFrom2Nix {
pname = "neovim-ayu";
version = "2021-09-13";
version = "2021-10-05";
src = fetchFromGitHub {
owner = "Shatur";
repo = "neovim-ayu";
rev = "9841e30f2cff5b1929620565c9289eb561bae75a";
sha256 = "0h25wgv5fvkycfsvw6jb82jl3fb94fvay1ii91yqiailpwa2ig76";
rev = "750d2246d38cd2839356ab8506fc8328a76d33db";
sha256 = "0gg11pswi2alz2khd7ygjhq6kb2nnawpd1f2vvgpc3wpqhp6lk92";
};
meta.homepage = "https://github.com/Shatur/neovim-ayu/";
};
@ -3768,12 +3768,12 @@ final: prev:
nightfox-nvim = buildVimPluginFrom2Nix {
pname = "nightfox.nvim";
version = "2021-10-04";
version = "2021-10-06";
src = fetchFromGitHub {
owner = "EdenEast";
repo = "nightfox.nvim";
rev = "15dfe546111a96e5f30198d5bd163658acdbbe3b";
sha256 = "0a03i8i5fjzffqv4pp29x32ld3h5azvia2a1b3sc5i0bbzishxb5";
rev = "9727b081eaab33e7ba7d6593e85e1ff2c854ecaa";
sha256 = "065bp6aq5kx7kkngjim8q314balbn36aamf71g1aqklxxkkiyfz5";
};
meta.homepage = "https://github.com/EdenEast/nightfox.nvim/";
};
@ -3864,12 +3864,12 @@ final: prev:
null-ls-nvim = buildVimPluginFrom2Nix {
pname = "null-ls.nvim";
version = "2021-10-03";
version = "2021-10-05";
src = fetchFromGitHub {
owner = "jose-elias-alvarez";
repo = "null-ls.nvim";
rev = "1fadae38e9e43cbd20ab238e18c2d6f099607e74";
sha256 = "1jsjsi2i08h9mjj88yzw6hrzphlhzsvqjdm1lkqwmjllklnh3xwk";
rev = "1c482001bd3dc044f973efc474919b33a9994e5a";
sha256 = "120vkg5q8ilnvmymk6zi42bxifabvzr4yc0d83kb7457xk0xkdpz";
};
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
};
@ -3912,12 +3912,12 @@ final: prev:
nvim-autopairs = buildVimPluginFrom2Nix {
pname = "nvim-autopairs";
version = "2021-10-03";
version = "2021-10-05";
src = fetchFromGitHub {
owner = "windwp";
repo = "nvim-autopairs";
rev = "72b2b6428561e692f7d65699eebaf122d7f24c29";
sha256 = "1s01m28v5clx1p1h4q8fga3f3mqsn5w6wlmdcyb3d9qzlzlvwvy1";
rev = "85fd134e6a6d3dfcca43f5f75f0262348ae20dd2";
sha256 = "07mdc7p2ymxvmm810w79n224vx5bpp374r95dxc7v37ngpsv32nz";
};
meta.homepage = "https://github.com/windwp/nvim-autopairs/";
};
@ -3972,12 +3972,12 @@ final: prev:
nvim-cmp = buildVimPluginFrom2Nix {
pname = "nvim-cmp";
version = "2021-09-30";
version = "2021-10-06";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-cmp";
rev = "af70f40d2eb6db2121536c8df2e114af759df537";
sha256 = "1sv6hsfa1anax7dvp9h83m4z50kpg51fzvvmjb15jjfdih5zmcdb";
rev = "a39f72a4634e4bb05371a6674e3e9218cbfc6b20";
sha256 = "04ksgg491nmyy7khdid9j45pv65yp7ksa0q7cr7gvqrh69v55daj";
};
meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
};
@ -4104,12 +4104,12 @@ final: prev:
nvim-gps = buildVimPluginFrom2Nix {
pname = "nvim-gps";
version = "2021-09-30";
version = "2021-10-06";
src = fetchFromGitHub {
owner = "smiteshp";
repo = "nvim-gps";
rev = "e8b068b0e59395e2acf4b1bdc066bd80539704ba";
sha256 = "1342brvmsjgrwb2hzm466hbd7s5dxw7i0dkwcjnipqdw2jvll9vs";
rev = "449dc8b5b34d54504d8331b9fa7eee95520400cc";
sha256 = "1baa9l71dgn2chbkj6p00rkj8xdq6d8icr93w31wmas6470bwgf2";
};
meta.homepage = "https://github.com/smiteshp/nvim-gps/";
};
@ -4176,12 +4176,12 @@ final: prev:
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
version = "2021-10-04";
version = "2021-10-05";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
rev = "30442900db62ff875013b3f1584e8c0a832c43d2";
sha256 = "1v0hmf5sv884l1svvfb20yb5q9vfbc4ap0268hcxc7393al4fs2f";
rev = "66659884c36dadd1f445f9012fcf4e7600286d3e";
sha256 = "1hp3rqk1zfvxgjmllfdh5as9112x54mfa73l3dxawqfv4cfi25w5";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@ -4284,12 +4284,12 @@ final: prev:
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree.lua";
version = "2021-10-03";
version = "2021-10-05";
src = fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-tree.lua";
rev = "29e5b754b7250aded609e8c071804053db5765c6";
sha256 = "14vj1yb570hg3zajvp62pwn75hih22dp2jp63vdfpmalznzwjjbc";
rev = "7ca37f824bc79bcaa8d6a5d8f94295d625269e0e";
sha256 = "0n3m44pykba0vn7440n8s6i7i8ii0r7wcnpdym9vdk4skpn1y3fa";
};
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
};
@ -4524,12 +4524,12 @@ final: prev:
open-browser-vim = buildVimPluginFrom2Nix {
pname = "open-browser.vim";
version = "2021-10-03";
version = "2021-10-05";
src = fetchFromGitHub {
owner = "tyru";
repo = "open-browser.vim";
rev = "3bb313a81922486c419e0a587cf84ef853af3e16";
sha256 = "17bg3vny1rzbyyra7qzzh9p0i00i2ivl96mdd4pbn2zqh77jd2vv";
rev = "80ec3f2bb0a86ac13c998e2f2c86e16e6d2f20bb";
sha256 = "01qj967nch3wwkbshrsdzyyr4apvsqrpa4dkmpn21qr2183w84zz";
};
meta.homepage = "https://github.com/tyru/open-browser.vim/";
};
@ -5041,24 +5041,24 @@ final: prev:
rust-tools-nvim = buildVimPluginFrom2Nix {
pname = "rust-tools.nvim";
version = "2021-10-01";
version = "2021-10-05";
src = fetchFromGitHub {
owner = "simrat39";
repo = "rust-tools.nvim";
rev = "c2aacb9cd51907ec6cce65a683cb2df6ae78a227";
sha256 = "067hjyw7d2wf443bny3m3gjkq3avf3k99xwzkl1yrd4vn321h2kn";
rev = "046f18f2b4af2cd928bdb1736f83fea54efd3dcb";
sha256 = "1h9y5jj90vkl50vfwi1hvhn2z71yhjsfvfldlvwakjx92izn84dm";
};
meta.homepage = "https://github.com/simrat39/rust-tools.nvim/";
};
rust-vim = buildVimPluginFrom2Nix {
pname = "rust.vim";
version = "2021-09-04";
version = "2021-10-05";
src = fetchFromGitHub {
owner = "rust-lang";
repo = "rust.vim";
rev = "c06a17151c69b9d61e60a28274932a28fd37c453";
sha256 = "11ms2has79w2jazvca2mysdbscs1412xmcql0mxc72wrpnws321h";
rev = "4aa69b84c8a58fcec6b6dad6fe244b916b1cf830";
sha256 = "07nh8gvkwq91i7qcz0rk5jlc8sb4d3af4zq2892kmmw576zg1wd8";
};
meta.homepage = "https://github.com/rust-lang/rust.vim/";
};
@ -6174,12 +6174,12 @@ final: prev:
vifm-vim = buildVimPluginFrom2Nix {
pname = "vifm.vim";
version = "2021-10-04";
version = "2021-10-05";
src = fetchFromGitHub {
owner = "vifm";
repo = "vifm.vim";
rev = "69d1d341e6e8c5424be178cc60375b517c9e4d4e";
sha256 = "1zh6jg0ycalwq0dz7b65lrvhr5af6317j12k1s2xl7piabjbhxrx";
rev = "85d7681b004d1a32dd02a5790d713e06f4a251b8";
sha256 = "0f3bq3d0nhxxsdmzq2qb7jjnwf8blkzsbnprqb715f5lqr6diwls";
};
meta.homepage = "https://github.com/vifm/vifm.vim/";
};
@ -6570,12 +6570,12 @@ final: prev:
vim-autoformat = buildVimPluginFrom2Nix {
pname = "vim-autoformat";
version = "2021-09-13";
version = "2021-10-05";
src = fetchFromGitHub {
owner = "vim-autoformat";
repo = "vim-autoformat";
rev = "a65a58db77ad1b5889a68bedbea890c8161b7f8c";
sha256 = "1frvyb3xpd4njh7ixg1ywj8x11ga343kqrmrgncb45scv12i7hx4";
rev = "7d7662e3f958e729ce21fee0ae623e3b2c438e3d";
sha256 = "0ijciwpxjkykk6cc1a55bwbc9kbbac8yq33gh331323gmzm517h8";
};
meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/";
};
@ -7146,12 +7146,12 @@ final: prev:
vim-dirvish = buildVimPluginFrom2Nix {
pname = "vim-dirvish";
version = "2021-09-02";
version = "2021-10-05";
src = fetchFromGitHub {
owner = "justinmk";
repo = "vim-dirvish";
rev = "b2b5709b7979bb99b0548d5879c49672891b9b5b";
sha256 = "076rvky65x7qiplbidmpz4f3is9l77g12bci1h490cni4n3rh73f";
rev = "77eae77073b285f7b6967922447370f2952d4e4d";
sha256 = "0wkz452gchd796h8ysr0xccpk86q8i63mk7ywfrxghf3a7zk0kan";
};
meta.homepage = "https://github.com/justinmk/vim-dirvish/";
};
@ -7290,12 +7290,12 @@ final: prev:
vim-elixir = buildVimPluginFrom2Nix {
pname = "vim-elixir";
version = "2021-09-04";
version = "2021-10-06";
src = fetchFromGitHub {
owner = "elixir-editors";
repo = "vim-elixir";
rev = "7e7f42cf10ba05b6d783de411a6ceca50fe0cc69";
sha256 = "0pfh63qinj1kr612plnixw12rndpv2qz45w1kb9kqddzzp3fjy98";
rev = "8ace05a9a4e225d103a9c06f6d5148d0e07408df";
sha256 = "0b3lk6z5l3bmxkh4syk8jrqh9s0d4kikna23990f3j06k141k6gp";
};
meta.homepage = "https://github.com/elixir-editors/vim-elixir/";
};
@ -8541,12 +8541,12 @@ final: prev:
vim-matchup = buildVimPluginFrom2Nix {
pname = "vim-matchup";
version = "2021-10-01";
version = "2021-10-06";
src = fetchFromGitHub {
owner = "andymass";
repo = "vim-matchup";
rev = "870df0bb741eed49d093268593bce385bd82a41a";
sha256 = "185jbg2i49vknfy64s811dppwgw1d4lq8q97q0rrnvh7w6q88wl8";
rev = "ce323c1ed83866fa28371c800d8d9afb24f1a64d";
sha256 = "16sgpdygilvd3mpqhm61lqiybnq100fdqd826zfvff2cri24dscl";
};
meta.homepage = "https://github.com/andymass/vim-matchup/";
};
@ -9861,12 +9861,12 @@ final: prev:
vim-table-mode = buildVimPluginFrom2Nix {
pname = "vim-table-mode";
version = "2021-09-04";
version = "2021-10-05";
src = fetchFromGitHub {
owner = "dhruvasagar";
repo = "vim-table-mode";
rev = "02d28b932398bb7774def2edaef6f1c0ad92c3e3";
sha256 = "1bh93qfvswb66fj7amhfmhyiyg17rnp28cpq07asm5gccr27ssw7";
rev = "eb42c62812f149f7315552f43e3dd617a43b2ab4";
sha256 = "04cl96qy6db0r07wg5vwhwpbcma53868gy75lfl21is87biz0d6b";
};
meta.homepage = "https://github.com/dhruvasagar/vim-table-mode/";
};
@ -10162,12 +10162,12 @@ final: prev:
vim-ultest = buildVimPluginFrom2Nix {
pname = "vim-ultest";
version = "2021-09-26";
version = "2021-10-05";
src = fetchFromGitHub {
owner = "rcarriga";
repo = "vim-ultest";
rev = "dfea06dc0e8da24338eef3414259055f360449cb";
sha256 = "1h8g3pcwgjlm68rlzb0v9xwbgccklig68pd8i8g18bzw341b622b";
rev = "7861d1925baef8fe3fa313affdfbdcaa6b2af26f";
sha256 = "165klmixdch1nc9cxdldl5yg4q79q58riw0mg0mahqvvr5m1yrw3";
};
meta.homepage = "https://github.com/rcarriga/vim-ultest/";
};
@ -10186,12 +10186,12 @@ final: prev:
vim-unimpaired = buildVimPluginFrom2Nix {
pname = "vim-unimpaired";
version = "2021-09-19";
version = "2021-09-24";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-unimpaired";
rev = "112e23a22ff41d090c2440aeaf12d2a6c5486bc6";
sha256 = "05vc09g91c6zz37p6as3q1fm9c7ahvjih1jd607bhgbzys8342c7";
rev = "39f195d7e66141d7f1fa683927547026501e9961";
sha256 = "0bbiv32brznns82v8s0s2fylcn4j5d3vw4x2kp5h6zb4lqgya30q";
};
meta.homepage = "https://github.com/tpope/vim-unimpaired/";
};
@ -10270,12 +10270,12 @@ final: prev:
vim-vsnip-integ = buildVimPluginFrom2Nix {
pname = "vim-vsnip-integ";
version = "2021-10-02";
version = "2021-10-06";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "vim-vsnip-integ";
rev = "0eee427f96aa11dec031adc104e218775bafc172";
sha256 = "1nb0kbv986vw4nf785s24435pyrya8jn4sjqn0168x5a0j83n2vr";
rev = "8db26e85c12a382db6c34487de2e1512dd7516f5";
sha256 = "1rlaglccvgpaj89lfn41ygykdizlis4wwrw92qxb9raz2a0z9idh";
};
meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/";
};
@ -10727,12 +10727,12 @@ final: prev:
wilder-nvim = buildVimPluginFrom2Nix {
pname = "wilder.nvim";
version = "2021-10-03";
version = "2021-10-06";
src = fetchFromGitHub {
owner = "gelguy";
repo = "wilder.nvim";
rev = "4a98c80aa4e8156f41c972e58a7308a69f9fc87a";
sha256 = "09iv34ha118dm1wdi6hdjs6vmy6la3q01ilalxihqhvwr7hlz48p";
rev = "666b1778031c288615715ebd837acb1f946d83a7";
sha256 = "1sx4rczbvg78gyyap56wa48i2lvy8x6briyp8jv500sh7x89q4zm";
};
meta.homepage = "https://github.com/gelguy/wilder.nvim/";
};

View file

@ -15,7 +15,7 @@ alvan/vim-closetag
alx741/vim-hindent
alx741/vim-stylishask
amiorin/ctrlp-z
andersevenrud/compe-tmux@main
andersevenrud/compe-tmux@cmp
andrep/vimacs
andreshazard/vim-logreview
AndrewRadev/sideways.vim@main

View file

@ -1,6 +1,7 @@
{ lib, buildPackages, fetchFromGitHub, fetchpatch, perl, buildLinux, ... } @ args:
buildLinux (args // {
# NOTE: bcachefs-tools should be updated simultaneously to preserve compatibility
version = "5.13.0-2021.10.01";
modDirVersion = "5.13.0";

View file

@ -7,13 +7,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "calibre-web";
version = "0.6.12";
version = "0.6.13";
src = fetchFromGitHub {
owner = "janeczku";
repo = "calibre-web";
rev = version;
sha256 = "sha256-IgS281qDxG302UznC63nZH8/ty4fgFtn+lLYdakGA4w=";
sha256 = "sha256-zU7ujvFPi4UaaEglIK3YX3TJxBME35NEKKblnJRt0tM=";
};
prePatch = ''
@ -53,6 +53,7 @@ python3.pkgs.buildPythonApplication rec {
flask_login
flask_principal
iso-639
lxml
pypdf3
requests
sqlalchemy

View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "ser2net";
version = "4.3.3";
version = "4.3.4";
src = fetchFromGitHub {
owner = "cminyard";
repo = pname;
rev = "v${version}";
sha256 = "sha256-p8iQifCf/IXXPdbjB3pgcw8FgkqRLShHSSeTzJ83Ecg=";
sha256 = "sha256-J95WDF6x6nHF+r+97E4WdTkXWF98/lx1OSauZTy1/3Q=";
};
passthru = {

View file

@ -22,20 +22,21 @@
stdenv.mkDerivation {
pname = "bcachefs-tools";
version = "unstable-2021-07-08";
version = "unstable-2021-10-01";
src = fetchFromGitHub {
owner = "koverstreet";
repo = "bcachefs-tools";
rev = "050d5f7bcf08bd02f5077a1c5559f352fa449e1e";
sha256 = "15bl9ni0ckmvs5d7hi6v26z690rrmkb7dx00skn6gwq87ffz3imw";
rev = "37850436dd7dfbe67738749c4d4a2506ffff1ec3";
sha256 = "040vgxrimahmfs9rhlggfwg0bzl7h9j2ksx3563rh63asjwlhnhi";
};
postPatch = ''
substituteInPlace Makefile \
--replace "pytest-3" "pytest --verbose" \
--replace "INITRAMFS_DIR=/etc/initramfs-tools" \
"INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools"
"INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools" \
--replace "doc/macro2rst.py" "python3 doc/macro2rst.py"
'';
nativeBuildInputs = [ pkg-config docutils ];

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "vsh";
version = "0.12.0";
version = "0.12.1";
src = fetchFromGitHub {
owner = "fishi0x01";
repo = "vsh";
rev = "v${version}";
sha256 = "059zzsg94287sxlk5clz6in7jscqaq530c84xqgy537f6cq3vr2p";
sha256 = "0skd16j969mb2kgq503wskaw8clyhkw135ny2nsqv5j2zjpr71ap";
};
# vendor directory is part of repository

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2021-10-02";
version = "2021-10-06";
src = fetchFromGitHub {
owner = "offensive-security";
repo = pname;
rev = version;
sha256 = "sha256-gUjFFxzkHHhNMDAgFmmIAuEACSCn1YXuauvjGAkrK6k=";
sha256 = "sha256-MTV6rDgy6FxmdQHoBnDNBwiKEiGj9THqoHJCwUoAoB8=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -31,5 +31,7 @@ let
../development/libraries/agda/functional-linear-algebra { };
generic = callPackage ../development/libraries/agda/generic { };
agdarsec = callPackage ../development/libraries/agda/agdarsec { };
};
in mkAgdaPackages Agda

View file

@ -3767,6 +3767,8 @@ in {
iso-639 = callPackage ../development/python-modules/iso-639 { };
iso4217 = callPackage ../development/python-modules/iso4217 { };
iso8601 = callPackage ../development/python-modules/iso8601 { };
isodate = callPackage ../development/python-modules/isodate { };
@ -6200,6 +6202,8 @@ in {
pyee = callPackage ../development/python-modules/pyee { };
pyefergy = callPackage ../development/python-modules/pyefergy { };
pyeight = callPackage ../development/python-modules/pyeight { };
pyelftools = callPackage ../development/python-modules/pyelftools { };