Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
818e64fcab
@ -8083,6 +8083,12 @@
|
||||
githubId = 1711539;
|
||||
name = "matklad";
|
||||
};
|
||||
matrss = {
|
||||
name = "Matthias Riße";
|
||||
email = "matthias.risze@t-online.de";
|
||||
github = "matrss";
|
||||
githubId = 9308656;
|
||||
};
|
||||
matt-snider = {
|
||||
email = "matt.snider@protonmail.com";
|
||||
github = "matt-snider";
|
||||
|
||||
@ -3,7 +3,8 @@
|
||||
with lib;
|
||||
|
||||
let cfg = config.programs.noisetorch;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.programs.noisetorch = {
|
||||
enable = mkEnableOption "noisetorch + setcap wrapper";
|
||||
|
||||
@ -24,5 +25,6 @@ in {
|
||||
capabilities = "cap_sys_resource=+ep";
|
||||
source = "${cfg.package}/bin/noisetorch";
|
||||
};
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -43,7 +43,7 @@ in rec {
|
||||
name = "nixos-${nixos.channel.version}";
|
||||
meta = {
|
||||
description = "Release-critical builds for the NixOS channel";
|
||||
maintainers = with pkgs.lib.maintainers; [ eelco fpletz ];
|
||||
maintainers = with pkgs.lib.maintainers; [ eelco ];
|
||||
};
|
||||
constituents = pkgs.lib.concatLists [
|
||||
[ "nixos.channel" ]
|
||||
|
||||
@ -20,7 +20,7 @@ with lib;
|
||||
{
|
||||
name = "couchdb";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ fpletz ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
nodes = {
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
import ./make-test-python.nix ({ pkgs, ...} : rec {
|
||||
name = "privacyidea";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ fpletz ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
nodes.machine = { ... }: {
|
||||
|
||||
@ -53,13 +53,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "mixxx";
|
||||
version = "2.3.2";
|
||||
version = "2.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mixxxdj";
|
||||
repo = "mixxx";
|
||||
rev = version;
|
||||
sha256 = "sha256-EnOO5OGcaIITqfF9gpGktarzYOx128C1M2VmYNzdRsA=";
|
||||
sha256 = "sha256-NRtrEobdJMFgDXrEeb2t1zeVN8pQP7+pda2DSU/yNX8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
@ -117,7 +117,7 @@ mkDerivation rec {
|
||||
|
||||
# mixxx installs udev rules to DATADIR instead of SYSCONFDIR
|
||||
# let's disable this and install udev rules manually via postInstall
|
||||
# see https://github.com/mixxxdj/mixxx/blob/2.3.2/CMakeLists.txt#L1381-L1392
|
||||
# see https://github.com/mixxxdj/mixxx/blob/2.3.3/CMakeLists.txt#L1381-L1392
|
||||
cmakeFlags = [
|
||||
"-DINSTALL_USER_UDEV_RULES=OFF"
|
||||
];
|
||||
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
description = "scalability-focused, untraceable, secure, and fungible cryptocurrency using the RingCT protocol";
|
||||
homepage = "https://www.getmasari.org/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ fpletz ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
description = "A fork of Monero and a truely fungible cryptocurrency";
|
||||
homepage = "https://www.sumokoin.org/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ fpletz ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
32
pkgs/applications/graphics/pika/default.nix
Normal file
32
pkgs/applications/graphics/pika/default.nix
Normal file
@ -0,0 +1,32 @@
|
||||
{ lib
|
||||
, fetchurl
|
||||
, stdenv
|
||||
, undmg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pika";
|
||||
version = "0.0.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/superhighfives/${pname}/releases/download/${version}/Pika-${version}.dmg";
|
||||
sha256 = "sha256-hcP2bETEx9RQW43I9nvdRPi9lbWwKW6mhRx5H6RxhjM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ undmg ];
|
||||
|
||||
sourceRoot = "Pika.app";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/Applications/Pika.app"
|
||||
cp -R . "$out/Applications/Pika.app"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://superhighfives.com/pika";
|
||||
description = "An open-source colour picker app for macOS";
|
||||
platforms = platforms.darwin;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ arkivm ];
|
||||
};
|
||||
}
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gpsprune";
|
||||
version = "21.2";
|
||||
version = "21.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar";
|
||||
sha256 = "sha256-QgbLbpqlC2sITbPK4ZcaovmycwhWtnu06x8F0grpECc=";
|
||||
sha256 = "sha256-0uPCMMWixw1dZeG12kvFO4FTp8qrOsLyLTKtGSVJxuw=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Kanban project management software";
|
||||
homepage = "https://kanboard.net";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fpletz lheckemann ];
|
||||
maintainers = with maintainers; [ lheckemann ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,17 +9,18 @@
|
||||
, light # light
|
||||
, pamixer # pamixer
|
||||
, pulseaudio # pactl
|
||||
, libdbusmenu-gtk3 # tray
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "nwg-panel";
|
||||
version = "0.5.7";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nwg-piotr";
|
||||
repo = "nwg-panel";
|
||||
rev = "v${version}";
|
||||
sha256 = "1d3qh42cwayb5d9ymhfs2vrbg5x5x6x73hw77m3xb9y4vyhji85x";
|
||||
sha256 = "sha256-kQow8jBHxMTgtTaOvq8uT5YjWxml+GoYaoUH3hMQN8g=";
|
||||
};
|
||||
|
||||
# No tests
|
||||
@ -31,7 +32,10 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
buildInputs = [ atk gdk-pixbuf gtk-layer-shell pango ];
|
||||
nativeBuildInputs = [ wrapGAppsHook gobject-introspection ];
|
||||
propagatedBuildInputs = with python3Packages; [ i3ipc netifaces psutil pybluez pygobject3 ];
|
||||
propagatedBuildInputs = (with python3Packages;
|
||||
[ i3ipc netifaces psutil pybluez pygobject3 requests dasbus setuptools ])
|
||||
# Run-time GTK dependency required by the Tray module
|
||||
++ [ libdbusmenu-gtk3 ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/{applications,pixmaps}
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "usql";
|
||||
version = "0.9.3";
|
||||
version = "0.11.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xo";
|
||||
repo = "usql";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NHeJSWrcX4hYBJpZu/UjQ1ZWfcUnWFCV0Meo+XveDOw=";
|
||||
sha256 = "sha256-0uXcCwMIhr+8snH3HqQ+ZXtTrYD6ufCTVaZPi1+RwUw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-EsLLBhyOcupx5LrJyWWMu4RAGWDKo3keflyZOASKldE=";
|
||||
vendorSha256 = "sha256-9XyG0Fu3idxGG01MoBr5BMoQSz+dyZFEXRNvvb+XWjA=";
|
||||
|
||||
buildInputs = [ unixODBC icu ];
|
||||
|
||||
|
||||
@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/fireice-uk/xmr-stak";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ fpletz bfortz ];
|
||||
maintainers = with maintainers; [ bfortz ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/xmrig/xmrig";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
maintainers = with maintainers; [ fpletz kim0 ];
|
||||
maintainers = with maintainers; [ kim0 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -19,9 +19,9 @@
|
||||
}
|
||||
},
|
||||
"beta": {
|
||||
"version": "104.0.5112.65",
|
||||
"sha256": "03adyhinhmih54rsv23w0cm86ldyfsxlmqhgk36vhgylgdras81v",
|
||||
"sha256bin64": "17rck7zvyxmlhmi4x27xhlrn6sznx75cbidhbw7bxk3z9x7qybfy",
|
||||
"version": "104.0.5112.79",
|
||||
"sha256": "1wxb3nl080wgg1g61g3pgzz3gaawg442iv8pxqhnayacm3qn5ilw",
|
||||
"sha256bin64": "1vagpsnjrdjcisgg7i56l3zcgvb5sg4pkaq5li500vmgcjin8irq",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-06-08",
|
||||
@ -32,9 +32,9 @@
|
||||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "105.0.5195.10",
|
||||
"sha256": "12spa7b8iy1ipj6f2rs6kdv6r986zdjmdkng5gk1ki1qli80gv2x",
|
||||
"sha256bin64": "146qxhzhlmd5hvp2g1nrfk7hjdxjlrafwa1gl4msjgrdrfz3bdql",
|
||||
"version": "105.0.5195.19",
|
||||
"sha256": "08wap1v2qjx8nzd8sbiv24vx0vdc2dhlzrlv3g4zpm2qj7l4mki7",
|
||||
"sha256bin64": "1alj49ysqdr5w1q42ww36kxfx60df2z5jxj39lza4vxm9b8r6ij2",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-07-11",
|
||||
|
||||
@ -12,9 +12,9 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "minikube";
|
||||
version = "1.26.0";
|
||||
version = "1.26.1";
|
||||
|
||||
vendorSha256 = "sha256-3ME8bs4TAQRAECko7+ZXBCFf4IyTn1P/+hParpc5QTU=";
|
||||
vendorSha256 = "sha256-aw2B5wdhEQiTDp/BpJdXzY3XBm3eXlSQt83j4RHhMg0=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@ -22,7 +22,7 @@ buildGoModule rec {
|
||||
owner = "kubernetes";
|
||||
repo = "minikube";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vGlW65jf3XGFNK9aSvsK7V0OmUOCtgJcWeNFOZVuH00=";
|
||||
sha256 = "sha256-08q/IdQEq1/KaIBN6ss8r1KbjSjZnhOW/BeaJ8BuYZM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles pkg-config which makeWrapper ];
|
||||
|
||||
@ -59,7 +59,7 @@ in buildGoPackage rec {
|
||||
or develop with it, day-to-day, on your local host.
|
||||
'';
|
||||
homepage = "https://github.com/minishift/minishift";
|
||||
maintainers = with maintainers; [ fpletz vdemeester ];
|
||||
maintainers = with maintainers; [ vdemeester ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.asl20;
|
||||
};
|
||||
|
||||
@ -63,7 +63,7 @@ in python3.pkgs.buildPythonApplication rec {
|
||||
meta = with lib; {
|
||||
description = "Chatbot designed to be simple to extend with plugins written in Python";
|
||||
homepage = "http://errbot.io/";
|
||||
maintainers = with maintainers; [ fpletz globin ];
|
||||
maintainers = with maintainers; [ globin ];
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
# flaky on darwin, "RuntimeError: can't start new thread"
|
||||
|
||||
@ -29,7 +29,7 @@ python3Packages.buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "An open source chat-ops bot framework";
|
||||
homepage = "https://opsdroid.dev";
|
||||
maintainers = with maintainers; [ fpletz globin willibutz ];
|
||||
maintainers = with maintainers; [ globin willibutz ];
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchFromGitLab, cmake, ninja, pkg-config, wrapGAppsHook
|
||||
, glib, gtk3, gettext, libxkbfile, libX11
|
||||
, glib, gtk3, gettext, libxkbfile, libX11, python3
|
||||
, freerdp, libssh, libgcrypt, gnutls, vte
|
||||
, pcre2, libdbusmenu-gtk3, libappindicator-gtk3
|
||||
, libvncserver, libpthreadstubs, libXdmcp, libxkbcommon
|
||||
@ -15,13 +15,13 @@ with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "remmina";
|
||||
version = "1.4.25";
|
||||
version = "1.4.27";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "Remmina";
|
||||
repo = "Remmina";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1val/KCClEtw1prVWuXJe8DmmQ7e7oqwAfAnT9G9iHI=";
|
||||
sha256 = "sha256-WIppHK4ucvKqgXB8VPy9ldbw22ZuDaEn1gNaLpyb4jA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ];
|
||||
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||
libvncserver libpthreadstubs libXdmcp libxkbcommon
|
||||
libsoup spice-protocol spice-gtk libepoxy at-spi2-core
|
||||
openssl gnome.adwaita-icon-theme json-glib libsodium webkitgtk
|
||||
harfbuzz
|
||||
harfbuzz python3
|
||||
] ++ optionals withLibsecret [ libsecret ]
|
||||
++ optionals withVte [ vte ];
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, ant, jdk, jre, gtk2, glib, xorg, Cocoa }:
|
||||
{ lib, stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, wrapGAppsHook, ant, jdk, jre, gtk2, glib, xorg, Cocoa }:
|
||||
|
||||
let
|
||||
_version = "2.10.2";
|
||||
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||
pname = "jameica";
|
||||
inherit version;
|
||||
|
||||
nativeBuildInputs = [ ant jdk makeWrapper ];
|
||||
nativeBuildInputs = [ ant jdk wrapGAppsHook makeWrapper ];
|
||||
buildInputs = lib.optionals stdenv.isLinux [ gtk2 glib xorg.libXtst ]
|
||||
++ lib.optional stdenv.isDarwin Cocoa;
|
||||
|
||||
@ -35,6 +35,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1x9sybknzsfxp9z0pvw9dx80732ynyap57y03p7xwwjbcrnjla57";
|
||||
};
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
# there is also a build.gradle, but it only seems to be used to vendor 3rd party libraries
|
||||
# and is not able to build the application itself
|
||||
buildPhase = ''
|
||||
@ -53,13 +55,16 @@ stdenv.mkDerivation rec {
|
||||
install -Dm644 plugin.xml $out/share/java/
|
||||
install -Dm644 build/jameica-icon.png $out/share/pixmaps/jameica.png
|
||||
cp ${desktopItem}/share/applications/* $out/share/applications/
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
makeWrapper ${jre}/bin/java $out/bin/jameica \
|
||||
--add-flags "-cp $out/share/java/jameica.jar:$out/share/jameica-${version}/* ${
|
||||
lib.optionalString stdenv.isDarwin ''-Xdock:name="Jameica" -XstartOnFirstThread''
|
||||
} de.willuhn.jameica.Main" \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.escapeShellArg (lib.makeLibraryPath buildInputs)} \
|
||||
--chdir "$out/share/java/"
|
||||
--chdir "$out/share/java/" \
|
||||
"''${gappsWrapperArgs[@]}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
@ -71,7 +76,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
sourceProvenance = with sourceTypes; [
|
||||
fromSource
|
||||
binaryBytecode # source bundles dependencies as jars
|
||||
binaryBytecode # source bundles dependencies as jars
|
||||
];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
{ mkDerivation
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, wrapQtAppsHook
|
||||
, qmake
|
||||
, pkg-config
|
||||
, qtbase
|
||||
@ -9,6 +10,7 @@
|
||||
, qttools
|
||||
, qtserialport
|
||||
, boost
|
||||
, libngspice
|
||||
, libgit2
|
||||
, quazip
|
||||
}:
|
||||
@ -16,35 +18,34 @@
|
||||
let
|
||||
# SHA256 of the fritzing-parts HEAD on the master branch,
|
||||
# which contains the latest stable parts definitions
|
||||
partsSha = "640fa25650211afccd369f960375ade8ec3e8653";
|
||||
partsSha = "4713511c894cb2894eae505b9307c6555afcc32c";
|
||||
|
||||
parts = fetchFromGitHub {
|
||||
owner = "fritzing";
|
||||
repo = "fritzing-parts";
|
||||
rev = partsSha;
|
||||
sha256 = "sha256-4S65eX4LCnXCFQAOxmdvr8d0nAgTWcJooE2SpLYpcXI=";
|
||||
sha256 = "sha256-QiOGWc+99MJhOVrXyNOinR8rTVvW/E+wPfoB6QvbhY0=";
|
||||
};
|
||||
in
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fritzing";
|
||||
version = "unstable-2021-09-22";
|
||||
version = "unstable-2022-07-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = "fritzing-app";
|
||||
rev = "f0af53a9077f7cdecef31d231b85d8307de415d4";
|
||||
sha256 = "sha256-fF38DrBoeZ0aKwVMNyYMPWa5rFPbIVXRARZT+eRat5Q=";
|
||||
rev = "40d23c29b0463d5c968c3c4b34ed5ffc05c5a258";
|
||||
sha256 = "sha256-smvfuxQWF/LMFFXHOKb3zUZsEet/XoiaxXOR5QMaYzw=";
|
||||
};
|
||||
|
||||
buildInputs = [ qtbase qtsvg qtserialport boost libgit2 quazip ];
|
||||
nativeBuildInputs = [ qmake pkg-config qttools ];
|
||||
buildInputs = [ qtbase qtsvg qtserialport boost libgit2 quazip libngspice ];
|
||||
nativeBuildInputs = [ qmake pkg-config qttools wrapQtAppsHook ];
|
||||
|
||||
patches = [
|
||||
# Add support for QuaZip 1.x
|
||||
(fetchpatch {
|
||||
url = "https://github.com/fritzing/fritzing-app/commit/ef83ebd9113266bb31b3604e3e9d0332bb48c999.patch";
|
||||
sha256 = "sha256-J43E6iBRIVbsuuo82gPk3Q7tyLhNkuuyYwtH8hUfcPU=";
|
||||
url = "https://aur.archlinux.org/cgit/aur.git/plain/0001-Quick-Dirty-patch-to-allow-finding-quazip-qt5-on-Arc.patch?h=fritzing&id=1ae0dc88464f375a54b156e6761315bcb04bcc1f";
|
||||
sha256 = "sha256-iS18EWw920gyeXDoHBRGwXvwMJurJS21H77Erl+fqog=";
|
||||
})
|
||||
];
|
||||
|
||||
@ -60,10 +61,10 @@ mkDerivation rec {
|
||||
cp -a ${parts}/* parts/
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${quazip}/include/QuaZip-Qt${lib.versions.major qtbase.version}-${quazip.version}/quazip";
|
||||
|
||||
qmakeFlags = [
|
||||
"phoenix.pro"
|
||||
"DEFINES=QUAZIP_INSTALLED"
|
||||
"DEFINES+=QUAZIP_1X"
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
|
||||
@ -203,7 +203,7 @@ stdenv.mkDerivation {
|
||||
meta = with lib; {
|
||||
homepage = "http://www.gitlab.com/";
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ fpletz globin krav talyz yayayayaka yuka ];
|
||||
maintainers = with maintainers; [ globin krav talyz yayayayaka yuka ];
|
||||
} // (if gitlabEnterprise then
|
||||
{
|
||||
license = licenses.unfreeRedistributable; # https://gitlab.com/gitlab-org/gitlab-ee/raw/master/LICENSE
|
||||
|
||||
@ -52,7 +52,7 @@ buildGoModule {
|
||||
homepage = "https://gitlab.com/gitlab-org/gitaly";
|
||||
description = "A Git RPC service for handling all the git calls made by GitLab";
|
||||
platforms = platforms.linux ++ [ "x86_64-darwin" ];
|
||||
maintainers = with maintainers; [ roblabla globin fpletz talyz yayayayaka ];
|
||||
maintainers = with maintainers; [ roblabla globin talyz yayayayaka ];
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
||||
@ -26,7 +26,7 @@ buildGoModule rec {
|
||||
description = "SSH access and repository management app for GitLab";
|
||||
homepage = "http://www.gitlab.com/";
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ fpletz globin talyz yayayayaka ];
|
||||
maintainers = with maintainers; [ globin talyz yayayayaka ];
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
||||
@ -24,7 +24,7 @@ buildGoModule rec {
|
||||
meta = with lib; {
|
||||
homepage = "http://www.gitlab.com/";
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ fpletz globin talyz yayayayaka ];
|
||||
maintainers = with maintainers; [ globin talyz yayayayaka ];
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
||||
@ -8,13 +8,13 @@ with lib;
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gogs";
|
||||
version = "0.12.9";
|
||||
version = "0.12.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gogs";
|
||||
repo = "gogs";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-oXIA0JY7+pfXk5RnHWCJEkU9bL+ZIc2oXQrLwa1XHMg=";
|
||||
sha256 = "sha256-EFGC94aIMW7AYJpgaHBT4W7BjXd+oijMqQPH40rIvlg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-5AnQ7zF2UK1HNoyr6gwFdVv+KMJEGkjKPpDEpUXckUg=";
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "iina";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/iina/iina/releases/download/v${version}/IINA.v${version}.dmg";
|
||||
sha256 = "sha256-kbh+gAVfCXoct6jJGXnetTAzFfIGdVLL5zh/SL/EJzY=";
|
||||
sha256 = "sha256-tQxBaCgAXh7sDcgGbJYe/MOJ5r4aWllVQepi1I0xo5E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ undmg ];
|
||||
|
||||
@ -10,22 +10,41 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "obs-gstreamer";
|
||||
version = "0.3.3";
|
||||
version = "0.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fzwoch";
|
||||
repo = "obs-gstreamer";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-KhSBZcV2yILTf5+aNoYWDfNwPiJoyYPeIOQMDFvOusg=";
|
||||
hash = "sha256-CDtWe4bx1M06nfqvVmIZaLQoKAsXFnG0Xy/mhiSbMgU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config meson ninja ];
|
||||
buildInputs = with gst_all_1; [ gstreamer gst-plugins-base obs-studio ];
|
||||
|
||||
# - We need "getLib" instead of default derivation, otherwise it brings gstreamer-bin;
|
||||
# - without gst-plugins-base it won't even show proper errors in logs;
|
||||
# - Without gst-plugins-bad it won't find element "h264parse";
|
||||
# - gst-vaapi adds "VA-API" to "Encoder type";
|
||||
# - gst-plugins-ugly adds "x264" to "Encoder type";
|
||||
# Tip: "could not link appsrc to videoconvert1" can mean a lot of things, enable GST_DEBUG=2 for help.
|
||||
passthru.obsWrapperArguments =
|
||||
let
|
||||
gstreamerHook = package: "--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : ${lib.getLib package}/lib/gstreamer-1.0";
|
||||
in
|
||||
with gst_all_1; builtins.map gstreamerHook [
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
gst-plugins-bad
|
||||
|
||||
gst-plugins-ugly
|
||||
gst-vaapi
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An OBS Studio source, encoder and video filter plugin to use GStreamer elements/pipelines in OBS Studio";
|
||||
homepage = "https://github.com/fzwoch/obs-gstreamer";
|
||||
maintainers = with maintainers; [ ahuzik ];
|
||||
maintainers = with maintainers; [ ahuzik pedrohlc ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
};
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ obs-studio, symlinkJoin, makeWrapper }:
|
||||
{ lib, obs-studio, symlinkJoin, makeWrapper }:
|
||||
|
||||
{ plugins ? [] }:
|
||||
|
||||
@ -8,11 +8,19 @@ symlinkJoin {
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
paths = [ obs-studio ] ++ plugins;
|
||||
|
||||
postBuild = ''
|
||||
wrapProgram $out/bin/obs \
|
||||
--set OBS_PLUGINS_PATH "$out/lib/obs-plugins" \
|
||||
--set OBS_PLUGINS_DATA_PATH "$out/share/obs/obs-plugins"
|
||||
'';
|
||||
postBuild = with lib;
|
||||
let
|
||||
# Some plugins needs extra environment, see obs-gstreamer for an example.
|
||||
pluginArguments =
|
||||
lists.concatMap (plugin: plugin.obsWrapperArguments or []) plugins;
|
||||
|
||||
wrapCommand = [
|
||||
"wrapProgram"
|
||||
"$out/bin/obs"
|
||||
''--set OBS_PLUGINS_PATH "$out/lib/obs-plugins"''
|
||||
''--set OBS_PLUGINS_DATA_PATH "$out/share/obs/obs-plugins"''
|
||||
] ++ pluginArguments;
|
||||
in concatStringsSep " " wrapCommand;
|
||||
|
||||
inherit (obs-studio) meta;
|
||||
passthru = obs-studio.passthru // {
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "lima";
|
||||
version = "0.11.2";
|
||||
version = "0.11.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lima-vm";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DN8YXbpD7TVVPvl8LKAwLHKt50G37cu8dJBqF+DDE6g=";
|
||||
sha256 = "sha256-sSmadO7iKkJb/kd9rnH34/DyAHqdNtbvGDt9xkK4t8E=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-lrJVnWd94nELROP5VYI+Qs8cK5U9PYiZo9j9cusb9cY=";
|
||||
vendorSha256 = "sha256-pe6AaO3vTbix+b21GqEICxdej8mbXXpzNrF4eKbEnSE=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
||||
|
||||
|
||||
@ -1,507 +0,0 @@
|
||||
# The file below is copy/pasted from
|
||||
# https://raw.githubusercontent.com/protesilaos/iosevka-comfy/0.2.1/private-build-plans.toml. It
|
||||
# seems like ofborg will prevent me from using fetchurl to download
|
||||
# this file automatically.
|
||||
[buildPlans.iosevka-comfy] # <iosevka-comfy> is your plan name
|
||||
family = "Iosevka Comfy" # Font menu family name
|
||||
spacing = "normal" # Optional; Values: `normal`, `quasi-proportional`, `quasi-proportional-extension-only`, `term`, `fontconfig-mono`, or `fixed`
|
||||
serifs = "sans" # Optional; Values: `sans` or `slab`
|
||||
|
||||
###################################################################################################
|
||||
# Configure variants
|
||||
|
||||
# # Optional; Whether to inherit a `ss##` variant
|
||||
# [buildPlans.iosevka-comfy.variants]
|
||||
# inherits = "ss01"
|
||||
|
||||
# Optional; Configure single character's variant
|
||||
[buildPlans.iosevka-comfy.variants.design]
|
||||
cv01 = 1 # A cap straight
|
||||
cv02 = 1 # B cap straight
|
||||
cv03 = 1 # C cap serifless
|
||||
cv04 = 6 # D cap curly with top and bottom serif (without serifs TODO reads like TOOO at small point sizes)
|
||||
cv05 = 1 # E cap serifless
|
||||
cv06 = 1 # F cap serifless
|
||||
cv07 = 4 # G cap toothed
|
||||
cv08 = 1 # H cap serifless
|
||||
cv09 = 1 # I cap long serifs
|
||||
cv10 = 2 # J cap serified
|
||||
cv11 = 2 # K cap curly
|
||||
cv12 = 1 # L cap serifless
|
||||
cv13 = 3 # M cap short middle leg slanted sides
|
||||
cv14 = 1 # N cap symmetric
|
||||
cv15 = 1 # P cap straight
|
||||
cv16 = 4 # Q cap crossing tail
|
||||
cv17 = 1 # R cap straight
|
||||
cv18 = 1 # S cap serifless
|
||||
cv19 = 1 # T cap serifless
|
||||
cv20 = 3 # U cap serifless
|
||||
cv21 = 1 # V cap straight
|
||||
cv22 = 1 # W straight
|
||||
cv23 = 1 # X cap straight
|
||||
cv24 = 1 # Y cap straight
|
||||
cv25 = 1 # Z cap straight
|
||||
cv26 = 10 # a single storey earless tailed bottom
|
||||
cv27 = 1 # b toothed
|
||||
cv28 = 1 # c serifless
|
||||
cv29 = 1 # d toothed
|
||||
cv33 = 1 # h straight
|
||||
cv34 = 10 # i serified flat tailed
|
||||
cv35 = 6 # j flat hook serified
|
||||
cv37 = 10 # l serified flat tailed
|
||||
cv42 = 9 # r compact
|
||||
cv43 = 1 # s serifless
|
||||
cv44 = 2 # t flat hook
|
||||
cv45 = 4 # u tailed
|
||||
cv49 = 6 # y cursive flat terminal hook
|
||||
cv53 = 1 # Λ, Δ lambda and delta cap straight
|
||||
cv54 = 2 # α alpha straight tailed
|
||||
VXAA = 1 # δ delta rounded top
|
||||
cv55 = 1 # Γ gamma cap straight
|
||||
cv56 = 6 # ι iota serified flat tailed
|
||||
cv57 = 2 # λ lambda top tailed
|
||||
VXAC = 1 # μ me tailless
|
||||
VXAB = 2 # ξ xe flat top
|
||||
cv71 = 13 # 0 oval dashed forward slash
|
||||
cv74 = 2 # 3 arched
|
||||
cv76 = 2 # 5 open contour
|
||||
cv78 = 1 # 7 straight
|
||||
cv79 = 3 # 8 two asymmetric circles
|
||||
cv81 = 2 # ~ tilde low
|
||||
cv82 = 2 # * asterisk five-pointed low
|
||||
cv83 = 1 # _ underscore right below baseline
|
||||
cv85 = 1 # ^ uptick high
|
||||
cv86 = 1 # ( parentheses normal slope
|
||||
cv87 = 2 # { braces curly
|
||||
cv88 = 1 # # column straight
|
||||
cv90 = 4 # @ three-fold, tall height
|
||||
cv91 = 2 # $ dollar strike through
|
||||
cv92 = 2 # ¢ cent strike through
|
||||
cv93 = 1 # % percent dots
|
||||
cv94 = 1 # | bar natural slope
|
||||
cv95 = 2 # ≥ equal-or-{higher,lower} slanted
|
||||
cv96 = 1 # ' single quote straight
|
||||
cv97 = 1 # ` grave/backtick straight
|
||||
cv98 = 1 # ? smooth
|
||||
cv99 = 2 # .:; square punctuation marks
|
||||
VXDD = 2 # ijäöü square diacretics
|
||||
|
||||
# Optional; Configure single character's variant for Upright and Oblique; Overrides [design]
|
||||
[buildPlans.iosevka-comfy.variants.upright]
|
||||
cv30 = 1 # e straight
|
||||
cv31 = 16 # f serifless bottom flat top crossbar at x height
|
||||
cv32 = 9 # g single storey flat hook earless cornered top
|
||||
cv36 = 1 # k straight
|
||||
cv38 = 6 # m earless double arch short middle leg
|
||||
cv39 = 3 # n earless straight
|
||||
cv40 = 2 # p earless
|
||||
cv41 = 2 # q earless
|
||||
cv46 = 1 # v straight
|
||||
cv47 = 1 # w straight
|
||||
cv48 = 1 # x straight
|
||||
cv50 = 1 # z straight
|
||||
cv72 = 3 # 1 serified with base
|
||||
cv73 = 1 # 2 straight
|
||||
cv75 = 3 # 4 semi-open contour
|
||||
cv77 = 3 # 6 straight
|
||||
cv80 = 3 # 9 straight
|
||||
cv89 = 2 # & et open top (ampersand)
|
||||
|
||||
# Optional; Configure single character's variant for Italic only; Overrides [design]
|
||||
[buildPlans.iosevka-comfy.variants.italic]
|
||||
cv30 = 2 # e curly
|
||||
cv31 = 14 # f extended flat top bottom hook
|
||||
cv32 = 7 # g single storey flat hook
|
||||
cv36 = 2 # k curly
|
||||
cv38 = 2 # m straight middle shortleg
|
||||
cv39 = 1 # n straight
|
||||
cv40 = 1 # p straight
|
||||
cv41 = 1 # q straight
|
||||
cv46 = 2 # v curly
|
||||
cv47 = 2 # w curly short middle top
|
||||
cv48 = 2 # x curly
|
||||
cv50 = 4 # z curly
|
||||
cv72 = 2 # 1 serified no base
|
||||
cv73 = 2 # 2 curly
|
||||
cv75 = 1 # 4 closed contour crossing
|
||||
cv77 = 1 # 6 closed contour
|
||||
cv80 = 1 # 9 closed contour
|
||||
cv89 = 4 # & et open top toothed (ampersand)
|
||||
|
||||
# End variant section
|
||||
###################################################################################################
|
||||
|
||||
###################################################################################################
|
||||
# Override default building weights
|
||||
# When buildPlans.<plan name>.weights is absent, all weights would built and mapped to
|
||||
# default values.
|
||||
# IMPORTANT : Currently "menu" and "css" property only support numbers between 0 and 1000.
|
||||
# and "shape" properly only supports number between 100 and 900 (inclusive).
|
||||
# If you decide to use custom weights you have to define all the weights you
|
||||
# plan to use otherwise they will not be built.
|
||||
[buildPlans.iosevka-comfy.weights.light]
|
||||
shape = 300
|
||||
menu = 300
|
||||
css = 300
|
||||
|
||||
[buildPlans.iosevka-comfy.weights.semilight]
|
||||
shape = 350
|
||||
menu = 350
|
||||
css = 350
|
||||
|
||||
[buildPlans.iosevka-comfy.weights.regular]
|
||||
shape = 400
|
||||
menu = 400
|
||||
css = 400
|
||||
|
||||
[buildPlans.iosevka-comfy.weights.bold]
|
||||
shape = 700
|
||||
menu = 700
|
||||
css = 700
|
||||
|
||||
[buildPlans.iosevka-comfy.weights.extrabold]
|
||||
shape = 800
|
||||
menu = 800
|
||||
css = 800
|
||||
|
||||
# End weight section
|
||||
###################################################################################################
|
||||
|
||||
###################################################################################################
|
||||
# Override default building slope sets
|
||||
# When this section is absent, all slopes would be built.
|
||||
|
||||
[buildPlans.iosevka-comfy.slopes.upright]
|
||||
angle = 0 # Angle in degrees. Valid range [0, 15]
|
||||
shape = "upright" # Slope grade used for shape selection. `upright` | `oblique` | `italic`
|
||||
menu = "upright" # Slope grade used for naming. `upright` | `oblique` | `italic`
|
||||
css = "normal" # Slope grade used for webfont CSS. `normal` | `oblique` | `italic`
|
||||
|
||||
[buildPlans.iosevka-comfy.slopes.italic]
|
||||
angle = 9.4
|
||||
shape = "italic"
|
||||
menu = "italic"
|
||||
css = "italic"
|
||||
|
||||
# End slope section
|
||||
###################################################################################################
|
||||
|
||||
###################################################################################################
|
||||
# Override default building widths
|
||||
# When buildPlans.<plan name>.widths is absent, all widths would built and mapped to
|
||||
# default values.
|
||||
# IMPORTANT : Currently "shape" property only supports numbers between 434 and 664 (inclusive),
|
||||
# while "menu" only supports integers between 1 and 9 (inclusive).
|
||||
# The "shape" parameter specifies the unit width, measured in 1/1000 em. The glyphs'
|
||||
# width are equal to, or a simple multiple of the unit width.
|
||||
# If you decide to use custom widths you have to define all the widths you plan to use,
|
||||
# otherwise they will not be built.
|
||||
|
||||
# [buildPlans.iosevka-comfy.widths.condensed]
|
||||
# shape = 485
|
||||
# menu = 3
|
||||
# css = "condensed"
|
||||
|
||||
[buildPlans.iosevka-comfy.widths.normal]
|
||||
shape = 525 # Unit Width, measured in 1/1000 em.
|
||||
menu = 5 # Width grade for the font's names.
|
||||
css = "normal" # "font-stretch' property of webfont CSS.
|
||||
|
||||
# [buildPlans.iosevka-comfy.widths.expanded]
|
||||
# shape = 600
|
||||
# menu = 7
|
||||
# css = "expanded"
|
||||
|
||||
# End width section
|
||||
###################################################################################################
|
||||
|
||||
###################################################################################################
|
||||
# Metric overrides
|
||||
# Certain metrics like line height (leading) could be overridden in your build plan file.
|
||||
# Edit the values to change the metrics. Remove this section when overriding is not needed.
|
||||
|
||||
[buildPlans.iosevka-comfy.metric-override]
|
||||
leading = 1100
|
||||
|
||||
# End metric override section
|
||||
###################################################################################################
|
||||
|
||||
|
||||
# Iosevka Comfy variants
|
||||
# ======================
|
||||
# Same glyph overrides and metrics, except for the spacing.
|
||||
|
||||
|
||||
# Fixed spacing (no ligatures)
|
||||
# ----------------------------
|
||||
[buildPlans.iosevka-comfy-fixed]
|
||||
family = "Iosevka Comfy Fixed"
|
||||
spacing = "fixed"
|
||||
serifs = "sans"
|
||||
|
||||
# It seems we can inherit variants, but not weights, slopes, widths,
|
||||
# metric-override...
|
||||
[buildPlans.iosevka-comfy-fixed.variants]
|
||||
inherits = "buildPlans.iosevka-comfy"
|
||||
|
||||
[buildPlans.iosevka-comfy-fixed.weights.light]
|
||||
shape = 300
|
||||
menu = 300
|
||||
css = 300
|
||||
|
||||
[buildPlans.iosevka-comfy-fixed.weights.semilight]
|
||||
shape = 350
|
||||
menu = 350
|
||||
css = 350
|
||||
|
||||
[buildPlans.iosevka-comfy-fixed.weights.regular]
|
||||
shape = 400
|
||||
menu = 400
|
||||
css = 400
|
||||
|
||||
[buildPlans.iosevka-comfy-fixed.weights.bold]
|
||||
shape = 700
|
||||
menu = 700
|
||||
css = 700
|
||||
|
||||
[buildPlans.iosevka-comfy-fixed.weights.extrabold]
|
||||
shape = 800
|
||||
menu = 800
|
||||
css = 800
|
||||
|
||||
[buildPlans.iosevka-comfy-fixed.slopes.upright]
|
||||
angle = 0
|
||||
shape = "upright"
|
||||
menu = "upright"
|
||||
css = "normal"
|
||||
|
||||
[buildPlans.iosevka-comfy-fixed.slopes.italic]
|
||||
angle = 9.4
|
||||
shape = "italic"
|
||||
menu = "italic"
|
||||
css = "italic"
|
||||
|
||||
[buildPlans.iosevka-comfy-fixed.widths.normal]
|
||||
shape = 525
|
||||
menu = 5
|
||||
css = "normal"
|
||||
|
||||
[buildPlans.iosevka-comfy-fixed.metric-override]
|
||||
leading = 1100
|
||||
|
||||
|
||||
|
||||
# Duo spacing (quasi-proportional)
|
||||
# --------------------------------
|
||||
[buildPlans.iosevka-comfy-duo]
|
||||
family = "Iosevka Comfy Duo"
|
||||
spacing = "quasi-proportional"
|
||||
serifs = "sans"
|
||||
|
||||
# It seems we can inherit variants, but not weights, slopes, widths,
|
||||
# metric-override...
|
||||
[buildPlans.iosevka-comfy-duo.variants]
|
||||
inherits = "buildPlans.iosevka-comfy"
|
||||
|
||||
# The '0' has a forward slash that cuts diagonally through the middle of
|
||||
# the circle, connecting the bottom left part to the top right of the
|
||||
# oval shape. Whereas the narrow variants have a dashed forward slash
|
||||
# which does not connect the two sides as it is positioned inside the
|
||||
# oval shape.
|
||||
[buildPlans.iosevka-comfy-duo.variants.design]
|
||||
cv71 = 9 # 0 oval forward slash
|
||||
|
||||
# The 'm' character has three legs of equal length, insetad of a shorter
|
||||
# middle leg. The short middle leg in the narrow variants is necessary
|
||||
# for legibility, especially at small point sizes (otherwise the
|
||||
# character's legs visually blend into what appears to be a solid
|
||||
# block).
|
||||
[buildPlans.iosevka-comfy-duo.variants.upright]
|
||||
cv38 = 5 # m earless normal middle leg
|
||||
|
||||
[buildPlans.iosevka-comfy-duo.variants.italic]
|
||||
cv38 = 1 # m straight normal middle leg
|
||||
|
||||
[buildPlans.iosevka-comfy-duo.weights.light]
|
||||
shape = 300
|
||||
menu = 300
|
||||
css = 300
|
||||
|
||||
[buildPlans.iosevka-comfy-duo.weights.semilight]
|
||||
shape = 350
|
||||
menu = 350
|
||||
css = 350
|
||||
|
||||
[buildPlans.iosevka-comfy-duo.weights.regular]
|
||||
shape = 400
|
||||
menu = 400
|
||||
css = 400
|
||||
|
||||
[buildPlans.iosevka-comfy-duo.weights.bold]
|
||||
shape = 700
|
||||
menu = 700
|
||||
css = 700
|
||||
|
||||
[buildPlans.iosevka-comfy-duo.weights.extrabold]
|
||||
shape = 800
|
||||
menu = 800
|
||||
css = 800
|
||||
|
||||
[buildPlans.iosevka-comfy-duo.slopes.upright]
|
||||
angle = 0
|
||||
shape = "upright"
|
||||
menu = "upright"
|
||||
css = "normal"
|
||||
|
||||
[buildPlans.iosevka-comfy-duo.slopes.italic]
|
||||
angle = 9.4
|
||||
shape = "italic"
|
||||
menu = "italic"
|
||||
css = "italic"
|
||||
|
||||
[buildPlans.iosevka-comfy-duo.widths.normal]
|
||||
shape = 525
|
||||
menu = 5
|
||||
css = "normal"
|
||||
|
||||
[buildPlans.iosevka-comfy-duo.metric-override]
|
||||
leading = 1100
|
||||
|
||||
|
||||
|
||||
# Like iosevka-comfy but expanded
|
||||
# -------------------------------
|
||||
[buildPlans.iosevka-comfy-wide]
|
||||
family = "Iosevka Comfy Wide"
|
||||
spacing = "normal"
|
||||
serifs = "sans"
|
||||
|
||||
# It seems we can inherit variants, but not weights, slopes, widths,
|
||||
# metric-override...
|
||||
[buildPlans.iosevka-comfy-wide.variants]
|
||||
inherits = "buildPlans.iosevka-comfy"
|
||||
|
||||
# The '0' has a forward slash that cuts diagonally through the middle of
|
||||
# the circle, connecting the bottom left part to the top right of the
|
||||
# oval shape. Whereas the narrow variants have a dashed forward slash
|
||||
# which does not connect the two sides as it is positioned inside the
|
||||
# oval shape.
|
||||
[buildPlans.iosevka-comfy-wide.variants.design]
|
||||
cv71 = 9 # 0 oval forward slash
|
||||
|
||||
# The 'm' character has three legs of equal length, insetad of a shorter
|
||||
# middle leg. The short middle leg in the narrow variants is necessary
|
||||
# for legibility, especially at small point sizes (otherwise the
|
||||
# character's legs visually blend into what appears to be a solid
|
||||
# block).
|
||||
[buildPlans.iosevka-comfy-wide.variants.upright]
|
||||
cv38 = 5 # m earless normal middle leg
|
||||
|
||||
[buildPlans.iosevka-comfy-wide.variants.italic]
|
||||
cv38 = 1 # m straight normal middle leg
|
||||
|
||||
[buildPlans.iosevka-comfy-wide.weights.light]
|
||||
shape = 300
|
||||
menu = 300
|
||||
css = 300
|
||||
|
||||
[buildPlans.iosevka-comfy-wide.weights.semilight]
|
||||
shape = 350
|
||||
menu = 350
|
||||
css = 350
|
||||
|
||||
[buildPlans.iosevka-comfy-wide.weights.regular]
|
||||
shape = 400
|
||||
menu = 400
|
||||
css = 400
|
||||
|
||||
[buildPlans.iosevka-comfy-wide.weights.bold]
|
||||
shape = 700
|
||||
menu = 700
|
||||
css = 700
|
||||
|
||||
[buildPlans.iosevka-comfy-wide.weights.extrabold]
|
||||
shape = 800
|
||||
menu = 800
|
||||
css = 800
|
||||
|
||||
[buildPlans.iosevka-comfy-wide.slopes.upright]
|
||||
angle = 0
|
||||
shape = "upright"
|
||||
menu = "upright"
|
||||
css = "normal"
|
||||
|
||||
[buildPlans.iosevka-comfy-wide.slopes.italic]
|
||||
angle = 9.4
|
||||
shape = "italic"
|
||||
menu = "italic"
|
||||
css = "italic"
|
||||
|
||||
# For the default width, check buildPlans.iosevka-comfy.widths.normal
|
||||
[buildPlans.iosevka-comfy-wide.widths.normal]
|
||||
shape = 625
|
||||
menu = 7
|
||||
css = "normal"
|
||||
|
||||
[buildPlans.iosevka-comfy-wide.metric-override]
|
||||
leading = 1100
|
||||
|
||||
|
||||
|
||||
# Like iosevka-comfy-wide but fixed monospace (no ligatures)
|
||||
# ----------------------------------------------------------
|
||||
[buildPlans.iosevka-comfy-wide-fixed]
|
||||
family = "Iosevka Comfy Wide Fixed"
|
||||
spacing = "fixed"
|
||||
serifs = "sans"
|
||||
|
||||
# It seems we can inherit variants, but not weights, slopes, widths,
|
||||
# metric-override...
|
||||
[buildPlans.iosevka-comfy-wide-fixed.variants]
|
||||
inherits = "buildPlans.iosevka-comfy-wide"
|
||||
|
||||
[buildPlans.iosevka-comfy-wide-fixed.weights.light]
|
||||
shape = 300
|
||||
menu = 300
|
||||
css = 300
|
||||
|
||||
[buildPlans.iosevka-comfy-wide-fixed.weights.semilight]
|
||||
shape = 350
|
||||
menu = 350
|
||||
css = 350
|
||||
|
||||
[buildPlans.iosevka-comfy-wide-fixed.weights.regular]
|
||||
shape = 400
|
||||
menu = 400
|
||||
css = 400
|
||||
|
||||
[buildPlans.iosevka-comfy-wide-fixed.weights.bold]
|
||||
shape = 700
|
||||
menu = 700
|
||||
css = 700
|
||||
|
||||
[buildPlans.iosevka-comfy-wide-fixed.weights.extrabold]
|
||||
shape = 800
|
||||
menu = 800
|
||||
css = 800
|
||||
|
||||
[buildPlans.iosevka-comfy-wide-fixed.slopes.upright]
|
||||
angle = 0
|
||||
shape = "upright"
|
||||
menu = "upright"
|
||||
css = "normal"
|
||||
|
||||
[buildPlans.iosevka-comfy-wide-fixed.slopes.italic]
|
||||
angle = 9.4
|
||||
shape = "italic"
|
||||
menu = "italic"
|
||||
css = "italic"
|
||||
|
||||
# For the default width, check buildPlans.iosevka-comfy.widths.normal
|
||||
[buildPlans.iosevka-comfy-wide-fixed.widths.normal]
|
||||
shape = 625
|
||||
menu = 7
|
||||
css = "normal"
|
||||
|
||||
[buildPlans.iosevka-comfy-wide-fixed.metric-override]
|
||||
leading = 1100
|
||||
@ -1,14 +1,17 @@
|
||||
{stdenv, lib, nodejs, nodePackages, remarshal, ttfautohint-nox, fetchurl}:
|
||||
{ callPackage, lib, fetchFromGitHub }:
|
||||
|
||||
let
|
||||
sets = [ "comfy" "comfy-fixed" "comfy-duo" "comfy-wide" "comfy-wide-fixed" ];
|
||||
privateBuildPlan = builtins.readFile ./comfy-private-build-plans.toml;
|
||||
version = "0.3.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "protesilaos";
|
||||
repo = "iosevka-comfy";
|
||||
rev = version;
|
||||
sha256 = "sha256-SMy3Kqve65ZU13lf1vZQR61mH7gcl1DvIZt3yD6tIf4=";
|
||||
};
|
||||
privateBuildPlan = src.outPath + "/private-build-plans.toml";
|
||||
overrideAttrs = (attrs: {
|
||||
version = "0.2.1";
|
||||
|
||||
passthru = {
|
||||
updateScript = ./update-comfy.sh;
|
||||
};
|
||||
inherit version;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/protesilaos/iosevka-comfy";
|
||||
@ -22,8 +25,8 @@ let
|
||||
maintainers = [ maintainers.DamienCassou ];
|
||||
};
|
||||
});
|
||||
makeIosevkaFont = set: (import ./default.nix {
|
||||
inherit stdenv lib nodejs nodePackages remarshal ttfautohint-nox set privateBuildPlan;
|
||||
makeIosevkaFont = set: (callPackage ./. {
|
||||
inherit set privateBuildPlan;
|
||||
}).overrideAttrs overrideAttrs;
|
||||
in
|
||||
builtins.listToAttrs (builtins.map (set: {name=set; value=makeIosevkaFont set;}) sets)
|
||||
|
||||
@ -80,16 +80,23 @@ stdenv.mkDerivation rec {
|
||||
else privateBuildPlan;
|
||||
|
||||
inherit extraParameters;
|
||||
passAsFile = [ "buildPlan" "extraParameters" ];
|
||||
passAsFile = [
|
||||
"extraParameters"
|
||||
] ++ lib.optional (! (builtins.isString privateBuildPlan && lib.hasPrefix builtins.storeDir privateBuildPlan)) [
|
||||
"buildPlan"
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
${lib.optionalString (builtins.isAttrs privateBuildPlan) ''
|
||||
remarshal -i "$buildPlanPath" -o private-build-plans.toml -if json -of toml
|
||||
''}
|
||||
${lib.optionalString (builtins.isString privateBuildPlan) ''
|
||||
${lib.optionalString (builtins.isString privateBuildPlan && (!lib.hasPrefix builtins.storeDir privateBuildPlan)) ''
|
||||
cp "$buildPlanPath" private-build-plans.toml
|
||||
''}
|
||||
${lib.optionalString (builtins.isString privateBuildPlan && (lib.hasPrefix builtins.storeDir privateBuildPlan)) ''
|
||||
cp "$buildPlan" private-build-plans.toml
|
||||
''}
|
||||
${lib.optionalString (extraParameters != null) ''
|
||||
echo -e "\n" >> params/parameters.toml
|
||||
cat "$extraParametersPath" >> params/parameters.toml
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p curl jq
|
||||
|
||||
set -euo pipefail
|
||||
cd "$(dirname "${BASH_SOURCE[0]}")"
|
||||
|
||||
repo=protesilaos/iosevka-comfy
|
||||
oldVersion=$(nix-instantiate --eval -E 'with import ../../../.. {}; lib.getVersion iosevka-comfy.comfy' | tr -d \")
|
||||
version=$(curl -s https://api.github.com/repos/$repo/tags | jq '.[0].name' | tr -d \")
|
||||
buildPlansUrl=https://raw.githubusercontent.com/$repo/$(echo $version)/private-build-plans.toml
|
||||
|
||||
if test "$oldVersion" = "$version"; then
|
||||
echo "New version same as old version, nothing to do." >&2
|
||||
exit 0
|
||||
fi
|
||||
|
||||
sed --in-place "s/$oldVersion/$version/" comfy.nix
|
||||
|
||||
cat > ./comfy-private-build-plans.toml <<EOF
|
||||
# The file below is copy/pasted from
|
||||
# $buildPlansUrl. It
|
||||
# seems like ofborg will prevent me from using fetchurl to download
|
||||
# this file automatically.
|
||||
EOF
|
||||
|
||||
wget --quiet --output-document=- "$buildPlansUrl" >> ./comfy-private-build-plans.toml
|
||||
|
||||
sets=$(grep '^\[buildPlans\.iosevka-comfy[^.]*\]' comfy-private-build-plans.toml \
|
||||
| sed 's/^.*iosevka-\(comfy[^]]*\)].*$/"\1" /' \
|
||||
| tr -d '\n' \
|
||||
| sort)
|
||||
|
||||
sed --in-place "s/sets = .*$/sets = [ $sets];/" comfy.nix
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, fetchzip }:
|
||||
|
||||
let
|
||||
version = "1.5.3";
|
||||
version = "1.5.4";
|
||||
in
|
||||
fetchzip {
|
||||
name = "victor-mono-${version}";
|
||||
@ -25,7 +25,7 @@ fetchzip {
|
||||
rm -r $out/{EOT,WOFF,WOFF2}
|
||||
'';
|
||||
|
||||
sha256 = "sha256-3TGpUDBJ24NEJb00oaJAHEbjC58bSthohzqM1klVDGA=";
|
||||
sha256 = "sha256-1si0d2lpuXaDcSc3giVMMMbZc/eKbHKU3wmwfYHZ8o0=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Free programming font with cursive italics and ligatures";
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lfc";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/lf-lang/lingua-franca/releases/download/v${version}/lfc_${version}.zip";
|
||||
sha256 = "rBx7UnPLufZBO7lG0In5upHqYCyRtI4kQv0V83CZHew=";
|
||||
sha256 = "sha256-jSINlwHfSOPbti3LJTXpSk6lcUtwKfz7CMLtq2OuNns=";
|
||||
};
|
||||
|
||||
buildInputs = [ jdk17_headless ];
|
||||
|
||||
@ -112,7 +112,7 @@ in stdenv.mkDerivation {
|
||||
Certified builds of OpenJDK that can be deployed across multiple
|
||||
operating systems, containers, hypervisors and Cloud platforms.
|
||||
'';
|
||||
maintainers = with maintainers; [ fpletz ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
mainProgram = "java";
|
||||
};
|
||||
|
||||
@ -117,7 +117,7 @@ in stdenv.mkDerivation {
|
||||
Certified builds of OpenJDK that can be deployed across multiple
|
||||
operating systems, containers, hypervisors and Cloud platforms.
|
||||
'';
|
||||
maintainers = with maintainers; [ fpletz ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||
mainProgram = "java";
|
||||
};
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, curl, hdf5, netcdf
|
||||
{ lib, stdenv, fetchurl, curl, hdf5, netcdf, eccodes
|
||||
, # build, install and link to a CDI library [default=no]
|
||||
enable_cdi_lib ? false
|
||||
, # build a completely statically linked CDO binary
|
||||
@ -9,22 +9,24 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cdo";
|
||||
version = "1.9.10";
|
||||
version = "2.0.5";
|
||||
|
||||
# Dependencies
|
||||
buildInputs = [ curl netcdf hdf5 ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://code.mpimet.mpg.de/attachments/download/24638/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-zDnIm7tIHXs5RaBsVqhJIEcjX0asNjxPDZgPzN3mZ34=";
|
||||
url = "https://code.mpimet.mpg.de/attachments/download/26823/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-7e678cOxofDGQtrmvIx2JODFS6vkYQZNxcfaykpbDc4=";
|
||||
};
|
||||
|
||||
# Configure phase
|
||||
configureFlags = [
|
||||
"--with-netcdf=${netcdf}" "--with-hdf5=${hdf5}"]
|
||||
++ lib.optional (enable_cdi_lib) "--enable-cdi-lib"
|
||||
++ lib.optional (enable_all_static) "--enable-all-static"
|
||||
++ lib.optional (enable_cxx) "--enable-cxx";
|
||||
"--with-netcdf=${netcdf}"
|
||||
"--with-hdf5=${hdf5}"
|
||||
"--with-eccodes=${eccodes}"
|
||||
]
|
||||
++ lib.optional enable_cdi_lib "--enable-cdi-lib"
|
||||
++ lib.optional enable_all_static "--enable-all-static"
|
||||
++ lib.optional enable_cxx "--enable-cxx";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Collection of command line Operators to manipulate and analyse Climate and NWP model Data";
|
||||
|
||||
@ -87,6 +87,8 @@ stdenv.mkDerivation rec {
|
||||
substituteInPlace ../tests/bash_tests/testcases.py \
|
||||
--replace "def io_test(self):" "def io_disabled(self):"
|
||||
''}
|
||||
'' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) ''
|
||||
export LC_ALL=C
|
||||
'';
|
||||
|
||||
# With CMake we have to enable samples or there won't be
|
||||
@ -120,6 +122,6 @@ stdenv.mkDerivation rec {
|
||||
description = "A library and command-line utility to manage image metadata";
|
||||
platforms = platforms.all;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [ ];
|
||||
maintainers = with maintainers; [ wegank ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -124,7 +124,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
homepage = "https://gnutls.org/";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ eelco fpletz ];
|
||||
maintainers = with maintainers; [ eelco ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "C-language implementation of Javascript Object Signing and Encryption";
|
||||
homepage = "https://github.com/latchset/jose";
|
||||
maintainers = with lib.maintainers; [ fpletz ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
license = lib.licenses.asl20;
|
||||
};
|
||||
}
|
||||
|
||||
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
|
||||
description = "A high quality MPEG Audio Layer III (MP3) encoder";
|
||||
homepage = "http://lame.sourceforge.net";
|
||||
license = licenses.lgpl2;
|
||||
maintainers = with maintainers; [ codyopel fpletz ];
|
||||
maintainers = with maintainers; [ codyopel ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Portable cryptographic and TLS library, formerly known as PolarSSL";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ fpletz ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rapidfuzz-cpp";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maxbachmann";
|
||||
repo = "rapidfuzz-cpp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ltxOn8thAiYgi5rG6xYFSnPl20Uyf4mWs1Rcv3lP++E=";
|
||||
hash = "sha256-ogj8eFkiDtjFcBb3Yip909gKBIeALsoH3LnRIjQmLMA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -13,6 +13,8 @@
|
||||
# tests
|
||||
, mock
|
||||
, pytestCheckHook
|
||||
, lingua
|
||||
, chameleon
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -37,8 +39,10 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
chameleon
|
||||
lingua
|
||||
mock
|
||||
pytestCheckHook
|
||||
] ++ passthru.optional-dependencies.babel;
|
||||
|
||||
disabledTests = lib.optionals isPyPy [
|
||||
@ -51,11 +55,6 @@ buildPythonPackage rec {
|
||||
"test_bytestring_passthru"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# lingua dependency is not packaged
|
||||
"test/ext/test_linguaplugin.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Super-fast templating language";
|
||||
homepage = "https://www.makotemplates.org/";
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "censys";
|
||||
version = "2.1.6";
|
||||
version = "2.1.7";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "censys";
|
||||
repo = "censys-python";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jCQWjGx35erhkj1gjBjdGytvKNarrTODH6fJpFMQqLE=";
|
||||
hash = "sha256-1GJef+6Aqah9W9yPwqD8QCh0sNn/X9UwlzmsCk51QMY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "itemadapter";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Px9g69bJGwAiKCDzi/USaqSaj7bkZ9NR8DZEIflToV0=";
|
||||
hash = "sha256-MsBh7Jq0fVND6AEbJocw9I/2MqAZK5UpLRGLGNvXaHo=";
|
||||
};
|
||||
|
||||
# Infinite recursion with Scrapy
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jarowinkler";
|
||||
version = "1.1.2";
|
||||
version = "1.2.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "maxbachmann";
|
||||
repo = "JaroWinkler";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-yaJcmHkLxiRqrBiIel97mFxpav3N5QQSM+L9jA1kn5A=";
|
||||
hash = "sha256-JR6nCLO6oUxpGKjnrrVAOLbrIALSNKkll53+3p4bb1g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
35
pkgs/development/python-modules/lingua/default.nix
Normal file
35
pkgs/development/python-modules/lingua/default.nix
Normal file
@ -0,0 +1,35 @@
|
||||
{ lib
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, flit-core
|
||||
, polib
|
||||
, click }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lingua";
|
||||
version = "4.15.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-DhqUZ0HbKIpANhrQT/OP4EvwgZg0uKu4TEtTX+2bpO8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
flit-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
click
|
||||
polib
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "lingua" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Translation toolset";
|
||||
homepage = "https://github.com/wichert/lingua";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ np ];
|
||||
};
|
||||
}
|
||||
@ -121,6 +121,6 @@ buildPythonPackage rec {
|
||||
description = "Man-in-the-middle proxy";
|
||||
homepage = "https://mitmproxy.org/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fpletz kamilchm ];
|
||||
maintainers = with maintainers; [ kamilchm SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "parts";
|
||||
version = "1.5.1";
|
||||
version = "1.5.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-H6nyn2TY1Ga65CyhxOSlgcDTTC1UJi8I/4damM6I7fM=";
|
||||
hash = "sha256-gOPDqXF05bQcG0Kv0+akBrikRr/CfHB9/tM/TJDPHdM=";
|
||||
};
|
||||
|
||||
# Project has no tests
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, isPy3k
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, setuptools-scm
|
||||
, pydantic
|
||||
@ -13,15 +13,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pygls";
|
||||
version = "0.12";
|
||||
version = "0.12.1";
|
||||
format = "setuptools";
|
||||
disabled = !isPy3k;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openlawlibrary";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PEfGxOUsiZ5WLmoQkOP2RRWJlIKi+42lOu55C3C+k8A=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-L2KTNiI+I+r2fF88B1NSunowokrDzGCw3PXbxekg/oE=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
@ -32,12 +33,6 @@ buildPythonPackage rec {
|
||||
toml
|
||||
typeguard
|
||||
];
|
||||
# We don't know why an early version of pydantic is required, see:
|
||||
# https://github.com/openlawlibrary/pygls/issues/221
|
||||
preBuild = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "pydantic>=1.7,<1.9" "pydantic"
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
mock
|
||||
|
||||
@ -1,93 +0,0 @@
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, pythonAtLeast, pythonOlder, isPy27
|
||||
, backports_functools_lru_cache ? null, configparser ? null, futures ? null, future, jedi, pluggy, python-jsonrpc-server, flake8
|
||||
, pytestCheckHook, mock, pytest-cov, coverage, setuptools, ujson, flaky
|
||||
, # Allow building a limited set of providers, e.g. ["pycodestyle"].
|
||||
providers ? ["*"]
|
||||
# The following packages are optional and
|
||||
# can be overwritten with null as your liking.
|
||||
, autopep8 ? null
|
||||
, mccabe ? null
|
||||
, pycodestyle ? null
|
||||
, pydocstyle ? null
|
||||
, pyflakes ? null
|
||||
, pylint ? null
|
||||
, rope ? null
|
||||
, yapf ? null
|
||||
}:
|
||||
|
||||
let
|
||||
withProvider = p: builtins.elem "*" providers || builtins.elem p providers;
|
||||
in
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-language-server";
|
||||
version = "0.36.2";
|
||||
# https://github.com/palantir/python-language-server/issues/896#issuecomment-752790868
|
||||
disabled = pythonAtLeast "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "palantir";
|
||||
repo = "python-language-server";
|
||||
rev = version;
|
||||
sha256 = "07x6jr4z20jxn03bxblwc8vk0ywha492cgwfhj7q97nb5cm7kx0q";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Reading the changelog I don't expect an API break in pycodestyle and pyflakes
|
||||
substituteInPlace setup.py \
|
||||
--replace "pycodestyle>=2.6.0,<2.7.0" "pycodestyle>=2.6.0,<2.8.0" \
|
||||
--replace "jedi>=0.17.2,<0.18.0" "jedi>=0.17.2,<0.19.0" \
|
||||
--replace "pyflakes>=2.2.0,<2.3.0" "pyflakes>=2.2.0,<2.4.0"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server ujson ]
|
||||
++ lib.optional (withProvider "autopep8") autopep8
|
||||
++ lib.optional (withProvider "mccabe") mccabe
|
||||
++ lib.optional (withProvider "pycodestyle") pycodestyle
|
||||
++ lib.optional (withProvider "pydocstyle") pydocstyle
|
||||
++ lib.optional (withProvider "pyflakes") pyflakes
|
||||
++ lib.optional (withProvider "pylint") pylint
|
||||
++ lib.optional (withProvider "rope") rope
|
||||
++ lib.optional (withProvider "yapf") yapf
|
||||
++ lib.optional isPy27 configparser
|
||||
++ lib.optionals (pythonOlder "3.2") [ backports_functools_lru_cache futures ];
|
||||
|
||||
# The tests require all the providers, disable otherwise.
|
||||
doCheck = providers == ["*"];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook mock pytest-cov coverage flaky
|
||||
# Do not propagate flake8 or it will enable pyflakes implicitly
|
||||
flake8
|
||||
# rope is technically a dependency, but we don't add it by default since we
|
||||
# already have jedi, which is the preferred option
|
||||
rope
|
||||
];
|
||||
|
||||
dontUseSetuptoolsCheck = true;
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$TEMPDIR
|
||||
'';
|
||||
|
||||
# Tests failed since update to 0.31.8
|
||||
disabledTests = [
|
||||
"test_pyqt_completion"
|
||||
"test_numpy_completions"
|
||||
"test_pandas_completions"
|
||||
"test_matplotlib_completions"
|
||||
"test_snippet_parsing"
|
||||
"test_numpy_hover"
|
||||
"test_symbols"
|
||||
] ++ lib.optional isPy27 "test_flake8_lint";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/palantir/python-language-server";
|
||||
description = "An implementation of the Language Server Protocol for Python";
|
||||
license = licenses.mit;
|
||||
maintainers = [ ];
|
||||
# no longer maintained
|
||||
# see https://github.com/palantir/python-language-server/pull/918#issuecomment-817361554
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
@ -23,6 +23,7 @@
|
||||
, setuptools-scm
|
||||
, stdenv
|
||||
, ujson
|
||||
, whatthepatch
|
||||
, yapf
|
||||
, withAutopep8 ? true
|
||||
, withFlake8 ? true
|
||||
@ -50,7 +51,7 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \
|
||||
--replace "--cov pylsp --cov test" "" \
|
||||
--replace "mccabe>=0.6.0,<0.7.0" "mccabe"
|
||||
@ -75,7 +76,7 @@ buildPythonPackage rec {
|
||||
++ lib.optional withPyflakes pyflakes
|
||||
++ lib.optional withPylint pylint
|
||||
++ lib.optional withRope rope
|
||||
++ lib.optional withYapf yapf;
|
||||
++ lib.optionals withYapf [ whatthepatch yapf ];
|
||||
|
||||
checkInputs = [
|
||||
flaky
|
||||
@ -87,7 +88,9 @@ buildPythonPackage rec {
|
||||
# pyqt5 is broken on aarch64-darwin
|
||||
++ lib.optionals (!stdenv.isDarwin || !stdenv.isAarch64) [ pyqt5 ];
|
||||
|
||||
disabledTests = lib.optional (!withPycodestyle) "test_workspace_loads_pycodestyle_config"
|
||||
disabledTests = [
|
||||
"test_numpy_completions" # https://github.com/python-lsp/python-lsp-server/issues/243
|
||||
] ++ lib.optional (!withPycodestyle) "test_workspace_loads_pycodestyle_config"
|
||||
# pyqt5 is broken on aarch64-darwin
|
||||
++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) "test_pyqt_completion";
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rapidfuzz";
|
||||
version = "2.1.3";
|
||||
version = "2.4.2";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
||||
owner = "maxbachmann";
|
||||
repo = "RapidFuzz";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-vK/56+5R6SgDz9DT92PzvDn8cSxSyUiCsV2EOcsGWTA=";
|
||||
hash = "sha256-nLYxPGK+7ThvpsmvF2zlo+DqykY8bW1j2si3Lnyq7oo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -47,7 +47,8 @@ buildPythonPackage rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'types-docutils = ">=0.18, <0.19"' 'types-docutils = ">=0.18"'
|
||||
--replace 'types-docutils = ">=0.18, <0.19"' 'types-docutils = ">=0.18"' \
|
||||
--replace 'docutils = ">=0.7, <0.19"' 'docutils = ">=0.7"'
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "s3-credentials";
|
||||
version = "0.12";
|
||||
version = "0.12.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "simonw";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-NDUm/RhlmuZwB3fwwom2Y9PcF6J4+G29WHE7lqdDP3Y=";
|
||||
hash = "sha256-w0pwQidSAh/CQPVbv4UocbbETyyOT/rcNFE1ixYz4lY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
30
pkgs/development/python-modules/whatthepatch/default.nix
Normal file
30
pkgs/development/python-modules/whatthepatch/default.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "whatthepatch";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cscorley";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-0l/Ebq7Js9sKFJ/RzkQ1aWEDCxt+COVd2qVnLSWwFx0=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "whatthepatch" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for both parsing and applying patch files";
|
||||
homepage = "https://github.com/cscorley/whatthepatch";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jyooru ];
|
||||
};
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/tests/test_server.py b/tests/test_server.py
|
||||
index c0777f5..1184fb3 100644
|
||||
--- a/tests/test_server.py
|
||||
+++ b/tests/test_server.py
|
||||
@@ -11,7 +11,7 @@ from pygls.types import (CompletionContext, CompletionParams,
|
||||
InitializeParams, Position, TextDocumentIdentifier,
|
||||
TextDocumentItem, TextDocumentPositionParams)
|
||||
|
||||
-CALL_TIMEOUT = 2
|
||||
+CALL_TIMEOUT = None
|
||||
|
||||
|
||||
def _init(client: LanguageServer, root: Path):
|
||||
@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://jenkins-ci.org";
|
||||
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ coconnor fpletz earldouglas nequissimus ];
|
||||
maintainers = with maintainers; [ coconnor earldouglas nequissimus ];
|
||||
mainProgram = "jenkins-cli";
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
||||
@ -1,5 +1,22 @@
|
||||
{ lib, stdenv, fetchFromGitHub, pandoc, man }:
|
||||
stdenv.mkDerivation rec {
|
||||
{ lib
|
||||
, resholve
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, bash
|
||||
, coreutils
|
||||
, git
|
||||
, gnugrep
|
||||
, gawk
|
||||
, curl
|
||||
, hostname
|
||||
, gnused
|
||||
, findutils
|
||||
, lftp
|
||||
, pandoc
|
||||
, man
|
||||
}:
|
||||
|
||||
resholve.mkDerivation rec {
|
||||
pname = "git-ftp";
|
||||
version = "1.6.0";
|
||||
src = fetchFromGitHub {
|
||||
@ -11,11 +28,66 @@ stdenv.mkDerivation rec {
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
# fix bug/typo; PRed upstream @
|
||||
# https://github.com/git-ftp/git-ftp/pull/628
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-function-invocation-typo.patch";
|
||||
url = "https://github.com/git-ftp/git-ftp/commit/cddf7cbba80e710758f6aac0ec0d77552ea8cd75.patch";
|
||||
sha256 = "sha256-2B0QaMJi78Bg3bA1jp41aiyql1/LCryoaDs7+xmS1HY=";
|
||||
})
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
make install-all prefix=$out
|
||||
'';
|
||||
|
||||
buildInputs = [pandoc man];
|
||||
nativeBuildInputs = [ pandoc man ];
|
||||
|
||||
solutions = {
|
||||
git-ftp = {
|
||||
scripts = [ "bin/git-ftp" ];
|
||||
interpreter = "${bash}/bin/bash";
|
||||
inputs = [
|
||||
coreutils
|
||||
git
|
||||
gnugrep
|
||||
gawk
|
||||
curl
|
||||
hostname
|
||||
gnused
|
||||
findutils
|
||||
lftp
|
||||
];
|
||||
fake = {
|
||||
# don't resolve impure system macOS security
|
||||
# caution: will still be fragile if PATH is bad
|
||||
# TODO: fixable once we figure out how to handle
|
||||
# this entire class of problem...
|
||||
"external" = [ "security" ];
|
||||
};
|
||||
keep = {
|
||||
# looks like run-time user/env/git-config controlled
|
||||
"$GIT_PAGER" = true;
|
||||
"$hook" = true; # presumably git hooks given context
|
||||
};
|
||||
execer = [
|
||||
# TODO: rm when binlore/resholve handle git; manually
|
||||
# checked and see no obvious subexec for now
|
||||
"cannot:${git}/bin/git"
|
||||
/*
|
||||
Mild uncertainty here. There *are* commandlikes in
|
||||
the arguments (especially wait & cd), but I think they are
|
||||
fine as-is, because I'm reading them as:
|
||||
1. ftp commands
|
||||
2. running on the remote anyways
|
||||
|
||||
See https://github.com/git-ftp/git-ftp/blob/057f7d8e9f00ffc5a8c6ceaa4be30af2939df41a/git-ftp#L1214-L1221
|
||||
*/
|
||||
"cannot:${lftp}/bin/lftp"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Git powered FTP client written as shell script";
|
||||
|
||||
@ -21,6 +21,6 @@ buildGoModule rec {
|
||||
homepage = "https://github.com/jesseduffield/lazygit";
|
||||
changelog = "https://github.com/jesseduffield/lazygit/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fpletz equirosa Br1ght0ne ];
|
||||
maintainers = with maintainers; [ equirosa Br1ght0ne ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
, buildPythonApplication
|
||||
, fetchFromGitHub
|
||||
, poetry
|
||||
, cmake-format
|
||||
, pygls
|
||||
, pyparsing
|
||||
, cmake
|
||||
@ -11,19 +12,22 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "cmake-language-server";
|
||||
version = "0.1.4";
|
||||
version = "0.1.5";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "regen100";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FOyyXSgoFpX4mOHFyZtVW618M1Xs7k+IioJzm1sdkKY=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-4GchuxArSJKnl28ckefJgbqxyf1fOU0DUj8R50upTcQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Test timeouts occasionally cause the build to fail
|
||||
./disable-test-timeouts.patch
|
||||
|
||||
# cmake-language-server depends on pygls 0.11, but still works with 0.12
|
||||
./use-latest-pygls.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@ -31,10 +35,23 @@ buildPythonApplication rec {
|
||||
--replace 'pyparsing = "^2.4"' 'pyparsing = "^3.0.6"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ poetry ];
|
||||
propagatedBuildInputs = [ pygls pyparsing ];
|
||||
nativeBuildInputs = [
|
||||
poetry
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cmake-format
|
||||
pygls
|
||||
pyparsing
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
cmake
|
||||
cmake-format
|
||||
pytest-datadir
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
checkInputs = [ cmake pytest-datadir pytestCheckHook ];
|
||||
dontUseCmakeConfigure = true;
|
||||
pythonImportsCheck = [ "cmake_language_server" ];
|
||||
|
||||
@ -0,0 +1,13 @@
|
||||
diff --git a/tests/test_server.py b/tests/test_server.py
|
||||
index 2d09bb2..59a122a 100644
|
||||
--- a/tests/test_server.py
|
||||
+++ b/tests/test_server.py
|
||||
@@ -26,7 +26,7 @@ from pygls.lsp.types import (
|
||||
)
|
||||
from pygls.server import LanguageServer
|
||||
|
||||
-CALL_TIMEOUT = 2
|
||||
+CALL_TIMEOUT = None
|
||||
|
||||
|
||||
def _init(client: LanguageServer, root: Path) -> None:
|
||||
@ -0,0 +1,13 @@
|
||||
diff --git a/pyproject.toml b/pyproject.toml
|
||||
index 417df1d..0f59857 100644
|
||||
--- a/pyproject.toml
|
||||
+++ b/pyproject.toml
|
||||
@@ -19,7 +19,7 @@ classifiers = [
|
||||
|
||||
[tool.poetry.dependencies]
|
||||
python = "^3.6"
|
||||
-pygls = "^0.11"
|
||||
+pygls = "^0.12"
|
||||
importlib-metadata = {version = "^4.8", python = "<3.8"}
|
||||
|
||||
[tool.poetry.dev-dependencies]
|
||||
25
pkgs/development/tools/refinery-cli/default.nix
Normal file
25
pkgs/development/tools/refinery-cli/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ fetchCrate, lib, openssl, pkg-config, rustPlatform }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "refinery-cli";
|
||||
version = "0.8.5";
|
||||
|
||||
src = fetchCrate {
|
||||
pname = "refinery_cli";
|
||||
inherit version;
|
||||
sha256 = "sha256-I9YjMsl70eiws4ea0P9oqOsNzN+gfO5Jwr7VlFCltq8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-Ehofdr6UNtOwRT0QVFaXDrWFRPqdF9eA8eL/hRwIJUM=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Run migrations for the Refinery ORM for Rust via the CLI";
|
||||
homepage = "https://github.com/rust-db/refinery";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ lucperkins ];
|
||||
};
|
||||
}
|
||||
42
pkgs/development/tools/wasmedge/default.nix
Normal file
42
pkgs/development/tools/wasmedge/default.nix
Normal file
@ -0,0 +1,42 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, llvmPackages
|
||||
, boost
|
||||
, cmake
|
||||
, gtest
|
||||
, spdlog
|
||||
}:
|
||||
|
||||
llvmPackages.stdenv.mkDerivation rec {
|
||||
pname = "wasmedge";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WasmEdge";
|
||||
repo = "WasmEdge";
|
||||
rev = version;
|
||||
sha256 = "sha256-SJi8CV0sa+g+Ngvdw8+SxV3kHqoiKBhYUwDLZM4+jX0=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
spdlog
|
||||
llvmPackages.llvm
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake llvmPackages.lld ];
|
||||
|
||||
checkInputs = [ gtest ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_BUILD_TYPE=Release"
|
||||
"-DWASMEDGE_BUILD_TESTS=OFF" # Tests are downloaded using git
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wasmedge.org/";
|
||||
license = with licenses; [ asl20 ];
|
||||
description = "A lightweight, high-performance, and extensible WebAssembly runtime for cloud native, edge, and decentralized applications";
|
||||
maintainers = with maintainers; [ dit7ya ];
|
||||
};
|
||||
}
|
||||
@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://bzflag.org/";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ fpletz ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
32
pkgs/games/tintin/default.nix
Normal file
32
pkgs/games/tintin/default.nix
Normal file
@ -0,0 +1,32 @@
|
||||
{ stdenv, fetchFromGitHub, lib, zlib, pcre
|
||||
, memorymappingHook, memstreamHook
|
||||
, gnutls
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tintin";
|
||||
version = "2.02.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scandum";
|
||||
repo = "tintin";
|
||||
rev = version;
|
||||
hash = "sha256-H9Cjg/GkyV50pgewv77zOJ8/Op78P9sQmZ5LorO4L+A=";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib pcre gnutls ]
|
||||
++ lib.optionals (stdenv.system == "x86_64-darwin") [ memorymappingHook memstreamHook ];
|
||||
|
||||
preConfigure = ''
|
||||
cd src
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A free MUD client for macOS, Linux and Windows";
|
||||
homepage = "https://tintin.mudhalla.net/index.php";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ abathur ];
|
||||
mainProgram = "tt++";
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
homepage = "http://www.urbanterror.info";
|
||||
license = licenses.unfreeRedistributable;
|
||||
maintainers = with maintainers; [ astsmtl fpletz ];
|
||||
maintainers = with maintainers; [ astsmtl ];
|
||||
platforms = platforms.linux;
|
||||
hydraPlatforms = [];
|
||||
};
|
||||
|
||||
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "Electric Sheep, a distributed screen saver for evolving artificial organisms";
|
||||
homepage = "https://electricsheep.org/";
|
||||
maintainers = with maintainers; [ fpletz ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl1;
|
||||
};
|
||||
|
||||
@ -9,12 +9,12 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "6.03";
|
||||
version = "6.04";
|
||||
pname = "xscreensaver";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.jwz.org/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-Mo1ReXNSrPWMpbq0nnb78mA058rXhfZR6hHOe0P7olo=";
|
||||
sha256 = "sha256-eHAUsp8MV5Pswtk+EQmgSf9IqwwpuFHas09oPO72sVI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -94,6 +94,6 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ fpletz ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -46,6 +46,6 @@ stdenv.mkDerivation rec {
|
||||
changelog = "https://linuxcontainers.org/lxcfs/news/";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ mic92 fpletz ];
|
||||
maintainers = with maintainers; [ mic92 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -10,12 +10,12 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "oci-seccomp-bpf-hook";
|
||||
version = "1.2.5";
|
||||
version = "1.2.6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "oci-seccomp-bpf-hook";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PU7WX5RAV6wWVRsqq6MdEjr00AtlTT4cSacRaxrEF2s=";
|
||||
sha256 = "sha256-+HGVxPBCPIdFwzZf3lFE0MWA2xMKsHQkfDo4zyNgzpg=";
|
||||
};
|
||||
vendorSha256 = null;
|
||||
|
||||
|
||||
@ -1,7 +1,24 @@
|
||||
{ stdenv, lib, makeWrapper, p7zip
|
||||
, gawk, util-linux, xorg, glib, dbus-glib, zlib, bbe, bash, timetrap, netcat, cups
|
||||
, kernel ? null, libsOnly ? false
|
||||
, fetchurl, undmg, perl, autoPatchelfHook
|
||||
{ stdenv
|
||||
, lib
|
||||
, makeWrapper
|
||||
, p7zip
|
||||
, gawk
|
||||
, util-linux
|
||||
, xorg
|
||||
, glib
|
||||
, dbus-glib
|
||||
, zlib
|
||||
, bbe
|
||||
, bash
|
||||
, timetrap
|
||||
, netcat
|
||||
, cups
|
||||
, kernel ? null
|
||||
, libsOnly ? false
|
||||
, fetchurl
|
||||
, undmg
|
||||
, perl
|
||||
, autoPatchelfHook
|
||||
}:
|
||||
|
||||
assert (!libsOnly) -> kernel != null;
|
||||
@ -14,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||
# We download the full distribution to extract prl-tools-lin.iso from
|
||||
# => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso
|
||||
src = fetchurl {
|
||||
url = "https://download.parallels.com/desktop/v${lib.versions.major version}/${version}/ParallelsDesktop-${version}.dmg";
|
||||
url = "https://download.parallels.com/desktop/v${lib.versions.major version}/${version}/ParallelsDesktop-${version}.dmg";
|
||||
sha256 = "sha256-gjLxQOTFuVghv1Bj+zfbNW97q1IN2rurSnPQi13gzRA=";
|
||||
};
|
||||
|
||||
@ -39,7 +56,8 @@ stdenv.mkDerivation rec {
|
||||
fi
|
||||
'';
|
||||
|
||||
patches = lib.optionals (lib.versionAtLeast kernel.version "5.18") [ ./prl-tools.patch ];
|
||||
patches = lib.optional (lib.versionAtLeast kernel.version "5.18") ./prl-tools-5.18.patch
|
||||
++ lib.optional (lib.versionAtLeast kernel.version "5.19") ./prl-tools-5.19.patch;
|
||||
|
||||
kernelVersion = lib.optionalString (!libsOnly) kernel.modDirVersion;
|
||||
kernelDir = lib.optionalString (!libsOnly) "${kernel.dev}/lib/modules/${kernelVersion}";
|
||||
|
||||
29
pkgs/os-specific/linux/prl-tools/prl-tools-5.19.patch
Normal file
29
pkgs/os-specific/linux/prl-tools/prl-tools-5.19.patch
Normal file
@ -0,0 +1,29 @@
|
||||
diff -puNr prl-tools-build/kmods/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c prl-tools-build/kmods/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c
|
||||
--- prl-tools-build/kmods/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c
|
||||
+++ prl-tools-build/kmods/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c
|
||||
@@ -851,7 +851,7 @@ ssize_t prlfs_rw(struct inode *inode, char *buf, size_t size,
|
||||
loff_t *off, unsigned int rw, int user, int flags);
|
||||
|
||||
|
||||
-int prlfs_readpage(struct file *file, struct page *page) {
|
||||
+int prlfs_read_folio(struct file *file, struct folio *folio) {
|
||||
char *buf;
|
||||
ssize_t ret;
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
|
||||
@@ -859,6 +859,7 @@ int prlfs_readpage(struct file *file, struct page *page) {
|
||||
#else
|
||||
struct inode *inode = file->f_dentry->d_inode;
|
||||
#endif
|
||||
+ struct page *page = &folio->page;
|
||||
loff_t off = page->index << PAGE_SHIFT;
|
||||
|
||||
if (!file) {
|
||||
@@ -950,7 +951,7 @@ out:
|
||||
}
|
||||
|
||||
static const struct address_space_operations prlfs_aops = {
|
||||
- .readpage = prlfs_readpage,
|
||||
+ .read_folio = prlfs_read_folio,
|
||||
.writepage = prlfs_writepage,
|
||||
.write_begin = simple_write_begin,
|
||||
.write_end = prlfs_write_end,
|
||||
@ -203,7 +203,7 @@ let
|
||||
changelog = "https://github.com/openzfs/zfs/releases/tag/zfs-${version}";
|
||||
license = lib.licenses.cddl;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ hmenke jcumming jonringer wizeman fpletz globin ];
|
||||
maintainers = with lib.maintainers; [ hmenke jcumming jonringer wizeman globin ];
|
||||
mainProgram = "zfs";
|
||||
# If your Linux kernel version is not yet supported by zfs, try zfsUnstable.
|
||||
# On NixOS set the option boot.zfs.enableUnstable.
|
||||
|
||||
@ -52,6 +52,6 @@ optionalWarning (crowdProperties != null) "Using `crowdProperties` is deprecated
|
||||
homepage = "https://www.atlassian.com/software/confluence";
|
||||
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ fpletz globin willibutz ciil techknowlogick ma27 ];
|
||||
maintainers = with maintainers; [ globin willibutz ciil techknowlogick ma27 ];
|
||||
};
|
||||
})
|
||||
|
||||
@ -51,6 +51,6 @@ optionalWarning (openidPassword != "WILL_NEVER_BE_SET") "Using `crowdProperties`
|
||||
description = "Single sign-on and identity management tool";
|
||||
homepage = "https://www.atlassian.com/software/crowd";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ fpletz globin ];
|
||||
maintainers = with maintainers; [ globin ];
|
||||
};
|
||||
})
|
||||
|
||||
@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Proprietary issue tracking product, also providing project management functions";
|
||||
homepage = "https://www.atlassian.com/software/jira";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ fpletz globin ciil megheaiulian techknowlogick ma27 ];
|
||||
maintainers = with maintainers; [ globin ciil megheaiulian techknowlogick ma27 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
description = "BIRD Internet Routing Daemon";
|
||||
homepage = "http://bird.network.cz";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ fpletz globin ];
|
||||
maintainers = with maintainers; [ globin ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://freeradius.org/";
|
||||
description = "A modular, high performance free RADIUS suite";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ sheenobu willibutz fpletz lheckemann ];
|
||||
maintainers = with maintainers; [ sheenobu willibutz lheckemann ];
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
description = "IRCv3 server designed to be highly scalable";
|
||||
homepage = "https://github.com/charybdis-ircd/charybdis";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ lassulus fpletz ];
|
||||
maintainers = with maintainers; [ lassulus ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
|
||||
@ -45,6 +45,6 @@ buildGoModule rec {
|
||||
description = "Mattermost is an open source platform for secure collaboration across the entire software development lifecycle";
|
||||
homepage = "https://www.mattermost.org";
|
||||
license = with licenses; [ agpl3 asl20 ];
|
||||
maintainers = with maintainers; [ fpletz ryantm numinit kranzes ];
|
||||
maintainers = with maintainers; [ ryantm numinit kranzes ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -19,7 +19,7 @@ buildGoModule rec {
|
||||
inherit (src.meta) homepage;
|
||||
description = "Minimal IRC server bridge to Mattermost";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fpletz ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -20,7 +20,7 @@ buildGoPackage rec {
|
||||
description = "Relay server for exporting metrics from collectd to Prometheus";
|
||||
homepage = "https://github.com/prometheus/collectd_exporter";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ benley fpletz ];
|
||||
maintainers = with maintainers; [ benley ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -19,7 +19,7 @@ buildGoModule rec {
|
||||
description = "HAProxy Exporter for the Prometheus monitoring system";
|
||||
homepage = "https://github.com/prometheus/haproxy_exporter";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ benley fpletz ];
|
||||
maintainers = with maintainers; [ benley ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -18,6 +18,6 @@ buildGoModule rec {
|
||||
description = "Prometheus exporter for OpenVPN";
|
||||
broken = true;
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fpletz globin ];
|
||||
maintainers = with maintainers; [ globin ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -42,7 +42,7 @@ buildGoPackage rec {
|
||||
description = "Allows ephemeral and batch jobs to expose metrics to Prometheus";
|
||||
homepage = "https://github.com/prometheus/pushgateway";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ benley fpletz ];
|
||||
maintainers = with maintainers; [ benley ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -185,7 +185,7 @@ let
|
||||
description = "A flexible, powerful daemon for playing music";
|
||||
homepage = "https://www.musicpd.org/";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ astsmtl ehmry fpletz tobim ];
|
||||
maintainers = with maintainers; [ astsmtl ehmry tobim ];
|
||||
platforms = platforms.unix;
|
||||
|
||||
longDescription = ''
|
||||
|
||||
@ -25,7 +25,7 @@ let
|
||||
meta = with lib; {
|
||||
description = "Sharing solution for files, calendars, contacts and more";
|
||||
homepage = "https://nextcloud.com";
|
||||
maintainers = with maintainers; [ schneefux bachp globin fpletz ma27 ];
|
||||
maintainers = with maintainers; [ schneefux bachp globin ma27 ];
|
||||
license = licenses.agpl3Plus;
|
||||
platforms = with platforms; unix;
|
||||
knownVulnerabilities = extraVulnerabilities
|
||||
|
||||
@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
|
||||
inherit (src.meta) homepage;
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ fpletz globin ];
|
||||
maintainers = with maintainers; [ globin ];
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "http://www.squid-cache.org";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ fpletz raskin ];
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -42,7 +42,7 @@ let
|
||||
description = "Web application accelerator also known as a caching HTTP reverse proxy";
|
||||
homepage = "https://www.varnish-cache.org";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ fpletz ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
};
|
||||
|
||||
@ -70,6 +70,6 @@ toPythonModule (buildPythonApplication rec {
|
||||
homepage = "https://github.com/searx/searx";
|
||||
description = "A privacy-respecting, hackable metasearch engine";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ matejc fpletz globin danielfullmer ];
|
||||
maintainers = with maintainers; [ matejc globin danielfullmer ];
|
||||
};
|
||||
})
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user