Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
2b26752329
20 changed files with 301 additions and 40 deletions
|
|
@ -11,8 +11,10 @@
|
|||
, xdg-utils
|
||||
, which
|
||||
|
||||
, jackSupport ? true, libjack2
|
||||
, pulseaudioSupport ? config.pulseaudio or true, libpulseaudio
|
||||
, jackSupport ? true
|
||||
, jackLibrary
|
||||
, pulseaudioSupport ? config.pulseaudio or true
|
||||
, libpulseaudio
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -43,7 +45,7 @@ stdenv.mkDerivation rec {
|
|||
runtimeDependencies = [
|
||||
gtk3 # libSwell needs libgdk-3.so.0
|
||||
]
|
||||
++ lib.optional jackSupport libjack2
|
||||
++ lib.optional jackSupport jackLibrary
|
||||
++ lib.optional pulseaudioSupport libpulseaudio;
|
||||
|
||||
dontBuild = true;
|
||||
|
|
@ -79,6 +81,6 @@ stdenv.mkDerivation rec {
|
|||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||
maintainers = with maintainers; [ jfrankenau ilian orivej uniquepointer ];
|
||||
maintainers = with maintainers; [ jfrankenau ilian orivej uniquepointer viraptor ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "electron-cash";
|
||||
version = "4.2.7";
|
||||
version = "4.2.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Electron-Cash";
|
||||
repo = "Electron-Cash";
|
||||
rev = version;
|
||||
sha256 = "sha256-m8a3x5fPSrnrCH30MToT3aKtX35nFUbeerR7ubWgOOI=";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-m13wJlNBG3BxOdKUyd3qmIhFBM7263FzMKr5lfD1tys=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
|
|
|||
82
pkgs/applications/networking/cluster/fetchit/default.nix
Normal file
82
pkgs/applications/networking/cluster/fetchit/default.nix
Normal file
|
|
@ -0,0 +1,82 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, lvm2
|
||||
, pkg-config
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fetchit";
|
||||
version = "0.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "fetchit";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hxS/+/fbYOpMJ5VfvvG5l7wWKBUUR22rYn9X79DzUUk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-SyPd8P9s8R2YbGEPqFeztF98W1QyGSBumtirSdpm8VI=";
|
||||
|
||||
subPackages = [ "cmd/fetchit" ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config installShellFiles ];
|
||||
buildInputs = [ lvm2 ];
|
||||
|
||||
# Flags are derived from
|
||||
# https://github.com/containers/fetchit/blob/v0.0.1/Makefile#L20-L29
|
||||
ldflags = [
|
||||
"-X k8s.io/client-go/pkg/version.gitMajor=0"
|
||||
"-X k8s.io/client-go/pkg/version.gitMinor=0"
|
||||
"-X k8s.io/client-go/pkg/version.gitTreeState=clean"
|
||||
"-X k8s.io/client-go/pkg/version.gitVersion=v0.0.0"
|
||||
"-X k8s.io/component-base/version.gitMajor=0"
|
||||
"-X k8s.io/component-base/version.gitMajor=0"
|
||||
"-X k8s.io/component-base/version.gitMinor=0"
|
||||
"-X k8s.io/component-base/version.gitTreeState=clean"
|
||||
"-X k8s.io/component-base/version.gitVersion=v0.0.0"
|
||||
"-s"
|
||||
"-w"
|
||||
];
|
||||
|
||||
tags = [
|
||||
"containers_image_openpgp"
|
||||
"exclude_graphdriver_btrfs"
|
||||
"gssapi"
|
||||
"include_gcs"
|
||||
"include_oss"
|
||||
"netgo"
|
||||
"osusergo"
|
||||
"providerless"
|
||||
];
|
||||
|
||||
# There are no tests for cmd/fetchit.
|
||||
doCheck = false;
|
||||
|
||||
postInstall = ''
|
||||
for i in bash fish zsh; do
|
||||
installShellCompletion --cmd fetchit \
|
||||
--$i <($out/bin/fetchit completion $i)
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool to manage the life cycle and configuration of Podman containers";
|
||||
longDescription = ''
|
||||
FetchIt allows for a GitOps based approach to manage containers running on
|
||||
a single host or multiple hosts based on a git repository. This allows for
|
||||
us to deploy a new host and provide the host a configuration value for
|
||||
FetchIt and automatically any containers defined in the git repository and
|
||||
branch will be deployed onto the host. This can be beneficial for
|
||||
environments that do not require the complexity of Kubernetes to manage
|
||||
the containers running on the host.
|
||||
'';
|
||||
homepage = "https://fetchit.readthedocs.io";
|
||||
changelog = "https://github.com/containers/fetchit/releases/tag/${src.rev}";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ azahi ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -7,7 +7,6 @@
|
|||
, jq
|
||||
, yarn
|
||||
, fixup_yarn_lock
|
||||
, nodejs
|
||||
, jitsi-meet
|
||||
, conf ? { }
|
||||
}:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, nodejs-14_x, python3, callPackage, removeReferencesTo
|
||||
{ lib, stdenv, fetchFromGitHub, nodejs, python3, callPackage, removeReferencesTo
|
||||
, fixup_yarn_lock, yarn, pkg-config, libsecret, xcbuild, Security, AppKit, fetchYarnDeps }:
|
||||
|
||||
let
|
||||
|
|
@ -15,12 +15,12 @@ in stdenv.mkDerivation rec {
|
|||
sha256 = pinData.srcHash;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ nodejs-14_x python3 yarn pkg-config ]
|
||||
nativeBuildInputs = [ nodejs python3 yarn pkg-config ]
|
||||
++ lib.optional stdenv.isDarwin xcbuild;
|
||||
buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ]
|
||||
++ lib.optionals stdenv.isDarwin [ Security AppKit ];
|
||||
|
||||
npm_config_nodedir = nodejs-14_x;
|
||||
npm_config_nodedir = nodejs;
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = ./yarn.lock;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, rustPlatform, fetchFromGitHub, callPackage, sqlcipher, nodejs-14_x, python3, yarn, fixup_yarn_lock, CoreServices, fetchYarnDeps, removeReferencesTo }:
|
||||
{ lib, stdenv, rustPlatform, fetchFromGitHub, callPackage, sqlcipher, nodejs, python3, yarn, fixup_yarn_lock, CoreServices, fetchYarnDeps, removeReferencesTo }:
|
||||
|
||||
let
|
||||
pinData = lib.importJSON ./pin.json;
|
||||
|
|
@ -16,10 +16,10 @@ in rustPlatform.buildRustPackage rec {
|
|||
|
||||
sourceRoot = "source/seshat-node/native";
|
||||
|
||||
nativeBuildInputs = [ nodejs-14_x python3 yarn ];
|
||||
nativeBuildInputs = [ nodejs python3 yarn ];
|
||||
buildInputs = [ sqlcipher ] ++ lib.optional stdenv.isDarwin CoreServices;
|
||||
|
||||
npm_config_nodedir = nodejs-14_x;
|
||||
npm_config_nodedir = nodejs;
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = src + "/seshat-node/yarn.lock";
|
||||
|
|
|
|||
|
|
@ -2,23 +2,25 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "acme";
|
||||
version = "unstable-2021-02-14";
|
||||
version = "unstable-2021-11-05";
|
||||
|
||||
src = fetchsvn {
|
||||
url = "svn://svn.code.sf.net/p/acme-crossass/code-0/trunk";
|
||||
rev = "319";
|
||||
sha256 = "sha256-VifIQ+UEVMKJ+cNS+Xxusazinr5Cgu1lmGuhqj/5Mpk=";
|
||||
rev = "323";
|
||||
sha256 = "1dzvip90yf1wg0fhfghn96dwrhg289d06b624px9a2wwy3vp5ryg";
|
||||
};
|
||||
|
||||
sourceRoot = "code-0-r${src.rev}/src";
|
||||
|
||||
makeFlags = [ "BINDIR=$(out)/bin" ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace "= gcc" "?= gcc"
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
makeFlags = [ "BINDIR=$(out)/bin" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A multi-platform cross assembler for 6502/6510/65816 CPUs";
|
||||
homepage = "https://sourceforge.net/projects/acme-crossass/";
|
||||
|
|
|
|||
|
|
@ -18,11 +18,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xdg-desktop-portal-gnome";
|
||||
version = "42.1";
|
||||
version = "42.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "doW2aVzZi+gjgXECDByXE8RkfSaAAGyYzo5N+FgxLNI=";
|
||||
sha256 = "TtEFpmfkYyVGcQPcc0bSAj+uwdXsFTvRcxbak49TrOA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -55,6 +55,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Backend implementation for xdg-desktop-portal for the GNOME desktop environment";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome";
|
||||
maintainers = teams.gnome.members;
|
||||
platforms = platforms.linux;
|
||||
license = licenses.lgpl21Plus;
|
||||
|
|
|
|||
51
pkgs/development/libraries/zint/default.nix
Normal file
51
pkgs/development/libraries/zint/default.nix
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, wrapQtAppsHook
|
||||
, cmake
|
||||
, qtbase
|
||||
, qttools
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zint";
|
||||
version = "2.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "woo-j";
|
||||
repo = "zint";
|
||||
rev = version;
|
||||
sha256 = "sha256-DtfyXBBEDcltGUAutHl/ksRTTYmS7Ll9kjfgD7NmBbA=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [ cmake wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [ qtbase qttools ];
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 $src/zint-qt.desktop $out/share/applications/zint-qt.desktop
|
||||
install -Dm644 $src/zint-qt.png $out/share/pixmaps/zint-qt.png
|
||||
install -Dm644 $src/frontend_qt/images/scalable/zint-qt.svg $out/share/icons/hicolor/scalable/apps/zint-qt.svg
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A barcode generating tool and library";
|
||||
longDescription = ''
|
||||
The Zint project aims to provide a complete cross-platform open source
|
||||
barcode generating solution. The package currently consists of a Qt based
|
||||
GUI, a CLI command line executable and a library with an API to allow
|
||||
developers access to the capabilities of Zint.
|
||||
'';
|
||||
homepage = "http://www.zint.org.uk";
|
||||
changelog = "https://github.com/woo-j/zint/blob/${version}/ChangeLog";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ azahi ];
|
||||
};
|
||||
}
|
||||
|
|
@ -35,7 +35,8 @@ buildPythonPackage rec {
|
|||
trio
|
||||
trio-websocket
|
||||
urllib3
|
||||
] ++ urllib3.optional-dependencies.socks;
|
||||
] ++ urllib3.optional-dependencies.secure
|
||||
++ urllib3.optional-dependencies.socks;
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
|
|
|
|||
|
|
@ -2,14 +2,18 @@
|
|||
, brotli
|
||||
, brotlicffi
|
||||
, buildPythonPackage
|
||||
, python-dateutil
|
||||
, certifi
|
||||
, cryptography
|
||||
, fetchPypi
|
||||
, idna
|
||||
, isPyPy
|
||||
, mock
|
||||
, pyopenssl
|
||||
, pysocks
|
||||
, pytest-freezegun
|
||||
, pytest-timeout
|
||||
, pytestCheckHook
|
||||
, python-dateutil
|
||||
, tornado
|
||||
, trustme
|
||||
}:
|
||||
|
|
@ -61,9 +65,8 @@ buildPythonPackage rec {
|
|||
|
||||
passthru.optional-dependencies = {
|
||||
brotli = if isPyPy then [ brotlicffi ] else [ brotli ];
|
||||
# we are removing secure dependencies as they are no longer relevant with py3:
|
||||
# https://urllib3.readthedocs.io/en/stable/reference/contrib/pyopenssl.html
|
||||
# secure = [ certifi cryptography idna pyopenssl ];
|
||||
# Use carefully since pyopenssl is not supported aarch64-darwin
|
||||
secure = [ certifi cryptography idna pyopenssl ];
|
||||
socks = [ pysocks ];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,34 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildGoModule
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cirrus-cli";
|
||||
version = "0.81.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cirruslabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qbo7QGPvPLalKbiApkpTtPSeIh1SjqEuKXBIuHJJBB8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-XVGFJv9TYjuwVubTcFVI2b+M2ZDE1Jv4u/dxowcLL2s=";
|
||||
|
||||
ldflags = [
|
||||
"-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}"
|
||||
"-X github.com/cirruslabs/cirrus-cli/internal/version.Commit=v${version}"
|
||||
];
|
||||
|
||||
# tests fail on read-only filesystem
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI for executing Cirrus tasks locally and in any CI";
|
||||
homepage = "https://github.com/cirruslabs/cirrus-cli";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ techknowlogick ];
|
||||
mainProgram = "cirrus";
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bugdom";
|
||||
version = "1.3.1";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jorio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-rhbsVgAkDdRJxbCCzJbsy5TbVdmP7MFqz+7nELiN4Yw=";
|
||||
sha256 = "sha256-pgms2mipW1zol35LVCuU5+7mN7CBiVGFvu1CJ3CrGU0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -107,10 +107,10 @@ let
|
|||
|
||||
unwrapped = stdenv.mkDerivation rec {
|
||||
name = "tsm-client-${version}-unwrapped";
|
||||
version = "8.1.14.0";
|
||||
version = "8.1.15.0";
|
||||
src = fetchurl {
|
||||
url = mkSrcUrl version;
|
||||
sha256 = "1iczc4w8rwzqnw01r89kwxcdr7pnwh3nqr3a0q8ncrxrhsy3qwn0";
|
||||
hash = "sha512-K98irjGvN2QejwbOoRhnHkYdFX3ZQ8hv+v2Gb2/pnr9AE1uj6h0lEXQu2cOEHbk7jMtGwpglzofCF7yUyT/tcw==";
|
||||
};
|
||||
inherit meta passthru;
|
||||
|
||||
|
|
@ -160,6 +160,16 @@ let
|
|||
ln --symbolic --force --no-target-directory "$out/$(cut -b 7- <<< "$target")" "$link"
|
||||
done
|
||||
'';
|
||||
|
||||
# since 7b9fd5d1c9802131ca0a01ff08a3ff64379d2df4
|
||||
# autopatchelf misses to add $out/lib to rpath;
|
||||
# we have to call autopatchelf manually as it would
|
||||
# run too late and overwrite our rpath otherwise
|
||||
dontAutoPatchelf = true;
|
||||
postFixup = ''
|
||||
autoPatchelf $out
|
||||
patchelf --add-rpath $out/lib $out/lib/*
|
||||
'';
|
||||
};
|
||||
|
||||
binPath = lib.makeBinPath ([ acl gnugrep procps ]
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
|
|||
version = "1.1.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://jfs.sourceforge.net/project/pub/jfsutils-${version}.tar.gz";
|
||||
url = "mirror://sourceforge/jfs/jfsutils-${version}.tar.gz";
|
||||
sha256 = "0kbsy2sk1jv4m82rxyl25gwrlkzvl3hzdga9gshkxkhm83v1aji4";
|
||||
};
|
||||
|
||||
|
|
@ -31,6 +31,14 @@ stdenv.mkDerivation rec {
|
|||
# `xchklog_buffer'; display.o:/build/jfsutils-1.1.15/fscklog/display.c:57: first defined here
|
||||
NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
|
||||
# this required for wipefreespace
|
||||
postInstall = ''
|
||||
mkdir -p $out/include
|
||||
cp include/*.h $out/include
|
||||
mkdir -p $out/lib
|
||||
cp ./libfs/libfs.a $out/lib
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "IBM JFS utilities";
|
||||
homepage = "http://jfs.sourceforge.net";
|
||||
|
|
|
|||
|
|
@ -21,6 +21,12 @@ stdenv.mkDerivation rec {
|
|||
substituteInPlace Makefile --replace ./run-ldconfig true
|
||||
'';
|
||||
|
||||
# this required for wipefreespace
|
||||
postInstall = ''
|
||||
mkdir -p $out/lib
|
||||
cp ./libmisc/.libs/libmisc.a $out/lib/libreiser4misc.a.la
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
inherit version;
|
||||
homepage = "https://sourceforge.net/projects/reiser4/";
|
||||
|
|
|
|||
54
pkgs/tools/filesystems/wipefreespace/default.nix
Normal file
54
pkgs/tools/filesystems/wipefreespace/default.nix
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
{ stdenv
|
||||
, pkgs
|
||||
, lib
|
||||
, fetchurl
|
||||
, e2fsprogs
|
||||
, ntfs3g
|
||||
, xfsprogs
|
||||
, reiser4progs
|
||||
, libaal
|
||||
, jfsutils
|
||||
, libuuid
|
||||
, texinfo
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wipefreespace";
|
||||
version = "2.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/wipefreespace/wipefreespace/${version}/wipefreespace-${version}.tar.gz";
|
||||
hash = "sha256-wymV6G4Et5TCoIztZfdb3xuzjdBHFyB5OmI4EcsJKwQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
texinfo
|
||||
];
|
||||
|
||||
# missed: Reiser3 FAT12/16/32 MinixFS HFS+ OCFS
|
||||
buildInputs = [
|
||||
e2fsprogs
|
||||
ntfs3g
|
||||
xfsprogs
|
||||
reiser4progs
|
||||
libaal
|
||||
jfsutils
|
||||
libuuid
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
preConfigure = ''
|
||||
export PATH=$PATH:${xfsprogs}/bin
|
||||
export CFLAGS=-I${jfsutils}/include
|
||||
export LDFLAGS="-L${jfsutils}/lib -L${reiser4progs}/lib"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A program which will securely wipe the free space";
|
||||
homepage = "https://wipefreespace.sourceforge.io";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ catap ];
|
||||
};
|
||||
}
|
||||
|
|
@ -12,9 +12,6 @@
|
|||
, javaSupport ? false
|
||||
, jdk
|
||||
}:
|
||||
let
|
||||
javabase = "${jdk}/jre/lib/${jdk.architecture}";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hdf";
|
||||
version = "4.2.15";
|
||||
|
|
@ -84,8 +81,6 @@ stdenv.mkDerivation rec {
|
|||
] ++ lib.optionals javaSupport [
|
||||
"-DHDF4_BUILD_JAVA=ON"
|
||||
"-DJAVA_HOME=${jdk}"
|
||||
"-DJAVA_AWT_LIBRARY=${javabase}/libawt.so"
|
||||
"-DJAVA_JVM_LIBRARY=${javabase}/server/libjvm.so"
|
||||
] ++ lib.optionals szipSupport [
|
||||
"-DHDF4_ENABLE_SZIP_ENCODING=ON"
|
||||
"-DHDF4_ENABLE_SZIP_SUPPORT=ON"
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
'' + lib.optionalString stdenv.isLinux ''
|
||||
mkdir -p $out/bin $out/lib
|
||||
cp -a build/dist/HDFView/bin/HDFView $out/bin/
|
||||
cp -a build/dist/HDFView/lib/app $out/lib/
|
||||
|
|
@ -45,7 +45,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
mkdir -p $out/share/applications $out/share/icons/hicolor/32x32/apps
|
||||
cp src/HDFView.png $out/share/icons/hicolor/32x32/apps/
|
||||
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
mkdir -p $out/Applications
|
||||
cp -a build/dist/HDFView.app $out/Applications/
|
||||
'' + ''
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
|
@ -53,6 +56,6 @@ stdenv.mkDerivation rec {
|
|||
description = "A visual tool for browsing and editing HDF4 and HDF5 files";
|
||||
license = lib.licenses.free; # BSD-like
|
||||
homepage = "https://portal.hdfgroup.org/display/HDFVIEW/HDFView";
|
||||
platforms = lib.platforms.linux;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -781,6 +781,8 @@ with pkgs;
|
|||
inherit curl stdenv;
|
||||
};
|
||||
|
||||
fetchit = callPackage ../applications/networking/cluster/fetchit { };
|
||||
|
||||
fetchzip = callPackage ../build-support/fetchzip { }
|
||||
// {
|
||||
tests = pkgs.tests.fetchzip;
|
||||
|
|
@ -4862,6 +4864,8 @@ with pkgs;
|
|||
|
||||
citrix_workspace = citrix_workspace_22_05_0;
|
||||
|
||||
cirrus-cli = callPackage ../development/tools/continuous-integration/cirrus-cli { };
|
||||
|
||||
inherit (callPackage ../applications/networking/remote/citrix-workspace { })
|
||||
citrix_workspace_21_01_0
|
||||
citrix_workspace_21_03_0
|
||||
|
|
@ -11975,6 +11979,8 @@ with pkgs;
|
|||
inherit (darwin.apple_sdk.frameworks) Foundation IOBluetooth;
|
||||
};
|
||||
|
||||
wipefreespace = callPackage ../tools/filesystems/wipefreespace {};
|
||||
|
||||
woeusb = callPackage ../tools/misc/woeusb { };
|
||||
|
||||
woeusb-ng = callPackage ../tools/misc/woeusb-ng { };
|
||||
|
|
@ -12232,6 +12238,8 @@ with pkgs;
|
|||
|
||||
zinit = callPackage ../shells/zsh/zinit {} ;
|
||||
|
||||
zint = qt6Packages.callPackage ../development/libraries/zint { };
|
||||
|
||||
zs-apc-spdu-ctl = callPackage ../tools/networking/zs-apc-spdu-ctl { };
|
||||
|
||||
zs-wait4host = callPackage ../tools/networking/zs-wait4host { };
|
||||
|
|
@ -29781,7 +29789,9 @@ with pkgs;
|
|||
|
||||
rdup = callPackage ../tools/backup/rdup { };
|
||||
|
||||
reaper = callPackage ../applications/audio/reaper { };
|
||||
reaper = callPackage ../applications/audio/reaper {
|
||||
jackLibrary = libjack2; # Another option is "pipewire.jack".
|
||||
};
|
||||
|
||||
recapp = callPackage ../applications/video/recapp { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue