Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
6af0c1b318
|
|
@ -952,6 +952,12 @@
|
|||
githubId = 59696216;
|
||||
name = "Arnold Farkas";
|
||||
};
|
||||
arnoutkroeze = {
|
||||
email = "nixpkgs@arnoutkroeze.nl";
|
||||
github = "arnoutkroeze";
|
||||
githubId = 37151054;
|
||||
name = "Arnout Kroeze";
|
||||
};
|
||||
arobyn = {
|
||||
email = "shados@shados.net";
|
||||
github = "shados";
|
||||
|
|
@ -3320,12 +3326,6 @@
|
|||
github = "edlimerkaj";
|
||||
githubId = 71988351;
|
||||
};
|
||||
edibopp = {
|
||||
email = "eduard.bopp@aepsil0n.de";
|
||||
github = "edibopp";
|
||||
githubId = 3098430;
|
||||
name = "Eduard Bopp";
|
||||
};
|
||||
emantor = {
|
||||
email = "rouven+nixos@czerwinskis.de";
|
||||
github = "emantor";
|
||||
|
|
@ -7821,6 +7821,12 @@
|
|||
githubId = 38543128;
|
||||
name = "Miles Breslin";
|
||||
};
|
||||
milibopp = {
|
||||
email = "contact@ebopp.de";
|
||||
github = "milibopp";
|
||||
githubId = 3098430;
|
||||
name = "Emilia Bopp";
|
||||
};
|
||||
millerjason = {
|
||||
email = "mailings-github@millerjason.com";
|
||||
github = "millerjason";
|
||||
|
|
|
|||
|
|
@ -12,16 +12,16 @@ let
|
|||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "electrs";
|
||||
version = "0.9.3";
|
||||
version = "0.9.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "romanz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sTQ/dX1uXJkEmrNZ47qjBlrexO50y0NGNhw71rHc9bw=";
|
||||
hash = "sha256-37KTcLFVzuXlLpz9INXbasUdzuY+T34ef8EtfczQ+D8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-1ZQt8LaqgxNxFfgCVCK0GVwbcVfX3v9iz7tHvzgyI0g=";
|
||||
cargoHash = "sha256-aOSCpvejMUfSZCDwShqMPEc3vXw9ri2QvTaCuHODTwA=";
|
||||
|
||||
# needed for librocksdb-sys
|
||||
nativeBuildInputs = [ llvmPackages.clang ];
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "helix";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "helix-editor";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-NoVg/8oJIgMQtxlCSjrLnYCG8shigYqZzWAQwmiqxgA=";
|
||||
sha256 = "sha256-d/USOtcPLjdgzN7TBCouBRmoSDH5LZD4R5Qq7lUrWZw=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-kqPI8WpGpr0VL7CbBTSsjKl3xqJrv/6Qjr6UFnIgaVo=";
|
||||
cargoSha256 = "sha256-/EATU7HsGNB35YOBp8sofbPd1nl4d3Ggj1ay3QuHkCI=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,91 +1,86 @@
|
|||
{ lib
|
||||
, buildDotnetModule
|
||||
, dotnetCorePackages
|
||||
, fetchFromGitHub
|
||||
, buildDotnetPackage
|
||||
, dotnetPackages
|
||||
, gtksharp
|
||||
, gettext
|
||||
, gtk3
|
||||
, installShellFiles
|
||||
, librsvg
|
||||
, makeDesktopItem
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
let
|
||||
mono-addins = dotnetPackages.MonoAddins;
|
||||
in
|
||||
buildDotnetPackage rec {
|
||||
buildDotnetModule rec {
|
||||
pname = "Pinta";
|
||||
version = "1.7.1";
|
||||
version = "2.0";
|
||||
|
||||
outputFiles = [ "bin/*" ];
|
||||
buildInputs = [ gtksharp mono-addins gettext ];
|
||||
xBuildFiles = [ "Pinta.sln" ];
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
runtimeDeps = [ gtk3 ];
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_6_0;
|
||||
dotnet-runtime = dotnetCorePackages.runtime_6_0;
|
||||
|
||||
# How-to update deps:
|
||||
# $ nix-build -A pinta.fetch-deps
|
||||
# $ ./result
|
||||
# $ cp /tmp/Pinta-deps.nix ./pkgs/applications/graphics/pinta/default.nix
|
||||
# TODO: create update script
|
||||
nugetDeps = ./deps.nix;
|
||||
|
||||
projectFile = "Pinta";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PintaProject";
|
||||
repo = "Pinta";
|
||||
rev = version;
|
||||
sha256 = "sha256-yRp/dpJ9T4DieqHTj3vhyuASPGe4vjHw0rSXFrTNZVc=";
|
||||
sha256 = "sha256-wqqNPyy5h/hTDm2u5MDZx1ds5qWAxy1/BY/fX4PeA88=";
|
||||
};
|
||||
|
||||
# Remove version information from nodes <Reference Include="... Version=... ">
|
||||
postPatch = with lib; let
|
||||
csprojFiles = [
|
||||
"Pinta/Pinta.csproj"
|
||||
"Pinta.Core/Pinta.Core.csproj"
|
||||
"Pinta.Effects/Pinta.Effects.csproj"
|
||||
"Pinta.Gui.Widgets/Pinta.Gui.Widgets.csproj"
|
||||
"Pinta.Resources/Pinta.Resources.csproj"
|
||||
"Pinta.Tools/Pinta.Tools.csproj"
|
||||
];
|
||||
versionedNames = [
|
||||
"Mono\\.Addins"
|
||||
"Mono\\.Posix"
|
||||
"Mono\\.Addins\\.Gui"
|
||||
"Mono\\.Addins\\.Setup"
|
||||
];
|
||||
|
||||
stripVersion = name: file:
|
||||
let
|
||||
match = ''<Reference Include="${name}([ ,][^"]*)?"'';
|
||||
replace = ''<Reference Include="${name}"'';
|
||||
in
|
||||
"sed -i -re 's/${match}/${replace}/g' ${file}\n";
|
||||
|
||||
# Map all possible pairs of two lists
|
||||
map2 = f: listA: listB: concatMap (a: map (f a) listB) listA;
|
||||
concatMap2Strings = f: listA: listB: concatStrings (map2 f listA listB);
|
||||
in
|
||||
concatMap2Strings stripVersion versionedNames csprojFiles
|
||||
+ ''
|
||||
# For some reason there is no Microsoft.Common.tasks file
|
||||
# in ''${mono}/lib/mono/3.5 .
|
||||
substituteInPlace Pinta.Install.proj \
|
||||
--replace 'ToolsVersion="3.5"' 'ToolsVersion="4.0"' \
|
||||
--replace "/usr/local" "$out"
|
||||
# FIXME: this should be propagated by wrapGAppsHook already, however for some
|
||||
# reason it is not working. Maybe a bug in buildDotnetModule?
|
||||
preInstall = ''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}"
|
||||
--set GDK_PIXBUF_MODULE_FILE ${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
|
||||
)
|
||||
'';
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--prefix MONO_GAC_PREFIX : ${gtksharp}"
|
||||
"--prefix LD_LIBRARY_PATH : ${gtksharp}/lib"
|
||||
"--prefix LD_LIBRARY_PATH : ${gtksharp.gtk.out}/lib"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
# Do automake's job manually
|
||||
substitute xdg/pinta.desktop.in xdg/pinta.desktop \
|
||||
# Rename the binary
|
||||
mv $out/bin/Pinta $out/bin/pinta
|
||||
|
||||
# Copy desktop icons
|
||||
for size in 16x16 22x22 24x24 32x32 96x96 scalable; do
|
||||
mkdir -p $out/share/icons/hicolor/$size/apps
|
||||
cp xdg/$size/* $out/share/icons/hicolor/$size/apps/
|
||||
done
|
||||
|
||||
# Copy runtime icons
|
||||
cp -r Pinta.Resources/icons/hicolor/16x16/* $out/share/icons/hicolor/16x16/
|
||||
|
||||
# Install manpage
|
||||
installManPage xdg/pinta.1
|
||||
|
||||
# Fix and copy desktop file
|
||||
# TODO: fix this propely by using the autoreconf+pkg-config build system
|
||||
# from upstream
|
||||
mkdir -p $out/share/applications
|
||||
substitute xdg/pinta.desktop.in $out/share/applications/Pinta.desktop \
|
||||
--replace _Name Name \
|
||||
--replace _Comment Comment \
|
||||
--replace _GenericName GenericName \
|
||||
--replace _X-GNOME-FullName X-GNOME-FullName
|
||||
substitute xdg/pinta.appdata.xml.in xdg/pinta.appdata.xml \
|
||||
--replace _p p
|
||||
|
||||
xbuild /target:CompileTranslations Pinta.Install.proj
|
||||
xbuild /target:Install Pinta.Install.proj
|
||||
--replace _X-GNOME-FullName X-GNOME-FullName \
|
||||
--replace _Keywords Keywords
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.pinta-project.com/";
|
||||
description = "Drawing/editing program modeled after Paint.NET";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
maintainers = with lib.maintainers; [ thiagokokada ];
|
||||
platforms = with lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
12
pkgs/applications/graphics/pinta/deps.nix
generated
Normal file
12
pkgs/applications/graphics/pinta/deps.nix
generated
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
{ fetchNuGet }: [
|
||||
(fetchNuGet { pname = "AtkSharp"; version = "3.24.24.34"; sha256 = "1jn1vgi9xm0jp7769k6sbdi8d273kigjrsh93i6s4c03hqxv7cqs"; })
|
||||
(fetchNuGet { pname = "CairoSharp"; version = "3.24.24.34"; sha256 = "0pydn1k0cam1gclg9sc1sbnmbyzh28qlc5qanyxcylwghink3kgz"; })
|
||||
(fetchNuGet { pname = "GdkSharp"; version = "3.24.24.34"; sha256 = "0r0x0yib7chwsyrbpvicrfwldwqx5lyqq4p86zaxpmzd6zdaj0x5"; })
|
||||
(fetchNuGet { pname = "GioSharp"; version = "3.24.24.34"; sha256 = "02hxvgjd4w9jpzbkk7qf9q9bkvyp5hfzwxfqp10vg5lpl9yl3xpx"; })
|
||||
(fetchNuGet { pname = "GLibSharp"; version = "3.24.24.34"; sha256 = "0kvp033fgdwc8p2abfp5z9pzq66cvwbnjfvr4v4bkpy5s5h181kq"; })
|
||||
(fetchNuGet { pname = "GtkSharp"; version = "3.24.24.34"; sha256 = "0028hzmmqyfx87qqmaf9cgb5psn7gkbmqvixcid67x1d6mzxjicb"; })
|
||||
(fetchNuGet { pname = "NGettext"; version = "0.6.7"; sha256 = "1lnq1lgd80xqn80qwq5ipfjnd7nl1ghinjc3krnd546r0c7hwqky"; })
|
||||
(fetchNuGet { pname = "PangoSharp"; version = "3.24.24.34"; sha256 = "1r0h14cklglfpv1lhv93cxmzi2w7d5s03gzpq3j5dmrz43flg9zw"; })
|
||||
(fetchNuGet { pname = "ParagonClipper"; version = "6.4.2"; sha256 = "0pam44f7iayqjz8nh1x29gxdd4dj00i7m5883cpa64i192pgl94c"; })
|
||||
(fetchNuGet { pname = "SharpZipLib"; version = "1.3.3"; sha256 = "1gij11wfj1mqm10631cjpnhzw882bnzx699jzwhdqakxm1610q8x"; })
|
||||
]
|
||||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mdzk";
|
||||
version = "0.4.3";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mdzk-rs";
|
||||
repo = "mdzk";
|
||||
rev = version;
|
||||
sha256 = "sha256-VUvV1XA9Bd3ugYHcKOcAQLUt0etxS/Cw2EgnFGxX0z0=";
|
||||
sha256 = "sha256-NkoKQKcww5ktEbxbOY6WP8OemCB+rvXbuN9oSPjLE3Y=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-lZ4fc/94ESlhpfa5ylg45oZNeaF1mZPxQUSLZrl2V3o=";
|
||||
cargoSha256 = "sha256-uJ00tGiKtcYghFUh0fcYg4nZc/o8yhvlVs+6/aRNY5s=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
{ lib, stdenv
|
||||
, fetchurl
|
||||
, unzip
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "smos";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/NorfairKing/smos/releases/download/v${version}/smos-release.zip";
|
||||
sha256 = "sha256:07yavk7xl92yjwwjdig90yq421n8ldv4fjfw7izd4hfpzw849a12";
|
||||
};
|
||||
|
||||
dontInstall = true;
|
||||
|
||||
unpackCmd = "${unzip}/bin/unzip -d $out $curSrc";
|
||||
sourceRoot = ".";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A comprehensive self-management system";
|
||||
homepage = "https://smos.online";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ norfair ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
|
@ -28,7 +28,7 @@ buildGoModule rec {
|
|||
meta = with lib; {
|
||||
description = "A Helm plugin that shows a diff";
|
||||
inherit (src.meta) homepage;
|
||||
license = licenses.apsl20;
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ yurrriq ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ buildGoModule rec {
|
|||
meta = with lib; {
|
||||
description = "A Helm plugin that shows a diff";
|
||||
inherit (src.meta) homepage;
|
||||
license = licenses.apsl20;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ yurrriq ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "A Helm plugin that helps manage secrets";
|
||||
inherit (src.meta) homepage;
|
||||
license = licenses.apsl20;
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ yurrriq ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ buildGoModule rec {
|
|||
meta = with lib; {
|
||||
description = "Kubestack framework CLI";
|
||||
homepage = "https://www.kubestack.com/";
|
||||
license = licenses.apsl20;
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ mtrsk ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gftp";
|
||||
version = "2.7.0b";
|
||||
version = "2.8.0b";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "masneyb";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-cIB3SneYKavgdI8eTtM1qsOrBJJ0c7/3CEvNPishNog=";
|
||||
hash = "sha256-syeRFpqbd1VhKhhs/fIByDSVpcY+SAlmikDo3J1ZHlo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
|
|||
libtool
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk
|
||||
ncurses
|
||||
|
|
@ -39,12 +40,12 @@ stdenv.mkDerivation rec {
|
|||
readline
|
||||
];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
preConfigure = ''
|
||||
./autogen.sh
|
||||
'';
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/masneyb/gftp";
|
||||
description = "GTK-based multithreaded FTP client for *nix-based machines";
|
||||
|
|
@ -48,6 +48,8 @@
|
|||
, brotli
|
||||
, microsoft_gsl
|
||||
, rlottie
|
||||
, stdenv
|
||||
, gcc10Stdenv
|
||||
}:
|
||||
|
||||
# Main reference:
|
||||
|
|
@ -63,10 +65,12 @@ let
|
|||
cxxStandard = "17";
|
||||
};
|
||||
};
|
||||
# Aarch64 default gcc9 will cause ICE. For reference #108305
|
||||
env = if stdenv.isAarch64 then gcc10Stdenv else stdenv;
|
||||
in
|
||||
mkDerivation rec {
|
||||
env.mkDerivation rec {
|
||||
pname = "telegram-desktop";
|
||||
version = "3.1.11";
|
||||
version = "3.4.3";
|
||||
# Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
|
||||
|
||||
# Telegram-Desktop with submodules
|
||||
|
|
@ -75,7 +79,7 @@ mkDerivation rec {
|
|||
repo = "tdesktop";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "0hpcsraw3gx37wk3r88q51qf68ny0kb3kd6slnklwf22d1jqr3fn";
|
||||
sha256 = "0w8llqc4ffhp4gkvk6cyxah16yxm15am0msg3qn39fi2qqnm01x8";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -154,6 +158,8 @@ mkDerivation rec {
|
|||
"-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c"
|
||||
# See: https://github.com/NixOS/nixpkgs/pull/130827#issuecomment-885212649
|
||||
"-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF"
|
||||
# TODO: Remove once QT6 is available in nixpkgs
|
||||
"-DDESKTOP_APP_QT6=OFF"
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "tg_owt";
|
||||
version = "unstable-2021-10-21";
|
||||
version = "unstable-2021-12-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "desktop-app";
|
||||
repo = "tg_owt";
|
||||
rev = "d578c760dc6f1ae5f0f3bb5317b0b2ed04b79138";
|
||||
sha256 = "12lr50nma3j9df55sxi6p48yhn9yxrwzz5yrx7r29p8p4fv1c75w";
|
||||
rev = "6708e0d31a73e64fe12f54829bf4060c41b2658e";
|
||||
sha256 = "081ylw8vp8c84x3f1xx1kia6k1sds2iza9fm5dvn3ccgjwxdm5ny";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kirc";
|
||||
version = "0.2.7";
|
||||
version = "0.2.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mcpcpc";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-iaqj4xB15DB3w/RaiCOMdAu8eONhTw1Dz0j5kykAHV4=";
|
||||
hash = "sha256-KRCVjz59SHjk86VgfGxYKk/Ti3o77dV7fdRu9mB3FSo=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
|
|||
|
|
@ -1,31 +1,22 @@
|
|||
{ lib
|
||||
, python3
|
||||
, fetchpatch
|
||||
, copyDesktopItems
|
||||
, makeDesktopItem
|
||||
, python3
|
||||
, qtsvg
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "pyspread";
|
||||
version = "1.99.6";
|
||||
version = "2.0.2";
|
||||
|
||||
src = python3.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-B1oyWUAXn63mmVFN9brJwbHxi7I5nYrK2JJU1DjAlb8=";
|
||||
hash = "sha256-rg2T9Y9FU2a+aWg0XM8jyQB9t8zDVlpad3TjUcx4//8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://gitlab.com/pyspread/pyspread/-/merge_requests/34
|
||||
(fetchpatch {
|
||||
name = "entry-points.patch";
|
||||
url = "https://gitlab.com/pyspread/pyspread/-/commit/3d8da6a7a7d76f7027d77ca95fac103961d729a2.patch";
|
||||
excludes = [ "bin/pyspread" "bin/pyspread.bat" ];
|
||||
sha256 = "1l614k7agv339hrin23jj7s1mq576vkdfkdim6wp224k7y37bnil";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
|
|
@ -47,19 +38,17 @@ python3.pkgs.buildPythonApplication rec {
|
|||
|
||||
pythonImportsCheck = [ "pyspread" ];
|
||||
|
||||
desktopItem = makeDesktopItem rec {
|
||||
name = pname;
|
||||
exec = name;
|
||||
icon = name;
|
||||
desktopName = "Pyspread";
|
||||
genericName = "Spreadsheet";
|
||||
comment = meta.description;
|
||||
categories = "Office;Development;Spreadsheet;";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
install -m 444 -Dt $out/share/applications ${desktopItem}/share/applications/*
|
||||
'';
|
||||
desktopItems = [
|
||||
(makeDesktopItem rec {
|
||||
name = pname;
|
||||
exec = name;
|
||||
icon = name;
|
||||
desktopName = "Pyspread";
|
||||
genericName = "Spreadsheet";
|
||||
comment = meta.description;
|
||||
categories = "Office;Development;Spreadsheet;";
|
||||
})
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
|
||||
|
|
|
|||
|
|
@ -4,48 +4,50 @@
|
|||
, appstream-glib
|
||||
, desktop-file-utils
|
||||
, libepoxy
|
||||
, gettext
|
||||
, glib
|
||||
, gtk3
|
||||
, gtk4
|
||||
, wayland
|
||||
, meson
|
||||
, mpv
|
||||
, ninja
|
||||
, nix-update-script
|
||||
, pkg-config
|
||||
, python3
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "celluloid";
|
||||
version = "0.21";
|
||||
version = "0.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "celluloid-player";
|
||||
repo = "celluloid";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-1Jeg1uqWxURGKR/Xg4j4roZ9Pg5MR7geyttdzlOU+rA=";
|
||||
hash = "sha256-QGN8YLtyb9YVNDK2ZDQwHJVg6UTIQssfNK9lQqxMNKQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream-glib
|
||||
desktop-file-utils
|
||||
gettext
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
];
|
||||
buildInputs = [
|
||||
libepoxy
|
||||
glib
|
||||
gtk3
|
||||
gtk4
|
||||
wayland
|
||||
mpv
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs meson-post-install.py src/generate-authors.py
|
||||
# Remove this for next release
|
||||
substituteInPlace meson-post-install.py --replace "gtk-update-icon-cache" "gtk4-update-icon-cache"
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -1,19 +1,29 @@
|
|||
{ lib, stdenvNoCC, fetchFromGitHub, curl, xclip }:
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, curl
|
||||
, wl-clipboard
|
||||
, xclip
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "mpvacious";
|
||||
version = "0.14";
|
||||
version = "0.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ajatt-Tools";
|
||||
repo = "mpvacious";
|
||||
rev = "v${version}";
|
||||
sha256 = "0r031hh3hpim9dli15m9q4cwka4ljvwg0hdgyp36r1n097q44r5f";
|
||||
sha256 = "1lxlgbjk4x3skg5s7kkr9llcdlmpmabfrcslwhhz5f4j3bq7498w";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# 'require' replaced with 'dofile' to work around
|
||||
# https://github.com/mpv-player/mpv/issues/7399 until fixed in mpvacious
|
||||
substituteInPlace subs2srs.lua \
|
||||
--replace "require('osd_styler')" "dofile('"$out/share/mpv/scripts/mpvacious/osd_styler.lua"')" \
|
||||
--replace "'curl'" "'${curl}/bin/curl'" \
|
||||
--replace "'wl-copy'" "'${wl-clipboard}/bin/wl-copy'" \
|
||||
--replace "xclip" "${xclip}/bin/xclip"
|
||||
'';
|
||||
|
||||
|
|
@ -21,12 +31,12 @@ stdenvNoCC.mkDerivation rec {
|
|||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/mpv/scripts
|
||||
cp subs2srs.lua $out/share/mpv/scripts
|
||||
mkdir -p $out/share/mpv/scripts/mpvacious
|
||||
cp *.lua $out/share/mpv/scripts/mpvacious
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.scriptName = "subs2srs.lua";
|
||||
passthru.scriptName = "mpvacious/subs2srs.lua";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Adds mpv keybindings to create Anki cards from movies and TV shows";
|
||||
|
|
|
|||
|
|
@ -283,6 +283,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "http://www.qemu.org/";
|
||||
description = "A generic and open source machine emulator and virtualizer";
|
||||
license = licenses.gpl2Plus;
|
||||
mainProgram = "qemu-kvm";
|
||||
maintainers = with maintainers; [ eelco qyliss ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xa";
|
||||
version = "2.3.11";
|
||||
version = "2.3.12";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://www.floodgap.com/retrotech/xa/dists/${pname}-${version}.tar.gz"
|
||||
"https://www.floodgap.com/retrotech/xa/dists/unsupported/${pname}-${version}.tar.gz"
|
||||
];
|
||||
hash = "sha256-MvIWTJnjBSGOmSlwhW3Y4jCbXLasR1jXsq/jv+vJAS0=";
|
||||
hash = "sha256-+P0VNgEtZ2/Gy/zdapF5PlZMibbvdH+NuPRnwXj7BwQ=";
|
||||
};
|
||||
|
||||
checkInputs = [ perl ];
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-media-sdk";
|
||||
version = "21.4.3";
|
||||
version = "22.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Intel-Media-SDK";
|
||||
repo = "MediaSDK";
|
||||
rev = "intel-mediasdk-${version}";
|
||||
sha256 = "sha256-Z6wIwgcKa+EaqSmbD//pYzGjDezASNWGnLCROiRvACo=";
|
||||
sha256 = "sha256-iISG947MUWVVAxykFwB5UK5Z4uQnEWJ6AFr/ZlHx4Nw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,35 +1,17 @@
|
|||
{ lib, stdenv, fetchurl, xercesc, getopt }:
|
||||
{ lib, stdenv, fetchFromGitHub, xercesc, getopt, cmake }:
|
||||
|
||||
let
|
||||
platform = if stdenv.isLinux then "linux" else
|
||||
if stdenv.isDarwin then "macosx" else
|
||||
throw "Unsupported platform";
|
||||
in stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xalan-c";
|
||||
version = "1.11";
|
||||
version = "1.12.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/xalan/xalan-c/sources/xalan_c-${version}-src.tar.gz";
|
||||
sha256 = "0a3a2b15vpacnqgpp6fiy1pwyc8q6ywzvyb5445f6wixfdspypjg";
|
||||
src = fetchFromGitHub {
|
||||
owner = "apache";
|
||||
repo = "xalan-c";
|
||||
rev = "Xalan-C_1_12_0";
|
||||
sha256 = "sha256:0q1204qk97i9h14vxxq7phcfpyiin0i1zzk74ixvg4wqy87b62s8";
|
||||
};
|
||||
|
||||
configurePhase = ''
|
||||
export XALANCROOT=`pwd`/c
|
||||
cd `pwd`/c
|
||||
mkdir -p $out
|
||||
./runConfigure -p ${platform} -c cc -x c++ -P$out
|
||||
'';
|
||||
|
||||
buildInputs = [ xercesc getopt ];
|
||||
|
||||
# Parallel build fails as:
|
||||
# c++ ... -c ... ExecutionContext.cpp
|
||||
# ProblemListenerBase.hpp:28:10: fatal error: LocalMsgIndex.hpp: No such file or directory
|
||||
# The build failure happens due to missing intra-project dependencies
|
||||
# against generated headers. Future 1.12 version dropped
|
||||
# autotools-based build system. Let's disable parallel builds until
|
||||
# next release.
|
||||
enableParallelBuilding = false;
|
||||
buildInputs = [ xercesc getopt cmake ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://xalan.apache.org/";
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Intel X86 Encoder Decoder (Intel XED)";
|
||||
homepage = "https://intelxed.github.io/";
|
||||
license = licenses.apsl20;
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ arturcygan ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -66,6 +66,6 @@ buildPythonPackage rec {
|
|||
description = "Terminal MUA using notmuch mail";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ edibopp ];
|
||||
maintainers = with maintainers; [ milibopp ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "deezer-python";
|
||||
version = "4.2.1";
|
||||
version = "4.3.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "browniebroke";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0gl0l7x9zqfkz3l4jfz8rb956lqj3vx1aghric36izwzl6wyj6h5";
|
||||
sha256 = "17l11mhv1qkdbhmwwal3zfgr1a3w1c4bwm9lqi78gadpl5lli4i2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -23,6 +23,6 @@ buildPythonPackage rec {
|
|||
homepage = "https://github.com/python-parsy/parsy";
|
||||
description = "Easy-to-use parser combinators, for parsing in pure Python";
|
||||
license = [ licenses.mit ];
|
||||
maintainers = with maintainers; [ edibopp ];
|
||||
maintainers = with maintainers; [ milibopp ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sqlmap";
|
||||
version = "1.5.12";
|
||||
version = "1.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-9FplToUd4CIkYZ88+Lat+joniZzRZDOfifH5z4sH8RM=";
|
||||
sha256 = "sha256-gYr/+sgkFT24JXNDHgmT4ee5b977Iax9TLZ9/nh7PP0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "vt-py";
|
||||
version = "0.11.0";
|
||||
version = "0.12.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -18,8 +18,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "VirusTotal";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PpgN9adGNZOorOUigsBVOb//ZafUaYHfo/Fv1IZf/XA=";
|
||||
rev = version;
|
||||
sha256 = "1yjrhwy2m819yda70ir6h7jsndradaw9a4pxjl8ys8p909vljvgx";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ buildGoModule rec {
|
|||
meta = with lib; {
|
||||
description = "Tools for interacting with remote images and registries including crane and gcrane";
|
||||
homepage = "https://github.com/google/go-containerregistry";
|
||||
license = licenses.apsl20;
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ yurrriq ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,8 @@
|
|||
, stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, unstableGitUpdater
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, qtbase
|
||||
, qtsvg
|
||||
, qttools
|
||||
|
|
@ -19,15 +20,25 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "punes";
|
||||
version = "unstable-2021-09-11";
|
||||
version = "0.108";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "punesemu";
|
||||
repo = "puNES";
|
||||
rev = "60ca36fcb066c41d0b3f2b550ca94dc7d12d84d6";
|
||||
sha256 = "JOi6AE1bpAc/wj9fQqHrUNc6vceeUyP0phT2f9kcJTY=";
|
||||
rev = "v${version}";
|
||||
sha256 = "0inkwmvbr2w4addmgk9r4f13yismang9ylfgflhh9352lf0lirv8";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Drop when version > 0.108
|
||||
# https://github.com/punesemu/puNES/issues/185
|
||||
(fetchpatch {
|
||||
name = "0001-punes-Fixed-make-install.patch";
|
||||
url = "https://github.com/punesemu/puNES/commit/902434f50398ebcda0786ade4b28a0496084810e.patch";
|
||||
sha256 = "1a3052n3n1qipi4bd7f7gq4zl5jjjzzzpbijdisis2vxvhnfvcim";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace configure.ac \
|
||||
--replace '`$PKG_CONFIG --variable=host_bins Qt5Core`/lrelease' '${qttools.dev}/bin/lrelease'
|
||||
|
|
@ -49,8 +60,8 @@ mkDerivation rec {
|
|||
"--with-ffmpeg"
|
||||
];
|
||||
|
||||
passthru.updateScript = unstableGitUpdater {
|
||||
url = "https://github.com/punesemu/puNES.git";
|
||||
passthru.updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ stdenv.mkDerivation {
|
|||
meta = with lib; {
|
||||
description = "Firmware for Realtek RTL8761b";
|
||||
license = licenses.unfreeRedistributableFirmware;
|
||||
maintainers = with maintainers; [ edibopp ];
|
||||
maintainers = with maintainers; [ milibopp ];
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
26
pkgs/servers/dcnnt/default.nix
Normal file
26
pkgs/servers/dcnnt/default.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ buildPythonApplication, fetchPypi, lib, pycryptodome }:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "dcnnt";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ef8578526163cb3e25fa352ba2f6f4d39309f477a72282416c89eddfb69c3a91";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pycryptodome
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/cyanomiko/dcnnt-py";
|
||||
description = "UI-less tool to connect Android phone with desktop";
|
||||
longDescription = ''
|
||||
Yet another tool to connect Android phone with desktop similar to
|
||||
KDE Connect.
|
||||
'';
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ arnoutkroeze ];
|
||||
};
|
||||
}
|
||||
|
|
@ -16,14 +16,14 @@ let
|
|||
}."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
hash = {
|
||||
x64-linux_hash = "sha256-KPGE9Az98UOBEJ/mUH/RI0zrf1tf90yckAfURvC+lWM=";
|
||||
arm64-linux_hash = "sha256-seJJ2le7Y4x6G5s0ASbN3KzldD9kOmFamwaxnJV3T7c=";
|
||||
x64-osx_hash = "sha256-FA81l/IZWGoAlBUS3irPCdcf3ey9Df3XzDen+4UlZzc=";
|
||||
x64-linux_hash = "sha256-L34dvileSSJxdhNwXC5iBChUM4r6hwncTHIBjWH20XE=";
|
||||
arm64-linux_hash = "sha256-cT0UcN9otaGbMXoxlxJosYFtWzA8lRvekdleUSaxN0E=";
|
||||
x64-osx_hash = "sha256-7a34R7PsgEzY4u7NKNR0LaVxonhhDNqjwQxEXaJbAww=";
|
||||
}."${arch}-${os}_hash";
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "prowlarr";
|
||||
version = "0.1.8.1231";
|
||||
version = "0.1.9.1313";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.develop.${version}.${os}-core-${arch}.tar.gz";
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tcsh";
|
||||
version = "6.23.00";
|
||||
version = "6.23.02";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
|
|
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
|||
"ftp://ftp.astron.com/pub/tcsh/old/${pname}-${version}.tar.gz"
|
||||
"ftp://ftp.astron.com/pub/tcsh/${pname}-${version}.tar.gz"
|
||||
];
|
||||
hash = "sha256-Tr6y8zYz0RXZU19VTGUahSMEDY2R5d4zP7LuBFuOAB4=";
|
||||
hash = "sha256-wD+AQFE2cxswkdpzWoHN2EgAhRAySrMl8jWv9wnkRus=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Admin UI for Synapse Homeservers";
|
||||
homepage = "https://github.com/Awesome-Technologies/synapse-admin";
|
||||
license = licenses.apsl20;
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ mkg20001 ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@ assert unicodeSupport -> ncurses.unicode && ncurses != null;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dialog";
|
||||
version = "1.3-20210621";
|
||||
version = "1.3-20211214";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.invisible-island.net/dialog/${pname}-${version}.tgz";
|
||||
hash = "sha256-w68izPzZuso4QGIQjdk1ToaZCSnuJwwjnu9pUYxdp8g=";
|
||||
hash = "sha256-zCll4FxqjDcHCza1ZBTqpWDfjYfyzqIXWeKJUOmyeks=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
|
|||
description = "Display dialog boxes from shell";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres spacefrogg ];
|
||||
platforms = ncurses.meta.platforms;
|
||||
inherit (ncurses.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "thefuck";
|
||||
version = "3.31";
|
||||
version = "3.32";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvbn";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-eKKUUJr00sUtT4u91MUgJjyPOXp3NigYVfYUP/sDBhY=";
|
||||
sha256 = "sha256-bRCy95owBJaxoyCNQF6gEENoxCkmorhyKzZgU1dQN6I=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ colorama decorator psutil pyte six ];
|
||||
|
|
|
|||
|
|
@ -21,6 +21,6 @@ buildGoModule rec {
|
|||
description = "A first-come-first-serve single-fire HTTP server";
|
||||
homepage = "https://github.com/raphaelreyna/oneshot";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ edibopp ];
|
||||
maintainers = with maintainers; [ milibopp ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Conceal messages in ASCII text by appending whitespace to the end of lines";
|
||||
homepage = "http://www.darkside.com.au/snow/";
|
||||
license = licenses.apsl20;
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ siraben ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "A resource monitor; python port of bashtop";
|
||||
homepage = src.meta.homepage;
|
||||
license = licenses.apsl20;
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ aw ];
|
||||
platforms = with platforms; linux ++ freebsd ++ darwin;
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Command Line Interface for AWS EC2 Instance Connect";
|
||||
homepage = "https://github.com/aws/aws-ec2-instance-connect-cli";
|
||||
license = licenses.apsl20;
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ yurrriq ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
meta = with lib; {
|
||||
description = "Creates and manages a simplestreams lxd image server on top of nginx";
|
||||
homepage = "https://github.com/Avature/lxd-image-server";
|
||||
license = licenses.apsl20;
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ mkg20001 ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -5620,7 +5620,7 @@ with pkgs;
|
|||
|
||||
gexiv2 = callPackage ../development/libraries/gexiv2 { };
|
||||
|
||||
gftp = callPackage ../applications/networking/gftp {
|
||||
gftp = callPackage ../applications/networking/ftp/gftp {
|
||||
gtk = gtk2;
|
||||
};
|
||||
|
||||
|
|
@ -20889,6 +20889,8 @@ with pkgs;
|
|||
erlang = erlangR22;
|
||||
};
|
||||
|
||||
dcnnt = python3Packages.callPackage ../servers/dcnnt { };
|
||||
|
||||
dendrite = callPackage ../servers/dendrite { };
|
||||
|
||||
dex-oidc = callPackage ../servers/dex { };
|
||||
|
|
@ -26146,8 +26148,6 @@ with pkgs;
|
|||
|
||||
smooth = callPackage ../development/libraries/smooth { };
|
||||
|
||||
smos = callPackage ../applications/misc/smos { };
|
||||
|
||||
spectrwm = callPackage ../applications/window-managers/spectrwm { };
|
||||
|
||||
spot = callPackage ../applications/audio/spot { };
|
||||
|
|
@ -27982,9 +27982,7 @@ with pkgs;
|
|||
|
||||
pinpoint = callPackage ../applications/office/pinpoint { };
|
||||
|
||||
pinta = callPackage ../applications/graphics/pinta {
|
||||
gtksharp = gtk-sharp-2_0;
|
||||
};
|
||||
pinta = callPackage ../applications/graphics/pinta { };
|
||||
|
||||
pistol = callPackage ../tools/misc/pistol { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue