Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
c77daf4da1
@ -149,7 +149,7 @@ in {
|
||||
|
||||
prunePaths = mkOption {
|
||||
type = listOf path;
|
||||
default = ["/tmp" "/var/tmp" "/var/cache" "/var/lock" "/var/run" "/var/spool" "/nix/store"];
|
||||
default = [ "/tmp" "/var/tmp" "/var/cache" "/var/lock" "/var/run" "/var/spool" "/nix/store" "/nix/var/log/nix" ];
|
||||
description = ''
|
||||
Which paths to exclude from indexing
|
||||
'';
|
||||
|
||||
@ -611,6 +611,7 @@
|
||||
./services/misc/uhub.nix
|
||||
./services/misc/weechat.nix
|
||||
./services/misc/xmr-stak.nix
|
||||
./services/misc/xmrig.nix
|
||||
./services/misc/zigbee2mqtt.nix
|
||||
./services/misc/zoneminder.nix
|
||||
./services/misc/zookeeper.nix
|
||||
|
||||
@ -64,8 +64,6 @@ with lib;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "XMRig Mining Software Service";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ ratsclub ];
|
||||
};
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "logseq";
|
||||
version = "0.4.5";
|
||||
version = "0.4.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
|
||||
sha256 = "EMybZH3heUWeCP74KdFr6zJY1R3hePo6RssbJXrkd9g=";
|
||||
sha256 = "fGRPuv98sr3wcVbkVCJr2yKxBZ/IiQP854T9NBf/vCk=";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
};
|
||||
|
||||
|
||||
@ -125,20 +125,31 @@ let
|
||||
};
|
||||
in runCommand "${pkg.name}-${pkg.version}" {} ''
|
||||
tree=${tree}
|
||||
if grep --quiet '\[workspace\]' "$tree/Cargo.toml"; then
|
||||
# If the target package is in a workspace, find the crate path
|
||||
# using `cargo metadata`.
|
||||
crateCargoTOML=$(${cargo}/bin/cargo metadata --format-version 1 --no-deps --manifest-path $tree/Cargo.toml | \
|
||||
${jq}/bin/jq -r '.packages[] | select(.name == "${pkg.name}") | .manifest_path')
|
||||
|
||||
# If the target package is in a workspace, or if it's the top-level
|
||||
# crate, we should find the crate path using `cargo metadata`.
|
||||
crateCargoTOML=$(${cargo}/bin/cargo metadata --format-version 1 --no-deps --manifest-path $tree/Cargo.toml | \
|
||||
${jq}/bin/jq -r '.packages[] | select(.name == "${pkg.name}") | .manifest_path')
|
||||
|
||||
# If the repository is not a workspace the package might be in a subdirectory.
|
||||
if [[ -z $crateCargoTOML ]]; then
|
||||
for manifest in $(find $tree -name "Cargo.toml"); do
|
||||
echo Looking at $manifest
|
||||
crateCargoTOML=$(${cargo}/bin/cargo metadata --format-version 1 --no-deps --manifest-path "$manifest" | ${jq}/bin/jq -r '.packages[] | select(.name == "${pkg.name}") | .manifest_path' || :)
|
||||
if [[ ! -z $crateCargoTOML ]]; then
|
||||
tree=$(dirname $crateCargoTOML)
|
||||
else
|
||||
>&2 echo "Cannot find path for crate '${pkg.name}-${pkg.version}' in the Cargo workspace in: $tree"
|
||||
exit 1
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
if [[ -z $crateCargoTOML ]]; then
|
||||
>&2 echo "Cannot find path for crate '${pkg.name}-${pkg.version}' in the tree in: $tree"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
echo Found crate ${pkg.name} at $crateCargoTOML
|
||||
tree=$(dirname $crateCargoTOML)
|
||||
|
||||
cp -prvd "$tree/" $out
|
||||
chmod u+w $out
|
||||
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
basicDynamic = callPackage ./basic-dynamic { };
|
||||
gitDependency = callPackage ./git-dependency { };
|
||||
gitDependencyRev = callPackage ./git-dependency-rev { };
|
||||
gitDependencyRevNonWorkspaceNestedCrate = callPackage ./git-dependency-rev-non-workspace-nested-crate { };
|
||||
gitDependencyTag = callPackage ./git-dependency-tag { };
|
||||
gitDependencyBranch = callPackage ./git-dependency-branch { };
|
||||
maturin = callPackage ./maturin { };
|
||||
|
||||
638
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/Cargo.lock
generated
Normal file
638
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/Cargo.lock
generated
Normal file
@ -0,0 +1,638 @@
|
||||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
version = 3
|
||||
|
||||
[[package]]
|
||||
name = "adler"
|
||||
version = "1.0.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
|
||||
|
||||
[[package]]
|
||||
name = "anyhow"
|
||||
version = "1.0.44"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "61604a8f862e1d5c3229fdd78f8b02c68dcf73a4c4b05fd636d12240aaa242c1"
|
||||
|
||||
[[package]]
|
||||
name = "autocfg"
|
||||
version = "1.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "1.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
|
||||
|
||||
[[package]]
|
||||
name = "cargo-test-macro"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/rust-lang/cargo?branch=rust-1.53.0#4369396ce7d270972955d876eaa4954bea56bcd9"
|
||||
|
||||
[[package]]
|
||||
name = "cargo-test-support"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/rust-lang/cargo?branch=rust-1.53.0#4369396ce7d270972955d876eaa4954bea56bcd9"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"cargo-test-macro",
|
||||
"cargo-util",
|
||||
"filetime",
|
||||
"flate2",
|
||||
"git2",
|
||||
"glob",
|
||||
"lazy_static",
|
||||
"remove_dir_all",
|
||||
"serde_json",
|
||||
"tar",
|
||||
"toml",
|
||||
"url",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cargo-util"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/rust-lang/cargo?branch=rust-1.53.0#4369396ce7d270972955d876eaa4954bea56bcd9"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"core-foundation",
|
||||
"crypto-hash",
|
||||
"filetime",
|
||||
"hex 0.4.3",
|
||||
"jobserver",
|
||||
"libc",
|
||||
"log",
|
||||
"miow",
|
||||
"same-file",
|
||||
"shell-escape",
|
||||
"tempfile",
|
||||
"walkdir",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.0.71"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "79c2681d6594606957bbb8631c4b90a7fcaaa72cdb714743a437b156d6a7eedd"
|
||||
dependencies = [
|
||||
"jobserver",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
[[package]]
|
||||
name = "commoncrypto"
|
||||
version = "0.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d056a8586ba25a1e4d61cb090900e495952c7886786fc55f909ab2f819b69007"
|
||||
dependencies = [
|
||||
"commoncrypto-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "commoncrypto-sys"
|
||||
version = "0.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1fed34f46747aa73dfaa578069fd8279d2818ade2b55f38f22a9401c7f4083e2"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "core-foundation"
|
||||
version = "0.9.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6888e10551bb93e424d8df1d07f1a8b4fceb0001a3a4b048bfc47554946f47b3"
|
||||
dependencies = [
|
||||
"core-foundation-sys",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "core-foundation-sys"
|
||||
version = "0.8.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
|
||||
|
||||
[[package]]
|
||||
name = "crc32fast"
|
||||
version = "1.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crypto-hash"
|
||||
version = "0.3.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8a77162240fd97248d19a564a565eb563a3f592b386e4136fb300909e67dddca"
|
||||
dependencies = [
|
||||
"commoncrypto",
|
||||
"hex 0.3.2",
|
||||
"openssl",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "filetime"
|
||||
version = "0.2.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"redox_syscall",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "flate2"
|
||||
version = "1.0.22"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"crc32fast",
|
||||
"libc",
|
||||
"libz-sys",
|
||||
"miniz_oxide",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "foreign-types"
|
||||
version = "0.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
|
||||
dependencies = [
|
||||
"foreign-types-shared",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "foreign-types-shared"
|
||||
version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
|
||||
|
||||
[[package]]
|
||||
name = "form_urlencoded"
|
||||
version = "1.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
|
||||
dependencies = [
|
||||
"matches",
|
||||
"percent-encoding",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "getrandom"
|
||||
version = "0.2.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"wasi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "git-dependency-rev-non-workspace-nested-crate"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"cargo-test-support",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "git2"
|
||||
version = "0.13.23"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2a8057932925d3a9d9e4434ea016570d37420ddb1ceed45a174d577f24ed6700"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"libc",
|
||||
"libgit2-sys",
|
||||
"log",
|
||||
"openssl-probe",
|
||||
"openssl-sys",
|
||||
"url",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "glob"
|
||||
version = "0.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
|
||||
|
||||
[[package]]
|
||||
name = "hex"
|
||||
version = "0.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
|
||||
|
||||
[[package]]
|
||||
name = "hex"
|
||||
version = "0.4.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
|
||||
|
||||
[[package]]
|
||||
name = "idna"
|
||||
version = "0.2.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
|
||||
dependencies = [
|
||||
"matches",
|
||||
"unicode-bidi",
|
||||
"unicode-normalization",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "itoa"
|
||||
version = "0.4.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
|
||||
|
||||
[[package]]
|
||||
name = "jobserver"
|
||||
version = "0.1.24"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "lazy_static"
|
||||
version = "1.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.105"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "869d572136620d55835903746bcb5cdc54cb2851fd0aeec53220b4bb65ef3013"
|
||||
|
||||
[[package]]
|
||||
name = "libgit2-sys"
|
||||
version = "0.12.24+1.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ddbd6021eef06fb289a8f54b3c2acfdd85ff2a585dfbb24b8576325373d2152c"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"libc",
|
||||
"libssh2-sys",
|
||||
"libz-sys",
|
||||
"openssl-sys",
|
||||
"pkg-config",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "libssh2-sys"
|
||||
version = "0.2.23"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b094a36eb4b8b8c8a7b4b8ae43b2944502be3e59cd87687595cf6b0a71b3f4ca"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"libc",
|
||||
"libz-sys",
|
||||
"openssl-sys",
|
||||
"pkg-config",
|
||||
"vcpkg",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "libz-sys"
|
||||
version = "1.1.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"libc",
|
||||
"pkg-config",
|
||||
"vcpkg",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "log"
|
||||
version = "0.4.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "matches"
|
||||
version = "0.1.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
|
||||
|
||||
[[package]]
|
||||
name = "miniz_oxide"
|
||||
version = "0.4.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
|
||||
dependencies = [
|
||||
"adler",
|
||||
"autocfg",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "miow"
|
||||
version = "0.3.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21"
|
||||
dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "once_cell"
|
||||
version = "1.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
|
||||
|
||||
[[package]]
|
||||
name = "openssl"
|
||||
version = "0.10.36"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8d9facdb76fec0b73c406f125d44d86fdad818d66fef0531eec9233ca425ff4a"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"cfg-if",
|
||||
"foreign-types",
|
||||
"libc",
|
||||
"once_cell",
|
||||
"openssl-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "openssl-probe"
|
||||
version = "0.1.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
|
||||
|
||||
[[package]]
|
||||
name = "openssl-sys"
|
||||
version = "0.9.67"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "69df2d8dfc6ce3aaf44b40dec6f487d5a886516cf6879c49e98e0710f310a058"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"cc",
|
||||
"libc",
|
||||
"pkg-config",
|
||||
"vcpkg",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "percent-encoding"
|
||||
version = "2.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
|
||||
|
||||
[[package]]
|
||||
name = "pkg-config"
|
||||
version = "0.3.21"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "10e2fcbb64ecbe64c8e040a386c3104d384583af58b956d870aaaf229df6e66d"
|
||||
|
||||
[[package]]
|
||||
name = "ppv-lite86"
|
||||
version = "0.2.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c3ca011bd0129ff4ae15cd04c4eef202cadf6c51c21e47aba319b4e0501db741"
|
||||
|
||||
[[package]]
|
||||
name = "rand"
|
||||
version = "0.8.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"rand_chacha",
|
||||
"rand_core",
|
||||
"rand_hc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_chacha"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
|
||||
dependencies = [
|
||||
"ppv-lite86",
|
||||
"rand_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_core"
|
||||
version = "0.6.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
|
||||
dependencies = [
|
||||
"getrandom",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_hc"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
|
||||
dependencies = [
|
||||
"rand_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "redox_syscall"
|
||||
version = "0.2.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "remove_dir_all"
|
||||
version = "0.5.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
|
||||
dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ryu"
|
||||
version = "1.0.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
|
||||
|
||||
[[package]]
|
||||
name = "same-file"
|
||||
version = "1.0.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
|
||||
dependencies = [
|
||||
"winapi-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.130"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913"
|
||||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
version = "1.0.68"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8"
|
||||
dependencies = [
|
||||
"itoa",
|
||||
"ryu",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "shell-escape"
|
||||
version = "0.1.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f"
|
||||
|
||||
[[package]]
|
||||
name = "tar"
|
||||
version = "0.4.37"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d6f5515d3add52e0bbdcad7b83c388bb36ba7b754dda3b5f5bc2d38640cdba5c"
|
||||
dependencies = [
|
||||
"filetime",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tempfile"
|
||||
version = "3.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"rand",
|
||||
"redox_syscall",
|
||||
"remove_dir_all",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tinyvec"
|
||||
version = "1.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f83b2a3d4d9091d0abd7eba4dc2710b1718583bd4d8992e2190720ea38f391f7"
|
||||
dependencies = [
|
||||
"tinyvec_macros",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tinyvec_macros"
|
||||
version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
|
||||
|
||||
[[package]]
|
||||
name = "toml"
|
||||
version = "0.5.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
|
||||
dependencies = [
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "unicode-bidi"
|
||||
version = "0.3.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-normalization"
|
||||
version = "0.1.19"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9"
|
||||
dependencies = [
|
||||
"tinyvec",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "url"
|
||||
version = "2.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
|
||||
dependencies = [
|
||||
"form_urlencoded",
|
||||
"idna",
|
||||
"matches",
|
||||
"percent-encoding",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "vcpkg"
|
||||
version = "0.2.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
|
||||
|
||||
[[package]]
|
||||
name = "walkdir"
|
||||
version = "2.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
|
||||
dependencies = [
|
||||
"same-file",
|
||||
"winapi",
|
||||
"winapi-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasi"
|
||||
version = "0.10.2+wasi-snapshot-preview1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
|
||||
|
||||
[[package]]
|
||||
name = "winapi"
|
||||
version = "0.3.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
|
||||
dependencies = [
|
||||
"winapi-i686-pc-windows-gnu",
|
||||
"winapi-x86_64-pc-windows-gnu",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "winapi-i686-pc-windows-gnu"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
|
||||
|
||||
[[package]]
|
||||
name = "winapi-util"
|
||||
version = "0.1.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
|
||||
dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "winapi-x86_64-pc-windows-gnu"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
||||
@ -0,0 +1,8 @@
|
||||
[package]
|
||||
name = "git-dependency-rev-non-workspace-nested-crate"
|
||||
version = "0.1.0"
|
||||
authors = ["Stefan Junker <mail@stefanjunker.de>"]
|
||||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
cargo-test-support = { git = "https://github.com/rust-lang/cargo", branch = "rust-1.53.0" }
|
||||
@ -0,0 +1,31 @@
|
||||
{ rustPlatform, pkg-config, openssl, lib, darwin, stdenv }:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "git-dependency-rev-non-workspace-nested-crate";
|
||||
version = "0.1.0";
|
||||
|
||||
src = ./.;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"cargo-test-macro-0.1.0" = "1yy1y1d523xdzwg1gc77pigbcwsbawmy4b7vw8v21m7q957sk0c4";
|
||||
};
|
||||
};
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
installCheckPhase = ''
|
||||
$out/bin/git-dependency-rev-non-workspace-nested-crate
|
||||
'';
|
||||
}
|
||||
@ -0,0 +1,3 @@
|
||||
fn main() {
|
||||
println!("{}", cargo_test_support::t!(Result::<&str, &str>::Ok("msg")));
|
||||
}
|
||||
52
pkgs/data/icons/la-capitaine-icon-theme/default.nix
Normal file
52
pkgs/data/icons/la-capitaine-icon-theme/default.nix
Normal file
@ -0,0 +1,52 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, breeze-icons
|
||||
, elementary-icon-theme
|
||||
, gnome-icon-theme
|
||||
, hicolor-icon-theme
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "la-capitaine-icon-theme";
|
||||
version = "0.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "keeferrourke";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0id2dddx6rl71472l47vafx968wnklmq6b980br68w82kcvqczzs";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
breeze-icons
|
||||
elementary-icon-theme
|
||||
gnome-icon-theme
|
||||
hicolor-icon-theme
|
||||
];
|
||||
|
||||
dontDropIconThemeCache = true;
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs configure
|
||||
|
||||
substituteInPlace configure \
|
||||
--replace 'DISTRO=$(format "$(lsb_release -si 2>/dev/null)")' 'DISTRO=nixos'
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/icons/$pname
|
||||
cp -a * $out/share/icons/$pname
|
||||
rm $out/share/icons/$pname/{configure,COPYING,LICENSE,*.md}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Icon theme inspired by macOS and Google's Material Design";
|
||||
homepage = "https://github.com/keeferrourke/la-capitaine-icon-theme";
|
||||
license = with licenses; [ gpl3Plus mit ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
};
|
||||
}
|
||||
@ -1,22 +1,35 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, libpng, zlib, qt4,
|
||||
bison, flex, libGLU, python2Packages
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, libpng
|
||||
, zlib
|
||||
, qt4
|
||||
, bison
|
||||
, flex
|
||||
, libGLU
|
||||
, python3Packages
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "seexpr";
|
||||
version = "2.11";
|
||||
version = "3.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wdas";
|
||||
repo = "SeExpr";
|
||||
rev = "v2.11";
|
||||
sha256 = "0a44k56jf6dl36fwgg4zpc252wq5lf9cblg74mp73k82hxw439l4";
|
||||
owner = "wdas";
|
||||
repo = "SeExpr";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-r6mgyb/FGz4KYZOgLDgmIqjO+PSmneD3KUWjymZXtEk=";
|
||||
};
|
||||
|
||||
cmakeFlags = [ "-DENABLE_SSE4=OFF" ];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ libGLU libpng zlib qt4 python2Packages.pyqt4 bison flex ];
|
||||
buildInputs = [ libGLU libpng zlib qt4 python3Packages.pyqt4 python3Packages.boost bison flex ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Embeddable expression evaluation engine from Disney Animation";
|
||||
homepage = "https://www.disneyanimation.com/technology/seexpr.html";
|
||||
homepage = "https://wdas.github.io/SeExpr/";
|
||||
maintainers = with maintainers; [ hodapp ];
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
|
||||
@ -1,6 +0,0 @@
|
||||
set -e
|
||||
source $stdenv/setup
|
||||
|
||||
tar xvf $src
|
||||
mkdir -p $out
|
||||
mv * $out
|
||||
@ -2,13 +2,24 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "mockobjects-0.09";
|
||||
builder = ./builder.sh;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/mockobjects/mockobjects-bin-0.09.tar";
|
||||
sha256 = "18rnyqfcyh0s3dwkkaszdd50ssyjx5fa1y3ii309ldqg693lfgnz";
|
||||
};
|
||||
|
||||
# Work around the "unpacker appears to have produced no directories"
|
||||
setSourceRoot = "sourceRoot=`pwd`";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/java
|
||||
cp mockobjects-*.jar $out/share/java
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Generic unit testing framework and methodology for testing any kind of code";
|
||||
platforms = platforms.unix;
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mautrix";
|
||||
version = "0.10.11";
|
||||
version = "0.11.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b3905fbd1381031b4c54258fdef9e99dd342c3a211abe0b827b2c480db4b1771";
|
||||
sha256 = "sha256-eZ8fWemS808Hz6KoQWfMsk5WfaO+vj0kTyInhtE20Qk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -9,25 +9,34 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-gammu";
|
||||
version = "3.2.3";
|
||||
version = "3.2.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gammu";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-MtFxKRE6CB/LZq9McMyYhjwfs/Rdke9gsNUqbOQdWYQ=";
|
||||
sha256 = "sha256-lFQBrKWwdvUScwsBva08izZVeVDn1u+ldzixtL9YTpA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [ gammu ];
|
||||
buildInputs = [
|
||||
gammu
|
||||
];
|
||||
|
||||
# Check with the next release if tests could be run with pytest
|
||||
# checkInputs = [ pytestCheckHook ];
|
||||
# Don't run tests for now
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "gammu" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"gammu"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python bindings for Gammu";
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ lib, buildDunePackage, fetchurl, makeWrapper
|
||||
, curly, fmt, bos, cmdliner, re, rresult, logs
|
||||
{ lib, buildDunePackage, fetchurl, makeWrapper, fetchpatch
|
||||
, curly, fmt, bos, cmdliner, re, rresult, logs, fpath
|
||||
, odoc, opam-format, opam-core, opam-state, yojson, astring
|
||||
, opam, git, findlib, mercurial, bzip2, gnutar, coreutils
|
||||
, alcotest, mdx
|
||||
, alcotest
|
||||
}:
|
||||
|
||||
# don't include dune as runtime dep, so user can
|
||||
@ -10,33 +10,36 @@
|
||||
let runtimeInputs = [ opam findlib git mercurial bzip2 gnutar coreutils ];
|
||||
in buildDunePackage rec {
|
||||
pname = "dune-release";
|
||||
version = "1.5.0";
|
||||
version = "1.5.2";
|
||||
|
||||
minimumOCamlVersion = "4.06";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ocamllabs/${pname}/releases/download/${version}/${pname}-${version}.tbz";
|
||||
sha256 = "1lyfaczskdbqnhmpiy6wga9437frds3m8prfk2rhwyb96h69y3pv";
|
||||
sha256 = "1r6bz1zz1al5y762ws3w98d8bnyi5ipffajgczixacmbrxvp3zgx";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ curly fmt cmdliner re opam-format opam-state opam-core
|
||||
rresult logs odoc bos yojson astring ];
|
||||
checkInputs = [ alcotest mdx ] ++ runtimeInputs;
|
||||
rresult logs odoc bos yojson astring fpath ];
|
||||
checkInputs = [ alcotest ] ++ runtimeInputs;
|
||||
doCheck = true;
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
patches = [
|
||||
# add missing git config calls to avoid failing due to the lack of a global git config
|
||||
(fetchpatch {
|
||||
name = "tests-missing-git-config.patch";
|
||||
url = "https://github.com/ocamllabs/dune-release/commit/87e7ffe2a9c574620d4e2fc0d79eed8772eab973.patch";
|
||||
sha256 = "0wrzcpzr54dwrdjdc75mijh78xk4bmsmqs1pci06fb2nf03vbd2k";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# remove check for curl in PATH, since curly is patched
|
||||
# to have a fixed path to the binary in nix store
|
||||
sed -i '/must_exist (Cmd\.v "curl"/d' lib/github.ml
|
||||
|
||||
# ignore weird yes error message
|
||||
sed -i 's/yes |/yes 2>\/dev\/null |/' \
|
||||
tests/bin/no_doc/run.t \
|
||||
tests/bin/draft/run.t \
|
||||
tests/bin/url-file/run.t
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
|
||||
@ -77,12 +77,12 @@ final: prev:
|
||||
|
||||
ale = buildVimPluginFrom2Nix {
|
||||
pname = "ale";
|
||||
version = "2021-11-12";
|
||||
version = "2021-11-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dense-analysis";
|
||||
repo = "ale";
|
||||
rev = "76c2293e68a6cad3b192062743d25b8daa082205";
|
||||
sha256 = "1fcc3qy425fp5qrhcgi8gagl2b33wa5m8r9xzqqawk47rkpjx5d0";
|
||||
rev = "8b3b16d71c4c683da6f3ca39662d207a3e894901";
|
||||
sha256 = "1mdxgiin61630fimxm2l0zcr30br4q2ipp84l3iqxjbs0fqg11s5";
|
||||
};
|
||||
meta.homepage = "https://github.com/dense-analysis/ale/";
|
||||
};
|
||||
@ -101,12 +101,12 @@ final: prev:
|
||||
|
||||
aniseed = buildVimPluginFrom2Nix {
|
||||
pname = "aniseed";
|
||||
version = "2021-11-14";
|
||||
version = "2021-10-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Olical";
|
||||
repo = "aniseed";
|
||||
rev = "9c8f2cd17d454a38b11cedd323579b579ee27f9c";
|
||||
sha256 = "1j7nsiikf2bl6h52pa0v2mwhsrk8irq9104jm7hy6a6wz97dqmfb";
|
||||
rev = "4bb3a4c1a1e329ebefa7ff022f7b3947770f7f26";
|
||||
sha256 = "0sd81pagrrwsig1fjm4ly866wcpq4xqpf810a8q1p2bygjs95chx";
|
||||
};
|
||||
meta.homepage = "https://github.com/Olical/aniseed/";
|
||||
};
|
||||
@ -197,12 +197,12 @@ final: prev:
|
||||
|
||||
aurora = buildVimPluginFrom2Nix {
|
||||
pname = "aurora";
|
||||
version = "2021-11-13";
|
||||
version = "2021-11-06";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ray-x";
|
||||
repo = "aurora";
|
||||
rev = "639f60317e7ccaccb6b8b6681b40897308d466b8";
|
||||
sha256 = "0b4nsdkfmd8j0v74fd4yzyx1rm2l4a968g3s9vhckrn9wnyj7khf";
|
||||
rev = "ea1b3e8398acde2659e4430b17f3084c33829fcb";
|
||||
sha256 = "1xwhp8fzasiyym5yqnhdfzrbh59vjf5jl1cc10xrf00kv2l2kvwx";
|
||||
};
|
||||
meta.homepage = "https://github.com/ray-x/aurora/";
|
||||
};
|
||||
@ -473,12 +473,12 @@ final: prev:
|
||||
|
||||
chadtree = buildVimPluginFrom2Nix {
|
||||
pname = "chadtree";
|
||||
version = "2021-11-14";
|
||||
version = "2021-11-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "chadtree";
|
||||
rev = "26068160899310b9029dc7508afe9b996be9b5a4";
|
||||
sha256 = "1hiqval4f02wz0lk54j9jagnn4rj9mfqazmwf1k8rz6zhw0im1fx";
|
||||
rev = "8bf4553d1000b2c9189f1893ac5c737b61572791";
|
||||
sha256 = "1jk795a6r8yzbjbyx121qn65njs4j3l947x3n937kygqpb7paflm";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/chadtree/";
|
||||
};
|
||||
@ -821,12 +821,12 @@ final: prev:
|
||||
|
||||
coc-fzf = buildVimPluginFrom2Nix {
|
||||
pname = "coc-fzf";
|
||||
version = "2021-11-11";
|
||||
version = "2021-10-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "antoinemadec";
|
||||
repo = "coc-fzf";
|
||||
rev = "60828294b9ba846c78893389d4772021043d2fa1";
|
||||
sha256 = "1y7rslksa558fdh3m4m626vpvs424pvxkkk70mr57is47cminm3m";
|
||||
rev = "9fc34a66e6744f52769bb0b95cba851723964faf";
|
||||
sha256 = "0lhvaygicayqpabgmdya6fq7yybch5nd7myjydmcdnpmivzh7mk8";
|
||||
};
|
||||
meta.homepage = "https://github.com/antoinemadec/coc-fzf/";
|
||||
};
|
||||
@ -1098,12 +1098,12 @@ final: prev:
|
||||
|
||||
conjure = buildVimPluginFrom2Nix {
|
||||
pname = "conjure";
|
||||
version = "2021-11-14";
|
||||
version = "2021-10-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Olical";
|
||||
repo = "conjure";
|
||||
rev = "9ed390497a5013aa533a15f5d96f3fb6319b4eb9";
|
||||
sha256 = "0w8akq23s5j5kais5s67f6zpkank9wgms30kzyvq2bpslk9kwvfx";
|
||||
rev = "a2831ac61c44f9fe98a0fb469b02b761d503bc9a";
|
||||
sha256 = "1r1lz397fga204i4a4g6zbaf457wmvb35kpd9m7n8476iay892j7";
|
||||
};
|
||||
meta.homepage = "https://github.com/Olical/conjure/";
|
||||
};
|
||||
@ -1134,12 +1134,12 @@ final: prev:
|
||||
|
||||
Coqtail = buildVimPluginFrom2Nix {
|
||||
pname = "Coqtail";
|
||||
version = "2021-11-11";
|
||||
version = "2021-10-28";
|
||||
src = fetchFromGitHub {
|
||||
owner = "whonore";
|
||||
repo = "Coqtail";
|
||||
rev = "91112aff209866d679fc89ca7d0697938f80e59f";
|
||||
sha256 = "0gp0a56zd1pf31z99yzwjrjq8zhinr68izqx9klj70r0h61hsm2z";
|
||||
rev = "86b9aecfaeaed5db9064b58115ff6dc67b318f7e";
|
||||
sha256 = "10gjlxnga52f21r558xz7pqv63pbqqfw01yl71i0z46y33jnpy14";
|
||||
};
|
||||
meta.homepage = "https://github.com/whonore/Coqtail/";
|
||||
};
|
||||
@ -1170,12 +1170,12 @@ final: prev:
|
||||
|
||||
crates-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "crates.nvim";
|
||||
version = "2021-11-13";
|
||||
version = "2021-11-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "saecki";
|
||||
repo = "crates.nvim";
|
||||
rev = "dea18a76bbe84d1eb80f9474cb33c8efd377c73d";
|
||||
sha256 = "0gc47ixbjb2zf9g0qr2jzq2cmnzgml1lvvv22zdsrk7j8n9kxxqb";
|
||||
rev = "0b17e2bb069cb388ba22d156bbe1b3b3b3585312";
|
||||
sha256 = "1d7gssvw2sl1girj8svbdzlrhxsjgp9rkfkjrr2jd7p5ilhry27a";
|
||||
};
|
||||
meta.homepage = "https://github.com/saecki/crates.nvim/";
|
||||
};
|
||||
@ -1640,12 +1640,12 @@ final: prev:
|
||||
|
||||
diffview-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "diffview.nvim";
|
||||
version = "2021-11-11";
|
||||
version = "2021-10-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sindrets";
|
||||
repo = "diffview.nvim";
|
||||
rev = "a38306ddf893b95b55c6cd881605b3232c658e42";
|
||||
sha256 = "1c55zhxzf3zps7fzqs4vsd81z9la2x3blvjwh45abs93rnqik8nx";
|
||||
rev = "d4ee04c9eb8951dcf1aa83d7a896bededfc68228";
|
||||
sha256 = "0wfrbhnal7y82bhrf446igc6g9avavk2jx0idk5sbv24bqhi9b60";
|
||||
};
|
||||
meta.homepage = "https://github.com/sindrets/diffview.nvim/";
|
||||
};
|
||||
@ -2015,12 +2015,12 @@ final: prev:
|
||||
|
||||
friendly-snippets = buildVimPluginFrom2Nix {
|
||||
pname = "friendly-snippets";
|
||||
version = "2021-11-12";
|
||||
version = "2021-11-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rafamadriz";
|
||||
repo = "friendly-snippets";
|
||||
rev = "05bfa7681b8f11b664fab657001c2efb6f3ec85e";
|
||||
sha256 = "1133f32q4g990mmvdrbnjxggk8y96w0c5zlvh553cz9j626a4zks";
|
||||
rev = "7d4a4c4e57b7aabb9e7d1f591c29e6d5e7e382e4";
|
||||
sha256 = "19z6yjdd7q9hydzx3bw2w8c573y0xjn9s7n780w65n34iirjbh7i";
|
||||
};
|
||||
meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
|
||||
};
|
||||
@ -2207,12 +2207,12 @@ final: prev:
|
||||
|
||||
git-messenger-vim = buildVimPluginFrom2Nix {
|
||||
pname = "git-messenger.vim";
|
||||
version = "2021-11-13";
|
||||
version = "2021-09-29";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rhysd";
|
||||
repo = "git-messenger.vim";
|
||||
rev = "2e67899355f3f631aad6845925e4c2c13546444d";
|
||||
sha256 = "0a6c04far9ji7h7k0b195zxn62sj6drn56cacmz86zmzksqgm8wp";
|
||||
rev = "3f08e210b3f7edd5477a73257eb8d5ca8100ccf0";
|
||||
sha256 = "0wc3jwfyr4pvzhcm3nf4rr3gqllfg0d2r66wl75g69cj6syagjj4";
|
||||
};
|
||||
meta.homepage = "https://github.com/rhysd/git-messenger.vim/";
|
||||
};
|
||||
@ -2255,12 +2255,12 @@ final: prev:
|
||||
|
||||
gitsigns-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "gitsigns.nvim";
|
||||
version = "2021-11-12";
|
||||
version = "2021-11-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lewis6991";
|
||||
repo = "gitsigns.nvim";
|
||||
rev = "bfc4543262442a336e257d2d9fac16aa1de532a9";
|
||||
sha256 = "0339qfryax4sk151p0vk3m5alpdpi52pc9zn2kwq3mqrnqf1q8d2";
|
||||
rev = "e6775fa32e4904cc8bbd098ba9807db9606e816e";
|
||||
sha256 = "1w7vq9jbw3lhd8i9wbf71q344235iwcigff7jrrh3fbcq6kk7m12";
|
||||
};
|
||||
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
|
||||
};
|
||||
@ -2399,12 +2399,12 @@ final: prev:
|
||||
|
||||
gruvbox-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "gruvbox.nvim";
|
||||
version = "2021-11-12";
|
||||
version = "2021-10-27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ellisonleao";
|
||||
repo = "gruvbox.nvim";
|
||||
rev = "dc7c63320c523997610ced545007935c72d81942";
|
||||
sha256 = "16nvlli0vmqxdbcx2d8p2nsl0865444l1d3ji23z9cbz4i171rsw";
|
||||
rev = "526439a61a859936fe85da27fffa927e2dccdb83";
|
||||
sha256 = "1zlvrfyas257j2iqanf4i2kvxa5cdj2n3kg9xk6g8bzsjcsqw4cw";
|
||||
};
|
||||
meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/";
|
||||
};
|
||||
@ -2495,12 +2495,12 @@ final: prev:
|
||||
|
||||
hologram-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "hologram.nvim";
|
||||
version = "2021-11-14";
|
||||
version = "2021-08-01";
|
||||
src = fetchFromGitHub {
|
||||
owner = "edluffy";
|
||||
repo = "hologram.nvim";
|
||||
rev = "1d1acf102de7a5eed7de62691250b064d6db9d8a";
|
||||
sha256 = "0ihr85iisjc3xr9jhm4fdgzhrjr1krnvinzb2x8cgmk7zsl5l194";
|
||||
rev = "5598fea84f0bab236293793a6398fb7fbbf1cbc6";
|
||||
sha256 = "0a5fgnqh475ngv4n4xbxzisvcx9vs1w4qn1k4imh8p61n02q0h8w";
|
||||
};
|
||||
meta.homepage = "https://github.com/edluffy/hologram.nvim/";
|
||||
};
|
||||
@ -2627,12 +2627,12 @@ final: prev:
|
||||
|
||||
indent-blankline-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "indent-blankline.nvim";
|
||||
version = "2021-11-12";
|
||||
version = "2021-11-08";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lukas-reineke";
|
||||
repo = "indent-blankline.nvim";
|
||||
rev = "9f663d31d4ee0672f24cd5b26ca3863665048a25";
|
||||
sha256 = "1lzdi3pgw9hf8pkmh3y8w3lrl27kac18hq4ryk0mghqyb8saabzw";
|
||||
rev = "bc8372815506066f3ca7885baca717cb986957be";
|
||||
sha256 = "0svhinr5qmhcskvakl71yykzxhm6m0ydymx7dp5w0jwsdcv9nnrx";
|
||||
};
|
||||
meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/";
|
||||
};
|
||||
@ -2928,12 +2928,12 @@ final: prev:
|
||||
|
||||
lean-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lean.nvim";
|
||||
version = "2021-11-13";
|
||||
version = "2021-11-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Julian";
|
||||
repo = "lean.nvim";
|
||||
rev = "ab2128f3b44b4314a51beb768cb70666e008a185";
|
||||
sha256 = "0db72fc9vvw7nib4z36r72m9vx1i9950d9npjgrlhhwdmb3sqg38";
|
||||
rev = "27a9bba67bc9114ba9a6f48686ac983f301dd4be";
|
||||
sha256 = "1vcd1i2w9vnkmlhan62s0raa8gigxpdyyzqvn2qqv1rifxzigpfw";
|
||||
};
|
||||
meta.homepage = "https://github.com/Julian/lean.nvim/";
|
||||
};
|
||||
@ -3048,12 +3048,12 @@ final: prev:
|
||||
|
||||
lightline-gruvbox-vim = buildVimPluginFrom2Nix {
|
||||
pname = "lightline-gruvbox.vim";
|
||||
version = "2021-11-12";
|
||||
version = "2018-03-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "shinchu";
|
||||
repo = "lightline-gruvbox.vim";
|
||||
rev = "e94af37820d9c2e6d9eb27c735bb8ef926a66c7e";
|
||||
sha256 = "1wxhxc3aqd0z0giwi8ki5wdarzz6s5bpc5iss7q63w2sbgvbr9sh";
|
||||
rev = "21659af1fc980ebe7de0f475e57c3fda9a82c2d3";
|
||||
sha256 = "0h9br1r5vbrx5cplnk34xlg1kagasj3zn18f8d4ifi0pibyq6pm1";
|
||||
};
|
||||
meta.homepage = "https://github.com/shinchu/lightline-gruvbox.vim/";
|
||||
};
|
||||
@ -3072,12 +3072,12 @@ final: prev:
|
||||
|
||||
lightspeed-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lightspeed.nvim";
|
||||
version = "2021-11-14";
|
||||
version = "2021-11-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggandor";
|
||||
repo = "lightspeed.nvim";
|
||||
rev = "c0ebc350e65b1f7370ec2d5b6f83bdc1ce602761";
|
||||
sha256 = "1p5sdkbp4921ji5prylmr3idqagd0k871bfnbj4dj6fwz65ba75c";
|
||||
rev = "6429028c58a2a64916cb9132743e5301af460c1c";
|
||||
sha256 = "0qhx7axm5vg1xh5j2mg0x3l7154f4n55k28pajrak4yw7ws82232";
|
||||
};
|
||||
meta.homepage = "https://github.com/ggandor/lightspeed.nvim/";
|
||||
};
|
||||
@ -3180,12 +3180,12 @@ final: prev:
|
||||
|
||||
lsp_signature-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lsp_signature.nvim";
|
||||
version = "2021-11-13";
|
||||
version = "2021-11-06";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ray-x";
|
||||
repo = "lsp_signature.nvim";
|
||||
rev = "600111e6249bcc948e2b811ef09adf4ea84ebfc1";
|
||||
sha256 = "0w012936d42m2bs2g8mgg72wkf9mvx4w5m01qdh8daksi1wg86hy";
|
||||
rev = "e5bd090b6d01af8f5d171f4183ff01aaa63a2b99";
|
||||
sha256 = "133bapazws12g2axzw8v9vkigpsdxc708hjlnzfkg0rwbm1pw9sc";
|
||||
};
|
||||
meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
|
||||
};
|
||||
@ -3228,12 +3228,12 @@ final: prev:
|
||||
|
||||
lualine-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lualine.nvim";
|
||||
version = "2021-11-13";
|
||||
version = "2021-11-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-lualine";
|
||||
repo = "lualine.nvim";
|
||||
rev = "e6b6caa93b900c86d8c299d92282feae3934ec39";
|
||||
sha256 = "015pmiag8yj3ngqp6wq1mmsnwln2fq83nbji9c6z7p49cibk1anv";
|
||||
rev = "df46c1e70a0aeb234aa9d2048d14f626a1cca317";
|
||||
sha256 = "0khkkicwcnrwpd9scdsggia916ws6hvpyx0gnszg43zq74q5h27q";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/";
|
||||
};
|
||||
@ -3372,12 +3372,12 @@ final: prev:
|
||||
|
||||
mkdx = buildVimPluginFrom2Nix {
|
||||
pname = "mkdx";
|
||||
version = "2021-11-12";
|
||||
version = "2021-07-05";
|
||||
src = fetchFromGitHub {
|
||||
owner = "SidOfc";
|
||||
repo = "mkdx";
|
||||
rev = "aeb41655826fbeb6c412b32f2cd3acd1c7e5e958";
|
||||
sha256 = "14bslsyrxc1x13mijybcinx39nmc3gp3skn05i537xzl7lq5dnlr";
|
||||
rev = "439c518cea989c875eea44ce54a36f7e7dc561d9";
|
||||
sha256 = "19b155lfiynm450cr9acm7dk58hh2ynrs3zpvrcll7slz8fgrhql";
|
||||
};
|
||||
meta.homepage = "https://github.com/SidOfc/mkdx/";
|
||||
};
|
||||
@ -4036,20 +4036,20 @@ final: prev:
|
||||
src = fetchFromGitHub {
|
||||
owner = "MunifTanjim";
|
||||
repo = "nui.nvim";
|
||||
rev = "e940b57f30f6035df690fb24b1e5c93ae6aafcd6";
|
||||
sha256 = "0nvg3zsgqbk0gs978gzfkc57xn3wcn1mcsf6qrgc1xz4jxdd582m";
|
||||
rev = "a07b754552008012f2d7d3602b7a233a29d92c66";
|
||||
sha256 = "19ffxpmq82f9qxbnb2lw2hvc9gqc1vfyvf553wpc439rpi98mxja";
|
||||
};
|
||||
meta.homepage = "https://github.com/MunifTanjim/nui.nvim/";
|
||||
};
|
||||
|
||||
null-ls-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "null-ls.nvim";
|
||||
version = "2021-11-12";
|
||||
version = "2021-11-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jose-elias-alvarez";
|
||||
repo = "null-ls.nvim";
|
||||
rev = "a3ded9b1525b06136e58a95f4d9ed2f090c0f908";
|
||||
sha256 = "0xc909lw73fbmmfvzvqwkba2akyv0c2msdfk94gcvxlm3dk910ng";
|
||||
rev = "2bf885dda0ecb669ef66d1c757287c98f6c16500";
|
||||
sha256 = "1303gpdr5yzxznx0djn5q09p1vibh15d0nmj1j6n2zqbjdx6bhfw";
|
||||
};
|
||||
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
|
||||
};
|
||||
@ -4116,12 +4116,12 @@ final: prev:
|
||||
|
||||
nvim-bqf = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-bqf";
|
||||
version = "2021-11-13";
|
||||
version = "2021-11-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kevinhwang91";
|
||||
repo = "nvim-bqf";
|
||||
rev = "ee370769ea2d6da807533a4c2b8f55ef057d4477";
|
||||
sha256 = "1xxab1pwnvlhy9mgyyvck8w3acz7cmjpqpl2mdc3z6gagqbjjrll";
|
||||
rev = "3ef30d2a754f6b47d6c696add0276519f9a8a2cf";
|
||||
sha256 = "1rd18r4113fpg7ihw87l7xprh5dpddx8s7g68qazbrxgmf1xbmd7";
|
||||
};
|
||||
meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";
|
||||
};
|
||||
@ -4152,12 +4152,12 @@ final: prev:
|
||||
|
||||
nvim-cmp = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-cmp";
|
||||
version = "2021-11-13";
|
||||
version = "2021-11-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrsh7th";
|
||||
repo = "nvim-cmp";
|
||||
rev = "753f5b7c92da0302efffc5ce6780dffe0602bdf3";
|
||||
sha256 = "0b9il665jjc94bp8gdvj4ra5qsbpcfjkvlsvi8miylanfycfmqy5";
|
||||
rev = "af06bd4b440c4da6b363ec2c3feb49bc0cda5510";
|
||||
sha256 = "0ckvm3kggnfqv4ngaxpl4zikbs2pwbqgy5x9fqzrdj2vydfm85wp";
|
||||
};
|
||||
meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
|
||||
};
|
||||
@ -4224,12 +4224,12 @@ final: prev:
|
||||
|
||||
nvim-dap = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-dap";
|
||||
version = "2021-11-12";
|
||||
version = "2021-10-29";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mfussenegger";
|
||||
repo = "nvim-dap";
|
||||
rev = "1a87456d280e8e308df7983650a5ea2b5a6bfb63";
|
||||
sha256 = "119cmq8bnm35l7vdlf83dkldk3jxdkdjsqw98b5hs437xrjwfhjr";
|
||||
rev = "dd778f65dc95323f781f291fb7c5bf3c17d057b1";
|
||||
sha256 = "1nvn03rx7gvrdvfmgsmwm2ncgsyizqyvgv92v7cvfa3jv30vfb0a";
|
||||
};
|
||||
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
|
||||
};
|
||||
@ -4284,24 +4284,24 @@ final: prev:
|
||||
|
||||
nvim-gps = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-gps";
|
||||
version = "2021-11-14";
|
||||
version = "2021-11-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "smiteshp";
|
||||
repo = "nvim-gps";
|
||||
rev = "4805df6a5858aea5ccff56a6d706c96fb746c5d7";
|
||||
sha256 = "13jmdnz9wxgqm5gcys42flfnwgj0pdwlcgx2vkmncfmg675fgfq6";
|
||||
rev = "14653c92c93b2e00a8cc742ee109f510350afc2a";
|
||||
sha256 = "13i1pyd5ibmczyw3r2wrhrislkych994487iv5202zv0jn6jaglm";
|
||||
};
|
||||
meta.homepage = "https://github.com/smiteshp/nvim-gps/";
|
||||
};
|
||||
|
||||
nvim-highlite = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-highlite";
|
||||
version = "2021-11-11";
|
||||
version = "2021-11-06";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Iron-E";
|
||||
repo = "nvim-highlite";
|
||||
rev = "c0f6d68ea245fd2efb527fe1b7874c48084d8150";
|
||||
sha256 = "1nai09x1sc9wvz2m5j4rj6wjpdhwk88v4sapdmvb5pqvrqqylg60";
|
||||
rev = "61773fc76e0d78c1223f158605f1cd698dc83a94";
|
||||
sha256 = "1p3hz5ap16yf3720l682sclal4ycqmqa4kaiw5ljz57jg070ckz8";
|
||||
};
|
||||
meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
|
||||
};
|
||||
@ -4344,12 +4344,12 @@ final: prev:
|
||||
|
||||
nvim-lightbulb = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-lightbulb";
|
||||
version = "2021-11-13";
|
||||
version = "2021-10-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kosayoda";
|
||||
repo = "nvim-lightbulb";
|
||||
rev = "cd5267d2d708e908dbd668c7de74e1325eb1e1da";
|
||||
sha256 = "1ans2kzg750d4a83hk5p9x5h51m9ywxgk6bxrcj1pwnpkhl5h75z";
|
||||
rev = "66223954d7bd7d4358c36d157c25503168d04319";
|
||||
sha256 = "0jghq2fkvibilb1zglkckhpmq6dgi1q87fcwpvcv9slk1qlgw19d";
|
||||
};
|
||||
meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/";
|
||||
};
|
||||
@ -4380,12 +4380,12 @@ final: prev:
|
||||
|
||||
nvim-lspconfig = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-lspconfig";
|
||||
version = "2021-11-13";
|
||||
version = "2021-11-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neovim";
|
||||
repo = "nvim-lspconfig";
|
||||
rev = "4191b1fca3bafe759ae5606d19e0f0e54e9fc83b";
|
||||
sha256 = "0fd7a9b0930kwd4c6hzfbqz6zq95skf06gc3nvb8g5my82xh5i2s";
|
||||
rev = "edca6c107027111ed02abe17a231d1cf0d353adf";
|
||||
sha256 = "13abx9r8p9admskallw3y1dqia288xm6l3l6idshih6wbmkx2jk2";
|
||||
};
|
||||
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
|
||||
};
|
||||
@ -4416,12 +4416,12 @@ final: prev:
|
||||
|
||||
nvim-notify = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-notify";
|
||||
version = "2021-11-12";
|
||||
version = "2021-11-02";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rcarriga";
|
||||
repo = "nvim-notify";
|
||||
rev = "54375b724637eb6f29085c582318ae1fd042e717";
|
||||
sha256 = "1zli6vpcyk8ving7x7lh5nwgkf020rh5dixxsmiq6p8xhgi7hg53";
|
||||
rev = "ee79a5e2f8bde0ebdf99880a98d1312da83a3caa";
|
||||
sha256 = "1krpd6jqy73kqf63yyyp4crkrnb80hi23wks6rf31mag6ry1xr27";
|
||||
};
|
||||
meta.homepage = "https://github.com/rcarriga/nvim-notify/";
|
||||
};
|
||||
@ -4464,12 +4464,12 @@ final: prev:
|
||||
|
||||
nvim-spectre = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-spectre";
|
||||
version = "2021-11-14";
|
||||
version = "2021-11-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "windwp";
|
||||
repo = "nvim-spectre";
|
||||
rev = "b630e04fa176ffb4e8c188b651561973a5ace077";
|
||||
sha256 = "1x0ndsgywkjb51y3zqhaxkrv9g7qjra6is3cxgiszl18d42g7nrd";
|
||||
rev = "9502f162a43d18d03f6d11e2152aee39b1ed5adb";
|
||||
sha256 = "1czj2jbls3ci35mbvvzb7x2zzh3aw2rz42bvfx45ibpw6iabdgky";
|
||||
};
|
||||
meta.homepage = "https://github.com/windwp/nvim-spectre/";
|
||||
};
|
||||
@ -4584,12 +4584,12 @@ final: prev:
|
||||
|
||||
nvim-web-devicons = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-web-devicons";
|
||||
version = "2021-11-12";
|
||||
version = "2021-10-08";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kyazdani42";
|
||||
repo = "nvim-web-devicons";
|
||||
rev = "f936ff3e1f9d58ec0caf0bd398e9675b54fe292e";
|
||||
sha256 = "1vzrsr2m75nky1nz5hji7chqcc3d601bkx7raq88pjw4qa3s7b1r";
|
||||
rev = "ee101462d127ed6a5561ce9ce92bfded87d7d478";
|
||||
sha256 = "097i8x5yyr0krq4jn5zwn6lild8dwv7yqdmlgrwbmywad32vfyh2";
|
||||
};
|
||||
meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/";
|
||||
};
|
||||
@ -4740,24 +4740,24 @@ final: prev:
|
||||
|
||||
orgmode-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "orgmode.nvim";
|
||||
version = "2021-11-14";
|
||||
version = "2021-11-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kristijanhusak";
|
||||
repo = "orgmode.nvim";
|
||||
rev = "25e1fec55362124a8300108c88bd7127e09dad03";
|
||||
sha256 = "0yhdyiwbwwg7m57983pnlawjgzm40dg77jy8dk4gb2183ldk8srs";
|
||||
rev = "93779c1eed34da14ab8082933fb1e3d47869d07f";
|
||||
sha256 = "145460q9a9f4jp8l8pfqi5rf12vvz05g4jfd70h65i7i55l2v37j";
|
||||
};
|
||||
meta.homepage = "https://github.com/kristijanhusak/orgmode.nvim/";
|
||||
};
|
||||
|
||||
package-info-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "package-info.nvim";
|
||||
version = "2021-11-13";
|
||||
version = "2021-11-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vuki656";
|
||||
repo = "package-info.nvim";
|
||||
rev = "8656a9305afe828b7b2664a571d309090043a0ac";
|
||||
sha256 = "0w5n1523d8la66d43w735lj57gmksj936kvlhwggmqyv64zw7jfz";
|
||||
rev = "037bedfa881d60f0ece93c31f31d04cf3ca29a87";
|
||||
sha256 = "0gflgccj0ymgv89paq9dp54f56g0wwz7m56sdfdycjii491q5hm4";
|
||||
};
|
||||
meta.homepage = "https://github.com/vuki656/package-info.nvim/";
|
||||
};
|
||||
@ -4872,12 +4872,12 @@ final: prev:
|
||||
|
||||
plenary-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "plenary.nvim";
|
||||
version = "2021-11-14";
|
||||
version = "2021-11-08";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-lua";
|
||||
repo = "plenary.nvim";
|
||||
rev = "1c31adb35fcebe921f65e5c6ff6d5481fa5fa5ac";
|
||||
sha256 = "075b6ak0hl3wqhsy1qmi91s30lh6p6vpbvqllzvyhlz3pxabh314";
|
||||
rev = "b42e0cfe22ad3a0cac35cf14315e9dc22cea2ec9";
|
||||
sha256 = "09is80vcmnp0w42nahsqwliiyiyv64s9x459rl2dk4mnr7hgi7fm";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
|
||||
};
|
||||
@ -5149,12 +5149,12 @@ final: prev:
|
||||
|
||||
refactoring-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "refactoring.nvim";
|
||||
version = "2021-11-12";
|
||||
version = "2021-11-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "theprimeagen";
|
||||
repo = "refactoring.nvim";
|
||||
rev = "2fbbae64c6c27dfab5c9fae2e520bef9f778bdd8";
|
||||
sha256 = "02mi4jbpiya3sdx1f69wyhilmjis5w7bqx562335xmw7z84ksmz7";
|
||||
rev = "c3fea5e8b377b07cd744579f8ca65e3f805ddaad";
|
||||
sha256 = "0rbn1mnyn9dhxv48qngs71n8pw25fmyaaffqgrk3qxfc1rxihf4a";
|
||||
};
|
||||
meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";
|
||||
};
|
||||
@ -5269,12 +5269,12 @@ final: prev:
|
||||
|
||||
rust-tools-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "rust-tools.nvim";
|
||||
version = "2021-11-13";
|
||||
version = "2021-11-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "simrat39";
|
||||
repo = "rust-tools.nvim";
|
||||
rev = "8d0fe8490258f3439aaf132fa7cb71299995bf5e";
|
||||
sha256 = "1rbmlkyidng1s635cq4sv415p0231pnqsmds4q2fkzj2mn41wcsh";
|
||||
rev = "488a79a053525fd1b3ceacb9b0675ebd0ed95dc0";
|
||||
sha256 = "13vks86lswp9xl934nqmgsdwx2jkjyz4qzm806ln2mz0mwmjk7zx";
|
||||
};
|
||||
meta.homepage = "https://github.com/simrat39/rust-tools.nvim/";
|
||||
};
|
||||
@ -5317,12 +5317,12 @@ final: prev:
|
||||
|
||||
SchemaStore-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "SchemaStore.nvim";
|
||||
version = "2021-11-12";
|
||||
version = "2021-11-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "b0o";
|
||||
repo = "SchemaStore.nvim";
|
||||
rev = "23aa17e29c081531a14c03802523ba5e29444de5";
|
||||
sha256 = "0890wncvhly5pg39sj2lyi6gnhlhj4v7bvaak9mn03pbzvljx3yi";
|
||||
rev = "6b3ec7db13a9935d5d948fb0985707181e07979d";
|
||||
sha256 = "18inch8c1n9b835igw8brvmxh4c8pl9cq8qiv3v64fry2pv59mqd";
|
||||
};
|
||||
meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
|
||||
};
|
||||
@ -5606,12 +5606,12 @@ final: prev:
|
||||
|
||||
specs-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "specs.nvim";
|
||||
version = "2021-11-12";
|
||||
version = "2021-05-05";
|
||||
src = fetchFromGitHub {
|
||||
owner = "edluffy";
|
||||
repo = "specs.nvim";
|
||||
rev = "e043580a65409ea071dfe34e94284959fd24e3be";
|
||||
sha256 = "1sg2i99ncx5j7al3mhwpnwyx1hila5gars0ak7q3n9yr4013i7dx";
|
||||
rev = "a62319a224b73b70af47a48ba076d7ec67b08526";
|
||||
sha256 = "1hs7qp3fr451ziddv08nyygnxx1n6y32fr0y97s9zjc7j13d3nc3";
|
||||
};
|
||||
meta.homepage = "https://github.com/edluffy/specs.nvim/";
|
||||
};
|
||||
@ -5691,12 +5691,12 @@ final: prev:
|
||||
|
||||
stabilize-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "stabilize.nvim";
|
||||
version = "2021-11-13";
|
||||
version = "2021-11-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "luukvbaal";
|
||||
repo = "stabilize.nvim";
|
||||
rev = "0026672d4b6fc922bd6f80df9a2858ce1e8cc0ed";
|
||||
sha256 = "0667yh9yprym7vakm83x174srb2x2ch9q97137qlj28acks3wnqh";
|
||||
rev = "fd74d2a9d2a384a530eba3a9771a5396b4ddad26";
|
||||
sha256 = "190mf9w344db5civ122l7zdr63l811qcqf7shh89zx4qfrsllf43";
|
||||
};
|
||||
meta.homepage = "https://github.com/luukvbaal/stabilize.nvim/";
|
||||
};
|
||||
@ -6065,12 +6065,12 @@ final: prev:
|
||||
|
||||
telescope-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "telescope.nvim";
|
||||
version = "2021-11-14";
|
||||
version = "2021-11-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-telescope";
|
||||
repo = "telescope.nvim";
|
||||
rev = "729492406ec3b545c4ecf2beadf7bd30c81e70e4";
|
||||
sha256 = "0vh0r1149xqniggjdr6b92rniwcq5879y01glnsz8rzf6n236zwc";
|
||||
rev = "f3ef5920725d719ed23195a457a86015826d3e1d";
|
||||
sha256 = "1dhczp84lhsz1ikqprg552wqi0hncigvhfb726iz01cr9y25b8mg";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
|
||||
};
|
||||
@ -6438,12 +6438,12 @@ final: prev:
|
||||
|
||||
vifm-vim = buildVimPluginFrom2Nix {
|
||||
pname = "vifm.vim";
|
||||
version = "2021-11-13";
|
||||
version = "2021-11-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vifm";
|
||||
repo = "vifm.vim";
|
||||
rev = "225e5ada593fda06504e0c469e98e41d3b739b03";
|
||||
sha256 = "0vrawikhv86f2g7qp8p28zcns3vfm1fyaqm1nml0hk3h4xzwnapa";
|
||||
rev = "7aee389c0ada5677eff5872195c0e3a47c20cb76";
|
||||
sha256 = "17hph035igj8b0m8dc3qw76w7mq47rzbm7n513npfy367vicably";
|
||||
};
|
||||
meta.homepage = "https://github.com/vifm/vifm.vim/";
|
||||
};
|
||||
@ -6702,12 +6702,12 @@ final: prev:
|
||||
|
||||
vim-airline = buildVimPluginFrom2Nix {
|
||||
pname = "vim-airline";
|
||||
version = "2021-11-12";
|
||||
version = "2021-11-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vim-airline";
|
||||
repo = "vim-airline";
|
||||
rev = "4b96f58902a34abda87fd3105e9d47a08801a891";
|
||||
sha256 = "05fn2485098kml90n5wc0qla7wwjcrz0lkhkr9qgdv4bvc9g3hyn";
|
||||
rev = "47bf6b1716d599fa19756ce094309a3d551fac73";
|
||||
sha256 = "1c2sqkyd0zha9pchh1lbyww7v281rr488ff5b1c2rkc6inya9lcd";
|
||||
};
|
||||
meta.homepage = "https://github.com/vim-airline/vim-airline/";
|
||||
};
|
||||
@ -7163,7 +7163,7 @@ final: prev:
|
||||
owner = "flazz";
|
||||
repo = "vim-colorschemes";
|
||||
rev = "fd8f122cef604330c96a6a6e434682dbdfb878c9";
|
||||
sha256 = "0kpsf6j20fgblc8vhqn7ymr52v2d1h52vc7rbxmxfwdm80nvv3g5";
|
||||
sha256 = "1cg8q7w0vgl73aw1b9zz0zh5vw5d2pm8pm54fhfzva4azg56f416";
|
||||
};
|
||||
meta.homepage = "https://github.com/flazz/vim-colorschemes/";
|
||||
};
|
||||
@ -7962,12 +7962,12 @@ final: prev:
|
||||
|
||||
vim-glsl = buildVimPluginFrom2Nix {
|
||||
pname = "vim-glsl";
|
||||
version = "2021-11-13";
|
||||
version = "2021-09-05";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tikhomirov";
|
||||
repo = "vim-glsl";
|
||||
rev = "25f9a7dfca64787313fb4339866ff941b8974d61";
|
||||
sha256 = "0dm0nmglf7sr9rkxq4ya14pg1wrqfbv6pigj2f1hb0gf1n9bd6rz";
|
||||
rev = "373e4ec58f725910ea242e79ce03fe21f100b6e3";
|
||||
sha256 = "0hf583fkrkq0y38ic9m0rl1p2h1s6fq8gx9gxk64hh6ibqxdicgz";
|
||||
};
|
||||
meta.homepage = "https://github.com/tikhomirov/vim-glsl/";
|
||||
};
|
||||
@ -8516,12 +8516,12 @@ final: prev:
|
||||
|
||||
vim-kitty-navigator = buildVimPluginFrom2Nix {
|
||||
pname = "vim-kitty-navigator";
|
||||
version = "2021-11-12";
|
||||
version = "2021-08-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "knubie";
|
||||
repo = "vim-kitty-navigator";
|
||||
rev = "17b67e86fe25657473b6d191b1f686ef8f451e8d";
|
||||
sha256 = "1v1aw2964f5fmfdaymdc1inrw8a0yx3scdcqnxzm2b58l735hbk6";
|
||||
rev = "a58f56960933df0b34b98ba3b025995774315adc";
|
||||
sha256 = "16vz20fvhbb2p9g68qix9s4fbr9adrgwc45g12ldi7bdgkr1006g";
|
||||
};
|
||||
meta.homepage = "https://github.com/knubie/vim-kitty-navigator/";
|
||||
};
|
||||
@ -10402,12 +10402,12 @@ final: prev:
|
||||
|
||||
vim-tpipeline = buildVimPluginFrom2Nix {
|
||||
pname = "vim-tpipeline";
|
||||
version = "2021-11-12";
|
||||
version = "2021-11-02";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vimpostor";
|
||||
repo = "vim-tpipeline";
|
||||
rev = "be9cd2c8cd007088f69019f18fb61aff457adb8c";
|
||||
sha256 = "1r2wvkgziil4bik3g7b19cscg17skhx98pgsvm2m00czrrfdxq6v";
|
||||
rev = "065cf18295fa8d08ab2d458c67ea6281c81bbd26";
|
||||
sha256 = "0l0zp64jzhdyrlgfplqkpsl0jbpxkr4sijymqsiabjiyvc8p6qc7";
|
||||
};
|
||||
meta.homepage = "https://github.com/vimpostor/vim-tpipeline/";
|
||||
};
|
||||
@ -10630,12 +10630,12 @@ final: prev:
|
||||
|
||||
vim-which-key = buildVimPluginFrom2Nix {
|
||||
pname = "vim-which-key";
|
||||
version = "2021-11-12";
|
||||
version = "2021-09-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "liuchengxu";
|
||||
repo = "vim-which-key";
|
||||
rev = "7e3819a91a7710ce561a9c11a22a82b9437a2533";
|
||||
sha256 = "0hx5ar663ai25jj7p44sl2nn2n0jj2iif5ybx5ic7cxz4qy477wn";
|
||||
rev = "2c915b6de918c073fbd83809e51343651f00f9a8";
|
||||
sha256 = "05jdjmpyczcgqsm5mznyb79bq10ianv7v3rhxy9wrklkama3jrgs";
|
||||
};
|
||||
meta.homepage = "https://github.com/liuchengxu/vim-which-key/";
|
||||
};
|
||||
@ -10895,12 +10895,12 @@ final: prev:
|
||||
|
||||
vimtex = buildVimPluginFrom2Nix {
|
||||
pname = "vimtex";
|
||||
version = "2021-11-13";
|
||||
version = "2021-11-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lervag";
|
||||
repo = "vimtex";
|
||||
rev = "228bfcfbf8766a39e2e582af13a8fb95b93a6a0a";
|
||||
sha256 = "0kpzdk8p8nxj76iqnzkjprymw6bykqr53nkipy4wiajv1940xpvq";
|
||||
rev = "c63adb6958458b62a7b9c0e4156d11a5da5f1a9f";
|
||||
sha256 = "07q4wmckz2a1x2l11pa1m5dqbk8wz0slk28p7wcapwfn5lxf48jq";
|
||||
};
|
||||
meta.homepage = "https://github.com/lervag/vimtex/";
|
||||
};
|
||||
@ -11136,12 +11136,12 @@ final: prev:
|
||||
|
||||
YouCompleteMe = buildVimPluginFrom2Nix {
|
||||
pname = "YouCompleteMe";
|
||||
version = "2021-11-13";
|
||||
version = "2021-11-05";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ycm-core";
|
||||
repo = "YouCompleteMe";
|
||||
rev = "2badfc08d1e6c64403d6a5d5b42e4a3b78b4b43c";
|
||||
sha256 = "0vf5afg6ysd9f48ndglxr40q8smah9dwsbxq6nzqy514xg1bqxbj";
|
||||
rev = "166f499cb1e7c0f445d0ffd8d280329f3942b93b";
|
||||
sha256 = "10p7nfjv76q5lf367a56dn4k2f70xdz28r3w0c28laym49jfm5wd";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";
|
||||
|
||||
@ -1,7 +1,23 @@
|
||||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p curl jq unzip
|
||||
# shellcheck shell=bash
|
||||
set -eu -o pipefail
|
||||
|
||||
# can be added to your configuration with the following command and snippet:
|
||||
# $ ./pkgs/misc/vscode-extensions/update_installed_exts.sh > extensions.nix
|
||||
#
|
||||
# packages = with pkgs;
|
||||
# (vscode-with-extensions.override {
|
||||
# vscodeExtensions = map
|
||||
# (extension: vscode-utils.buildVscodeMarketplaceExtension {
|
||||
# mktplcRef = {
|
||||
# inherit (extension) name publisher version sha256;
|
||||
# };
|
||||
# })
|
||||
# (import ./extensions.nix).extensions;
|
||||
# })
|
||||
# ]
|
||||
|
||||
# Helper to just fail with a message and non-zero exit code.
|
||||
function fail() {
|
||||
echo "$1" >&2
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "i7z";
|
||||
version = "0.27.3";
|
||||
version = "0.27.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DimitryAndric";
|
||||
repo = "i7z";
|
||||
rev = "v${version}";
|
||||
sha256 = "0l8wz0ffb27nkwchc606js652spk8masy3kjmzh7ygipwsary5ds";
|
||||
sha256 = "00c4ng30ry88hcya4g1i9dngiqmz3cs31x7qh1a10nalxn1829xy";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses ] ++ lib.optional withGui qtbase;
|
||||
|
||||
@ -748,11 +748,18 @@ let
|
||||
|
||||
BSD_PROCESS_ACCT_V3 = yes;
|
||||
|
||||
SERIAL_DEV_BUS = whenAtLeast "4.11" yes; # enables support for serial devices
|
||||
SERIAL_DEV_CTRL_TTYPORT = whenAtLeast "4.11" yes; # enables support for TTY serial devices
|
||||
|
||||
BT_HCIBTUSB_MTK = whenAtLeast "5.3" yes; # MediaTek protocol support
|
||||
BT_HCIUART_QCA = whenAtLeast "4.3" yes; # Qualcomm Atheros protocol support
|
||||
BT_HCIUART_SERDEV = whenAtLeast "4.12" yes; # required by BT_HCIUART_QCA
|
||||
BT_HCIUART = whenAtLeast "2.5.45" module; # required for BT devices with serial port interface (QCA6390)
|
||||
BT_HCIUART_BCSP = option yes;
|
||||
BT_HCIUART_H4 = option yes; # UART (H4) protocol support
|
||||
BT_HCIUART_LL = option yes;
|
||||
BT_RFCOMM_TTY = option yes; # RFCOMM TTY support
|
||||
BT_QCA = whenAtLeast "4.3" module; # enables QCA6390 bluetooth
|
||||
|
||||
CLEANCACHE = option yes;
|
||||
CRASH_DUMP = option no;
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "grocy";
|
||||
version = "3.1.2";
|
||||
version = "3.1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/grocy/grocy/releases/download/v${version}/grocy_${version}.zip";
|
||||
sha256 = "sha256-Kw2UA3jJEfGPr9jMnDmJ4GW87fwM80pQpqTz9ugXzow=";
|
||||
sha256 = "sha256-6vgnV9HQHwJGUHGxAMXxXXiEj2kNTWqGcHnpPHvma/Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
@ -1,4 +0,0 @@
|
||||
source $stdenv/setup
|
||||
|
||||
mkdir -p $out/lib
|
||||
ln -s $mysql_jdbc/share/java/mysql-connector-java.jar $out/lib/mysql-connector-java.jar
|
||||
@ -2,12 +2,19 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "tomcat-mysql-jdbc";
|
||||
builder = ./builder.sh;
|
||||
buildInputs = [ mysql_jdbc ];
|
||||
|
||||
inherit mysql_jdbc;
|
||||
version = mysql_jdbc.version;
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/lib
|
||||
ln -s $mysql_jdbc/share/java/mysql-connector-java.jar $out/lib/mysql-connector-java.jar
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
python3.pkgs.buildPythonPackage rec {
|
||||
pname = "mautrix-signal";
|
||||
version = "unstable-2021-08-12";
|
||||
version = "unstable-2021-11-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tulir";
|
||||
repo = "mautrix-signal";
|
||||
rev = "a592baaaa6c9ab7ec29edc84f069b9e9e2fc1b03";
|
||||
sha256 = "0rvidf4ah23x8m7k7hbkwm2xrs838wnli99gh99b5hr6fqmacbwl";
|
||||
owner = "mautrix";
|
||||
repo = "signal";
|
||||
rev = "2e57810e964c1701df2e69273c2f8cebbe021464";
|
||||
sha256 = "sha256-xgn01nbY3LR4G1Yk2MgUhq116/wEhG+5vLH6HKqZE+8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
@ -46,7 +46,7 @@ python3.pkgs.buildPythonPackage rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/tulir/mautrix-signal";
|
||||
homepage = "https://github.com/mautrix/signal";
|
||||
description = "A Matrix-Signal puppeting bridge";
|
||||
license = licenses.agpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
|
||||
@ -12,25 +12,35 @@ let
|
||||
sha256 = "ebbb777cbf9312359b897bf81ba00dae0f5cb69fba2a18265dcc18a6f5ef7519";
|
||||
};
|
||||
});
|
||||
|
||||
tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.24.0a2";
|
||||
pname = "tulir-telethon";
|
||||
src = oldAttrs.src.override {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Qbx164FwC8nhesoY2fkaKvErN8g0Ph8vGcx+Cc1AqRg=";
|
||||
};
|
||||
});
|
||||
};
|
||||
};
|
||||
|
||||
# officially supported database drivers
|
||||
dbDrivers = with python.pkgs; [
|
||||
psycopg2
|
||||
aiosqlite
|
||||
# sqlite driver is already shipped with python by default
|
||||
];
|
||||
|
||||
in python.pkgs.buildPythonPackage rec {
|
||||
pname = "mautrix-telegram";
|
||||
version = "0.10.1";
|
||||
version = "0.10.2";
|
||||
disabled = python.pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tulir";
|
||||
repo = pname;
|
||||
owner = "mautrix";
|
||||
repo = "telegram";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1Dmc7WRlT2ivGkdrGDC1b44DE0ovQKfUR0gDiQE4h5c=";
|
||||
sha256 = "sha256-BYsGLyxhdjBVmnZXLC5ZjwDlWcHdUGp+DsNIOXA1/Tc=";
|
||||
};
|
||||
|
||||
patches = [ ./0001-Re-add-entrypoint.patch ./0002-Don-t-depend-on-pytest-runner.patch ];
|
||||
@ -49,7 +59,7 @@ in python.pkgs.buildPythonPackage rec {
|
||||
CommonMark
|
||||
ruamel-yaml
|
||||
python_magic
|
||||
telethon
|
||||
tulir-telethon
|
||||
telethon-session-sqlalchemy
|
||||
pillow
|
||||
lxml
|
||||
@ -87,7 +97,7 @@ in python.pkgs.buildPythonPackage rec {
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/tulir/mautrix-telegram";
|
||||
homepage = "https://github.com/mautrix/telegram";
|
||||
description = "A Matrix-Telegram hybrid puppeting/relaybot bridge";
|
||||
license = licenses.agpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
|
||||
@ -1,19 +1,19 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, olm }:
|
||||
{ lib, buildGo117Module, fetchFromGitHub, olm }:
|
||||
|
||||
buildGoModule rec {
|
||||
buildGo117Module rec {
|
||||
pname = "mautrix-whatsapp";
|
||||
version = "0.1.10";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mautrix";
|
||||
repo = "whatsapp";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4eqgmJ5CC1Glc8jG+4cQs6FbrY8Az29rCrZvFU3PAoM=";
|
||||
sha256 = "sha256-gCbZGlZDwHw+OAlTx3rHlbd4Ntw+RaCEDTiP/1q0oJs=";
|
||||
};
|
||||
|
||||
buildInputs = [ olm ];
|
||||
|
||||
vendorSha256 = "sha256-Y9mUl7fWZiXBEEDX3w2HXMlQKJntv16WeQC1bQQ7hHs=";
|
||||
vendorSha256 = "sha256-4KDLL9FY3DrkGBDlu6G8Fp7XJfXjwLTELspyW+FBGfo=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -9,11 +9,11 @@
|
||||
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "diffoscope";
|
||||
version = "190";
|
||||
version = "192";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
|
||||
sha256 = "sha256-iZ9OJESNlGgsYTO9jbzEX5sCz8Rrhs7cecJEy7j4U+c=";
|
||||
sha256 = "sha256-ZaSE1yYznZIQV7yKyeBlqQzkgUn3CoadZY2fDA1/SnE=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
@ -79,6 +79,7 @@ python3Packages.buildPythonApplication rec {
|
||||
# Disable flaky tests on Darwin
|
||||
"test_non_unicode_filename"
|
||||
"test_listing"
|
||||
"test_symlink_root"
|
||||
];
|
||||
|
||||
# flaky tests on Darwin
|
||||
|
||||
@ -23219,6 +23219,11 @@ with pkgs;
|
||||
|
||||
kreative-square-fonts = callPackage ../data/fonts/kreative-square-fonts { };
|
||||
|
||||
la-capitaine-icon-theme = callPackage ../data/icons/la-capitaine-icon-theme {
|
||||
inherit (plasma5Packages) breeze-icons;
|
||||
inherit (pantheon) elementary-icon-theme;
|
||||
};
|
||||
|
||||
layan-gtk-theme = callPackage ../data/themes/layan-gtk-theme { };
|
||||
|
||||
lato = callPackage ../data/fonts/lato {};
|
||||
|
||||
Loading…
Reference in New Issue
Block a user