mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
811b90f085
|
|
@ -110,6 +110,11 @@ in {
|
|||
source = json.generate "v4l2-monitor.conf" configs.v4l2-monitor;
|
||||
};
|
||||
|
||||
environment.etc."pipewire/media-session.d/with-audio" =
|
||||
mkIf config.services.pipewire.audio.enable {
|
||||
text = "";
|
||||
};
|
||||
|
||||
environment.etc."pipewire/media-session.d/with-alsa" =
|
||||
mkIf config.services.pipewire.alsa.enable {
|
||||
text = "";
|
||||
|
|
|
|||
|
|
@ -116,6 +116,16 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
audio = {
|
||||
enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
# this is for backwards compatibility
|
||||
default = cfg.alsa.enable || cfg.jack.enable || cfg.pulse.enable;
|
||||
defaultText = lib.literalExpression "config.services.pipewire.alsa.enable || config.services.pipewire.jack.enable || config.services.pipewire.pulse.enable";
|
||||
description = "Whether to use PipeWire as the primary sound server";
|
||||
};
|
||||
};
|
||||
|
||||
alsa = {
|
||||
enable = mkEnableOption "ALSA support";
|
||||
support32Bit = mkEnableOption "32-bit ALSA support on 64-bit systems";
|
||||
|
|
@ -152,13 +162,18 @@ in {
|
|||
config = mkIf cfg.enable {
|
||||
assertions = [
|
||||
{
|
||||
assertion = cfg.pulse.enable -> !config.hardware.pulseaudio.enable;
|
||||
message = "PipeWire based PulseAudio server emulation replaces PulseAudio. This option requires `hardware.pulseaudio.enable` to be set to false";
|
||||
assertion = cfg.audio.enable -> !config.hardware.pulseaudio.enable;
|
||||
message = "Using PipeWire as the sound server conflicts with PulseAudio. This option requires `hardware.pulseaudio.enable` to be set to false";
|
||||
}
|
||||
{
|
||||
assertion = cfg.jack.enable -> !config.services.jack.jackd.enable;
|
||||
message = "PipeWire based JACK emulation doesn't use the JACK service. This option requires `services.jack.jackd.enable` to be set to false";
|
||||
}
|
||||
{
|
||||
# JACK intentionally not checked, as PW-on-JACK setups are a thing that some people may want
|
||||
assertion = (cfg.alsa.enable || cfg.pulse.enable) -> cfg.audio.enable;
|
||||
message = "Using PipeWire's ALSA/PulseAudio compatibility layers requires running PipeWire as the sound server. Set `services.pipewire.audio.enable` to true.";
|
||||
}
|
||||
];
|
||||
|
||||
environment.systemPackages = [ cfg.package ]
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
cfg = config.services.pipewire.wireplumber;
|
||||
pwCfg = config.services.pipewire;
|
||||
cfg = pwCfg.wireplumber;
|
||||
pwUsedForAudio = pwCfg.audio.enable;
|
||||
in
|
||||
{
|
||||
meta.maintainers = [ lib.maintainers.k900 ];
|
||||
|
|
@ -33,6 +35,14 @@ in
|
|||
];
|
||||
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
environment.etc."wireplumber/main.lua.d/80-nixos.lua" = lib.mkIf (!pwUsedForAudio) {
|
||||
text = ''
|
||||
# Pipewire is not used for audio, so prevent it from grabbing audio devices
|
||||
alsa_monitor.enable = function() end
|
||||
'';
|
||||
};
|
||||
|
||||
systemd.packages = [ cfg.package ];
|
||||
|
||||
systemd.services.wireplumber.enable = config.services.pipewire.systemWide;
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ let tests = {
|
|||
in mapAttrs (name: { pkg, executable ? name, cmd ? "SHELL=$command ${executable}", colourTest ? true, pinkValue ? "#FF0087", kill ? false }: makeTest
|
||||
{
|
||||
name = "terminal-emulator-${name}";
|
||||
meta = with pkgs.stdenv.lib.maintainers; {
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ jjjollyjim ];
|
||||
};
|
||||
|
||||
|
|
|
|||
146
pkgs/applications/graphics/unigine-superposition/default.nix
Normal file
146
pkgs/applications/graphics/unigine-superposition/default.nix
Normal file
|
|
@ -0,0 +1,146 @@
|
|||
{ lib
|
||||
, glib
|
||||
, stdenv
|
||||
, dbus
|
||||
, freetype
|
||||
, fontconfig
|
||||
, zlib
|
||||
, qtquickcontrols2
|
||||
, libXinerama
|
||||
, libxcb
|
||||
, libSM
|
||||
, libXi
|
||||
, libglvnd
|
||||
, libXext
|
||||
, libXrandr
|
||||
, mailspring
|
||||
, libX11
|
||||
, libICE
|
||||
, libXrender
|
||||
, autoPatchelfHook
|
||||
, makeWrapper
|
||||
, mkDerivation
|
||||
, xkeyboard_config
|
||||
, fetchurl
|
||||
, buildFHSUserEnv
|
||||
, openal
|
||||
, makeDesktopItem
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
superposition = stdenv.mkDerivation rec{
|
||||
pname = "unigine-superposition";
|
||||
version = "1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://assets.unigine.com/d/Unigine_Superposition-${version}.run";
|
||||
sha256 = "12hzlz792pf8pvxf13fww3qhahqzwzkxq9q3mq20hbhvaphbg7nd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
stdenv.cc.cc
|
||||
dbus
|
||||
freetype
|
||||
fontconfig
|
||||
zlib
|
||||
qtquickcontrols2
|
||||
libXinerama
|
||||
libxcb
|
||||
libSM
|
||||
libXi
|
||||
libglvnd
|
||||
libXext
|
||||
libXrandr
|
||||
mailspring
|
||||
libX11
|
||||
libICE
|
||||
libXrender
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
bash $src --target $name --noexec
|
||||
mkdir -p $out/bin $out/lib/unigine/superposition/
|
||||
cp -r $name/* $out/lib/unigine/superposition/
|
||||
echo "exec $out/lib/unigine/superposition/Superposition" >> $out/bin/superposition
|
||||
chmod +x $out/bin/superposition
|
||||
wrapProgram $out/lib/unigine/superposition/Superposition \
|
||||
--set QT_XKB_CONFIG_ROOT ${xkeyboard_config} \
|
||||
--run "cd $out/lib/unigine/superposition/"
|
||||
'';
|
||||
|
||||
dontUnpack = true;
|
||||
dontWrapQtApps = true;
|
||||
|
||||
postPatchMkspecs = ''
|
||||
cp -f $name/bin/superposition $out/lib/unigine/superposition/bin/superposition
|
||||
'';
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "Superposition";
|
||||
exec = "Superposition";
|
||||
genericName = "A GPU Stress test tool from the UNIGINE";
|
||||
icon = "Superposition";
|
||||
desktopName = "Superposition Benchmark";
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
# We can patch the "/bin/superposition", but "/bin/launcher" checks it for changes.
|
||||
# For that we need use a buildFHSUserEnv.
|
||||
|
||||
buildFHSUserEnv {
|
||||
name = "Superposition";
|
||||
|
||||
targetPkgs = pkgs: [
|
||||
superposition
|
||||
glib
|
||||
stdenv.cc.cc
|
||||
dbus
|
||||
freetype
|
||||
fontconfig
|
||||
zlib
|
||||
qtquickcontrols2
|
||||
libXinerama
|
||||
libxcb
|
||||
libSM
|
||||
libXi
|
||||
libglvnd
|
||||
libXext
|
||||
libXrandr
|
||||
mailspring
|
||||
libX11
|
||||
libICE
|
||||
libXrender
|
||||
openal
|
||||
];
|
||||
runScript = "superposition";
|
||||
|
||||
extraInstallCommands = ''
|
||||
# create directories
|
||||
mkdir -p $out/share/icons/hicolor $out/share/applications
|
||||
# create .desktop file
|
||||
ln -s ${desktopItem}/share/applications/* $out/share/applications
|
||||
# install Superposition.desktop and icon
|
||||
cp ${superposition}/lib/unigine/superposition/Superposition.png $out/share/icons/
|
||||
for RES in 16 24 32 48 64 128 256; do
|
||||
mkdir -p $out/share/icons/hicolor/"$RES"x"$RES"/apps
|
||||
cp ${superposition}/lib/unigine/superposition/icons/superposition_icon_$RES.png $out/share/icons/hicolor/"$RES"x"$RES"/apps/Superposition.png
|
||||
done
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "The Unigine Superposition GPU benchmarking tool";
|
||||
homepage = "https://benchmark.unigine.com/superposition";
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = [ lib.maintainers.BarinovMaxim ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
70
pkgs/applications/misc/gnome-solanum/default.nix
Normal file
70
pkgs/applications/misc/gnome-solanum/default.nix
Normal file
|
|
@ -0,0 +1,70 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, rustPlatform
|
||||
, desktop-file-utils
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, wrapGAppsHook
|
||||
, python3
|
||||
, git
|
||||
, glib
|
||||
, gtk4
|
||||
, gst_all_1
|
||||
, libadwaita
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "solanum";
|
||||
version = "3.0.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = "Solanum";
|
||||
rev = "v${version}";
|
||||
sha256 = "0cga6cz6jfbipzp008rjznkz7844licdc34lk133fcyqil0cg0ap";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
sha256 = "10kzv98b2fiql9f6n2fv6lrgq4fdzxq0h4nzcq9jrw3fsggzl0wb";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs build-aux
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
wrapGAppsHook
|
||||
python3
|
||||
git
|
||||
desktop-file-utils
|
||||
] ++ (with rustPlatform; [
|
||||
cargoSetupHook
|
||||
rust.cargo
|
||||
rust.rustc
|
||||
]);
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk4
|
||||
libadwaita
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-plugins-bad
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://gitlab.gnome.org/World/Solanum";
|
||||
description = "A pomodoro timer for the GNOME desktop";
|
||||
maintainers = with maintainers; [ linsui ];
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,6 +2,8 @@
|
|||
, lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, copyDesktopItems
|
||||
, makeDesktopItem
|
||||
, desktopToDarwinBundle
|
||||
, pkg-config
|
||||
, freetype
|
||||
|
|
@ -56,8 +58,9 @@ stdenv.mkDerivation rec {
|
|||
++ lib.optionals (!enableX11) [ "HAVE_X11=no" ]
|
||||
++ lib.optionals (!enableGL) [ "HAVE_GLUT=no" ];
|
||||
|
||||
nativeBuildInputs =
|
||||
[ pkg-config ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle;
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
++ lib.optional (enableGL || enableX11) copyDesktopItems
|
||||
++ lib.optional stdenv.isDarwin desktopToDarwinBundle;
|
||||
|
||||
buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg gumbo ]
|
||||
++ lib.optional stdenv.isDarwin xcbuild
|
||||
|
|
@ -77,6 +80,30 @@ stdenv.mkDerivation rec {
|
|||
rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,libjpeg,openjpeg,zlib}
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = pname;
|
||||
desktopName = pname;
|
||||
comment = meta.description;
|
||||
icon = "mupdf";
|
||||
exec = "${pname} %f";
|
||||
terminal = false;
|
||||
mimeTypes = [
|
||||
"application/epub+zip"
|
||||
"application/oxps"
|
||||
"application/pdf"
|
||||
"application/vnd.ms-xpsdocument"
|
||||
"application/x-cbz"
|
||||
"application/x-pdf"
|
||||
];
|
||||
categories = [ "Graphics" "Viewer" ];
|
||||
keywords = [
|
||||
"mupdf" "comic" "document" "ebook" "viewer"
|
||||
"cbz" "epub" "fb2" "pdf" "xps"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p "$out/lib/pkgconfig"
|
||||
cat >"$out/lib/pkgconfig/mupdf.pc" <<EOF
|
||||
|
|
@ -92,20 +119,14 @@ stdenv.mkDerivation rec {
|
|||
EOF
|
||||
|
||||
moveToOutput "bin" "$bin"
|
||||
'' + lib.optionalString enableX11 ''
|
||||
'' + lib.optionalString (enableX11 || enableGL) ''
|
||||
mkdir -p $bin/share/icons/hicolor/48x48/apps
|
||||
cp docs/logo/mupdf.png $bin/share/icons/hicolor/48x48/apps
|
||||
'' + (if enableGL then ''
|
||||
ln -s "$bin/bin/mupdf-gl" "$bin/bin/mupdf"
|
||||
'' else lib.optionalString (enableX11) ''
|
||||
ln -s "$bin/bin/mupdf-x11" "$bin/bin/mupdf"
|
||||
mkdir -p $bin/share/applications
|
||||
cat > $bin/share/applications/mupdf.desktop <<EOF
|
||||
[Desktop Entry]
|
||||
Type=Application
|
||||
Version=1.0
|
||||
Name=mupdf
|
||||
Comment=PDF viewer
|
||||
Exec=$bin/bin/mupdf-x11 %f
|
||||
Terminal=false
|
||||
MimeType=application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;application/epub+zip
|
||||
EOF
|
||||
'';
|
||||
'');
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -44,12 +44,12 @@ assert with lib.strings; (
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "palemoon";
|
||||
version = "29.4.4";
|
||||
version = "29.4.5";
|
||||
|
||||
src = fetchzip {
|
||||
name = "${pname}-${version}";
|
||||
url = "http://archive.palemoon.org/source/${pname}-${version}.source.tar.xz";
|
||||
sha256 = "sha256-0R0IJd4rd7NqnxQxkHSx10cNlwECqpKgJnlfYAMx4wc=";
|
||||
sha256 = "sha256-ls4uhfFaiFHkmAVbwwBenm71sNm6Tql2tMpzk9D2b5Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
|
||||
|
||||
let
|
||||
version = "0.27.4";
|
||||
sha256 = "06951i332gr17nsbns8mh4kcjilqfw5w95shaznpaksx93f554g0";
|
||||
manifestsSha256 = "0fvzh7j3vi5hw8jbw2gisjnn53bffwnp7zm3dwcbv3svwpw7823d";
|
||||
version = "0.28.3";
|
||||
sha256 = "1agzj8fgv6jp1i15asjvhnsxw4fj7i6g00ajjl4ihd9p166r83qy";
|
||||
manifestsSha256 = "036d1y5dkb9mir9iy76zwdydlqxpbhz7j25fy1faznmicm2qxiqi";
|
||||
|
||||
manifests = fetchzip {
|
||||
url =
|
||||
|
|
@ -23,7 +23,7 @@ in buildGoModule rec {
|
|||
inherit sha256;
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-7sHLXjyYMWSFckDPeVGJYK+nwhbRpD76tV334PCVYwA=";
|
||||
vendorSha256 = "sha256-8TIeVcPW55vJn49y2xLfOOrefmqNAhDMmTWS/c8HuA8=";
|
||||
|
||||
postUnpack = ''
|
||||
cp -r ${manifests} source/cmd/flux/manifests
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-freon";
|
||||
version = "45";
|
||||
version = "unstable-2022-02-05";
|
||||
|
||||
passthru = {
|
||||
extensionUuid = "freon@UshakovVasilii_Github.yahoo.com";
|
||||
|
|
@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "UshakovVasilii";
|
||||
repo = "gnome-shell-extension-freon";
|
||||
rev = "EGO-${version}";
|
||||
sha256 = "sha256-tPb7SzHSwvz7VV+kZTmcw1eAdtL1J7FJ3BOtg4Us8jc=";
|
||||
rev = "010c363d9bff8ed28000cbf8df2226dad65078fb";
|
||||
hash = "sha256-Fb8y+HoWq+205gqwAD2DVYym1eThGZqDML5HlyhS+4M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ glib ];
|
||||
|
|
|
|||
|
|
@ -80,6 +80,6 @@ index 03d469b..6057a3b 100644
|
|||
function getSmartData (argv){
|
||||
- const smartctl = GLib.find_program_in_path('smartctl')
|
||||
+ const smartctl = GLib.find_program_in_path('@smartmontools@/bin/smartctl')
|
||||
return JSON.parse(ByteArray.toString( GLib.spawn_command_line_sync(`${smartctl} ${argv} -j`)[1] ))
|
||||
return JSON.parse(ByteArray.toString( GLib.spawn_command_line_sync(`'${smartctl}' ${argv} -j`)[1] ))
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-gsconnect";
|
||||
version = "53";
|
||||
version = "50";
|
||||
|
||||
outputs = [ "out" "installedTests" ];
|
||||
|
||||
|
|
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "GSConnect";
|
||||
repo = "gnome-shell-extension-gsconnect";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-u14OVv3iyQbLEmqLgMdEUD2iC4nsYVCOr4ua66T3TBk=";
|
||||
hash = "sha256-uUpdjBsVeS99AYDpGlXP9fMqGxWj+XfVubNoGJs76G0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,17 +1,19 @@
|
|||
{ lib
|
||||
, fetchFromGitLab
|
||||
, git
|
||||
, coq
|
||||
, cacert
|
||||
}:
|
||||
|
||||
coq.ocamlPackages.buildDunePackage rec {
|
||||
pname = "ligo";
|
||||
version = "0.34.0";
|
||||
version = "0.36.0";
|
||||
src = fetchFromGitLab {
|
||||
owner = "ligolang";
|
||||
repo = "ligo";
|
||||
rev = version;
|
||||
sha256 = "sha256-MHkIr+XkW/zrRt+Cg48q4fOWTkNGH0hbf+oU7cAivNE=";
|
||||
sha256 = "0zx8ai79ha3npm3aybzgisil27v9i052cqdllfri0fsc67dig78b";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# The build picks this up for ligo --version
|
||||
|
|
@ -19,32 +21,59 @@ coq.ocamlPackages.buildDunePackage rec {
|
|||
|
||||
useDune2 = true;
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
git
|
||||
coq
|
||||
coq.ocamlPackages.menhir
|
||||
coq.ocamlPackages.ocaml-recovery-parser
|
||||
];
|
||||
|
||||
buildInputs = with coq.ocamlPackages; [
|
||||
coq
|
||||
menhir
|
||||
menhirLib
|
||||
qcheck
|
||||
ocamlgraph
|
||||
bisect_ppx
|
||||
ppx_deriving
|
||||
ppx_deriving_yojson
|
||||
ppx_expect
|
||||
tezos-base
|
||||
tezos-shell-services
|
||||
tezos-010-PtGRANAD-test-helpers
|
||||
tezos-011-PtHangz2-test-helpers
|
||||
tezos-protocol-010-PtGRANAD-parameters
|
||||
tezos-protocol-010-PtGRANAD
|
||||
tezos-protocol-environment
|
||||
ppx_import
|
||||
terminal_size
|
||||
ocaml-recovery-parser
|
||||
yojson
|
||||
getopt
|
||||
terminal_size
|
||||
core
|
||||
pprint
|
||||
linenoise
|
||||
|
||||
# Test helpers deps
|
||||
qcheck
|
||||
qcheck-alcotest
|
||||
alcotest-lwt
|
||||
|
||||
# vendored tezos' deps
|
||||
ctypes
|
||||
hacl-star
|
||||
hacl-star-raw
|
||||
lwt-canceler
|
||||
ipaddr
|
||||
bls12-381-unix
|
||||
bls12-381-legacy
|
||||
ptime
|
||||
mtime
|
||||
lwt_log
|
||||
ringo
|
||||
ringo-lwt
|
||||
secp256k1-internal
|
||||
resto
|
||||
resto-directory
|
||||
resto-cohttp-self-serving-client
|
||||
irmin-pack
|
||||
ezjsonm
|
||||
data-encoding
|
||||
bisect_ppx
|
||||
cmdliner
|
||||
core
|
||||
ocaml-recovery-parser
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-gmmlib";
|
||||
version = "22.1.0";
|
||||
version = "22.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "gmmlib";
|
||||
rev = "intel-gmmlib-${version}";
|
||||
sha256 = "sha256-4LFBokMEhhobKIMzZYlt3Nn88lX60l+IZZ0gi+o7Tds=";
|
||||
sha256 = "sha256-eU6ztYYcFPeADFBqmDFqyqVGlxdTV1N5pnIg6rjoALg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
47
pkgs/development/libraries/java/jffi/default.nix
Normal file
47
pkgs/development/libraries/java/jffi/default.nix
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
{ lib, stdenv, fetchFromGitHub, jdk, jre, ant, libffi, texinfo, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jffi";
|
||||
version = "1.3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jnr";
|
||||
repo = "jffi";
|
||||
rev = "jffi-${version}";
|
||||
sha256 = "sha256-VjZYhMbad+AesANG06umRzqMWj+Ebzu59TYK7Tm/bFo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ jdk ant texinfo pkg-config ];
|
||||
buildInputs = [ libffi ] ;
|
||||
|
||||
buildPhase = ''
|
||||
# The pkg-config script in the build.xml doesn't work propery
|
||||
# set the lib path manually to work around this.
|
||||
export LIBFFI_LIBS="${libffi}/lib/libffi.so"
|
||||
|
||||
ant -Duse.system.libffi=1 jar
|
||||
ant -Duse.system.libffi=1 archive-platform-jar
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/java
|
||||
cp -r dist/* $out/share/java
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
checkPhase = ''
|
||||
# The pkg-config script in the build.xml doesn't work propery
|
||||
# set the lib path manually to work around this.
|
||||
export LIBFFI_LIBS="${libffi}/lib/libffi.so"
|
||||
|
||||
ant -Duse.system.libffi=1 test
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Java Foreign Function Interface ";
|
||||
homepage = "https://github.com/jnr/jffi";
|
||||
platforms = platforms.unix;
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ bachp ];
|
||||
};
|
||||
}
|
||||
|
|
@ -19,11 +19,11 @@ assert withFonts -> freetype != null;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libbluray";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://get.videolan.org/libbluray/${version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-4tuvmehOCpcl9Jhby4XUHlLCJhzGUdiISxt5C17wFvk=";
|
||||
sha256 = "sha256-wksPQcW3N7u2XFRP5jSVY3p3HBClGd/IAudp8RK0O3U=";
|
||||
};
|
||||
|
||||
patches = optional withJava ./BDJ-JARFILE-path.patch;
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libgphoto2";
|
||||
version = "2.5.28";
|
||||
version = "2.5.29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gphoto";
|
||||
repo = "libgphoto2";
|
||||
rev = "libgphoto2-${builtins.replaceStrings [ "." ] [ "_" ] version}-release";
|
||||
sha256 = "sha256-e3zMinUUBKzZlQQzkS0oPWAzIVlmQoLj73Spj0XiTIE=";
|
||||
sha256 = "sha256-Js5gbD57lhtqBX6joGMiLKUwkPDaSclnTrwBR87AliQ=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ assert variant == null || variant == "gtk3" || variant == "gtk4" || variant == "
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libportal" + lib.optionalString (variant != null) "-${variant}";
|
||||
version = "0.5";
|
||||
version = "0.6";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
|
|
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "flatpak";
|
||||
repo = "libportal";
|
||||
rev = version;
|
||||
sha256 = "oPPO2f6NNeok0SGh4jELkkOP6VUxXZiwPM/n6CUHm0Q=";
|
||||
sha256 = "sha256-wDDE43UC6FBgPYLS+WWExeheURCH/3fCKu5oJg7GM+A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "suitesparse";
|
||||
version = "5.10.1";
|
||||
version = "5.11.0";
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
|
|
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "DrTimothyAldenDavis";
|
||||
repo = "SuiteSparse";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ifuoXgVQp2vHR/reC/Hjbt3vqaKpql3Nfxdb/Cgv/aU=";
|
||||
sha256 = "sha256-AM16ngJ/CoSV6BOb80Pi9EqWoRILryOO4Rk+S5DffLU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
|
|||
"CUBLAS_LIB=${cudatoolkit}/lib/libcublas.so"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# Unless these are set, the build will attempt to use `Accelerate` on darwin, see:
|
||||
# https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v5.10.1/SuiteSparse_config/SuiteSparse_config.mk#L368
|
||||
# https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v5.11.0/SuiteSparse_config/SuiteSparse_config.mk#L368
|
||||
"BLAS=-lblas"
|
||||
"LAPACK=-llapack"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "lwt-watcher";
|
||||
version = "0.1";
|
||||
version = "0.2";
|
||||
src = fetchFromGitLab {
|
||||
owner = "nomadic-labs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0kaf7py02i0dn9rvrbzxh4ljfg059wc8xvm093m9wy7lsa68rax9";
|
||||
sha256 = "sha256-35Z73bSzEEgTabNH2cD9lRdDczsyIMZR2ktyKx4aN9k=";
|
||||
};
|
||||
|
||||
useDune2 = true;
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "luxtronik";
|
||||
version = "0.3.10";
|
||||
version = "0.3.11";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "Bouni";
|
||||
repo = "python-luxtronik";
|
||||
rev = version;
|
||||
sha256 = "sha256-JPY1HbNZanEsUpQ5W2kAwEFvwNGQI2hoogTZUGIg3YY=";
|
||||
sha256 = "sha256-pngtkEuWmOD1MG7/Bh+8iqCxU0l/fGHA8uZxYoxOE5Y=";
|
||||
};
|
||||
|
||||
# Project has no tests
|
||||
|
|
|
|||
|
|
@ -74,7 +74,6 @@ buildPythonPackage rec {
|
|||
passlib
|
||||
protobuf
|
||||
publicsuffix2
|
||||
pyasn1
|
||||
pyopenssl
|
||||
pyparsing
|
||||
pyperclip
|
||||
|
|
@ -87,8 +86,6 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
checkInputs = [
|
||||
beautifulsoup4
|
||||
glibcLocales
|
||||
hypothesis
|
||||
parver
|
||||
pytest-asyncio
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{ buildPythonPackage
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytest
|
||||
, lib
|
||||
, pytestCheckHook
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -13,17 +14,17 @@ buildPythonPackage rec {
|
|||
sha256 = "51fdc7fb93615286428ee7758cecc2f374d5ff363bdd884c7ea622a7a327a81e";
|
||||
};
|
||||
|
||||
checkPhase = ''
|
||||
py.test
|
||||
'';
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/msgpack/msgpack-python";
|
||||
description = "MessagePack serializer implementation for Python";
|
||||
changelog = "https://github.com/msgpack/msgpack-python/blob/master/ChangeLog.rst";
|
||||
license = lib.licenses.asl20;
|
||||
# maintainers = ?? ;
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "nbxmpp";
|
||||
version = "2.0.4";
|
||||
version = "2.0.6";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "gajim";
|
||||
repo = "python-nbxmpp";
|
||||
rev = "nbxmpp-${version}";
|
||||
sha256 = "1c2ncx1k93gxndaw183x0vlqgjnippl3v6sknklj3z2yjcj0l1ks";
|
||||
sha256 = "sha256:03iydz0r9m8559srawwnhaqzqm9liwrnc8v6abj4w3m1lil32bid";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pex";
|
||||
version = "2.1.73";
|
||||
version = "2.1.74";
|
||||
format = "flit";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-OxIm0vFH0JadaKMGrKNNj8mA7ue1kazjpauSK6XNGiU=";
|
||||
hash = "sha256-SyKOwESn+0pFtm2GBFcS+kzIuv5cNXcayTtI7OyFpQg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "PyRect";
|
||||
version = "0.1.4";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Oy+nNTzjKhGqawoVSVlo0qdjQjyJR64ki5LAN9704gI=";
|
||||
sha256 = "sha256-9lFV9t+bkptnyv+9V8CUfFrlRJ07WA0XgHS/+0egm3g=";
|
||||
};
|
||||
|
||||
checkInputs = [ tox pytestCheckHook pygame ];
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "trimesh";
|
||||
version = "3.10.6";
|
||||
version = "3.10.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-oFNJ2hynf4bUY6sIXx7y4jEkCATi5rZetiCvNpwNzio=";
|
||||
sha256 = "sha256-OYor+DQJkkQx8C5E0pmeGaymiYEyKkuKBLp12jkrhS8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy ];
|
||||
|
|
|
|||
|
|
@ -12,6 +12,10 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
|
||||
buildInputs = lib.optional stdenv.hostPlatform.isLinux alsa-lib;
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 contrib/sndiod.service $out/lib/systemd/system/sndiod.service
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
, ninja
|
||||
, python3
|
||||
, gtk-doc
|
||||
, docbook_xsl
|
||||
, docbook-xsl-nons
|
||||
, udev
|
||||
, libgudev
|
||||
, libusb1
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "upower";
|
||||
version = "0.99.15";
|
||||
version = "0.99.17";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
|
|
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "upower";
|
||||
repo = "upower";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-GlLy2MPip21KOabdW8Vw6NVe3xhzsd9htxQ2xO/hZ/4=";
|
||||
sha256 = "xvvqzGxgkuGcvnO12jnLURNJUoSlnMw2g/mnII+i6Bs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
|||
ninja
|
||||
python3
|
||||
gtk-doc
|
||||
docbook_xsl
|
||||
docbook-xsl-nons
|
||||
gettext
|
||||
gobject-introspection
|
||||
libxslt
|
||||
|
|
@ -99,7 +99,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
homepage = "https://upower.freedesktop.org/";
|
||||
changelog = "https://gitlab.freedesktop.org/upower/upower/-/blob/v${version}/NEWS";
|
||||
description = "A D-Bus service for power management";
|
||||
maintainers = teams.freedesktop.members;
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl2Plus;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -27,12 +27,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rabbitmq-server";
|
||||
version = "3.9.13";
|
||||
version = "3.9.14";
|
||||
|
||||
# when updating, consider bumping elixir version in all-packages.nix
|
||||
src = fetchurl {
|
||||
url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-DndZ74m+CFyrukxKyOpfoRCb86RID2XL7x0eUZifcno=";
|
||||
sha256 = "sha256-c6GpB6CSCHiU9hTC9FkxyTc1UpNWxx5iP3y2dbTUfS0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "matrix-dendrite";
|
||||
version = "0.6.5";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matrix-org";
|
||||
repo = "dendrite";
|
||||
rev = "v${version}";
|
||||
sha256 = "jSn2awZsfsniSOTNkaEdQw/sZm7nUfiMntsxigy/51Y=";
|
||||
sha256 = "sha256-R0xGsngNk8osBh3vRUeYxmEgbbNa+wKOihRjOU40D48=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-B4d3FGXy8TrED3oikTjETQso/AtEfIWWcdY6FykD/8A=";
|
||||
vendorSha256 = "sha256-0Y/RVRWZ0osU/kEcf+Y8TH8K2rmxFmQSqMMNHoRIugo=";
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) dendrite;
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@ in lib.mapAttrs (n: make) (with lib.systems.examples; {
|
|||
armv6l-musl = muslpi;
|
||||
aarch64-musl = aarch64-multiplatform-musl;
|
||||
riscv64 = riscv64;
|
||||
mips64el-linux-gnuabin32 = lib.systems.platforms.mips64el-linux-gnuabin32;
|
||||
mips64el-linux-gnuabi64 = lib.systems.platforms.mips64el-linux-gnuabi64;
|
||||
mips64el-linux-gnuabin32 = mips64el-linux-gnuabin32;
|
||||
mips64el-linux-gnuabi64 = mips64el-linux-gnuabi64;
|
||||
powerpc64 = ppc64;
|
||||
powerpc64-musl = ppc64-musl;
|
||||
powerpc64le = powernv;
|
||||
|
|
|
|||
|
|
@ -41,13 +41,13 @@ let
|
|||
]));
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "ostree";
|
||||
version = "2022.1";
|
||||
version = "2022.2";
|
||||
|
||||
outputs = [ "out" "dev" "man" "installedTests" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz";
|
||||
sha256 = "sha256-Q6AOeFaEK4o09mFvws4c4jjvQyEMykH3DmtLDSqfytU=";
|
||||
sha256 = "sha256-duL1tXhNjLaG6QvjL87LtWxsaoJOA3ShpoILV3EDZ2s=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -40,13 +40,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rpm-ostree";
|
||||
version = "2022.2";
|
||||
version = "2022.3";
|
||||
|
||||
outputs = [ "out" "dev" "man" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-wy6zmVy7+31+wadLldWdf/IyT0dyLArYLmGw/Kgd+sU=";
|
||||
sha256 = "sha256-ERDaCLj/qvyzAxmpUfFsCx9fsDjlhQ19PRyUTVZ2Z2w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "amass";
|
||||
version = "3.18.2";
|
||||
version = "3.18.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OWASP";
|
||||
repo = "Amass";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2HE+hzvEbM+68x3YJq8rIMCKAld9MLrCEuHBA4uuetI=";
|
||||
sha256 = "sha256-DsIqG+r2PrMKEypLuLky60U3nXNt0Ms9YrZetIQGnpE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-hYrv5z+9JY7gXkC4xQvko7qhwBtzywUy0TMqrlgqXb0=";
|
||||
|
|
|
|||
|
|
@ -1,25 +1,18 @@
|
|||
{ lib, stdenv, fetchFromGitHub
|
||||
, autoPatchelfHook
|
||||
, fuse, packer
|
||||
, fuse, jffi
|
||||
, maven, jdk, jre, makeWrapper, glib, wrapGAppsHook
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "cryptomator";
|
||||
version = "1.5.15";
|
||||
version = "1.6.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cryptomator";
|
||||
repo = "cryptomator";
|
||||
rev = version;
|
||||
sha256 = "06n7wda7gfalvsg1rlcm51ss73nlbhh95z6zq18yvn040clkzkij";
|
||||
};
|
||||
|
||||
icons = fetchFromGitHub {
|
||||
owner = "cryptomator";
|
||||
repo = "cryptomator-linux";
|
||||
rev = version;
|
||||
sha256 = "1sqbx858zglv0xkpjya0cpbkxf2hkj1xvxhnir3176y2xyjv6aib";
|
||||
sha256 = "sha256-hOILOdVYBnS9XuEXaIJcf2bPF72Lcr7IBX4CFCIsC8k=";
|
||||
};
|
||||
|
||||
# perform fake build to make a fixed-output derivation out of the files downloaded from maven central (120MB)
|
||||
|
|
@ -28,10 +21,10 @@ let
|
|||
inherit src;
|
||||
|
||||
nativeBuildInputs = [ jdk maven ];
|
||||
buildInputs = [ jre ];
|
||||
|
||||
buildPhase = ''
|
||||
cd main
|
||||
while mvn -Prelease package -Dmaven.repo.local=$out/.m2 -Dmaven.wagon.rto=5000; [ $? = 1 ]; do
|
||||
while mvn -Plinux package -Dmaven.test.skip=true -Dmaven.repo.local=$out/.m2 -Dmaven.wagon.rto=5000; [ $? = 1 ]; do
|
||||
echo "timeout, restart maven to continue downloading"
|
||||
done
|
||||
'';
|
||||
|
|
@ -44,42 +37,52 @@ let
|
|||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "195ysv9l861y9d1lvmvi7wmk172ynlba9n233blpaigq88cjn208";
|
||||
outputHash = "sha256-XFqXjNjPN2vwA3jay7TS79S4FHksjjrODdD/p4oTvpg=";
|
||||
|
||||
doCheck = false;
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
inherit pname version src;
|
||||
|
||||
buildPhase = ''
|
||||
cd main
|
||||
mvn -Prelease package --offline -Dmaven.repo.local=$(cp -dpR ${deps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2
|
||||
mvn -Plinux package --offline -Dmaven.test.skip=true -Dmaven.repo.local=$(cp -dpR ${deps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin/ $out/usr/share/cryptomator/libs/
|
||||
mkdir -p $out/bin/ $out/share/cryptomator/libs/ $out/share/cryptomator/mods/
|
||||
|
||||
cp buildkit/target/libs/* buildkit/target/linux-libs/* $out/usr/share/cryptomator/libs/
|
||||
cp target/libs/* $out/share/cryptomator/libs/
|
||||
cp target/mods/* target/cryptomator-*.jar $out/share/cryptomator/mods/
|
||||
|
||||
# The bundeled jffi.so dosn't work on nixos and causes a segmentation fault
|
||||
# we thus replace it with a version build by nixos
|
||||
rm $out/share/cryptomator/libs/jff*.jar
|
||||
cp -f ${jffi}/share/java/jffi-complete.jar $out/share/cryptomator/libs/
|
||||
|
||||
makeWrapper ${jre}/bin/java $out/bin/cryptomator \
|
||||
--add-flags "-classpath '$out/usr/share/cryptomator/libs/*'" \
|
||||
--add-flags "--class-path '$out/share/cryptomator/libs/*'" \
|
||||
--add-flags "--module-path '$out/share/cryptomator/mods'" \
|
||||
--add-flags "-Dcryptomator.settingsPath='~/.config/Cryptomator/settings.json'" \
|
||||
--add-flags "-Dcryptomator.ipcPortPath='~/.config/Cryptomator/ipcPort.bin'" \
|
||||
--add-flags "-Dcryptomator.ipcSocketPath='~/.config/Cryptomator/ipc.socket'" \
|
||||
--add-flags "-Dcryptomator.logDir='~/.local/share/Cryptomator/logs'" \
|
||||
--add-flags "-Dcryptomator.mountPointsDir='~/.local/share/Cryptomator/mnt'" \
|
||||
--add-flags "-Djdk.gtk.version=3" \
|
||||
--add-flags "-Xss20m" \
|
||||
--add-flags "-Xmx512m" \
|
||||
--add-flags "org.cryptomator.launcher.Cryptomator" \
|
||||
--prefix PATH : "$out/usr/share/cryptomator/libs/:${lib.makeBinPath [ jre glib ]}" \
|
||||
--add-flags "-Djavafx.embed.singleThread=true " \
|
||||
--add-flags "-Dawt.useSystemAAFontSettings=on" \
|
||||
--add-flags "--module org.cryptomator.desktop/org.cryptomator.launcher.Cryptomator" \
|
||||
--prefix PATH : "$out/share/cryptomator/libs/:${lib.makeBinPath [ jre glib ]}" \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ fuse ]}" \
|
||||
--set JAVA_HOME "${jre.home}"
|
||||
|
||||
# install desktop entry and icons
|
||||
cp -r ${icons}/resources/appimage/AppDir/usr/* $out/
|
||||
cp -r ${src}/dist/linux/appimage/resources/AppDir/usr/* $out/
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook maven makeWrapper wrapGAppsHook jdk ];
|
||||
buildInputs = [ fuse packer jre glib ];
|
||||
buildInputs = [ fuse jre glib jffi ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Free client-side encryption for your cloud files";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# frozen_string_literal: true
|
||||
source "https://rubygems.org"
|
||||
|
||||
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.34"
|
||||
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.35"
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
GIT
|
||||
remote: https://github.com/rapid7/metasploit-framework
|
||||
revision: e1ab1599c07319d2732645b003c038ffa4dad7cd
|
||||
ref: refs/tags/6.1.34
|
||||
revision: c1efca37c6e967103978915618efa41515134ea1
|
||||
ref: refs/tags/6.1.35
|
||||
specs:
|
||||
metasploit-framework (6.1.34)
|
||||
metasploit-framework (6.1.35)
|
||||
actionpack (~> 6.0)
|
||||
activerecord (~> 6.0)
|
||||
activesupport (~> 6.0)
|
||||
|
|
@ -128,13 +128,13 @@ GEM
|
|||
arel-helpers (2.14.0)
|
||||
activerecord (>= 3.1.0, < 8)
|
||||
aws-eventstream (1.2.0)
|
||||
aws-partitions (1.568.0)
|
||||
aws-partitions (1.570.0)
|
||||
aws-sdk-core (3.130.0)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
aws-partitions (~> 1, >= 1.525.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
jmespath (~> 1.0)
|
||||
aws-sdk-ec2 (1.303.0)
|
||||
aws-sdk-ec2 (1.304.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-iam (1.68.0)
|
||||
|
|
@ -334,7 +334,7 @@ GEM
|
|||
rex-core
|
||||
rex-struct2
|
||||
rex-text
|
||||
rex-core (0.1.26)
|
||||
rex-core (0.1.27)
|
||||
rex-encoder (0.1.6)
|
||||
metasm
|
||||
rex-arch
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@ let
|
|||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "metasploit-framework";
|
||||
version = "6.1.34";
|
||||
version = "6.1.35";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rapid7";
|
||||
repo = "metasploit-framework";
|
||||
rev = version;
|
||||
sha256 = "sha256-6rGELJYmddWoR6qIuXKoCT5RpMASIzssWG9Y0Xtx+Z8=";
|
||||
sha256 = "sha256-1xEc+I2Pvs6GQuEGAHWWAum7ASESX5R5D1qN+wPtFgY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -104,10 +104,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1ap27g6hxcczpb5dj7v0wzxrvywfa2kf3zx69xnjz1qvxf3plw54";
|
||||
sha256 = "0w3y40l5xg0p5sha6w4wppwb6kil129nk760yblswqw7vz0s0mm0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.568.0";
|
||||
version = "1.570.0";
|
||||
};
|
||||
aws-sdk-core = {
|
||||
groups = ["default"];
|
||||
|
|
@ -124,10 +124,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "12k3gjsagdb11crg2gx7373qn1zhglkkija9d6558v0slcza8m3j";
|
||||
sha256 = "0vvplr6ml7acl047lynmsdl2bs2i992vx68dhzqmllppf8ggcjvs";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.303.0";
|
||||
version = "1.304.0";
|
||||
};
|
||||
aws-sdk-iam = {
|
||||
groups = ["default"];
|
||||
|
|
@ -684,12 +684,12 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
fetchSubmodules = false;
|
||||
rev = "e1ab1599c07319d2732645b003c038ffa4dad7cd";
|
||||
sha256 = "17zrf5xx2n3gb0n3n8qjq2j52gh9m1rbk25a8yldax96jqn89cga";
|
||||
rev = "c1efca37c6e967103978915618efa41515134ea1";
|
||||
sha256 = "01hnxl1zp3as1xwr8pqj440vps82jrsh01p18a3cxglgipw1q4fp";
|
||||
type = "git";
|
||||
url = "https://github.com/rapid7/metasploit-framework";
|
||||
};
|
||||
version = "6.1.34";
|
||||
version = "6.1.35";
|
||||
};
|
||||
metasploit-model = {
|
||||
groups = ["default"];
|
||||
|
|
@ -1147,10 +1147,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1hjc70q6wb580k0jk4g4s9aqwd25l48kr0pcyjjs2ffax0zcm4d0";
|
||||
sha256 = "0a5fb8g6ksak1g1syhvh5rh87shnx617l7nl6afl80in0h4fd4xd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.26";
|
||||
version = "0.1.27";
|
||||
};
|
||||
rex-encoder = {
|
||||
groups = ["default"];
|
||||
|
|
|
|||
33
pkgs/tools/text/justify/default.nix
Normal file
33
pkgs/tools/text/justify/default.nix
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitea
|
||||
, cmake
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "justify";
|
||||
version = "unstable-2022-03-19";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "tildegit.org";
|
||||
owner = "jns";
|
||||
repo = "justify";
|
||||
rev = "0d397c20ed921c8e091bf18e548d174e15810e62";
|
||||
sha256 = "sha256-406OhJt2Ila/LIhfqJXhbFqFxJJiRyMVI4/VK8Y43kc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
installPhase = ''
|
||||
install -D justify $out/bin/justify
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://tildegit.org/jns/justify";
|
||||
description = "Simple text alignment tool that supports left/right/center/fill justify alignment";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "justify";
|
||||
maintainers = with maintainers; [ xfnw ];
|
||||
};
|
||||
}
|
||||
|
|
@ -6110,6 +6110,8 @@ with pkgs;
|
|||
|
||||
gnome-secrets = callPackage ../applications/misc/gnome-secrets { };
|
||||
|
||||
gnome-solanum = callPackage ../applications/misc/gnome-solanum { };
|
||||
|
||||
gnome-podcasts = callPackage ../applications/audio/gnome-podcasts { };
|
||||
|
||||
gnome-photos = callPackage ../applications/graphics/gnome-photos { };
|
||||
|
|
@ -7034,6 +7036,8 @@ with pkgs;
|
|||
|
||||
jupyter-kernel = callPackage ../applications/editors/jupyter/kernel.nix { };
|
||||
|
||||
justify = callPackage ../tools/text/justify { };
|
||||
|
||||
jwhois = callPackage ../tools/networking/jwhois { };
|
||||
|
||||
k2pdfopt = callPackage ../applications/misc/k2pdfopt { };
|
||||
|
|
@ -20964,6 +20968,8 @@ with pkgs;
|
|||
|
||||
jdom = callPackage ../development/libraries/java/jdom { };
|
||||
|
||||
jffi = callPackage ../development/libraries/java/jffi { };
|
||||
|
||||
jflex = callPackage ../development/libraries/java/jflex { };
|
||||
|
||||
lombok = callPackage ../development/libraries/java/lombok { };
|
||||
|
|
@ -29690,6 +29696,8 @@ with pkgs;
|
|||
|
||||
unigine-heaven = callPackage ../applications/graphics/unigine-heaven { };
|
||||
|
||||
unigine-superposition = libsForQt5.callPackage ../applications/graphics/unigine-superposition { };
|
||||
|
||||
unipicker = callPackage ../applications/misc/unipicker { };
|
||||
|
||||
unison = callPackage ../applications/networking/sync/unison {
|
||||
|
|
|
|||
Loading…
Reference in a new issue