mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 07:13:23 +01:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
4b0e1b22cf
33 changed files with 343 additions and 61 deletions
|
|
@ -7135,6 +7135,16 @@
|
|||
fingerprint = "A3A3 65AE 16ED A7A0 C29C 88F1 9712 452E 8BE3 372E";
|
||||
}];
|
||||
};
|
||||
pinpox = {
|
||||
email = "mail@pablo.tools";
|
||||
github = "pinpox";
|
||||
githubId = 1719781;
|
||||
name = "Pablo Ovelleiro Corral";
|
||||
keys = [{
|
||||
longkeyid = "sa4096/0x823A6154426408D3";
|
||||
fingerprint = "D03B 218C AE77 1F77 D7F9 20D9 823A 6154 4264 08D3";
|
||||
}];
|
||||
};
|
||||
piotr = {
|
||||
email = "ppietrasa@gmail.com";
|
||||
name = "Piotr Pietraszkiewicz";
|
||||
|
|
|
|||
|
|
@ -284,7 +284,9 @@ let
|
|||
extraInstallerConfig
|
||||
];
|
||||
|
||||
# builds stuff in the VM, needs more juice
|
||||
virtualisation.diskSize = 8 * 1024;
|
||||
virtualisation.cores = 8;
|
||||
virtualisation.memorySize = 1536;
|
||||
|
||||
# Use a small /dev/vdb as the root disk for the
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, rustPackages_1_45, pkgconfig, openssl
|
||||
{ lib, fetchFromGitHub, rustPackages, pkgconfig, openssl
|
||||
, withALSA ? true, alsaLib ? null
|
||||
, withPulseAudio ? false, libpulseaudio ? null
|
||||
, withPortAudio ? false, portaudio ? null
|
||||
|
|
@ -7,21 +7,18 @@
|
|||
, dbus ? null
|
||||
}:
|
||||
|
||||
# rust >= 1.48 causes a panic within spotifyd on music playback. as long as
|
||||
# there is no upstream fix for the issue we use an older version of rust.
|
||||
# Upstream issue: https://github.com/Spotifyd/spotifyd/issues/719
|
||||
rustPackages_1_45.rustPlatform.buildRustPackage rec {
|
||||
rustPackages.rustPlatform.buildRustPackage rec {
|
||||
pname = "spotifyd";
|
||||
version = "0.2.24";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Spotifyd";
|
||||
repo = "spotifyd";
|
||||
rev = "v${version}";
|
||||
sha256 = "08i0zm7kgprixqjpgaxk7xid1njgj6lmi896jf9fsjqzdzlblqk8";
|
||||
sha256 = "055njhy9if4qpsbgbr6615xxhcx9plava1m4l323vi4dbw09wh5r";
|
||||
};
|
||||
|
||||
cargoSha256 = "0200apqbx769ggjnjr0m72g61ikhml2xak5n1il2pvfx1yf5nw0n";
|
||||
cargoSha256 = "1ijrl208607abjwpr3cajcbj6sr35bk6ik778a58zf28kzdhrawc";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"--no-default-features"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchFromGitHub, fzf }:
|
||||
{ lib, stdenv, fetchFromGitHub, fzf }:
|
||||
|
||||
assert lib.asserts.assertOneOf "fzf" fzf.pname [ "fzf" "skim" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "quilter";
|
||||
version = "2.5.1";
|
||||
version = "2.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lainsce";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0ya1iwzfzvrci083zyrjj6ac4ys25j90slpk8yydw9n99kb750rk";
|
||||
sha256 = "sha256-A8Ov0rITHuMLDYTueeDO89KtxlP0pNk1pA7O4x3Q9fE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -18,13 +18,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "setzer";
|
||||
version = "0.3.9";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cvfosammmm";
|
||||
repo = "Setzer";
|
||||
rev = "v${version}";
|
||||
sha256 = "1qmy2bxl8x6pijjaaj91v6rqdipha6iyy0b6b9y1lk3r2p3azd42";
|
||||
sha256 = "036xbg65h255zlvz9l86sw6w9l4qfyf13x8p8ml7dj52hcdfvyb9";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
|
|
@ -51,7 +51,8 @@ python3.pkgs.buildPythonApplication rec {
|
|||
propagatedBuildInputs = with python3.pkgs; [
|
||||
pygobject3
|
||||
pyxdg
|
||||
pypdf2
|
||||
pdfminer
|
||||
pycairo
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "blogc";
|
||||
version = "0.20.0";
|
||||
version = "0.20.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "blogc";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0hx0gpvmv7rd910czafvmcpxabbvfmvdyxk4d1mckmblx8prb807";
|
||||
sha256 = "sha256-YAwGgV5Vllz8JlIASbGIkdRzpciQbgPiXl5DjiSEJyE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-calculator";
|
||||
version = "1.5.5";
|
||||
version = "1.6.0";
|
||||
|
||||
repoName = "calculator";
|
||||
|
||||
|
|
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "elementary";
|
||||
repo = repoName;
|
||||
rev = version;
|
||||
sha256 = "sha256-ctKUtaBU0qvDYquGCPL7tiTwQ7IcqvT7SXRjxETWXbM=";
|
||||
sha256 = "sha256-kDqUwTi3XnFGUwAjnWcaKqDylUFqpus9WurLoqbV1xk=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rapidcheck";
|
||||
version = "unstable-2018-09-27";
|
||||
version = "unstable-2020-12-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emil-e";
|
||||
repo = "rapidcheck";
|
||||
rev = "de54478fa35c0d9cea14ec0c5c9dfae906da524c";
|
||||
sha256 = "0n8l0mlq9xqmpkgcj5xicicd1my2cfwxg25zdy8347dqkl1ppgbs";
|
||||
rev = "b78f89288c7e086d06e2a1e10b605d8375517a8a";
|
||||
sha256 = "0fj11gbhkaxbsgix2im7vdfvr26l75b8djk462sfw8xrwrfkjbdz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
38
pkgs/development/ocaml-modules/awa/default.nix
Normal file
38
pkgs/development/ocaml-modules/awa/default.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{ lib, buildDunePackage, fetchurl
|
||||
, ppx_sexp_conv, ppx_cstruct
|
||||
, mirage-crypto, mirage-crypto-rng, mirage-crypto-pk
|
||||
, x509, cstruct, cstruct-unix, cstruct-sexp, sexplib
|
||||
, rresult, mtime, logs, fmt, cmdliner, base64, hacl_x25519
|
||||
, zarith
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "awa";
|
||||
version = "0.0.1";
|
||||
|
||||
minimumOCamlVersion = "4.07";
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/awa-ssh/releases/download/v${version}/awa-v${version}.tbz";
|
||||
sha256 = "c1d604645517b191184a5800f5c48a6a9a3e5a2fce4a0e2ecfeee74586301400";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ppx_sexp_conv ppx_cstruct ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
mirage-crypto mirage-crypto-rng mirage-crypto-pk x509
|
||||
cstruct cstruct-sexp sexplib rresult mtime
|
||||
logs base64 hacl_x25519 zarith
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [ cstruct-unix cmdliner fmt ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "SSH implementation in OCaml";
|
||||
license = licenses.isc;
|
||||
homepage = "https://github.com/mirage/awa-ssh";
|
||||
maintainers = [ maintainers.sternenseemann ];
|
||||
};
|
||||
}
|
||||
15
pkgs/development/ocaml-modules/awa/lwt.nix
Normal file
15
pkgs/development/ocaml-modules/awa/lwt.nix
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
{ buildDunePackage, awa
|
||||
, cstruct, mtime, lwt, cstruct-unix, mirage-crypto-rng
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "awa-lwt";
|
||||
|
||||
inherit (awa) version src useDune2;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
awa cstruct mtime lwt cstruct-unix mirage-crypto-rng
|
||||
];
|
||||
|
||||
inherit (awa) meta;
|
||||
}
|
||||
15
pkgs/development/ocaml-modules/awa/mirage.nix
Normal file
15
pkgs/development/ocaml-modules/awa/mirage.nix
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
{ buildDunePackage, awa
|
||||
, cstruct, mtime, lwt, mirage-flow, mirage-clock, logs
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "awa-mirage";
|
||||
|
||||
inherit (awa) version src useDune2;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
awa cstruct mtime lwt mirage-flow mirage-clock logs
|
||||
];
|
||||
|
||||
inherit (awa) meta;
|
||||
}
|
||||
47
pkgs/development/ocaml-modules/mimic/default.nix
Normal file
47
pkgs/development/ocaml-modules/mimic/default.nix
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
{ lib, buildDunePackage, fetchurl
|
||||
, fmt, mirage-flow, result, rresult, cstruct, logs, ke
|
||||
, alcotest, alcotest-lwt, bigstringaf, bigarray-compat
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "mimic";
|
||||
version = "0.0.1";
|
||||
|
||||
minimumOCamlVersion = "4.08";
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/ocaml-git/releases/download/${pname}-v${version}/${pname}-${pname}-v${version}.tbz";
|
||||
sha256 = "0j4l99sgm5mdmv67vakkz2pw45l6i89bpza88xqkgmskfk50c5pk";
|
||||
};
|
||||
|
||||
# don't install changelogs for other packages
|
||||
postPatch = ''
|
||||
rm -f CHANGES.md CHANGES.carton.md
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
fmt
|
||||
mirage-flow
|
||||
result
|
||||
rresult
|
||||
cstruct
|
||||
logs
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [
|
||||
alcotest
|
||||
alcotest-lwt
|
||||
bigstringaf
|
||||
bigarray-compat
|
||||
ke
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple protocol dispatcher";
|
||||
license = licenses.isc;
|
||||
homepage = "https://github.com/mirage/ocaml-git";
|
||||
maintainers = [ maintainers.sternenseemann ];
|
||||
};
|
||||
}
|
||||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "msldap";
|
||||
version = "0.3.22";
|
||||
version = "0.3.24";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1ivq56953skql8f255nqx2sg4mm0kz2pr5b4dx62dx7jdgd1xym3";
|
||||
sha256 = "0q9bhw0lfw9iykjdsqz62ipy3ihfz6kprzw5sc7v1678l2pvs84j";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, buildPythonPackage
|
||||
, python
|
||||
, fetchPypi
|
||||
, isPy27
|
||||
, pytestCheckHook
|
||||
, cython
|
||||
, numpy
|
||||
|
|
@ -13,19 +14,17 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "nitime";
|
||||
version = "0.8.1";
|
||||
disabled = python.pythonVersion != "3.7"; # gcc error when running Cython with Python 3.8
|
||||
version = "0.9";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0hb3x5196z2zaawb8s7lhja0vd3n983ncaynqfl9qg315x9ax7i6";
|
||||
sha256 = "sha256-bn2QrbsfqUJim84vH5tt5T6h3YsGAlgu9GCMiNQ0OHQ=";
|
||||
};
|
||||
|
||||
buildInputs = [ cython ];
|
||||
|
||||
propagatedBuildInputs = [ numpy scipy matplotlib networkx nibabel ];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
buildInputs = [ cython ];
|
||||
propagatedBuildInputs = [ numpy scipy matplotlib networkx nibabel ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://nipy.org/nitime";
|
||||
|
|
|
|||
|
|
@ -1,17 +1,32 @@
|
|||
{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, coverage, pytest, pytestcov }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, coverage
|
||||
, fetchPypi
|
||||
, isPy27
|
||||
, pytest-cov
|
||||
, pytestCheckHook
|
||||
, toml
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "vulture";
|
||||
version = "2.1";
|
||||
version = "2.3";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "933bf7f3848e9e39ecab6a12faa59d5185471c887534abac13baea6fe8138cc2";
|
||||
sha256 = "0ryrmsm72z3fzaanyblz49q40h9d3bbl4pspn2lvkkp9rcmsdm83";
|
||||
};
|
||||
|
||||
checkInputs = [ coverage pytest pytestcov ];
|
||||
checkPhase = "pytest";
|
||||
propagatedBuildInputs = [ toml ];
|
||||
|
||||
checkInputs = [
|
||||
coverage
|
||||
pytest-cov
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "vulture" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Finds unused code in Python programs";
|
||||
|
|
|
|||
|
|
@ -329,7 +329,8 @@ let
|
|||
rtiff = [ pkgs.libtiff.dev ];
|
||||
runjags = [ pkgs.jags ];
|
||||
RVowpalWabbit = [ pkgs.zlib.dev pkgs.boost ];
|
||||
rzmq = [ pkgs.zeromq ];
|
||||
rzmq = [ pkgs.zeromq pkgs.pkgconfig ];
|
||||
clustermq = [ pkgs.zeromq ];
|
||||
SAVE = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre ];
|
||||
sdcTable = [ pkgs.gmp pkgs.glpk ];
|
||||
seewave = [ pkgs.fftw.dev pkgs.libsndfile.dev ];
|
||||
|
|
@ -384,6 +385,7 @@ let
|
|||
nat = [ pkgs.which ];
|
||||
nat_templatebrains = [ pkgs.which ];
|
||||
pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.darwin.binutils ];
|
||||
clustermq = [ pkgs.pkgconfig ];
|
||||
RMark = [ pkgs.which ];
|
||||
RPushbullet = [ pkgs.which ];
|
||||
RcppEigen = [ pkgs.libiconv ];
|
||||
|
|
@ -663,6 +665,14 @@ let
|
|||
'';
|
||||
});
|
||||
|
||||
rzmq = old.rzmq.overrideDerivation (attrs: {
|
||||
preConfigure = "patchShebangs configure";
|
||||
});
|
||||
|
||||
clustermq = old.clustermq.overrideDerivation (attrs: {
|
||||
preConfigure = "patchShebangs configure";
|
||||
});
|
||||
|
||||
Cairo = old.Cairo.overrideDerivation (attrs: {
|
||||
NIX_LDFLAGS = "-lfontconfig";
|
||||
});
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "act";
|
||||
version = "0.2.17";
|
||||
version = "0.2.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nektos";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0s7bgm2q7z9xpaj6kfvg63v12k35ckaxwmh6bbjh15xibaw58183";
|
||||
sha256 = "16c5qxxi37pdcqrf8aliad6lkqx9jk57yc2q6gpw9ffar49km4qi";
|
||||
};
|
||||
|
||||
vendorSha256 = "0bcrw3hf92m7n58lrlm0vj1wiwwy82q2rl1a725q3d6xwvi5kh9h";
|
||||
vendorSha256 = "1xw80vb49bd0n620yaxwcvyf9glkscc42i847blan4hw6k957hii";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-make";
|
||||
version = "0.32.9";
|
||||
version = "0.32.10";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "0f6avprq0d65v5fk3kn2kvw3w024f21yq6v8y7d9rbwqxxf87jlf";
|
||||
sha256 = "sha256-cDpEFw9uICB/4aZheTWwDqYGjLz+C6gLie/S3ehhifg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
|
|||
buildInputs = [ openssl ]
|
||||
++ stdenv.lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
|
||||
|
||||
cargoSha256 = "0v0657hh8ivqaq4sn0saaiz06shxavhrh9mksjlzj7c2ym6cxkih";
|
||||
cargoSha256 = "sha256-Qh14lks72bsetwyv0ALF7nZo3m3FDEmVxzFkHJoEuzE=";
|
||||
|
||||
# Some tests fail because they need network access.
|
||||
# However, Travis ensures a proper build.
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-wipe";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mihai-dinculescu";
|
||||
repo = "cargo-wipe";
|
||||
rev = "v${version}";
|
||||
sha256 = "1kwkifdp98zsinh7xcsz2va252wxbw73xlrv0r7h3m0bn51d52vw";
|
||||
sha256 = "sha256-sVekfGHg2wspP5/zJzXTXupspwJr4hQBucY5+8iUjUQ=";
|
||||
};
|
||||
|
||||
cargoSha256 = "15snr1b1pybwcjzwddxybvry3jyllcmrp8dyfm9yiagks3wrcfb4";
|
||||
cargoSha256 = "sha256-IzEurJcPoM/JMQlSL7N84wzZddNpynrsjQEOUNms2YQ=";
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wrangler";
|
||||
version = "1.12.3";
|
||||
version = "1.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1h9020yf5jsbilzn94h7qyxw9qnz3vw43g8a2415wvjqq6ihzfvm";
|
||||
sha256 = "0xhldarzb71x4k7ydk4yd6g0qv6y2l0mn2lc43hvl9jm29pnz95q";
|
||||
};
|
||||
|
||||
cargoSha256 = "12azc41y2yx936ax9b1yylc0gy91k0m7ih6p0bkw7m928f762hpx";
|
||||
cargoSha256 = "0w845virvw7mvibc76ar2hbffhfzj2v8v1xkrsssrgzyaryb48jk";
|
||||
|
||||
nativeBuildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -4,8 +4,9 @@
|
|||
, python
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, lame
|
||||
, mplayer
|
||||
, mpv-unwrapped
|
||||
, libpulseaudio
|
||||
, pyqtwebengine
|
||||
, decorator
|
||||
|
|
@ -105,11 +106,16 @@ buildPythonApplication rec {
|
|||
checkInputs = [ pytest glibcLocales nose ];
|
||||
|
||||
nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ];
|
||||
buildInputs = [ lame mplayer libpulseaudio ];
|
||||
buildInputs = [ lame mpv-unwrapped libpulseaudio ];
|
||||
|
||||
patches = [
|
||||
# Disable updated version check.
|
||||
./no-version-check.patch
|
||||
(fetchpatch {
|
||||
name = "fix-mpv-args.patch";
|
||||
url = "https://sources.debian.org/data/main/a/anki/2.1.15+dfsg-3/debian/patches/fix-mpv-args.patch";
|
||||
sha256 = "1dimnnawk64m5bbdbjrxw5k08q95l728n94cgkrrwxwavmmywaj2";
|
||||
})
|
||||
];
|
||||
|
||||
# Anki does not use setup.py
|
||||
|
|
@ -173,7 +179,7 @@ buildPythonApplication rec {
|
|||
preFixup = ''
|
||||
makeWrapperArgs+=(
|
||||
"''${qtWrapperArgs[@]}"
|
||||
--prefix PATH ':' "${lame}/bin:${mplayer}/bin"
|
||||
--prefix PATH ':' "${lame}/bin:${mpv-unwrapped}/bin"
|
||||
)
|
||||
'';
|
||||
|
||||
|
|
@ -197,7 +203,6 @@ buildPythonApplication rec {
|
|||
or even practicing guitar chords!
|
||||
'';
|
||||
license = licenses.agpl3Plus;
|
||||
broken = stdenv.hostPlatform.isAarch64;
|
||||
platforms = platforms.mesaPlatforms;
|
||||
maintainers = with maintainers; [ oxij Profpatsch ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -5065,6 +5065,54 @@ let
|
|||
meta.homepage = "https://github.com/tpope/vim-endwise/";
|
||||
};
|
||||
|
||||
vim-erlang-compiler = buildVimPluginFrom2Nix {
|
||||
pname = "vim-erlang-compiler";
|
||||
version = "2020-11-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vim-erlang";
|
||||
repo = "vim-erlang-compiler";
|
||||
rev = "17e47d28141c961e567b39d8d9956cbdb6e720d0";
|
||||
sha256 = "1j27zk2gfig3zv7cg7dwg5x0c3nsik5blcci8a16wq050pi8bsr1";
|
||||
};
|
||||
meta.homepage = "https://github.com/vim-erlang/vim-erlang-compiler/";
|
||||
};
|
||||
|
||||
vim-erlang-omnicomplete = buildVimPluginFrom2Nix {
|
||||
pname = "vim-erlang-omnicomplete";
|
||||
version = "2020-08-29";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vim-erlang";
|
||||
repo = "vim-erlang-omnicomplete";
|
||||
rev = "2f980dd8f1861e00ea14dcd5ecc370e71af695fb";
|
||||
sha256 = "1i3c7ybahmb4az2njzvfnvx39bqiyqhf43n32rhpc3xg05y3bk7d";
|
||||
};
|
||||
meta.homepage = "https://github.com/vim-erlang/vim-erlang-omnicomplete/";
|
||||
};
|
||||
|
||||
vim-erlang-runtime = buildVimPluginFrom2Nix {
|
||||
pname = "vim-erlang-runtime";
|
||||
version = "2020-11-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vim-erlang";
|
||||
repo = "vim-erlang-runtime";
|
||||
rev = "8a8ec7cb54d52be5fc5dce2a028888c2a2f50e35";
|
||||
sha256 = "13qfyl9v0a82hn574x6h7rq9kl3rhg6ivlpj69n2jn0lf33ij8qq";
|
||||
};
|
||||
meta.homepage = "https://github.com/vim-erlang/vim-erlang-runtime/";
|
||||
};
|
||||
|
||||
vim-erlang-tags = buildVimPluginFrom2Nix {
|
||||
pname = "vim-erlang-tags";
|
||||
version = "2020-10-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vim-erlang";
|
||||
repo = "vim-erlang-tags";
|
||||
rev = "a5bc6a90a166073d74e5103f40735740ae40a3cb";
|
||||
sha256 = "02d3y2296nh8qv0kgx119c1niim6ci2bahi7q3k0jsl2f86fl7dy";
|
||||
};
|
||||
meta.homepage = "https://github.com/vim-erlang/vim-erlang-tags/";
|
||||
};
|
||||
|
||||
vim-eunuch = buildVimPluginFrom2Nix {
|
||||
pname = "vim-eunuch";
|
||||
version = "2020-08-07";
|
||||
|
|
|
|||
|
|
@ -608,6 +608,10 @@ vhda/verilog_systemverilog.vim
|
|||
vigoux/LanguageTool.nvim
|
||||
vim-airline/vim-airline
|
||||
vim-airline/vim-airline-themes
|
||||
vim-erlang/vim-erlang-compiler
|
||||
vim-erlang/vim-erlang-omnicomplete
|
||||
vim-erlang/vim-erlang-runtime
|
||||
vim-erlang/vim-erlang-tags
|
||||
vim-pandoc/vim-pandoc
|
||||
vim-pandoc/vim-pandoc-after
|
||||
vim-pandoc/vim-pandoc-syntax
|
||||
|
|
|
|||
37
pkgs/servers/fiche/default.nix
Normal file
37
pkgs/servers/fiche/default.nix
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
{ stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fiche";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "solusipse";
|
||||
repo = "fiche";
|
||||
rev = version;
|
||||
sha256 = "1102r39xw17kip7mjp987jy8na333gw9vxv31f7v8q05cr7d7kfb";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
install -Dm755 fiche -t $out/bin
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Command line pastebin for sharing terminal output";
|
||||
longDescription = ''
|
||||
Fiche is a command line pastebin server for sharing terminal output.
|
||||
It can be used without any graphical tools from a TTY and has minimal requirements.
|
||||
A live instance can be found at https://termbin.com.
|
||||
|
||||
Example usage:
|
||||
echo just testing! | nc termbin.com 9999
|
||||
'';
|
||||
|
||||
homepage = "https://github.com/solusipse/fiche";
|
||||
changelog = "https://github.com/solusipse/fiche/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.pinpox ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
postPatch = ''
|
||||
substituteInPlace include/defaults.h --replace 'PKGLOCALSTATEDIR "' '"/var/lib/charybdis'
|
||||
substituteInPlace include/defaults.h --replace 'ETCPATH "' '"/etc/charybdis'
|
||||
'';
|
||||
|
||||
autoreconfPhase = "sh autogen.sh";
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ in {
|
|||
};
|
||||
|
||||
nextcloud20 = generic {
|
||||
version = "20.0.4";
|
||||
sha256 = "sha256-Jp8WIuMm9dEeOH04YarU4rDnkzSul+7Vp7M1K6dmFCA=";
|
||||
version = "20.0.5";
|
||||
sha256 = "5c70dd33024012a1651fd099133d052d129a4dadc6935f44bb9c3e2b360befe3";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "awsweeper";
|
||||
version = "0.10.2";
|
||||
version = "0.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jckuester";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1ln4s04n1qd1wv88ahhvvvphlxf6c9krqz9lmbcx3n67sb8xngm5";
|
||||
sha256 = "sha256-fpWoLFSwSVxaiWyVMSmQTd3o/zOySUXNM2YhxMQ7nsA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "0zlhb84fmrnwq71d0h83p28aqlfclcydndl0z2j9nx2skjlxax2i";
|
||||
vendorSha256 = "sha256-1u1mzANLlWduAQF1GUX7BJSyYlSZwNQISqKwbyRlGog=";
|
||||
|
||||
buildFlagsArray = [ "-ldflags=-s -w -X github.com/jckuester/awsweeper/internal.version=${version} -X github.com/jckuester/awsweeper/internal.commit=${src.rev} -X github.com/jckuester/awsweeper/internal.date=unknown" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "aws-okta";
|
||||
version = "1.0.8";
|
||||
version = "1.0.11";
|
||||
|
||||
goPackagePath = "github.com/segmentio/aws-okta";
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ buildGoPackage rec {
|
|||
owner = "segmentio";
|
||||
repo = "aws-okta";
|
||||
rev = "v${version}";
|
||||
sha256 = "14bg9rdfxkpw00phc8faz4ghiyb0j7a9qai74lidrzplzl139bzf";
|
||||
sha256 = "sha256-1cprKpIFgM3+lUEHNvda34nJTH4Ch3LtTRq/Dp6QBQ8=";
|
||||
};
|
||||
|
||||
buildFlags = [ "--tags" "release" ];
|
||||
|
|
|
|||
26
pkgs/tools/security/scilla/default.nix
Normal file
26
pkgs/tools/security/scilla/default.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "scilla";
|
||||
version = "20210118-${lib.strings.substring 0 7 rev}";
|
||||
rev = "74dd81492fef92b95765df1d0f629276a146a5a4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "edoardottt";
|
||||
repo = pname;
|
||||
inherit rev;
|
||||
sha256 = "10qvaigfarljydfb9vx2fb9nk293j4g9w2h9mr8xw6adbvl0qr9q";
|
||||
};
|
||||
|
||||
vendorSha256 = "04wqsl4269gc3r6l9srqhcq19zarnyyab8k1shj3w6lkfcc61z25";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Information gathering tool for DNS, ports and more";
|
||||
homepage = "https://github.com/edoardottt/scilla";
|
||||
license = with licenses; [ gpl3Plus ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "atomicparsley";
|
||||
version = "20200701.154658.b0d6223";
|
||||
version = "20210114.184825.1dbe1be";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wez";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-EHO4WkxoAXUhuJKMNYmBbGfOgtO9uklzXtWS4QsV1c8=";
|
||||
sha256 = "sha256-dyrfr3bsRzEWaAr9K+7SchFVl63cZawyIjmstOI9e5I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -150,6 +150,8 @@ in
|
|||
|
||||
ankisyncd = callPackage ../servers/ankisyncd { };
|
||||
|
||||
fiche = callPackage ../servers/fiche { };
|
||||
|
||||
avro-tools = callPackage ../development/tools/avro-tools { };
|
||||
|
||||
bacnet-stack = callPackage ../tools/networking/bacnet-stack {};
|
||||
|
|
@ -27988,6 +27990,8 @@ in
|
|||
|
||||
scilab-bin = callPackage ../applications/science/math/scilab-bin {};
|
||||
|
||||
scilla = callPackage ../tools/security/scilla { };
|
||||
|
||||
scotch = callPackage ../applications/science/math/scotch { };
|
||||
|
||||
mininet = callPackage ../tools/virtualization/mininet { };
|
||||
|
|
|
|||
|
|
@ -44,6 +44,12 @@ let
|
|||
|
||||
atdgen = callPackage ../development/ocaml-modules/atdgen { };
|
||||
|
||||
awa = callPackage ../development/ocaml-modules/awa { };
|
||||
|
||||
awa-lwt = callPackage ../development/ocaml-modules/awa/lwt.nix { };
|
||||
|
||||
awa-mirage = callPackage ../development/ocaml-modules/awa/mirage.nix { };
|
||||
|
||||
base64 = callPackage ../development/ocaml-modules/base64 { };
|
||||
|
||||
bap = callPackage ../development/ocaml-modules/bap {
|
||||
|
|
@ -574,6 +580,8 @@ let
|
|||
|
||||
mezzo = callPackage ../development/compilers/mezzo { };
|
||||
|
||||
mimic = callPackage ../development/ocaml-modules/mimic { };
|
||||
|
||||
minisat = callPackage ../development/ocaml-modules/minisat { };
|
||||
|
||||
mirage = callPackage ../development/ocaml-modules/mirage { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue