Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
677697c12f
|
|
@ -198,6 +198,18 @@ with lib.maintainers; {
|
|||
enableFeatureFreezePing = true;
|
||||
};
|
||||
|
||||
enlightenment = {
|
||||
members = [
|
||||
romildo
|
||||
];
|
||||
githubTeams = [
|
||||
"enlightenment"
|
||||
];
|
||||
scope = "Maintain Enlightenment desktop environment and related packages.";
|
||||
shortName = "Enlightenment";
|
||||
enableFeatureFreezePing = true;
|
||||
};
|
||||
|
||||
# Dummy group for the "everyone else" section
|
||||
feature-freeze-everyone-else = {
|
||||
members = [ ];
|
||||
|
|
@ -343,6 +355,30 @@ with lib.maintainers; {
|
|||
shortName = "Linux Kernel";
|
||||
};
|
||||
|
||||
lumina = {
|
||||
members = [
|
||||
romildo
|
||||
];
|
||||
githubTeams = [
|
||||
"lumina"
|
||||
];
|
||||
scope = "Maintain lumina desktop environment and related packages.";
|
||||
shortName = "Lumina";
|
||||
enableFeatureFreezePing = true;
|
||||
};
|
||||
|
||||
lxqt = {
|
||||
members = [
|
||||
romildo
|
||||
];
|
||||
githubTeams = [
|
||||
"lxqt"
|
||||
];
|
||||
scope = "Maintain LXQt desktop environment and related packages.";
|
||||
shortName = "LXQt";
|
||||
enableFeatureFreezePing = true;
|
||||
};
|
||||
|
||||
marketing = {
|
||||
members = [
|
||||
garbas
|
||||
|
|
|
|||
|
|
@ -16,6 +16,10 @@ let
|
|||
in
|
||||
|
||||
{
|
||||
meta = {
|
||||
maintainers = teams.enlightenment.members;
|
||||
};
|
||||
|
||||
imports = [
|
||||
(mkRenamedOptionModule [ "services" "xserver" "desktopManager" "e19" "enable" ] [ "services" "xserver" "desktopManager" "enlightenment" "enable" ])
|
||||
];
|
||||
|
|
|
|||
|
|
@ -10,6 +10,10 @@ let
|
|||
in
|
||||
|
||||
{
|
||||
meta = {
|
||||
maintainers = teams.lumina.members;
|
||||
};
|
||||
|
||||
options = {
|
||||
|
||||
services.xserver.desktopManager.lumina.enable = mkOption {
|
||||
|
|
|
|||
|
|
@ -9,6 +9,10 @@ let
|
|||
in
|
||||
|
||||
{
|
||||
meta = {
|
||||
maintainers = teams.lxqt.members;
|
||||
};
|
||||
|
||||
options = {
|
||||
|
||||
services.xserver.desktopManager.lxqt.enable = mkOption {
|
||||
|
|
@ -63,6 +67,8 @@ in
|
|||
|
||||
services.upower.enable = config.powerManagement.enable;
|
||||
|
||||
services.xserver.libinput.enable = mkDefault true;
|
||||
|
||||
xdg.portal.enable = true;
|
||||
xdg.portal.extraPortals = [ pkgs.lxqt.xdg-desktop-portal-lxqt ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -12,16 +12,16 @@ let
|
|||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "electrs";
|
||||
version = "0.9.6";
|
||||
version = "0.9.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "romanz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-BI7hxlpg2sggD1ag73n+tRre+Ja2ZFhDPzy1DV8aEHw=";
|
||||
hash = "sha256-hdXc64gj7QtCnTq3f5mpQDEKLM6qaDBLkQE07xxNaDE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Oy2mOulSB2a9LaT47G+BzjidcjPjHeaoesQ7g6M8M1Q=";
|
||||
cargoHash = "sha256-xMATO+H3bGkM/tLRimmLGYtrOAX8hzkw5Hb0c6iVAXY=";
|
||||
|
||||
# needed for librocksdb-sys
|
||||
nativeBuildInputs = [ llvmPackages.clang ];
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "monero-cli";
|
||||
version = "0.17.3.0";
|
||||
version = "0.17.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "monero-project";
|
||||
repo = "monero";
|
||||
rev = "v${version}";
|
||||
sha256 = "1spsf7m3x4psp9s7mivr6x4886jnbq4i8ll2dl8bv5bsdhcd3pjm";
|
||||
sha256 = "19sgcbli7fc1l6ms7ma6hcz1mmpbnd296lc8a19rl410acpv45zy";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "monero-gui";
|
||||
version = "0.17.3.1";
|
||||
version = "0.17.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "monero-project";
|
||||
repo = "monero-gui";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RrchaqFmL4W9F8DhZfvxm7mHMkx/OX8K9e8uNFXWubo=";
|
||||
sha256 = "10gincmgc0qpsgm94m1fqfy9j8jn9g1gjk12lcqnf77kvcnz37hq";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -45,13 +45,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "imagemagick";
|
||||
version = "7.1.0-31";
|
||||
version = "7.1.0-32";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ImageMagick";
|
||||
repo = "ImageMagick";
|
||||
rev = version;
|
||||
hash = "sha256-Pf+x3TnmvKTCDL3dGLyAr6JUl5E3BRi/XW/dkuCr2YA=";
|
||||
hash = "sha256-blDdNZJCyBdPEgdZXwgNUGSdSIwnqRaVLsLdFeA4JzQ=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@ let
|
|||
name = "${old.pname}-${version}";
|
||||
hash = "sha256-sBFXcLXpAkX+HzRKrLKaHhi5ieS8Yc/Uf30WcXyWrok=";
|
||||
};
|
||||
patches = [ ./libdeltachat-darwin-dylib.patch ] ++ old.patches;
|
||||
});
|
||||
electronExec = if stdenv.isDarwin then
|
||||
"${electron_16}/Applications/Electron.app/Contents/MacOS/Electron"
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnunet";
|
||||
version = "0.16.0";
|
||||
version = "0.16.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-0y2m8T/xzYZwUlcZ6g956fdtLef2Bphg4Kd/xpo2AGg=";
|
||||
sha256 = "sha256-MjkFLxNTepqrqqZuxCh12+4vaDjF8Ys674VOa1Mew4o=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -4,14 +4,15 @@
|
|||
crateFeatures, crateRenames, libName, release, libPath,
|
||||
crateType, metadata, crateBin, hasCrateBin,
|
||||
extraRustcOpts, verbose, colors,
|
||||
buildTests
|
||||
buildTests,
|
||||
codegenUnits
|
||||
}:
|
||||
|
||||
let
|
||||
baseRustcOpts =
|
||||
[
|
||||
(if release then "-C opt-level=3" else "-C debuginfo=2")
|
||||
"-C codegen-units=$NIX_BUILD_CORES"
|
||||
"-C codegen-units=${toString codegenUnits}"
|
||||
"--remap-path-prefix=$NIX_BUILD_TOP=/"
|
||||
(mkRustcDepArgs dependencies crateRenames)
|
||||
(mkRustcFeatureArgs crateFeatures)
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
{
|
||||
build
|
||||
, buildDependencies
|
||||
, codegenUnits
|
||||
, colors
|
||||
, completeBuildDeps
|
||||
, completeDeps
|
||||
|
|
@ -24,7 +25,7 @@ let version_ = lib.splitString "-" crateVersion;
|
|||
version = lib.splitVersion (lib.head version_);
|
||||
rustcOpts = lib.foldl' (opts: opt: opts + " " + opt)
|
||||
(if release then "-C opt-level=3" else "-C debuginfo=2")
|
||||
(["-C codegen-units=$NIX_BUILD_CORES"] ++ extraRustcOptsForBuildRs);
|
||||
(["-C codegen-units=${toString codegenUnits}"] ++ extraRustcOptsForBuildRs);
|
||||
buildDeps = mkRustcDepArgs buildDependencies crateRenames;
|
||||
authors = lib.concatStringsSep ":" crateAuthors;
|
||||
optLevel = if release then 3 else 0;
|
||||
|
|
|
|||
|
|
@ -228,6 +228,7 @@ crate_: lib.makeOverridable
|
|||
"colors"
|
||||
"edition"
|
||||
"buildTests"
|
||||
"codegenUnits"
|
||||
];
|
||||
extraDerivationAttrs = builtins.removeAttrs crate processedAttrs;
|
||||
nativeBuildInputs_ = nativeBuildInputs;
|
||||
|
|
@ -315,6 +316,7 @@ crate_: lib.makeOverridable
|
|||
colors = lib.attrByPath [ "colors" ] "always" crate;
|
||||
extraLinkFlags = lib.concatStringsSep " " (crate.extraLinkFlags or [ ]);
|
||||
edition = crate.edition or null;
|
||||
codegenUnits = if crate ? codegenUnits then crate.codegenUnits else 1;
|
||||
extraRustcOpts =
|
||||
lib.optionals (crate ? extraRustcOpts) crate.extraRustcOpts
|
||||
++ extraRustcOpts_
|
||||
|
|
@ -329,13 +331,13 @@ crate_: lib.makeOverridable
|
|||
inherit crateName buildDependencies completeDeps completeBuildDeps crateDescription
|
||||
crateFeatures crateRenames libName build workspace_member release libPath crateVersion
|
||||
extraLinkFlags extraRustcOptsForBuildRs
|
||||
crateAuthors crateHomepage verbose colors;
|
||||
crateAuthors crateHomepage verbose colors codegenUnits;
|
||||
};
|
||||
buildPhase = buildCrate {
|
||||
inherit crateName dependencies
|
||||
crateFeatures crateRenames libName release libPath crateType
|
||||
metadata hasCrateBin crateBin verbose colors
|
||||
extraRustcOpts buildTests;
|
||||
extraRustcOpts buildTests codegenUnits;
|
||||
};
|
||||
installPhase = installCrate crateName metadata buildTests;
|
||||
|
||||
|
|
|
|||
|
|
@ -19,11 +19,11 @@ stdenv.mkDerivation rec {
|
|||
wrapPythonPrograms
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "A user interface for the connman network connection manager";
|
||||
homepage = "https://enlightenment.org/";
|
||||
license = lib.licenses.lgpl3;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ matejc tstrobel ftrvxmtrx romildo ];
|
||||
license = licenses.lgpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with lib.maintainers; [ matejc tstrobel ftrvxmtrx ] ++ teams.enlightenment.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://www.enlightenment.org/";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
maintainers = teams.enlightenment.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -208,6 +208,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://enlightenment.org/";
|
||||
license = with licenses; [ bsd2 lgpl2Only licenses.zlib ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx romildo ];
|
||||
maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx ] ++ teams.enlightenment.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -75,6 +75,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://www.enlightenment.org";
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx romildo ];
|
||||
maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx ] ++ teams.enlightenment.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://www.smhouston.us/ephoto/";
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
maintainers = teams.enlightenment.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://www.enlightenment.org";
|
||||
license = with licenses; [ isc ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
maintainers = teams.enlightenment.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://enlightenment.org/";
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ matejc ftrvxmtrx romildo ];
|
||||
maintainers = with maintainers; [ matejc ftrvxmtrx ] ++ teams.enlightenment.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://www.enlightenment.org/about-terminology";
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx romildo ];
|
||||
maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx ] ++ teams.enlightenment.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,6 +27,6 @@ mkDerivation rec {
|
|||
homepage = "https://github.com/lumina-desktop/lumina-calculator";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
maintainers = teams.lumina.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,6 +33,6 @@ mkDerivation rec {
|
|||
homepage = "https://github.com/lumina-desktop/lumina-pdf";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
maintainers = teams.lumina.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -108,6 +108,6 @@ mkDerivation rec {
|
|||
homepage = "https://lumina-desktop.org";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
maintainers = teams.lumina.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,6 +44,6 @@ mkDerivation rec {
|
|||
description = "GUI configuration tool for compton X composite manager";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = with platforms; unix;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
maintainers = teams.lxqt.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -50,6 +50,6 @@ mkDerivation rec {
|
|||
description = "Core library of PCManFM-Qt (Qt binding for libfm)";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = with platforms; unix;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
maintainers = teams.lxqt.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -57,6 +57,6 @@ mkDerivation rec {
|
|||
homepage = "https://github.com/lxqt/liblxqt";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
maintainers = teams.lxqt.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,6 +44,6 @@ mkDerivation rec {
|
|||
description = "Qt implementation of freedesktop.org xdg specs";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
maintainers = teams.lxqt.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,6 +34,6 @@ mkDerivation rec {
|
|||
homepage = "https://github.com/lxqt/libsysstat";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = with platforms; unix;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
maintainers = teams.lxqt.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -49,6 +49,6 @@ mkDerivation rec {
|
|||
description = "The image viewer and screenshot tool for lxqt";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = with platforms; unix;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
maintainers = teams.lxqt.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,6 +44,6 @@ mkDerivation rec {
|
|||
description = "Dialogue window providing information about LXQt and the system it's running on";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
maintainers = teams.lxqt.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -54,6 +54,6 @@ mkDerivation rec {
|
|||
description = "LXQt system administration tool";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
maintainers = teams.lxqt.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,6 +46,6 @@ mkDerivation rec {
|
|||
description = "Archive tool for the LXQt desktop environment";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = with platforms; unix;
|
||||
maintainers = with maintainers; [ jchw ];
|
||||
maintainers = with maintainers; [ jchw ] ++ teams.lxqt.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -66,6 +66,6 @@ mkDerivation rec {
|
|||
description = "Various packaging tools and scripts for LXQt applications";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = with platforms; unix;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
maintainers = teams.lxqt.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ mkDerivation rec {
|
|||
description = "Tools to configure LXQt and the underlying operating system";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
maintainers = teams.lxqt.members;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,6 +46,6 @@ mkDerivation rec {
|
|||
description = "LXQt service for global keyboard shortcuts registration";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
maintainers = teams.lxqt.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,6 +46,6 @@ mkDerivation rec {
|
|||
description = "The LXQt notification daemon";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
maintainers = teams.lxqt.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,6 +46,6 @@ mkDerivation rec {
|
|||
description = "GUI to query passwords on behalf of SSH agents";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
maintainers = teams.lxqt.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -78,6 +78,6 @@ mkDerivation rec {
|
|||
description = "The LXQt desktop panel";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
maintainers = teams.lxqt.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -54,6 +54,6 @@ mkDerivation rec {
|
|||
description = "The LXQt PolicyKit agent";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
maintainers = teams.lxqt.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,6 +52,6 @@ mkDerivation rec {
|
|||
description = "Power management module for LXQt";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
maintainers = teams.lxqt.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,6 +51,6 @@ mkDerivation rec {
|
|||
description = "LXQt Qt platform integration plugin";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
maintainers = teams.lxqt.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,6 +56,6 @@ mkDerivation rec {
|
|||
description = "Tool used to launch programs quickly by typing their names";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
maintainers = teams.lxqt.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -55,6 +55,6 @@ mkDerivation rec {
|
|||
description = "An alternative session manager ported from the original razor-session";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
maintainers = teams.lxqt.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,6 +48,6 @@ mkDerivation rec {
|
|||
description = "GUI frontend for sudo/su";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
maintainers = teams.lxqt.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,6 +29,6 @@ mkDerivation rec {
|
|||
description = "Themes, graphics and icons for LXQt";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
maintainers = teams.lxqt.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,6 +48,6 @@ mkDerivation rec {
|
|||
description = "The Qt port of obconf, the Openbox configuration tool";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = with platforms; unix;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
maintainers = teams.lxqt.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,6 +43,6 @@ mkDerivation rec {
|
|||
description = "A Pulseaudio mixer in Qt (port of pavucontrol)";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = with platforms; linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
maintainers = teams.lxqt.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,6 +51,6 @@ mkDerivation rec {
|
|||
description = "File manager and desktop icon manager (Qt port of PCManFM and libfm)";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = with platforms; unix;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
maintainers = teams.lxqt.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,6 +34,6 @@ mkDerivation rec {
|
|||
homepage = "https://github.com/pvanek/qlipper";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = with platforms; unix;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
maintainers = teams.lxqt.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,6 +44,6 @@ mkDerivation rec {
|
|||
description = "Qt based process manager";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = with platforms; linux; # does not build on darwin
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
maintainers = teams.lxqt.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,6 +43,6 @@ mkDerivation rec {
|
|||
description = "A lightweight Qt-based terminal emulator";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = with platforms; unix;
|
||||
maintainers = with maintainers; [ romildo globin ];
|
||||
maintainers = with maintainers; [ globin ] ++ teams.lxqt.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,6 +36,6 @@ mkDerivation rec {
|
|||
description = "A terminal emulator widget for Qt 5";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = with platforms; unix;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
maintainers = teams.lxqt.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,6 +51,6 @@ mkDerivation rec {
|
|||
description = "Crossplatform tool for fast making screenshots";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
maintainers = teams.lxqt.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -121,6 +121,8 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
|
||||
granite = callPackage ./granite { };
|
||||
|
||||
granite7 = callPackage ./granite/7 { };
|
||||
|
||||
#### SERVICES
|
||||
|
||||
contractor = callPackage ./services/contractor { };
|
||||
|
|
|
|||
73
pkgs/desktops/pantheon/granite/7/default.nix
Normal file
73
pkgs/desktops/pantheon/granite/7/default.nix
Normal file
|
|
@ -0,0 +1,73 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, python3
|
||||
, meson
|
||||
, ninja
|
||||
, vala
|
||||
, pkg-config
|
||||
, libgee
|
||||
, gtk4
|
||||
, glib
|
||||
, gettext
|
||||
, gsettings-desktop-schemas
|
||||
, gobject-introspection
|
||||
, wrapGAppsHook4
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "granite";
|
||||
version = "7.0.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-fuyjQDH3C8qRYuAfQDDeW3aSWVTLtGzMAjcuAHCB1Zw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
gobject-introspection
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
vala
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
glib
|
||||
gsettings-desktop-schemas # is_clock_format_12h uses "org.gnome.desktop.interface clock-format"
|
||||
gtk4
|
||||
libgee
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson/post_install.py
|
||||
patchShebangs meson/post_install.py
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.granite7";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "An extension to GTK used by elementary OS";
|
||||
longDescription = ''
|
||||
Granite is a companion library for GTK and GLib. Among other things, it provides complex widgets and convenience functions
|
||||
designed for use in apps built for elementary OS.
|
||||
'';
|
||||
homepage = "https://github.com/elementary/granite";
|
||||
license = licenses.lgpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.pantheon.members;
|
||||
mainProgram = "granite-7-demo";
|
||||
};
|
||||
}
|
||||
|
|
@ -18,13 +18,18 @@ stdenv.mkDerivation rec {
|
|||
buildPhase = ''
|
||||
ant
|
||||
'';
|
||||
# Fix for https://github.com/armedbear/abcl/issues/484
|
||||
javaOpts =
|
||||
lib.optionalString
|
||||
(lib.versionAtLeast jre.version "17")
|
||||
"--add-opens=java.base/java.util.jar=ALL-UNNAMED";
|
||||
installPhase = ''
|
||||
mkdir -p "$out"/{bin,share/doc/abcl,lib/abcl}
|
||||
cp -r README COPYING CHANGES examples/ "$out/share/doc/abcl/"
|
||||
cp -r dist/*.jar contrib/ "$out/lib/abcl/"
|
||||
|
||||
echo "#! ${stdenv.shell}" >> "$out/bin/abcl"
|
||||
echo "${jre}/bin/java -cp \"$out/lib/abcl/abcl.jar:$out/lib/abcl/abcl-contrib.jar:\$CLASSPATH\" org.armedbear.lisp.Main \"\$@\"" >> "$out/bin/abcl"
|
||||
echo "${jre}/bin/java $javaOpts -cp \"$out/lib/abcl/abcl.jar:$out/lib/abcl/abcl-contrib.jar:\$CLASSPATH\" org.armedbear.lisp.Main \"\$@\"" >> "$out/bin/abcl"
|
||||
chmod a+x "$out"/bin/*
|
||||
'';
|
||||
buildInputs = [jre ant jdk jre];
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "duckdb";
|
||||
version = "0.3.3";
|
||||
version = "0.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WxJj5hOJsRuKUHjpGZWsa0PxRZZJcX88p1/typ+yqEw=";
|
||||
sha256 = "sha256-2PBc5qe2md87u2nvMTx/XZVzLsr8QrvUkw46/6VTlGs=";
|
||||
};
|
||||
|
||||
patches = [ ./version.patch ];
|
||||
|
|
@ -31,13 +31,17 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_EXCEL_EXTENSION=ON"
|
||||
"-DBUILD_FTS_EXTENSION=ON"
|
||||
"-DBUILD_HTTPFS_EXTENSION=${enableFeature withHttpFs}"
|
||||
"-DBUILD_ICU_EXTENSION=ON"
|
||||
"-DBUILD_JSON_EXTENSION=ON"
|
||||
"-DBUILD_ODBC_DRIVER=${enableFeature withOdbc}"
|
||||
"-DBUILD_PARQUET_EXTENSION=ON"
|
||||
"-DBUILD_REST_EXTENSION=ON"
|
||||
"-DBUILD_REST=ON"
|
||||
"-DBUILD_SUBSTRAIT_EXTENSION=ON"
|
||||
"-DBUILD_TPCDS_EXTENSION=ON"
|
||||
"-DBUILD_TPCE=ON"
|
||||
"-DBUILD_TPCH_EXTENSION=ON"
|
||||
"-DBUILD_VISUALIZER_EXTENSION=ON"
|
||||
"-DJDBC_DRIVER=${enableFeature withJdbc}"
|
||||
|
|
|
|||
|
|
@ -16,25 +16,23 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdeltachat";
|
||||
version = "1.77.0";
|
||||
version = "1.78.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-core-rust";
|
||||
rev = version;
|
||||
hash = "sha256-SEsa83PQ2r3PBJuJhTMeje1n2mZUt/f61DvoVPwyxvs=";
|
||||
hash = "sha256-SMobKC34RU7/LfRtgBxa8CHsLlWOQ29zaiw/V4+wWqU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/deltachat/deltachat-core-rust/pull/2589
|
||||
./darwin-dylib.patch
|
||||
./no-static-lib.patch
|
||||
];
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-6srybgs1DGaE6iMrnRUWRnoQM00VCsZwMNdKQ2eqqxg=";
|
||||
hash = "sha256-G2lUk1M3B+a3BaNPFWQgsYehUu7dyfuRc+fXSlWjSq4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,6 +16,10 @@ stdenv.mkDerivation rec {
|
|||
./autogen.sh
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--disable-werror"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoconf automake libtool pkg-config perl ];
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -44,6 +44,13 @@ stdenv.mkDerivation rec {
|
|||
|
||||
propagatedBuildInputs = [ ncurses ];
|
||||
|
||||
buildFlags = lib.optional stdenv.hostPlatform.isStatic "static";
|
||||
installTargets = lib.optional stdenv.hostPlatform.isStatic "install-static";
|
||||
|
||||
preBuild = ''
|
||||
makeFlagsArray+=(AR_CR="${stdenv.cc.targetPrefix}ar cr")
|
||||
'';
|
||||
|
||||
# slang 2.3.2 does not support parallel building
|
||||
enableParallelBuilding = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -10,6 +10,10 @@ buildDunePackage rec {
|
|||
|
||||
propagatedBuildInputs = [ dune-glob dune-private-libs ];
|
||||
|
||||
preBuild = ''
|
||||
rm -r vendor/csexp
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
inherit (dune_3.meta) homepage;
|
||||
description = "API for writing dynamic Dune actions";
|
||||
|
|
|
|||
|
|
@ -10,6 +10,10 @@ buildDunePackage rec {
|
|||
|
||||
propagatedBuildInputs = [ dune-private-libs ];
|
||||
|
||||
preBuild = ''
|
||||
rm -r vendor/csexp
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
inherit (dune_3.meta) homepage;
|
||||
description = "Glob string matching language supported by dune";
|
||||
|
|
|
|||
|
|
@ -13,6 +13,10 @@ buildDunePackage rec {
|
|||
|
||||
propagatedBuildInputs = [ stdune ];
|
||||
|
||||
preBuild = ''
|
||||
rm -r vendor/csexp
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Private libraries of Dune";
|
||||
maintainers = [ maintainers.marsam ];
|
||||
|
|
|
|||
23
pkgs/development/ocaml-modules/dune-rpc/default.nix
Normal file
23
pkgs/development/ocaml-modules/dune-rpc/default.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ lib, buildDunePackage, dune_3, stdune, ordering, pp, xdg, dyn }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "dune-rpc";
|
||||
inherit (dune_3) src version;
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
dontAddPrefix = true;
|
||||
|
||||
buildInputs = [ stdune ordering pp xdg dyn ];
|
||||
|
||||
preBuild = ''
|
||||
rm -r vendor/csexp
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library to connect and control a running dune instance";
|
||||
inherit (dune_3.meta) homepage;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
@ -10,6 +10,10 @@ buildDunePackage rec {
|
|||
|
||||
propagatedBuildInputs = [ dune-private-libs ];
|
||||
|
||||
preBuild = ''
|
||||
rm -r vendor/csexp
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A library for embedding location information inside executable and libraries";
|
||||
inherit (dune_3.meta) homepage;
|
||||
|
|
|
|||
23
pkgs/development/ocaml-modules/fiber/default.nix
Normal file
23
pkgs/development/ocaml-modules/fiber/default.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ lib, buildDunePackage, dune_3, stdune, dyn }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "fiber";
|
||||
inherit (dune_3) src version;
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
dontAddPrefix = true;
|
||||
|
||||
buildInputs = [ stdune dyn ];
|
||||
|
||||
preBuild = ''
|
||||
rm -r vendor/csexp
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Structured concurrency library";
|
||||
inherit (dune_3.meta) homepage;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,14 +1,13 @@
|
|||
{ lib, buildDunePackage, jsonrpc, lsp, re, makeWrapper, dot-merlin-reader, spawn }:
|
||||
{ lib, buildDunePackage, lsp, xdg, re, fiber, makeWrapper, dot-merlin-reader, spawn }:
|
||||
|
||||
buildDunePackage {
|
||||
buildDunePackage rec {
|
||||
pname = "ocaml-lsp-server";
|
||||
inherit (jsonrpc) version src;
|
||||
useDune2 = true;
|
||||
|
||||
inherit (lsp) preBuild;
|
||||
inherit (lsp) version src preBuild;
|
||||
duneVersion = if lib.versionAtLeast version "1.10.0" then "3" else "2";
|
||||
|
||||
buildInputs = lsp.buildInputs ++ [ lsp re ]
|
||||
++ lib.optional (lib.versionAtLeast jsonrpc.version "1.9") spawn;
|
||||
++ lib.optional (lib.versionAtLeast version "1.9") spawn
|
||||
++ lib.optionals (lib.versionAtLeast version "1.10") [ fiber xdg ];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
|
@ -16,7 +15,7 @@ buildDunePackage {
|
|||
wrapProgram $out/bin/ocamllsp --prefix PATH : ${dot-merlin-reader}/bin
|
||||
'';
|
||||
|
||||
meta = jsonrpc.meta // {
|
||||
meta = lsp.meta // {
|
||||
description = "OCaml Language Server Protocol implementation";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,10 +10,14 @@
|
|||
}:
|
||||
|
||||
let params =
|
||||
if lib.versionAtLeast ocaml.version "4.13"
|
||||
if lib.versionAtLeast ocaml.version "4.14"
|
||||
then {
|
||||
version = "1.10.3";
|
||||
sha256 = "sha256-o6wQc7Byi5T0vbARF3LAq69/9wMkOZRQ6rcVa/rBUfE=";
|
||||
version = "1.11.3";
|
||||
sha256 = "sha256-KlMFh05O04I0Xil2B+nL2hUxZw0jaDMUnI23oUwGyhs=";
|
||||
} else if lib.versionAtLeast ocaml.version "4.13"
|
||||
then {
|
||||
version = "1.10.5";
|
||||
sha256 = "sha256-TeJS6t1ruWhWPvWNatrnSUWI6T17XKiosHLYizBDDcw=";
|
||||
} else if lib.versionAtLeast ocaml.version "4.12"
|
||||
then {
|
||||
version = "1.9.0";
|
||||
|
|
@ -32,7 +36,7 @@ buildDunePackage rec {
|
|||
inherit (params) sha256;
|
||||
};
|
||||
|
||||
useDune2 = true;
|
||||
duneVersion = if lib.versionAtLeast version "1.10.0" then "3" else "2";
|
||||
minimalOCamlVersion = "4.06";
|
||||
|
||||
buildInputs =
|
||||
|
|
|
|||
|
|
@ -8,18 +8,23 @@
|
|||
, omd
|
||||
, octavius
|
||||
, dune-build-info
|
||||
, dune-rpc
|
||||
, uutf
|
||||
, dyn
|
||||
, re
|
||||
, pp
|
||||
, stdune
|
||||
, dune_3
|
||||
, csexp
|
||||
, pp
|
||||
, cmdliner
|
||||
, ordering
|
||||
, ocamlformat-rpc-lib
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "lsp";
|
||||
inherit (jsonrpc) version src;
|
||||
useDune2 = true;
|
||||
duneVersion = if lib.versionAtLeast version "1.10.0" then "3" else "2";
|
||||
minimumOCamlVersion =
|
||||
if lib.versionAtLeast version "1.7.0" then
|
||||
"4.12"
|
||||
|
|
@ -30,15 +35,30 @@ buildDunePackage rec {
|
|||
# They are vendored by upstream only because it is then easier to install
|
||||
# ocaml-lsp without messing with your opam switch, but nix should prevent
|
||||
# this type of problems without resorting to vendoring.
|
||||
preBuild = ''
|
||||
preBuild = lib.optionalString (lib.versionOlder version "1.10.4") ''
|
||||
rm -r ocaml-lsp-server/vendor/{octavius,uutf,omd,cmdliner}
|
||||
'';
|
||||
|
||||
buildInputs =
|
||||
if lib.versionAtLeast version "1.7.0" then
|
||||
if lib.versionAtLeast version "1.10.0" then
|
||||
[
|
||||
pp
|
||||
re
|
||||
ppx_yojson_conv_lib
|
||||
octavius
|
||||
dune-build-info
|
||||
dune-rpc
|
||||
omd
|
||||
cmdliner
|
||||
ocamlformat-rpc-lib
|
||||
dyn
|
||||
stdune
|
||||
]
|
||||
else if lib.versionAtLeast version "1.7.0" then
|
||||
[ pp re ppx_yojson_conv_lib octavius dune-build-info omd cmdliner ocamlformat-rpc-lib ]
|
||||
else
|
||||
[ cppo
|
||||
[
|
||||
cppo
|
||||
ppx_yojson_conv_lib
|
||||
ocaml-syntax-shims
|
||||
octavius
|
||||
|
|
|
|||
|
|
@ -1,12 +1,24 @@
|
|||
{ lib, fetchurl, buildDunePackage, csexp, sexplib0 }:
|
||||
{ lib, fetchurl, buildDunePackage, ocaml, csexp, sexplib0 }:
|
||||
|
||||
# for compat with ocaml-lsp
|
||||
let source =
|
||||
if lib.versionAtLeast ocaml.version "4.13"
|
||||
then {
|
||||
version = "0.21.0";
|
||||
sha256 = "sha256-KhgX9rxYH/DM6fCqloe4l7AnJuKrdXSe6Y1XY3BXMy0=";
|
||||
} else {
|
||||
version = "0.20.0";
|
||||
sha256 = "sha256-JtmNCgwjbCyUE4bWqdH5Nc2YSit+rekwS43DcviIfgk=";
|
||||
};
|
||||
in
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "ocamlformat-rpc-lib";
|
||||
version = "0.19.0";
|
||||
inherit (source) version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/ocamlformat-${version}.tbz";
|
||||
sha256 = "sha256-YvxGqujwpKM85/jXcm1xCb/2Fepvy1DRSC8h0g7lD0Y=";
|
||||
inherit (source) sha256;
|
||||
};
|
||||
|
||||
minimumOCamlVersion = "4.08";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildDunePackage, dune_3, dyn, ordering }:
|
||||
{ lib, buildDunePackage, dune_3, dyn, ordering, csexp }:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "stdune";
|
||||
|
|
@ -7,7 +7,11 @@ buildDunePackage {
|
|||
|
||||
dontAddPrefix = true;
|
||||
|
||||
propagatedBuildInputs = [ dyn ordering ];
|
||||
propagatedBuildInputs = [ dyn ordering csexp ];
|
||||
|
||||
preBuild = ''
|
||||
rm -r vendor/csexp
|
||||
'';
|
||||
|
||||
meta = dune_3.meta // {
|
||||
description = "Dune's unstable standard library";
|
||||
|
|
|
|||
17
pkgs/development/ocaml-modules/xdg/default.nix
Normal file
17
pkgs/development/ocaml-modules/xdg/default.nix
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
{ lib, buildDunePackage, dune_3 }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "xdg";
|
||||
inherit (dune_3) src version;
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
dontAddPrefix = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "XDG Base Directory Specification";
|
||||
inherit (dune_3.meta) homepage;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,23 +1,25 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, pyyaml
|
||||
, prance
|
||||
, marshmallow
|
||||
, pytestCheckHook
|
||||
, mock
|
||||
, openapi-spec-validator
|
||||
, prance
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pyyaml
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "apispec";
|
||||
version = "5.1.1";
|
||||
disabled = pythonOlder "3.6";
|
||||
version = "5.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d167890e37f14f3f26b588ff2598af35faa5c27612264ea1125509c8ff860834";
|
||||
hash = "sha256-XqNGC0MRULYWMj3WHsu3VXwurnF9r8HW50SUuF2PksE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -32,12 +34,14 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "apispec" ];
|
||||
pythonImportsCheck = [
|
||||
"apispec"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A pluggable API specification generator with support for the OpenAPI Specification";
|
||||
homepage = "https://github.com/marshmallow-code/apispec";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
maintainers = with maintainers; [ costrouc ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,14 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, isPy27
|
||||
, pkg-config
|
||||
, pkgconfig
|
||||
, setuptools-scm
|
||||
, libdeltachat
|
||||
, cffi
|
||||
, imapclient
|
||||
, pluggy
|
||||
, imap-tools
|
||||
, requests
|
||||
, pluggy
|
||||
, setuptools
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
|
@ -19,6 +21,8 @@ buildPythonPackage rec {
|
|||
disabled = isPy27;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
pkgconfig
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
|
|
@ -30,7 +34,7 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [
|
||||
cffi
|
||||
imapclient
|
||||
imap-tools
|
||||
pluggy
|
||||
requests
|
||||
setuptools
|
||||
|
|
|
|||
40
pkgs/development/python-modules/duckdb-engine/default.nix
Normal file
40
pkgs/development/python-modules/duckdb-engine/default.nix
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, duckdb
|
||||
, hypothesis
|
||||
, ipython-sql
|
||||
, poetry-core
|
||||
, sqlalchemy
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "duckdb-engine";
|
||||
version = "0.1.8";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "duckdb_engine";
|
||||
owner = "Mause";
|
||||
rev = version;
|
||||
hash = "sha256-dnm1nveCjrXFjDRykHp39AeVx7sk7Q/XwGn6hxdydT4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
|
||||
propagatedBuildInputs = [ duckdb sqlalchemy ];
|
||||
|
||||
checkInputs = [ pytestCheckHook hypothesis ipython-sql ];
|
||||
|
||||
pythonImportsCheck = [ "duckdb_engine" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Very very very basic sqlalchemy driver for duckdb";
|
||||
homepage = "https://github.com/Mause/duckdb_engine";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ cpcloud ];
|
||||
};
|
||||
}
|
||||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "gehomesdk";
|
||||
version = "0.4.24";
|
||||
version = "0.4.25";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-20l3zNOvZVGucm1SFzmSjkj3iOXPQhp4T5sInTGO/aQ=";
|
||||
sha256 = "sha256-TGitDdRvNKaZzbPrYvWx1bdbXAJW3OSnzbPBF2LpJW4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,6 +8,9 @@
|
|||
, clickhouse-driver
|
||||
, click
|
||||
, dask
|
||||
, datafusion
|
||||
, duckdb
|
||||
, duckdb-engine
|
||||
, graphviz
|
||||
, importlib-metadata
|
||||
, multipledispatch
|
||||
|
|
@ -15,50 +18,51 @@
|
|||
, pandas
|
||||
, parsy
|
||||
, poetry-core
|
||||
, poetry-dynamic-versioning
|
||||
, pyarrow
|
||||
, pytest
|
||||
, pydantic
|
||||
, pytest-benchmark
|
||||
, pytest-mock
|
||||
, pytest-xdist
|
||||
, python
|
||||
, pytz
|
||||
, regex
|
||||
, requests
|
||||
, sqlalchemy
|
||||
, tables
|
||||
, sqlite
|
||||
, tabulate
|
||||
, toolz
|
||||
}:
|
||||
let
|
||||
# ignore tests for which dependencies are not available
|
||||
backends = [
|
||||
"csv"
|
||||
"dask"
|
||||
"hdf5"
|
||||
"datafusion"
|
||||
"duckdb"
|
||||
"pandas"
|
||||
"parquet"
|
||||
"sqlite"
|
||||
];
|
||||
|
||||
backendsString = lib.concatStringsSep " " backends;
|
||||
|
||||
ibisTestingData = fetchFromGitHub {
|
||||
owner = "ibis-project";
|
||||
repo = "testing-data";
|
||||
rev = "743201a35c6b968cf55b054f9d28949ea15d1f0a";
|
||||
sha256 = "sha256-xuSE6wHP3aF8lnEE2SuFbTRBu49ecRmc1F3HPcszptI=";
|
||||
rev = "a88a4b3c3b54a88e7f77e59de70f5bf20fb62f19";
|
||||
sha256 = "sha256-BnRhVwPcWFwiBJ2ySgiiuUdnF4gesnTq1/dLcuvc868=";
|
||||
};
|
||||
in
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ibis-framework";
|
||||
version = "2.1.1";
|
||||
version = "3.0.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "ibis";
|
||||
owner = "ibis-project";
|
||||
rev = version;
|
||||
hash = "sha256-n3fR6wvcSfIo7760seB+5SxtoYSqQmqkzZ9VlNQF200=";
|
||||
hash = "sha256-7ywDMAHQAl39kiHfxVkq7voUEKqbb9Zq8qlaug7+ukI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
|
|
@ -68,65 +72,48 @@ buildPythonPackage rec {
|
|||
cached-property
|
||||
clickhouse-driver
|
||||
dask
|
||||
datafusion
|
||||
duckdb
|
||||
duckdb-engine
|
||||
graphviz
|
||||
importlib-metadata
|
||||
multipledispatch
|
||||
numpy
|
||||
pandas
|
||||
parsy
|
||||
poetry-dynamic-versioning
|
||||
pyarrow
|
||||
pydantic
|
||||
pytz
|
||||
regex
|
||||
requests
|
||||
sqlalchemy
|
||||
tables
|
||||
tabulate
|
||||
toolz
|
||||
] ++ lib.optionals (pythonOlder "3.8" && lib.versionOlder version "3.0.0") [
|
||||
importlib-metadata
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
click
|
||||
pytest
|
||||
pytest-benchmark
|
||||
pytest-mock
|
||||
pytest-xdist
|
||||
sqlite
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'atpublic = ">=2.3,<3"' 'atpublic = ">=2.3"' \
|
||||
--replace 'regex = "^2021.7.6"' 'regex = "*"'
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
# setup.py exists only for developer convenience and is automatically generated
|
||||
rm setup.py
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# These tests are broken upstream: https://github.com/ibis-project/ibis/issues/3291
|
||||
"test_summary_numeric"
|
||||
"test_summary_non_numeric"
|
||||
"test_batting_most_hits"
|
||||
"test_join_with_window_function"
|
||||
"test_where_long"
|
||||
"test_quantile_groupby"
|
||||
"test_summary_numeric"
|
||||
"test_summary_numeric_group_by"
|
||||
"test_summary_non_numeric"
|
||||
"test_searched_case_column"
|
||||
"test_simple_case_column"
|
||||
"test_summary_non_numeric_group_by"
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"ibis/tests"
|
||||
"ibis/backends/tests"
|
||||
"ibis/backends/{${lib.concatStringsSep "," backends}}/tests"
|
||||
"--dist=loadgroup"
|
||||
"-m"
|
||||
"'${lib.concatStringsSep " or " backends} or core'"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
set -euo pipefail
|
||||
set -eo pipefail
|
||||
|
||||
export IBIS_TEST_DATA_DIRECTORY
|
||||
IBIS_TEST_DATA_DIRECTORY="$(mktemp -d)"
|
||||
|
|
@ -138,13 +125,13 @@ buildPythonPackage rec {
|
|||
find "$IBIS_TEST_DATA_DIRECTORY" -type f -exec chmod u+rw {} +
|
||||
|
||||
# load data
|
||||
for backend in ${backendsString}; do
|
||||
python ci/datamgr.py "$backend" &
|
||||
for backend in ${lib.concatStringsSep " " backends}; do
|
||||
${python.interpreter} ci/datamgr.py load "$backend"
|
||||
done
|
||||
'';
|
||||
|
||||
wait
|
||||
'' + lib.optionalString (lib.versionOlder version "3.0.0") ''
|
||||
export PYTEST_BACKENDS="${backendsString}"
|
||||
postCheck = ''
|
||||
rm -r "$IBIS_TEST_DATA_DIRECTORY"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
|
|||
58
pkgs/development/python-modules/ipython-sql/default.nix
Normal file
58
pkgs/development/python-modules/ipython-sql/default.nix
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, ipython
|
||||
, ipython_genutils
|
||||
, pandas
|
||||
, prettytable
|
||||
, pytest
|
||||
, sqlalchemy
|
||||
, sqlparse
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "ipython-sql";
|
||||
version = "0.4.0";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "catherinedevlin";
|
||||
repo = "ipython-sql";
|
||||
rev = "117764caf099d80100ed4b09fc004b55eed6f121";
|
||||
hash = "sha256-ScQihsvRSnC7VIgy8Tzi1z4x6KIZo0SAeLPvHAVdrfA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace 'prettytable<1' prettytable
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ipython
|
||||
ipython_genutils
|
||||
prettytable
|
||||
sqlalchemy
|
||||
sqlparse
|
||||
];
|
||||
|
||||
checkInputs = [ ipython pandas pytest ];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
# running with ipython is required because the tests use objects available
|
||||
# only inside of ipython, for example the global `get_ipython()` function
|
||||
ipython -c 'import pytest; pytest.main()'
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "sql" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Introduces a %sql (or %%sql) magic.";
|
||||
homepage = "https://github.com/catherinedevlin/ipython-sql";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ cpcloud ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,34 +1,55 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, aiohttp
|
||||
, fetchpatch
|
||||
, jsonrpc-base
|
||||
, pytest-aiohttp
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jsonrpc-async";
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emlove";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1ff3523rwgira5llmf5iriwqag7b6ln9vmj0s70yyc6k98yg06rp";
|
||||
hash = "sha256-Lr8gvQR0Q46b/e1K/XyvqtJo18nBpHjlDdNq4vjCMyU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ aiohttp jsonrpc-base ];
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
jsonrpc-base
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest-aiohttp
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Fix tests with later pytest-aiohttp, https://github.com/emlove/jsonrpc-async/pull/9
|
||||
(fetchpatch {
|
||||
name = "support-later-pytest-aiohttp.patch";
|
||||
url = "https://github.com/emlove/jsonrpc-async/commit/8b790f23af0d898df90460029d5ba3bcfb0423ed.patch";
|
||||
sha256 = "sha256-rthHRF90hywMIbvIHo3Do/uzXKe+STPOoZIa80H4b/g=";
|
||||
})
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"tests.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"jsonrpc_async"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A JSON-RPC client library for asyncio";
|
||||
homepage = "https://github.com/emlove/jsonrpc-async";
|
||||
|
|
|
|||
|
|
@ -3,17 +3,21 @@
|
|||
, fetchFromGitHub
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jsonrpc-base";
|
||||
version = "2.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emlove";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1cd83m831ngck2v8m08pb2g29z4vr9iggi73l7h506v6clkb4n3y";
|
||||
hash = "sha256-fliyJmVmG1DgoePE92LKm/wknlgXgYq2mOzZMFAdqLE=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
@ -25,6 +29,10 @@ buildPythonPackage rec {
|
|||
"tests.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"jsonrpc_base"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A JSON-RPC client library base interface";
|
||||
homepage = "https://github.com/emlove/jsonrpc-base";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,52 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, dunamai
|
||||
, jinja2
|
||||
, markupsafe
|
||||
, poetry-core
|
||||
, pytest
|
||||
, tomlkit
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "poetry-dynamic-versioning";
|
||||
version = "0.14.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mtkennerly";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-J/93BFyp+XBy9TRAzAM64ZcMurHxcXDTukOGJE5yvBk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dunamai
|
||||
tomlkit
|
||||
jinja2
|
||||
markupsafe
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
disabledTests = [
|
||||
# these require .git, but leaveDotGit = true doesn't help
|
||||
"test__get_version__defaults"
|
||||
"test__get_version__format_jinja"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "poetry_dynamic_versioning" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Plugin for Poetry to enable dynamic versioning based on VCS tags";
|
||||
homepage = "https://github.com/mtkennerly/poetry-dynamic-versioning";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ cpcloud ];
|
||||
};
|
||||
}
|
||||
|
|
@ -44,6 +44,6 @@ buildPythonPackage rec {
|
|||
homepage = "https://github.com/DaveMDS/python-efl";
|
||||
platforms = platforms.linux;
|
||||
license = with licenses; [ gpl3 lgpl3 ];
|
||||
maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx romildo ];
|
||||
maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx ] ++ teams.enlightenment.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
let
|
||||
pname = "platformsh";
|
||||
version = "v3.79.0";
|
||||
version = "3.79.0";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/platformsh/platformsh-cli/releases/download/${version}/platform.phar";
|
||||
url = "https://github.com/platformsh/platformsh-cli/releases/download/v${version}/platform.phar";
|
||||
sha256 = "sha256-gTh1VS/b+D8E67w6Q4u9h0EhpFZiA2gBGe4mo49+9KY=";
|
||||
};
|
||||
|
||||
|
|
@ -31,7 +31,7 @@ stdenv.mkDerivation {
|
|||
export PATH="${lib.makeBinPath [ curl jq common-updater-scripts ]}"
|
||||
NEW_VERSION=$(curl -s https://api.github.com/repos/platformsh/platformsh-cli/releases/latest | jq .tag_name --raw-output)
|
||||
|
||||
if [[ "${version}" = "$NEW_VERSION" ]]; then
|
||||
if [[ "v${version}" = "$NEW_VERSION" ]]; then
|
||||
echo "The new version same as the old version."
|
||||
exit 0
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -7,16 +7,17 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "calibre-web";
|
||||
version = "0.6.17";
|
||||
version = "0.6.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "janeczku";
|
||||
repo = "calibre-web";
|
||||
rev = version;
|
||||
sha256 = "sha256-K2va9as+z00txpg/0fR89+kpMzpQSiSSIV489NDs8Bs=";
|
||||
sha256 = "sha256-KjmpFetNhNM5tL34e/Pn1i3hc86JZglubSMsHZWu198=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
advocate
|
||||
backports_abc
|
||||
flask-babel
|
||||
flask_login
|
||||
|
|
@ -30,6 +31,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
tornado
|
||||
unidecode
|
||||
Wand
|
||||
werkzeug
|
||||
];
|
||||
|
||||
patches = [
|
||||
|
|
@ -55,11 +57,12 @@ python3.pkgs.buildPythonApplication rec {
|
|||
--replace "cps = calibreweb:main" "calibre-web = calibreweb:main" \
|
||||
--replace "Flask>=1.0.2,<2.1.0" "Flask>=1.0.2" \
|
||||
--replace "Flask-Login>=0.3.2,<0.5.1" "Flask-Login>=0.3.2" \
|
||||
--replace "flask-wtf>=0.14.2,<0.16.0" "flask-wtf>=0.14.2" \
|
||||
--replace "lxml>=3.8.0,<4.8.0" "lxml>=3.8.0" \
|
||||
--replace "PyPDF3>=1.0.0,<1.0.4" "PyPDF3>=1.0.0" \
|
||||
--replace "requests>=2.11.1,<2.25.0" "requests" \
|
||||
--replace "unidecode>=0.04.19,<1.3.0" "unidecode>=0.04.19"
|
||||
--replace "flask-wtf>=0.14.2,<1.1.0" "flask-wtf>=0.14.2" \
|
||||
--replace "lxml>=3.8.0,<4.9.0" "lxml>=3.8.0" \
|
||||
--replace "PyPDF3>=1.0.0,<1.0.7" "PyPDF3>=1.0.0" \
|
||||
--replace "requests>=2.11.1,<2.28.0" "requests" \
|
||||
--replace "unidecode>=0.04.19,<1.4.0" "unidecode>=0.04.19" \
|
||||
--replace "werkzeug<2.1.0" ""
|
||||
'';
|
||||
|
||||
# Upstream repo doesn't provide any tests.
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dict-db-wiktionary";
|
||||
version = "20220301";
|
||||
version = "20220420";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dumps.wikimedia.org/enwiktionary/${version}/enwiktionary-${version}-pages-articles.xml.bz2";
|
||||
sha256 = "Gobilm9Rlb7qtZU+hlsYOl1/BAjj/MtNp5z2GQx8NN8=";
|
||||
sha256 = "qsha26LL2513SDtriE/0zdPX1zlnpzk1KKk+R9dSdew=";
|
||||
};
|
||||
|
||||
# script in nixpkgs does not support python2
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
cmakeFlags = [
|
||||
"-DLOCALDIR=${placeholder "out"}/share/fortunes"
|
||||
"-DNO_OFFENSIVE=true"
|
||||
];
|
||||
|
||||
patches = [ (builtins.toFile "not-a-game.patch" ''
|
||||
|
|
@ -36,6 +37,10 @@ stdenv.mkDerivation rec {
|
|||
--
|
||||
'') ];
|
||||
|
||||
postFixup = ''
|
||||
rm -f $out/share/fortunes/men-women*
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
mainProgram = "fortune";
|
||||
description = "A program that displays a pseudorandom message from a database of quotations";
|
||||
|
|
|
|||
|
|
@ -336,6 +336,8 @@ let
|
|||
inherit (pkgs) opam git mercurial coreutils gnutar bzip2;
|
||||
};
|
||||
|
||||
dune-rpc = callPackage ../development/ocaml-modules/dune-rpc { };
|
||||
|
||||
dune-site = callPackage ../development/ocaml-modules/dune-site { };
|
||||
|
||||
duration = callPackage ../development/ocaml-modules/duration { };
|
||||
|
|
@ -423,6 +425,8 @@ let
|
|||
inherit (pkgs) ffmpeg;
|
||||
};
|
||||
|
||||
fiber = callPackage ../development/ocaml-modules/fiber { };
|
||||
|
||||
fileutils = callPackage ../development/ocaml-modules/fileutils { };
|
||||
|
||||
findlib = callPackage ../development/tools/ocaml/findlib { };
|
||||
|
|
@ -1418,6 +1422,8 @@ let
|
|||
|
||||
x509 = callPackage ../development/ocaml-modules/x509 { };
|
||||
|
||||
xdg = callPackage ../development/ocaml-modules/xdg { };
|
||||
|
||||
xenstore = callPackage ../development/ocaml-modules/xenstore { };
|
||||
|
||||
xenstore_transport = callPackage ../development/ocaml-modules/xenstore_transport { };
|
||||
|
|
|
|||
|
|
@ -2531,6 +2531,8 @@ in {
|
|||
inherit (pkgs) duckdb;
|
||||
};
|
||||
|
||||
duckdb-engine = callPackage ../development/python-modules/duckdb-engine { };
|
||||
|
||||
duecredit = callPackage ../development/python-modules/duecredit { };
|
||||
|
||||
duet = callPackage ../development/python-modules/duet { };
|
||||
|
|
@ -4194,6 +4196,8 @@ in {
|
|||
|
||||
ipython = callPackage ../development/python-modules/ipython { };
|
||||
|
||||
ipython-sql = callPackage ../development/python-modules/ipython-sql { };
|
||||
|
||||
ipyvue = callPackage ../development/python-modules/ipyvue { };
|
||||
|
||||
ipyvuetify = callPackage ../development/python-modules/ipyvuetify { };
|
||||
|
|
@ -6510,6 +6514,8 @@ in {
|
|||
|
||||
poetry-core = callPackage ../development/python-modules/poetry-core { };
|
||||
|
||||
poetry-dynamic-versioning = callPackage ../development/python-modules/poetry-dynamic-versioning { };
|
||||
|
||||
poetry-semver = callPackage ../development/python-modules/poetry-semver { };
|
||||
|
||||
poetry2conda = callPackage ../development/python-modules/poetry2conda { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue