Merge master into staging-next
This commit is contained in:
commit
aea4725648
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "gallery_dl";
|
||||
version = "1.16.5";
|
||||
version = "1.17.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "fb8c927630b292abf5052f8f75c3eebccbdffa609566768d4dc4d9665df91e68";
|
||||
sha256 = "bf5196b9e18a45d62d7e823894f12def310264a258956882cbac13b5e856bf00";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
|
@ -1,10 +1,10 @@
|
||||
{ lib, stdenv, fetchurl, appimageTools, undmg, libsecret }:
|
||||
{ lib, stdenv, fetchurl, appimageTools, undmg, libsecret, libxshmfence }:
|
||||
let
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
throwSystem = throw "Unsupported system: ${system}";
|
||||
|
||||
pname = "keeweb";
|
||||
version = "1.16.7";
|
||||
version = "1.17.0";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
suffix = {
|
||||
@ -16,9 +16,9 @@ let
|
||||
src = fetchurl {
|
||||
url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.${suffix}";
|
||||
sha256 = {
|
||||
x86_64-linux = "0a4yh2jh9sph17mqqi62gm5jc4yffkysq6yiggyzz5f8xw4p315j";
|
||||
x86_64-darwin = "0ix1apddqvz561pw5lx47x091wlfj27zh8k8v7kn5xvm09hswfkr";
|
||||
aarch64-darwin = "0p0kql79kcb3w947g1ljhbj15b8aqrwcrbi0cknb12f6iq47lkz7";
|
||||
x86_64-linux = "1c7zvwnd46d3lrlcdigv341flz44jl6mnvr6zqny5mfz221ynbj7";
|
||||
x86_64-darwin = "1n4haxychm5jjhjnpncavjh0wr4dagqi78qfsx5gwlv86hzryzwy";
|
||||
aarch64-darwin = "1j7z63cbfms02f2lhl949wy3lc376jw8kqmjfn9j949s0l5fanpb";
|
||||
}.${system} or throwSystem;
|
||||
};
|
||||
|
||||
@ -29,6 +29,7 @@ let
|
||||
meta = with lib; {
|
||||
description = "Free cross-platform password manager compatible with KeePass";
|
||||
homepage = "https://keeweb.info/";
|
||||
changelog = "https://github.com/keeweb/keeweb/blob/v${version}/release-notes.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||
@ -37,7 +38,7 @@ let
|
||||
linux = appimageTools.wrapType2 rec {
|
||||
inherit name src meta;
|
||||
|
||||
extraPkgs = pkgs: with pkgs; [ libsecret ];
|
||||
extraPkgs = pkgs: with pkgs; [ libsecret libxshmfence ];
|
||||
|
||||
extraInstallCommands = ''
|
||||
mv $out/bin/{${name},${pname}}
|
||||
@ -54,11 +55,11 @@ let
|
||||
|
||||
nativeBuildInputs = [ undmg ];
|
||||
|
||||
sourceRoot = "KeeWeb.app";
|
||||
sourceRoot = ".";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/Applications/KeeWeb.app
|
||||
cp -R . $out/Applications/KeeWeb.app
|
||||
mkdir -p $out/Applications
|
||||
cp -r *.app $out/Applications
|
||||
'';
|
||||
};
|
||||
in
|
||||
|
@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "testssl.sh";
|
||||
version = "3.0.2";
|
||||
version = "3.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "drwetter";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0vfpj3g3il3imbydx3j8gx1pgzrxi0czcl9jmi749vnkf5mkmh8w";
|
||||
sha256 = "sha256-Rcvkzw1DfoRXrk0vlpL6CojEHYfYga3voc2hm4qxdmw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
@ -1,16 +1,28 @@
|
||||
{lib, stdenv, fetchFromGitHub, cmake, boost, gmp, htslib, zlib, lzma, pkg-config}:
|
||||
{lib, stdenv, fetchpatch, fetchFromGitHub, cmake, boost, gmp, htslib, zlib, lzma, pkg-config}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "octopus";
|
||||
version = "0.7.0";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "luntergroup";
|
||||
repo = "octopus";
|
||||
rev = "v${version}";
|
||||
sha256 = "0y3g0xc3x3adbcmds6hh60023pfv1qrz6ak7jd88fg9vxi9bdrfb";
|
||||
sha256 = "sha256-TZ57uKTZ87FWpLNGPY8kbML1EDM8fnEFbXR+Z3dmiao=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Backport TZ patchs (https://github.com/luntergroup/octopus/issues/149)
|
||||
(fetchpatch {
|
||||
url = "https://github.com/luntergroup/octopus/commit/3dbd8cc33616129ad356e99a4dae82e4f6702250.patch";
|
||||
sha256 = "sha256-UCufVU9x+L1zCEhkr/48KFYRvh8w26w8Jr+O+wULKK8=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/luntergroup/octopus/commit/af5a66a2792bd098fb53eb79fb4822625f09305e.patch";
|
||||
sha256 = "sha256-r8jv6EZHfTWVLYUBau3F+ilOd9IeH8rmatorEY5LXP4=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ boost gmp htslib zlib lzma ];
|
||||
|
||||
|
@ -1,13 +1,13 @@
|
||||
{
|
||||
"version": "13.8.4",
|
||||
"repo_hash": "1q8q5v7c6g7yss26d6wg29h28fq1azy1smai97yk80cr0kirab8v",
|
||||
"version": "13.8.5",
|
||||
"repo_hash": "0dpyqynd6rscg07s58y0cjn7vfj2h21h51ja0fm6ll76wb02sbm6",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v13.8.4-ee",
|
||||
"rev": "v13.8.5-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "13.8.4",
|
||||
"GITALY_SERVER_VERSION": "13.8.5",
|
||||
"GITLAB_PAGES_VERSION": "1.34.0",
|
||||
"GITLAB_SHELL_VERSION": "13.15.1",
|
||||
"GITLAB_WORKHORSE_VERSION": "8.59.0"
|
||||
"GITLAB_WORKHORSE_VERSION": "8.59.2"
|
||||
}
|
||||
}
|
||||
|
@ -33,14 +33,14 @@ let
|
||||
};
|
||||
};
|
||||
in buildGoModule rec {
|
||||
version = "13.8.4";
|
||||
version = "13.8.5";
|
||||
pname = "gitaly";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-y8uy70ccQPba+JJmWace4LgLJkJNzVdFhrvq0AB8G5w=";
|
||||
sha256 = "sha256-hKIjKltPPmz50Ru7elpHdeoyGAqgp+txR3fKleqY7hM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-oVw6vXI3CyOn4l02PkYx3HVpZfzQPi3yBuf9tRvoWoM=";
|
||||
|
@ -3,13 +3,13 @@
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "8.59.0";
|
||||
version = "8.59.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-workhorse";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6JVt5hNWvnUm64SFqns1f1+xMP/KyPQ8H93jqXNT8n8=";
|
||||
sha256 = "sha256-hMcE7dlUw34DyUO0v5JxwvvEh/HC2emrIKc1K1U4bPE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "0vkw12w7vr0g4hf4f0im79y7l36d3ah01n1vl7siy94si47g8ir5";
|
||||
|
@ -307,6 +307,9 @@ gem 'premailer-rails', '~> 1.10.3'
|
||||
|
||||
# LabKit: Tracing and Correlation
|
||||
gem 'gitlab-labkit', '0.14.0'
|
||||
# Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0
|
||||
# because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900
|
||||
gem 'thrift', '>= 0.14.0'
|
||||
|
||||
# I18n
|
||||
gem 'ruby_parser', '~> 3.15', require: false
|
||||
|
@ -1176,7 +1176,7 @@ GEM
|
||||
rack (>= 1, < 3)
|
||||
thor (0.20.3)
|
||||
thread_safe (0.3.6)
|
||||
thrift (0.13.0)
|
||||
thrift (0.14.0)
|
||||
tilt (2.0.10)
|
||||
timecop (0.9.1)
|
||||
timeliness (0.3.10)
|
||||
@ -1522,6 +1522,7 @@ DEPENDENCIES
|
||||
terser (= 1.0.2)
|
||||
test-prof (~> 0.12.0)
|
||||
thin (~> 1.7.0)
|
||||
thrift (>= 0.14.0)
|
||||
timecop (~> 0.9.1)
|
||||
toml-rb (~> 1.0.0)
|
||||
truncato (~> 0.7.11)
|
||||
|
@ -5154,10 +5154,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "08076cmdx0g51yrkd7dlxlr45nflink3jhdiq7006ljc2pc3212q";
|
||||
sha256 = "1v4q8wlc4kr952r24q9x60cvimn27g34h0j23imwqkrjcbngsj5n";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
};
|
||||
tilt = {
|
||||
groups = ["default" "development" "test"];
|
||||
|
@ -12330,11 +12330,11 @@
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "swagger_ui_dist___swagger_ui_dist_3.32.4.tgz";
|
||||
name = "swagger_ui_dist___swagger_ui_dist_3.43.0.tgz";
|
||||
path = fetchurl {
|
||||
name = "swagger_ui_dist___swagger_ui_dist_3.32.4.tgz";
|
||||
url = "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-3.32.4.tgz";
|
||||
sha1 = "6fa920a99e38eaaf129580ac158cf730494a2190";
|
||||
name = "swagger_ui_dist___swagger_ui_dist_3.43.0.tgz";
|
||||
url = "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-3.43.0.tgz";
|
||||
sha1 = "b064a2cec1d27776f9a124bc70423cfa0bbc0d3f";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
@ -8,12 +8,12 @@
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
version = "1.28.3";
|
||||
version = "1.28.5";
|
||||
pname = "docker-compose";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "78a48ef8ff4fed092261ecb1a60d9b28b7776e72ed6df591a900008039308b0f";
|
||||
sha256 = "b3ff8f0352eb4055c4c483cb498aeff7c90195fa679f3caf7098a2d6fa6030e5";
|
||||
};
|
||||
|
||||
# lots of networking and other fails
|
||||
|
@ -6,11 +6,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fontParts";
|
||||
version = "0.9.9";
|
||||
version = "0.9.10";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1iz04kpxgc5fx2rl4585hr1vp4cdajqbddlskkhlmzkn9hvz528i";
|
||||
sha256 = "0hwjnqbkcfkhigx581w4532vddsx5wiy73gx46kjisp0hlir9628";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
|
@ -1,26 +1,42 @@
|
||||
{ lib, buildPythonPackage, fetchPypi
|
||||
, nose, pyyaml, pathspec }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pathspec
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pyyaml
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "yamllint";
|
||||
version = "1.25.0";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b1549cbe5b47b6ba67bdeea31720f5c51431a4d0c076c1557952d841f7223519";
|
||||
};
|
||||
|
||||
checkInputs = [ nose ];
|
||||
propagatedBuildInputs = [
|
||||
pyyaml
|
||||
pathspec
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ pyyaml pathspec ];
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# Two test failures
|
||||
doCheck = false;
|
||||
disabledTests = [
|
||||
# Test failure could be related to https://github.com/adrienverge/yamllint/issues/334
|
||||
"test_find_files_recursively"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "yamllint" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A linter for YAML files";
|
||||
homepage = "https://github.com/adrienverge/yamllint";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ jonringer mikefaille ];
|
||||
};
|
||||
}
|
||||
|
@ -3,13 +3,13 @@
|
||||
buildGoPackage rec {
|
||||
|
||||
pname = "harmonist";
|
||||
version = "0.3.0";
|
||||
version = "0.4.1";
|
||||
|
||||
goPackagePath = "git.tuxfamily.org/harmonist/harmonist.git";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.tuxfamily.org/harmonist/releases/${pname}-${version}.tar.gz";
|
||||
sha256 = "16bh4zzq7szwcw19n34bslkf81fz3i0p4zqkd8gdi5ixkbm998lm";
|
||||
sha256 = "19abqmzz9nnlnizkskvlkcpahk8lzrl57mgg6dfxn25l55vfznws";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
@ -29,6 +29,6 @@ buildGoPackage rec {
|
||||
homepage = "https://harmonist.tuxfamily.org/";
|
||||
license = licenses.isc;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [freepotion];
|
||||
maintainers = with maintainers; [];
|
||||
};
|
||||
}
|
||||
|
94
pkgs/games/harmonist/deps.nix
generated
94
pkgs/games/harmonist/deps.nix
generated
@ -1,20 +1,92 @@
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/nsf/termbox-go";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/nsf/termbox-go";
|
||||
rev = "93860e16131719fa9722e7c448dbf8c0e3210a0d";
|
||||
sha256 = "03hz060cy8qrl4kgr80pbq6xvr38z4c6ghr3y81i8g854rvp6426";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/mattn/go-runewidth";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mattn/go-runewidth";
|
||||
rev = "18c3d09a134a52720932bbaa92c798a0ab111004";
|
||||
sha256 = "1snr8mk63vz2h44knq26dm81p83887v7kb09iywqmx0nqzngih66";
|
||||
rev = "59616a248b91ae20bf3eb93636a24c87d9ce6cea";
|
||||
sha256 = "0jh9552ppqvkdfni7x623n0x5mbiaqqhjhmr0zkh28x56k4ysii4";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/anaseto/gruid";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/anaseto/gruid";
|
||||
rev = "976b3db42d20169cf44eca1406b3cff104a80979";
|
||||
sha256 = "0rvsavkvg2hziwdh8sjk3n5v92m5mfjb8v9m7ch22maxfwq5kv6y";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/anaseto/gruid-tcell";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/anaseto/gruid-tcell";
|
||||
rev = "4878126bb96fa0e529ec22c700d03b030e5c3bf7";
|
||||
sha256 = "0spm9gqsdan1mvbpypywid00vvl92rii8akhmjdm8l1r9qk7a3i4";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/gdamore/tcell";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/gdamore/tcell";
|
||||
rev = "f4d402906fa3d330545365abbf970c048e677b35";
|
||||
sha256 = "1wcbm5vxrh5s8g4mas32y3n0pjvfmngmc2yrxg1yn4333mh9mgf3";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/lucasb-eyer/go-colorful";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/lucasb-eyer/go-colorful";
|
||||
rev = "4d8f45c41ac988423342507a1fb6050239b5a742";
|
||||
sha256 = "1p2rl5353fi4p3l0bz3dg0lifhxqj8hjyh1b6z1cn286qxwnnnm8";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/gdamore/encoding";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/gdamore/encoding";
|
||||
rev = "6289cdc94c00ac4aa177771c5fce7af2f96b626d";
|
||||
sha256 = "1vmm5zll92i2fm4ajqx0gyx0p9j36496x5nabi3y0x7h0inv0pk9";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/rivo/uniseg";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/rivo/uniseg";
|
||||
rev = "75711fccf6a3e85bc74c241e2dddd06a9bc9e53d";
|
||||
sha256 = "0j7h22vfmjj562vr8gpsyrkrwp1pq9ayh5fylv24skxb467g9f0q";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/term/";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/term";
|
||||
rev = "6a3ed077a48de71621ad530f9078fffa0bc0ce32";
|
||||
sha256 = "0xni8n3q2r9f6fk223b2c1702fvqmgz7vk6738asri3fwby583q5";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/text/";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/text";
|
||||
rev = "e3aa4adf54f644ca0cb35f1f1fb19b239c40ef04";
|
||||
sha256 = "03q5kjmp4sfp5yzwb76lyf8cs9qca26vlwry5qgqf8w03rq700hf";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/sys/";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/sys";
|
||||
rev = "88b6017d06564827ae436c619d52116f470a3611";
|
||||
sha256 = "14n7b6833lhxjzsgvi14c6c8nfiqqb4r71wvv4z5ksyssi95i3r7";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
@ -5,11 +5,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xcowsay";
|
||||
version = "1.5";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.nickg.me.uk/files/xcowsay-${version}.tar.gz";
|
||||
sha256 = "0pyaa062z1ag26dhkm1yzp2hivnlmhlpqn5xg7mx9r1m652mm91y";
|
||||
sha256 = "sha256-wypsfAp634wbaAI+fxzmr3J5AmvQzChVi/wp/BPxiA0=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@ -32,9 +32,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.doof.me.uk/xcowsay";
|
||||
description =
|
||||
"A program based on cowsay that displays a cute cow and message on your desktop";
|
||||
license = licenses.gpl3;
|
||||
description = "Tool to display a cute cow and messages";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ das_j ];
|
||||
};
|
||||
}
|
||||
|
@ -656,7 +656,7 @@ self: super: {
|
||||
});
|
||||
|
||||
lf-vim = super.lf-vim.overrideAttrs (old: {
|
||||
dependencies = with super; [ vim-bbye ];
|
||||
dependencies = with super; [ vim-floaterm ];
|
||||
});
|
||||
|
||||
vim-stylish-haskell = super.vim-stylish-haskell.overrideAttrs (old: {
|
||||
|
@ -12,11 +12,11 @@ let
|
||||
in
|
||||
buildPythonApplication rec {
|
||||
pname = "matrix-synapse";
|
||||
version = "1.28.0";
|
||||
version = "1.29.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-KWEpgizOdil7dXIxug7xT3dEYEHi/IEPX/6aT7qW6C8=";
|
||||
sha256 = "sha256-BySztUwVqyaL0AvmJMWEbjVqf981ABKMAU9f9C/0wkU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
20
pkgs/shells/fish/plugins/clownfish.nix
Normal file
20
pkgs/shells/fish/plugins/clownfish.nix
Normal file
@ -0,0 +1,20 @@
|
||||
{ lib, buildFishPlugin, fetchFromGitHub }:
|
||||
|
||||
buildFishPlugin {
|
||||
pname = "clownfish";
|
||||
version = "unstable-2021-01-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IlanCosman";
|
||||
repo = "clownfish";
|
||||
rev = "a0db28d8280d05561b8f48c0465480725feeca4c";
|
||||
sha256 = "04xvikyrdm6yxh588vbpwvm04fas76pa7sigsaqrip7yh021xxab";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fish function to mock the behaviour of commands";
|
||||
homepage = "https://github.com/IlanCosman/clownfish";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ pacien ];
|
||||
};
|
||||
}
|
@ -4,10 +4,17 @@ lib.makeScope newScope (self: with self; {
|
||||
|
||||
buildFishPlugin = callPackage ./build-fish-plugin.nix { };
|
||||
|
||||
clownfish = callPackage ./clownfish.nix { };
|
||||
|
||||
# Fishtape 2.x and 3.x aren't compatible,
|
||||
# but both versions are used in the tests of different other plugins.
|
||||
fishtape = callPackage ./fishtape.nix { };
|
||||
fishtape_3 = callPackage ./fishtape_3.nix { };
|
||||
|
||||
foreign-env = callPackage ./foreign-env { };
|
||||
|
||||
fzf-fish = callPackage ./fzf-fish.nix { };
|
||||
|
||||
pure = callPackage ./pure.nix { };
|
||||
|
||||
})
|
||||
|
25
pkgs/shells/fish/plugins/fishtape_3.nix
Normal file
25
pkgs/shells/fish/plugins/fishtape_3.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ lib, buildFishPlugin, fetchFromGitHub }:
|
||||
|
||||
buildFishPlugin rec {
|
||||
pname = "fishtape";
|
||||
version = "3.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jorgebucaran";
|
||||
repo = "fishtape";
|
||||
rev = version;
|
||||
sha256 = "072a3qbk1lpxw53bxp91drsffylx8fbywhss3x0jbnayn9m8i7aa";
|
||||
};
|
||||
|
||||
checkFunctionDirs = [ "./functions" ]; # fishtape is introspective
|
||||
checkPhase = ''
|
||||
fishtape tests/*.fish
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "100% pure-Fish test runner";
|
||||
homepage = "https://github.com/jorgebucaran/fishtape";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ pacien ];
|
||||
};
|
||||
}
|
34
pkgs/shells/fish/plugins/fzf-fish.nix
Normal file
34
pkgs/shells/fish/plugins/fzf-fish.nix
Normal file
@ -0,0 +1,34 @@
|
||||
{ lib, buildFishPlugin, fetchFromGitHub, fzf, clownfish, fishtape_3 }:
|
||||
|
||||
buildFishPlugin rec {
|
||||
pname = "fzf.fish";
|
||||
version = "5.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PatrickF1";
|
||||
repo = "fzf.fish";
|
||||
rev = "v${version}";
|
||||
sha256 = "1b280n8bh00n4vkm19zrn84km52296ljlm1zhz95jgaiwymf2x73";
|
||||
};
|
||||
|
||||
checkInputs = [ fzf ];
|
||||
checkPlugins = [ clownfish fishtape_3 ];
|
||||
checkFunctionDirs = [ "./functions" ];
|
||||
checkPhase = ''
|
||||
# Disable git tests which inspect the project's git repo, which isn't
|
||||
# possible since we strip the impure .git from our build input
|
||||
rm -r tests/*git*
|
||||
|
||||
# Disable tests that are failing, probably because of our wrappers
|
||||
rm -r tests/search_shell_variables
|
||||
|
||||
fishtape tests/*/*.fish
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Augment your fish command line with fzf key bindings";
|
||||
homepage = "https://github.com/PatrickF1/fzf.fish";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ pacien ];
|
||||
};
|
||||
}
|
@ -6,11 +6,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wget";
|
||||
version = "1.20.3";
|
||||
version = "1.21.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/wget/${pname}-${version}.tar.lz";
|
||||
sha256 = "1frajd86ds8vz2hprq30wq8ya89z9dcxnwm8nwk12bbc47l7qq39";
|
||||
sha256 = "sha256-25u+U0fm+qBvx4gF7rgIsmiXlFXq2QA6YIVpydT8kK0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -1,14 +1,14 @@
|
||||
{ lib, stdenv, fetchFromGitHub, perl, gettext, pkg-config, libidn2, libiconv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "5.5.6";
|
||||
version = "5.5.8";
|
||||
pname = "whois";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rfc1036";
|
||||
repo = "whois";
|
||||
rev = "v${version}";
|
||||
sha256 = "0iqbn2ky9j7qdpv5hycy56knnfhl8nz4l4905rnr0p703lvxxx8d";
|
||||
sha256 = "sha256-WSAqJMVeHkcqzcgwvFKKBXJiIfKXBQr2mjioG7CgkIo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ perl gettext pkg-config ];
|
||||
|
@ -5,13 +5,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "theHarvester";
|
||||
version = "3.2.2";
|
||||
version = "3.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "laramies";
|
||||
repo = pname;
|
||||
rev = "V${version}";
|
||||
sha256 = "0lxzxfa9wbzim50d2jmd27i57szd0grm1dfayhnym86jn01qpvn3";
|
||||
rev = version;
|
||||
sha256 = "02jhk34znpvq522pqr3x4c0rljw37x62znwycijf1zx81dpbn4rm";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
35
pkgs/tools/security/uddup/default.nix
Normal file
35
pkgs/tools/security/uddup/default.nix
Normal file
@ -0,0 +1,35 @@
|
||||
{ lib
|
||||
, buildPythonApplication
|
||||
, colorama
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "uddup";
|
||||
version = "0.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rotemreiss";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1f5dm3772hiik9irnyvbs7wygcafbwi7czw3b47cwhb90b8fi5hg";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
colorama
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "uddup" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool for de-duplication URLs";
|
||||
homepage = "https://github.com/rotemreiss/uddup";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
@ -18,7 +18,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "thermald";
|
||||
version = "2.4.1";
|
||||
version = "2.4.3";
|
||||
|
||||
outputs = [ "out" "devdoc" ];
|
||||
|
||||
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "intel";
|
||||
repo = "thermal_daemon";
|
||||
rev = "v${version}";
|
||||
sha256 = "0rlac7v1b59m7gh767hkd8a0r4p001nd24786fnmryygbxynd2s6";
|
||||
sha256 = "sha256-CPrk2r3C4WG+y3KzWf6xWhfNdDgEigki62iAXu+DccU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -2,10 +2,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "uptimed";
|
||||
version = "0.4.2";
|
||||
version = "0.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "0wnnpjfxnycigqj6hag0n6p5piss8cv40y9jda72d9s4df5n91z8";
|
||||
sha256 = "sha256-X/LnH+EWjXlw8RktfL4ckAUmP2DPV1qlb6Ii4N985cU=";
|
||||
rev = "v${version}";
|
||||
repo = "uptimed";
|
||||
owner = "rpodgorny";
|
||||
@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
|
||||
which can also easily be used to show your records on a web page.
|
||||
'';
|
||||
homepage = "https://github.com/rpodgorny/uptimed/";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.unix;
|
||||
license = with licenses; [ gpl2Only lgpl21Plus ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
}
|
||||
|
@ -1,14 +1,14 @@
|
||||
{ lib, stdenv, fetchFromBitbucket, python3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "7.2";
|
||||
version = "8.0";
|
||||
pname = "tab";
|
||||
|
||||
src = fetchFromBitbucket {
|
||||
owner = "tkatchev";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1bm15lw0vp901dj2vsqx6yixmn7ls3brrzh1w6zgd1ksjzlm5aax";
|
||||
sha256 = "sha256-RcDvghTiqIdH79khwDIo8PhvmcObmix8WBrHToLwcw4=";
|
||||
};
|
||||
|
||||
checkInputs = [ python3 ];
|
||||
|
@ -13133,6 +13133,8 @@ in
|
||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation;
|
||||
};
|
||||
|
||||
uddup = python3Packages.callPackage ../tools/security/uddup { };
|
||||
|
||||
udis86 = callPackage ../development/tools/udis86 { };
|
||||
|
||||
uefi-firmware-parser = callPackage ../development/tools/analysis/uefi-firmware-parser { };
|
||||
|
Loading…
Reference in New Issue
Block a user