gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2024-09-15 06:04:28 +00:00
committed by GitHub
parent b698c4af44 c8cb4b8b3a
commit 5b7501db5b
19 changed files with 307 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix
+101 -2
View File
@@ -1,4 +1,4 @@
pkgs:
pkgs: lib: buildPackages:
self: super:
@@ -6,6 +6,54 @@ let
libExt = pkgs.stdenv.hostPlatform.extensions.sharedLibrary;
in
{
cl-lib = null; # builtin
cl-print = null; # builtin
tle = null; # builtin
advice = null; # builtin
# Compilation instructions for the Ada executables:
# https://www.nongnu.org/ada-mode/
ada-mode = super.ada-mode.overrideAttrs (
finalAttrs: previousAttrs: {
# actually unpack source of ada-mode and wisi
# which are both needed to compile the tools
# we need at runtime
dontUnpack = false;
srcs = [
super.ada-mode.src
self.wisi.src
];
sourceRoot = "ada-mode-${finalAttrs.version}";
nativeBuildInputs = previousAttrs.nativeBuildInputs or [ ] ++ [
buildPackages.gnat
buildPackages.gprbuild
buildPackages.dos2unix
buildPackages.re2c
];
buildInputs = previousAttrs.buildInputs or [ ] ++ [ pkgs.gnatPackages.gnatcoll-xref ];
buildPhase = ''
runHook preBuild
./build.sh -j$NIX_BUILD_CORES
runHook postBuild
'';
postInstall =
previousAttrs.postInstall or ""
+ "\n"
+ ''
./install.sh "$out"
'';
meta = previousAttrs.meta // {
maintainers = [ lib.maintainers.sternenseemann ];
};
}
);
# TODO delete this when we get upstream fix https://debbugs.gnu.org/cgi/bugreport.cgi?bug=73241
eglot = super.eglot.overrideAttrs (old: {
postInstall =
@@ -20,6 +68,57 @@ in
'';
});
jinx = super.jinx.overrideAttrs (old: {
dontUnpack = false;
nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ pkgs.pkg-config ];
buildInputs = old.buildInputs or [ ] ++ [ pkgs.enchant2 ];
postBuild =
old.postBuild or ""
+ "\n"
+ ''
NIX_CFLAGS_COMPILE="$($PKG_CONFIG --cflags enchant-2) $NIX_CFLAGS_COMPILE"
$CC -shared -o jinx-mod${libExt} jinx-mod.c -lenchant-2
'';
postInstall =
old.postInstall or ""
+ "\n"
+ ''
outd=$out/share/emacs/site-lisp/elpa/jinx-*
install -m444 -t $outd jinx-mod${libExt}
rm $outd/jinx-mod.c $outd/emacs-module.h
'';
meta = old.meta // {
maintainers = [ lib.maintainers.DamienCassou ];
};
});
plz = super.plz.overrideAttrs (old: {
dontUnpack = false;
postPatch =
old.postPatch or ""
+ "\n"
+ ''
substituteInPlace plz.el \
--replace-fail 'plz-curl-program "curl"' 'plz-curl-program "${lib.getExe pkgs.curl}"'
'';
preInstall =
old.preInstall or ""
+ "\n"
+ ''
tar -cf "$ename-$version.tar" --transform "s,^,$ename-$version/," * .[!.]*
src="$ename-$version.tar"
'';
});
pq = super.pq.overrideAttrs (old: {
buildInputs = old.buildInputs or [ ] ++ [ pkgs.postgresql ];
});
# native compilation for tests/seq-tests.el never ends
# delete tests/seq-tests.el to workaround this
seq = super.seq.overrideAttrs (old: {
@@ -41,7 +140,7 @@ in
buildPhase =
old.buildPhase or ""
+ ''
$CXX -shared -o xapian-lite${libExt} xapian-lite.cc $NIX_CFLAGS_COMPILE -lxapian
$CXX -shared -o xapian-lite${libExt} xapian-lite.cc -lxapian
'';
postInstall =
old.postInstall or ""
pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix
+1 -4
View File
@@ -47,12 +47,9 @@ self: let
super = imported;
commonOverrides = import ./elpa-common-overrides.nix pkgs;
commonOverrides = import ./elpa-common-overrides.nix pkgs lib buildPackages;
overrides = self: super: {
pq = super.pq.overrideAttrs (old: {
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.postgresql ];
});
};
elpaDevelPackages =
pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
+1 -85
View File
@@ -47,7 +47,7 @@ self: let
super = imported;
commonOverrides = import ./elpa-common-overrides.nix pkgs;
commonOverrides = import ./elpa-common-overrides.nix pkgs lib buildPackages;
overrides = self: super: {
# upstream issue: Wrong type argument: arrayp, nil
@@ -56,90 +56,6 @@ self: let
then markBroken super.org-transclusion
else super.org-transclusion;
rcirc-menu = markBroken super.rcirc-menu; # Missing file header
cl-lib = null; # builtin
cl-print = null; # builtin
tle = null; # builtin
advice = null; # builtin
# Compilation instructions for the Ada executables:
# https://www.nongnu.org/ada-mode/
ada-mode = super.ada-mode.overrideAttrs (old: {
# actually unpack source of ada-mode and wisi
# which are both needed to compile the tools
# we need at runtime
dontUnpack = false;
srcs = [
super.ada-mode.src
self.wisi.src
];
sourceRoot = "ada-mode-${self.ada-mode.version}";
nativeBuildInputs = old.nativeBuildInputs ++ [
buildPackages.gnat
buildPackages.gprbuild
buildPackages.dos2unix
buildPackages.re2c
];
buildInputs = old.buildInputs ++ [
pkgs.gnatPackages.gnatcoll-xref
];
buildPhase = ''
runHook preBuild
./build.sh -j$NIX_BUILD_CORES
runHook postBuild
'';
postInstall = (old.postInstall or "") + "\n" + ''
./install.sh "$out"
'';
meta = old.meta // {
maintainers = [ lib.maintainers.sternenseemann ];
};
});
jinx = super.jinx.overrideAttrs (old: let
libExt = pkgs.stdenv.hostPlatform.extensions.sharedLibrary;
in {
dontUnpack = false;
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [
pkgs.pkg-config
];
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.enchant2 ];
postBuild = ''
NIX_CFLAGS_COMPILE="$($PKG_CONFIG --cflags enchant-2) $NIX_CFLAGS_COMPILE"
$CC -shared -o jinx-mod${libExt} jinx-mod.c -lenchant-2
'';
postInstall = (old.postInstall or "") + "\n" + ''
outd=$out/share/emacs/site-lisp/elpa/jinx-*
install -m444 -t $outd jinx-mod${libExt}
rm $outd/jinx-mod.c $outd/emacs-module.h
'';
meta = old.meta // {
maintainers = [ lib.maintainers.DamienCassou ];
};
});
plz = super.plz.overrideAttrs (
old: {
dontUnpack = false;
postPatch = old.postPatch or "" + ''
substituteInPlace ./plz.el \
--replace 'plz-curl-program "curl"' 'plz-curl-program "${pkgs.curl}/bin/curl"'
'';
preInstall = ''
tar -cf "$pname-$version.tar" --transform "s,^,$pname-$version/," * .[!.]*
src="$pname-$version.tar"
'';
}
);
};
pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix
-33
View File
@@ -1,33 +0,0 @@
{
stdenv,
lib,
melpaBuild,
fetchFromGitLab,
unstableGitUpdater,
}:
melpaBuild {
pname = "ligo-mode";
version = "1.7.0-unstable-2024-08-22";
src = fetchFromGitLab {
owner = "ligolang";
repo = "ligo";
rev = "47128d41a9329356cbad40a982d8144da19a9218";
hash = "sha256-IrxPnbWrhqe3TxELsqa2y4NdcfEJMGUcGCdNuDG+rfs=";
};
files = ''("tools/emacs/ligo-mode.el")'';
ignoreCompilationError = false;
passthru.updateScript = unstableGitUpdater { };
meta = {
description = "Major mode for editing LIGO source code";
homepage = "https://gitlab.com/ligolang/ligo";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ AndersonTorres ];
broken = stdenv.isDarwin; # different src hash on darwin
};
}
pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
+8 -10
View File
@@ -31,36 +31,34 @@ in
{ lib, pkgs }: variant: self:
let
dontConfigure = pkg:
if pkg != null then pkg.override (args: {
pkg.override (args: {
melpaBuild = drv: args.melpaBuild (drv // {
dontConfigure = true;
});
}) else null;
});
markBroken = pkg:
if pkg != null then pkg.override (args: {
pkg.override (args: {
melpaBuild = drv: args.melpaBuild (drv // {
meta = (drv.meta or { }) // { broken = true; };
});
}) else null;
});
externalSrc = pkg: epkg:
if pkg != null then pkg.override (args: {
pkg.override (args: {
melpaBuild = drv: args.melpaBuild (drv // {
inherit (epkg) src version;
propagatedUserEnvPkgs = [ epkg ];
});
}) else null;
});
buildWithGit = pkg: pkg.overrideAttrs (attrs: {
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ pkgs.git ];
});
fix-rtags = pkg:
if pkg != null then dontConfigure (externalSrc pkg pkgs.rtags)
else null;
fix-rtags = pkg: dontConfigure (externalSrc pkg pkgs.rtags);
generateMelpa = lib.makeOverridable ({ archiveJson ? defaultArchive
}:
@@ -130,7 +128,7 @@ let
ligo-mode =
if super.ligo-mode.version == "0.3"
then markBroken super.ligo-mode
else null; # auto-updater is failing; use manual one
else super.ligo-mode;
# upstream issue: missing file header
link = markBroken super.link;
pkgs/applications/misc/zettlr/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {
zettlr = {
version = "3.0.2";
hash = "sha256-xwBq+kLmTth15uLiYWJOhi/YSPZVJNO6JTrKFojSDXA=";
version = "3.2.0";
hash = "sha256-gttDGWFJ/VmOyqgOSKnCqqPtNTKJd1fmDpa0ZAX3xc8=";
};
}
pkgs/applications/misc/zettlr/generic.nix
+19 -11
View File
@@ -1,9 +1,11 @@
{ pname
, version
, hash
, appimageTools
, lib
, fetchurl
{
pname,
version,
hash,
appimageTools,
lib,
fetchurl,
makeWrapper,
}:
# Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs.
@@ -19,21 +21,27 @@ in
appimageTools.wrapType2 rec {
inherit pname version src;
extraPkgs = pkgs: [ pkgs.texliveMedium pkgs.pandoc ];
extraPkgs = pkgs: [
pkgs.texliveMedium
pkgs.pandoc
];
extraInstallCommands = ''
source "${makeWrapper}/nix-support/setup-hook"
wrapProgram $out/bin/zettlr \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/Zettlr.desktop
install -m 444 -D ${appimageContents}/Zettlr.png $out/share/icons/hicolor/512x512/apps/Zettlr.png
substituteInPlace $out/share/applications/Zettlr.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'
--replace-fail 'Exec=AppRun' 'Exec=${pname}'
'';
meta = with lib; {
meta = {
description = "Markdown editor for writing academic texts and taking notes";
homepage = "https://www.zettlr.com";
platforms = [ "x86_64-linux" ];
license = licenses.gpl3;
maintainers = with maintainers; [ tfmoraes ];
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ tfmoraes ];
mainProgram = "zettlr";
};
}
pkgs/applications/networking/cluster/kubecolor/default.nix
+7 -3
View File
@@ -2,19 +2,23 @@
buildGoModule rec {
pname = "kubecolor";
version = "0.3.3";
version = "0.4.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-VGpyYc6YmRr58OSRQvWTo4f8ku8L1/gn0ilbQSotO2k=";
sha256 = "sha256-jOFeTAfV7X8+z+DBOBOFVcspxZ8QssKFWRGK9HnqBO0=";
};
vendorHash = "sha256-Gzz+mCEMQCcLwTiGMB8/nXk7HDAEGkEapC/VOyXrn/Q=";
vendorHash = "sha256-b99HAM1vsncq9Q5XJiHZHyv7bjQs6GGyNAMONmGpxms=";
ldflags = [ "-s" "-w" "-X main.Version=${version}" ];
subPackages = [
"."
];
meta = with lib; {
description = "Colorizes kubectl output";
mainProgram = "kubecolor";
pkgs/applications/networking/nextcloud-client/default.nix
+2 -2
View File
@@ -26,7 +26,7 @@
stdenv.mkDerivation rec {
pname = "nextcloud-client";
version = "3.13.3";
version = "3.13.4";
outputs = [ "out" "dev" ];
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
owner = "nextcloud-releases";
repo = "desktop";
rev = "v${version}";
hash = "sha256-Z2/WllEiz/Yj/GyIczfA4L2+3Hr8Jmo7X2W/hP1PmwI=";
hash = "sha256-anQwIqWtHdKFfUuCekiyrdg9xzxcs5bVJ0VDMtyVfw8=";
};
patches = [
pkgs/applications/office/tryton/default.nix
+14 -5
View File
@@ -19,22 +19,23 @@
python3Packages.buildPythonApplication rec {
pname = "tryton";
version = "7.2.4";
disabled = !python3Packages.isPy3k;
version = "7.2.5";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-LYebXgAvIG3pUF7GpRjeQvP6S83yPjPO/lZg9r0X+Kc=";
hash = "sha256-U6hA6TuIMDTFAZUic60A5IKr/LKxKZEgiTIhkLlTJSw=";
};
build-system = [ python3Packages.setuptools ];
nativeBuildInputs = [
pkg-config
gobject-introspection
wrapGAppsHook3
];
propagatedBuildInputs = with python3Packages; [
dependencies = with python3Packages; [
python-dateutil
pygobject3
goocalendar
@@ -55,8 +56,16 @@ python3Packages.buildPythonApplication rec {
pango
];
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
strictDeps = false;
pythonImportsCheck = [ "tryton" ];
doCheck = false;
meta = with lib; {
pkgs/by-name/_6/_64gram/package.nix
+2 -2
View File
@@ -8,7 +8,7 @@
telegram-desktop.overrideAttrs (old: rec {
pname = "64gram";
version = "1.1.34";
version = "1.1.39";
src = fetchFromGitHub {
owner = "TDesktop-x64";
@@ -16,7 +16,7 @@ telegram-desktop.overrideAttrs (old: rec {
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-DbHbhkInZi8B/0fvbCWutN4noEv7MZ+C5Eg7g+89Moo=";
hash = "sha256-+slLW177PhNvMb4ARY3X95eKVZiZTxJIPuSurTiGTls=";
};
patches = (old.patches or []) ++ [
pkgs/by-name/ca/calligraphy/package.nix
+61
View File
@@ -0,0 +1,61 @@
{
lib,
python3Packages,
fetchFromGitLab,
meson,
ninja,
pkg-config,
gobject-introspection,
wrapGAppsHook4,
desktop-file-utils,
libadwaita,
}:
python3Packages.buildPythonApplication rec {
pname = "calligraphy";
version = "1.0.1";
pyproject = false; # Built with meson
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GeopJr";
repo = "Calligraphy";
rev = "refs/tags/v${version}";
hash = "sha256-Vqbrt8zS2PL4Fhc421DY+IkjD4nuGqSNTLlE8IYSmcI=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
gobject-introspection
wrapGAppsHook4
desktop-file-utils
];
buildInputs = [
libadwaita
];
dependencies = with python3Packages; [
pygobject3
pyfiglet
];
dontWrapGApps = true;
makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ];
meta = {
description = "GTK tool turning text into ASCII banners";
homepage = "https://calligraphy.geopjr.dev";
license = with lib.licenses; [
gpl3Plus
# and
cc0
];
mainProgram = "calligraphy";
maintainers = with lib.maintainers; [ aleksana ];
platforms = lib.platforms.linux;
};
}
pkgs/by-name/pa/papers/package.nix
+5
View File
@@ -111,6 +111,11 @@ stdenv.mkDerivation (finalAttrs: {
stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "16"
) "-Wno-error=incompatible-function-pointer-types";
postInstall = ''
substituteInPlace $out/share/thumbnailers/papers.thumbnailer \
--replace-fail '=papers-thumbnailer' "=$out/bin/papers-thumbnailer"
'';
preFixup = ''
gappsWrapperArgs+=(
--prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
pkgs/by-name/sn/snips-sh/package.nix
+33
View File
@@ -0,0 +1,33 @@
{
lib,
buildGoModule,
fetchFromGitHub,
sqlite,
libtensorflow,
withTensorflow ? false,
}:
buildGoModule rec {
pname = "snips-sh";
version = "0.4.0";
vendorHash = "sha256-u2f9aHUrfuM4ZsTWA955sCkgcGBFlNhEU2Qlq2C2Kso=";
src = fetchFromGitHub {
owner = "robherley";
repo = "snips.sh";
rev = "v${version}";
hash = "sha256-gfZFLlTFofYQ72rQjgB8g012vbxFjk8bLYTVJwZNgMs=";
};
tags = (lib.optional (!withTensorflow) "noguesser");
buildInputs = [ sqlite ] ++ (lib.optional withTensorflow libtensorflow);
meta = {
description = "passwordless, anonymous SSH-powered pastebin with a human-friendly TUI and web UI";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
homepage = "https://snips.sh";
maintainers = with lib.maintainers; [ jeremiahs ];
mainProgram = "snips.sh";
};
}
pkgs/development/python-modules/gmqtt/default.nix
+41
View File
@@ -0,0 +1,41 @@
{
lib,
buildPythonPackage,
fetchPypi,
# build-system
setuptools,
# tests
pytestCheckHook,
pytest-asyncio,
}:
buildPythonPackage rec {
pname = "gmqtt";
version = "0.6.16";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-3dH9wcauYE50N3z3DpnwZ+V5wDwccaas1JThmek7f6Q=";
};
build-system = [ setuptools ];
# Tests require local socket connection which is forbidden in the sandbox
doCheck = false;
nativeCheckInputs = [
pytestCheckHook
pytest-asyncio
];
pythonImportsCheck = [ "gmqtt" ];
meta = {
description = "Python MQTT v5.0 async client";
homepage = "https://github.com/wialon/gmqtt";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ doronbehar ];
};
}
pkgs/development/python-modules/knx-frontend/default.nix
+2 -2
View File
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "knx-frontend";
version = "2024.9.4.64538";
version = "2024.9.10.221729";
pyproject = true;
# TODO: source build, uses yarn.lock
src = fetchPypi {
pname = "knx_frontend";
inherit version;
hash = "sha256-xOBo6y2yT5MNIzyJ8SVVndHrM+Ol/GZXLC/nAwqXY2M=";
hash = "sha256-Imv4DcQCdT5iHIsDtxzLRwTWQqRgR4ASx/kdkmIbK6o=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/scikit-hep-testdata/default.nix
+2 -2
View File
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "scikit-hep-testdata";
version = "0.4.47";
version = "0.4.48";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "scikit-hep";
repo = "scikit-hep-testdata";
rev = "refs/tags/v${version}";
hash = "sha256-YCzqAe+TVNbPrHPxD/OjxkjmYCb5pZO0+l68xUJp72w=";
hash = "sha256-B0YmO48aGDRsQ56+q7/Z6xquCNjbAQ55fkY6auvwB90=";
};
build-system = [ setuptools-scm ];
pkgs/tools/misc/miniserve/default.nix
+4 -4
View File
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "miniserve";
version = "0.27.1-unstable-2024-08-08";
version = "0.28.0";
src = fetchFromGitHub {
owner = "svenstaro";
repo = "miniserve";
rev = "cb495906b11c9638eb7a2707d12810482ac6e3f6";
hash = "sha256-NNORLa1Vct2Iwn/Cp3w1U3KGTXoSwar4QI+dNe+Po54=";
rev = "v${version}";
hash = "sha256-jrQnmIYap5eHVWPqoRsXVroB0VWLKxesi3rB/WylR0U=";
};
cargoHash = "sha256-syBvuCeEHzahEwvLY3f/N02GJRHPi4JDCRYNLd7CqoU=";
cargoHash = "sha256-/BBue4YfpFk/tId2GV9sstEdgNuy3QnieINGnx45ydU=";
nativeBuildInputs = [
installShellFiles
pkgs/top-level/python-packages.nix
+2
View File
@@ -5081,6 +5081,8 @@ self: super: with self; {
enablePython = true;
});
gmqtt = callPackage ../development/python-modules/gmqtt { };
gntp = callPackage ../development/python-modules/gntp { };
gnureadline = callPackage ../development/python-modules/gnureadline { };