Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
d6a1c7033e
|
|
@ -233,6 +233,13 @@
|
|||
<link xlink:href="options.html#opt-services.languagetool.enable">services.languagetool</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://gitlab.com/CalcProgrammer1/OpenRGB/-/tree/master">OpenRGB</link>,
|
||||
a FOSS tool for controlling RGB lighting. Available as
|
||||
<link xlink:href="options.html#opt-services-hardware-openrgb-enable">services.hardware.openrgb.enable</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://www.getoutline.com/">Outline</link>,
|
||||
|
|
|
|||
|
|
@ -85,6 +85,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
- [languagetool](https://languagetool.org/), a multilingual grammar, style, and spell checker.
|
||||
Available as [services.languagetool](options.html#opt-services.languagetool.enable).
|
||||
|
||||
- [OpenRGB](https://gitlab.com/CalcProgrammer1/OpenRGB/-/tree/master), a FOSS tool for controlling RGB lighting. Available as [services.hardware.openrgb.enable](options.html#opt-services-hardware-openrgb-enable).
|
||||
|
||||
- [Outline](https://www.getoutline.com/), a wiki and knowledge base similar to Notion. Available as [services.outline](#opt-services.outline.enable).
|
||||
|
||||
- [alps](https://git.sr.ht/~migadu/alps), a simple and extensible webmail. Available as [services.alps](#opt-services.alps.enable).
|
||||
|
|
|
|||
|
|
@ -455,6 +455,7 @@
|
|||
./services/hardware/lcd.nix
|
||||
./services/hardware/lirc.nix
|
||||
./services/hardware/nvidia-optimus.nix
|
||||
./services/hardware/openrgb.nix
|
||||
./services/hardware/pcscd.nix
|
||||
./services/hardware/pommed.nix
|
||||
./services/hardware/power-profiles-daemon.nix
|
||||
|
|
|
|||
52
nixos/modules/services/hardware/openrgb.nix
Normal file
52
nixos/modules/services/hardware/openrgb.nix
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
{ pkgs, lib, config, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.hardware.openrgb;
|
||||
in {
|
||||
options.services.hardware.openrgb = {
|
||||
enable = mkEnableOption (lib.mdDoc "OpenRGB server");
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.openrgb;
|
||||
defaultText = literalMD "pkgs.openrgb";
|
||||
description = lib.mdDoc "Set version of openrgb package to use.";
|
||||
};
|
||||
|
||||
motherboard = mkOption {
|
||||
type = types.nullOr (types.enum [ "amd" "intel" ]);
|
||||
default = null;
|
||||
description = lib.mdDoc "CPU family of motherboard. Allows for addition motherboard i2c support.";
|
||||
};
|
||||
|
||||
server.port = mkOption {
|
||||
type = types.port;
|
||||
default = 6742;
|
||||
description = lib.mdDoc "Set server port of openrgb.";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
services.udev.packages = [ cfg.package ];
|
||||
|
||||
boot.kernelModules = [ "i2c-dev" ]
|
||||
++ lib.optionals (cfg.motherboard == "amd") [ "i2c-piix" ]
|
||||
++ lib.optionals (cfg.motherboard == "intel") [ "i2c-i801" ];
|
||||
|
||||
systemd.services.openrgb = {
|
||||
description = "OpenRGB server daemon";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = "${cfg.package}/bin/openrgb --server --server-port ${toString cfg.server.port}";
|
||||
Restart = "always";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ jonringer ];
|
||||
}
|
||||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "batik";
|
||||
version = "1.14";
|
||||
version = "1.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/xmlgraphics/batik/binaries/batik-bin-${version}.tar.gz";
|
||||
sha256 = "sha256-D06qgb5wdS5AahnznDnAGISPCZY/CPqJdGQFRwUsRhg=";
|
||||
sha256 = "sha256-NYo7+8DikUmDsioM1Q1YW1s3KwsQeTnwIKDr+RHxxyo=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -27,11 +27,11 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "calibre";
|
||||
version = "5.42.0";
|
||||
version = "5.44.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-pob9GZl3Wiky5aMGGvcNQdDrKh19bo+n5ihdS45X+Vg=";
|
||||
hash = "sha256-b/qj6v02okNV5ZV/D4ONttttNFbPoXy00Tn9lOuviOw=";
|
||||
};
|
||||
|
||||
# https://sources.debian.org/patches/calibre/${version}+dfsg-1
|
||||
|
|
@ -40,12 +40,12 @@ mkDerivation rec {
|
|||
(fetchpatch {
|
||||
name = "0001-only-plugin-update.patch";
|
||||
url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}%2Bdfsg-1/debian/patches/0001-only-plugin-update.patch";
|
||||
sha256 = "sha256:1h2hl4z9qm17crms4d1lq2cq44cnxbga1dv6qckhxvcg6pawxg3l";
|
||||
sha256 = "sha256-dLzO1TWP7Q4nw2a3oN7qlhGCmcA0NKJrZidUnD6hUMA=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "0007-Hardening-Qt-code.patch";
|
||||
url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}%2Bdfsg-1/debian/patches/0007-Hardening-Qt-code.patch";
|
||||
sha256 = "sha256:18wps7fn0cpzb7gf78f15pmbaff4vlygc9g00hq7zynfa4pcgfdg";
|
||||
name = "0006-Hardening-Qt-code.patch";
|
||||
url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}%2Bdfsg-1/debian/patches/0006-Hardening-Qt-code.patch";
|
||||
sha256 = "sha256-/X6iZZFxv4793h2yYI3UAz0mLNEmKpdVrmOnABFT0tE=";
|
||||
})
|
||||
]
|
||||
++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dasel";
|
||||
version = "1.26.1";
|
||||
version = "1.27.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TomWright";
|
||||
repo = "dasel";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7DQJiwszE+qGcyyOZd9Zzg9PPc79HTYk8knI7upduts=";
|
||||
sha256 = "sha256-bVAW8DrLqZKm9/iLleFxIMVkxaqhgdKwQUSEPpYhwt8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-zli9SEBU6n0JusAquqb9+O2W4yPZS7zmC5PCebVSeIA=";
|
||||
|
|
|
|||
11
pkgs/applications/misc/doctave/cargo-lock.patch
Normal file
11
pkgs/applications/misc/doctave/cargo-lock.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -295,7 +295,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "doctave"
|
||||
-version = "0.4.0"
|
||||
+version = "0.4.2"
|
||||
dependencies = [
|
||||
"alphanumeric-sort",
|
||||
"ascii",
|
||||
30
pkgs/applications/misc/doctave/default.nix
Normal file
30
pkgs/applications/misc/doctave/default.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{ lib, rustPlatform, fetchFromGitHub, stdenv, CoreServices }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "doctave";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "doctave";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1780pqvnlbxxhm7rynnysqr0vihdkwmc6rmgp43bmj1k18ar4qgj";
|
||||
};
|
||||
|
||||
# Cargo.lock is outdated
|
||||
cargoPatches = [ ./cargo-lock.patch ];
|
||||
|
||||
cargoSha256 = "sha256-keLcNttdM9JUnn3qi/bWkcObIHl3MRACDHKPSZuScOc=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
CoreServices
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A batteries-included developer documentation site generator";
|
||||
homepage = "https://github.com/doctave/doctave";
|
||||
changelog = "https://github.com/doctave/doctave/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "k9s";
|
||||
version = "0.26.5";
|
||||
version = "0.26.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "derailed";
|
||||
repo = "k9s";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-IARb8MGFIg2X5rOipQyM2qL3fXa6xRS58cavR4ytH+k=";
|
||||
sha256 = "sha256-cWk2K1+j5P14TO7YSTY9/1RT2HjG9BtfsFJy+cg9EDs=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
|
|
|||
|
|
@ -26,17 +26,12 @@ let
|
|||
src = fetchFromGitHub {
|
||||
owner = "paperless-ngx";
|
||||
repo = "django-q";
|
||||
sha256 = "sha256-aoDuPig8Nf8fLzn7GjBn69aF2zH2l8gxascAu9lIG3U=";
|
||||
rev = "71abc78fdaec029cf71e9849a3b0fa084a1678f7";
|
||||
hash = "sha256-alu7tZwUn77xhUF9c/aGmwRwO//mR/FucXjvXUl/6ek=";
|
||||
rev = "8b5289d8caf36f67fb99448e76ead20d5b498c1b";
|
||||
};
|
||||
# due to paperless-ngx modification of the pyproject.toml file
|
||||
# the patch is not needed any more
|
||||
patches = [];
|
||||
});
|
||||
|
||||
# django-extensions 3.1.5 is required, but its tests are incompatible with Django 4
|
||||
django-extensions = super.django-extensions.overridePythonAttrs (_: {
|
||||
doCheck = false;
|
||||
patches = [ ];
|
||||
});
|
||||
|
||||
aioredis = super.aioredis.overridePythonAttrs (oldAttrs: rec {
|
||||
|
|
@ -66,12 +61,12 @@ let
|
|||
in
|
||||
python.pkgs.pythonPackages.buildPythonApplication rec {
|
||||
pname = "paperless-ngx";
|
||||
version = "1.8.0";
|
||||
version = "1.9.1";
|
||||
|
||||
# Fetch the release tarball instead of a git ref because it contains the prebuilt fontend
|
||||
src = fetchurl {
|
||||
url = "https://github.com/paperless-ngx/paperless-ngx/releases/download/v${version}/${pname}-v${version}.tar.xz";
|
||||
hash = "sha256-BLfhh04RvBJFRQiPXkMl8XlWqZOWKmjjl+6lZ326stU=";
|
||||
hash = "sha256-KWq3zUES8klXexNO9krlqZKZEajOhkTHF13t/3rxrPc=";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
|
|
@ -120,6 +115,7 @@ python.pkgs.pythonPackages.buildPythonApplication rec {
|
|||
inotifyrecursive
|
||||
joblib
|
||||
langdetect
|
||||
pkgs.libmysqlclient
|
||||
lxml
|
||||
msgpack
|
||||
numpy
|
||||
|
|
|
|||
|
|
@ -1,23 +1,25 @@
|
|||
{ lib
|
||||
, mkDerivation
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, pkg-config
|
||||
, qtbase
|
||||
, qttools
|
||||
, qpdf
|
||||
, podofo
|
||||
, imagemagick
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "pdfmixtool";
|
||||
version = "1.0.2";
|
||||
version = "1.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "scarpetta";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "066ap1w05gj8n0kvilyhlr1fzwrmlczx3lax7mbw0rfid9qh3467";
|
||||
hash = "sha256-S8hhWZ6nHyIWPwsfl+o9XnljLD3aE/vthCLuWEbm5nc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -26,12 +28,22 @@ mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
imagemagick
|
||||
qtbase
|
||||
qttools
|
||||
qpdf
|
||||
podofo
|
||||
];
|
||||
|
||||
patches = [
|
||||
# fix incompatibility with qpdf11
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/scarpetta/pdfmixtool/-/commit/81f7e96f6e68dfeba3cd4e00d8553dfdd2d7f2fa.diff";
|
||||
hash = "sha256-uBchYjUIqL7dJR7U/TSxhSGu1qY742cFUIv0XKU6L2g=";
|
||||
})
|
||||
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An application to split, merge, rotate and mix PDF files";
|
||||
homepage = "https://gitlab.com/scarpetta/pdfmixtool";
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "snakemake";
|
||||
version = "7.14.1";
|
||||
version = "7.14.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "snakemake";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-o2pERzt6wU/EiXBc9kI2qn9PhXGyvNiEWbSRzI85R8c=";
|
||||
hash = "sha256-4XduybmDmlux3zvjbN1ouaJ1PkNO8h6vHuxgZ3YLBrw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "colima";
|
||||
version = "0.4.4";
|
||||
version = "0.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abiosoft";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "bSBaSS+rVkFqTSdyegdE/F0X5u7yvF/nHslAO3xgD6I=";
|
||||
sha256 = "sha256-hoxEf62EPD/WFXW6qbPCvEwViwmme3pSBfjeKOLsGjc=";
|
||||
# We need the git revision
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
|
|
@ -28,7 +28,7 @@ buildGoModule rec {
|
|||
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||
|
||||
vendorSha256 = "sha256-jDzDwK7qA9lKP8CfkKzfooPDrHuHI4OpiLXmX9vOpOg=";
|
||||
vendorSha256 = "sha256-tsMQMWEkTE1NhevcqBETGWiboqL6QTepgnIo4B5Y4wQ=";
|
||||
|
||||
CGO_ENABLED = 1;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,57 +1,36 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, intltool
|
||||
, glib
|
||||
, mkXfceDerivation
|
||||
, exo
|
||||
, gtk3
|
||||
, libXtst
|
||||
, xorgproto
|
||||
, libxfce4ui
|
||||
, libxfce4util
|
||||
, xfce4-panel
|
||||
, libxfce4ui
|
||||
, xfconf
|
||||
, gtk3
|
||||
, hicolor-icon-theme
|
||||
, xfce
|
||||
, xorgproto
|
||||
}:
|
||||
|
||||
let
|
||||
mkXfceDerivation rec {
|
||||
category = "panel-plugins";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "xfce4-cpugraph-plugin";
|
||||
version = "1.2.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-dzJG9XwYJKhUaNQRnBeusHFw7R66zo+kBsf7z1tHr5k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
intltool
|
||||
];
|
||||
rev-prefix = "xfce4-cpugraph-plugin-";
|
||||
odd-unstable = false;
|
||||
sha256 = "sha256-Elm10ZGN93R+1XZ4vJJZZIJ6OcaHpsrH0nQRMMuFnLY=";
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
exo
|
||||
gtk3
|
||||
libXtst
|
||||
xorgproto
|
||||
libxfce4util
|
||||
libxfce4ui
|
||||
libxfce4util
|
||||
xfce4-panel
|
||||
xfconf
|
||||
gtk3
|
||||
hicolor-icon-theme
|
||||
xorgproto
|
||||
];
|
||||
|
||||
passthru.updateScript = xfce.archiveUpdater { inherit category pname version; };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://docs.xfce.org/panel-plugins/xfce4-cpugraph-plugin";
|
||||
description = "CPU graph show for Xfce panel";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ] ++ teams.xfce.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nextpnr";
|
||||
version = "0.3";
|
||||
version = "0.4";
|
||||
|
||||
srcs = [
|
||||
(fetchFromGitHub {
|
||||
owner = "YosysHQ";
|
||||
repo = "nextpnr";
|
||||
rev = "${pname}-${version}";
|
||||
hash = "sha256-q4h1TNAn66fJou8abNFowRbGXZTBfz5x+H5Q/psMvIw=";
|
||||
hash = "sha256-gnNUFSV+/SzCuP43KyUUgVNdAzjOM7lOLNJT72L8lTY=";
|
||||
name = "nextpnr";
|
||||
})
|
||||
(fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "8.5.17";
|
||||
version = "8.3.29";
|
||||
packInstall = swiplPath: pack:
|
||||
''${swiplPath}/bin/swipl -g "pack_install(${pack}, [package_directory(\"${swiplPath}/lib/swipl/pack\"), silent(true), interactive(false)])." -t "halt."
|
||||
'';
|
||||
|
|
@ -47,7 +47,7 @@ stdenv.mkDerivation {
|
|||
owner = "SWI-Prolog";
|
||||
repo = "swipl-devel";
|
||||
rev = "V${version}";
|
||||
sha256 = "sha256-n1o6eG40DHnmNXuifQC6UFwGzuiL22V++0qRmq1RSzc=";
|
||||
sha256 = "sha256-2QYY3VDG3dhbv5gtSid4eMYMxhhpggCedJL+RhtbbaU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,30 +1,27 @@
|
|||
{ lib, stdenv, fetchFromGitHub, python3, boost, cmake }:
|
||||
|
||||
let
|
||||
rev = "2f06397673bbca3da11928d538b8ab7d01c944c6";
|
||||
rev = "488f4e71073062de314c55a037ede7cf03a3324c";
|
||||
# git describe --tags
|
||||
realVersion = "1.0-534-g${builtins.substring 0 7 rev}";
|
||||
realVersion = "1.2.1-14-g${builtins.substring 0 7 rev}";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "trellis";
|
||||
version = "2021-12-14";
|
||||
version = "unstable-2022-09-14";
|
||||
|
||||
srcs = [
|
||||
(fetchFromGitHub {
|
||||
owner = "YosysHQ";
|
||||
repo = "prjtrellis";
|
||||
inherit rev;
|
||||
hash = "sha256-m5CalAIbzY2bhOvpBbPBeLZeDp+itk1HlRsSmtiddaA=";
|
||||
hash = "sha256-Blbu+0rlM/3izbF0XCvkNpSAND0IclWEwK7anzyrpvw=";
|
||||
name = "trellis";
|
||||
})
|
||||
|
||||
(fetchFromGitHub {
|
||||
owner = "YosysHQ";
|
||||
repo = "prjtrellis-db";
|
||||
# note: the upstream submodule points to revision 0ee729d20eaf,
|
||||
# but that's just the tip of the branch that was merged into master.
|
||||
# fdf4bf275a is the merge commit itself
|
||||
rev = "fdf4bf275a7402654bc643db537173e2fbc86103";
|
||||
sha256 = "eDq2wU2pnfK9bOkEVZ07NQPv02Dc6iB+p5GTtVBiyQA=";
|
||||
rev = "35d900a94ff0db152679a67bf6e4fbf40ebc34aa";
|
||||
hash = "sha256-r6viR8y9ZjURGNbsa0/YY8lzy9kGzjuu408ntxwpqm0=";
|
||||
name = "trellis-database";
|
||||
})
|
||||
];
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wasmtime";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bytecodealliance";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-e5YEHVALk6wJ76dl68mT+ncztU2FjpFqTp6YS9Gsz2c=";
|
||||
sha256 = "sha256-dQ5RAeJYEfU/WcHf9Xz1jjetlEePB1oHDAbKpzqkda4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-q0eS5vPOh/VhC+oke2GeZX18GmrHwrsaMXcHK0jBZ7A=";
|
||||
cargoSha256 = "sha256-0xEMlt1d6E+APf6SQ23E+mS/U4f0ziRpn2tTF9nSbx4=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"--package wasmtime-cli"
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
, zstd
|
||||
, enableShared ? !stdenv.hostPlatform.isStatic
|
||||
, enableFlight ? true
|
||||
, enableJemalloc ? !(stdenv.isAarch64 && stdenv.isDarwin)
|
||||
, enableJemalloc ? !stdenv.isDarwin
|
||||
# boost/process is broken in 1.69 on darwin, but fixed in 1.70 and
|
||||
# non-existent in older versions
|
||||
# see https://github.com/boostorg/process/issues/55
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
nv-codec-headers = nv-codec-headers-11;
|
||||
}).overrideAttrs (old: rec {
|
||||
pname = "jellyfin-ffmpeg";
|
||||
version = "5.1.1-1";
|
||||
version = "5.1.1-2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jellyfin";
|
||||
repo = "jellyfin-ffmpeg";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WxUADm5z6SH6Xegi2dhhien5IBY/Y/ZZaXr7MdOvpYA=";
|
||||
sha256 = "sha256-aviluHVNGxbWkmJ6mnlFbtRKKb0FoKkNw0Bgl+tmqyA=";
|
||||
};
|
||||
|
||||
configureFlags = old.configureFlags ++ [
|
||||
|
|
|
|||
|
|
@ -1,29 +1,28 @@
|
|||
{ lib, stdenv, fetchFromGitHub, libjpeg, zlib, perl }:
|
||||
{ lib, stdenv, fetchFromGitHub, libjpeg, zlib, cmake, perl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qpdf";
|
||||
version = "10.6.3";
|
||||
version = "11.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qpdf";
|
||||
repo = "qpdf";
|
||||
rev = "release-qpdf-${version}";
|
||||
hash = "sha256-SiZA8T7N1SWlbCFosSqFosLDV/3Q7+ywvgq1iB4umdg=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-T06BLtDZN6ulJ9Po3LN1RlI6q8ddAfo95RAhyfrn+qg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ perl ];
|
||||
nativeBuildInputs = [ cmake perl ];
|
||||
|
||||
buildInputs = [ zlib libjpeg ];
|
||||
|
||||
configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
|
||||
"--with-random=/dev/urandom";
|
||||
|
||||
preCheck = ''
|
||||
preConfigure = ''
|
||||
patchShebangs qtest/bin/qtest-driver
|
||||
patchShebangs run-qtest
|
||||
# qtest needs to know where the source code is
|
||||
substituteInPlace CMakeLists.txt --replace "run-qtest" "run-qtest --top $src --code $src --bin $out"
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://qpdf.sourceforge.net/";
|
||||
|
|
|
|||
|
|
@ -361,7 +361,7 @@ final: prev: {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz";
|
||||
sha512 = "sha512-HuYqnTDgH8atjPGtYmY0Ql9XrrJnfW7daG1PtAJRW0E6gJxc50lY3vrIDn0yjMR3TvRlypjTcspQX8DT+xD4Sg==";
|
||||
sha512 = "sha512-l/QKLmLcKJQFuc+X02LyICo0NWTUVaNNZ00jKJBqwDyhwMAhboD1FWwYV50rkH4Wls0RviAJSFzkC2ZrfawpfA==";
|
||||
};
|
||||
postInstall = with pkgs; ''
|
||||
wrapProgram "$out/bin/prisma" \
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fakeredis";
|
||||
version = "1.9.1";
|
||||
version = "1.9.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "dsoftwareinc";
|
||||
repo = "fakeredis-py";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-3jsTNwxUZzkNxutYqK8lI37Cexrii6QydikW/TkUqbk=";
|
||||
hash = "sha256-tZ+t4s5V8Na2Lt/TlkdJi7vZxlxAaMbk3MvxUhdQOLs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pikepdf";
|
||||
version = "5.4.2";
|
||||
version = "6.0.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -39,7 +39,7 @@ buildPythonPackage rec {
|
|||
postFetch = ''
|
||||
rm "$out/.git_archival.txt"
|
||||
'';
|
||||
hash = "sha256-b4QUn+wfkk6Yx74ViBg6yaE1+bXtxidoyXYgBaJ9iiM=";
|
||||
hash = "sha256-rwMSmARUrScG2nmiYBSkcq0NuUMhn0pHOPvgdKZbH7w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -51,10 +51,8 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i 's|\S*/opt/homebrew.*|pass|' setup.py
|
||||
|
||||
substituteInPlace setup.py \
|
||||
--replace setuptools_scm_git_archive ""
|
||||
--replace "shims_enabled = not cflags_defined" "shims_enabled = False"
|
||||
'';
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -12,33 +12,24 @@ index 2a170c6..5ee3ba1 100644
|
|||
check=True,
|
||||
)
|
||||
diff --git a/src/pikepdf/jbig2.py b/src/pikepdf/jbig2.py
|
||||
index be390a1..3818ec3 100644
|
||||
index 28c596b..aff3565 100644
|
||||
--- a/src/pikepdf/jbig2.py
|
||||
+++ b/src/pikepdf/jbig2.py
|
||||
@@ -31,7 +31,7 @@ def extract_jbig2(
|
||||
@@ -28,7 +28,7 @@ def _extract_jbig2_bytes(jbig2: bytes, jbig2_globals: bytes) -> bytes:
|
||||
output_path = Path(tmpdir) / "outfile"
|
||||
|
||||
|
||||
args = [
|
||||
- "jbig2dec",
|
||||
+ "@jbig2dec@",
|
||||
"--embedded",
|
||||
"--format",
|
||||
"png",
|
||||
@@ -64,7 +64,7 @@ def _extract_jbig2_bytes(jbig2: bytes, jbig2_globals: bytes) -> bytes:
|
||||
output_path = Path(tmpdir) / "outfile"
|
||||
|
||||
args = [
|
||||
- "jbig2dec",
|
||||
+ "@jbig2dec@",
|
||||
"--embedded",
|
||||
"--format",
|
||||
"png",
|
||||
@@ -100,7 +100,7 @@ def extract_jbig2_bytes(
|
||||
|
||||
def _check_jbig2dec_available() -> None: # pragma: no cover
|
||||
try:
|
||||
- proc = run(['jbig2dec', '--version'], stdout=PIPE, check=True, encoding='ascii')
|
||||
+ proc = run(['@jbig2dec@', '--version'], stdout=PIPE, check=True, encoding='ascii')
|
||||
except (CalledProcessError, FileNotFoundError) as e:
|
||||
raise DependencyError("jbig2dec - not installed or not found") from e
|
||||
else:
|
||||
@@ -88,7 +88,7 @@ class JBIG2Decoder(JBIG2DecoderInterface):
|
||||
def _version(self) -> Version:
|
||||
try:
|
||||
proc = run(
|
||||
- ['jbig2dec', '--version'], stdout=PIPE, check=True, encoding='ascii'
|
||||
+ ['@jbig2dec@', '--version'], stdout=PIPE, check=True, encoding='ascii'
|
||||
)
|
||||
except (CalledProcessError, FileNotFoundError) as e:
|
||||
raise DependencyError("jbig2dec - not installed or not found") from e
|
||||
|
|
|
|||
28
pkgs/development/tools/argc/default.nix
Normal file
28
pkgs/development/tools/argc/default.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ lib, rustPlatform, fetchFromGitHub, installShellFiles }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "argc";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sigoden";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1gzsp08x54bsvzjm09cr1lgdr5mq1gzs36x2fjd710ixwcf9fcb6";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-LIQ/j4NMYwrwBQkEYlrqRobrfkPERwtWZqT8pwSoICA=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion completions/argc.{bash,zsh}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool to handle sh/bash cli parameters";
|
||||
homepage = "https://github.com/sigoden/argc";
|
||||
license = with licenses; [ mit /* or */ asl20 ];
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
||||
|
|
@ -13,19 +13,19 @@
|
|||
# function correctly.
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "prisma-engines";
|
||||
version = "4.2.1";
|
||||
version = "4.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prisma";
|
||||
repo = "prisma-engines";
|
||||
rev = version;
|
||||
sha256 = "sha256-TlKjAfpygQq2c77d6ZoMIBtWC0bAiMiKygFkh5GrBBc=";
|
||||
sha256 = "sha256-gk+psYNSC5Xy6R3aUF0E9TyJgJ78+EMvz/xnPgN3+RY=";
|
||||
};
|
||||
|
||||
# Use system openssl.
|
||||
OPENSSL_NO_VENDOR = 1;
|
||||
|
||||
cargoSha256 = "sha256-KkCq7h6qqh37LvA4wQYjLk/LPKCg5Wgl6tEhH55qh8M=";
|
||||
cargoSha256 = "sha256-BiQMoY2hd5q05YZBrTrHlKDtWlOkyfWjjNB/8F2+lXg=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "oh-my-posh";
|
||||
version = "11.0.1";
|
||||
version = "11.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jandedobbeleer";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ovbhU23m4idWOSmdzPh5RH5/DxPjzsk1qqccIzGjNY4=";
|
||||
sha256 = "sha256-6BTH4wiiiQEP8DMq+pYHizIgnJrj8bO3i/RIwvqAYbQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-A4+sshIzPla7udHfnMmbFqn+fW3SOCrI6g7tArzmh1E=";
|
||||
|
|
|
|||
22
pkgs/development/tools/rust/dioxus-cli/default.nix
Normal file
22
pkgs/development/tools/rust/dioxus-cli/default.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{ fetchCrate, lib, rustPlatform, openssl, pkg-config }:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "dioxus-cli";
|
||||
version = "0.1.4";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-SnmDOMxc+39LX6kOzma2zA6T91UGCnvr7WWhX+wXnLo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
cargoSha256 = "sha256-Mf/WtOO/vFuhg90DoPDwOZ6XKj423foHZ8vHugXakb0=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI tool for developing, testing, and publishing Dioxus apps";
|
||||
homepage = "https://dioxuslabs.com";
|
||||
license = with licenses; [ mit asl20 ];
|
||||
maintainers = with maintainers; [ xanderio ];
|
||||
};
|
||||
}
|
||||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rust-analyzer-unwrapped";
|
||||
version = "2022-09-19";
|
||||
cargoSha256 = "sha256-GoGnhO1WaDpNrxyOj2xJPirwmsZ2IESDmA7orryupfo=";
|
||||
version = "2022-09-26";
|
||||
cargoSha256 = "sha256-Wq5fI/ohoTHEjx0wa8De2uh8cG5+92H+vAfDa25JilY=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-lang";
|
||||
repo = "rust-analyzer";
|
||||
rev = version;
|
||||
sha256 = "sha256-aG6JOn3BG/2U1zuusB4bwLnPMXNoAeDSL8MWUCDLvl8=";
|
||||
sha256 = "sha256-aCHudrXd8DKocehX6aWzlbZv4bq2l7MFXhM/wc2NdmI=";
|
||||
};
|
||||
|
||||
cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ];
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "0.53.1";
|
||||
version = "0.53.2";
|
||||
binary-deps-version = "6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -41,7 +41,7 @@ let
|
|||
repo = "Unvanquished";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-AWXuPXOhhPfdDrcyZF5o7uBnieSCGhwCzOYN8MjgTl8=";
|
||||
sha256 = "sha256-VqMhA6GEYh/m+dzOgXS+5Jqo4x7RrQf4qIwstdTTU+E=";
|
||||
};
|
||||
|
||||
unvanquished-binary-deps = stdenv.mkDerivation rec {
|
||||
|
|
@ -119,7 +119,7 @@ let
|
|||
pname = "unvanquished-assets";
|
||||
inherit version src;
|
||||
|
||||
outputHash = "sha256-+mO4HQwFfy7SeGrN4R52KOr/uNQXkHMvYir3k0l5rDo=";
|
||||
outputHash = "sha256-MPqyqcZGc5KlkftGCspWhISBJ/h+Os29g7ZK6yWz0cQ=";
|
||||
outputHashMode = "recursive";
|
||||
|
||||
nativeBuildInputs = [ aria2 cacert ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, python3, openssl
|
||||
{ lib, stdenv, python3, openssl, rustPlatform
|
||||
, enableSystemd ? stdenv.isLinux, nixosTests
|
||||
, enableRedis ? true
|
||||
, callPackage
|
||||
|
|
@ -11,13 +11,35 @@ in
|
|||
with python3.pkgs;
|
||||
buildPythonApplication rec {
|
||||
pname = "matrix-synapse";
|
||||
version = "1.67.0";
|
||||
version = "1.68.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-86KVu1wUkVy1/mONVbDM1g+Y+Kh90y1rpf58Kc2VtBY=";
|
||||
hash = "sha256-jQcprvKEbLuLWth0aWeh5mi/v8z83GIrjCsm3JdJcUM=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-k8iAYRgFCuv6QYAUW5kSEwFSEXVNAEGpPya7biS1Vlo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Remove setuptools_rust from runtime dependencies
|
||||
# https://github.com/matrix-org/synapse/blob/v1.68.0/pyproject.toml#L177-L185
|
||||
sed -i '/^setuptools_rust =/d' pyproject.toml
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
rustPlatform.cargoSetupHook
|
||||
setuptools-rust
|
||||
] ++ (with rustPlatform.rust; [
|
||||
cargo
|
||||
rustc
|
||||
]);
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -63,7 +85,14 @@ buildPythonApplication rec {
|
|||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
# remove src module, so tests use the installed module instead
|
||||
rm -rf ./synapse
|
||||
|
||||
PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial -j $NIX_BUILD_CORES tests
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
passthru.tests = { inherit (nixosTests) matrix-synapse; };
|
||||
|
|
|
|||
|
|
@ -15,16 +15,16 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "minio";
|
||||
version = "2022-09-22T18-57-27Z";
|
||||
version = "2022-09-25T15-44-53Z";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minio";
|
||||
repo = "minio";
|
||||
rev = "RELEASE.${version}";
|
||||
sha256 = "sha256-y8FgfUQG5vuBCqLmTtiIdpduJhfLZ7oSvOgPBYV+sQY=";
|
||||
sha256 = "sha256-ygDE7oqNddC+7kIkGu3QuswQp1Mh441rHvwF2JIKOzE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-zXEGukIHfb9CX+GJFcpVwo2UFZSJoc8Iq6olDKqh/gM=";
|
||||
vendorSha256 = "sha256-nl7lQ+PnfEgEnc/g2PIpsSQH18v/YF5yw+tlIYWNP1A=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "check_ssl_cert";
|
||||
version = "2.47.0";
|
||||
version = "2.48.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matteocorti";
|
||||
repo = "check_ssl_cert";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8Xzu9uyShhJ/gmEs60qJ9W+00NSTCpNe2nqa9aT19ng=";
|
||||
hash = "sha256-uaDeg7Dph99NWN0pKHrffBYOOzN8/1fW2YBEE8vnYMs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "vikunja-api";
|
||||
version = "0.19.0";
|
||||
version = "0.19.2";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "kolaente.dev";
|
||||
owner = "vikunja";
|
||||
repo = "api";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1BxkQFiAqH+n8yzQn0+5cd/Z6oEBbGuK1pu1qt8CUbk=";
|
||||
sha256 = "sha256-KI/RgtyjO+LdsoZ0JMo7xHeINpUAd5nDvd/WiWYEA6c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
|
|
@ -24,7 +24,7 @@ buildGoModule rec {
|
|||
'';
|
||||
in [ fakeGit mage ];
|
||||
|
||||
vendorSha256 = "fzk22B7KpXfGS+8GF6J3ydmFyvP7oelRuiF+IveYdg4=";
|
||||
vendorSha256 = "sha256-ZEmZeIB+uL1/JWEfBd7gZuGNF95pdiJfu5+FY2+sL64=";
|
||||
|
||||
# checks need to be disabled because of needed internet for some checks
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vikunja-frontend";
|
||||
version = "0.19.0";
|
||||
version = "0.19.1";
|
||||
src = fetchurl {
|
||||
url = "https://dl.vikunja.io/frontend/${pname}-${version}.zip";
|
||||
sha256 = "sha256-pdUNPfGgbSMyXcS2HKMekIiIzJ3GutHCs0gFVkHN9yc=";
|
||||
sha256 = "sha256-Kf55M1m/NBQhgaul/4seDMdPFU8jhgOwTNAzdgVg2OQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenv, fetchurl, nixosTests }:
|
||||
{ lib, stdenv, fetchurl, nixosTests, writeScript }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wordpress";
|
||||
version = "6.0.1";
|
||||
version = "6.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://wordpress.org/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-9nhZaASqidfNySgIYpOEZOqyWurr/vqRrhdeFao+8FQ=";
|
||||
sha256 = "sha256-UG5FYlJowBy71DJHgoDE1/lIIndp0qx1yFlDIeMV0Og=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
@ -18,6 +18,14 @@ stdenv.mkDerivation rec {
|
|||
inherit (nixosTests) wordpress;
|
||||
};
|
||||
|
||||
passthru.updateScript = writeScript "update.sh" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p common-updater-scripts jq
|
||||
set -eu -o pipefail
|
||||
version=$(curl --globoff "https://api.wordpress.org/core/version-check/1.7/" | jq -r '.offers[0].version')
|
||||
update-source-version wordpress $version
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wordpress.org";
|
||||
description = "WordPress is open source software you can use to create a beautiful website, blog, or app";
|
||||
|
|
|
|||
39
pkgs/tools/misc/fw/default.nix
Normal file
39
pkgs/tools/misc/fw/default.nix
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, libgit2
|
||||
, openssl
|
||||
, stdenv
|
||||
, Security
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fw";
|
||||
version = "2.16.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brocode";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1nhkirjq2q9sxg4k2scy8vxlqa9ikvr5lid0f22vws07vif4kkfs";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-iD3SBSny0mYpmVEInYaylHn0AbtIqTOwJHdFeq3UBaM=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ libgit2 openssl ] ++ lib.optionals stdenv.isDarwin [
|
||||
Security
|
||||
];
|
||||
|
||||
OPENSSL_NO_VENDOR = 1;
|
||||
USER = "nixbld";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A workspace productivity booster";
|
||||
homepage = "https://github.com/brocode/fw";
|
||||
license = licenses.wtfpl;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
||||
|
|
@ -3,16 +3,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "macchina";
|
||||
version = "6.1.5";
|
||||
version = "6.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Macchina-CLI";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-420Ng/LgmcYPH5q0boDaBjlWgLSeySXW/BTOp9+2XgA=";
|
||||
sha256 = "sha256-0wPMx3IMYhB3XxSsTRqKIsNCGghnRcpwZloHjLxjlMo=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-uRgHKj3EeT1Nq7j5koOovZJTVoVPVeBL8wLogJJoCfU=";
|
||||
cargoSha256 = "sha256-QaqRIc3eKp7Wy5798wCCA4hk9Twa5Nr1mXTIxf+Hy/Q=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nebula";
|
||||
version = "1.6.0";
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "slackhq";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-JUFMcqu24YK1FjaNPkQLOtkyEhvqZPXZyFV+HBAKn5w=";
|
||||
sha256 = "sha256-IsLSlQsrfw3obkz4jHL23BRQY2fviGbPEvs5j0zkdX0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-GvMiOEC3Y/pGG++Z+XCgLVADKymUR9shDxjx3xIz8u0=";
|
||||
|
|
|
|||
|
|
@ -26,13 +26,6 @@ let
|
|||
in stdenv.mkDerivation {
|
||||
inherit pname version src;
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
src = "${src}/zeroidc";
|
||||
name = "${pname}-${version}";
|
||||
sha256 = "sha256-8K4zAXo85MT4pfIsg7DZAO+snfwzdo2TozVw17KhX4Q=";
|
||||
};
|
||||
postPatch = "cp ${src}/zeroidc/Cargo.lock Cargo.lock";
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs ./doc/build.sh
|
||||
substituteInPlace ./doc/build.sh \
|
||||
|
|
@ -41,12 +34,17 @@ in stdenv.mkDerivation {
|
|||
substituteInPlace ./make-linux.mk \
|
||||
--replace '-march=armv6zk' "" \
|
||||
--replace '-mcpu=arm1176jzf-s' ""
|
||||
|
||||
# Upstream does not define the cargo settings necessary to use the vendorized rust-jwt version, so it has to be added manually.
|
||||
# Can be removed once ZeroTierOne's zeroidc no longer uses a git url in Cargo.toml for jwt
|
||||
echo '[source."https://github.com/glimberg/rust-jwt"]
|
||||
git = "https://github.com/glimberg/rust-jwt"
|
||||
replace-with = "vendored-sources"' >> ./zeroidc/.cargo/config.toml
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
ronn
|
||||
rustPlatform.cargoSetupHook
|
||||
rustPlatform.rust.cargo
|
||||
rustPlatform.rust.rustc
|
||||
];
|
||||
|
|
|
|||
29
pkgs/tools/text/teip/default.nix
Normal file
29
pkgs/tools/text/teip/default.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ lib, rustPlatform, fetchCrate, installShellFiles, perl }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "teip";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-fME+tS8wcC6mk5FjuDJpFWWhIsiXV4kuybSqj9awFUM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-wrfS+OEYF60nOhtrnmk7HKqVuAJQFaiT0GM+3OoZ3Wk=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
checkInputs = [ perl ];
|
||||
|
||||
postInstall = ''
|
||||
installManPage man/teip.1
|
||||
installShellCompletion --zsh completion/zsh/_teip
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool to bypass a partial range of standard input to any command";
|
||||
homepage = "https://github.com/greymd/teip";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
||||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubevirt";
|
||||
version = "0.57.0";
|
||||
version = "0.57.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubevirt";
|
||||
repo = "kubevirt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+35z953dgb6lJpC/8+VcrHLY6yXINoDxq6GxkEEVOgU=";
|
||||
sha256 = "sha256-b832NNAoLYiHfvAm2eWGa8Odlppj8hLKl7jQA09s+4k=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -1510,6 +1510,10 @@ with pkgs;
|
|||
|
||||
fuse-emulator = callPackage ../applications/emulators/fuse-emulator {};
|
||||
|
||||
fw = callPackage ../tools/misc/fw {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
gcdemu = callPackage ../applications/emulators/cdemu/gui.nix { };
|
||||
|
||||
gensgs = pkgsi686Linux.callPackage ../applications/emulators/gens-gs { };
|
||||
|
|
@ -2870,6 +2874,8 @@ with pkgs;
|
|||
|
||||
aptdec = callPackage ../development/libraries/aptdec {};
|
||||
|
||||
argc = callPackage ../development/tools/argc { };
|
||||
|
||||
aria2 = callPackage ../tools/networking/aria2 {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
|
@ -5777,6 +5783,10 @@ with pkgs;
|
|||
|
||||
dockbarx = callPackage ../applications/misc/dockbarx { };
|
||||
|
||||
doctave = callPackage ../applications/misc/doctave {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices;
|
||||
};
|
||||
|
||||
dog = callPackage ../tools/system/dog { };
|
||||
|
||||
dogdns = callPackage ../tools/networking/dogdns {
|
||||
|
|
@ -11578,6 +11588,8 @@ with pkgs;
|
|||
|
||||
teamviewer = libsForQt515.callPackage ../applications/networking/remote/teamviewer { };
|
||||
|
||||
teip = callPackage ../tools/text/teip { };
|
||||
|
||||
telegraf = callPackage ../servers/monitoring/telegraf { };
|
||||
|
||||
teleport = callPackage ../servers/teleport {
|
||||
|
|
@ -16383,6 +16395,8 @@ with pkgs;
|
|||
|
||||
dive = callPackage ../development/tools/dive { };
|
||||
|
||||
dioxus-cli = callPackage ../development/tools/rust/dioxus-cli { };
|
||||
|
||||
doclifter = callPackage ../development/tools/misc/doclifter { };
|
||||
|
||||
docutils = with python3Packages; toPythonApplication docutils;
|
||||
|
|
|
|||
|
|
@ -259,6 +259,8 @@ let
|
|||
crossSystem = {
|
||||
isStatic = true;
|
||||
parsed = makeMuslParsedPlatform stdenv.hostPlatform.parsed;
|
||||
} // lib.optionalAttrs (stdenv.hostPlatform.system == "powerpc64-linux") {
|
||||
gcc.abi = "elfv2";
|
||||
};
|
||||
});
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue