Merge master into haskell-updates
This commit is contained in:
commit
78e55d66b3
4
.github/CODEOWNERS
vendored
4
.github/CODEOWNERS
vendored
|
@ -192,8 +192,8 @@
|
|||
/nixos/tests/knot.nix @mweinelt
|
||||
|
||||
# Dhall
|
||||
/pkgs/development/dhall-modules @Gabriel439 @Profpatsch @ehmry
|
||||
/pkgs/development/interpreters/dhall @Gabriel439 @Profpatsch @ehmry
|
||||
/pkgs/development/dhall-modules @Gabriella439 @Profpatsch @ehmry
|
||||
/pkgs/development/interpreters/dhall @Gabriella439 @Profpatsch @ehmry
|
||||
|
||||
# Idris
|
||||
/pkgs/development/idris-modules @Infinisil
|
||||
|
|
|
@ -222,6 +222,13 @@ in
|
|||
for available options with which to populate settings.
|
||||
'';
|
||||
};
|
||||
openRegistration = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Allow open registration without secondary verification (reCAPTCHA).
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
@ -263,6 +270,8 @@ in
|
|||
"--https-bind-address :${builtins.toString cfg.httpsPort}"
|
||||
"--tls-cert ${cfg.tlsCert}"
|
||||
"--tls-key ${cfg.tlsKey}"
|
||||
] ++ lib.optionals cfg.openRegistration [
|
||||
"--really-enable-open-registration"
|
||||
]);
|
||||
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
|
||||
Restart = "on-failure";
|
||||
|
|
|
@ -37,13 +37,11 @@ in
|
|||
{ assertion = cfg.efi -> cfg.hvm;
|
||||
message = "EC2 instances using EFI must be HVM instances.";
|
||||
}
|
||||
{ assertion = versionOlder config.boot.kernelPackages.kernel.version "5.15";
|
||||
message = "ENA driver fails to build with kernel >= 5.15";
|
||||
{ assertion = versionOlder config.boot.kernelPackages.kernel.version "5.17";
|
||||
message = "ENA driver fails to build with kernel >= 5.17";
|
||||
}
|
||||
];
|
||||
|
||||
boot.kernelPackages = pkgs.linuxKernel.packages.linux_5_10;
|
||||
|
||||
boot.growPartition = cfg.hvm;
|
||||
|
||||
fileSystems."/" = mkIf (!cfg.zfs.enable) {
|
||||
|
|
|
@ -73,9 +73,6 @@ in
|
|||
|
||||
environment.systemPackages = with pkgs; [ anbox ];
|
||||
|
||||
boot.kernelModules = [ "ashmem_linux" "binder_linux" ];
|
||||
boot.extraModulePackages = [ kernelPackages.anbox ];
|
||||
|
||||
services.udev.extraRules = ''
|
||||
KERNEL=="ashmem", NAME="%k", MODE="0666"
|
||||
KERNEL=="binder*", NAME="%k", MODE="0666"
|
||||
|
|
|
@ -17,6 +17,7 @@ import ./make-test-python.nix (
|
|||
homeserver = { pkgs, ... }: {
|
||||
services.dendrite = {
|
||||
enable = true;
|
||||
openRegistration = true;
|
||||
settings = {
|
||||
global.server_name = "test-dendrite-server.com";
|
||||
global.private_key = private_key;
|
||||
|
|
|
@ -1,34 +0,0 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, deadbeef, gtk3, libxml2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deadbeef-infobar-plugin";
|
||||
version = "1.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://bitbucket.org/dsimbiriatin/deadbeef-infobar/downloads/deadbeef-infobar-${version}.tar.gz";
|
||||
sha256 = "0c9wh3wh1hdww7v96i8cy797la06mylhfi0880k8vwh88079aapf";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ deadbeef gtk3 libxml2 ];
|
||||
|
||||
buildFlags = [ "gtk3" ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/lib/deadbeef
|
||||
cp gtk3/ddb_infobar_gtk3.so $out/lib/deadbeef
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
broken = true; # crashes DeaDBeeF and is abandoned (https://bitbucket.org/dsimbiriatin/deadbeef-infobar/issues/38/infobar-causes-deadbeef-180-to-crash)
|
||||
description = "DeaDBeeF Infobar Plugin";
|
||||
homepage = "https://bitbucket.org/dsimbiriatin/deadbeef-infobar";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.jtojnar ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
|
@ -1,62 +0,0 @@
|
|||
{ lib, stdenv, fetchFromGitHub, makeWrapper
|
||||
, shntool, cuetools
|
||||
, flac, faac, mp4v2, wavpack, mac
|
||||
, imagemagick, libiconv, enca, lame, mutagen, vorbis-tools
|
||||
, aacgain, mp3gain, vorbisgain
|
||||
}:
|
||||
|
||||
let
|
||||
wrapSplit2flac = format: ''
|
||||
makeWrapper $out/bin/.split2flac-wrapped $out/bin/split2${format} \
|
||||
--set SPLIT2FLAC_FORMAT ${format} \
|
||||
--prefix PATH : ${lib.makeBinPath [
|
||||
shntool cuetools
|
||||
flac faac mp4v2 wavpack mac
|
||||
imagemagick libiconv enca lame mutagen vorbis-tools
|
||||
aacgain mp3gain vorbisgain
|
||||
]}
|
||||
'';
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "split2flac";
|
||||
version = "122";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ftrvxmtrx";
|
||||
repo = "split2flac";
|
||||
rev = version;
|
||||
sha256 = "1a71amamip25hhqx7wwzfcl3d5snry9xsiha0kw73iq2m83r2k63";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace split2flac \
|
||||
--replace 'FORMAT="''${0##*split2}"' 'FORMAT=''${SPLIT2FLAC_FORMAT:-flac}'
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/bash-completion/completions
|
||||
cp split2flac-bash-completion.sh \
|
||||
$out/share/bash-completion/completions/split2flac-bash-completion.sh
|
||||
|
||||
mkdir -p $out/bin
|
||||
cp split2flac $out/bin/.split2flac-wrapped
|
||||
|
||||
${wrapSplit2flac "flac"}
|
||||
${wrapSplit2flac "mp3"}
|
||||
${wrapSplit2flac "ogg"}
|
||||
${wrapSplit2flac "m4a"}
|
||||
${wrapSplit2flac "wav"}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Split flac/ape/wv/wav + cue sheet into separate tracks";
|
||||
homepage = "https://github.com/ftrvxmtrx/split2flac";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ jfrankenau ];
|
||||
};
|
||||
}
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, testers, sptlrx }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "sptlrx";
|
||||
|
@ -15,6 +15,12 @@ buildGoModule rec {
|
|||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = sptlrx;
|
||||
# TODO Wrong version in `0.2.0`. Has been fixed upstream.
|
||||
version = "v0.1.0";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Spotify lyrics in your terminal";
|
||||
homepage = "https://github.com/raitonoberu/sptlrx";
|
||||
|
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "termusic";
|
||||
version = "0.6.10";
|
||||
version = "0.6.15";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-i+XxEPkLZK+JKDl88P8Nd7XBhsGhEzvUGovJtSWvRtg=";
|
||||
sha256 = "sha256-e4hCo5a54EPp6/sd1/ivwHePu+e6MqbA9tvPWf41EhQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-7nQzU1VvRDrtltVAXTX268vl9AbQhMOilPG4nNAJ+Xk=";
|
||||
cargoHash = "sha256-kQjLmASJpo7+LT73vVjbPWhNUGJ1HI6S/8W6gJskJXE=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ alsa-lib ];
|
||||
|
|
|
@ -1,24 +1,37 @@
|
|||
{ rust, rustPlatform, stdenv, lib, fetchFromGitHub, autoreconfHook, makeWrapper
|
||||
, cargo, pkg-config, curl, coreutils, boost177, db62, hexdump, libsodium
|
||||
, libevent, utf8cpp, util-linux, withDaemon ? true, withMining ? true
|
||||
{ rust, rustPlatform, stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook
|
||||
, makeWrapper, cargo, pkg-config, curl, coreutils, boost178, db62, hexdump
|
||||
, libsodium, libevent, utf8cpp, util-linux, withDaemon ? true, withMining ? true
|
||||
, withUtils ? true, withWallet ? true, withZmq ? true, zeromq
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec {
|
||||
pname = "zcash";
|
||||
version = "4.6.0-2";
|
||||
version = "4.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zcash";
|
||||
repo = "zcash";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RvUa8CKPBFfsqzrJkPHePZMqpCfyVafrUbftMdTviHA=";
|
||||
sha256 = "sha256-yF+/QepSiZwsdZydWjvxDIFeFyJbJyqZmCdMyQHmrzI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-qWimataBZ/rLDOLgetNfFAzi/psXcJV54b3WGm9k+b4=";
|
||||
prePatch = lib.optionalString stdenv.isAarch64 ''
|
||||
substituteInPlace .cargo/config.offline \
|
||||
--replace "[target.aarch64-unknown-linux-gnu]" "" \
|
||||
--replace "linker = \"aarch64-linux-gnu-gcc\"" ""
|
||||
'';
|
||||
|
||||
cargoPatches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/zcash/zcash/commit/61cd19a52d41d60c1987ecf269f7aa8e4d527310.diff";
|
||||
sha256 = "sha256-/7T2yCSVlRN7qfFjrZlfBNMlbVHb/KRjtUBY2xFr0mo=";
|
||||
})
|
||||
];
|
||||
|
||||
cargoSha256 = "sha256-+BLfO5OnCBqQTIqMXKJdoPCRgtENa+m0WOHKG9gkdMk=";
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook cargo hexdump makeWrapper pkg-config ];
|
||||
buildInputs = [ boost177 libevent libsodium utf8cpp ]
|
||||
buildInputs = [ boost178 libevent libsodium utf8cpp ]
|
||||
++ lib.optional withWallet db62
|
||||
++ lib.optional withZmq zeromq;
|
||||
|
||||
|
@ -37,7 +50,7 @@ rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec {
|
|||
|
||||
configureFlags = [
|
||||
"--disable-tests"
|
||||
"--with-boost-libdir=${lib.getLib boost177}/lib"
|
||||
"--with-boost-libdir=${lib.getLib boost178}/lib"
|
||||
"CXXFLAGS=-I${lib.getDev utf8cpp}/include/utf8cpp"
|
||||
"RUST_TARGET=${rust.toRustTargetSpec stdenv.hostPlatform}"
|
||||
] ++ lib.optional (!withWallet) "--disable-wallet"
|
||||
|
@ -58,8 +71,8 @@ rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec {
|
|||
meta = with lib; {
|
||||
description = "Peer-to-peer, anonymous electronic cash system";
|
||||
homepage = "https://z.cash/";
|
||||
maintainers = with maintainers; [ rht tkerber ];
|
||||
maintainers = with maintainers; [ rht tkerber centromere ];
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -38,13 +38,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cudatext";
|
||||
version = "1.163.0";
|
||||
version = "1.164.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alexey-T";
|
||||
repo = "CudaText";
|
||||
rev = version;
|
||||
sha256 = "sha256-4jGLyAE202GAjaypubKGW1edyKqOti/yTwstC/R94iE=";
|
||||
sha256 = "sha256-LKLWZiA3Ya8xI2QvNW2f+5akndBloj5pQ7QNaVMoYSI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -11,13 +11,13 @@
|
|||
},
|
||||
"ATFlatControls": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.04.18",
|
||||
"sha256": "sha256-Bp/pkbTPLiVaDSstzTaNjKb+msPw8Tuny75n/aYBpUc="
|
||||
"rev": "2022.05.06",
|
||||
"sha256": "sha256-mYZ3mgtUpQ8sry5WmdluHca/CR7RqR9GRrxIoeZFLes="
|
||||
},
|
||||
"ATSynEdit": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.04.26",
|
||||
"sha256": "sha256-aItWkjnFqxeyEywELEBkuvMH1zfI4jJFL10CexSktxU="
|
||||
"rev": "2022.05.09",
|
||||
"sha256": "sha256-bzBO9Uf8Zkt/kFouQuiPagL7e+86ezH/mOpDCuInJlE="
|
||||
},
|
||||
"ATSynEdit_Cmp": {
|
||||
"owner": "Alexey-T",
|
||||
|
@ -26,13 +26,13 @@
|
|||
},
|
||||
"EControl": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.04.21",
|
||||
"sha256": "sha256-le6ulGFUNjeipYQKzVFezFb9u/0IcQcu5BMxFaIZdyw="
|
||||
"rev": "2022.05.06",
|
||||
"sha256": "sha256-ppm8Wuxhi5N3Er0f0h9d+v2spwEMr7ksf9tz4vI42+M="
|
||||
},
|
||||
"ATSynEdit_Ex": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.04.11",
|
||||
"sha256": "sha256-wzE6lNhrXsBOP+Zx+qAcj6Hhf87qqDaqKf9up7I3ZUo="
|
||||
"rev": "2022.05.08",
|
||||
"sha256": "sha256-mAxqJ3PO1BCOYNctKfw/4fKbJsI7Ckb5PVcKdALZu0Q="
|
||||
},
|
||||
"Python-for-Lazarus": {
|
||||
"owner": "Alexey-T",
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "scite";
|
||||
version = "5.0.2";
|
||||
version = "5.2.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.scintilla.org/scite502.tgz";
|
||||
sha256 = "00n2gr915f7kvp2250dzn6n0p6lhr6qdlm1m7y2xi6qrrky0bpan";
|
||||
url = "https://www.scintilla.org/scite522.tgz";
|
||||
sha256 = "1q46clclx8r0b8zbq2zi89sygszgqf9ra5l83r2fs0ghvjgh2cxd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
@ -6326,6 +6326,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/darfink/starsearch.vim/";
|
||||
};
|
||||
|
||||
stylish-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "stylish.nvim";
|
||||
version = "2022-02-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "teto";
|
||||
repo = "stylish.nvim";
|
||||
rev = "ea745ebf446410ef3d75f9890b2e7fd59be42e19";
|
||||
sha256 = "1kl2g32ls4s7kpr6395rdmsa7gdzkpfiypphmnxg8n75n0b0mwb3";
|
||||
};
|
||||
meta.homepage = "https://github.com/teto/stylish.nvim/";
|
||||
};
|
||||
|
||||
suda-vim = buildVimPluginFrom2Nix {
|
||||
pname = "suda.vim";
|
||||
version = "2022-02-10";
|
||||
|
|
|
@ -41,6 +41,8 @@
|
|||
, ycmd
|
||||
, zoxide
|
||||
, nodejs
|
||||
, xdotool
|
||||
, xorg
|
||||
|
||||
# test dependencies
|
||||
, neovim-unwrapped
|
||||
|
@ -606,6 +608,14 @@ self: super: {
|
|||
'';
|
||||
};
|
||||
|
||||
stylish-nvim = super.stylish-nvim.overrideAttrs (old: {
|
||||
postPatch = ''
|
||||
substituteInPlace lua/stylish/common/mouse_hover_handler.lua --replace xdotool ${xdotool}/bin/xdotool
|
||||
substituteInPlace lua/stylish/components/menu.lua --replace xdotool ${xdotool}/bin/xdotool
|
||||
substituteInPlace lua/stylish/components/menu.lua --replace xwininfo ${xorg.xwininfo}/bin/xwininfo
|
||||
'';
|
||||
});
|
||||
|
||||
sved =
|
||||
let
|
||||
# we put the script in its own derivation to benefit the magic of wrapGAppsHook
|
||||
|
|
|
@ -14,17 +14,17 @@ let
|
|||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "0ss7c0dvlgnfqi0snhx73ndzjbw24xz6pcny4v52mrd1kfhcmpvd";
|
||||
x86_64-darwin = "0ds5jv5q6k1hzrwhcgkyvx0ls9p1q7zh0fqigpxandx6ysrd7cga";
|
||||
aarch64-linux = "12zz02hdhhw19rx9kbi3yd5x81w1vs8vxjrnqqvva8bj0jnwf4iq";
|
||||
aarch64-darwin = "07ws2dc2il7ky77j5pxaxqp5cyw0v04jnv98z1494pdmxyn8gf7q";
|
||||
armv7l-linux = "0khyzc69rbfz2pnbab9v3as1hdzkzxfg3mxvf6g7ax9npvsrqw92";
|
||||
x86_64-linux = "1db5vwcwi3w11zm2b72cvddn5k9yav65rg7ii9wq4a0dym39f8ql";
|
||||
x86_64-darwin = "1q5vjisdc0q5vigb1lwq8fkxbaar73jnk4ac0fqlhc4gqacz3cs3";
|
||||
aarch64-linux = "01lcvjw9nfgp93ydl16bp91gbkivd23jn8pan220fjvdsgvcbg48";
|
||||
aarch64-darwin = "06p6p2c9a3rav9c23pvfn8mmd77wc9z7pavpmkgm1f3wplx48q8q";
|
||||
armv7l-linux = "0pzim9r2zzwyim3g6f8ixgqllgz4cijaiw76czi0wmz4dxxdljrw";
|
||||
}.${system};
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.67.0";
|
||||
version = "1.67.1";
|
||||
pname = "vscode";
|
||||
|
||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
|
|
|
@ -2,83 +2,72 @@
|
|||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, alsa-lib
|
||||
, gtksourceview3
|
||||
, libXv
|
||||
, openal
|
||||
, libpulseaudio
|
||||
, libao
|
||||
, udev
|
||||
, SDL2
|
||||
, alsa-lib
|
||||
, gtk3
|
||||
, gtksourceview3
|
||||
, libGL
|
||||
, libGLU
|
||||
, libX11
|
||||
, libXv
|
||||
, libao
|
||||
, libpulseaudio
|
||||
, openal
|
||||
, udev
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ares";
|
||||
version = "126";
|
||||
version = "127";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ares-emulator";
|
||||
repo = "ares";
|
||||
rev = "v${version}";
|
||||
sha256 = "1rj4vmz8lvpmfc6wni7222kagnw9f6jda9rcb6qky2kpizlp2d24";
|
||||
};
|
||||
|
||||
parallel-rdp = fetchFromGitHub {
|
||||
owner = "Themaister";
|
||||
repo = "parallel-rdp-standalone";
|
||||
rev = "0dcebe11ee79288441e40e145c8f340d81f52316";
|
||||
sha256 = "1avp4wyfkhk5yfjqx5w3jbqghn2mq5la7k9248kjmnp9n9lip6w9";
|
||||
sha256 = "0rhq39w41j9yr1fkyfmf4n6fjxnq1cglj98rp4wys12kwqv7smvx";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./dont-rebuild-on-install.patch
|
||||
./fix-ruby.patch
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
dontConfigure = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
gtksourceview3
|
||||
libXv
|
||||
openal
|
||||
libpulseaudio
|
||||
libao
|
||||
udev
|
||||
SDL2
|
||||
alsa-lib
|
||||
gtk3
|
||||
gtksourceview3
|
||||
libGL
|
||||
libGLU
|
||||
libX11
|
||||
libXv
|
||||
libao
|
||||
libpulseaudio
|
||||
openal
|
||||
udev
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
enableParallelBuilding = true;
|
||||
|
||||
rm -rf ares/n64/vulkan/parallel-rdp
|
||||
ln -sf ${parallel-rdp} ares/n64/vulkan/parallel-rdp
|
||||
make -C desktop-ui -j $NIX_BUILD_CORES openmp=true vulkan=true local=false hiro=gtk3
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/{bin,share/{applications,ares,pixmaps}}
|
||||
cp desktop-ui/out/ares $out/bin
|
||||
cp desktop-ui/resource/ares.desktop $out/share/applications
|
||||
cp desktop-ui/resource/{ares{.ico,.png},font.png} $out/share/pixmaps
|
||||
cp -r ares/{Shaders,System} $out/share/ares
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
makeFlags = [
|
||||
"-C desktop-ui"
|
||||
"local=false"
|
||||
"openmp=true"
|
||||
"hiro=gtk3"
|
||||
"prefix=$(out)"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://ares.dev";
|
||||
description = "Open-source multi-system emulator with a focus on accuracy and preservation";
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ Madouura ];
|
||||
platforms = platforms.all;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
# TODO: select between Qt, GTK2 and GTK3
|
||||
# TODO: support Darwin
|
||||
|
|
|
@ -0,0 +1,22 @@
|
|||
From 65cc7647110edd768e7baa7991143014316e655a Mon Sep 17 00:00:00 2001
|
||||
From: Madoura <93990818+Madouura@users.noreply.github.com>
|
||||
Date: Mon, 9 May 2022 10:17:06 -0500
|
||||
Subject: [PATCH] Update GNUmakefile
|
||||
|
||||
---
|
||||
desktop-ui/GNUmakefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/desktop-ui/GNUmakefile b/desktop-ui/GNUmakefile
|
||||
index 8e27b11d3..0bee561fb 100644
|
||||
--- a/desktop-ui/GNUmakefile
|
||||
+++ b/desktop-ui/GNUmakefile
|
||||
@@ -106,7 +106,7 @@ endif
|
||||
$(call rdelete,$(object.path))
|
||||
$(call rdelete,$(output.path))
|
||||
|
||||
-install: all
|
||||
+install:
|
||||
ifeq ($(platform),windows)
|
||||
$(call mkdir,$(prefix)/$(name)/)
|
||||
else ifeq ($(shell id -un),root)
|
|
@ -1,39 +1,41 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, libarchive
|
||||
, SDL
|
||||
}:
|
||||
|
||||
let
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dgen-sdl";
|
||||
version = "1.33";
|
||||
in stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://sourceforge.net/projects/dgen/files/dgen/${version}/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-meLAYBfCKHPHf4gYbrzAmGckTrbgQsdjuwlLArje9h4=";
|
||||
};
|
||||
|
||||
buildInputs = [ SDL libarchive ];
|
||||
buildInputs = [
|
||||
SDL
|
||||
libarchive
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-joystick"
|
||||
"--enable-debugger"
|
||||
"--enable-debug-vdp"
|
||||
"--enable-debugger"
|
||||
"--enable-joystick"
|
||||
"--enable-pico" # experimental
|
||||
"--enable-vgmdump"
|
||||
"--with-star=no" # Needs ASM support
|
||||
"--with-musa"
|
||||
"--with-cyclone=no" # Needs ASM support
|
||||
"--with-mz80"
|
||||
"--with-cz80"
|
||||
"--with-drz80=no" # Needs ASM support
|
||||
"--with-dz80"
|
||||
"--with-musa"
|
||||
"--with-mz80"
|
||||
"--with-star=no" # Needs ASM support
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://dgen.sourceforge.net/";
|
||||
homepage = "http://dgen.sourceforge.net/";
|
||||
description = "Sega Genesis/Mega Drive emulator";
|
||||
longDescription = ''
|
||||
DGen/SDL is a free, open source emulator for Sega Genesis/Mega Drive
|
||||
|
|
|
@ -12,7 +12,9 @@
|
|||
, libpng
|
||||
, libpulseaudio
|
||||
, libsamplerate
|
||||
, libxml2
|
||||
, libXdmcp
|
||||
, openssl
|
||||
, pcre
|
||||
, perl
|
||||
, pkg-config
|
||||
, portaudio
|
||||
|
@ -20,6 +22,8 @@
|
|||
, soundtouch
|
||||
, stdenv
|
||||
, udev
|
||||
, vulkan-headers
|
||||
, vulkan-loader
|
||||
, wrapGAppsHook
|
||||
, wxGTK
|
||||
, zlib
|
||||
|
@ -28,14 +32,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pcsx2";
|
||||
version = "1.7.2105";
|
||||
version = "1.7.2731";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PCSX2";
|
||||
repo = "pcsx2";
|
||||
fetchSubmodules = true;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/A8u7oDIVs0Zmne0ebaXxOeIQbM9pr62KEH6FJR2umk=";
|
||||
hash = "sha256-b3cK3ly9J44YMy/cNprlDCSsu8+DrlhRSLXv5xMouWo=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
@ -44,9 +48,10 @@ stdenv.mkDerivation rec {
|
|||
"-DPACKAGE_MODE=TRUE"
|
||||
"-DWAYLAND_API=TRUE"
|
||||
"-DXDG_STD=TRUE"
|
||||
"-DUSE_VULKAN=TRUE"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake perl pkg-config wrapGAppsHook ];
|
||||
nativeBuildInputs = [ cmake perl pkg-config vulkan-headers wrapGAppsHook ];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
|
@ -60,16 +65,29 @@ stdenv.mkDerivation rec {
|
|||
libpng
|
||||
libpulseaudio
|
||||
libsamplerate
|
||||
libxml2
|
||||
libXdmcp
|
||||
openssl
|
||||
pcre
|
||||
portaudio
|
||||
SDL2
|
||||
soundtouch
|
||||
udev
|
||||
vulkan-loader
|
||||
wayland
|
||||
wxGTK
|
||||
zlib
|
||||
];
|
||||
|
||||
# Wayland doesn't seem to work right now (crashes when booting a game).
|
||||
# Try removing `--prefix GDK_BACKEND : x11` on the next update.
|
||||
# (This may be solved when the project finshes migrating to Qt)
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}
|
||||
--prefix GDK_BACKEND : x11
|
||||
)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Playstation 2 emulator";
|
||||
longDescription = ''
|
||||
|
@ -81,13 +99,12 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
homepage = "https://pcsx2.net";
|
||||
maintainers = with maintainers; [ hrdinka govanify ];
|
||||
mainProgram = "PCSX2";
|
||||
|
||||
# PCSX2's source code is released under LGPLv3+. It However ships
|
||||
# additional data files and code that are licensed differently.
|
||||
# This might be solved in future, for now we should stick with
|
||||
# license.free
|
||||
license = licenses.free;
|
||||
platforms = platforms.x86;
|
||||
platforms = platforms.x86_64;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,34 +0,0 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchurl, cgal, boost, gmp, mpfr, flex, bison, dxflib, readline
|
||||
, qtbase, qmake, libGLU
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.9.8";
|
||||
pname = "rapcad";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gilesbathgate";
|
||||
repo = "rapcad";
|
||||
rev = "v${version}";
|
||||
sha256 = "0a0sqf6h227zalh0jrz6jpm8iwji7q3i31plqk76i4qm9vsgrhir";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchurl {
|
||||
url = "https://github.com/GilesBathgate/RapCAD/commit/278a8d6c7b8fe08f867002528bbab4a6319a7bb6.patch";
|
||||
sha256 = "1vvkyf0wg79zdzs5zlggfrr1lrp1x75dglzl0mspnycwldsdwznj";
|
||||
name = "disable-QVector-qHash.patch";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
buildInputs = [ qtbase cgal boost gmp mpfr flex bison dxflib readline libGLU ];
|
||||
|
||||
meta = with lib; {
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.raskin ];
|
||||
platforms = platforms.linux;
|
||||
description = "Constructive solid geometry package";
|
||||
broken = true; # 2018-04-11
|
||||
};
|
||||
}
|
|
@ -19,7 +19,7 @@ mkDerivation {
|
|||
'';
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/kgpg/";
|
||||
description = "Encryption tool";
|
||||
description = "A KDE based interface for GnuPG, a powerful encryption utility";
|
||||
license = [ lib.licenses.gpl2 ];
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
|
|
|
@ -76,7 +76,7 @@
|
|||
(fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; })
|
||||
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.0.0"; sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.4"; sha256 = "1zm9q9yvglsn5w786c9cjdfj1a8z4sipmvn9rhg3ps23rllxwmcc"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.4"; sha256 = "0g1vw0wr88zlfpdg2gz8c0mriasci1kzvjia4nj19j7b0zaga7f0"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.4"; sha256 = "1x1g3jhd57z1w3js7f6qa72vwvvjayvxzc2xxcqyscm9xy1fb3d4"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.4"; sha256 = "08mrvb71kldzla2j7v10ifxrc6bwsrd4bms2rqfb7rmx00qs6yj0"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.4"; sha256 = "0vgjwpy55mf6x22a634cdidckyq5hi941i9p10jqyrbnc637frv2"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.4"; sha256 = "1qasm6j25lmcc4xn7f7s3jli1pypz1kfnj7j9dkjlx9mc8r356zp"; })
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ lib
|
||||
, mkDerivation
|
||||
, stdenv
|
||||
, nix-update-script
|
||||
, fetchFromGitHub
|
||||
, substituteAll
|
||||
|
@ -11,61 +11,22 @@
|
|||
, qtmultimedia
|
||||
, qtx11extras
|
||||
, qttranslations
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
let
|
||||
singleapplication = fetchFromGitHub {
|
||||
owner = "itay-grudev";
|
||||
repo = "SingleApplication";
|
||||
rev = "v3.2.0";
|
||||
sha256 = "0w3z97dcqcz3bf7w6fja4smkafmx9kvhzb9px4k2nfmmyxh4yfma";
|
||||
};
|
||||
qtaskbarcontrol = fetchFromGitHub {
|
||||
owner = "Skycoder42";
|
||||
repo = "QTaskbarControl";
|
||||
rev = "2.0.2";
|
||||
sha256 = "0iymcvq3pv07fs9l4kh6hi1igqr7957iqndhsmg9fqkalf8nqyad";
|
||||
};
|
||||
qhotkey = fetchFromGitHub {
|
||||
owner = "Skycoder42";
|
||||
repo = "QHotkey";
|
||||
rev = "1.4.2";
|
||||
sha256 = "0391fkqrxqmzpvms4rk06aq05l308k6sadp6y3czq0gx2kng8mn9";
|
||||
};
|
||||
qonlinetranslator = fetchFromGitHub {
|
||||
owner = "crow-translate";
|
||||
repo = "QOnlineTranslator";
|
||||
rev = "1.5.3";
|
||||
sha256 = "sha256-L8y4vazbWD5SC7itxQOjEcX10w0laewxTOGz+Yd+kVM=";
|
||||
};
|
||||
circleflags = fetchFromGitHub {
|
||||
owner = "HatScripts";
|
||||
repo = "circle-flags";
|
||||
rev = "v2.3.0";
|
||||
sha256 = "sha256-KabmewF1Xf/1JQuzolrlRyLJR8O5j+/iT+29/QtOQVE=";
|
||||
};
|
||||
fluent = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = "Fluent-icon-theme";
|
||||
rev = "2021-08-15";
|
||||
sha256 = "sha256-uBu0vbKfhhnPKGwrnSBjPwS9ncH1iAlmeefAcpckOm4=";
|
||||
};
|
||||
in
|
||||
mkDerivation rec {
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crow-translate";
|
||||
version = "2.9.2";
|
||||
version = "2.9.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crow-translate";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-cxfBdoqGVmtCaXyw6QzXj2V44wKyVal/uqsddwIdvjw=";
|
||||
sha256 = "sha256-AzwJJ85vxXsc0+W3QM8citN5f0AD6APQVd9628cfLgI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./dont-fetch-external-libs.patch;
|
||||
inherit singleapplication qtaskbarcontrol qhotkey qonlinetranslator circleflags fluent;
|
||||
})
|
||||
(substituteAll {
|
||||
# See https://github.com/NixOS/nixpkgs/issues/86054
|
||||
src = ./fix-qttranslations-path.patch;
|
||||
|
@ -73,12 +34,7 @@ mkDerivation rec {
|
|||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
cp -r ${circleflags}/flags/* data/icons
|
||||
cp -r ${fluent}/src/* data/icons
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules qttools ];
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules qttools wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [ leptonica tesseract4 qtmultimedia qtx11extras ];
|
||||
|
||||
|
|
|
@ -1,65 +0,0 @@
|
|||
diff --git i/CMakeLists.txt w/CMakeLists.txt
|
||||
index 375b17c..106efa9 100644
|
||||
--- i/CMakeLists.txt
|
||||
+++ w/CMakeLists.txt
|
||||
@@ -114,13 +114,11 @@ qt5_add_translation(QM_FILES
|
||||
)
|
||||
|
||||
configure_file(src/cmake.h.in cmake.h)
|
||||
-configure_file(data/icons/flags.qrc ${CircleFlags_SOURCE_DIR}/flags/flags.qrc COPYONLY)
|
||||
-configure_file(data/icons/fluent-icon-theme.qrc ${FluentIconTheme_SOURCE_DIR}/src/fluent-icon-theme.qrc COPYONLY)
|
||||
|
||||
add_executable(${PROJECT_NAME}
|
||||
- ${CircleFlags_SOURCE_DIR}/flags/flags.qrc
|
||||
+ data/icons/flags.qrc
|
||||
${QM_FILES}
|
||||
- ${FluentIconTheme_SOURCE_DIR}/src/fluent-icon-theme.qrc
|
||||
+ data/icons/fluent-icon-theme.qrc
|
||||
data/icons/engines/engines.qrc
|
||||
src/addlanguagedialog.cpp
|
||||
src/addlanguagedialog.ui
|
||||
diff --git i/cmake/ExternalLibraries.cmake w/cmake/ExternalLibraries.cmake
|
||||
index c92e745..f265f03 100644
|
||||
--- i/cmake/ExternalLibraries.cmake
|
||||
+++ w/cmake/ExternalLibraries.cmake
|
||||
@@ -2,34 +2,28 @@ include(FetchContent)
|
||||
|
||||
set(QAPPLICATION_CLASS QApplication)
|
||||
FetchContent_Declare(SingleApplication
|
||||
- GIT_REPOSITORY https://github.com/itay-grudev/SingleApplication
|
||||
- GIT_TAG v3.2.0
|
||||
+ SOURCE_DIR @singleapplication@
|
||||
)
|
||||
|
||||
FetchContent_Declare(QTaskbarControl
|
||||
- GIT_REPOSITORY https://github.com/Skycoder42/QTaskbarControl
|
||||
- GIT_TAG 2.0.2
|
||||
+ SOURCE_DIR @qtaskbarcontrol@
|
||||
)
|
||||
|
||||
option(QHOTKEY_INSTALL OFF)
|
||||
FetchContent_Declare(QHotkey
|
||||
- GIT_REPOSITORY https://github.com/Skycoder42/QHotkey
|
||||
- GIT_TAG 1.4.2
|
||||
+ SOURCE_DIR @qhotkey@
|
||||
)
|
||||
|
||||
FetchContent_Declare(QOnlineTranslator
|
||||
- GIT_REPOSITORY https://github.com/crow-translate/QOnlineTranslator
|
||||
- GIT_TAG 1.5.3
|
||||
+ SOURCE_DIR @qonlinetranslator@
|
||||
)
|
||||
|
||||
FetchContent_Declare(CircleFlags
|
||||
- GIT_REPOSITORY https://github.com/HatScripts/circle-flags
|
||||
- GIT_TAG v2.3.0
|
||||
+ SOURCE_DIR @circleflags@
|
||||
)
|
||||
|
||||
FetchContent_Declare(FluentIconTheme
|
||||
- GIT_REPOSITORY https://github.com/vinceliuice/Fluent-icon-theme
|
||||
- GIT_TAG 2021-08-15
|
||||
+ SOURCE_DIR @fluent@
|
||||
)
|
||||
|
||||
FetchContent_MakeAvailable(SingleApplication QTaskbarControl QHotkey QOnlineTranslator CircleFlags FluentIconTheme)
|
|
@ -22,13 +22,13 @@ let
|
|||
menuInputs = if withX11 then [ dmenu xdotool ] else [ bemenu ];
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "mepo";
|
||||
version = "0.4.1";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~mil";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-soIAQgo8Cyii/zzJapgJmC5hN/ySnHKoSbOg/XgTnGg=";
|
||||
hash = "sha256-k6YXaqB3EwbDPlTvijZf10q+IYwt4/MiqGXL495KIcY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config zig makeWrapper ];
|
||||
|
|
|
@ -1,115 +0,0 @@
|
|||
{ fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, qemu, unzip, zip,
|
||||
coreutils, gnugrep, which, gnused, e2fsprogs, autoPatchelfHook, gptfdisk,
|
||||
python3Packages, qt5, runtimeShell, lib, util-linux, wrapQtAppsHook }:
|
||||
|
||||
# Note: Multibootusb is tricky to maintain. It relies on the
|
||||
# $PYTHONPATH variable containing some of their code, so that
|
||||
# something like:
|
||||
#
|
||||
# from scripts import config
|
||||
#
|
||||
# works. It also relies on the current directory to find some runtime
|
||||
# resources thanks to a use of __file__.
|
||||
#
|
||||
# https://github.com/mbusb/multibootusb/blob/0d34d70c3868f1d7695cfd141141b17c075de967/scripts/osdriver.py#L59
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "multibootusb";
|
||||
name = "${pname}-${version}";
|
||||
version = "9.2.0";
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapQtAppsHook
|
||||
autoPatchelfHook
|
||||
unzip
|
||||
zip
|
||||
];
|
||||
|
||||
runTimeDeps = [
|
||||
coreutils
|
||||
gnugrep
|
||||
which
|
||||
parted
|
||||
util-linux
|
||||
qemu
|
||||
p7zip
|
||||
gnused
|
||||
mtools
|
||||
procps
|
||||
e2fsprogs
|
||||
gptfdisk
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libxcb
|
||||
python3Packages.python
|
||||
qt5.full
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mbusb";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
|
||||
sha256 = "0wlan0cp6c2i0nahixgpmkm0h4n518gj8rc515d579pqqp91p2h3";
|
||||
};
|
||||
|
||||
# Tests can't run inside the NixOS sandbox
|
||||
# "Failed to connect to socket /run/dbus/system_bus_socket: No such file or directory"
|
||||
doCheck = false;
|
||||
|
||||
pythonPath = with python3Packages; [
|
||||
dbus-python
|
||||
pyqt5
|
||||
pytest-shutil
|
||||
pyudev
|
||||
six
|
||||
];
|
||||
|
||||
# multibootusb ships zips with various versions of syslinux, we need to patchelf them
|
||||
postPatch = ''
|
||||
for zip in $(find . -name "*.zip"); do
|
||||
zip=$(readlink -f $zip)
|
||||
target="$(mktemp -d)"
|
||||
pushd $target
|
||||
unzip $zip
|
||||
rm $zip
|
||||
autoPatchelf .
|
||||
zip -r $zip *
|
||||
popd
|
||||
done
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# This script doesn't work and it doesn't add much anyway
|
||||
rm $out/bin/multibootusb-pkexec
|
||||
|
||||
# The installed data isn't sufficient for whatever reason, missing gdisk/gdisk.exe
|
||||
mkdir -p "$out/share/${pname}"
|
||||
cp -r data "$out/share/${pname}/data"
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=(
|
||||
# Firstly, add all necessary QT variables
|
||||
"''${qtWrapperArgs[@]}"
|
||||
|
||||
# Then, add the installed scripts/ directory to the python path
|
||||
--prefix "PYTHONPATH" ":" "$out/lib/${python3Packages.python.libPrefix}/site-packages"
|
||||
|
||||
# Add some runtime dependencies
|
||||
--prefix "PATH" ":" "${lib.makeBinPath runTimeDeps}"
|
||||
|
||||
# Finally, move to directory that contains data
|
||||
--chdir "$out/share/${pname}"
|
||||
)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Multiboot USB creator for Linux live disks";
|
||||
homepage = "http://multibootusb.org/";
|
||||
license = licenses.gpl2;
|
||||
maintainers = []; # Looking for a maintainer!
|
||||
broken = true; # "name 'config' is not defined", added 2021-02-06
|
||||
};
|
||||
}
|
|
@ -1,40 +0,0 @@
|
|||
{ lib, stdenv, fetchFromGitLab, python2Packages }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "phwmon";
|
||||
version = "2017-04-10";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "o9000";
|
||||
repo = "phwmon";
|
||||
rev = "b162e53dccc4adf8f11f49408d05fd85d9c6c909";
|
||||
sha256 = "1hqmsq66y8bqkpvszw84jyk8haxq3cjnz105hlkmp7786vfmkisq";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ python2Packages.wrapPython ];
|
||||
|
||||
buildInputs = [ python2Packages.pygtk python2Packages.psutil ];
|
||||
|
||||
pythonPath = [ python2Packages.pygtk python2Packages.psutil ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace install.sh --replace "/usr/local" "$out"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/share/applications
|
||||
./install.sh
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapPythonPrograms
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://gitlab.com/o9000/phwmon";
|
||||
description = "Hardware monitor (CPU, memory, network and disk I/O) for the system tray";
|
||||
license = lib.licenses.gpl2;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ lib.maintainers.romildo ];
|
||||
};
|
||||
}
|
|
@ -1,25 +1,23 @@
|
|||
{ mkDerivation, lib, fetchFromGitHub, autoreconfHook, perl, pkg-config
|
||||
, libtool, openssl, qtbase, qttools }:
|
||||
{ mkDerivation, lib, fetchFromGitHub, autoreconfHook, pkg-config
|
||||
, libtool, openssl, qtbase, qttools, sphinx }:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "xca";
|
||||
version = "2.2.1";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chris2511";
|
||||
repo = "xca";
|
||||
rev = "RELEASE.${version}";
|
||||
sha256 = "0na2816lkfkkvssh9kmf5vwy6x8kd4x7h138jzy61wrvs69vhnbi";
|
||||
sha256 = "04z0mmjsry72nvib4icmwh1717y4q9pf2gr68ljrzln4vv4ckpwk";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace doc/code2html \
|
||||
--replace /usr/bin/perl ${perl}/bin/perl
|
||||
'';
|
||||
|
||||
buildInputs = [ libtool openssl qtbase ];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config qttools ];
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config qttools sphinx ];
|
||||
|
||||
# Needed for qcollectiongenerator (see https://github.com/NixOS/nixpkgs/pull/92710)
|
||||
QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"stable": {
|
||||
"version": "101.0.4951.54",
|
||||
"sha256": "1d808a7mvg0nd0mm20c1ny5kdvb2xvrs8vz4nnk456ix8pywcv62",
|
||||
"sha256bin64": "1m6s6xf2wvz535w6jskk3pnibvsjpzmbxvd9rlxmqr08y219gp5y",
|
||||
"version": "101.0.4951.64",
|
||||
"sha256": "1xyqm32y9v1hn8ji6qfw6maynqgg3266j58dq4x4aqsm2gj9cn4w",
|
||||
"sha256bin64": "14ijrj7h2y72ppyysz6jv40c01lbnan7z69cl24asch2zjlgwv8v",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-03-14",
|
||||
|
|
|
@ -96,6 +96,7 @@
|
|||
# WARNING: NEVER set any of the options below to `true` by default.
|
||||
# Set to `!privacySupport` or `false`.
|
||||
|
||||
, crashreporterSupport ? !privacySupport
|
||||
, geolocationSupport ? !privacySupport
|
||||
, googleAPISupport ? geolocationSupport
|
||||
, webrtcSupport ? !privacySupport
|
||||
|
@ -109,10 +110,6 @@
|
|||
# `browser.eme.ui.enabled` and `media.gmp-widevinecdm.enabled` accordingly
|
||||
, drmSupport ? true
|
||||
|
||||
## other
|
||||
|
||||
, crashreporterSupport ? false
|
||||
|
||||
# As stated by Sylvestre Ledru (@sylvestre) on Nov 22, 2017 at
|
||||
# https://github.com/NixOS/nixpkgs/issues/31843#issuecomment-346372756 we
|
||||
# have permission to use the official firefox branding.
|
||||
|
|
|
@ -1,11 +1,7 @@
|
|||
{ stdenv, lib, callPackage, fetchurl, fetchpatch, nixosTests }:
|
||||
|
||||
let
|
||||
common = opts: callPackage (import ./common.nix opts) {};
|
||||
in
|
||||
{ stdenv, lib, callPackage, fetchurl, fetchpatch, nixosTests, buildMozillaMach }:
|
||||
|
||||
rec {
|
||||
firefox = common rec {
|
||||
firefox = buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "100.0";
|
||||
src = fetchurl {
|
||||
|
@ -30,7 +26,7 @@ rec {
|
|||
};
|
||||
};
|
||||
|
||||
firefox-esr-91 = common rec {
|
||||
firefox-esr-91 = buildMozillaMach rec {
|
||||
pname = "firefox-esr";
|
||||
version = "91.9.0esr";
|
||||
src = fetchurl {
|
||||
|
@ -54,30 +50,4 @@ rec {
|
|||
versionSuffix = "esr";
|
||||
};
|
||||
};
|
||||
|
||||
librewolf =
|
||||
let
|
||||
librewolf-src = callPackage ./librewolf { };
|
||||
in
|
||||
(common rec {
|
||||
pname = "librewolf";
|
||||
binaryName = "librewolf";
|
||||
version = librewolf-src.packageVersion;
|
||||
src = librewolf-src.firefox;
|
||||
inherit (librewolf-src) extraConfigureFlags extraPostPatch extraPassthru;
|
||||
|
||||
meta = {
|
||||
description = "A fork of Firefox, focused on privacy, security and freedom";
|
||||
homepage = "https://librewolf.net/";
|
||||
maintainers = with lib.maintainers; [ squalus ];
|
||||
inherit (firefox.meta) platforms badPlatforms broken maxSilent license;
|
||||
};
|
||||
updateScript = callPackage ./librewolf/update.nix {
|
||||
attrPath = "librewolf-unwrapped";
|
||||
};
|
||||
}).override {
|
||||
crashreporterSupport = false;
|
||||
enableOfficialBranding = false;
|
||||
pgoSupport = false; # Profiling gets stuck and doesn't terminate.
|
||||
};
|
||||
}
|
||||
|
|
31
pkgs/applications/networking/browsers/librewolf/default.nix
Normal file
31
pkgs/applications/networking/browsers/librewolf/default.nix
Normal file
|
@ -0,0 +1,31 @@
|
|||
{ stdenv, lib, callPackage, buildMozillaMach }:
|
||||
|
||||
let
|
||||
librewolf-src = callPackage ./librewolf.nix { };
|
||||
in
|
||||
(buildMozillaMach rec {
|
||||
pname = "librewolf";
|
||||
binaryName = "librewolf";
|
||||
version = librewolf-src.packageVersion;
|
||||
src = librewolf-src.firefox;
|
||||
inherit (librewolf-src) extraConfigureFlags extraPostPatch extraPassthru;
|
||||
|
||||
meta = {
|
||||
description = "A fork of Firefox, focused on privacy, security and freedom";
|
||||
homepage = "https://librewolf.net/";
|
||||
maintainers = with lib.maintainers; [ squalus ];
|
||||
platforms = lib.platforms.unix;
|
||||
badPlatforms = lib.platforms.darwin;
|
||||
broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory".
|
||||
# not in `badPlatforms` because cross-compilation on 64-bit machine might work.
|
||||
maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115)
|
||||
license = lib.licenses.mpl20;
|
||||
};
|
||||
updateScript = callPackage ./update.nix {
|
||||
attrPath = "librewolf-unwrapped";
|
||||
};
|
||||
}).override {
|
||||
crashreporterSupport = false;
|
||||
enableOfficialBranding = false;
|
||||
pgoSupport = false; # Profiling gets stuck and doesn't terminate.
|
||||
}
|
|
@ -1,4 +1,4 @@
|
|||
{ callPackage, git }:
|
||||
{ callPackage }:
|
||||
let
|
||||
src = callPackage ./src.nix { };
|
||||
in
|
|
@ -20,7 +20,7 @@ writeScript "update-librewolf" ''
|
|||
latestTag=$(curl https://gitlab.com/api/v4/projects/librewolf-community%2Fbrowser%2Fsource/repository/tags?per_page=1 | jq -r .[0].name)
|
||||
echo "latestTag=$latestTag"
|
||||
|
||||
srcJson=pkgs/applications/networking/browsers/firefox/librewolf/src.json
|
||||
srcJson=pkgs/applications/networking/browsers/librewolf/src.json
|
||||
localRev=$(jq -r .source.rev < $srcJson)
|
||||
echo "localRev=$localRev"
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
, dbus
|
||||
, dbus-glib
|
||||
, desktop-file-utils
|
||||
, fetchzip
|
||||
, fetchFromGitea
|
||||
, ffmpeg
|
||||
, fontconfig
|
||||
, freetype
|
||||
|
@ -39,19 +39,21 @@
|
|||
# https://developer.palemoon.org/build/linux/
|
||||
assert stdenv.cc.isGNU;
|
||||
assert with lib.strings; (
|
||||
versionAtLeast stdenv.cc.version "4.9"
|
||||
&& !hasPrefix "6" stdenv.cc.version
|
||||
&& versionOlder stdenv.cc.version "11"
|
||||
versionAtLeast stdenv.cc.version "7.1"
|
||||
&& versionOlder stdenv.cc.version "12"
|
||||
);
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "palemoon";
|
||||
version = "29.4.6";
|
||||
version = "31.0.0";
|
||||
|
||||
src = fetchzip {
|
||||
name = "${pname}-${version}";
|
||||
url = "http://archive.palemoon.org/source/${pname}-${version}.source.tar.xz";
|
||||
sha256 = "sha256-6bI3AnIhp0x3BCgTvmbOXDBGrJXg3cN+AmwI8XCKD8g=";
|
||||
src = fetchFromGitea {
|
||||
domain = "repo.palemoon.org";
|
||||
owner = "MoonchildProductions";
|
||||
repo = "Pale-Moon";
|
||||
rev = "${version}_Release";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-fIQAQCtjA/9Otft3e9Z4xWgE09sqsdArYQtZqmEgfTc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -139,14 +141,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
./mach install
|
||||
|
||||
# Fix missing icon due to wrong WMClass
|
||||
# https://forum.palemoon.org/viewtopic.php?f=3&t=26746&p=214221#p214221
|
||||
substituteInPlace ./palemoon/branding/official/palemoon.desktop \
|
||||
--replace 'StartupWMClass="pale moon"' 'StartupWMClass=Pale moon'
|
||||
# Install official branding stuff
|
||||
desktop-file-install --dir=$out/share/applications \
|
||||
./palemoon/branding/official/palemoon.desktop
|
||||
|
||||
# Install official branding icons
|
||||
for iconname in default{16,22,24,32,48,256} mozicon128; do
|
||||
n=''${iconname//[^0-9]/}
|
||||
size=$n"x"$n
|
||||
|
@ -155,7 +152,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# Remove unneeded SDK data from installation
|
||||
# https://forum.palemoon.org/viewtopic.php?f=37&t=26796&p=214676#p214729
|
||||
rm -rf $out/{include,share/idl,lib/palemoon-devel-${version}}
|
||||
rm -r $out/{include,share/idl,lib/palemoon-devel-${version}}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
|
|
@ -20,8 +20,6 @@ ac_add_options --enable-strip
|
|||
ac_add_options --enable-devtools
|
||||
ac_add_options --enable-av1
|
||||
|
||||
ac_add_options --disable-eme
|
||||
ac_add_options --disable-webrtc
|
||||
ac_add_options --disable-gamepad
|
||||
ac_add_options --disable-tests
|
||||
ac_add_options --disable-debug
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cloudflared";
|
||||
version = "2022.5.0";
|
||||
version = "2022.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = "cloudflared";
|
||||
rev = version;
|
||||
hash = "sha256-vz0fxSzx0vOpZy6/MVfZ467c9qdHUWZIL5wklTnnBBA=";
|
||||
hash = "sha256-yv4ulVkc7WX6T287kXecyE6lFlxh4YKAi2UCGkOf/lk=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "terragrunt";
|
||||
version = "0.36.11";
|
||||
version = "0.37.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kXa3iG94WTH6KpQksl2r0yXyr4KuLY2AZdZtZ6zWYUA=";
|
||||
sha256 = "sha256-7nil/T6q1crZh9ARTP615UzfjKcgsclpIt2N1ifABBk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-7SUf4r+6r6dkBoBZFg2AUK114QEl0+1lwRA4ymYArFs=";
|
||||
|
|
|
@ -12,15 +12,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "werf";
|
||||
version = "1.2.91";
|
||||
version = "1.2.99";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "werf";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ZafIG4D5TvAbXbo07gFajt8orTsju1GfF9a1OR0t1Oo=";
|
||||
sha256 = "sha256-D9NwVZGB0UV0tRe927GpxHzdvAeqcRJOYfocbbj6BRM=";
|
||||
};
|
||||
vendorSha256 = "sha256-U4eVQR/ExAENOg2XEYM+mFXANk+basdMLEcqSHuTsh4=";
|
||||
vendorSha256 = "sha256-ZMSTl9WFTF5x+tiQZ37ihVrOuLS0W5PjyXbbzyHJNsI=";
|
||||
proxyVendor = true;
|
||||
|
||||
nativeBuildInputs = [ installShellFiles pkg-config ];
|
||||
|
|
|
@ -4,11 +4,11 @@ let
|
|||
configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf);
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "cinny";
|
||||
version = "1.8.2";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz";
|
||||
sha256 = "sha256-0harFaO1MWzTmN/Q3e38MC2O7P9yVeQ5ZSy0yiGbtCs=";
|
||||
sha256 = "sha256-tM3YA0GW8Z24gt8t9dOyr10GCINodAB0b4/gD7jfgOM=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
@ -28,13 +28,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "profanity";
|
||||
version = "0.12.0";
|
||||
version = "0.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "profanity-im";
|
||||
repo = "profanity";
|
||||
rev = version;
|
||||
hash = "sha256-kmixWp9Q2tMVp+tk5kbTdBfgRNghKk3+48L582hqlm8=";
|
||||
hash = "sha256-yUiiww8yhymdqR6CITRnItxZhfpZiEbu1WyD8bDW+vc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
136
pkgs/applications/networking/n8n/node-packages.nix
generated
136
pkgs/applications/networking/n8n/node-packages.nix
generated
|
@ -463,6 +463,15 @@ let
|
|||
sha512 = "L7wFlX3t9GsGgNS0oxLt6zbAZZGgsdptMmciL4cdxHmbL3Hz4Lysh8YqAR34eHsJ1uacJITcZBBDl5XpQlxPpQ==";
|
||||
};
|
||||
};
|
||||
"@types/generic-pool-3.1.10" = {
|
||||
name = "_at_types_slash_generic-pool";
|
||||
packageName = "@types/generic-pool";
|
||||
version = "3.1.10";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@types/generic-pool/-/generic-pool-3.1.10.tgz";
|
||||
sha512 = "WRT/9taXh9XJRA9yvrbC02IqGZhK9GbFE/vuP2LeSLrqmDzz5wdXsH0Ige/F+3+rbbZfwH3LEazDsU0JiSV3vA==";
|
||||
};
|
||||
};
|
||||
"@types/json-diff-0.5.2" = {
|
||||
name = "_at_types_slash_json-diff";
|
||||
packageName = "@types/json-diff";
|
||||
|
@ -589,13 +598,13 @@ let
|
|||
sha512 = "nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==";
|
||||
};
|
||||
};
|
||||
"@types/snowflake-sdk-1.6.3" = {
|
||||
"@types/snowflake-sdk-1.6.4" = {
|
||||
name = "_at_types_slash_snowflake-sdk";
|
||||
packageName = "@types/snowflake-sdk";
|
||||
version = "1.6.3";
|
||||
version = "1.6.4";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@types/snowflake-sdk/-/snowflake-sdk-1.6.3.tgz";
|
||||
sha512 = "YGlCPN88p6WYQCjBDIXwe2aWPkWNzKPW5/XJOGGnaXIacqULfKO6puq2a4OU02WCzfWr+XvOEj1MKWnxBhm+jw==";
|
||||
url = "https://registry.npmjs.org/@types/snowflake-sdk/-/snowflake-sdk-1.6.4.tgz";
|
||||
sha512 = "v3QjPbvd2dhyI5fPU5whxgUjhf9O19acIGiL65aUPCnkLIla5Z0ZqOiP3Jw5eyghunZHWohKfvtV+UdesCi29g==";
|
||||
};
|
||||
};
|
||||
"@types/tough-cookie-2.3.8" = {
|
||||
|
@ -976,13 +985,13 @@ let
|
|||
sha512 = "z4oo33lmnvvNRqfUe3YjDGGpqu/L2+wXBIhMtwq6oqZ+exOUAkQYM6zd2VWKF7AIlajOF8ZZuPFfryTG9iLC/w==";
|
||||
};
|
||||
};
|
||||
"aws-sdk-2.1129.0" = {
|
||||
"aws-sdk-2.1131.0" = {
|
||||
name = "aws-sdk";
|
||||
packageName = "aws-sdk";
|
||||
version = "2.1129.0";
|
||||
version = "2.1131.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1129.0.tgz";
|
||||
sha512 = "gQZaByfW7zKCg1n/kA+xDdLhI/SauaokRTq+lztK1cCCdFkR5CShcKeK/qUgVxjy43mwB7CkeTh1WUr2NMb0jg==";
|
||||
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1131.0.tgz";
|
||||
sha512 = "Ic3f2fSgVhYDQ0OBGxE6ODtSwaKyxBPGrI2RGrYt2Oj0Z8f227P7dB90o9X7y2MtnuJ4WoAzkf3Vc1c1UnnZlA==";
|
||||
};
|
||||
};
|
||||
"aws-sign2-0.7.0" = {
|
||||
|
@ -1804,13 +1813,13 @@ let
|
|||
sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==";
|
||||
};
|
||||
};
|
||||
"convict-6.2.2" = {
|
||||
"convict-6.2.3" = {
|
||||
name = "convict";
|
||||
packageName = "convict";
|
||||
version = "6.2.2";
|
||||
version = "6.2.3";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/convict/-/convict-6.2.2.tgz";
|
||||
sha512 = "3MsROJiEFN3BAzeFit1t87t7EUFzd44MNd13MLSikV2dsnDl7znwKgtYPPONtnDzxiDW0nBAsxVhSRNrjUrTTg==";
|
||||
url = "https://registry.npmjs.org/convict/-/convict-6.2.3.tgz";
|
||||
sha512 = "mTY04Qr7WrqiXifdeUYXr4/+Te4hPFWDvz6J2FVIKCLc2XBhq63VOSSYAKJ+unhZAYOAjmEdNswTOeHt7s++pQ==";
|
||||
};
|
||||
};
|
||||
"cookie-0.4.1" = {
|
||||
|
@ -1858,13 +1867,13 @@ let
|
|||
sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==";
|
||||
};
|
||||
};
|
||||
"core-js-3.22.4" = {
|
||||
"core-js-3.22.5" = {
|
||||
name = "core-js";
|
||||
packageName = "core-js";
|
||||
version = "3.22.4";
|
||||
version = "3.22.5";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/core-js/-/core-js-3.22.4.tgz";
|
||||
sha512 = "1uLykR+iOfYja+6Jn/57743gc9n73EWiOnSJJ4ba3B4fOEYDBv25MagmEZBxTp5cWq4b/KPx/l77zgsp28ju4w==";
|
||||
url = "https://registry.npmjs.org/core-js/-/core-js-3.22.5.tgz";
|
||||
sha512 = "VP/xYuvJ0MJWRAobcmQ8F2H6Bsn+s7zqAAjFaHGBMc5AQm7zaelhD1LGduFn2EehEcQcU+br6t+fwbpQ5d1ZWA==";
|
||||
};
|
||||
};
|
||||
"core-util-is-1.0.2" = {
|
||||
|
@ -2344,13 +2353,13 @@ let
|
|||
sha512 = "2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==";
|
||||
};
|
||||
};
|
||||
"es-abstract-1.19.5" = {
|
||||
"es-abstract-1.20.0" = {
|
||||
name = "es-abstract";
|
||||
packageName = "es-abstract";
|
||||
version = "1.19.5";
|
||||
version = "1.20.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.5.tgz";
|
||||
sha512 = "Aa2G2+Rd3b6kxEUKTF4TaW67czBLyAv3z7VOhYRU50YBx+bbsYZ9xQP4lMNazePuFlybXI0V4MruPos7qUo5fA==";
|
||||
url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz";
|
||||
sha512 = "URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==";
|
||||
};
|
||||
};
|
||||
"es-to-primitive-1.2.1" = {
|
||||
|
@ -2776,6 +2785,24 @@ let
|
|||
sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==";
|
||||
};
|
||||
};
|
||||
"function.prototype.name-1.1.5" = {
|
||||
name = "function.prototype.name";
|
||||
packageName = "function.prototype.name";
|
||||
version = "1.1.5";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz";
|
||||
sha512 = "uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==";
|
||||
};
|
||||
};
|
||||
"functions-have-names-1.2.3" = {
|
||||
name = "functions-have-names";
|
||||
packageName = "functions-have-names";
|
||||
version = "1.2.3";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz";
|
||||
sha512 = "xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==";
|
||||
};
|
||||
};
|
||||
"gauge-3.0.2" = {
|
||||
name = "gauge";
|
||||
packageName = "gauge";
|
||||
|
@ -3847,13 +3874,13 @@ let
|
|||
sha512 = "xOqorG21Va+3CjpFOfFTU7SWohHH2uIX9ZY4Byz6J+lvpfvc486tOAT/G9GfbrKtJ9O7NCX9o0aC2lxqbnZ9EA==";
|
||||
};
|
||||
};
|
||||
"libphonenumber-js-1.9.52" = {
|
||||
"libphonenumber-js-1.9.53" = {
|
||||
name = "libphonenumber-js";
|
||||
packageName = "libphonenumber-js";
|
||||
version = "1.9.52";
|
||||
version = "1.9.53";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.52.tgz";
|
||||
sha512 = "8k83chc+zMj+J/RkaBxi0PpSTAdzHmpqzCMqquSJVRfbZFr8DCp6vPC7ms2PIPGxeqajZLI6CBLW5nLCJCJrYg==";
|
||||
url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.53.tgz";
|
||||
sha512 = "3cuMrA2CY3TbKVC0wKye5dXYgxmVVi4g13gzotprQSguFHMqf0pIrMM2Z6ZtMsSWqvtIqi5TuQhGjMhxz0O9Mw==";
|
||||
};
|
||||
};
|
||||
"libqp-1.1.0" = {
|
||||
|
@ -4144,13 +4171,13 @@ let
|
|||
sha512 = "IXAq50s4qwrOBrXJklY+KhgZF+5y98PDaNo0gi/v2KQBFLyWr+JyFvijZXkGKjQj/h9c0OwoE+JZbwUXce76hQ==";
|
||||
};
|
||||
};
|
||||
"luxon-2.3.2" = {
|
||||
"luxon-2.4.0" = {
|
||||
name = "luxon";
|
||||
packageName = "luxon";
|
||||
version = "2.3.2";
|
||||
version = "2.4.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/luxon/-/luxon-2.3.2.tgz";
|
||||
sha512 = "MlAQQVMFhGk4WUA6gpfsy0QycnKP0+NlCBJRVRNPxxSIbjrCbQ65nrpJD3FVyJNZLuJ0uoqL57ye6BmDYgHaSw==";
|
||||
url = "https://registry.npmjs.org/luxon/-/luxon-2.4.0.tgz";
|
||||
sha512 = "w+NAwWOUL5hO0SgwOHsMBAmZ15SoknmQXhSO0hIbJCAmPKSsGeK8MlmhYh2w6Iib38IxN2M+/ooXWLbeis7GuA==";
|
||||
};
|
||||
};
|
||||
"mailparser-3.5.0" = {
|
||||
|
@ -4531,13 +4558,13 @@ let
|
|||
sha512 = "Me8fk76HeWUmTPnksH4kzG0bKOp1yLFjAC4F+EcEllIIf+x75kjN+gSH4uwgvspzGCVO88ZnppWoGQwvHQpXQw==";
|
||||
};
|
||||
};
|
||||
"n8n-nodes-base-0.173.0" = {
|
||||
"n8n-nodes-base-0.174.0" = {
|
||||
name = "n8n-nodes-base";
|
||||
packageName = "n8n-nodes-base";
|
||||
version = "0.173.0";
|
||||
version = "0.174.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.173.0.tgz";
|
||||
sha512 = "9ya0cgRMk6iz01m2shZHahe4KurL89/T+iGLywrUZdPdIRni7LR4ywSG51B4jko73+zsKPNYjya650BGNz7TaQ==";
|
||||
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.174.0.tgz";
|
||||
sha512 = "2yYWeSkfI08BtgGZvOksmQOpjNPYmhvkqO2SBTuTAqkryZ1AHiw6RtILsf2575prQDdep2clxIZxW7owxxFmLA==";
|
||||
};
|
||||
};
|
||||
"n8n-workflow-0.98.0" = {
|
||||
|
@ -5791,6 +5818,15 @@ let
|
|||
sha512 = "p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==";
|
||||
};
|
||||
};
|
||||
"regexp.prototype.flags-1.4.3" = {
|
||||
name = "regexp.prototype.flags";
|
||||
packageName = "regexp.prototype.flags";
|
||||
version = "1.4.3";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz";
|
||||
sha512 = "fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==";
|
||||
};
|
||||
};
|
||||
"reinterval-1.1.0" = {
|
||||
name = "reinterval";
|
||||
packageName = "reinterval";
|
||||
|
@ -6367,13 +6403,13 @@ let
|
|||
sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==";
|
||||
};
|
||||
};
|
||||
"sqlite3-5.0.7" = {
|
||||
"sqlite3-5.0.8" = {
|
||||
name = "sqlite3";
|
||||
packageName = "sqlite3";
|
||||
version = "5.0.7";
|
||||
version = "5.0.8";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.7.tgz";
|
||||
sha512 = "9PUfvpol1/5SI3WZawFINwpRz6qhUeJJtFNG6rr0CvDWMXN75PJPv+3b0aVEOOx5rAZIPcXW2zVasH8foqw7Gg==";
|
||||
url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.8.tgz";
|
||||
sha512 = "f2ACsbSyb2D1qFFcqIXPfFscLtPVOWJr5GmUzYxf4W+0qelu5MWrR+FAQE1d5IUArEltBrzSDxDORG8P/IkqyQ==";
|
||||
};
|
||||
};
|
||||
"sqlstring-2.3.3" = {
|
||||
|
@ -7534,10 +7570,10 @@ in
|
|||
n8n = nodeEnv.buildNodePackage {
|
||||
name = "n8n";
|
||||
packageName = "n8n";
|
||||
version = "0.175.1";
|
||||
version = "0.176.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n/-/n8n-0.175.1.tgz";
|
||||
sha512 = "rInwNB6wxOs79EvC2HFALyDhdDPJwLVT+z1LivxLRD9dZOrtlMD9wdDfESpHYS5ikND4T5JW32HaxGF9nnzlJA==";
|
||||
url = "https://registry.npmjs.org/n8n/-/n8n-0.176.0.tgz";
|
||||
sha512 = "eJTzCFcujAfJegWKQhGi+upAsfTEpW1/2HC5vwV2btdgm8XCMyhVBMJJR7ZJMozFNDz8ErLhwtlIfQCQSXRP0A==";
|
||||
};
|
||||
dependencies = [
|
||||
(sources."@azure/abort-controller-1.1.0" // {
|
||||
|
@ -7652,6 +7688,7 @@ in
|
|||
sources."@types/express-serve-static-core-4.17.28"
|
||||
sources."@types/express-unless-0.5.3"
|
||||
sources."@types/ftp-0.3.33"
|
||||
sources."@types/generic-pool-3.1.10"
|
||||
sources."@types/json-diff-0.5.2"
|
||||
sources."@types/jsonwebtoken-8.5.8"
|
||||
sources."@types/lodash-4.14.182"
|
||||
|
@ -7669,7 +7706,7 @@ in
|
|||
sources."@types/range-parser-1.2.4"
|
||||
sources."@types/readable-stream-2.3.13"
|
||||
sources."@types/serve-static-1.13.10"
|
||||
sources."@types/snowflake-sdk-1.6.3"
|
||||
sources."@types/snowflake-sdk-1.6.4"
|
||||
sources."@types/tough-cookie-2.3.8"
|
||||
sources."@types/tunnel-0.0.3"
|
||||
sources."@xmldom/xmldom-0.7.5"
|
||||
|
@ -7725,7 +7762,7 @@ in
|
|||
];
|
||||
})
|
||||
sources."avsc-5.7.4"
|
||||
(sources."aws-sdk-2.1129.0" // {
|
||||
(sources."aws-sdk-2.1131.0" // {
|
||||
dependencies = [
|
||||
sources."buffer-4.9.2"
|
||||
sources."events-1.1.1"
|
||||
|
@ -7898,11 +7935,11 @@ in
|
|||
})
|
||||
sources."content-disposition-0.5.4"
|
||||
sources."content-type-1.0.4"
|
||||
sources."convict-6.2.2"
|
||||
sources."convict-6.2.3"
|
||||
sources."cookie-0.4.1"
|
||||
sources."cookie-parser-1.4.6"
|
||||
sources."cookie-signature-1.0.6"
|
||||
sources."core-js-3.22.4"
|
||||
sources."core-js-3.22.5"
|
||||
sources."core-util-is-1.0.2"
|
||||
sources."crc-32-1.2.2"
|
||||
sources."cron-1.7.2"
|
||||
|
@ -7966,7 +8003,7 @@ in
|
|||
sources."entities-2.2.0"
|
||||
sources."env-variable-0.0.6"
|
||||
sources."err-code-2.0.3"
|
||||
sources."es-abstract-1.19.5"
|
||||
sources."es-abstract-1.20.0"
|
||||
sources."es-to-primitive-1.2.1"
|
||||
sources."es5-ext-0.8.2"
|
||||
sources."escalade-3.1.1"
|
||||
|
@ -8024,6 +8061,8 @@ in
|
|||
sources."fs-minipass-2.1.0"
|
||||
sources."fs.realpath-1.0.0"
|
||||
sources."function-bind-1.1.1"
|
||||
sources."function.prototype.name-1.1.5"
|
||||
sources."functions-have-names-1.2.3"
|
||||
sources."gauge-3.0.2"
|
||||
sources."generate-function-2.3.1"
|
||||
sources."generic-pool-3.8.2"
|
||||
|
@ -8168,7 +8207,7 @@ in
|
|||
sources."iconv-lite-0.6.3"
|
||||
];
|
||||
})
|
||||
sources."libphonenumber-js-1.9.52"
|
||||
sources."libphonenumber-js-1.9.53"
|
||||
sources."libqp-1.1.0"
|
||||
sources."limiter-1.1.5"
|
||||
sources."linkify-it-4.0.0"
|
||||
|
@ -8212,7 +8251,7 @@ in
|
|||
sources."yallist-2.1.2"
|
||||
];
|
||||
})
|
||||
sources."luxon-2.3.2"
|
||||
sources."luxon-2.4.0"
|
||||
(sources."mailparser-3.5.0" // {
|
||||
dependencies = [
|
||||
sources."iconv-lite-0.6.3"
|
||||
|
@ -8283,7 +8322,7 @@ in
|
|||
sources."n8n-core-0.116.0"
|
||||
sources."n8n-design-system-0.19.0"
|
||||
sources."n8n-editor-ui-0.142.1"
|
||||
(sources."n8n-nodes-base-0.173.0" // {
|
||||
(sources."n8n-nodes-base-0.174.0" // {
|
||||
dependencies = [
|
||||
sources."iconv-lite-0.6.3"
|
||||
];
|
||||
|
@ -8469,6 +8508,7 @@ in
|
|||
sources."redis-parser-3.0.0"
|
||||
sources."reflect-metadata-0.1.13"
|
||||
sources."regenerator-runtime-0.13.9"
|
||||
sources."regexp.prototype.flags-1.4.3"
|
||||
sources."reinterval-1.1.0"
|
||||
sources."remove-trailing-separator-1.1.0"
|
||||
sources."remove-trailing-slash-0.1.1"
|
||||
|
@ -8577,7 +8617,7 @@ in
|
|||
];
|
||||
})
|
||||
sources."sprintf-js-1.1.2"
|
||||
sources."sqlite3-5.0.7"
|
||||
sources."sqlite3-5.0.8"
|
||||
sources."sqlstring-2.3.3"
|
||||
sources."sse-channel-3.1.1"
|
||||
sources."ssf-0.11.2"
|
||||
|
|
|
@ -86,8 +86,6 @@ in stdenv.mkDerivation {
|
|||
++ lib.optionals stdenv.isLinux [ inotify-tools ]
|
||||
;
|
||||
|
||||
NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework CoreFoundation";
|
||||
|
||||
postInstall = ''
|
||||
mkdir $apparmor
|
||||
cat >$apparmor/bin.transmission-daemon <<EOF
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, fetchFromGitHub, stdenvNoCC, w3m, curl, jq, makeWrapper, installShellFiles }:
|
||||
{ lib, fetchFromGitHub, stdenvNoCC, w3m, curl, jq, makeWrapper, installShellFiles, xclip }:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "tmpmail";
|
||||
version = "1.1.9";
|
||||
version = "1.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sdushantha";
|
||||
repo = "tmpmail";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sWcsmBUHSfo7sICXyhNhbfRFSHumObnWc7stWxcwVTg=";
|
||||
sha256 = "sha256-s4c1M4YHK/CNpH7nPt7rRqlkLUZrpBXvAVS/qxCai9c=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
|
|||
mkdir -p $out/bin
|
||||
install -Dm755 -t $out/bin tmpmail
|
||||
installManPage tmpmail.1
|
||||
wrapProgram $out/bin/tmpmail --prefix PATH : ${lib.makeBinPath [ w3m curl jq ]}
|
||||
wrapProgram $out/bin/tmpmail --prefix PATH : ${lib.makeBinPath [ w3m curl jq xclip ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, lib, fetchFromGitHub, cmake, boost, gmp, mpfr, libedit, python3
|
||||
, texinfo, gnused, usePython ? true }:
|
||||
, fetchpatch, installShellFiles, texinfo, gnused, usePython ? true }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ledger";
|
||||
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
|||
gmp mpfr libedit gnused
|
||||
] ++ lib.optional usePython python3;
|
||||
|
||||
nativeBuildInputs = [ cmake texinfo ];
|
||||
nativeBuildInputs = [ cmake texinfo installShellFiles ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib"
|
||||
|
@ -34,8 +34,21 @@ stdenv.mkDerivation rec {
|
|||
--replace 'DESTINATION ''${Python_SITEARCH}' 'DESTINATION "${python3.sitePackages}"'
|
||||
'';
|
||||
|
||||
patches = [
|
||||
# Add support for $XDG_CONFIG_HOME. Remove with the next release
|
||||
(fetchpatch {
|
||||
url = "https://github.com/ledger/ledger/commit/c79674649dee7577d6061e3d0776922257520fd0.patch";
|
||||
sha256 = "sha256-vwVQnY9EUCXPzhDJ4PSOmQStb9eF6H0yAOiEmL6sAlk=";
|
||||
excludes = [ "doc/NEWS.md" ];
|
||||
})
|
||||
];
|
||||
|
||||
installTargets = [ "doc" "install" ];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd ledger --bash $src/contrib/ledger-completion.bash
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://ledger-cli.org/";
|
||||
description = "A double-entry accounting system with a command-line reporting interface";
|
||||
|
@ -49,6 +62,6 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ jwiegley ];
|
||||
maintainers = with maintainers; [ jwiegley marsam ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchzip
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, libtirpc
|
||||
, ncurses
|
||||
|
@ -10,12 +10,18 @@ stdenv.mkDerivation rec {
|
|||
pname = "teapot";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchzip {
|
||||
src = fetchFromGitHub {
|
||||
name = "${pname}-${version}";
|
||||
url = "https://www.syntax-k.de/projekte/teapot/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-wzAwZwOMeTsuR5LhfjspGdejT6X1V8YJ8B7v9pcbxaY=";
|
||||
owner = "museoa";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-38XFjRzOGasr030f+mRYT+ptlabpnVJfa+1s7ZAjS+k=";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
cd src
|
||||
'';
|
||||
|
||||
patches = [
|
||||
# include a local file in order to make cc happy
|
||||
./001-fix-warning.patch
|
||||
|
@ -41,8 +47,8 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.syntax-k.de/projekte/teapot/";
|
||||
description = "Table Editor And Planner, Or: Teapot!";
|
||||
inherit (src.meta) homepage;
|
||||
description = "Table Editor And Planner, Or: Teapot";
|
||||
longDescription = ''
|
||||
Teapot is a compact spreadsheet software originally written by Michael
|
||||
Haardt. It features a (n)curses-based text terminal interface, and
|
||||
|
@ -70,4 +76,4 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
}
|
||||
# TODO: patch/fix FLTK building
|
||||
# TODO: add documentation from
|
||||
# TODO: add documentation
|
||||
|
|
|
@ -1,19 +1,19 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, pulseaudio }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, libpulseaudio }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "flex-ndax";
|
||||
version = "0.2-20211111.0";
|
||||
version = "0.2-20220427";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kc2g-flex-tools";
|
||||
repo = "nDAX";
|
||||
rev = "v${version}";
|
||||
sha256 = "0m2hphj0qvgq25pfm3s76naf672ll43jv7gll8cfs7276ckg1904";
|
||||
hash = "sha256-KmvTLfGC6xzXcWYAzmBYiYSF65lqMdsdMQjUEk3siqc=";
|
||||
};
|
||||
|
||||
buildInputs = [ pulseaudio ];
|
||||
buildInputs = [ libpulseaudio ];
|
||||
|
||||
vendorSha256 = "1bf0iidb8ggzahy3fvxispf3g940mv6vj9wqd8i3rldc6ca2i3pf";
|
||||
vendorSha256 = "sha256-u/5LiVo/ZOefprEKr/L1+3+OfYb0a4wq+CWoUjYNvzg=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/kc2g-flex-tools/nDAX";
|
||||
|
|
|
@ -21,13 +21,13 @@
|
|||
|
||||
gnuradio.pkgs.mkDerivation rec {
|
||||
pname = "gnss-sdr";
|
||||
version = "0.0.16";
|
||||
version = "0.0.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gnss-sdr";
|
||||
repo = "gnss-sdr";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ODe4k6PDGtDX11FrbggEbN3tc4UtATaItUIpCKl4JjM=";
|
||||
sha256 = "sha256-0aAjkrVAswoRL/KANBSZ5Jq4Y9VwOHZKUKLpXDdKtk8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -35,11 +35,6 @@ gnuradio.pkgs.mkDerivation rec {
|
|||
# cpu_features which is bundled in the source. NOTE: Perhaps this patch
|
||||
# should be sent upstream.
|
||||
./fix_libcpu_features_install_path.patch
|
||||
# Fixes a compilation issue, should be removed on next release.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/gnss-sdr/gnss-sdr/commit/8a42967c854e575f2dd9ee7ca81a2522eebb864b.patch";
|
||||
sha256 = "sha256-W8BwC08QVtW0LUj5Q+j28aYG+713s+vQIzsWyrNUs1Q=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- a/CMakeLists.txt 1970-01-01 08:00:01.000000000 +0800
|
||||
+++ b/CMakeLists.txt 2022-02-16 20:41:53.725290020 +0800
|
||||
@@ -1214,7 +1214,7 @@
|
||||
--- i/CMakeLists.txt
|
||||
+++ w/CMakeLists.txt
|
||||
@@ -1210,7 +1210,7 @@ if(NOT VOLKGNSSSDR_FOUND)
|
||||
BINARY_DIR ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build
|
||||
CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS}
|
||||
-DCMAKE_BUILD_TYPE=$<$<CONFIG:None>:None>$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>$<$<CONFIG:RelWithDebInfo>:RelWithDebInfo>$<$<CONFIG:MinSizeRel>:MinSizeRel>$<$<CONFIG:NoOptWithASM>:NoOptWithASM>$<$<CONFIG:Coverage>:Coverage>$<$<CONFIG:O2WithASM>:O2WithASM>$<$<CONFIG:O3WithASM>:O3WithASM>$<$<CONFIG:ASAN>:ASAN>
|
||||
|
@ -9,16 +9,16 @@
|
|||
DOWNLOAD_COMMAND ""
|
||||
UPDATE_COMMAND ""
|
||||
PATCH_COMMAND ""
|
||||
@@ -1247,7 +1247,7 @@
|
||||
)
|
||||
set(VOLK_GNSSSDR_BUILD_BYPRODUCTS
|
||||
${VOLK_GNSSSDR_BUILD_BYPRODUCTS}
|
||||
- ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX}
|
||||
+ ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX}
|
||||
)
|
||||
@@ -1248,7 +1248,7 @@ if(NOT VOLKGNSSSDR_FOUND)
|
||||
)
|
||||
set(VOLK_GNSSSDR_BUILD_BYPRODUCTS
|
||||
${VOLK_GNSSSDR_BUILD_BYPRODUCTS}
|
||||
- ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX}
|
||||
+ ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX}
|
||||
)
|
||||
endif()
|
||||
endif()
|
||||
ExternalProject_Add(volk_gnsssdr_module
|
||||
@@ -1256,7 +1256,7 @@
|
||||
@@ -1261,7 +1261,7 @@ if(NOT VOLKGNSSSDR_FOUND)
|
||||
BINARY_DIR ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build
|
||||
CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS}
|
||||
-DCMAKE_BUILD_TYPE=$<$<CONFIG:None>:None>$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>$<$<CONFIG:RelWithDebInfo>:RelWithDebInfo>$<$<CONFIG:MinSizeRel>:MinSizeRel>$<$<CONFIG:NoOptWithASM>:NoOptWithASM>$<$<CONFIG:Coverage>:Coverage>$<$<CONFIG:O2WithASM>:O2WithASM>$<$<CONFIG:O3WithASM>:O3WithASM>$<$<CONFIG:ASAN>:ASAN>
|
||||
|
@ -27,7 +27,7 @@
|
|||
DOWNLOAD_COMMAND ""
|
||||
UPDATE_COMMAND ""
|
||||
PATCH_COMMAND ""
|
||||
@@ -1271,7 +1271,7 @@
|
||||
@@ -1280,7 +1280,7 @@ if(NOT VOLKGNSSSDR_FOUND)
|
||||
BINARY_DIR ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build
|
||||
CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS}
|
||||
-DCMAKE_BUILD_TYPE=$<$<CONFIG:None>:None>$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>$<$<CONFIG:RelWithDebInfo>:RelWithDebInfo>$<$<CONFIG:MinSizeRel>:MinSizeRel>$<$<CONFIG:NoOptWithASM>:NoOptWithASM>$<$<CONFIG:Coverage>:Coverage>$<$<CONFIG:O2WithASM>:O2WithASM>$<$<CONFIG:O3WithASM>:O3WithASM>$<$<CONFIG:ASAN>:ASAN>
|
||||
|
@ -36,9 +36,9 @@
|
|||
DOWNLOAD_COMMAND ""
|
||||
UPDATE_COMMAND ""
|
||||
PATCH_COMMAND ""
|
||||
@@ -1310,7 +1310,7 @@
|
||||
@@ -1319,7 +1319,7 @@ if(NOT VOLKGNSSSDR_FOUND)
|
||||
if(CMAKE_VERSION VERSION_GREATER 3.0 AND SUPPORTED_CPU_FEATURES_ARCH)
|
||||
if(NOT CpuFeatures_FOUND)
|
||||
if(NOT CPUFEATURES_FOUND AND ENABLE_CPUFEATURES)
|
||||
set_target_properties(Volkgnsssdr::volkgnsssdr PROPERTIES
|
||||
- INTERFACE_LINK_LIBRARIES ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX}
|
||||
+ INTERFACE_LINK_LIBRARIES ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, zlib }:
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bowtie";
|
||||
|
@ -11,6 +11,26 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-mWItmrTMPst/NnzSpxxTHcBztDqHPCza9yOsZPwp7G4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Without this patch, compiling with clang on an M1 Mac fails because
|
||||
# 'cpuid.h' is included. It only works on x86 and throws an error.
|
||||
(fetchpatch {
|
||||
name = "fix_compilation_on_arm64";
|
||||
url = "https://github.com/BenLangmead/bowtie/commit/091d72f4cb69ca0713704d38bd7f9b37e6c4ff2d.patch";
|
||||
sha256 = "sha256-XBvgICUBnE5HKpJ36IHTDiKjJgLFKETsIaJC46uN+2I=";
|
||||
})
|
||||
|
||||
# Without this patch, compilation adds the current source directory to the
|
||||
# include search path, and #include <version> in standard library code can
|
||||
# end up picking the unrelated VERSION source code file on case-insensitive
|
||||
# file systems.
|
||||
(fetchpatch {
|
||||
name = "fix_include_search_path";
|
||||
url = "https://github.com/BenLangmead/bowtie/commit/c208b9db936eab0bc3ffdf0182b4f59a9017a1c4.patch";
|
||||
sha256 = "sha256-772EE+oWFWXssSMabPryb0AfIS1tC10mPTRCBm7RrUs=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ zlib ];
|
||||
|
||||
installFlags = [ "prefix=$(out)" ];
|
||||
|
|
|
@ -11,13 +11,13 @@ assert (!blas.isILP64) && (!lapack.isILP64);
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "octopus";
|
||||
version = "11.3";
|
||||
version = "11.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "octopus-code";
|
||||
repo = "octopus";
|
||||
rev = version;
|
||||
sha256 = "0n04yvnc0rg3lvnkkdpbwkfl6zg544260p3s65vwkc5dflrhk34r";
|
||||
sha256 = "1z423sjpc4ajjy3s7623z3rfwmp2hgis7iiiy8gb5apw73k33dyv";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -1,36 +1,23 @@
|
|||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, wrapQtAppsHook
|
||||
{
|
||||
lib,
|
||||
python3,
|
||||
fetchFromGitHub,
|
||||
wrapQtAppsHook,
|
||||
}:
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
scipy = super.scipy.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.4.1";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
sha256 = "0ndw7zyxd2dj37775mc75zm4fcyiipnqxclc45mkpxy8lvrvpqfy";
|
||||
};
|
||||
doCheck = false;
|
||||
});
|
||||
};
|
||||
};
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "nanovna-saver";
|
||||
version = "0.3.8";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NanoVNA-Saver";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0z83rwpnbbs1n74mx8dgh1d1crp90mannj9vfy161dmy4wzc5kpv";
|
||||
sha256 = "1n1bh46spdyk7kgvv95hyfy9f904czhzlvk41vliqkak56hj2ss1";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapQtAppsHook ];
|
||||
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
cython
|
||||
scipy
|
||||
pyqt5
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
, buildPackages
|
||||
, sharutils
|
||||
, file
|
||||
, getconf
|
||||
, flint
|
||||
, ntl
|
||||
, cddlib
|
||||
|
@ -87,7 +88,7 @@ stdenv.mkDerivation rec {
|
|||
latex2html
|
||||
texinfo4
|
||||
texlive.combined.scheme-small
|
||||
];
|
||||
] ++ lib.optionals stdenv.isDarwin [ getconf ];
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
preAutoreconf = ''
|
||||
|
|
|
@ -112,10 +112,14 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# Fix library paths
|
||||
cd $out/libexec/${dirName}/Executables
|
||||
for path in MathKernel WolframKernel math mcc wolfram; do
|
||||
for path in MathKernel math mcc wolfram; do
|
||||
makeWrapper $out/libexec/${dirName}/Executables/$path $out/bin/$path --set LD_LIBRARY_PATH "${zlib}/lib:${stdenv.cc.cc.lib}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}"
|
||||
done
|
||||
|
||||
for path in WolframKernel wolframscript; do
|
||||
makeWrapper $out/libexec/${dirName}/SystemFiles/Kernel/Binaries/Linux-x86-64/$path $out/bin/$path --set LD_LIBRARY_PATH "${zlib}/lib:${stdenv.cc.cc.lib}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}"
|
||||
done
|
||||
|
||||
# ... and xkeyboard config path for Qt
|
||||
for path in WolframPlayer wolframplayer; do
|
||||
makeWrapper $out/libexec/${dirName}/Executables/$path $out/bin/$path \
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "eterm";
|
||||
version = "0.9.6-unstable=2020-03-03";
|
||||
version = "0.9.6+date=2020-03-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mej";
|
||||
|
@ -43,7 +43,10 @@ stdenv.mkDerivation rec {
|
|||
maintainers = [ maintainers.AndersonTorres ];
|
||||
platforms = platforms.linux;
|
||||
knownVulnerabilities = [
|
||||
"Usage of ANSI escape sequences causes unexpected newline-termination, leading to unexpected command execution (https://www.openwall.com/lists/oss-security/2021/05/17/1)"
|
||||
''Usage of ANSI escape sequences causes unexpected newline-termination,
|
||||
leading to unexpected command execution. More info at:
|
||||
- https://www.cve.org/CVERecord?id=CVE-2021-33477
|
||||
- https://www.openwall.com/lists/oss-security/2021/05/17/1''
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ lib, fetchurl, makeWrapper
|
||||
, pypy2Packages
|
||||
, cvs, subversion, git, breezy
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
pypy2Packages.buildPythonApplication rec {
|
||||
|
@ -12,7 +13,7 @@ pypy2Packages.buildPythonApplication rec {
|
|||
sha256 = "1ska0z15sjhyfi860rjazz9ya1gxbf5c0h8dfqwz88h7fccd22b4";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
||||
|
||||
checkInputs = [ subversion git breezy ];
|
||||
|
||||
|
@ -24,13 +25,15 @@ pypy2Packages.buildPythonApplication rec {
|
|||
for i in bzr svn git; do
|
||||
wrapProgram $out/bin/cvs2$i \
|
||||
--prefix PATH : "${lib.makeBinPath [ cvs ]}"
|
||||
$out/bin/cvs2$i --man > csv2$i.1
|
||||
installManPage csv2$i.1
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool to convert CVS repositories to Subversion repositories";
|
||||
homepage = "https://github.com/mhagger/cvs2svn";
|
||||
maintainers = [ maintainers.makefu ];
|
||||
maintainers = with maintainers; [ makefu viraptor ];
|
||||
platforms = platforms.unix;
|
||||
license = licenses.asl20;
|
||||
};
|
||||
|
|
|
@ -2,22 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fnc";
|
||||
version = "0.10";
|
||||
version = "0.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://fnc.bsdbox.org/tarball/${version}/fnc-${version}.tar.gz";
|
||||
sha256 = "1phqxh0afky7q2qmhgjlsq1awbv4254yd8wpzxlww4p7a57cp0lk";
|
||||
sha256 = "05cg8id4d1ia8y60y3x23167bl1rn2fdpkf1jfj3aklhlihvkbxd";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "sqlite3-upgrade.patch";
|
||||
url = "https://fnc.bsdbox.org/vpatch?from=12e8919d436f52ca&to=091ce838edf67f1d";
|
||||
sha256 = "sha256-uKSO+lCY6h7Wkv5T7zeagMbpDxj6oirA/bty6i6Py8s=";
|
||||
})
|
||||
];
|
||||
patchFlags = [ "-p0" ];
|
||||
|
||||
buildInputs = [ libiconv ncurses zlib ];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
@ -26,14 +17,6 @@ stdenv.mkDerivation rec {
|
|||
mkdir -p $out/bin
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
test "$($out/bin/fnc --version)" = '${pname} ${version}'
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Interactive ncurses browser for Fossil repositories";
|
||||
longDescription = ''
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gh";
|
||||
version = "2.9.0";
|
||||
version = "2.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cli";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-k8td9YKtlkit3YzpAncocZE7+Cl8v9ZNyPD4ZysCFRI=";
|
||||
sha256 = "sha256-2lIHEO4+oW9+C7VSulmVwZJ1l6RYBbV6wlKMvdOGqi8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-YLkNua0Pz0gVIYnWOzOlV5RuLBaoZ4l7l1Pf4QIfUVQ=";
|
||||
vendorSha256 = "sha256-EFJfd6sUK5iquFW0kXaiH6tLiNqbZNe9awpIqmqhp7I=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, addOpenGLRunpath
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, libelf
|
||||
|
@ -8,25 +9,31 @@
|
|||
, rpcsvc-proto
|
||||
, libtirpc
|
||||
, makeWrapper
|
||||
, substituteAll
|
||||
, go
|
||||
}:
|
||||
let
|
||||
modp-ver = "450.57";
|
||||
modprobeVersion = "495.44";
|
||||
nvidia-modprobe = fetchFromGitHub {
|
||||
owner = "NVIDIA";
|
||||
repo = "nvidia-modprobe";
|
||||
rev = modp-ver;
|
||||
sha256 = "0r4f6lpbbqqs9932xd2mr7bxn6a3xdalcwq332fc1amrrkgzfyv7";
|
||||
rev = modprobeVersion;
|
||||
sha256 = "sha256-Y3ZOfge/EcmhqI19yWO7UfPqkvY1CHHvFC5l9vYyGuU=";
|
||||
};
|
||||
modprobePatch = substituteAll {
|
||||
src = ./modprobe.patch;
|
||||
inherit modprobeVersion;
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libnvidia-container";
|
||||
version = "1.5.0";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NVIDIA";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-b9yQ1mEo1EkjXMguV0t98OvFEQO4h76EVu154MsB2II=";
|
||||
sha256 = "sha256-7OTawWwjeKU8wIa8I/+aSvAJli4kEua94nJSNyCajpE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -36,11 +43,53 @@ stdenv.mkDerivation rec {
|
|||
# path.
|
||||
./libnvc-ldconfig-and-path-fixes.patch
|
||||
|
||||
# the libnvidia-container Makefile wants to build and install static
|
||||
# libtirpc libraries; this patch prevents that from happening
|
||||
./avoid-static-libtirpc-build.patch
|
||||
# fix bogus struct declaration
|
||||
./inline-c-struct.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i \
|
||||
-e 's/^REVISION ?=.*/REVISION = ${src.rev}/' \
|
||||
-e 's/^COMPILER :=.*/COMPILER = $(CC)/' \
|
||||
mk/common.mk
|
||||
|
||||
mkdir -p deps/src/nvidia-modprobe-${modprobeVersion}
|
||||
cp -r ${nvidia-modprobe}/* deps/src/nvidia-modprobe-${modprobeVersion}
|
||||
chmod -R u+w deps/src
|
||||
pushd deps/src
|
||||
|
||||
patch -p0 < ${modprobePatch}
|
||||
touch nvidia-modprobe-${modprobeVersion}/.download_stamp
|
||||
popd
|
||||
|
||||
# 1. replace DESTDIR=$(DEPS_DIR) with empty strings to prevent copying
|
||||
# things into deps/src/nix/store
|
||||
# 2. similarly, remove any paths prefixed with DEPS_DIR
|
||||
# 3. prevent building static libraries because we don't build static
|
||||
# libtirpc (for now)
|
||||
# 4. prevent installation of static libraries because of step 3
|
||||
# 5. prevent installation of libnvidia-container-go.so twice
|
||||
sed -i Makefile \
|
||||
-e 's#DESTDIR=\$(DEPS_DIR)#DESTDIR=""#g' \
|
||||
-e 's#\$(DEPS_DIR)\$#\$#g' \
|
||||
-e 's#all: shared static tools#all: shared tools#g' \
|
||||
-e '/$(INSTALL) -m 644 $(LIB_STATIC) $(DESTDIR)$(libdir)/d' \
|
||||
-e '/$(INSTALL) -m 755 $(libdir)\/$(LIBGO_SHARED) $(DESTDIR)$(libdir)/d'
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preBuild = ''
|
||||
HOME="$(mktemp -d)"
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ];
|
||||
NIX_LDFLAGS = [ "-L${libtirpc.dev}/lib" "-ltirpc" ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config go rpcsvc-proto makeWrapper ];
|
||||
|
||||
buildInputs = [ libelf libcap libseccomp libtirpc ];
|
||||
|
||||
makeFlags = [
|
||||
"WITH_LIBELF=yes"
|
||||
"prefix=$(out)"
|
||||
|
@ -50,32 +99,14 @@ stdenv.mkDerivation rec {
|
|||
"CFLAGS=-DWITH_TIRPC"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i \
|
||||
-e 's/^REVISION ?=.*/REVISION = ${src.rev}/' \
|
||||
-e 's/^COMPILER :=.*/COMPILER = $(CC)/' \
|
||||
mk/common.mk
|
||||
|
||||
mkdir -p deps/src/nvidia-modprobe-${modp-ver}
|
||||
cp -r ${nvidia-modprobe}/* deps/src/nvidia-modprobe-${modp-ver}
|
||||
chmod -R u+w deps/src
|
||||
pushd deps/src
|
||||
patch -p0 < ${./modprobe.patch}
|
||||
touch nvidia-modprobe-${modp-ver}/.download_stamp
|
||||
popd
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/nvidia-container-cli \
|
||||
--prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:/run/opengl-driver-32/lib
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ];
|
||||
NIX_LDFLAGS = [ "-L${libtirpc.dev}/lib" "-ltirpc" ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config rpcsvc-proto makeWrapper ];
|
||||
|
||||
buildInputs = [ libelf libcap libseccomp libtirpc ];
|
||||
postInstall =
|
||||
let
|
||||
inherit (addOpenGLRunpath) driverLink;
|
||||
libraryPath = lib.makeLibraryPath [ "$out" driverLink "${driverLink}-32" ];
|
||||
in
|
||||
''
|
||||
wrapProgram $out/bin/nvidia-container-cli --prefix LD_LIBRARY_PATH : ${libraryPath}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/NVIDIA/libnvidia-container";
|
||||
|
|
|
@ -0,0 +1,14 @@
|
|||
diff --git a/src/nvcgo.c b/src/nvcgo.c
|
||||
index 98789a3..47ad02b 100644
|
||||
--- a/src/nvcgo.c
|
||||
+++ b/src/nvcgo.c
|
||||
@@ -33,7 +33,8 @@
|
||||
void nvcgo_program_1(struct svc_req *, register SVCXPRT *);
|
||||
|
||||
static struct nvcgo_ext {
|
||||
- struct nvcgo;
|
||||
+ struct rpc rpc;
|
||||
+ struct libnvcgo api;
|
||||
bool initialized;
|
||||
void *dl_handle;
|
||||
} global_nvcgo_context;
|
|
@ -1,6 +1,6 @@
|
|||
diff -ruN nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c
|
||||
--- nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c 2020-07-09 17:06:05.000000000 +0000
|
||||
+++ nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c 2020-08-18 12:43:03.223871514 +0000
|
||||
diff -ruN nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.c nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.c
|
||||
--- nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.c 2020-07-09 17:06:05.000000000 +0000
|
||||
+++ nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.c 2020-08-18 12:43:03.223871514 +0000
|
||||
@@ -840,10 +840,10 @@
|
||||
return mknod_helper(major, minor_num, vgpu_dev_name, NV_PROC_REGISTRY_PATH);
|
||||
}
|
||||
|
@ -16,9 +16,9 @@ diff -ruN nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c nvidia-m
|
|||
{
|
||||
char field[32];
|
||||
FILE *fp;
|
||||
diff -ruN nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h
|
||||
--- nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h 2020-07-09 17:06:05.000000000 +0000
|
||||
+++ nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h 2020-08-18 12:43:44.227745050 +0000
|
||||
diff -ruN nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.h nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.h
|
||||
--- nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.h 2020-07-09 17:06:05.000000000 +0000
|
||||
+++ nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.h 2020-08-18 12:43:44.227745050 +0000
|
||||
@@ -81,6 +81,7 @@
|
||||
int nvidia_nvswitch_get_file_state(int minor);
|
||||
int nvidia_cap_mknod(const char* cap_file_path, int *minor);
|
||||
|
|
|
@ -103,6 +103,12 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-gTRf9XENAfbFB3asYCXnw4OV4Af6VE1W56K2xpYDhgM=";
|
||||
revert = true;
|
||||
})
|
||||
# make nixos tests that boot from USB more stable
|
||||
# https://lists.nongnu.org/archive/html/qemu-devel/2022-05/msg01484.html
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/raboof/qemu/-/commit/3fb5e8fe4434130b1167a995b2a01c077cca2cd5.patch";
|
||||
sha256 = "sha256-evzrN3i4ntc/AFG0C0rezQpQbWcnx74nXO+5DLErX8o=";
|
||||
})
|
||||
]
|
||||
++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch;
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, fetchFromGitHub }:
|
||||
let
|
||||
font-awesome = { version, sha256, rev ? version}: fetchFromGitHub {
|
||||
font-awesome = { version, sha256, rev ? version }: fetchFromGitHub {
|
||||
name = "font-awesome-${version}";
|
||||
|
||||
|
||||
|
@ -21,18 +21,20 @@ let
|
|||
Font Awesome gives you scalable vector icons that can instantly be customized.
|
||||
This package includes only the OTF font. For full CSS etc. see the project website.
|
||||
'';
|
||||
homepage = "http://fortawesome.github.io/Font-Awesome/";
|
||||
homepage = "https://fontawesome.com/";
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ abaldeau johnazoidberg ];
|
||||
};
|
||||
};
|
||||
in {
|
||||
# Keeping version 4 because version 5 is incompatible for some icons. That
|
||||
in
|
||||
{
|
||||
# Keeping version 4 and 5 because version 6 is incompatible for some icons. That
|
||||
# means that projects which depend on it need to actively convert the
|
||||
# symbols. See:
|
||||
# https://github.com/greshake/i3status-rust/issues/130
|
||||
# https://fontawesome.com/how-to-use/on-the-web/setup/upgrading-from-version-4
|
||||
# https://fontawesome.com/v6/docs/web/setup/upgrade/
|
||||
v4 = font-awesome {
|
||||
version = "4.7.0";
|
||||
rev = "v4.7.0";
|
||||
|
@ -42,4 +44,8 @@ in {
|
|||
version = "5.15.3";
|
||||
sha256 = "sha256-EDxk/yO3nMmtM/ytrAEgPYSBbep3rA3NrKkiqf3OsU0=";
|
||||
};
|
||||
v6 = font-awesome {
|
||||
version = "6.1.1";
|
||||
sha256 = "sha256-BjK1PJQFWtKDvfQ2Vh7BoOPqYucyvOG+2Pu/Kh+JpAA";
|
||||
};
|
||||
}
|
23
pkgs/data/fonts/sil-abyssinica/default.nix
Normal file
23
pkgs/data/fonts/sil-abyssinica/default.nix
Normal file
|
@ -0,0 +1,23 @@
|
|||
{ fetchzip, lib }:
|
||||
|
||||
let
|
||||
version = "1.500";
|
||||
in
|
||||
fetchzip {
|
||||
name = "sil-abyssinica-${version}";
|
||||
url = "mirror://debian/pool/main/f/fonts-sil-abyssinica/fonts-sil-abyssinica_${version}.orig.tar.xz";
|
||||
sha256 = "sha256-fCa88wG2JfHTaHaBkuvoncbcbrh3XNzc8ewS3W+W/fM=";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts
|
||||
tar xf $downloadedFile --strip-components=1 -C $out/share/fonts AbyssinicaSIL-${version}/AbyssinicaSIL-R.ttf
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Unicode font for Ethiopian and Erythrean scripts (Amharic et al.)";
|
||||
homepage = "https://software.sil.org/abyssinica/";
|
||||
license = licenses.ofl;
|
||||
maintainers = with lib.maintainers; [ serge ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
|
@ -223,8 +223,7 @@ let
|
|||
[ "--disable-all" ]
|
||||
|
||||
# PCRE
|
||||
++ lib.optionals (lib.versionAtLeast version "7.4") [ "--with-external-pcre=${pcre2.dev}" ]
|
||||
++ [ "PCRE_LIBDIR=${pcre2}" ]
|
||||
++ [ "--with-external-pcre=${pcre2.dev}" ]
|
||||
|
||||
|
||||
# Enable sapis
|
||||
|
@ -232,10 +231,6 @@ let
|
|||
++ lib.optional (!cliSupport) "--disable-cli"
|
||||
++ lib.optional fpmSupport "--enable-fpm"
|
||||
++ lib.optional pearSupport [ "--with-pear" "--enable-xml" "--with-libxml" ]
|
||||
++ lib.optionals (pearSupport && (lib.versionOlder version "7.4")) [
|
||||
"--enable-libxml"
|
||||
"--with-libxml-dir=${libxml2.dev}"
|
||||
]
|
||||
++ lib.optional pharSupport "--enable-phar"
|
||||
++ lib.optional (!phpdbgSupport) "--disable-phpdbg"
|
||||
|
||||
|
@ -270,14 +265,7 @@ let
|
|||
done
|
||||
|
||||
export EXTENSION_DIR=$out/lib/php/extensions
|
||||
''
|
||||
# PKG_CONFIG need not be a relative path
|
||||
+ lib.optionalString (lib.versionOlder version "7.4") ''
|
||||
for i in $(find . -type f -name "*.m4"); do
|
||||
substituteInPlace $i \
|
||||
--replace 'test -x "$PKG_CONFIG"' 'type -P "$PKG_CONFIG" >/dev/null'
|
||||
done
|
||||
'' + ''
|
||||
|
||||
./buildconf --copy --force
|
||||
|
||||
if test -f $src/genfiles; then
|
||||
|
|
|
@ -1,44 +0,0 @@
|
|||
diff --git a/ext/zlib/tests/bug55544.phpt b/ext/zlib/tests/bug55544.phpt
|
||||
index a0d22f4fcebf4846da6781f424f87821626de5ea..e650fe6909f555d04834f4c08f7fd0d354b783e2 100644
|
||||
--- a/ext/zlib/tests/bug55544.phpt
|
||||
+++ b/ext/zlib/tests/bug55544.phpt
|
||||
@@ -6,6 +6,9 @@ extension_loaded("zlib") or die("skip");
|
||||
if (substr(PHP_OS, 0, 3) == 'WIN') {
|
||||
die("skip not for windows");
|
||||
}
|
||||
+if (PHP_OS == "Darwin") {
|
||||
+ die("skip not for darwin");
|
||||
+}
|
||||
?>
|
||||
--INI--
|
||||
output_handler=ob_gzhandler
|
||||
diff --git a/ext/zlib/tests/gzencode_variation1.phpt b/ext/zlib/tests/gzencode_variation1.phpt
|
||||
index c966b2cbc5b7..2f953168fa22 100644
|
||||
--- a/ext/zlib/tests/gzencode_variation1.phpt
|
||||
+++ b/ext/zlib/tests/gzencode_variation1.phpt
|
||||
@@ -10,6 +10,10 @@ if( substr(PHP_OS, 0, 3) == "WIN" ) {
|
||||
if (!extension_loaded("zlib")) {
|
||||
print "skip - ZLIB extension not loaded";
|
||||
}
|
||||
+
|
||||
+if (PHP_OS == "Darwin") {
|
||||
+ print "skip - OS is encoded in headers, tested header is non Darwin";
|
||||
+}
|
||||
?>
|
||||
--FILE--
|
||||
<?php
|
||||
diff --git a/ext/zlib/tests/gzencode_variation2.phpt b/ext/zlib/tests/gzencode_variation2.phpt
|
||||
index 94ac42a5f1cd..9160cf519751 100644
|
||||
--- a/ext/zlib/tests/gzencode_variation2.phpt
|
||||
+++ b/ext/zlib/tests/gzencode_variation2.phpt
|
||||
@@ -10,6 +10,10 @@ if( substr(PHP_OS, 0, 3) == "WIN" ) {
|
||||
if (!extension_loaded("zlib")) {
|
||||
print "skip - ZLIB extension not loaded";
|
||||
}
|
||||
+
|
||||
+if (PHP_OS == "Darwin") {
|
||||
+ print "skip - OS is encoded in headers, tested header is non Darwin";
|
||||
+}
|
||||
?>
|
||||
--FILE--
|
||||
<?php
|
|
@ -176,8 +176,6 @@ let
|
|||
# default to python's platforms
|
||||
platforms = python.meta.platforms;
|
||||
isBuildPythonPackage = python.meta.platforms;
|
||||
} // lib.optionalAttrs (attrs?pname) {
|
||||
mainProgram = attrs.pname;
|
||||
} // meta;
|
||||
} // lib.optionalAttrs (attrs?checkPhase) {
|
||||
# If given use the specified checkPhase, otherwise use the setup hook.
|
||||
|
|
|
@ -1,21 +1,25 @@
|
|||
{ lib, stdenv, rustPlatform, fetchFromGitHub }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "yex-lang";
|
||||
version = "unstable-2021-12-25";
|
||||
version = "0.pre+date=2022-05-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nonamescm";
|
||||
repo = "yex-lang";
|
||||
rev = "a97def1431b73b8693700f530ec023f1776eaf83";
|
||||
hash = "sha256-CEzJtlEVMvMnRyUKdko1UDTluv8Fc88tfOpKGIFMnRw=";
|
||||
rev = "866c4decbb9340f5af687b145e2c4f47fcbee786";
|
||||
hash = "sha256-sxzkZ2Rhn3HvZIfjnJ6Z2au/l/jV5705ecs/X3Iah6k=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-mHMenqcdt9Yjm/6H1Ywf637Sv8ddq6a4Eu2/A/jX9gQ=";
|
||||
cargoSha256 = "sha256-nX5FoPAk50wt0CXskyg7jQeHvD5YtBNnCe0CVOGXTMI=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/nonamesc/yex-lang";
|
||||
description = "A cool functional scripting language written in rust";
|
||||
homepage = "https://github.com/nonamescm/yex-lang";
|
||||
description = "A functional scripting language written in rust";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
mainProgram = "yex";
|
||||
|
|
|
@ -1,40 +1,25 @@
|
|||
{ lib, stdenv, fetchzip, fetchpatch, atk, cairo, ldc, gdk-pixbuf, gnome, gst_all_1, librsvg
|
||||
{ lib, stdenv, fetchzip, atk, cairo, dcompiler, gdk-pixbuf, gnome, gst_all_1, librsvg
|
||||
, glib, gtk3, gtksourceview4, libgda, libpeas, pango, pkg-config, which, vte }:
|
||||
|
||||
let
|
||||
inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "gtkd";
|
||||
version = "3.9.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
version = "3.10.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://gtkd.org/Downloads/sources/GtkD-${version}.zip";
|
||||
sha256 = "12kc4s5gp6gn456d8pzhww1ggi9qbxldmcpp6855297g2x8xxy5p";
|
||||
sha256 = "DEKVDexGyg/T3SdnnvRjaHq1LbDo8ekNslxKROpMCCE=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ldc pkg-config which ];
|
||||
nativeBuildInputs = [ dcompiler pkg-config which ];
|
||||
propagatedBuildInputs = [
|
||||
atk cairo gdk-pixbuf glib gstreamer gst-plugins-base gtk3 gtksourceview4
|
||||
libgda libpeas librsvg pango vte
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Fix makefile not installing .pc's
|
||||
(fetchpatch {
|
||||
url = "https://github.com/gtkd-developers/GtkD/commit/a9db09117ab27127ca4c3b8d2f308fae483a9199.patch";
|
||||
sha256 = "0ngyqifw1kandc1vk01kms3z65pcisfd75q7z09rml96glhfzjd6";
|
||||
})
|
||||
# Fix breakage with dmd ldc 1.26 and newer
|
||||
(fetchpatch {
|
||||
url = "https://github.com/gtkd-developers/GtkD/commit/323ff96c648882eaca2faee170bd9e90c6e1e9c3.patch";
|
||||
sha256 = "1rhyi0isl6fl5i6fgsinvgq6v72xq7c6sajrxcsnmrzpvw91il3d";
|
||||
})
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
postPatch = ''
|
||||
substituteAll ${./paths.d} generated/gtkd/gtkd/paths.d
|
||||
|
||||
substituteInPlace generated/gstreamer/gst/app/c/functions.d \
|
||||
|
@ -134,6 +119,10 @@ in stdenv.mkDerivation rec {
|
|||
done
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit dcompiler;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "D binding and OO wrapper for GTK";
|
||||
homepage = "https://gtkd.org";
|
||||
|
|
|
@ -1,20 +1,29 @@
|
|||
{ lib, stdenv, fetchurl
|
||||
, pkg-config }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libast";
|
||||
version = "0.7.1";
|
||||
version = "0.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.eterm.org/download/${pname}-${version}.tar.gz";
|
||||
sha256 = "1w7bs46r4lykfd83kc3bg9i1rxzzlb4ydk23ikf8mx8avz05q1aj";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mej";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-rnqToFi+d6D6O+JDHQxkVjTc/0RBag6Jqv4uDcE4PNc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
inherit (src.meta) homepage;
|
||||
description = "Library of Assorted Spiffy Things";
|
||||
homepage = "https://www.eterm.org";
|
||||
license = licenses.bsd2;
|
||||
maintainers = [ maintainers.AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
|
|
|
@ -1,23 +0,0 @@
|
|||
{ lib, stdenv, fetchurl, bison, libuuid, curl, libxml2, flex }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.20.6";
|
||||
pname = "libdap";
|
||||
|
||||
nativeBuildInputs = [ bison flex ];
|
||||
buildInputs = [ libuuid curl libxml2 ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.opendap.org/pub/source/${pname}-${version}.tar.gz";
|
||||
sha256 = "0jn5bi8k2lq6mmrsw7r1r5aviyf8gb39b2iy20v4kpkj5napzk1m";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A C++ SDK which contains an implementation of DAP";
|
||||
homepage = "https://www.opendap.org/software/libdap";
|
||||
license = licenses.lgpl2;
|
||||
maintainers = [ maintainers.bzizou ];
|
||||
platforms = platforms.linux;
|
||||
broken = true;
|
||||
};
|
||||
}
|
|
@ -1,10 +0,0 @@
|
|||
{ libssh2, fetchurl }:
|
||||
|
||||
libssh2.overrideAttrs (attrs: rec {
|
||||
version = "1.10.0";
|
||||
src = fetchurl {
|
||||
url = with attrs; "${meta.homepage}/download/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-LWTpDz3tOUuR06LndMogOkF59prr7gMAPlpvpiHkHVE=";
|
||||
};
|
||||
patches = [];
|
||||
})
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libstrophe";
|
||||
version = "0.11.0";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "strophe";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-xAqBxCYNo2IntnHKXY6CSJ+Yiu01lxQ1Q3gb0ioypSs=";
|
||||
sha256 = "sha256-YJ8A97ECc3VxdGfhUu0YYijAamnrHCO6kr7TAIan96o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
|
|
@ -124,7 +124,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://xmlsoft.org/";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/libxml2";
|
||||
description = "XML parsing library for C";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
|
|
|
@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://xmlsoft.org/XSLT/";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/libxslt";
|
||||
description = "A C library and tools to do XSL transformations";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
|
|
|
@ -1,27 +0,0 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, opencv, qtbase, qtsvg }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
version = "0.5";
|
||||
pname = "openbr";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "biometrics";
|
||||
repo = "openbr";
|
||||
rev = "cc364a89a86698cd8d3052f42a3cb520c929b325";
|
||||
sha256 = "12y00cf5dlzp9ciiwbihf6xhlkdxpydhscv5hwp83qjdllid9rrz";
|
||||
};
|
||||
|
||||
buildInputs = [ opencv qtbase qtsvg ];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
meta = {
|
||||
description = "Open Source Biometric Recognition";
|
||||
homepage = "http://openbiometrics.org/";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [flosse];
|
||||
platforms = with lib.platforms; linux;
|
||||
broken = true;
|
||||
};
|
||||
}
|
|
@ -13,6 +13,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
# See https://github.com/trailofbits/pe-parse/issues/169
|
||||
NIX_CFLAGS_COMPILE = "-Wno-sign-conversion";
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
$out/bin/dump-pe ../tests/assets/example.exe
|
||||
|
|
|
@ -329,7 +329,7 @@ let
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz";
|
||||
sha512 = "sha512-oO1auBnBtieGdiN+57IgsA9Vr7Sy4HkILi1KSaUG4mpKfEbnkTGnLOxAqjLed+K2nsG/GtE1tJBtB7JxN1a78Q==";
|
||||
sha512 = "sha512-l9MOgNCn/paDE+i1K2fp9NZ+Du4trzPTJsGkaQHVBufTGqzoYHuNk8JfzXuIn0Gte6/ZjyKj652Jq/Lc1tp2yw==";
|
||||
};
|
||||
postInstall = with pkgs; ''
|
||||
wrapProgram "$out/bin/prisma" \
|
||||
|
|
10
pkgs/development/node-packages/node-packages.nix
generated
10
pkgs/development/node-packages/node-packages.nix
generated
|
@ -67102,15 +67102,6 @@ let
|
|||
sha512 = "hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg==";
|
||||
};
|
||||
};
|
||||
"ts-pattern-4.0.2" = {
|
||||
name = "ts-pattern";
|
||||
packageName = "ts-pattern";
|
||||
version = "4.0.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/ts-pattern/-/ts-pattern-4.0.2.tgz";
|
||||
sha512 = "eHqR/7A6fcw05vCOfnL6RwgGJbVi9G/YHTdYdjYmElhDdJ1SMn7pWs+6+YuxygaFwQS/g+cIDlu+UD8IVpur1A==";
|
||||
};
|
||||
};
|
||||
"ts-pnp-1.2.0" = {
|
||||
name = "ts-pnp";
|
||||
packageName = "ts-pnp";
|
||||
|
@ -118740,7 +118731,6 @@ in
|
|||
};
|
||||
dependencies = [
|
||||
sources."@prisma/engines-3.13.0-17.efdf9b1183dddfd4258cd181a72125755215ab7b"
|
||||
sources."ts-pattern-4.0.2"
|
||||
];
|
||||
buildInputs = globalBuildInputs;
|
||||
meta = {
|
||||
|
|
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = {
|
||||
homepage = "http://ocaml-benchmark.forge.ocamlcore.org/";
|
||||
platforms = ocaml.meta.platforms or [];
|
||||
inherit (ocaml.meta) platforms;
|
||||
description = "Benchmark running times of code";
|
||||
license = lib.licenses.lgpl21;
|
||||
maintainers = with lib.maintainers; [ volth ];
|
||||
|
|
|
@ -22,9 +22,10 @@ buildDunePackage rec {
|
|||
'';
|
||||
|
||||
meta = {
|
||||
inherit (src.meta) homepage;
|
||||
description = "Binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve";
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
inherit (src.meta) homepage;
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
mainProgram = "bdump";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -64,7 +64,7 @@ stdenv.mkDerivation {
|
|||
for reading from and writing to compressed files in these formats.
|
||||
'';
|
||||
license = "LGPL+linking exceptions";
|
||||
platforms = ocaml.meta.platforms or [];
|
||||
inherit (ocaml.meta) platforms;
|
||||
maintainers = with maintainers; [ maggesi ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
|||
description = "A comprehensive Unicode library for OCaml";
|
||||
license = lib.licenses.lgpl21;
|
||||
branch = "0.8.2";
|
||||
platforms = ocaml.meta.platforms or [];
|
||||
inherit (ocaml.meta) platforms;
|
||||
maintainers = [
|
||||
lib.maintainers.maggesi
|
||||
];
|
||||
|
|
|
@ -24,7 +24,7 @@ stdenv.mkDerivation {
|
|||
homepage = "https://github.com/yoriyuki/Camomile/tree/master/Camomile";
|
||||
description = "A comprehensive Unicode library for OCaml";
|
||||
license = lib.licenses.lgpl21;
|
||||
platforms = ocaml.meta.platforms or [];
|
||||
inherit (ocaml.meta) platforms;
|
||||
maintainers = [
|
||||
lib.maintainers.maggesi
|
||||
];
|
||||
|
|
|
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://erratique.ch/software/cmdliner";
|
||||
description = "An OCaml module for the declarative definition of command line interfaces";
|
||||
license = licenses.bsd3;
|
||||
platforms = ocaml.meta.platforms or [];
|
||||
inherit (ocaml.meta) platforms;
|
||||
maintainers = [ maintainers.vbgl ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.coherentpdf.com/";
|
||||
platforms = ocaml.meta.platforms or [];
|
||||
inherit (ocaml.meta) platforms;
|
||||
description = "PDF Command Line Tools";
|
||||
license = licenses.unfree;
|
||||
maintainers = [ maintainers.vbgl ];
|
||||
|
|
|
@ -31,7 +31,7 @@ stdenv.mkDerivation {
|
|||
itself.
|
||||
'';
|
||||
license = lib.licenses.mit;
|
||||
platforms = ocaml.meta.platforms or [];
|
||||
inherit (ocaml.meta) platforms;
|
||||
maintainers = [
|
||||
lib.maintainers.maggesi
|
||||
];
|
||||
|
|
|
@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.lgpl21Plus;
|
||||
changelog = "https://github.com/mbacarella/curses/raw/${version}/CHANGES";
|
||||
maintainers = [ maintainers.volth ];
|
||||
platforms = ocaml.meta.platforms or [];
|
||||
inherit (ocaml.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "http://dypgen.free.fr";
|
||||
description = "Dypgen GLR self extensible parser generator";
|
||||
license = lib.licenses.cecill-b;
|
||||
platforms = ocaml.meta.platforms or [];
|
||||
inherit (ocaml.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/ygrek/ocaml-extlib";
|
||||
description = "Enhancements to the OCaml Standard Library modules";
|
||||
license = lib.licenses.lgpl21Only;
|
||||
platforms = ocaml.meta.platforms or [];
|
||||
inherit (ocaml.meta) platforms;
|
||||
maintainers = [ lib.maintainers.sternenseemann ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -34,6 +34,6 @@ stdenv.mkDerivation {
|
|||
description = "A distributed computing library for Objective Caml which facilitates distributed execution of parallelizable computations in a seamless fashion";
|
||||
license = licenses.lgpl21;
|
||||
maintainers = [ maintainers.vbgl ];
|
||||
platforms = ocaml.meta.platforms or [];
|
||||
inherit (ocaml.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://erratique.ch/software/jsonm";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ vbgl ];
|
||||
platforms = ocaml.meta.platforms or [];
|
||||
mainProgram = "jsontrip";
|
||||
inherit (ocaml.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -29,7 +29,7 @@ stdenv.mkDerivation (rec {
|
|||
|
||||
meta = {
|
||||
branch = "2.14";
|
||||
platforms = ocaml.meta.platforms or [];
|
||||
inherit (ocaml.meta) platforms;
|
||||
maintainers = [
|
||||
lib.maintainers.maggesi
|
||||
lib.maintainers.roconnor
|
||||
|
|
|
@ -37,7 +37,7 @@ stdenv.mkDerivation {
|
|||
dontStrip = true;
|
||||
|
||||
meta = with lib; {
|
||||
platforms = ocaml.meta.platforms or [];
|
||||
inherit (ocaml.meta) platforms;
|
||||
maintainers = with maintainers; [
|
||||
maggesi roconnor vbgl
|
||||
];
|
||||
|
|
|
@ -38,7 +38,7 @@ stdenv.mkDerivation {
|
|||
|
||||
meta = {
|
||||
inherit (libllvm.meta) license homepage;
|
||||
platforms = ocaml.meta.platforms or [];
|
||||
inherit (ocaml.meta) platforms;
|
||||
description = "OCaml bindings distributed with LLVM";
|
||||
maintainers = with lib.maintainers; [ vbgl ];
|
||||
};
|
||||
|
|
|
@ -43,6 +43,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "http://cairographics.org/cairo-ocaml";
|
||||
description = "ocaml bindings for cairo library";
|
||||
license = lib.licenses.gpl2;
|
||||
platforms = ocaml.meta.platforms or [];
|
||||
inherit (ocaml.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://libvirt.org/ocaml/";
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.volth ];
|
||||
platforms = ocaml.meta.platforms or [];
|
||||
inherit (ocaml.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue