Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-01-28 18:30:04 +00:00 committed by GitHub
commit 7fb7a62990
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
34 changed files with 944 additions and 155 deletions

View file

@ -5640,6 +5640,12 @@
email = "markus@wotringer.de";
name = "Markus Wotringer";
};
marijanp = {
name = "Marijan Petričević";
email = "marijan.petricevic94@gmail.com";
github = "marijanp";
githubId = 13599169;
};
marius851000 = {
email = "mariusdavid@laposte.net";
name = "Marius David";
@ -8649,6 +8655,12 @@
githubId = 36899624;
name = "squalus";
};
srapenne = {
email = "solene@perso.pw";
github = "rapenne-s";
githubId = 248016;
name = "Solène Rapenne";
};
srghma = {
email = "srghma@gmail.com";
github = "srghma";

View file

@ -876,6 +876,7 @@
./services/web-apps/gotify-server.nix
./services/web-apps/grocy.nix
./services/web-apps/hedgedoc.nix
./services/web-apps/hledger-web.nix
./services/web-apps/icingaweb2/icingaweb2.nix
./services/web-apps/icingaweb2/module-monitoring.nix
./services/web-apps/ihatemoney

View file

@ -0,0 +1,77 @@
{ lib, pkgs, config, ... }:
with lib;
let
cfg = config.services.hledger-web;
in {
options.services.hledger-web = {
enable = mkEnableOption "hledger-web service";
serveApi = mkEnableOption "Serve only the JSON web API, without the web UI.";
host = mkOption {
type = types.str;
default = "127.0.0.1";
description = ''
Address to listen on.
'';
};
port = mkOption {
type = types.port;
default = 5000;
example = "80";
description = ''
Port to listen on.
'';
};
capabilities = mkOption {
type = types.commas;
default = "view";
description = ''
Enable the view, add, and/or manage capabilities. E.g. view,add
'';
};
journalFile = mkOption {
type = types.path;
example = "/home/hledger/.hledger.journal";
description = ''
Input journal file.
'';
};
baseUrl = mkOption {
type = with types; nullOr str;
default = null;
example = "https://example.org";
description = ''
Base URL, when sharing over a network.
'';
};
};
config = mkIf cfg.enable {
systemd.services.hledger-web = {
description = "hledger-web - web-app for the hledger accounting tool.";
documentation = [ https://hledger.org/hledger-web.html ];
wantedBy = [ "multi-user.target" ];
after = [ "networking.target" ];
serviceConfig = {
ExecStart = ''
${pkgs.hledger-web}/bin/hledger-web \
--host=${cfg.host} \
--port=${toString cfg.port} \
--file=${cfg.journalFile} \
"--capabilities=${cfg.capabilities}" \
${optionalString (cfg.baseUrl != null) "--base-url=${cfg.baseUrl}"} \
${optionalString (cfg.serveApi) "--serve-api"}
'';
Restart = "always";
};
};
};
meta.maintainers = with lib.maintainers; [ marijanp ];
}

View file

@ -155,6 +155,7 @@ in
# not on other platforms.
hibernate = handleTestOn ["x86_64-linux"] ./hibernate.nix {};
hitch = handleTest ./hitch {};
hledger-web = handleTest ./hledger-web.nix {};
hocker-fetchdocker = handleTest ./hocker-fetchdocker {};
home-assistant = handleTest ./home-assistant.nix {};
hostname = handleTest ./hostname.nix {};

View file

@ -0,0 +1,53 @@
import ./make-test-python.nix ({ pkgs, lib, ... }:
let
journal = pkgs.writeText "test.journal" ''
2010/01/10 Loan
assets:cash 500$
income:loan -500$
2010/01/10 NixOS Foundation donation
expenses:donation 250$
assets:cash -250$
'';
in
rec {
name = "hledger-web";
meta.maintainers = with lib.maintainers; [ marijanp ];
nodes = {
server = { config, pkgs, ... }: rec {
services.hledger-web = {
host = "127.0.0.1";
port = 5000;
enable = true;
journalFile = journal;
};
networking.firewall.allowedTCPPorts = [ services.hledger-web.port ];
};
apiserver = { config, pkgs, ... }: rec {
services.hledger-web = {
host = "127.0.0.1";
port = 5000;
enable = true;
serveApi = true;
journalFile = journal;
};
networking.firewall.allowedTCPPorts = [ services.hledger-web.port ];
};
};
testScript = ''
start_all()
server.wait_for_unit("hledger-web.service")
server.wait_for_open_port(5000)
with subtest("Check if web UI is accessible"):
page = server.succeed("curl -L http://127.0.0.1:5000")
assert "test.journal" in page
apiserver.wait_for_unit("hledger-web.service")
apiserver.wait_for_open_port(5000)
with subtest("Check if the JSON API is served"):
transactions = apiserver.succeed("curl -L http://127.0.0.1:5000/transactions")
assert "NixOS Foundation donation" in transactions
'';
})

View file

@ -1,4 +1,4 @@
{ lib, mkDerivation, callPackage, fetchFromGitHub,
{ lib, mkDerivation, callPackage, fetchurl,
guile_1_8, qtbase, xmodmap, which, freetype,
libjpeg,
sqlite,
@ -16,19 +16,17 @@
let
pname = "TeXmacs";
version = "1.99.15";
version = "1.99.18";
common = callPackage ./common.nix {
inherit tex extraFonts chineseFonts japaneseFonts koreanFonts;
};
in
mkDerivation {
name = "${pname}-${version}";
inherit pname version;
src = fetchFromGitHub {
owner = "texmacs";
repo = "texmacs";
rev = "v${version}";
sha256 = "04585hdh98fvyhj4wsxf69xal2wvfa6lg76gad8pr6ww9abi5105";
src = fetchurl {
url = "https://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz";
sha256 = "0il3fwgw20421aj90wg8kyhkwk6lbgb3bb2g5qamh5lk90yj725i";
};
nativeBuildInputs = [ cmake pkg-config ];

View file

@ -13,6 +13,7 @@ import sys
from codecs import iterdecode
from collections import OrderedDict
from datetime import datetime
from distutils.version import LooseVersion
from os.path import abspath, dirname
from urllib.request import urlopen
@ -122,7 +123,7 @@ def print_updates(channels_old, channels_new):
for channel_name in channels_old:
version_old = channels_old[channel_name]["version"]
version_new = channels_new[channel_name]["version"]
if version_old < version_new:
if LooseVersion(version_old) < LooseVersion(version_new):
attr_name = channel_name_to_attr_name(channel_name)
print(f'- {attr_name}: {version_old} -> {version_new}')

View file

@ -31,9 +31,9 @@
}
},
"dev": {
"version": "89.0.4389.9",
"sha256": "12jiy5p1cbrs0gc3kd86walcnh038lzs5gnb9vif45f7kxn3c9pm",
"sha256bin64": "1wmidvf5gfm1xkpaj07gsvyk1r8b6jbcv46w5vclydlc1r6wh81s",
"version": "89.0.4389.23",
"sha256": "1d5pv4bhskh4l8x5ygccxwiryf05mwr1qzq1dzn6q82damr6dpq5",
"sha256bin64": "0d8ikwck7zmwgqni1f1xb44p773dqq096qnj0yg941457b0yg5hs",
"deps": {
"gn": {
"version": "2021-01-07",

View file

@ -91,19 +91,19 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
version = "10.0.8";
version = "10.0.9";
lang = "en-US";
srcs = {
x86_64-linux = fetchurl {
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";
sha256 = "23sp9vMbXg/c4o9wm+G0bW4KaP7lCUMpSQNK/5mSmeo=";
sha256 = "Dtlfm/memHSxir5XkUGkJICGEM+tPs//ET4PdVM1HPM=";
};
i686-linux = fetchurl {
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz";
sha256 = "vliiyw8KSCiZ2ycCvqOPEW3qSDH9wXwIygU1RYAqA6g=";
sha256 = "GZywFEX/5Br+Zu1w6pegoNOTrSIVQNE2LINsa3Vdlxs=";
};
};
in

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, perl, nettools, java, polyml, z3, rlwrap }:
{ lib, stdenv, fetchurl, perl, perlPackages, makeWrapper, nettools, java, polyml, z3, rlwrap }:
# nettools needed for hostname
stdenv.mkDerivation rec {
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
sha256 = "1bibabhlsvf6qsjjkgxcpq3cvl1z7r8yfcgqbhbvsiv69n3gyfk3";
};
buildInputs = [ perl polyml z3 ]
buildInputs = [ perl polyml z3 makeWrapper ]
++ lib.optionals (!stdenv.isDarwin) [ nettools java ];
sourceRoot = dirname;
@ -64,6 +64,8 @@ stdenv.mkDerivation rec {
mv $TMP/$dirname $out
cd $out/$dirname
bin/isabelle install $out/bin
wrapProgram $out/$dirname/src/HOL/Tools/ATP/scripts/remote_atp --set PERL5LIB ${perlPackages.makeFullPerlPath [ perlPackages.LWP ]}
'';
meta = with lib; {

View file

@ -4,11 +4,11 @@
buildPythonApplication rec {
pname = "git-machete";
version = "2.15.9";
version = "2.16.1";
src = fetchPypi {
inherit pname version;
sha256 = "0sg9ci9q1v3975855vi491ass72ladp3bjj2mvg77yxj13g3qqsx";
sha256 = "00xh3q3gmi88qcl0a61pw532iyw4xcls5h336cjzld70ps2r89g4";
};
nativeBuildInputs = [ installShellFiles pbr ];

View file

@ -1,4 +1,8 @@
{ stdenv, lib, fetchurl, SDL, libogg, libvorbis, smpeg, enableNativeMidi ? false, fluidsynth ? null }:
{ stdenv, lib, fetchurl
, SDL, libogg, libvorbis, smpeg, libmikmod
, fluidsynth
, enableNativeMidi ? false
}:
stdenv.mkDerivation rec {
pname = "SDL_mixer";
@ -9,9 +13,9 @@ stdenv.mkDerivation rec {
sha256 = "0alrhqgm40p4c92s26mimg9cm1y7rzr6m0p49687jxd9g6130i0n";
};
buildInputs = [ SDL libogg libvorbis fluidsynth smpeg ];
buildInputs = [ SDL libogg libvorbis fluidsynth smpeg libmikmod ];
configureFlags = [ "--disable-music-ogg-shared" ]
configureFlags = [ "--disable-music-ogg-shared" "--disable-music-mod-shared" ]
++ lib.optional enableNativeMidi " --enable-music-native-midi-gpl"
++ lib.optionals stdenv.isDarwin [ "--disable-sdltest" "--disable-smpegtest" ];

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "simdjson";
version = "0.8.0";
version = "0.8.1";
src = fetchFromGitHub {
owner = "simdjson";
repo = "simdjson";
rev = "v${version}";
sha256 = "0lpb8la74xwd78d5mgwnzx4fy632jbmh0ip19v0dydwm0kagm0a3";
sha256 = "1x5f8b5s67kf9sjx04rp81q0f3dlnqfngn3h0lrfnphipald5fji";
};
nativeBuildInputs = [ cmake ];

View file

@ -0,0 +1,37 @@
{ lib
, bluepy
, buildPythonPackage
, csrmesh
, fetchPypi
, pycryptodome
, requests
}:
buildPythonPackage rec {
pname = "avion";
version = "0.10";
src = fetchPypi {
inherit pname version;
sha256 = "0zgv45086b97ngyqxdp41wxb7hpn9g7alygc21j9y3dib700vzdz";
};
propagatedBuildInputs = [
bluepy
csrmesh
pycryptodome
requests
];
# Project has no test
doCheck = false;
# bluepy/uuids.json is not found
# pythonImportsCheck = [ "avion" ];
meta = with lib; {
description = "Python API for controlling Avi-on Bluetooth dimmers";
homepage = "https://github.com/mjg59/python-avion";
license = with licenses; [ gpl3Plus ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -0,0 +1,29 @@
{ lib
, bluepy
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "bluepy-devices";
version = "0.2.1";
src = fetchPypi {
pname = "bluepy_devices";
inherit version;
sha256 = "02zzzivxq2vifgs65m2rm8pqlsbzsbc419c032irzvfxjx539mr8";
};
propagatedBuildInputs = [ bluepy ];
# Project has no test
doCheck = false;
pythonImportsCheck = [ "bluepy_devices" ];
meta = with lib; {
description = "Python BTLE Device Interface for bluepy";
homepage = "https://github.com/bimbar/bluepy_devices";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -0,0 +1,32 @@
{ lib
, bluepy
, buildPythonPackage
, fetchPypi
, pycryptodomex
}:
buildPythonPackage rec {
pname = "csrmesh";
version = "0.10.0";
src = fetchPypi {
inherit pname version;
sha256 = "03lzam54ypcfvqvikh3gsrivvlidmz1ifdq15xv8c5i3n5b178ag";
};
propagatedBuildInputs = [
bluepy
pycryptodomex
];
# Project has no test
doCheck = false;
pythonImportsCheck = [ "csrmesh" ];
meta = with lib; {
description = "Python implementation of the CSRMesh bridge protocol";
homepage = "https://github.com/nkaminski/csrmesh";
license = with licenses; [ lgpl3Only ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -3,7 +3,7 @@
, aiohttp
, aresponses
, fetchFromGitHub
, poetry
, poetry-core
, pytest-aiohttp
, pytest-asyncio
, pytestCheckHook
@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pyiqvia";
version = "0.3.1";
version = "0.3.2";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -21,10 +21,10 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = version;
sha256 = "1yjsbq4p040a35n8g2l0wgnv83wkjirv4rj73s2mjzn3cxf395bz";
sha256 = "089lah23939m523jmjkaw2li0fikp2nswxznfvzwnr6wjpp3m9as";
};
nativeBuildInputs = [ poetry ];
nativeBuildInputs = [ poetry-core ];
propagatedBuildInputs = [ aiohttp ];

View file

@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "py-spy";
version = "0.3.3";
version = "0.3.4";
src = fetchFromGitHub {
owner = "benfred";
repo = "py-spy";
rev = "v${version}";
sha256 = "1w9nwsmazafr78ghif6njdcqjisr0f1jb6cm1w4ngvigx5qlrbkv";
sha256 = "sha256-7282DGLNHpKorNTHvpMLmqF2DrEVMIiQIzf5nTuJ7lc=";
};
NIX_CFLAGS_COMPILE = "-L${libunwind}/lib";
@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
checkInputs = [ python3 ];
cargoSha256 = "0hrzmpwd2k4l8gjbry8ddrkv9q9qh8ag096md4q0fyn5bgnxhkah";
cargoSha256 = "sha256-qVnOuLNMAy+6MP+dh6vLiSXvwQBAwyzRnHzCP60BdWk=";
meta = with lib; {
description = "Sampling profiler for Python programs";

View file

@ -0,0 +1,288 @@
diff --git a/Cargo.lock b/Cargo.lock
new file mode 100644
index 0000000..6c45593
--- /dev/null
+++ b/Cargo.lock
@@ -0,0 +1,279 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "anyhow"
+version = "1.0.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afddf7f520a80dbf76e6f50a35bca42a2331ef227a28b3b6dc5c2e2338d114b1"
+
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "bitflags"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+
+[[package]]
+name = "cargo-limit"
+version = "0.0.4"
+dependencies = [
+ "anyhow",
+ "atty",
+ "cargo_metadata",
+ "const_format",
+ "ctrlc",
+ "either",
+ "itertools",
+ "libc",
+ "serde_json",
+]
+
+[[package]]
+name = "cargo-platform"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0226944a63d1bf35a3b5f948dd7c59e263db83695c9e8bffc4037de02e30f1d7"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cargo_metadata"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7714a157da7991e23d90686b9524b9e12e0407a108647f52e9328f4b3d51ac7f"
+dependencies = [
+ "cargo-platform",
+ "semver",
+ "semver-parser",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "cc"
+version = "1.0.66"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48"
+
+[[package]]
+name = "cfg-if"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+
+[[package]]
+name = "const_format"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0412fd9e3c921f868af82a0097da41c250087e513786858b9e6b6055f8ed300"
+dependencies = [
+ "const_format_proc_macros",
+]
+
+[[package]]
+name = "const_format_proc_macros"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8df496e1bbc93814d728a8036ff054cd95830afe9cf2275c9326688c02eff936"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
+]
+
+[[package]]
+name = "ctrlc"
+version = "3.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b57a92e9749e10f25a171adcebfafe72991d45e7ec2dcb853e8f83d9dafaeb08"
+dependencies = [
+ "nix",
+ "winapi",
+]
+
+[[package]]
+name = "either"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "itertools"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
+
+[[package]]
+name = "libc"
+version = "0.2.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7eb0c4e9c72ee9d69b767adebc5f4788462a3b45624acd919475c92597bcaf4f"
+
+[[package]]
+name = "nix"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83450fe6a6142ddd95fb064b746083fc4ef1705fe81f64a64e1d4b39f54a1055"
+dependencies = [
+ "bitflags",
+ "cc",
+ "cfg-if",
+ "libc",
+]
+
+[[package]]
+name = "pest"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"
+dependencies = [
+ "ucd-trie",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
+dependencies = [
+ "unicode-xid",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
+
+[[package]]
+name = "semver"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
+dependencies = [
+ "semver-parser",
+ "serde",
+]
+
+[[package]]
+name = "semver-parser"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7"
+dependencies = [
+ "pest",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.123"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.123"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fceb2595057b6891a4ee808f70054bd2d12f0e97f1cbb78689b59f676df325a"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
+]
+
+[[package]]
+name = "ucd-trie"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
+
+[[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-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
--
2.29.2

View file

@ -0,0 +1,34 @@
{ lib
, rustPlatform
, fetchFromGitHub
, nix-update-script
}:
rustPlatform.buildRustPackage rec {
pname = "cargo-limit";
version = "0.0.4";
src = fetchFromGitHub {
owner = "alopatindev";
repo = "cargo-limit";
rev = version;
sha256 = "0ky62hbf6byxci28vqsps4xkf4r8irz5rz9q1pfmr68ls7bwywm7";
};
cargoPatches = [ ./cargo-Add-Cargo.lock.patch ];
cargoSha256 = "0vdpz7xhkf05fr430hz00w0d2ghjhmhmpi89jzcdw1cmrnidywly";
passthru = {
updateScript = nix-update-script {
attrPath = pname;
};
};
meta = with lib; {
description = "Cargo subcommand \"limit\": reduces the noise of compiler messages";
homepage = "https://github.com/alopatindev/cargo-limit";
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ otavio ];
};
}

View file

@ -0,0 +1,53 @@
{ lib, stdenv
, fetchFromGitHub
, makeDesktopItem, copyDesktopItems
, imagemagick
, autoreconfHook
, SDL, SDL_mixer, SDL_image, SDL_gfx
, libvorbis
, libjpeg, libpng
, zlib
}:
stdenv.mkDerivation rec {
pname = "freedroid";
version = "1.2.1";
src = fetchFromGitHub {
owner = "ReinhardPrix";
repo = "FreedroidClassic";
rev = "release-${version}";
sha256 = "027wns25nyyc8afyhyp5a8wn13x9nlzmnqzqyyma1055xjy5imis";
};
nativeBuildInputs = [ copyDesktopItems imagemagick autoreconfHook ];
buildInputs = [ SDL SDL_image SDL_gfx SDL_mixer libjpeg libpng libvorbis zlib ];
postPatch = ''
touch NEWS
'';
postInstall = ''
mkdir -p $out/share/icons/hicolor/32x32/apps
convert graphics/paraicon.bmp $out/share/icons/hicolor/32x32/apps/freedroid.png
'';
desktopItems = [ (makeDesktopItem {
name = pname;
exec = pname;
icon = pname;
desktopName = "Freedroid Classic";
comment = "A clone of the classic game 'Paradroid' on Commodore 64";
categories = "Game;ArcadeGame;";
}) ];
meta = with lib; {
description = "A clone of the classic game 'Paradroid' on Commodore 64";
homepage = "https://github.com/ReinhardPrix/FreedroidClassic";
license = licenses.gpl2Only;
maintainers = with maintainers; [ iblech ];
platforms = platforms.unix;
# Builds but fails to render to the screen at runtime.
broken = stdenv.isDarwin;
};
}

View file

@ -65,12 +65,12 @@ let
ale = buildVimPluginFrom2Nix {
pname = "ale";
version = "2021-01-25";
version = "2021-01-27";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
rev = "3a1728297a915b6e41c6339d571e85bc3756e5ff";
sha256 = "0zhpw9x97z430r9g73rchagznsxf1landlql42gzha64wsk5ihiw";
rev = "82c8e3a3a3740b520c748ff181e5c29f508b8455";
sha256 = "0dfd5428lrd5nb098gzsggfnl75v916q2vxzfbbpi2lms8slm60k";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
};
@ -377,12 +377,12 @@ let
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
version = "2021-01-25";
version = "2021-01-28";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "0dad2908db0139de301035315c812b3fc2ccbd6e";
sha256 = "175glq9iphr1xplqfcralp8xqn9i3d931s4z0mw3frhvfnrj6vi0";
rev = "2081a39a7458b55ac396f3e27b4875b41521a387";
sha256 = "0m79i175820lhng27v4jdz0pv3hfw5xv95kqhlifz6hbmc75mw61";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@ -473,12 +473,12 @@ let
coc-explorer = buildVimPluginFrom2Nix {
pname = "coc-explorer";
version = "2021-01-25";
version = "2021-01-26";
src = fetchFromGitHub {
owner = "weirongxu";
repo = "coc-explorer";
rev = "c4330ee3a65658e2cdc2f57cb066064eb5bc93f7";
sha256 = "19dsidp13wj1n841zj2pw7xwwx17iw72rzlpdnvh319cmjfg44r7";
rev = "3b4d3128328d20fcf683c76f1efc29b93001b9a6";
sha256 = "1s3yma34qrpdz5mra7bspnd42kw6c3nqhl3ql5mmrabn0ry3ajvz";
};
meta.homepage = "https://github.com/weirongxu/coc-explorer/";
};
@ -533,12 +533,12 @@ let
coc-nvim = buildVimPluginFrom2Nix {
pname = "coc-nvim";
version = "2021-01-25";
version = "2021-01-28";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc.nvim";
rev = "35935515f6cae76db5f5ab339bd0055291bf6453";
sha256 = "1gkd37xjsv9msqs579f9fjqwpwsikkcx6qsdw9bgxfkhdmi3jmck";
rev = "a336a8bc251702d9526a6818ae56e86d92fafc0c";
sha256 = "0jh5ik1w6qyp9scr9qxi47n7b8xgznknhsriwcpw2axs9ff00zz8";
};
meta.homepage = "https://github.com/neoclide/coc.nvim/";
};
@ -702,12 +702,12 @@ let
Coqtail = buildVimPluginFrom2Nix {
pname = "Coqtail";
version = "2021-01-21";
version = "2021-01-26";
src = fetchFromGitHub {
owner = "whonore";
repo = "Coqtail";
rev = "ff42b26f69634ed9fb3001887d80c65a759458e5";
sha256 = "0b4pra6f83933kl1ys8k4q9y9mx6a7qc7z757s82b0jk92cs790b";
rev = "c4d5c58771dd854671bd26b94693ecc1ffa21e39";
sha256 = "1r66h030f1952cl1bgynwb3r80zjh5imxwm87gnyjk6rg9kpjqnd";
};
meta.homepage = "https://github.com/whonore/Coqtail/";
};
@ -894,24 +894,24 @@ let
denite-nvim = buildVimPluginFrom2Nix {
pname = "denite-nvim";
version = "2021-01-23";
version = "2021-01-28";
src = fetchFromGitHub {
owner = "Shougo";
repo = "denite.nvim";
rev = "9637bc88220c0117e0bc20b730348aaa744a78d6";
sha256 = "1gwx6x584h98w31g1ynyqbjs6vypx121wcbsq1bq4npn71a9yvxv";
rev = "50a2abf1aa4ca8e192752da55e4102590ce71d9b";
sha256 = "1bvmy8rz6wqrxb2xm1v5kzl95va8qjy8z719j3b562qg10igjyl9";
};
meta.homepage = "https://github.com/Shougo/denite.nvim/";
};
deol-nvim = buildVimPluginFrom2Nix {
pname = "deol-nvim";
version = "2021-01-19";
version = "2021-01-27";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deol.nvim";
rev = "bd8d4d03d81d03db13d4b6eeb40c8a5c422c3ce6";
sha256 = "19kk5mpisbil3jarl93sjq97jxb29sxbw5s2zsh1gih6dfp659d5";
rev = "0c6e1653f0d0a904efa8da01e470ffe0bd1bf594";
sha256 = "1jfwzvblcfx7yx0lhwps0smgsblrc0azncv1bzliyx27in3gn59s";
};
meta.homepage = "https://github.com/Shougo/deol.nvim/";
};
@ -1220,12 +1220,12 @@ let
echodoc-vim = buildVimPluginFrom2Nix {
pname = "echodoc-vim";
version = "2021-01-21";
version = "2021-01-28";
src = fetchFromGitHub {
owner = "Shougo";
repo = "echodoc.vim";
rev = "1b657bccd69c0498a865b930959a36279e7213e0";
sha256 = "1n9wa4p9ng04ckklca32xz9c8zlkmzlhmwva7sf8l217bcr3zb9y";
rev = "c805de7e9811cd298861c7bc6ef455093dcdfaf5";
sha256 = "1jhhscldckydzzjnl1jki3025brmlbmr7czhw1s30jx5wr00zc5w";
};
meta.homepage = "https://github.com/Shougo/echodoc.vim/";
};
@ -1475,24 +1475,24 @@ let
fzf-vim = buildVimPluginFrom2Nix {
pname = "fzf-vim";
version = "2021-01-20";
version = "2021-01-27";
src = fetchFromGitHub {
owner = "junegunn";
repo = "fzf.vim";
rev = "36de5db9f0af1fb2e788f890d7f28f1f8239bd4b";
sha256 = "02wpqvmsdl64f3xni46is8mydy4h9i41b432qa5z0bfc652ax43d";
rev = "707f5b6269337ea5c19fc4054cd2574939f817f5";
sha256 = "1xb6zs7k8d815jzjs877ik6bp9bnyasv59jpnjv6fanxaaqas711";
};
meta.homepage = "https://github.com/junegunn/fzf.vim/";
};
galaxyline-nvim = buildVimPluginFrom2Nix {
pname = "galaxyline-nvim";
version = "2021-01-24";
version = "2021-01-27";
src = fetchFromGitHub {
owner = "glepnir";
repo = "galaxyline.nvim";
rev = "22791e9aadfc2a24ccc22d21b4c50f6b52e12980";
sha256 = "1dw9k5ql7h8mgj7ag34pxa2jr9b2k788csc2a0jmyp6qp0d0x5ad";
rev = "d49b8b16ce3a0765ff6e2a861b0205aec5fd946a";
sha256 = "0l5rdlfrcfywfchg3fkppdhzgm084cmrdiw3pms420rqvpdpr93l";
};
meta.homepage = "https://github.com/glepnir/galaxyline.nvim/";
};
@ -1956,12 +1956,12 @@ let
Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix {
pname = "Jenkinsfile-vim-syntax";
version = "2021-01-23";
version = "2021-01-26";
src = fetchFromGitHub {
owner = "martinda";
repo = "Jenkinsfile-vim-syntax";
rev = "7760006fc591e5a109432a0de0a705c92f7ffcd7";
sha256 = "1cqqk25x7km4qy0qxhjnqn77911a9nzjdif5905b99n1n6yn36q0";
rev = "0d05729168ea44d60862f17cffa80024ab30bcc9";
sha256 = "05z30frs4f5z0l4qgxk08r7mb19bzhqs36hi213yin78cz62b9gy";
};
meta.homepage = "https://github.com/martinda/Jenkinsfile-vim-syntax/";
};
@ -2220,12 +2220,12 @@ let
lspsaga-nvim = buildVimPluginFrom2Nix {
pname = "lspsaga-nvim";
version = "2021-01-25";
version = "2021-01-28";
src = fetchFromGitHub {
owner = "glepnir";
repo = "lspsaga.nvim";
rev = "b0e99487b09fb11e16c25d3e1fda2900a8bbf3da";
sha256 = "0gvd6f25m7bcrs8wysssq1nf1xysfz6b7ximnlzyp2y1g9xiwx8f";
rev = "23320342240307163d50d96ed2509740db3b3684";
sha256 = "1pxld0gx5i6mzg367c1z3nag5pbqyf57syw88w64yjxxvn1h151h";
};
meta.homepage = "https://github.com/glepnir/lspsaga.nvim/";
};
@ -2304,12 +2304,12 @@ let
mkdx = buildVimPluginFrom2Nix {
pname = "mkdx";
version = "2020-12-10";
version = "2021-01-28";
src = fetchFromGitHub {
owner = "SidOfc";
repo = "mkdx";
rev = "c977b1feff1dd53fc876f107d5c1128354e3cfb5";
sha256 = "15b0w9wabrp4mb4hj1zi3bf5ma0p2qkb7b93c9hzrqbimkzdy1db";
rev = "602a78430aee47881f8c57f73ba96fdded9a3ace";
sha256 = "1j4icyp3p20rlb8apyp7ixwxv59q2pdzjg7krh1mc6spr6m779jv";
};
meta.homepage = "https://github.com/SidOfc/mkdx/";
};
@ -2724,12 +2724,12 @@ let
nerdcommenter = buildVimPluginFrom2Nix {
pname = "nerdcommenter";
version = "2021-01-19";
version = "2021-01-27";
src = fetchFromGitHub {
owner = "preservim";
repo = "nerdcommenter";
rev = "7be3292b8de5127a386bf20f1198704e90cf24e9";
sha256 = "0bz6q80bbq1pl45ch37rcnnakljv6877qasqvdzb09w3jn6hz2vl";
rev = "2955d669dcb597dc9ced04cf1ee776983053b15e";
sha256 = "1vkfyjbq8fn3p9wnw3s1l5fqs8lvjl5csbq5201djg2cihfddsm1";
};
meta.homepage = "https://github.com/preservim/nerdcommenter/";
};
@ -2842,6 +2842,18 @@ let
meta.homepage = "https://github.com/roxma/nvim-cm-racer/";
};
nvim-compe = buildVimPluginFrom2Nix {
pname = "nvim-compe";
version = "2021-01-28";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-compe";
rev = "c2247bceb2fba741800faaa98c0a7459c00e88da";
sha256 = "0q6f0j36jjgxj5pnvgmkf3mm9yarw5a4cx2fhs4igd8hry8n6hw4";
};
meta.homepage = "https://github.com/hrsh7th/nvim-compe/";
};
nvim-completion-manager = buildVimPluginFrom2Nix {
pname = "nvim-completion-manager";
version = "2018-07-27";
@ -2856,12 +2868,12 @@ let
nvim-dap = buildVimPluginFrom2Nix {
pname = "nvim-dap";
version = "2021-01-23";
version = "2021-01-26";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-dap";
rev = "55833f58a65ab703bb1f34860f60a98ce601fc08";
sha256 = "0sljqwm48p3i2ps3p5rh0vr7lxbzwd67npkqd9scbmgcmci6blvj";
rev = "1461a3bacb22143e04039cf1a29024dad8876949";
sha256 = "12ay8gjxp94v365an45a6bv034gnmdkirrvw0jvbpymky0pznmgj";
};
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
};
@ -2892,12 +2904,12 @@ let
nvim-highlite = buildVimPluginFrom2Nix {
pname = "nvim-highlite";
version = "2020-12-31";
version = "2021-01-26";
src = fetchFromGitHub {
owner = "Iron-E";
repo = "nvim-highlite";
rev = "2fb6dc1b2a702a2f7ddd3dedff04b7fdfe66d9be";
sha256 = "0sxyk1g82ycgx5mi21s1jyrqg3qd4cyjrzy6hbwil04kcadqkkc1";
rev = "b0bca9edd3d4430f7a07387b72ea2ecaf370d808";
sha256 = "1j0gfszx92m3v7wzaxfmxbi93qsnfc8zg4kvjnbvpwfgvyvbizgs";
};
meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
};
@ -2928,12 +2940,12 @@ let
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
version = "2021-01-25";
version = "2021-01-27";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
rev = "94a3e5137649a71f3356bf9eb3aa94b906e68066";
sha256 = "1758kx8nxm3aw6rxxfzbf1pfmihxbhvayq4qw4b2dnl0d5pdcpgw";
rev = "78a31c0ebc947c43a4bc349a0244fc8df3fbfa8c";
sha256 = "0p5wzq588mlbas2l3xli9v2fhvxp1y52297x510if8adl97pv67k";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@ -2988,12 +3000,12 @@ let
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2021-01-22";
version = "2021-01-27";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "6d2b1fc56679038fb839b7f7707b65808ff5d9e4";
sha256 = "0jw5igzargbhxrim7256535n6z18ffbzng2qaxsz0mkzp1mr9kik";
rev = "12181e236ee4e565f9746037793abe4ae65caf46";
sha256 = "0s9pdr142k5bsg6fp1pl15dcpmnafnncwg8rw4ix0c038dkgqwfn";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@ -3036,12 +3048,12 @@ let
nvim-ts-rainbow = buildVimPluginFrom2Nix {
pname = "nvim-ts-rainbow";
version = "2021-01-24";
version = "2021-01-27";
src = fetchFromGitHub {
owner = "p00f";
repo = "nvim-ts-rainbow";
rev = "aca42922425e80582f7e3bb77c87f914119fb664";
sha256 = "0d7h5fc5kyd4i17s0xjfq7ifg7h2xbrsnspilbraxppyfj0xhdrs";
rev = "adad3ea7eb820b7e0cc926438605e7637ee1f5e6";
sha256 = "0vbd0a3kblbx28s2p7ljsalb1hymr2qjhjqgr03sg1a6hmxib1i0";
};
meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";
};
@ -3096,24 +3108,24 @@ let
oceanic-next = buildVimPluginFrom2Nix {
pname = "oceanic-next";
version = "2021-01-25";
version = "2021-01-26";
src = fetchFromGitHub {
owner = "mhartington";
repo = "oceanic-next";
rev = "0d5e2cbf88b4c1d312d30746496ca36d66de29e3";
sha256 = "0kh4ak8jfq5q1p2ig6c4a4n20bbh2arnas1z843lw3r3if5f9jvs";
rev = "f47fa3d4f63f1ce60bba13af81d97ee98ec31ceb";
sha256 = "064d2ip2fvkkqh0z8x0mykycbcwmdajflr5qz0pl4f5q0rlsnbb8";
};
meta.homepage = "https://github.com/mhartington/oceanic-next/";
};
one-nvim = buildVimPluginFrom2Nix {
pname = "one-nvim";
version = "2021-01-25";
version = "2021-01-27";
src = fetchFromGitHub {
owner = "Th3Whit3Wolf";
repo = "one-nvim";
rev = "c58db68bc16ab3eb50aaa81e54082f809d318194";
sha256 = "1m26qxa2hzkm03fw7vr547k7srawp0p533q7116c96gd3gsz3hxv";
rev = "ad1e00ecb2623525e5b25adc984629fe02d5284a";
sha256 = "1i2bvjvg60gw7jcafvwg2k63my7bshjlmx6by9xqh998s14db7vj";
};
meta.homepage = "https://github.com/Th3Whit3Wolf/one-nvim/";
};
@ -3168,12 +3180,12 @@ let
packer-nvim = buildVimPluginFrom2Nix {
pname = "packer-nvim";
version = "2021-01-25";
version = "2021-01-27";
src = fetchFromGitHub {
owner = "wbthomason";
repo = "packer.nvim";
rev = "9d2c03cec29d56827da8b63917a58567e1d9ab86";
sha256 = "12g3vi4hhm53sfnqn4h5x8vl3q1s0qh0gbr1vdshg76hylyv8qx4";
rev = "41567d3535c70770e1b628d9ac9aedbf6350fc5b";
sha256 = "18szd5z101ji205lyqkf9hpbrqb7k32q89ckfydsizj1rnsgkq6d";
};
meta.homepage = "https://github.com/wbthomason/packer.nvim/";
};
@ -3794,12 +3806,12 @@ let
sql-nvim = buildVimPluginFrom2Nix {
pname = "sql-nvim";
version = "2021-01-24";
version = "2021-01-27";
src = fetchFromGitHub {
owner = "tami5";
repo = "sql.nvim";
rev = "deab3730a5558c9b780c9e4f7ddb5252e44cb6e7";
sha256 = "0yyz2g2i3dv0lziyj40px2f1yqg0q6snazzs1mq4yvabz1vq3zkk";
rev = "91b7138c0a766bfe3964507951ee39e2f38344da";
sha256 = "09mk4r7c5shbn34v1fkj312zp11f0yjp07ck7i6lijm7kcj77fmq";
};
meta.homepage = "https://github.com/tami5/sql.nvim/";
};
@ -3974,12 +3986,12 @@ let
telescope-frecency-nvim = buildVimPluginFrom2Nix {
pname = "telescope-frecency-nvim";
version = "2021-01-20";
version = "2021-01-26";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope-frecency.nvim";
rev = "a770d59b925ff4ff87036afff06c87d620cd6861";
sha256 = "04kla2nyz1rh0b9iyi5nynyzpmyjiql2wvs2gdf964a79m86493l";
rev = "8b82406c94f587ebd900ec351a137322098bfc83";
sha256 = "0l5yz6kvpivlsg33h74hhc8axskq33wlkmlykak9wfxyq8ii4x6h";
};
meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/";
};
@ -4011,12 +4023,12 @@ let
telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope-nvim";
version = "2021-01-25";
version = "2021-01-27";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
rev = "ccbb7f56384921a81813f0f9ebc85cdba0b7c255";
sha256 = "04s59yjkrz1apfb5ydi43v5q0wmpmgymjvakn3n88cxyxk9yl297";
rev = "5995a8be8faaa2c6e8693ca52f2320cb4a80e3fa";
sha256 = "0p06cl12gabr425xzn69smk8pwnqmkaj1qccy3zj1qvwymb03sxg";
};
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
};
@ -4756,12 +4768,12 @@ let
vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap";
version = "2021-01-23";
version = "2021-01-28";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
rev = "890aaca21af5ce9569d4393f72240283c198a246";
sha256 = "1n11vb609v6fxrv5vxzf9z1hkzlzky0lx9sf5hjzmf54kny77f3r";
rev = "d3536cae87fc9ac106f25f0a2d8d96c697bccb08";
sha256 = "1sag4018is0az3nvck592k4b6nl9ah82b55kr55p4y6wssgm7aak";
};
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
};
@ -5392,12 +5404,12 @@ let
vim-floaterm = buildVimPluginFrom2Nix {
pname = "vim-floaterm";
version = "2021-01-25";
version = "2021-01-27";
src = fetchFromGitHub {
owner = "voldikss";
repo = "vim-floaterm";
rev = "f1a48620a74478a0415d492ac22d2763d140a76c";
sha256 = "0h6c2zy2ikl0z0pa8n6kjl80ww13225mskrzaf0k07j20ks5dcf1";
rev = "5c3f06cbd323ffbae3cbc7ed86538293db35c0a5";
sha256 = "0raz585m79pjw3y3kdqbnay7bz7dkgimb3a4x1khgxclidf10qv3";
};
meta.homepage = "https://github.com/voldikss/vim-floaterm/";
};
@ -5440,12 +5452,12 @@ let
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
version = "2020-12-17";
version = "2021-01-26";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
rev = "bebe504e38d0a20c30d6dd666c4c793b3cc66104";
sha256 = "03w28pll83sj7g7ngif27mj81zmwik0iw8yc50yc3szk0lv816yc";
rev = "8cf0cf5bfb2b858faecf4e0f6c1b8d0948805e5e";
sha256 = "1ka4bbmzpdzaflnywl4pknd0xy1n6mqw3qk4krk92dd6bcya0b1d";
};
meta.homepage = "https://github.com/tpope/vim-fugitive/";
};
@ -5512,12 +5524,12 @@ let
vim-gitgutter = buildVimPluginFrom2Nix {
pname = "vim-gitgutter";
version = "2020-12-11";
version = "2021-01-26";
src = fetchFromGitHub {
owner = "airblade";
repo = "vim-gitgutter";
rev = "512e2999ed7ff367580e0d6bc4d2daa81663221f";
sha256 = "0229x71prknra1k2val78qpddy6w7wmla2j6cjk8fjvp1h2jvwxz";
rev = "ff9d134f0c69e25d391138036051b2c5e6bac864";
sha256 = "1xpqhhvxf13nk4hd7jn0ydkkdk7r14w72h8hmpxzhhji1d0pcy43";
};
meta.homepage = "https://github.com/airblade/vim-gitgutter/";
};
@ -5692,12 +5704,12 @@ let
vim-hexokinase = buildVimPluginFrom2Nix {
pname = "vim-hexokinase";
version = "2020-12-31";
version = "2021-01-25";
src = fetchFromGitHub {
owner = "RRethy";
repo = "vim-hexokinase";
rev = "a7468f62a70d1da85b3fbe7f540a6dbd7a199536";
sha256 = "1vx48gq0skjmcjrxc8qkvjbqdsap50jrh1gyiqmm9s9rqxzsi4hs";
rev = "d2157749ed519661eb8605e1f19ca04b9cfa14cc";
sha256 = "0x33a6w1apmhncbp42m4mc7csjh1234k6d8zzk8pmk5csljhvsr7";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/RRethy/vim-hexokinase/";
@ -5829,8 +5841,8 @@ let
src = fetchFromGitHub {
owner = "RRethy";
repo = "vim-illuminate";
rev = "929b68b008679dfbe1145da00b3de08fc4f041f2";
sha256 = "089kignrkhqxl8f2csckhc9pc1hsjmw2ds8zcskryjbzrbak5mhv";
rev = "e763aabff734798599c40afef388c88cefbd2cba";
sha256 = "1a59nbz9msjh8773rlpgvcxmljqnxnprb7f9xf6gj680wmfpcjc4";
};
meta.homepage = "https://github.com/RRethy/vim-illuminate/";
};
@ -6198,24 +6210,24 @@ let
vim-lsc = buildVimPluginFrom2Nix {
pname = "vim-lsc";
version = "2021-01-24";
version = "2021-01-28";
src = fetchFromGitHub {
owner = "natebosch";
repo = "vim-lsc";
rev = "c8d00fc7299d0ff73a37dcd7f6bb5564fb30d1a3";
sha256 = "1axnrgldjkpqxxh6hpjmzjvk7af2n08kqb7205d5y307ya1rh5lw";
rev = "53530bf2b53b8af7299aa6499ca30e74c90480ec";
sha256 = "1464jk1mlmpz9chs5hc6nx718r981z7rc68fyxzksfsn3gmk5isq";
};
meta.homepage = "https://github.com/natebosch/vim-lsc/";
};
vim-lsp = buildVimPluginFrom2Nix {
pname = "vim-lsp";
version = "2021-01-23";
version = "2021-01-26";
src = fetchFromGitHub {
owner = "prabirshrestha";
repo = "vim-lsp";
rev = "7d5cd2763cbede18728e1254ed8d5e89fd500fd2";
sha256 = "0hymc1ni3wrbwbn8iql4qy4gb1xvcx2qsxqzna0f861c8kc9v4y4";
rev = "0c77beb2eb99263e69a25b4d66e7ca2cd15cb0ef";
sha256 = "0r981drs6cikhbkabjr7r30hszmbwkz98c8ldraw984r2zhllw1y";
};
meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
};
@ -6919,12 +6931,12 @@ let
vim-puppet = buildVimPluginFrom2Nix {
pname = "vim-puppet";
version = "2021-01-15";
version = "2021-01-26";
src = fetchFromGitHub {
owner = "rodjek";
repo = "vim-puppet";
rev = "a3af44488b00481f2a79dc7e4bb49e2767a4e6a4";
sha256 = "07bspasgd38kj91x3c6nf7wwhbg1sqw8kwvn7c4z11q32ry4hmgk";
rev = "8f588076dd026d029bb07c59fbbe8c11271d10a4";
sha256 = "086vd56vh82bgka0j81fbj8lkb5fcr79z281m98cwz8lij9vnp5g";
};
meta.homepage = "https://github.com/rodjek/vim-puppet/";
};
@ -6967,12 +6979,12 @@ let
vim-quickrun = buildVimPluginFrom2Nix {
pname = "vim-quickrun";
version = "2020-08-25";
version = "2021-01-27";
src = fetchFromGitHub {
owner = "thinca";
repo = "vim-quickrun";
rev = "c688f336a4aeb002319994f4fb4a8873f204f0ab";
sha256 = "1wzcvshwn4gvjbcmni1r473001m5ipamggkcpwsa7xr74sj4rn73";
rev = "c980977f1d77b3285937b9d7b5baa964fc9ed7f5";
sha256 = "00f1slgrjnh8m59sm3xmias3jvjlvw26yigv9fmy6zwcynlivc5x";
};
meta.homepage = "https://github.com/thinca/vim-quickrun/";
};
@ -7207,12 +7219,12 @@ let
vim-signify = buildVimPluginFrom2Nix {
pname = "vim-signify";
version = "2021-01-22";
version = "2021-01-28";
src = fetchFromGitHub {
owner = "mhinz";
repo = "vim-signify";
rev = "26e8c8d9cf27838cd13b45cb54118d74af34087d";
sha256 = "11aahxvpxv6h2yl3dlcdfb2715d6m2m6f53xw13sir25hmwlj8k8";
rev = "b2a0450e23c63b75bbeabf4f0c28f9b4b2480689";
sha256 = "0fj9dwvkpg69v6ps56hrm0k2y4f9rvnj7hwic6ysxfx96wngfzcm";
};
meta.homepage = "https://github.com/mhinz/vim-signify/";
};
@ -7796,12 +7808,12 @@ let
vim-visual-multi = buildVimPluginFrom2Nix {
pname = "vim-visual-multi";
version = "2021-01-06";
version = "2021-01-27";
src = fetchFromGitHub {
owner = "mg979";
repo = "vim-visual-multi";
rev = "d95d4c31a7919f58e9bb89bfc0c3a272461d782d";
sha256 = "1xnixwq6rddvs0za76sic3sf5fk0v10cdrsyaz3d6y0g0qmv9cz0";
rev = "dbf8ab3ca9d16326ad4f1b3f154de78303299f4b";
sha256 = "1j612450iip6vfr525nfp6arpb763j5ykjwqixs3b11jfnga268q";
};
meta.homepage = "https://github.com/mg979/vim-visual-multi/";
};
@ -7820,12 +7832,12 @@ let
vim-vsnip = buildVimPluginFrom2Nix {
pname = "vim-vsnip";
version = "2021-01-15";
version = "2021-01-28";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "vim-vsnip";
rev = "7d96014c899e92476a4d74dca010713d17507a2d";
sha256 = "1fb7xcpjysix846vrz02mcx8bm2swzckxa54i0sf462ynckcvg4f";
rev = "c4f374de5f1a0a90db432ae19eb6361d336f656c";
sha256 = "04znlii5b92fdr8vcxsh1lnnljcljmvn94k0wijn5k4yh2vf6dm7";
};
meta.homepage = "https://github.com/hrsh7th/vim-vsnip/";
};
@ -8101,8 +8113,8 @@ let
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
rev = "47e038635b98b21aa5d48e319f6058ba5a38e209";
sha256 = "16hjn9dmv8n24dflircdfkx4iq4b5w2drbn745i77fn5a0s1n3nk";
rev = "b2e93e1ab44099d3344f81f22dfa0851444ac824";
sha256 = "19c4y4r8j8hvbwwqqj5f84p3i2ys21a7bdizffrpz05ds3zigwyi";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};

View file

@ -168,6 +168,7 @@ HerringtonDarkholme/yats.vim
honza/vim-snippets
hoob3rt/lualine.nvim
hotwatermorning/auto-git-diff
hrsh7th/nvim-compe
hrsh7th/vim-vsnip
hrsh7th/vim-vsnip-integ
hsanson/vim-android

View file

@ -10,11 +10,11 @@ assert enablePython -> python3 != null;
stdenv.mkDerivation rec {
pname = "bind";
version = "9.16.10";
version = "9.16.11";
src = fetchurl {
url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-vEf8AZxiBeamv7g5xUShRyMh3wU3upBbhGpMv/4zYrM=";
sha256 = "sha256-ARH2TdfY9RXPoSnhgczpb/ggcNGyfxGiH2hWEQ0GmcE=";
};
outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];

View file

@ -61,7 +61,7 @@
"auth" = ps: with ps; [ aiohttp-cors ];
"automation" = ps: with ps; [ aiohttp-cors ];
"avea" = ps: with ps; [ avea ];
"avion" = ps: with ps; [ ]; # missing inputs: avion
"avion" = ps: with ps; [ avion ];
"awair" = ps: with ps; [ ]; # missing inputs: python_awair
"aws" = ps: with ps; [ aiobotocore ];
"axis" = ps: with ps; [ aiohttp-cors axis paho-mqtt ];

View file

@ -0,0 +1,35 @@
{ lib
, buildPythonApplication
, fetchFromGitHub
, pkgs
, boto3
}:
buildPythonApplication rec {
pname = "aws-mfa";
version = "0.0.12";
src = fetchFromGitHub {
owner = "broamski";
repo = "aws-mfa";
rev = version;
sha256 = "1blcpa13zgyac3v8inc7fh9szxq2avdllx6w5ancfmyh5spc66ay";
};
propagatedBuildInputs = [
boto3
];
doCheck = false;
pythonImportsCheck = [
"awsmfa"
];
meta = with lib; {
description = "Manage AWS MFA Security Credentials";
homepage = "https://github.com/broamski/aws-mfa";
license = [ licenses.mit ];
maintainers = [ maintainers.srapenne ];
};
}

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "procs";
version = "0.10.10";
version = "0.11.1";
src = fetchFromGitHub {
owner = "dalance";
repo = pname;
rev = "v${version}";
sha256 = "12p95nybsisqpji01qgkp5wfg7fwk814xdsz338q9wac8nvqw9w3";
sha256 = "sha256-e9fdqsv/P3zZdjsdAkwO21txPS1aWd0DuqRQUdr1vX4=";
};
cargoSha256 = "13wfz0ig9dsl0h085rzlrx0dg9la957c50xyzjfxq1ybw2qr266b";
cargoSha256 = "sha256-ilSDLbPQnmhQcNbtKCpUNmyZY0JUY/Ksg0sj/t7veT0=";
buildInputs = lib.optional stdenv.isDarwin Security;

View file

@ -3,11 +3,11 @@
python3Packages.buildPythonPackage rec {
pname = "yubikey-manager";
version = "3.1.1";
version = "3.1.2";
srcs = fetchurl {
url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz";
sha256 = "1yhc8j67phrj5xgx09b5h7c67pgc4wj4jnkmkq0r3s6j7jn43vv8";
hash = "sha256-dwnIOuu0QyWRl6RSdyQw7dGsAZ4xpXpx6jOpCkp4efE=";
};
propagatedBuildInputs =

View file

@ -0,0 +1,35 @@
{ buildGoModule
, fetchFromGitHub
, lib
, stdenv
}:
buildGoModule rec {
pname = "chisel";
version = "1.7.3";
src = fetchFromGitHub {
owner = "jpillora";
repo = pname;
rev = "v${version}";
sha256 = "0dayc0mbvybsydx2r170m5cfmf0p4896vk9xawpk7gncxclrwpv6";
};
vendorSha256 = "01wh8fn76jn8hnf7gj759k8dwqrr0p36xmsxfc8dayzinpl10fqv";
# tests require access to the network
doCheck = false;
meta = with lib; {
description = "TCP/UDP tunnel over HTTP";
longDescription = ''
Chisel is a fast TCP/UDP tunnel, transported over HTTP, secured via
SSH. Single executable including both client and server. Chisel is
mainly useful for passing through firewalls, though it can also be
used to provide a secure endpoint into your network.
'';
homepage = "https://github.com/jpillora/chisel";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -0,0 +1,32 @@
{ buildGoModule
, fetchFromGitHub
, lib
}:
buildGoModule rec {
pname = "go-cve-search";
version = "0.1.3";
src = fetchFromGitHub {
owner = "s-index";
repo = pname;
rev = "v${version}";
sha256 = "0hbv829daviskwsyp9xjcvl52m22986b2cylf2rldnxw5x8zqdvd";
};
vendorSha256 = "0bhxk39ivbkhwjvq6415lax1pzn208b7px1id0d1nry93bk2zynd";
# Tests requires network access
doCheck = false;
meta = with lib; {
description = "A lightweight CVE search tool";
longDescription = ''
go-cve-search is a lightweight tool to search CVE (Common Vulnerabilities
and Exposures).
'';
homepage = "https://github.com/s-index/go-cve-search";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -0,0 +1,35 @@
{ lib
, buildPythonApplication
, docopt
, fetchFromGitHub
, importlib-metadata
, poetry-core
}:
buildPythonApplication rec {
pname = "xortool";
version = "1.0.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "hellman";
repo = pname;
rev = "v${version}";
sha256 = "19lfadi28r89bl5q8fhrxgjgs3nx3kgjd4rdg7wbvzi1cn29c5n7";
};
nativeBuildInputs = [ poetry-core ];
propagatedBuildInputs = [ docopt importlib-metadata ];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "xortool" ];
meta = with lib; {
description = "Tool to analyze multi-byte XOR cipher";
homepage = "https://github.com/hellman/xortool";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
description = "Unix command line queue utility";
homepage = "https://github.com/chneukirchen/nq";
license = licenses.publicDomain;
platforms = platforms.linux;
platforms = platforms.all;
maintainers = with maintainers; [ cstrahan ];
};
}

View file

@ -999,6 +999,8 @@ in
aws-google-auth = python3Packages.callPackage ../tools/admin/aws-google-auth { };
aws-mfa = python3Packages.callPackage ../tools/admin/aws-mfa { };
aws-nuke = callPackage ../tools/admin/aws-nuke { };
aws-okta = callPackage ../tools/security/aws-okta { };
@ -1148,6 +1150,8 @@ in
go-check = callPackage ../development/tools/check { };
go-cve-search = callPackage ../tools/security/go-cve-search { };
chkcrontab = callPackage ../tools/admin/chkcrontab { };
claws = callPackage ../tools/misc/claws { };
@ -1852,6 +1856,8 @@ in
chelf = callPackage ../tools/misc/chelf { };
chisel = callPackage ../tools/networking/chisel { };
cht-sh = callPackage ../tools/misc/cht.sh { };
ckbcomp = callPackage ../tools/X11/ckbcomp { };
@ -4232,6 +4238,8 @@ in
mkFranzDerivation = callPackage ../applications/networking/instant-messengers/franz/generic.nix { };
};
freedroid = callPackage ../games/freedroid { };
freedroidrpg = callPackage ../games/freedroidrpg { };
freenukum = callPackage ../games/freenukum { };
@ -10733,6 +10741,7 @@ in
inherit (darwin.apple_sdk.frameworks) Security;
};
cargo-insta = callPackage ../development/tools/rust/cargo-insta { };
cargo-limit = callPackage ../development/tools/rust/cargo-limit { };
cargo-make = callPackage ../development/tools/rust/cargo-make {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
@ -29371,6 +29380,8 @@ in
xboxdrv = callPackage ../misc/drivers/xboxdrv { };
xortool = python3Packages.callPackage ../tools/security/xortool { };
xow = callPackage ../misc/drivers/xow { };
xbps = callPackage ../tools/package-management/xbps { };

View file

@ -557,6 +557,8 @@ in {
avea = callPackage ../development/python-modules/avea { };
avion = callPackage ../development/python-modules/avion { };
avro3k = callPackage ../development/python-modules/avro3k { };
avro = callPackage ../development/python-modules/avro { };
@ -997,6 +999,8 @@ in {
bluepy = callPackage ../development/python-modules/bluepy { };
bluepy-devices = callPackage ../development/python-modules/bluepy-devices { };
bme680 = callPackage ../development/python-modules/bme680 { };
bokeh = callPackage ../development/python-modules/bokeh { };
@ -1507,6 +1511,8 @@ in {
crytic-compile = callPackage ../development/python-modules/crytic-compile { };
csrmesh = callPackage ../development/python-modules/csrmesh { };
csscompressor = callPackage ../development/python-modules/csscompressor { };
cssmin = callPackage ../development/python-modules/cssmin { };