Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
842f26c1de
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocenaudio";
|
||||
version = "3.11.0";
|
||||
version = "3.11.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}";
|
||||
sha256 = "1yflpyl0d1mi0zxdyrlbg0px95s2c945ahy0agc8rha01ccf7jwy";
|
||||
sha256 = "sha256-m8sKu2QuEyCWQ975vDfLVWKgU7ydEp5/vRYRO3z1yio=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,33 +2,30 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clifm";
|
||||
version = "1.1";
|
||||
version = "1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "leo-arch";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0mf9lrq0l532vyf4ycsikrw8imn4gkavyn3cr42nhjsr1drygrp8";
|
||||
sha256 = "sha256-nYBGM3gUj1NGrxNLt0xpNl00cgS2Ecs3kYjZapiJT48=";
|
||||
};
|
||||
|
||||
buildInputs = [ libcap acl file readline ];
|
||||
|
||||
makeFlags = [
|
||||
"INSTALLPREFIX=${placeholder "out"}/bin"
|
||||
"DESKTOPPREFIX=${placeholder "out"}/share"
|
||||
"DESTDIR=${placeholder "out"}"
|
||||
"DATADIR=/share"
|
||||
"PREFIX=/"
|
||||
];
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p $out/bin $out/share
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/leo-arch/clifm";
|
||||
description = "CliFM is a CLI-based, shell-like, and non-curses terminal file manager written in C: simple, fast, extensible, and lightweight as hell";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ vonfry ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
23
pkgs/applications/networking/cluster/kubecolor/default.nix
Normal file
23
pkgs/applications/networking/cluster/kubecolor/default.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubecolor";
|
||||
version = "0.0.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hidetatz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-bKHEp9AxH1CcObhNzD3BkNOdyWZu7JrEdsXpo49wEcI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-C1K7iEugA4HBLthcOI7EZ6H4YHW6el8X6FjVN1BeJR0=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Colorizes kubectl output";
|
||||
homepage = "https://github.com/hidetatz/kubecolor";
|
||||
changelog = "https://github.com/hidetatz/kubecolor/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.ivankovnatsky ];
|
||||
};
|
||||
}
|
||||
|
|
@ -5,13 +5,13 @@ buildGoModule rec {
|
|||
/* Do not use "dev" as a version. If you do, Tilt will consider itself
|
||||
running in development environment and try to serve assets from the
|
||||
source tree, which is not there once build completes. */
|
||||
version = "0.23.2";
|
||||
version = "0.23.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tilt-dev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-lCo+sTkbqpbCI9aCh/QqlDw7jzYzKt3Gf67shvBIc7k=";
|
||||
sha256 = "sha256:1612yrlsajl1j95zh057k82nzz492a9p1cgamph4m84zpm0v67jc";
|
||||
};
|
||||
vendorSha256 = null;
|
||||
|
||||
|
|
|
|||
|
|
@ -3,14 +3,12 @@
|
|||
, appimageTools
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.7.4";
|
||||
in
|
||||
appimageTools.wrapType2 {
|
||||
name = "session-desktop-appimage-${version}";
|
||||
appimageTools.wrapType2 rec {
|
||||
pname = "session-desktop-appimage";
|
||||
version = "1.7.6";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage";
|
||||
sha256 = "1yjah9ip3r2irvv2g9j0ql55nkmpwml7lngmq954xrkq9smrdrm5";
|
||||
sha256 = "PNjUslqLcSxkRSXFpesBr2sfre4wetZWfUQTjywdClU=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -21,13 +21,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "nextcloud-client";
|
||||
version = "3.4.0";
|
||||
version = "3.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nextcloud";
|
||||
repo = "desktop";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+b+DJwbYegbeoQmcdBg5Y7rJmKwPjz2XRUroP55ZO+g=";
|
||||
sha256 = "sha256-1fUk4PUFkWcLOvrYvM+K+ZarUSeq/JtDU2bHHPoAoC8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "zk";
|
||||
version = "0.8.0";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mickael-menu";
|
||||
repo = "zk";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-lTg5jB3krZWmCn3wWoAwzqBji1AyTTTVf/BphC7Mr5s=";
|
||||
sha256 = "sha256-AXKIi70evf581lMwfbfxm8hFCzsnhKRQgnIEZQFS75A=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-m7QGv8Vx776TsN7QHXtO+yl3U1D573UMZVyg1B4UeIk=";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,23 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "git-credential-1password";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "develerik";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WMEUa0mSxmeFXQBejwxtlhWuuLKguugavRaBUVpYA3g=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-eUjaSpmQpSOvSBW+7ajXiEDepkyvHsIiEY0RGpfnao0=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A git credential helper for 1Password";
|
||||
homepage = "https://github.com/develerik/git-credential-1password";
|
||||
changelog = "https://github.com/develerik/git-credential-1password/releases/tag/v${version}";
|
||||
license = licenses.isc;
|
||||
maintainers = [ maintainers.ivankovnatsky ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,17 +2,17 @@
|
|||
|
||||
let
|
||||
pname = "radicle-upstream";
|
||||
version = "0.2.10";
|
||||
version = "0.2.12";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
srcs = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://releases.radicle.xyz/radicle-upstream-${version}.AppImage";
|
||||
sha256 = "sha256-iZC7FzYaQsCoAq/soi5g2oo/Xd2PtZgO/wR8zDgN4Fk=";
|
||||
sha256 = "7520c7feb94234df6f8523689d098e0d19510e2ac0122e482d1e01086c9b02fe";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://releases.radicle.xyz/radicle-upstream-${version}.dmg";
|
||||
sha256 = "sha256-gc5OrNu7t0VJrjLQO7+7TWvEj7D51WmMJfL/KQDMgvA=";
|
||||
sha256 = "8bbff051f169f029044e4c4965cad88f48e939b945fd5c253f0c39665a19ce44";
|
||||
};
|
||||
};
|
||||
src = srcs.${stdenv.hostPlatform.system};
|
||||
|
|
|
|||
|
|
@ -31,11 +31,9 @@ stdenv.mkDerivation rec {
|
|||
pname = "elementary-code";
|
||||
version = "6.1.0";
|
||||
|
||||
repoName = "code";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = repoName;
|
||||
repo = "code";
|
||||
rev = version;
|
||||
sha256 = "sha256-AXmMcPj2hf33G5v3TUg+eZwaKOdVlRvoVXglMJFHRjw=";
|
||||
};
|
||||
|
|
@ -75,9 +73,6 @@ stdenv.mkDerivation rec {
|
|||
webkitgtk
|
||||
];
|
||||
|
||||
# install script fails with UnicodeDecodeError because of printing a fancy elipsis character
|
||||
LC_ALL = "C.UTF-8";
|
||||
|
||||
# ctags needed in path by outline plugin
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
, gtk3
|
||||
, bluez
|
||||
, switchboard
|
||||
, wingpanel-indicator-bluetooth
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -53,6 +54,7 @@ stdenv.mkDerivation rec {
|
|||
gtk3
|
||||
libgee
|
||||
switchboard
|
||||
wingpanel-indicator-bluetooth # settings schema
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
, pkg-config
|
||||
, vala
|
||||
, libgee
|
||||
, elementary-settings-daemon
|
||||
, gnome-settings-daemon
|
||||
, granite
|
||||
, gtk3
|
||||
|
|
@ -44,7 +43,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
dbus
|
||||
elementary-settings-daemon
|
||||
gnome-settings-daemon
|
||||
glib
|
||||
granite
|
||||
|
|
|
|||
|
|
@ -1,29 +1,36 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-redacted-script";
|
||||
version = "unstable-2016-06-03";
|
||||
version = "5.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "png2378";
|
||||
repo = "redacted-elementary";
|
||||
rev = "346440ff9ce19465e6d5c3d6d67a8573f992c746";
|
||||
sha256 = "1jpd13sxkarclr0mlm66wzgpjh52ghzjzn4mywhyshyyskwn7jg1";
|
||||
owner = "elementary";
|
||||
repo = "fonts";
|
||||
rev = version;
|
||||
sha256 = "sha256-YiE7yaH0ZrF1/Cp+3bcJYm2cExQjFcat6JLMJPjhops=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/fonts/truetype/redacted-elementary
|
||||
cp -a truetype/*.ttf $out/share/fonts/truetype/redacted-elementary
|
||||
cp -a redacted/*.ttf $out/share/fonts/truetype/redacted-elementary
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Font for concealing text";
|
||||
homepage = "https://github.com/png2378/redacted-elementary";
|
||||
homepage = "https://github.com/elementary/fonts";
|
||||
license = licenses.ofl;
|
||||
maintainers = teams.pantheon.members;
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@
|
|||
, elementary-icon-theme
|
||||
, wingpanel-with-indicators
|
||||
, elementary-gtk-theme
|
||||
, elementary-settings-daemon
|
||||
, nixos-artwork
|
||||
, lightdm
|
||||
, gdk-pixbuf
|
||||
|
|
@ -33,11 +32,9 @@ stdenv.mkDerivation rec {
|
|||
pname = "elementary-greeter";
|
||||
version = "6.0.1";
|
||||
|
||||
repoName = "greeter";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = repoName;
|
||||
repo = "greeter";
|
||||
rev = version;
|
||||
sha256 = "1f606ds56sp1c58q8dblfpaq9pwwkqw9i4gkwksw45m2xkwlbflq";
|
||||
};
|
||||
|
|
@ -67,7 +64,6 @@ stdenv.mkDerivation rec {
|
|||
clutter-gtk # else we get could not generate cargs for mutter-clutter-2
|
||||
elementary-gtk-theme
|
||||
elementary-icon-theme
|
||||
elementary-settings-daemon
|
||||
gnome-settings-daemon
|
||||
gdk-pixbuf
|
||||
granite
|
||||
|
|
@ -101,7 +97,7 @@ stdenv.mkDerivation rec {
|
|||
# dbus-launch needed in path
|
||||
--prefix PATH : "${dbus}/bin"
|
||||
|
||||
# for `wingpanel -g`
|
||||
# for `io.elementary.wingpanel -g`
|
||||
--prefix PATH : "${wingpanel-with-indicators}/bin"
|
||||
|
||||
# for the compositor
|
||||
|
|
|
|||
|
|
@ -14,19 +14,16 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wingpanel-indicator-ayatana";
|
||||
version = "unstable-2021-12-01";
|
||||
version = "unstable-2021-12-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Lafydev";
|
||||
repo = pname;
|
||||
rev = "53dc05919cdba772c787620a4bee5821e38c53cd";
|
||||
sha256 = "sha256-T0OHzqENyeAr0pvXUaRMwF1RpwKVyDAF5P5G9S28COU=";
|
||||
rev = "5749f753ca64ce58232a46b9045949b3f8219827";
|
||||
sha256 = "sha256-kuEVw62IDTyC3hRRcWv2RihPOohGqEt8YLr44SurwPM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fixes install path for wingpanel indicator
|
||||
# https://github.com/Lafydev/wingpanel-indicator-ayatana/pull/30
|
||||
./fix-indicator-dir.patch
|
||||
# Tells the indicator the path for libapplication.so
|
||||
(substituteAll {
|
||||
src = ./fix-libapplication-dir.patch;
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
diff --git a/meson.build b/meson.build
|
||||
index 4aeab2b..dc44e6c 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -25,8 +25,10 @@ dependencies = {
|
||||
'wingpanel': wingpanel
|
||||
}
|
||||
|
||||
+libdir = join_paths(get_option('prefix'), get_option('libdir'))
|
||||
+
|
||||
indicator_name = 'ayatana'
|
||||
-indicator_dir = dependencies['wingpanel'].get_pkgconfig_variable('indicatorsdir')
|
||||
+indicator_dir = dependencies['wingpanel'].get_pkgconfig_variable('indicatorsdir', define_variable: ['libdir', libdir])
|
||||
|
||||
# ----------------------------------------------------------------------------------------------------------------------
|
||||
# Bindings:
|
||||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "monkeyhex";
|
||||
version = "1.7.3";
|
||||
version = "1.7.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c121e734ccae8f1be6f1ecaf9100f3f8bde0a2dd03979b8ba42c474b1978806e";
|
||||
sha256 = "a646096dd3114ee8a7c6f30363f38c288ec56c4e032c8fc7e681792b604dd122";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ future ];
|
||||
|
|
|
|||
|
|
@ -27,12 +27,12 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "4.2.1";
|
||||
version = "4.2.2";
|
||||
sourceRoot = ".";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
|
||||
sha256 = "Eup6oR4r2xLeHc65k5oi6W9aSAQ3yxfBIzedjg/fXoI=";
|
||||
sha256 = "mYHQ1To1bE6HlihHdQqXyegFTkYIVHSABsgPDX4rLTM=";
|
||||
};
|
||||
|
||||
# Update with `eval $(nix-build -A bazel.updater)`,
|
||||
|
|
@ -239,14 +239,6 @@ stdenv.mkDerivation rec {
|
|||
src = ../bazel_rc.patch;
|
||||
bazelSystemBazelRCPath = bazelRC;
|
||||
})
|
||||
|
||||
# On macOS Monterey, protoc segfaults.
|
||||
# Issue: https://github.com/bazelbuild/bazel/issues/14216
|
||||
# Fix: https://github.com/bazelbuild/bazel/pull/14275
|
||||
(fetchpatch {
|
||||
url = "https://github.com/bazelbuild/bazel/commit/ae0a6c98d4f94abedbedb2d51c27de5febd7df67.patch";
|
||||
sha256 = "sha256-YcdxqjTMGI86k1wgFqxJqghv0kknAjlFQFpt4VccCTE=";
|
||||
})
|
||||
] ++ lib.optional enableNixHacks ../nix-hacks.patch;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -48,5 +48,6 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ nixinator ];
|
||||
platforms = platforms.unix;
|
||||
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/cdogs-sdl.x86_64-darwin
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,19 +2,19 @@
|
|||
|
||||
let
|
||||
pname = "miniflux";
|
||||
version = "2.0.33";
|
||||
version = "2.0.34";
|
||||
|
||||
in buildGoModule {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
repo = "v2";
|
||||
rev = version;
|
||||
sha256 = "0vcfpy71gdvd0z20v6d36l3yvmnm4nmfplivw9yjzv8kbnf9mabc";
|
||||
sha256 = "sha256-6fXmi0q6J1XyxEtOuKO8efkwLrfkMiqeKTHZPuoKYAs=";
|
||||
};
|
||||
|
||||
vendorSha256 = "1j4jskcply9mxz9bggw1c6368k22rga6f3f6mgs1pklz5v7r7n2j";
|
||||
vendorSha256 = "sha256-P8ukjBrkPZ0n8HtfyEf2pG3DAXl7D10Ib+dmtwI4KqI=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGo117Module rec {
|
||||
pname = "grafana";
|
||||
version = "8.3.2";
|
||||
version = "8.3.3";
|
||||
|
||||
excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)";
|
||||
|
||||
|
|
@ -10,15 +10,15 @@ buildGo117Module rec {
|
|||
rev = "v${version}";
|
||||
owner = "grafana";
|
||||
repo = "grafana";
|
||||
sha256 = "sha256-oPCeK9SHRpShAjLK3l8yMIwcrGvoUNjaeNNWZBjCIas=";
|
||||
sha256 = "sha256-kfeYAEwHal5bfCmNe2l5iBLM4D3eYFaVtVhXdN90o+I=";
|
||||
};
|
||||
|
||||
srcStatic = fetchurl {
|
||||
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
|
||||
sha256 = "sha256-EA+SxQqmEvITBSxVWU5Ytot9pkG3UcXxRAA9cEcw0Yk=";
|
||||
sha256 = "sha256-iUKMUg4AS8ufr3YY3UyB/2JJYGTL8urT4bnbz0dsbxg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-aS9yz0JODZtichaIkiBJLiMjbjGY93eSYwuactbRqOY=";
|
||||
vendorSha256 = "sha256-FHVlCL4ZyHO7Ebi31K1wXcMiN6hiQjVz+5jkJx8R7jc=";
|
||||
|
||||
nativeBuildInputs = [ wire ];
|
||||
|
||||
|
|
@ -62,6 +62,8 @@ buildGo117Module rec {
|
|||
tar -xvf $srcStatic
|
||||
mkdir -p $out/share/grafana
|
||||
mv grafana-*/{public,conf,tools} $out/share/grafana/
|
||||
|
||||
cp ./conf/defaults.ini $out/share/grafana/conf/
|
||||
'';
|
||||
|
||||
passthru.tests = { inherit (nixosTests) grafana; };
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "HedgeDoc",
|
||||
"version": "1.9.0",
|
||||
"version": "1.9.2",
|
||||
"description": "The best platform to write and share markdown.",
|
||||
"main": "app.js",
|
||||
"license": "AGPL-3.0",
|
||||
|
|
@ -37,8 +37,8 @@
|
|||
"ejs": "^3.0.0",
|
||||
"express": ">=4.14",
|
||||
"express-session": "^1.14.2",
|
||||
"file-type": "^16.1.0",
|
||||
"formidable": "^1.0.17",
|
||||
"formidable": "^2.0.0",
|
||||
"file-type": "^17.0.0",
|
||||
"graceful-fs": "^4.1.11",
|
||||
"helmet": "^4.5.0",
|
||||
"i18n": "^0.13.0",
|
||||
|
|
@ -70,7 +70,7 @@
|
|||
"morgan": "^1.7.0",
|
||||
"mysql2": "^2.0.0",
|
||||
"node-fetch": "^2.6.1",
|
||||
"passport": "^0.4.0",
|
||||
"passport": "^0.5.0",
|
||||
"passport-dropbox-oauth2": "^1.1.0",
|
||||
"passport-facebook": "^3.0.0",
|
||||
"passport-github": "^1.1.0",
|
||||
|
|
@ -85,7 +85,7 @@
|
|||
"pdfobject": "^2.0.201604172",
|
||||
"pg": "^8.2.1",
|
||||
"pg-hstore": "^2.3.3",
|
||||
"prom-client": "^13.1.0",
|
||||
"prom-client": "^14.0.0",
|
||||
"prometheus-api-metrics": "^3.2.0",
|
||||
"randomcolor": "^0.6.0",
|
||||
"readline-sync": "^1.4.7",
|
||||
|
|
@ -110,7 +110,7 @@
|
|||
"**/request": "^2.88.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=12"
|
||||
"node": "^12.20.0 || ^14.13.1 || 16.x"
|
||||
},
|
||||
"bugs": "https://github.com/hedgedoc/hedgedoc/issues",
|
||||
"keywords": [
|
||||
|
|
@ -153,19 +153,19 @@
|
|||
"copy-webpack-plugin": "6.4.1",
|
||||
"css-loader": "5.2.7",
|
||||
"emojify.js": "1.1.0",
|
||||
"esbuild-loader": "2.15.1",
|
||||
"esbuild-loader": "2.16.0",
|
||||
"escape-html": "1.0.3",
|
||||
"eslint": "7.32.0",
|
||||
"eslint": "8.3.0",
|
||||
"eslint-config-standard": "16.0.3",
|
||||
"eslint-plugin-import": "2.24.2",
|
||||
"eslint-plugin-import": "2.25.3",
|
||||
"eslint-plugin-node": "11.1.0",
|
||||
"eslint-plugin-promise": "5.1.0",
|
||||
"eslint-plugin-promise": "5.1.1",
|
||||
"eslint-plugin-standard": "4.1.0",
|
||||
"exports-loader": "1.1.1",
|
||||
"expose-loader": "1.0.3",
|
||||
"file-loader": "6.2.0",
|
||||
"file-saver": "2.0.5",
|
||||
"flowchart.js": "1.15.0",
|
||||
"flowchart.js": "1.17.0",
|
||||
"fork-awesome": "1.2.0",
|
||||
"gist-embed": "2.6.0",
|
||||
"highlight.js": "10.7.3",
|
||||
|
|
@ -174,25 +174,25 @@
|
|||
"ionicons": "2.0.1",
|
||||
"jquery": "3.6.0",
|
||||
"jquery-mousewheel": "3.1.13",
|
||||
"jquery-ui": "1.12.1",
|
||||
"jquery-ui": "1.13.0",
|
||||
"js-cookie": "3.0.1",
|
||||
"js-sequence-diagrams": "git+https://github.com/hedgedoc/js-sequence-diagrams.git",
|
||||
"js-yaml": "3.14.1",
|
||||
"jsonlint": "1.6.3",
|
||||
"keymaster": "1.6.2",
|
||||
"less": "4.1.1",
|
||||
"less": "4.1.2",
|
||||
"less-loader": "7.3.0",
|
||||
"list.js": "2.3.1",
|
||||
"mathjax": "2.7.9",
|
||||
"mermaid": "8.12.1",
|
||||
"mermaid": "8.13.4",
|
||||
"mini-css-extract-plugin": "1.6.2",
|
||||
"mocha": "9.1.1",
|
||||
"mocha": "9.1.3",
|
||||
"mock-require": "3.0.3",
|
||||
"optimize-css-assets-webpack-plugin": "6.0.1",
|
||||
"prismjs": "1.24.1",
|
||||
"prismjs": "1.25.0",
|
||||
"raphael": "2.3.0",
|
||||
"remark-cli": "10.0.0",
|
||||
"remark-preset-lint-markdown-style-guide": "5.0.1",
|
||||
"remark-cli": "10.0.1",
|
||||
"remark-preset-lint-markdown-style-guide": "5.1.1",
|
||||
"reveal.js": "3.9.2",
|
||||
"select2": "3.5.2-browserify",
|
||||
"socket.io-client": "2.4.0",
|
||||
|
|
@ -204,7 +204,7 @@
|
|||
"visibilityjs": "2.0.2",
|
||||
"viz.js": "1.8.2",
|
||||
"webpack": "4.46.0",
|
||||
"webpack-cli": "4.8.0",
|
||||
"webpack-cli": "4.9.1",
|
||||
"webpack-merge": "5.8.0",
|
||||
"wurl": "2.5.4"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"version": "1.9.0",
|
||||
"srcHash": "hSKQGkI1+68Zf05RhgRKZo47buyobzjhURSZ30/h0PA=",
|
||||
"yarnHash": "0v51jmmbg8fx66ay2glby0gxw07in95igz325p42g5hjd5kankf6"
|
||||
"version": "1.9.2",
|
||||
"srcHash": "e0oPib+JutFBCuCSuokqLL94isI4SfGIT5aLnTjpulM=",
|
||||
"yarnHash": "0kb91c2jppwp9vg70c5jhy5lhf09p35blci8cvpj69y5sk80q0zc"
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wiki-js";
|
||||
version = "2.5.219";
|
||||
version = "2.5.260";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Requarks/wiki/releases/download/${version}/${pname}.tar.gz";
|
||||
sha256 = "sha256-xzxOv17B+9wegtNXGr9SD4KUWlMbrvPtZhvfmoZhBNc=";
|
||||
sha256 = "sha256-X9GmW2m94e7ft+ujJeR3ig5d8rsbEYzmlG52YJt2294=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "diffoscope";
|
||||
version = "194";
|
||||
version = "197";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
|
||||
sha256 = "sha256-9JU8srcn7UMdMPAdQlpDzr/Ife5joGJTTqJIN1IJGLk=";
|
||||
sha256 = "sha256-EKTknFa6gGqd1kpy/k1Vh1Zya+XvBMlU5G6Rg2p66es=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
|
|
|||
|
|
@ -2,18 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gotify-cli";
|
||||
version = "2.2.0";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gotify";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "0hgh1i8rdmf12qmk66cgksv8hz5qzkfbfb6cfmrkhbq765xkm4ir";
|
||||
sha256 = "sha256-X41m7bCilDgnTMJy3ISz8g7dAtaz/lphwaCPZDGMDXk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "1l47s0h0v4cgqcsm5008cknvfa4vnv6f7n43d8ga0xq5ikqqzmja";
|
||||
|
||||
doCheck = false;
|
||||
vendorSha256 = "sha256-EKscJM8r1dbKRQPSZFwFqJYACkQynIS347460PuxQiU=";
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/cli $out/bin/gotify
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, fetchurl, jre, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.0.29";
|
||||
version = "3.0.30";
|
||||
pname = "swagger-codegen";
|
||||
|
||||
jarfilename = "${pname}-cli-${version}.jar";
|
||||
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://maven/io/swagger/codegen/v3/${pname}-cli/${version}/${jarfilename}";
|
||||
sha256 = "sha256-sEwqUmtWaoBV0QmdP8ibm3neqWHk7+tWLAuO2FaCUtQ=";
|
||||
sha256 = "sha256-ldjs0zEctHOmMf6eJWtjMOxjONWebsy2xlKOi8eFFdE=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -5693,6 +5693,8 @@ with pkgs;
|
|||
|
||||
git-cola = callPackage ../applications/version-management/git-and-tools/git-cola { };
|
||||
|
||||
git-credential-1password = callPackage ../applications/version-management/git-and-tools/git-credential-1password { };
|
||||
|
||||
git-crecord = callPackage ../applications/version-management/git-crecord { };
|
||||
|
||||
git-crypt = callPackage ../applications/version-management/git-and-tools/git-crypt { };
|
||||
|
|
@ -26560,6 +26562,8 @@ with pkgs;
|
|||
|
||||
kubeconform = callPackage ../applications/networking/cluster/kubeconform { };
|
||||
|
||||
kubecolor = callPackage ../applications/networking/cluster/kubecolor { };
|
||||
|
||||
kubectl = callPackage ../applications/networking/cluster/kubectl { };
|
||||
|
||||
kubebuilder = callPackage ../applications/networking/cluster/kubebuilder { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue