Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
28641f51dc
@ -62,6 +62,8 @@ rec {
|
||||
‘type’: A module system type representing the module set as a submodule,
|
||||
to be extended by configuration from the containing module set.
|
||||
|
||||
This is also available as the module argument ‘moduleType’.
|
||||
|
||||
‘extendModules’: A function similar to ‘evalModules’ but building on top
|
||||
of the module set. Its arguments, ‘modules’ and ‘specialArgs’ are
|
||||
added to the existing values.
|
||||
@ -74,6 +76,8 @@ rec {
|
||||
override existing configuration fundamentally requires a new
|
||||
fixpoint to be constructed.
|
||||
|
||||
This is also available as a module argument.
|
||||
|
||||
‘_module’: A portion of the configuration tree which is elided from
|
||||
‘config’. It contains some values that are mostly internal to the
|
||||
module system implementation.
|
||||
@ -146,6 +150,7 @@ rec {
|
||||
config = {
|
||||
_module.args = {
|
||||
inherit extendModules;
|
||||
moduleType = type;
|
||||
} // args;
|
||||
};
|
||||
};
|
||||
|
||||
@ -281,6 +281,11 @@ checkConfigError 'A definition for option .fun.\[function body\]. is not of type
|
||||
checkConfigOutput "b a" config.result ./functionTo/list-order.nix
|
||||
checkConfigOutput "a c" config.result ./functionTo/merging-attrs.nix
|
||||
|
||||
# moduleType
|
||||
checkConfigOutput "a b" config.resultFoo ./declare-variants.nix ./define-variant.nix
|
||||
checkConfigOutput "a y z" config.resultFooBar ./declare-variants.nix ./define-variant.nix
|
||||
checkConfigOutput "a b c" config.resultFooFoo ./declare-variants.nix ./define-variant.nix
|
||||
|
||||
cat <<EOF
|
||||
====== module tests ======
|
||||
$pass Pass
|
||||
|
||||
9
lib/tests/modules/declare-variants.nix
Normal file
9
lib/tests/modules/declare-variants.nix
Normal file
@ -0,0 +1,9 @@
|
||||
{ lib, moduleType, ... }:
|
||||
let inherit (lib) mkOption types;
|
||||
in
|
||||
{
|
||||
options.variants = mkOption {
|
||||
type = types.lazyAttrsOf moduleType;
|
||||
default = {};
|
||||
};
|
||||
}
|
||||
22
lib/tests/modules/define-variant.nix
Normal file
22
lib/tests/modules/define-variant.nix
Normal file
@ -0,0 +1,22 @@
|
||||
{ config, lib, ... }:
|
||||
let inherit (lib) types mkOption attrNames;
|
||||
in
|
||||
{
|
||||
options = {
|
||||
attrs = mkOption { type = types.attrsOf lib.types.int; };
|
||||
result = mkOption { };
|
||||
resultFoo = mkOption { };
|
||||
resultFooBar = mkOption { };
|
||||
resultFooFoo = mkOption { };
|
||||
};
|
||||
config = {
|
||||
attrs.a = 1;
|
||||
variants.foo.attrs.b = 1;
|
||||
variants.bar.attrs.y = 1;
|
||||
variants.foo.variants.bar.attrs.z = 1;
|
||||
variants.foo.variants.foo.attrs.c = 3;
|
||||
resultFoo = lib.concatMapStringsSep " " toString (attrNames config.variants.foo.attrs);
|
||||
resultFooBar = lib.concatMapStringsSep " " toString (attrNames config.variants.foo.variants.bar.attrs);
|
||||
resultFooFoo = lib.concatMapStringsSep " " toString (attrNames config.variants.foo.variants.foo.attrs);
|
||||
};
|
||||
}
|
||||
@ -5081,7 +5081,7 @@
|
||||
}];
|
||||
};
|
||||
ivankovnatsky = {
|
||||
email = "ikovnatsky@protonmail.ch";
|
||||
email = "75213+ivankovnatsky@users.noreply.github.com";
|
||||
github = "ivankovnatsky";
|
||||
githubId = 75213;
|
||||
name = "Ivan Kovnatsky";
|
||||
|
||||
@ -152,6 +152,7 @@ let
|
||||
serviceConfig = {
|
||||
# The service's only task is to ensure that the specified path exists
|
||||
Type = "oneshot";
|
||||
WorkingDirectory = cfg.path;
|
||||
};
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
};
|
||||
|
||||
@ -100,6 +100,7 @@ in
|
||||
serviceConfig = {
|
||||
User = config.users.users.gollum.name;
|
||||
Group = config.users.groups.gollum.name;
|
||||
WorkingDirectory = cfg.stateDir;
|
||||
ExecStart = ''
|
||||
${pkgs.gollum}/bin/gollum \
|
||||
--port ${toString cfg.port} \
|
||||
|
||||
@ -195,6 +195,7 @@ in {
|
||||
SystemCallArchitectures = "native";
|
||||
SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ];
|
||||
UMask = "0027";
|
||||
WorkingDirectory = "/var/lib/radicale";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -57,7 +57,7 @@ let
|
||||
pgsqlLocal = cfg.database.createLocally && cfg.database.type == "pgsql";
|
||||
|
||||
phpExt = pkgs.php74.withExtensions
|
||||
({ enabled, all }: with all; [ iconv mbstring curl openssl tokenizer xmlrpc soap ctype zip gd simplexml dom intl json sqlite3 pgsql pdo_sqlite pdo_pgsql pdo_odbc pdo_mysql pdo mysqli session zlib xmlreader fileinfo filter ]);
|
||||
({ enabled, all }: with all; [ iconv mbstring curl openssl tokenizer xmlrpc soap ctype zip gd simplexml dom intl json sqlite3 pgsql pdo_sqlite pdo_pgsql pdo_odbc pdo_mysql pdo mysqli session zlib xmlreader fileinfo filter opcache ]);
|
||||
in
|
||||
{
|
||||
# interface
|
||||
|
||||
@ -29,7 +29,6 @@ let
|
||||
} ''
|
||||
install -D ${xmonadEnv}/share/man/man1/xmonad.1.gz $out/share/man/man1/xmonad.1.gz
|
||||
makeWrapper ${configured}/bin/xmonad $out/bin/xmonad \
|
||||
--set NIX_GHC "${xmonadEnv}/bin/ghc" \
|
||||
--set XMONAD_XMESSAGE "${pkgs.xorg.xmessage}/bin/xmessage"
|
||||
'';
|
||||
|
||||
@ -93,6 +92,8 @@ in {
|
||||
<literal>(restart "xmonad" True)</literal> instead, which will just restart
|
||||
xmonad from PATH. This allows e.g. switching to the new xmonad binary
|
||||
after rebuilding your system with nixos-rebuild.
|
||||
For the same reason, ghc is not added to the environment when this
|
||||
option is set.
|
||||
|
||||
If you actually want to run xmonad with a config specified here, but
|
||||
also be able to recompile and restart it from a copy of that source in
|
||||
|
||||
@ -67,6 +67,7 @@ let
|
||||
"systemd-user-sessions.service"
|
||||
"dbus-org.freedesktop.import1.service"
|
||||
"dbus-org.freedesktop.machine1.service"
|
||||
"dbus-org.freedesktop.login1.service"
|
||||
"user@.service"
|
||||
"user-runtime-dir@.service"
|
||||
|
||||
|
||||
@ -12,16 +12,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "electrs";
|
||||
version = "0.9.2";
|
||||
version = "0.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "romanz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dYKSc5fU66fu+GdTeWQBrIOJAiBGdYAOS7MCto98Xss=";
|
||||
hash = "sha256-sTQ/dX1uXJkEmrNZ47qjBlrexO50y0NGNhw71rHc9bw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-M4H5tUbo1f18kk8S53saebSnZhZFr8udw41BUNJbQVI==";
|
||||
cargoHash = "sha256-1ZQt8LaqgxNxFfgCVCK0GVwbcVfX3v9iz7tHvzgyI0g=";
|
||||
|
||||
# needed for librocksdb-sys
|
||||
nativeBuildInputs = [ llvmPackages.clang ];
|
||||
|
||||
55
pkgs/applications/graphics/pixeluvo/default.nix
Normal file
55
pkgs/applications/graphics/pixeluvo/default.nix
Normal file
@ -0,0 +1,55 @@
|
||||
{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper
|
||||
, gtk3-x11 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pixeluvo";
|
||||
version = "1.6.0-2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.pixeluvo.com/downloads/${pname}_${version}_amd64.deb";
|
||||
sha256 = "sha256-QYSuD6o3kHg0DrFihYEcf9e3b8U1bu4Zf78+Akmm8yo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
dpkg
|
||||
makeWrapper
|
||||
autoPatchelfHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3-x11
|
||||
stdenv.cc.cc
|
||||
];
|
||||
|
||||
libPath = lib.makeLibraryPath buildInputs;
|
||||
|
||||
dontBuild = true;
|
||||
dontConfigure = true;
|
||||
|
||||
unpackPhase = ''
|
||||
dpkg-deb -x ${src} ./
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mv usr $out
|
||||
mv opt $out
|
||||
install -Dm644 $out/opt/pixeluvo/pixeluvo.png -t $out/share/pixmaps/
|
||||
|
||||
substituteInPlace $out/share/applications/pixeluvo.desktop \
|
||||
--replace '/opt/pixeluvo/pixeluvo.png' pixeluvo
|
||||
|
||||
makeWrapper $out/opt/pixeluvo/bin/Pixeluvo64 $out/bin/pixeluvo \
|
||||
--prefix LD_LIBRARY_PATH : ${libPath}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Beautifully Designed Image and Photo Editor for Windows and Linux";
|
||||
homepage = "http://www.pixeluvo.com/";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ wolfangaukang ];
|
||||
};
|
||||
}
|
||||
@ -32,11 +32,24 @@ let
|
||||
url = "https://github.com/swaywm/wlroots/commit/e18599b05e0f0cbeba11adbd489e801285470eab.patch";
|
||||
sha256 = "17ax4dyk0584yhs3lq8ija5bkainjf7psx9c9r50cr4jm9c0i37l";
|
||||
})
|
||||
|
||||
# xwayland: Allow to retrieve _NET_STARTUP_ID
|
||||
(fetchpatch {
|
||||
name = "allow-to-retrieve-net-startup-id.patch";
|
||||
url = "https://github.com/swaywm/wlroots/commit/66593071bc90a1cccaeedc636eb6f33c973f5362.patch";
|
||||
sha256 = "sha256-yKf/twdUzrII5IakH7AH6LGyPDo9Nl/gIB0pTThSTfY=";
|
||||
})
|
||||
# xwayland: Allow to retrieve startup-id via _NET_STARTUP_INFO
|
||||
(fetchpatch {
|
||||
name = "allow-to-retrieve-startup-id-via-net-startup-info.patch";
|
||||
url = "https://github.com/swaywm/wlroots/commit/235bb6f2fcb8ee4174215ba74b5bc2f191c5960a.patch";
|
||||
sha256 = "sha256-7AWBq12tF/781CmgvTaOvTIiiJMywxRn6eWp+jacdak=";
|
||||
})
|
||||
];
|
||||
});
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "phoc";
|
||||
version = "0.8.0";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
@ -44,7 +57,7 @@ in stdenv.mkDerivation rec {
|
||||
owner = "Phosh";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-QAnJlpFjWJvwxGyenmN4IaI9VFn2jwdXpa8VqAmH7Xw=";
|
||||
sha256 = "sha256-qd1ZETM2/AjU5nKQIqh0Q+SboLNr+NncvSHgLv2S3KI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
50
pkgs/applications/misc/thedesk/default.nix
Normal file
50
pkgs/applications/misc/thedesk/default.nix
Normal file
@ -0,0 +1,50 @@
|
||||
{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron
|
||||
, alsa-lib, gtk3, libxshmfence, mesa, nss }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "thedesk";
|
||||
version = "22.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/cutls/TheDesk/releases/download/v${version}/${pname}_${version}_amd64.deb";
|
||||
sha256 = "sha256-5KB88zMgwfObgmcMTe6R+oG48qLHrMht6vM1EvI+QFY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
dpkg
|
||||
autoPatchelfHook
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [ alsa-lib gtk3 libxshmfence mesa nss ];
|
||||
|
||||
dontBuild = true;
|
||||
dontConfigure = true;
|
||||
|
||||
unpackPhase = ''
|
||||
dpkg-deb -x ${src} ./
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mv usr $out
|
||||
mv opt $out
|
||||
|
||||
substituteInPlace $out/share/applications/thedesk.desktop \
|
||||
--replace '/opt/TheDesk' $out/bin
|
||||
|
||||
makeWrapper ${electron}/bin/electron $out/bin/thedesk \
|
||||
--add-flags $out/opt/TheDesk/resources/app.asar
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Mastodon/Misskey Client for PC";
|
||||
homepage = "https://thedesk.top";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ wolfangaukang ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cloudflared";
|
||||
version = "2021.10.5";
|
||||
version = "2021.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = "cloudflared";
|
||||
rev = version;
|
||||
sha256 = "sha256-vz7S6Qzr10Idy83ogMIHEHrjxGxxjtFnzNsuhbZqUnA=";
|
||||
sha256 = "sha256-amwzMSPMaXbIj95RhSVnl0kwHnEluKj4L7q4Zu2HPgE=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
@ -22,6 +22,6 @@ buildGoModule rec {
|
||||
homepage = "https://www.cloudflare.com/products/argo-tunnel";
|
||||
license = licenses.unfree;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.thoughtpolice maintainers.enorris ];
|
||||
maintainers = with maintainers; [ bbigras enorris thoughtpolice ];
|
||||
};
|
||||
}
|
||||
|
||||
56
pkgs/applications/networking/cluster/arkade/default.nix
Normal file
56
pkgs/applications/networking/cluster/arkade/default.nix
Normal file
@ -0,0 +1,56 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, kubectl
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "arkade";
|
||||
version = "0.8.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexellis";
|
||||
repo = "arkade";
|
||||
rev = version;
|
||||
sha256 = "0jv6pip3ywx8bx7m25fby6kl5irnjxvlpss2wkm615gv9ari21aq";
|
||||
};
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
vendorSha256 = "05zdd5c2x4k4myxmgj32md8wq08i543l8q81rabqgyd3r9nwv4lx";
|
||||
|
||||
# Exclude pkg/get: tests downloading of binaries which fail when sandbox=true
|
||||
subPackages = [
|
||||
"."
|
||||
"cmd"
|
||||
"pkg/apps"
|
||||
"pkg/archive"
|
||||
"pkg/config"
|
||||
"pkg/env"
|
||||
"pkg/helm"
|
||||
"pkg/k8s"
|
||||
"pkg/types"
|
||||
];
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
"-X github.com/alexellis/arkade/cmd.GitCommit=ref/tags/${version}"
|
||||
"-X github.com/alexellis/arkade/cmd.Version=${version}"
|
||||
];
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/arkade" \
|
||||
--prefix PATH : ${lib.makeBinPath [ kubectl ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/alexellis/arkade";
|
||||
description = "Open Source Kubernetes Marketplace";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ welteki ];
|
||||
};
|
||||
}
|
||||
56
pkgs/applications/networking/cluster/driftctl/default.nix
Normal file
56
pkgs/applications/networking/cluster/driftctl/default.nix
Normal file
@ -0,0 +1,56 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "driftctl";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudskiff";
|
||||
repo = "driftctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rWC4jqquVWJmHV/dnH+DsxlNiAY01xnq9z0/owS4Yis=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-d8vASP8KnUeUkaHRU8kCE7FCt2QLGu5ET5BN3GM2O9c=";
|
||||
|
||||
postUnpack = ''
|
||||
# Without this, tests fail to locate aws/3.19.0.json
|
||||
for prefix in / \
|
||||
/pkg \
|
||||
/pkg/analyser \
|
||||
/pkg/alerter \
|
||||
/pkg/remote \
|
||||
/pkg/middlewares \
|
||||
/pkg/cmd/scan/output \
|
||||
/pkg/iac/terraform/state \
|
||||
/pkg/iac/supplier ; do
|
||||
mkdir -p ./source/$prefix/github.com/cloudskiff
|
||||
ln -sf $PWD/source ./source/$prefix/github.com/cloudskiff/driftctl
|
||||
done
|
||||
|
||||
# Disable check for latest version and telemetry, which are opt-out.
|
||||
# Making it out-in is quite a job, and why bother?
|
||||
find -name '*.go' \
|
||||
| xargs sed -i 's,https://2lvzgmrf2e.execute-api.eu-west-3.amazonaws.com/,https://0.0.0.0/,g'
|
||||
|
||||
# and remove corresponding flags from --help, so things look tidy.
|
||||
find -name driftctl.go | \
|
||||
xargs sed -i -e '/("no-version-check"/ d' -e '/("disable-telemetry"/ d'
|
||||
|
||||
# Presumably it can be done with ldflags, but I failed to find incantation
|
||||
# that would work, we here we go old-school.
|
||||
find -name version.go | xargs sed -i -e 's/"dev"/"${version}"/'
|
||||
find -name build.go | xargs sed -i -e 's/"dev"/"release"/'
|
||||
|
||||
# Fix the tests that checks for dev-dev.
|
||||
find -name version_test.go | xargs sed -i -e 's/"dev-dev/"${version}/'
|
||||
find -name driftctl_test.go | xargs sed -i -e 's/"dev-dev/"${version}/'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to track infrastructure drift";
|
||||
homepage = "https://github.com/cloudskiff/driftctl";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ kaction ];
|
||||
};
|
||||
}
|
||||
@ -61,7 +61,7 @@ GEM
|
||||
multi_json
|
||||
to_regexp (~> 0.2.1)
|
||||
jwt (2.3.0)
|
||||
krane (2.3.1)
|
||||
krane (2.3.2)
|
||||
activesupport (>= 5.0)
|
||||
colorize (~> 0.8)
|
||||
concurrent-ruby (~> 1.1)
|
||||
@ -77,7 +77,7 @@ GEM
|
||||
recursive-open-struct (~> 1.1, >= 1.1.1)
|
||||
rest-client (~> 2.0)
|
||||
memoist (0.16.2)
|
||||
mime-types (3.4.0)
|
||||
mime-types (3.4.1)
|
||||
mime-types-data (~> 3.2015)
|
||||
mime-types-data (3.2021.1115)
|
||||
minitest (5.14.4)
|
||||
|
||||
@ -276,10 +276,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0k1lwg0d2phs9n9zdx7nv5rv2p2vipm9jgzalr8x9nrq1is6wgvr";
|
||||
sha256 = "0x908645i92w012xglc07lb6k2irn1zpzwgn1n99h2x54qk1pz4v";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.3.1";
|
||||
version = "2.3.2";
|
||||
};
|
||||
kubeclient = {
|
||||
dependencies = ["http" "recursive-open-struct" "rest-client"];
|
||||
@ -308,10 +308,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1wvbwlkf6i17xvxx70cffw26ijvcc400vfhpbnvd8mmx556cnb4g";
|
||||
sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.4.0";
|
||||
version = "3.4.1";
|
||||
};
|
||||
mime-types-data = {
|
||||
groups = ["default"];
|
||||
|
||||
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||
homepage =
|
||||
"https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-working-with-install-plugin.html";
|
||||
description = "Amazon SSM Session Manager Plugin";
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ mbaillie ];
|
||||
};
|
||||
|
||||
@ -0,0 +1,54 @@
|
||||
{ stdenv, lib, fetchurl, unzip, makeDesktopItem, copyDesktopItems
|
||||
, makeWrapper, electron }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "indigenous-desktop";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/marksuth/indigenous-desktop/releases/download/v${version}/indigenous-linux-x64-${version}.zip";
|
||||
sha256 = "sha256-1nqj9N5RQE0PogJSULu75CTVLHeQsHIimtFXSCP6SPA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
makeWrapper
|
||||
unzip
|
||||
];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = pname;
|
||||
exec = "indigenous-desktop";
|
||||
icon = "indigenous-desktop";
|
||||
comment = meta.description;
|
||||
desktopName = "Indigenous";
|
||||
genericName = "Feed Reader";
|
||||
})
|
||||
];
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/opt/indigenous $out/share/indigenous $out/share/pixmaps
|
||||
cp -r ./ $out/opt/indigenous
|
||||
mv $out/opt/indigenous/{locales,resources} $out/share/indigenous
|
||||
mv $out/share/indigenous/resources/app/images/icon.png $out/share/pixmaps/indigenous-desktop.png
|
||||
|
||||
makeWrapper ${electron}/bin/electron $out/bin/indigenous-desktop \
|
||||
--add-flags $out/share/indigenous/resources/app
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "IndieWeb app with extensions for sharing to/reading from micropub endpoints";
|
||||
homepage = "https://indigenous.realize.be/indigenous-desktop";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ wolfangaukang ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
@ -4,11 +4,11 @@
|
||||
}:
|
||||
python2.pkgs.buildPythonApplication rec {
|
||||
pname = "chirp-daily";
|
||||
version = "20210724";
|
||||
version = "20211016";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "0wddzls7r0l5b8vvljnmrj5lmmp7zkzl4h73pyigyf9nbhaklybb";
|
||||
sha256 = "13xzqnhvnw6yipv4izkq0s9ykyl9pc5ifpr1ii8xfp28ch706qyw";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python2.pkgs; [
|
||||
|
||||
@ -1,28 +1,40 @@
|
||||
{ lib, fetchFromGitHub, appstream-glib, desktop-file-utils, glib
|
||||
, gobject-introspection, gst_all_1, gtk4, libadwaita, librsvg, meson, ninja
|
||||
, pkg-config, python3, wrapGAppsHook }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, appstream-glib
|
||||
, desktop-file-utils
|
||||
, glib
|
||||
, gobject-introspection
|
||||
, gst_all_1
|
||||
, gtk4
|
||||
, libadwaita
|
||||
, libpulseaudio
|
||||
, librsvg
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, python3
|
||||
, rustPlatform
|
||||
, wayland
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kooha";
|
||||
version = "1.2.1";
|
||||
format = "other";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SeaDve";
|
||||
repo = "Kooha";
|
||||
rev = "v${version}";
|
||||
sha256 = "1qwbzdn0n1nxcfci1bhhkfchdhw5yz74fdvsa84cznyyx2jils8w";
|
||||
sha256 = "05ynpwjdpl7zp9f17zhhvb59rbz3gd7hc0amla1g85ldgfxbgl00";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gobject-introspection
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
gtk4
|
||||
libadwaita
|
||||
librsvg
|
||||
];
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256:16zf6vb001z7xdv2g4kpmb2vqsmaql2cpsx1rl9zrfhpl2z6frs9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream-glib
|
||||
@ -31,21 +43,31 @@ python3.pkgs.buildPythonApplication rec {
|
||||
ninja
|
||||
python3
|
||||
pkg-config
|
||||
rustPlatform.cargoSetupHook
|
||||
rustPlatform.rust.cargo
|
||||
rustPlatform.rust.rustc
|
||||
wayland
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gobject-introspection
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
gtk4
|
||||
libadwaita
|
||||
libpulseaudio
|
||||
librsvg
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ python3.pkgs.pygobject3 ];
|
||||
|
||||
strictDeps = false;
|
||||
|
||||
buildPhase = ''
|
||||
export GST_PLUGIN_SYSTEM_PATH_1_0="$out/lib/gstreamer-1.0/:$GST_PLUGIN_SYSTEM_PATH_1_0"
|
||||
'';
|
||||
|
||||
# Fixes https://github.com/NixOS/nixpkgs/issues/31168
|
||||
postPatch = ''
|
||||
chmod +x build-aux/meson/postinstall.py
|
||||
patchShebangs build-aux/meson/postinstall.py
|
||||
patchShebangs build-aux/meson_post_install.py
|
||||
'';
|
||||
|
||||
installCheckPhase = ''
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "phosh";
|
||||
version = "0.13.1";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects
|
||||
sha256 = "sha256-dKQK4mGe/dvNlca/XMDeq1Q4dH/WBF/rtiUh8RssF5c=";
|
||||
sha256 = "sha256-pN2IWJDsQoTSOUki5gKhIucFYlYchzrqKHQYq6o4EkI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -3,12 +3,12 @@
|
||||
let
|
||||
generator = buildGoModule rec {
|
||||
pname = "v2ray-domain-list-community";
|
||||
version = "20211103073737";
|
||||
version = "20211119143108";
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2fly";
|
||||
repo = "domain-list-community";
|
||||
rev = version;
|
||||
sha256 = "sha256-NYgEXbow16w+XMRjbQG1cIn/BjPbbcj+uzb4kcVR6eI=";
|
||||
sha256 = "sha256-CJMINkutaUI/Eka0OJTjeG3weTMYaNKdB2BWOxFgI3s=";
|
||||
};
|
||||
vendorSha256 = "sha256-JuLU9v1ukVfAEtz07tGk66st1+sO4SBz83BlK3IPQwU=";
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,15 +1,14 @@
|
||||
{
|
||||
stdenv,
|
||||
clangStdenv,
|
||||
fetchgit,
|
||||
fetchpatch,
|
||||
libuuid,
|
||||
python3,
|
||||
bc,
|
||||
clang_9,
|
||||
llvmPackages_9,
|
||||
overrideCC,
|
||||
lib,
|
||||
{ stdenv
|
||||
, clangStdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, libuuid
|
||||
, python3
|
||||
, bc
|
||||
, clang_9
|
||||
, llvmPackages_9
|
||||
, overrideCC
|
||||
, lib
|
||||
}:
|
||||
|
||||
let
|
||||
@ -39,12 +38,26 @@ edk2 = buildStdenv.mkDerivation {
|
||||
version = "202108";
|
||||
|
||||
# submodules
|
||||
src = fetchgit {
|
||||
url = "https://github.com/tianocore/edk2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tianocore";
|
||||
repo = "edk2";
|
||||
rev = "edk2-stable${edk2.version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "1ps244f7y43afxxw6z95xscy24f9mpp8g0mfn90rd4229f193ba2";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pull upstream fix for gcc-11 build.
|
||||
(fetchpatch {
|
||||
name = "gcc-11-vla.patch";
|
||||
url = "https://github.com/google/brotli/commit/0a3944c8c99b8d10cc4325f721b7c273d2b41f7b.patch";
|
||||
sha256 = "10c6ibnxh4f8lrh9i498nywgva32jxy2c1zzvr9mcqgblf9d19pj";
|
||||
# Apply submodule patch to subdirectory: "a/" -> "BaseTools/Source/C/BrotliCompress/brotli/"
|
||||
stripLen = 1;
|
||||
extraPrefix = "BaseTools/Source/C/BrotliCompress/brotli/";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ libuuid pythonEnv ];
|
||||
|
||||
makeFlags = [ "-C BaseTools" ]
|
||||
|
||||
@ -1,21 +1,20 @@
|
||||
{ lib, stdenv, fetchurl
|
||||
, withShishi ? !stdenv.isDarwin, shishi ? null
|
||||
, withShishi ? !stdenv.isDarwin, shishi
|
||||
}:
|
||||
|
||||
assert withShishi -> shishi != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gss-1.0.3";
|
||||
pname = "gss";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gss/${name}.tar.gz";
|
||||
url = "mirror://gnu/gss/${pname}-${version}.tar.gz";
|
||||
sha256 = "1syyvh3k659xf1hdv9pilnnhbbhs6vfapayp4xgdcc8mfgf9v4gz";
|
||||
};
|
||||
|
||||
buildInputs = lib.optional withShishi shishi;
|
||||
|
||||
configureFlags = [
|
||||
"--${if withShishi != null then "enable" else "disable"}-kereberos5"
|
||||
"--${if withShishi then "enable" else "disable"}-kerberos5"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@ -10,12 +10,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyterlab";
|
||||
version = "3.1.18";
|
||||
version = "3.2.3";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a43733acc3729557fc4758cff55652e52896e42c64c1f12540656ae7f298b806";
|
||||
sha256 = "7d74593e52d4dbfacbb98e14cac4bc765ea2cffb1b980675f44930d622871705";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ jupyter-packaging ];
|
||||
|
||||
@ -15,11 +15,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "knack";
|
||||
version = "0.8.2";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4eaa50a1c5e79d1c5c8e5e1705b661721b0b83a089695e59e229cc26c64963b9";
|
||||
sha256 = "7fcab17585c0236885eaef311c01a1e626d84c982aabcac81703afda3f89c81f";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -21,11 +21,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymatgen";
|
||||
version = "2022.0.14";
|
||||
version = "2022.0.16";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "03d24ebafc21becab376c26de09437dd5cfb7bda7099046194e95b4c9fa35209";
|
||||
sha256 = "fb4db7d547f062266a1a113d898fb0626ded5a1f9101ef79681e171b7e45fad0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ glibcLocales ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "QtAwesome";
|
||||
version = "1.0.3";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d37bbeb69ddc591e5ff036b741bda8d1d92133811f1f5a7150021506f70b8e6e";
|
||||
sha256 = "3fc6eb9327f96ded8e0d291dad4f7a543394c53bff8f9f4badd7433181581a8b";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ qtpy six ];
|
||||
|
||||
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp -prd * $out/bin
|
||||
cp -prd *.dll *.so gozip func $out/bin
|
||||
patchelf \
|
||||
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
--set-rpath "${libPath}" "$out/bin/func"
|
||||
|
||||
@ -20,13 +20,13 @@
|
||||
}:
|
||||
mkDerivation rec {
|
||||
pname = "duckstation";
|
||||
version = "unstable-2021-10-19";
|
||||
version = "unstable-2021-10-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stenzek";
|
||||
repo = pname;
|
||||
rev = "96f4fdf8d88ff3a120f3bc409a6a6487cdcbd55f";
|
||||
sha256 = "sha256-WWsi7kmFEYES2BoNKIFF1+lKHJGP3hbTZ9o3eWp+EcE=";
|
||||
rev = "287b1e1abc98ef3f01d8530e0b428b58d8e77e96";
|
||||
sha256 = "sha256-1s7oBdOOkK6a3DKCZ70dAilFzlzrURwhx+MRTmOPWJE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja pkg-config extra-cmake-modules wrapQtAppsHook qttools ];
|
||||
@ -45,7 +45,7 @@ mkDerivation rec {
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
#"-DUSE_DRMKMS=ON" # Broken in combination with Wayland, https://github.com/stenzek/duckstation/issues/2630
|
||||
"-DUSE_DRMKMS=ON" # Broken in combination with Wayland, https://github.com/stenzek/duckstation/issues/2630
|
||||
"-DUSE_WAYLAND=ON"
|
||||
];
|
||||
|
||||
|
||||
@ -3250,6 +3250,18 @@ final: prev:
|
||||
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
|
||||
};
|
||||
|
||||
luatab-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "luatab.nvim";
|
||||
version = "2021-11-08";
|
||||
src = fetchFromGitHub {
|
||||
owner = "alvarosevilla95";
|
||||
repo = "luatab.nvim";
|
||||
rev = "05eacdfd818741ff3f92bae6213c026a91711be4";
|
||||
sha256 = "0iy45hmn6f6dp3pym0yl091kngnrg25hrk5dlm93mj3yxbmgss4r";
|
||||
};
|
||||
meta.homepage = "https://github.com/alvarosevilla95/luatab.nvim/";
|
||||
};
|
||||
|
||||
lush-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lush.nvim";
|
||||
version = "2021-11-06";
|
||||
@ -5809,6 +5821,18 @@ final: prev:
|
||||
meta.homepage = "https://github.com/vim-syntastic/syntastic/";
|
||||
};
|
||||
|
||||
tabline-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "tabline.nvim";
|
||||
version = "2021-11-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kdheepak";
|
||||
repo = "tabline.nvim";
|
||||
rev = "3bac71db4e99b5af9a5fbfd1d134031aea4f01ab";
|
||||
sha256 = "1fzmcfvp7bxskmb18885pmnyyfcir7z20zgz7ffw98rq97rdf02r";
|
||||
};
|
||||
meta.homepage = "https://github.com/kdheepak/tabline.nvim/";
|
||||
};
|
||||
|
||||
tabmerge = buildVimPluginFrom2Nix {
|
||||
pname = "tabmerge";
|
||||
version = "2010-10-18";
|
||||
|
||||
@ -12,6 +12,7 @@ aklt/plantuml-syntax
|
||||
allendang/nvim-expand-expr@main
|
||||
altercation/vim-colors-solarized
|
||||
alvan/vim-closetag
|
||||
alvarosevilla95/luatab.nvim
|
||||
alx741/vim-hindent
|
||||
alx741/vim-stylishask
|
||||
amiorin/ctrlp-z
|
||||
@ -344,6 +345,7 @@ kbenzie/vim-spirv
|
||||
kchmck/vim-coffee-script
|
||||
kdheepak/cmp-latex-symbols@main
|
||||
kdheepak/lazygit.nvim
|
||||
kdheepak/tabline.nvim@main
|
||||
KeitaNakamura/neodark.vim
|
||||
keith/investigate.vim
|
||||
keith/rspec.vim
|
||||
|
||||
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
inherit libsOnly;
|
||||
|
||||
unpackPhase = ''
|
||||
undmg < "${src}"
|
||||
undmg "${src}"
|
||||
|
||||
export sourceRoot=prl-tools-build
|
||||
7z x "Parallels Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso" -o$sourceRoot
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rtl8821ce";
|
||||
version = "${kernel.version}-unstable-2021-05-28";
|
||||
version = "${kernel.version}-unstable-2021-11-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tomaspinho";
|
||||
repo = "rtl8821ce";
|
||||
rev = "f93db734666f75ebf65e44ceb943c19b598b1647";
|
||||
sha256 = "sha256-cqXV52U+6Jl9Jje1nEOYDvmH4rgA1QdrwNCfYeul3hU=";
|
||||
rev = "ca204c60724d23ab10244f920d4e50759ed1affb";
|
||||
sha256 = "18ma8a8h1l90dss0k6al7q6plwr57jc9g67p22g9917k1jfbhm97";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "pic" ];
|
||||
@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl2Only;
|
||||
platforms = platforms.linux;
|
||||
broken = stdenv.isAarch64;
|
||||
maintainers = with maintainers; [ hhm ];
|
||||
maintainers = with maintainers; [ hhm ivar ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "slurm";
|
||||
version = "21.08.3.1";
|
||||
version = "21.08.4.1";
|
||||
|
||||
# N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
|
||||
# because the latter does not keep older releases.
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
repo = "slurm";
|
||||
# The release tags use - instead of .
|
||||
rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}";
|
||||
sha256 = "0riynmdmq44hqjdfd8acvc14miy5yqbwvsmbm1xcgsjdxjan8l2z";
|
||||
sha256 = "0xaswxm54lxahjn5pkm8b1x1ny3iclyp07h7fzhadgbqmla26np2";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
21
pkgs/servers/duckling-proxy/default.nix
Normal file
21
pkgs/servers/duckling-proxy/default.nix
Normal file
@ -0,0 +1,21 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule {
|
||||
pname = "duckling-proxy";
|
||||
version = "2021-07-23-unstable";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LukeEmmet";
|
||||
repo = "duckling-proxy";
|
||||
rev = "e2bfd73a60d7afa43f13a9d420d514131fee8fd1";
|
||||
sha256 = "134hnfa4f5sb1z1j5684wmqzascsrlagx8z36i1470yggb00j4hr";
|
||||
};
|
||||
vendorSha256 = "0wxk1a5gn9a7q2kgq11a783rl5cziipzhndgp71i365y3p1ssqyf";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Gemini proxy to access the Small Web";
|
||||
homepage = "https://github.com/LukeEmmet/duckling-proxy";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ kaction ];
|
||||
};
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchzip
|
||||
, fetchpatch
|
||||
, makeWrapper
|
||||
, nixosTests
|
||||
@ -49,11 +49,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "trafficserver";
|
||||
version = "9.0.2";
|
||||
version = "9.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
src = fetchzip {
|
||||
url = "mirror://apache/trafficserver/trafficserver-${version}.tar.bz2";
|
||||
sha256 = "0r05iqmnnjq259nsibncgfrfsr0l4h3hsafizvgfl9zgmrkm6izz";
|
||||
sha256 = "sha256-oicRqKFE6hOpcNG9o3BmrMujtEzi4hrPhBWaljOW+VI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
mkYarnPackage rec {
|
||||
pname = "grafana-image-renderer";
|
||||
version = "3.2.1";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "grafana-image-renderer";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1xHRfEjtxiXXRt6Rpl4j8xxTQ6qXG4/ps885CLc35OQ=";
|
||||
sha256 = "sha256-q4w40Do3e4vMluwAb1YwSGMVHO6QRZr8Fa5I+05uzLI=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@ -49,7 +49,7 @@
|
||||
"eslint-plugin-react-hooks": "^4.2.0",
|
||||
"husky": "^4.3.8",
|
||||
"lint-staged": "^11.2.0",
|
||||
"pkg": "^5.3.3",
|
||||
"pkg": "^5.4.1",
|
||||
"prettier": "2.2.1",
|
||||
"tsc-watch": "^4.2.3",
|
||||
"typescript": "^4.3.2"
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -10,11 +10,11 @@
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_babel_code_frame___code_frame_7.15.8.tgz";
|
||||
name = "_babel_code_frame___code_frame_7.14.5.tgz";
|
||||
path = fetchurl {
|
||||
name = "_babel_code_frame___code_frame_7.15.8.tgz";
|
||||
url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.15.8.tgz";
|
||||
sha1 = "45990c47adadb00c03677baa89221f7cc23d2503";
|
||||
name = "_babel_code_frame___code_frame_7.14.5.tgz";
|
||||
url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz";
|
||||
sha1 = "23b08d740e83f49c5e59945fbf1b43e80bbf4edb";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -290,19 +290,19 @@
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_types_node___node_16.10.3.tgz";
|
||||
name = "_types_node___node_16.10.2.tgz";
|
||||
path = fetchurl {
|
||||
name = "_types_node___node_16.10.3.tgz";
|
||||
url = "https://registry.yarnpkg.com/@types/node/-/node-16.10.3.tgz";
|
||||
sha1 = "7a8f2838603ea314d1d22bb3171d899e15c57bd5";
|
||||
name = "_types_node___node_16.10.2.tgz";
|
||||
url = "https://registry.yarnpkg.com/@types/node/-/node-16.10.2.tgz";
|
||||
sha1 = "5764ca9aa94470adb4e1185fe2e9f19458992b2e";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_types_node___node_14.17.21.tgz";
|
||||
name = "_types_node___node_14.17.20.tgz";
|
||||
path = fetchurl {
|
||||
name = "_types_node___node_14.17.21.tgz";
|
||||
url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.21.tgz";
|
||||
sha1 = "6359d8cf73481e312a43886fa50afc70ce5592c6";
|
||||
name = "_types_node___node_14.17.20.tgz";
|
||||
url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.20.tgz";
|
||||
sha1 = "74cc80438fd0467dc4377ee5bbad89a886df3c10";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -1298,11 +1298,11 @@
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "eslint_plugin_jsdoc___eslint_plugin_jsdoc_36.1.1.tgz";
|
||||
name = "eslint_plugin_jsdoc___eslint_plugin_jsdoc_36.1.0.tgz";
|
||||
path = fetchurl {
|
||||
name = "eslint_plugin_jsdoc___eslint_plugin_jsdoc_36.1.1.tgz";
|
||||
url = "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-36.1.1.tgz";
|
||||
sha1 = "124cd0e53a5d07f01ebde916a96dd1a6009625d6";
|
||||
name = "eslint_plugin_jsdoc___eslint_plugin_jsdoc_36.1.0.tgz";
|
||||
url = "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-36.1.0.tgz";
|
||||
sha1 = "8dfe5f27edfb6aa3812e6d86ccaea849ddc86b03";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -2386,11 +2386,11 @@
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "lint_staged___lint_staged_11.2.1.tgz";
|
||||
name = "lint_staged___lint_staged_11.2.0.tgz";
|
||||
path = fetchurl {
|
||||
name = "lint_staged___lint_staged_11.2.1.tgz";
|
||||
url = "https://registry.yarnpkg.com/lint-staged/-/lint-staged-11.2.1.tgz";
|
||||
sha1 = "e49104cb4eb01ef36742531385be2efe2b85ed94";
|
||||
name = "lint_staged___lint_staged_11.2.0.tgz";
|
||||
url = "https://registry.yarnpkg.com/lint-staged/-/lint-staged-11.2.0.tgz";
|
||||
sha1 = "6b9774a74b3eb4bef5c59fb6475bff84d6853008";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -3066,19 +3066,19 @@
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "pkg_fetch___pkg_fetch_3.2.3.tgz";
|
||||
name = "pkg_fetch___pkg_fetch_3.2.4.tgz";
|
||||
path = fetchurl {
|
||||
name = "pkg_fetch___pkg_fetch_3.2.3.tgz";
|
||||
url = "https://registry.yarnpkg.com/pkg-fetch/-/pkg-fetch-3.2.3.tgz";
|
||||
sha1 = "9825febf4eadd470c126d3f6bdc2cb6996861d36";
|
||||
name = "pkg_fetch___pkg_fetch_3.2.4.tgz";
|
||||
url = "https://registry.yarnpkg.com/pkg-fetch/-/pkg-fetch-3.2.4.tgz";
|
||||
sha1 = "5372734b12167d4bacd872be348217461b517390";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "pkg___pkg_5.3.3.tgz";
|
||||
name = "pkg___pkg_5.4.1.tgz";
|
||||
path = fetchurl {
|
||||
name = "pkg___pkg_5.3.3.tgz";
|
||||
url = "https://registry.yarnpkg.com/pkg/-/pkg-5.3.3.tgz";
|
||||
sha1 = "5ad1dadfc4e55169f0e1046626e669e0428d4cd7";
|
||||
name = "pkg___pkg_5.4.1.tgz";
|
||||
url = "https://registry.yarnpkg.com/pkg/-/pkg-5.4.1.tgz";
|
||||
sha1 = "4d824e42c454f32131e471d7cd8d14bfdb3e1c4c";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
||||
@ -2,32 +2,32 @@
|
||||
|
||||
let
|
||||
# when upgrade znapzend, check versions of Perl libs here: https://github.com/oetiker/znapzend/blob/master/cpanfile
|
||||
# pinned versions are listed at https://github.com/oetiker/znapzend/blob/master/thirdparty/cpanfile-5.26.1.snapshot
|
||||
Mojolicious-8-35 = perlPackages.buildPerlPackage rec {
|
||||
# pinned versions are listed at https://github.com/oetiker/znapzend/blob/master/thirdparty/cpanfile-5.30.snapshot
|
||||
Mojolicious' = perlPackages.buildPerlPackage rec {
|
||||
pname = "Mojolicious";
|
||||
version = "8.35";
|
||||
version = "8.73";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/S/SR/SRI/${pname}-${version}.tar.gz";
|
||||
sha256 = "1bll0ahh5v1y3x0ql29klwsa68cj46wzqc385srsnn2m8kh2ak8h";
|
||||
sha256 = "118y2264f89bbp5ly2dh36xjq25jk85s2ssxa3y4gsgsk6sjzzk1";
|
||||
};
|
||||
};
|
||||
MojoIOLoopForkCall-0-20 = perlPackages.buildPerlModule rec {
|
||||
MojoIOLoopForkCall' = perlPackages.buildPerlModule rec {
|
||||
pname = "Mojo-IOLoop-ForkCall";
|
||||
version = "0.20";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/J/JB/JBERGER/${pname}-${version}.tar.gz";
|
||||
sha256 = "19pih5x0ayxs2m8j29qwdpi6ky3w4ghv6vrmax3ix9r59hj6569b";
|
||||
};
|
||||
propagatedBuildInputs = [ perlPackages.IOPipely Mojolicious-8-35 ];
|
||||
propagatedBuildInputs = [ perlPackages.IOPipely Mojolicious' ];
|
||||
};
|
||||
|
||||
perl' = perl.withPackages (p:
|
||||
[ MojoIOLoopForkCall-0-20
|
||||
[ MojoIOLoopForkCall'
|
||||
p.TAPParserSourceHandlerpgTAP
|
||||
]);
|
||||
|
||||
version = "0.20.0";
|
||||
checksum = "15lb5qwksa508m9bj6d3n4rrjpakfaas9qxspg408bcqfp7pqjw3";
|
||||
version = "0.21.0";
|
||||
sha256 = "1lg46rf2ahlclan29zx8ag5k4fjp28sc9l02z76f0pvdlj4qnihl";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "znapzend";
|
||||
@ -37,7 +37,7 @@ stdenv.mkDerivation {
|
||||
owner = "oetiker";
|
||||
repo = "znapzend";
|
||||
rev = "v${version}";
|
||||
sha256 = checksum;
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
buildInputs = [ wget perl' ];
|
||||
|
||||
@ -26,6 +26,13 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0cdv9g87c1y8zwhqkd9ba2zjw4slcvg7yzcqv43idvnwb5fl29n7";
|
||||
excludes = [ "doc/history.d" ];
|
||||
})
|
||||
|
||||
# Pull upstream fix for gcc-11:
|
||||
(fetchpatch {
|
||||
name = "gcc-11.patch";
|
||||
url = "https://github.com/amadvance/advancecomp/commit/7b08f7a2af3f66ab95437e4490499cebb20e5e41.patch";
|
||||
sha256 = "0gpppq6b760m1429g7d808ipdgb4lrqc1b6xk2457y66pbaiwc9s";
|
||||
})
|
||||
];
|
||||
|
||||
# autover.sh relies on 'git describe', which obviously doesn't work as we're not cloning
|
||||
|
||||
@ -21,5 +21,6 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with maintainers; [ lheckemann ma27 ];
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "wdisplays";
|
||||
};
|
||||
}
|
||||
|
||||
@ -4,40 +4,39 @@
|
||||
, extra-cmake-modules
|
||||
, pkg-config
|
||||
, SDL2
|
||||
, qtbase
|
||||
, qttools
|
||||
, qtx11extras
|
||||
, xorg
|
||||
, fetchFromGitHub
|
||||
, itstool
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "antimicroX";
|
||||
version = "3.0.1";
|
||||
pname = "antimicrox";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "juliagoda";
|
||||
repo = "antimicroX";
|
||||
owner = "AntiMicroX";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "05asxlkgb4cgvpcyksw1cx8cz8nzi8hmw8b91lw92892j7a2r7wj";
|
||||
sha256 = "sha256-brG3DTpWRYmDemTeteuuNbF0JoDAXdcFwO12JC6/0/Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules pkg-config itstool ];
|
||||
buildInputs = [
|
||||
SDL2
|
||||
qtbase
|
||||
qttools
|
||||
qtx11extras
|
||||
xorg.libX11
|
||||
xorg.libXtst
|
||||
xorg.libXi
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "/usr/lib/udev/rules.d/" "$out/lib/udev/rules.d/"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "GUI for mapping keyboard and mouse controls to a gamepad";
|
||||
inherit (src.meta) homepage;
|
||||
maintainers = with maintainers; [ jb55 ];
|
||||
maintainers = with maintainers; [ jb55 sbruder ];
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, ncurses, pkg-config }:
|
||||
{ lib, stdenv, fetchurl, fetchpatch, ncurses, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "6.5.0";
|
||||
@ -9,6 +9,16 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1vd9vdxyxsccl64ilx542ya5vlw2bpg6gnkq1x8cfqy6vxvmx7dj";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix pending upstream inclusion for ncurses-6.3:
|
||||
# https://github.com/halturin/multitail/pull/4
|
||||
(fetchpatch {
|
||||
name = "ncurses-6.3.patch";
|
||||
url = "https://github.com/halturin/multitail/commit/d7d10f3bce261074c116eba9f924b61f43777662.patch";
|
||||
sha256 = "0kyp9l6v92mz6d3h34j11gs5kh3sf2nv76mygqfxb800vd8r0cgg";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
@ -21,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.vanheusden.com/multitail/";
|
||||
homepage = "https://github.com/halturin/multitail";
|
||||
description = "tail on Steroids";
|
||||
maintainers = with lib.maintainers; [ matthiasbeyer ];
|
||||
platforms = lib.platforms.unix;
|
||||
|
||||
31
pkgs/tools/misc/stderred/default.nix
Normal file
31
pkgs/tools/misc/stderred/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, lib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "stderred";
|
||||
version = "unstable-2021-04-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sickill";
|
||||
repo = "stderred";
|
||||
rev = "b2238f7c72afb89ca9aaa2944d7f4db8141057ea";
|
||||
sha256 = "sha256-k/EA327AsRHgUYu7QqSF5yzOyO6h5XcE9Uv4l1VcIPI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
sourceRoot = "${src.name}/src";
|
||||
|
||||
meta = with lib; {
|
||||
description = "stderr in red";
|
||||
homepage = "https://github.com/sickill/stderred";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ vojta001 ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -18,6 +18,14 @@ stdenv.mkDerivation rec {
|
||||
url = "https://sources.debian.net/data/main/j/jnettop/0.13.0-1/debian/patches/0001-Use-64-bit-integers-for-byte-totals-support-bigger-u.patch";
|
||||
sha256 = "1b0alc12sj8pzcb66f8xslbqlbsvq28kz34v6jfhbb1q25hyr7jg";
|
||||
})
|
||||
|
||||
# Fix pending upstream inclusion for ncurses-6.3:
|
||||
# https://sourceforge.net/p/jnettop/patches/5/
|
||||
(fetchpatch {
|
||||
name = "ncurses-6.3.patch";
|
||||
url = "https://sourceforge.net/p/jnettop/patches/5/attachment/jnettop-0.13.0-ncurses-6.3.patch";
|
||||
sha256 = "1a0g3bal6f2fh1sq9q5kfwljrnskfvrhdzhjadcds34gzsr26v7x";
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = "autoconf ";
|
||||
@ -31,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||
by bandwidth they use.
|
||||
'';
|
||||
|
||||
homepage = "http://jnettop.kubs.info/";
|
||||
homepage = "https://sourceforge.net/projects/jnettop/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
|
||||
@ -37,8 +37,11 @@ stdenv.mkDerivation rec {
|
||||
substituteInPlace $out/lib/systemd/system/wg-quick@.service \
|
||||
--replace /usr/bin $out/bin
|
||||
'' + lib.optionalString stdenv.isLinux ''
|
||||
# we want to allow users to provide their own resolvconf implementation, i.e. the one provided by systemd-resolved
|
||||
for f in $out/bin/*; do
|
||||
wrapProgram $f --prefix PATH : ${lib.makeBinPath [ procps iproute2 iptables openresolv ]}
|
||||
wrapProgram $f \
|
||||
--prefix PATH : ${lib.makeBinPath [ procps iproute2 iptables ]} \
|
||||
--suffix PATH : ${lib.makeBinPath [ openresolv ]}
|
||||
done
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
for f in $out/bin/*; do
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zap";
|
||||
version = "2.10.0";
|
||||
version = "2.11.0";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/zaproxy/zaproxy/releases/download/v${version}/ZAP_${version}_Linux.tar.gz";
|
||||
sha256 = "1mz9s56pbs62g4pnd1ml8y6jpf9ilisdwwvjv5kn6yxrcdi2zzqh";
|
||||
sha256 = "sha256-wr64T3+ps5r2V72z4NDbqWQlJX6kjg6LIu7szY1VaB4=";
|
||||
};
|
||||
|
||||
buildInputs = [ jre ];
|
||||
|
||||
@ -54,7 +54,8 @@ mapAliases ({
|
||||
ammonite-repl = ammonite; # added 2017-05-02
|
||||
amsn = throw "amsn has been removed due to being unmaintained."; # added 2020-12-09
|
||||
angelfish = libsForQt5.plasmaMobileGear.angelfish; # added 2021-10-06
|
||||
antimicro = throw "antimicro has been removed as it was broken, see antimicroX instead."; # added 2020-08-06
|
||||
antimicro = throw "antimicro has been removed as it was broken, see antimicrox instead."; # added 2020-08-06
|
||||
antimicroX = antimicrox; # added 2021-10-31
|
||||
arduino_core = arduino-core; # added 2015-02-04
|
||||
ardour_5 = throw "ardour_5 has been removed. see https://github.com/NixOS/nixpkgs/issues/139549"; # added 2021-09-28
|
||||
arora = throw "arora has been removed."; # added 2020-09-09
|
||||
|
||||
@ -4640,6 +4640,8 @@ with pkgs;
|
||||
|
||||
driftnet = callPackage ../tools/networking/driftnet {};
|
||||
|
||||
driftctl = callPackage ../applications/networking/cluster/driftctl { };
|
||||
|
||||
drill = callPackage ../tools/networking/drill {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
@ -9610,6 +9612,8 @@ with pkgs;
|
||||
|
||||
stdman = callPackage ../data/documentation/stdman { };
|
||||
|
||||
stderred = callPackage ../tools/misc/stderred { };
|
||||
|
||||
steck = callPackage ../servers/pinnwand/steck.nix { };
|
||||
|
||||
stenc = callPackage ../tools/backup/stenc { };
|
||||
@ -9961,6 +9965,10 @@ with pkgs;
|
||||
|
||||
thc-ipv6 = callPackage ../tools/security/thc-ipv6 { };
|
||||
|
||||
thedesk = callPackage ../applications/misc/thedesk {
|
||||
electron = electron_12;
|
||||
};
|
||||
|
||||
theharvester = callPackage ../tools/security/theharvester { };
|
||||
|
||||
inherit (nodePackages) thelounge;
|
||||
@ -21543,6 +21551,8 @@ with pkgs;
|
||||
|
||||
squid = callPackage ../servers/squid { };
|
||||
|
||||
duckling-proxy = callPackage ../servers/duckling-proxy { };
|
||||
|
||||
sslh = callPackage ../servers/sslh { };
|
||||
|
||||
thttpd = callPackage ../servers/http/thttpd { };
|
||||
@ -23993,6 +24003,8 @@ with pkgs;
|
||||
|
||||
arion = callPackage ../applications/virtualization/arion { };
|
||||
|
||||
arkade = callPackage ../applications/networking/cluster/arkade { };
|
||||
|
||||
asuka = callPackage ../applications/networking/browsers/asuka {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
@ -25773,6 +25785,8 @@ with pkgs;
|
||||
|
||||
hyperledger-fabric = callPackage ../tools/misc/hyperledger-fabric { };
|
||||
|
||||
indigenous-desktop = callPackage ../applications/networking/feedreaders/indigenous-desktop { };
|
||||
|
||||
jackline = callPackage ../applications/networking/instant-messengers/jackline {
|
||||
ocamlPackages = ocaml-ng.ocamlPackages_4_08;
|
||||
};
|
||||
@ -25797,6 +25811,8 @@ with pkgs;
|
||||
|
||||
pixelnuke = callPackage ../applications/graphics/pixelnuke { };
|
||||
|
||||
pixeluvo = callPackage ../applications/graphics/pixeluvo { };
|
||||
|
||||
pmbootstrap = python3Packages.callPackage ../tools/misc/pmbootstrap { };
|
||||
|
||||
shepherd = nodePackages."@nerdwallet/shepherd";
|
||||
@ -32001,7 +32017,7 @@ with pkgs;
|
||||
|
||||
android-file-transfer = libsForQt5.callPackage ../tools/filesystems/android-file-transfer { };
|
||||
|
||||
antimicroX = libsForQt5.callPackage ../tools/misc/antimicroX { };
|
||||
antimicrox = libsForQt5.callPackage ../tools/misc/antimicrox { };
|
||||
|
||||
atari800 = callPackage ../misc/emulators/atari800 { };
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user