mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 16:33:15 +00:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
3f305fab72
@ -1,4 +1,4 @@
|
||||
{ config, lib, pkgs, utils, ... }:
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
cfg = config.virtualisation.containers;
|
||||
|
||||
@ -136,7 +136,7 @@ in
|
||||
|
||||
environment.etc."containers/policy.json".source =
|
||||
if cfg.policy != { } then pkgs.writeText "policy.json" (builtins.toJSON cfg.policy)
|
||||
else utils.copyFile "${pkgs.skopeo.src}/default-policy.json";
|
||||
else "${pkgs.skopeo.policy}/default-policy.json";
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ config, lib, pkgs, utils, ... }:
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
let
|
||||
@ -93,7 +93,7 @@ in
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [ cfg.package pkgs.cri-tools ];
|
||||
|
||||
environment.etc."crictl.yaml".source = utils.copyFile "${pkgs.cri-o-unwrapped.src}/crictl.yaml";
|
||||
environment.etc."crictl.yaml".source = "${cfg.package}/etc/crictl.yaml";
|
||||
|
||||
virtualisation.cri-o.settings.crio = {
|
||||
storage_driver = cfg.storageDriver;
|
||||
@ -124,8 +124,8 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
environment.etc."cni/net.d/10-crio-bridge.conf".source = utils.copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/10-crio-bridge.conf";
|
||||
environment.etc."cni/net.d/99-loopback.conf".source = utils.copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/99-loopback.conf";
|
||||
environment.etc."cni/net.d/10-crio-bridge.conflist".source = "${cfg.package}/etc/cni/net.d/10-crio-bridge.conflist";
|
||||
environment.etc."cni/net.d/99-loopback.conflist".source = "${cfg.package}/etc/cni/net.d/99-loopback.conflist";
|
||||
environment.etc."crio/crio.conf.d/00-default.conf".source = cfgFile;
|
||||
|
||||
# Enable common /etc/containers configuration
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
diff -ru a/app/app_procs.c b/app/app_procs.c
|
||||
--- a/app/app_procs.c 2021-01-30 11:09:52.000000000 -0500
|
||||
+++ b/app/app_procs.c 2021-01-30 11:11:05.000000000 -0500
|
||||
@@ -785,6 +785,7 @@
|
||||
|
||||
if (!filename) {
|
||||
g_print (_("Filename conversion failed: %s\n"), filenames[i]);
|
||||
+ ++i;
|
||||
continue;
|
||||
}
|
||||
|
||||
@ -1,40 +1,68 @@
|
||||
{ lib, stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkg-config, perlPackages,
|
||||
libxml2, gettext, python2, libxml2Python, docbook5, docbook_xsl,
|
||||
libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui,
|
||||
gtk-mac-integration-gtk2 }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, appstream-glib
|
||||
, cmake
|
||||
, dblatex
|
||||
, desktop-file-utils
|
||||
, graphene
|
||||
, gtk2
|
||||
, gtk-mac-integration-gtk2
|
||||
, intltool
|
||||
, libxml2
|
||||
, libxslt
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, poppler
|
||||
, python3
|
||||
# Building with docs are failing in unstable-2022-12-14
|
||||
, withDocs ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "dia";
|
||||
version = "0.97.3.20170622";
|
||||
version = "unstable-2022-12-14";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://gitlab.gnome.org/GNOME/dia.git";
|
||||
rev = "b86085dfe2b048a2d37d587adf8ceba6fb8bc43c";
|
||||
sha256 = "1fyxfrzdcs6blxhkw3bcgkksaf3byrsj4cbyrqgb4869k3ynap96";
|
||||
src = fetchFromGitLab {
|
||||
owner = "GNOME";
|
||||
repo = "dia";
|
||||
domain = "gitlab.gnome.org";
|
||||
rev = "4a619ec7cc93be5ddfbcc48d9e1572d04943bcad";
|
||||
hash = "sha256-xi45Ak4rlDQjs/FNkdkm145mx76GNHjE6Nrs1dc94ww=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./CVE-2019-19451.patch
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[ gtk2 libxml2 gettext python2 libxml2Python docbook5
|
||||
libxslt docbook_xsl libart_lgpl ]
|
||||
++ lib.optional withGNOME libgnomeui
|
||||
++ lib.optional stdenv.isDarwin gtk-mac-integration-gtk2;
|
||||
|
||||
nativeBuildInputs = [ autoconf automake libtool pkg-config intltool ]
|
||||
++ (with perlPackages; [ perl XMLParser ]);
|
||||
patches = [ ./poppler-22_09-build-fix.patch ];
|
||||
|
||||
preConfigure = ''
|
||||
NOCONFIGURE=1 ./autogen.sh # autoreconfHook is not enough
|
||||
patchShebangs .
|
||||
'';
|
||||
configureFlags = lib.optional withGNOME "--enable-gnome";
|
||||
|
||||
# error: implicitly declaring library function 'finite' with type 'int (double)'
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dfinite=isfinite";
|
||||
buildInputs = [
|
||||
graphene
|
||||
gtk2
|
||||
libxml2
|
||||
python3
|
||||
poppler
|
||||
] ++
|
||||
lib.optionals withDocs [
|
||||
libxslt
|
||||
] ++
|
||||
lib.optionals stdenv.isDarwin [
|
||||
gtk-mac-integration-gtk2
|
||||
];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
nativeBuildInputs = [
|
||||
appstream-glib
|
||||
desktop-file-utils
|
||||
intltool
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
] ++
|
||||
lib.optionals withDocs [
|
||||
dblatex
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Gnome Diagram drawing software";
|
||||
|
||||
93
pkgs/applications/graphics/dia/poppler-22_09-build-fix.patch
Normal file
93
pkgs/applications/graphics/dia/poppler-22_09-build-fix.patch
Normal file
@ -0,0 +1,93 @@
|
||||
diff --git a/plug-ins/pdf/pdf-import.cpp b/plug-ins/pdf/pdf-import.cpp
|
||||
index 189737908..a2a479693 100644
|
||||
--- a/plug-ins/pdf/pdf-import.cpp
|
||||
+++ b/plug-ins/pdf/pdf-import.cpp
|
||||
@@ -152,12 +152,12 @@ public :
|
||||
void
|
||||
updateLineDash (GfxState *state)
|
||||
{
|
||||
- double *dashPattern;
|
||||
- int dashLength;
|
||||
- double dashStart;
|
||||
-
|
||||
- state->getLineDash (&dashPattern, &dashLength, &dashStart);
|
||||
- this->dash_length = dashLength ? dashPattern[0] * scale : 1.0;
|
||||
+ const double *dashPattern=NULL;
|
||||
+ int dashLength=0;
|
||||
+ double dashStart=0;
|
||||
+ const std::vector<double> &dash = state->getLineDash(&dashStart); // > Poppler 22.09 ...
|
||||
+ dashPattern = dash.data();
|
||||
+ dashLength = dash.size();
|
||||
|
||||
if (dashLength == 0)
|
||||
this->line_style = DIA_LINE_STYLE_SOLID;
|
||||
@@ -318,10 +318,11 @@ public :
|
||||
//FIXME: Dia is really unhappy about zero size fonts
|
||||
if (!(state->getFontSize() > 0.0))
|
||||
return;
|
||||
- GfxFont *f = state->getFont();
|
||||
+ const std::shared_ptr<GfxFont> f = state->getFont(); // poppler 22.05 ... header changed
|
||||
+ gconstpointer f1 = &f; // GLib typedef const void * gconstpointer;
|
||||
|
||||
// instead of building the same font over and over again
|
||||
- if (g_hash_table_lookup (this->font_map, f)) {
|
||||
+ if (g_hash_table_lookup (this->font_map, f1)) {
|
||||
++font_map_hits;
|
||||
return;
|
||||
}
|
||||
@@ -333,8 +334,9 @@ public :
|
||||
gchar *family = g_strdup (f->getFamily() ? f->getFamily()->c_str() : "sans");
|
||||
|
||||
// we are (not anymore) building the same font over and over again
|
||||
+ f1 = &f;
|
||||
g_print ("Font 0x%x: '%s' size=%g (* %g)\n",
|
||||
- GPOINTER_TO_INT (f), family, state->getTransformedFontSize(), scale);
|
||||
+ GPOINTER_TO_INT (f1), family, state->getTransformedFontSize(), scale);
|
||||
|
||||
// now try to make a fontname Dia/Pango can cope with
|
||||
// strip style postfix - we already have extracted the style bits above
|
||||
@@ -354,7 +356,9 @@ public :
|
||||
fsize *= fabs(fm[3] / fm[0]);
|
||||
font = dia_font_new (family, style, fsize * scale / 0.8);
|
||||
|
||||
- g_hash_table_insert (this->font_map, f, font);
|
||||
+ f1 = &f;
|
||||
+ gpointer f2 = (gpointer)f1; // GLib typedef void* gpointer;
|
||||
+ g_hash_table_insert (this->font_map, f2, font);
|
||||
g_free (family);
|
||||
}
|
||||
void updateTextShift(GfxState *state, double shift)
|
||||
@@ -721,11 +725,12 @@ DiaOutputDev::drawString(GfxState *state, GooString *s)
|
||||
return;
|
||||
if (!(state->getFontSize() > 0.0))
|
||||
return;
|
||||
- font = (DiaFont *)g_hash_table_lookup (this->font_map, state->getFont());
|
||||
+ gconstpointer f_1 = &state->getFont();
|
||||
+ font = (DiaFont *)g_hash_table_lookup (this->font_map, f_1);
|
||||
|
||||
// we have to decode the string data first
|
||||
{
|
||||
- GfxFont *f = state->getFont();
|
||||
+ const std::shared_ptr<GfxFont> f = state->getFont();
|
||||
const char *p = s->c_str();
|
||||
CharCode code;
|
||||
int j = 0, m, n;
|
||||
@@ -870,8 +875,8 @@ import_pdf(const gchar *filename, DiagramData *dia, DiaContext *ctx, void* user_
|
||||
std::unique_ptr<PDFDoc> doc;
|
||||
GooString *fileName = new GooString(filename);
|
||||
// no passwords yet
|
||||
- GooString *ownerPW = NULL;
|
||||
- GooString *userPW = NULL;
|
||||
+ const std::optional<GooString> ownerPW;
|
||||
+ const std::optional<GooString> userPW;
|
||||
gboolean ret = FALSE;
|
||||
|
||||
// without this we will get strange crashes (at least with /O2 build)
|
||||
@@ -899,6 +904,7 @@ import_pdf(const gchar *filename, DiagramData *dia, DiaContext *ctx, void* user_
|
||||
delete diaOut;
|
||||
ret = TRUE;
|
||||
}
|
||||
+ doc.reset();
|
||||
delete fileName;
|
||||
|
||||
return ret;
|
||||
@ -1041,11 +1041,11 @@
|
||||
"vendorHash": "sha256-bYHvuzj3ShX55cgrYobqADxcRDgese+n24p14z82CLA="
|
||||
},
|
||||
"sops": {
|
||||
"hash": "sha256-6FuThi6iuuUGcMhswAk3Z6Lxth/2nuI57A02Xu2s+/U=",
|
||||
"hash": "sha256-D1Yzs8hDimMP9y8ZRbizEhic3vGtLcZjOVSuSMUAqPk=",
|
||||
"homepage": "https://registry.terraform.io/providers/carlpett/sops",
|
||||
"owner": "carlpett",
|
||||
"repo": "terraform-provider-sops",
|
||||
"rev": "v0.7.1",
|
||||
"rev": "v0.7.2",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8="
|
||||
},
|
||||
|
||||
@ -21,11 +21,11 @@ let
|
||||
|
||||
self = python3Packages.buildPythonApplication rec {
|
||||
pname = "mercurial${lib.optionalString fullBuild "-full"}";
|
||||
version = "6.3.1";
|
||||
version = "6.3.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
|
||||
sha256 = "sha256-bDmrhzKUjYnPEgh1HdfYXUBCqoIVOXdFG56xM2dYUHI=";
|
||||
sha256 = "sha256-z+butd2JOrMsC3nBUxqsQgdz4PyDejXbPU2ScD30Wpg=";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
@ -35,7 +35,7 @@ let
|
||||
cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "mercurial-${version}";
|
||||
sha256 = "sha256-UZ/ZSZkAedrm3iUkaQu6zvfX4bhrYDlwR9L9ytf38ZY=";
|
||||
sha256 = "sha256-pJNX0j/Rg3cQanveD7z2x5wixo/jLvHai8Ib2Akmmgk";
|
||||
sourceRoot = "mercurial-${version}/rust";
|
||||
} else null;
|
||||
cargoRoot = if rustSupport then "rust" else null;
|
||||
|
||||
@ -15,13 +15,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cri-o";
|
||||
version = "1.25.1";
|
||||
version = "1.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cri-o";
|
||||
repo = "cri-o";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MFqCRHsIpc8ianyNW+PsDINQavbTZs2rZ2k6q/6wTkY=";
|
||||
sha256 = "sha256-XVg1TBYD6Y/EByKnnD+mFL/qA6IqBohuEvUgjwN962g=";
|
||||
};
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -54,6 +54,9 @@ buildGoModule rec {
|
||||
installShellCompletion --$shell completions/$shell/*
|
||||
done
|
||||
|
||||
install contrib/cni/*.conflist -Dt $out/etc/cni/net.d
|
||||
install crictl.yaml -Dt $out/etc
|
||||
|
||||
installManPage docs/*.[1-9]
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@ -40,6 +40,7 @@ in runCommand cri-o-unwrapped.name {
|
||||
ln -s ${cri-o-unwrapped.man} $man
|
||||
|
||||
mkdir -p $out/bin
|
||||
ln -s ${cri-o-unwrapped}/etc $out/etc
|
||||
ln -s ${cri-o-unwrapped}/share $out/share
|
||||
|
||||
for p in ${cri-o-unwrapped}/bin/*; do
|
||||
|
||||
@ -28,7 +28,11 @@ in
|
||||
} @ args:
|
||||
|
||||
let hash_ =
|
||||
if args ? hash then { outputHashAlgo = null; outputHash = args.hash; }
|
||||
if args ? hash then
|
||||
{
|
||||
outputHashAlgo = if args.hash == "" then "sha256" else null;
|
||||
outputHash = args.hash;
|
||||
}
|
||||
else if args ? sha256 then { outputHashAlgo = "sha256"; outputHash = args.sha256; }
|
||||
else throw "fetchCargoTarball requires a hash for ${name}";
|
||||
in stdenv.mkDerivation ({
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
, callPackage
|
||||
, cargo
|
||||
, cargo-nextest
|
||||
, clang
|
||||
, lib
|
||||
, makeSetupHook
|
||||
, maturin
|
||||
@ -127,8 +126,8 @@ in {
|
||||
bindgenHook = callPackage ({}: makeSetupHook {
|
||||
name = "rust-bindgen-hook";
|
||||
substitutions = {
|
||||
libclang = clang.cc.lib;
|
||||
inherit clang;
|
||||
libclang = rustc.llvmPackages.clang.cc.lib;
|
||||
clang = rustc.llvmPackages.clang;
|
||||
};
|
||||
}
|
||||
./rust-bindgen-hook.sh) {};
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "smiley-sans";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/atelier-anchor/smiley-sans/releases/download/v${version}/smiley-sans-v${version}.zip";
|
||||
sha256 = "sha256-ufx/n3c7XoTZAxmdUMD4fc25z6By3/H4TOn0RtHOwyQ=";
|
||||
sha256 = "sha256-/lsAZRHgmx1TMjm2O5Z0IOiHQM8LKJPXcBKZrlXt3RA=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
@ -18,9 +18,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "A condensed and oblique Chinese typeface seeking a visual balance between the humanist and the geometric";
|
||||
|
||||
@ -40,6 +40,10 @@ buildPythonPackage rec {
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "jsonschema<4" "jsonschema" \
|
||||
--replace "sphinx-external-toc~=0.2.3" "sphinx-external-toc" \
|
||||
--replace "sphinx-jupyterbook-latex~=0.4.6" "sphinx-jupyterbook-latex" \
|
||||
--replace "sphinx-thebe~=0.1.1" "sphinx-thebe" \
|
||||
--replace "sphinx>=4,<5" "sphinx" \
|
||||
--replace "sphinx_book_theme~=0.3.2" "sphinx_book_theme" \
|
||||
--replace "myst-nb~=0.13.1" "myst-nb" \
|
||||
--replace "docutils>=0.15,<0.18" "docutils" \
|
||||
--replace "sphinx-design~=0.1.0" "sphinx-design" \
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinx-book-theme";
|
||||
version = "0.3.3";
|
||||
version = "0.4.0rc1";
|
||||
|
||||
format = "wheel";
|
||||
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
dist = "py3";
|
||||
python = "py3";
|
||||
pname = "sphinx_book_theme";
|
||||
sha256 = "9685959dbbb492af005165ef1b9229fdd5d5431580ac181578beae3b4d012d91";
|
||||
sha256 = "bfad8ef469885da5633f7cf7f8cd9a0ae11ea2351a91e507b44cf15973934512";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -34,10 +34,8 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "A clean book theme for scientific explanations and documentation with Sphinx";
|
||||
homepage = "https://github.com/executablebooks/sphinx-book-theme";
|
||||
changelog = "https://github.com/executablebooks/sphinx-book-theme/raw/v${version}/CHANGELOG.md";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ marsam ];
|
||||
# Missing sphinx 5.X support
|
||||
# https://github.com/executablebooks/sphinx-book-theme/issues/592
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@ -7,13 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinx-thebe";
|
||||
version = "0.1.2";
|
||||
version = "0.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "756f1dd6643f5abb491f8a27b22825b04f47e05c5d214bbb2e6b5d42b621b85e";
|
||||
sha256 = "sha256-CHZ6WacLlFhpGyujW7b2KkRSlGmUR3rlg5ulPMsKUoc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ sphinx ];
|
||||
|
||||
@ -11,6 +11,7 @@
|
||||
, makeWrapper
|
||||
, fuse-overlayfs
|
||||
, dockerTools
|
||||
, runCommand
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
@ -46,6 +47,7 @@ buildGoModule rec {
|
||||
runHook preInstall
|
||||
PREFIX=$out make install-binary install-completions
|
||||
PREFIX=$man make install-docs
|
||||
install ${passthru.policy}/default-policy.json -Dt $out/etc/containers
|
||||
'' + lib.optionalString stdenv.isLinux ''
|
||||
wrapProgram $out/bin/skopeo \
|
||||
--prefix PATH : ${lib.makeBinPath [ fuse-overlayfs ]}
|
||||
@ -53,8 +55,13 @@ buildGoModule rec {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
inherit (dockerTools.examples) testNixFromDockerHub;
|
||||
passthru = {
|
||||
policy = runCommand "policy" { } ''
|
||||
install ${src}/default-policy.json -Dt $out
|
||||
'';
|
||||
tests = {
|
||||
inherit (dockerTools.examples) testNixFromDockerHub;
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -155,12 +155,12 @@ in rec {
|
||||
|
||||
cpu = mkTmuxPlugin {
|
||||
pluginName = "cpu";
|
||||
version = "unstable-2021-12-15";
|
||||
version = "unstable-2023-01-06";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tmux-plugins";
|
||||
repo = "tmux-cpu";
|
||||
rev = "9eb3dba66672c5b43065e144cc3a1031f77ad67e";
|
||||
sha256 = "sha256-v/jZxsa+JwsSKjmA32VK/4gBNHP/SyOzTaYSSz2c0+4=";
|
||||
rev = "98d787191bc3e8f19c3de54b96ba1caf61385861";
|
||||
sha256 = "sha256-ymmCI6VYvf94Ot7h2GAboTRBXPIREP+EB33+px5aaJk=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zoxide";
|
||||
version = "0.8.3";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ajeetdsouza";
|
||||
repo = "zoxide";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ivzsVP+Mm2TX9addxUKMoOWqXPKvDtfPAT5Gu+E++4Y=";
|
||||
sha256 = "sha256-easHqXEHMrRqLmD7GMudoMGRnFOLsnRrgivVaYfQn8k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
|
||||
--replace '"fzf"' '"${fzf}/bin/fzf"'
|
||||
'';
|
||||
|
||||
cargoSha256 = "sha256-G4EnjOuqx3k8HnKjDAz34f+kthOWFeXZdgWrXkvFWqk=";
|
||||
cargoSha256 = "sha256-6SGzMEYQIGDabIlCUmHky34wGMrAkOrweF7VTzzrUPE=";
|
||||
|
||||
postInstall = ''
|
||||
installManPage man/man*/*
|
||||
|
||||
@ -16658,7 +16658,9 @@ with pkgs;
|
||||
|
||||
srelay = callPackage ../tools/networking/srelay { };
|
||||
|
||||
xidel = callPackage ../tools/text/xidel { };
|
||||
xidel = callPackage ../tools/text/xidel {
|
||||
openssl = openssl_1_1;
|
||||
};
|
||||
|
||||
asdf-vm = callPackage ../tools/misc/asdf-vm { };
|
||||
|
||||
@ -28392,9 +28394,7 @@ with pkgs;
|
||||
|
||||
dht = callPackage ../applications/networking/p2p/dht { };
|
||||
|
||||
dia = callPackage ../applications/graphics/dia {
|
||||
inherit (gnome2) libart_lgpl libgnomeui;
|
||||
};
|
||||
dia = callPackage ../applications/graphics/dia { };
|
||||
|
||||
direwolf = callPackage ../applications/radio/direwolf {
|
||||
hamlib = hamlib_4;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user