Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
5934fd9ec8
36 changed files with 516 additions and 511 deletions
|
|
@ -219,14 +219,15 @@ let
|
|||
cidr = "${route.address}/${toString route.prefixLength}";
|
||||
via = optionalString (route.via != null) ''via "${route.via}"'';
|
||||
options = concatStrings (mapAttrsToList (name: val: "${name} ${val} ") route.options);
|
||||
type = toString route.type;
|
||||
in
|
||||
''
|
||||
echo "${cidr}" >> $state
|
||||
echo -n "adding route ${cidr}... "
|
||||
if out=$(ip route add "${cidr}" ${options} ${via} dev "${i.name}" proto static 2>&1); then
|
||||
if out=$(ip route add ${type} "${cidr}" ${options} ${via} dev "${i.name}" proto static 2>&1); then
|
||||
echo "done"
|
||||
elif ! echo "$out" | grep "File exists" >/dev/null 2>&1; then
|
||||
echo "'ip route add "${cidr}" ${options} ${via} dev "${i.name}"' failed: $out"
|
||||
echo "'ip route add ${type} "${cidr}" ${options} ${via} dev "${i.name}"' failed: $out"
|
||||
exit 1
|
||||
fi
|
||||
''
|
||||
|
|
|
|||
|
|
@ -142,6 +142,9 @@ in
|
|||
optionalAttrs (route.via != null) {
|
||||
Gateway = route.via;
|
||||
} //
|
||||
optionalAttrs (route.type != null) {
|
||||
Type = route.type;
|
||||
} //
|
||||
optionalAttrs (route.options ? onlink) {
|
||||
GatewayOnLink = true;
|
||||
} //
|
||||
|
|
|
|||
|
|
@ -90,6 +90,22 @@ let
|
|||
'';
|
||||
};
|
||||
|
||||
type = mkOption {
|
||||
type = types.nullOr (types.enum [
|
||||
"unicast" "local" "broadcast" "multicast"
|
||||
]);
|
||||
default = null;
|
||||
description = ''
|
||||
Type of the route. See the <literal>Route types</literal> section
|
||||
in the <literal>ip-route(8)</literal> manual page for the details.
|
||||
|
||||
Note that <literal>prohibit</literal>, <literal>blackhole</literal>,
|
||||
<literal>unreachable</literal>, and <literal>throw</literal> cannot
|
||||
be configured per device, so they are not available here. Similarly,
|
||||
<literal>nat</literal> hasn't been supported since kernel 2.6.
|
||||
'';
|
||||
};
|
||||
|
||||
via = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
|
|
|
|||
|
|
@ -32,14 +32,7 @@ let
|
|||
};
|
||||
};
|
||||
# ihatemoney needs a local smtp server otherwise project creation just crashes
|
||||
services.opensmtpd = {
|
||||
enable = true;
|
||||
serverConfiguration = ''
|
||||
listen on lo
|
||||
action foo relay
|
||||
match from any for any action foo
|
||||
'';
|
||||
};
|
||||
services.postfix.enable = true;
|
||||
};
|
||||
testScript = ''
|
||||
machine.wait_for_open_port(8000)
|
||||
|
|
|
|||
|
|
@ -77,12 +77,14 @@ let
|
|||
testCases = {
|
||||
loopback = {
|
||||
name = "Loopback";
|
||||
machine.networking.useDHCP = false;
|
||||
machine.networking.useNetworkd = networkd;
|
||||
nodes.client = { pkgs, ... }: with pkgs.lib; {
|
||||
networking.useDHCP = false;
|
||||
networking.useNetworkd = networkd;
|
||||
};
|
||||
testScript = ''
|
||||
start_all()
|
||||
machine.wait_for_unit("network.target")
|
||||
loopback_addresses = machine.succeed("ip addr show lo")
|
||||
client.wait_for_unit("network.target")
|
||||
loopback_addresses = client.succeed("ip addr show lo")
|
||||
assert "inet 127.0.0.1/8" in loopback_addresses
|
||||
assert "inet6 ::1/128" in loopback_addresses
|
||||
'';
|
||||
|
|
@ -139,6 +141,25 @@ let
|
|||
client.wait_until_succeeds("ping -c 1 192.168.3.1")
|
||||
'';
|
||||
};
|
||||
routeType = {
|
||||
name = "RouteType";
|
||||
nodes.client = { pkgs, ... }: with pkgs.lib; {
|
||||
networking = {
|
||||
useDHCP = false;
|
||||
useNetworkd = networkd;
|
||||
interfaces.eth1.ipv4.routes = [{
|
||||
address = "192.168.1.127";
|
||||
prefixLength = 32;
|
||||
type = "local";
|
||||
}];
|
||||
};
|
||||
};
|
||||
testScript = ''
|
||||
start_all()
|
||||
client.wait_for_unit("network.target")
|
||||
client.succeed("ip -4 route list table local | grep 'local 192.168.1.127'")
|
||||
'';
|
||||
};
|
||||
dhcpDefault = {
|
||||
name = "useDHCP-by-default";
|
||||
nodes.router = router;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkg-config, deadbeef, gtk3, perl
|
||||
, libdbusmenu-glib }:
|
||||
, libdbusmenu }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deadbeef-statusnotifier-plugin";
|
||||
|
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ deadbeef gtk3 libdbusmenu-glib ];
|
||||
buildInputs = [ deadbeef gtk3 libdbusmenu ];
|
||||
|
||||
buildFlags = [ "gtk3" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ config, lib, stdenv, autoreconfHook, fetchFromGitHub, pkg-config, makeWrapper
|
||||
{ config, lib, stdenv, autoreconfHook, fetchFromGitHub, fetchpatch
|
||||
, pkg-config, makeWrapper
|
||||
, alsa-lib, alsa-plugins, libtool, icu, pcre2
|
||||
, pulseaudioSupport ? config.pulseaudio or false, libpulseaudio }:
|
||||
|
||||
|
|
@ -13,6 +14,16 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1agwgby9ql8r3x5rd1rgx3xp9y4cdg4pi3kqlz3vanv9na8nf3id";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pull upstream fix for -fno-common toolchains:
|
||||
# https://github.com/MycroftAI/mimic1/pull/216
|
||||
(fetchpatch {
|
||||
name = "fno-common";
|
||||
url = "https://github.com/MycroftAI/mimic1/commit/77b36eaeb2c38eba571b8db7e9bb0fd507774e6d.patch";
|
||||
sha256 = "0n3hqrfpbdp44y0c8bq55ay9m4c96r09k18hjxka4x54j5c7lw1m";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -8,6 +8,7 @@ https://github.com/vim-scripts/DoxygenToolkit.vim/,,
|
|||
https://github.com/numToStr/FTerm.nvim/,,
|
||||
https://github.com/antoinemadec/FixCursorHold.nvim/,,
|
||||
https://github.com/vim-scripts/Improved-AnsiEsc/,,
|
||||
https://github.com/ionide/Ionide-vim/,HEAD,
|
||||
https://github.com/martinda/Jenkinsfile-vim-syntax/,,
|
||||
https://github.com/autozimu/LanguageClient-neovim/,,
|
||||
https://github.com/vigoux/LanguageTool.nvim/,,
|
||||
|
|
@ -85,6 +86,7 @@ https://github.com/sudormrfbin/cheatsheet.nvim/,,
|
|||
https://github.com/yunlingz/ci_dark/,,
|
||||
https://github.com/projekt0n/circles.nvim/,,
|
||||
https://github.com/xavierd/clang_complete/,,
|
||||
https://github.com/p00f/clangd_extensions.nvim/,HEAD,
|
||||
https://github.com/rhysd/clever-f.vim/,,
|
||||
https://github.com/bbchung/clighter8/,,
|
||||
https://github.com/winston0410/cmd-parser.nvim/,,
|
||||
|
|
@ -121,6 +123,7 @@ https://github.com/manicmaniac/coconut.vim/,HEAD,
|
|||
https://github.com/metakirby5/codi.vim/,,
|
||||
https://github.com/tjdevries/colorbuddy.nvim/,,
|
||||
https://github.com/lilydjwg/colorizer/,,
|
||||
https://github.com/Domeee/com.cloudedmountain.ide.neovim/,HEAD,
|
||||
https://github.com/wincent/command-t/,,
|
||||
https://github.com/numtostr/comment.nvim/,,
|
||||
https://github.com/rhysd/committia.vim/,,
|
||||
|
|
@ -137,12 +140,15 @@ https://github.com/rhysd/conflict-marker.vim/,,
|
|||
https://github.com/Olical/conjure/,,
|
||||
https://github.com/Shougo/context_filetype.vim/,,
|
||||
https://github.com/github/copilot.vim/,,
|
||||
https://github.com/ms-jpq/coq.artifacts/,HEAD,
|
||||
https://github.com/ms-jpq/coq.thirdparty/,HEAD,
|
||||
https://github.com/jvoorhis/coq.vim/,,
|
||||
https://github.com/ms-jpq/coq_nvim/,,
|
||||
https://github.com/lfilho/cosco.vim/,,
|
||||
https://github.com/nixprime/cpsm/,,
|
||||
https://github.com/saecki/crates.nvim/,,
|
||||
https://github.com/godlygeek/csapprox/,,
|
||||
https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/,HEAD,
|
||||
https://github.com/chrisbra/csv.vim/,,
|
||||
https://github.com/JazzCore/ctrlp-cmatcher/,,
|
||||
https://github.com/FelikZ/ctrlp-py-matcher/,,
|
||||
|
|
@ -207,6 +213,7 @@ https://github.com/andviro/flake8-vim/,,
|
|||
https://github.com/ncm2/float-preview.nvim/,,
|
||||
https://github.com/fhill2/floating.nvim/,,
|
||||
https://github.com/floobits/floobits-neovim/,,
|
||||
https://github.com/akinsho/flutter-tools.nvim/,HEAD,
|
||||
https://github.com/mhartington/formatter.nvim/,,
|
||||
https://github.com/megaannum/forms/,,
|
||||
https://github.com/rafamadriz/friendly-snippets/,,
|
||||
|
|
@ -237,6 +244,7 @@ https://github.com/roman/golden-ratio/,,
|
|||
https://github.com/buoto/gotests-vim/,,
|
||||
https://github.com/rmagatti/goto-preview/,,
|
||||
https://github.com/junegunn/goyo.vim/,,
|
||||
https://github.com/brymer-meneses/grammar-guard.nvim/,HEAD,
|
||||
https://github.com/liuchengxu/graphviz.vim/,,
|
||||
https://github.com/gruvbox-community/gruvbox/,,gruvbox-community
|
||||
https://github.com/morhetz/gruvbox/,,
|
||||
|
|
@ -451,6 +459,7 @@ https://github.com/neovim/nvimdev.nvim/,,
|
|||
https://github.com/glepnir/oceanic-material/,,
|
||||
https://github.com/mhartington/oceanic-next/,,
|
||||
https://github.com/pwntester/octo.nvim/,,
|
||||
https://github.com/Hoffs/omnisharp-extended-lsp.nvim/,HEAD,
|
||||
https://github.com/Th3Whit3Wolf/one-nvim/,,
|
||||
https://github.com/navarasu/onedark.nvim/,,
|
||||
https://github.com/joshdick/onedark.vim/,,
|
||||
|
|
@ -527,6 +536,7 @@ https://github.com/liuchengxu/space-vim/,,
|
|||
https://github.com/ctjhoa/spacevim/,,
|
||||
https://github.com/chrisgeo/sparkup/,,
|
||||
https://github.com/edluffy/specs.nvim/,,
|
||||
https://github.com/lewis6991/spellsitter.nvim/,HEAD,
|
||||
https://github.com/sjl/splice.vim/,,
|
||||
https://github.com/vimlab/split-term.vim/,,
|
||||
https://github.com/AndrewRadev/splitjoin.vim/,,
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ callPackage, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // {
|
||||
version = "5.0.2";
|
||||
version = "5.0.6";
|
||||
kde-channel = "stable";
|
||||
sha256 = "sha256-5nUfx+tQSXekiAo3brvTmVyH2tFUSGCE6COX5l1JnL8=";
|
||||
sha256 = "sha256:0qhf7vm13v33yk67n7wdcgrqpk7yvajdlkqcp7zhrl2z7qdnvmzd";
|
||||
})
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem
|
||||
, kio, kcrash, breeze-icons
|
||||
, boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib
|
||||
, openjpeg, opencolorio_1, vc, poppler, curl, ilmbase
|
||||
, openjpeg, opencolorio_1, vc, poppler, curl, ilmbase, libmypaint, libwebp
|
||||
, qtmultimedia, qtx11extras, quazip
|
||||
, python3Packages
|
||||
|
||||
|
|
@ -23,13 +23,13 @@ mkDerivation rec {
|
|||
inherit sha256;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip_4 makeWrapper ];
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ];
|
||||
|
||||
buildInputs = [
|
||||
karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons
|
||||
ki18n kitemmodels kitemviews kwindowsystem kio kcrash breeze-icons
|
||||
boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib
|
||||
openjpeg opencolorio_1 poppler curl ilmbase
|
||||
openjpeg opencolorio_1 poppler curl ilmbase libmypaint libwebp
|
||||
qtmultimedia qtx11extras quazip
|
||||
python3Packages.pyqt5
|
||||
] ++ lib.optional stdenv.hostPlatform.isx86 vc;
|
||||
|
|
@ -37,6 +37,17 @@ mkDerivation rec {
|
|||
NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ]
|
||||
++ lib.optional stdenv.cc.isGNU "-Wno-deprecated-copy";
|
||||
|
||||
# Krita runs custom python scripts in CMake with custom PYTHONPATH which krita determined in their CMake script.
|
||||
# Patch the PYTHONPATH so python scripts can import sip successfully.
|
||||
postPatch = let
|
||||
pythonPath = python3Packages.makePythonPath (with python3Packages; [ sip setuptools ]);
|
||||
in ''
|
||||
substituteInPlace cmake/modules/FindSIP.cmake \
|
||||
--replace 'PYTHONPATH=''${_sip_python_path}' 'PYTHONPATH=${pythonPath}'
|
||||
substituteInPlace cmake/modules/SIPMacros.cmake \
|
||||
--replace 'PYTHONPATH=''${_krita_python_path}' 'PYTHONPATH=${pythonPath}'
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings"
|
||||
"-DPYQT_SIP_DIR_OVERRIDE=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings"
|
||||
|
|
@ -52,7 +63,7 @@ mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "A free and open source painting application";
|
||||
homepage = "https://krita.org/";
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
maintainers = with maintainers; [ abbradar sifmelcara ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl3Only;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -15,6 +15,9 @@ mkDerivation rec {
|
|||
postInstall = lib.optionalString stdenv.isDarwin ''
|
||||
mkdir -p "$out/Applications"
|
||||
mv bin/chatterino.app "$out/Applications/"
|
||||
'' + ''
|
||||
mkdir -p $out/share/icons/hicolor/256x256/apps
|
||||
cp $src/resources/icon.png $out/share/icons/hicolor/256x256/apps/chatterino.png
|
||||
'';
|
||||
meta = with lib; {
|
||||
description = "A chat client for Twitch chat";
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "deltachat-cursed";
|
||||
version = "0.6.0";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adbenitez";
|
||||
repo = "deltachat-cursed";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qFX5CjrF0HLR41BbrCPT+rI9vAP6VLzXXAaVq/Loabs=";
|
||||
hash = "sha256-EA3yTP4j/jj26E8zdRwTIW+9FkI0ehK4Y8AqiCnF2xA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ in nodePackages.deltachat-desktop.override rec {
|
|||
postInstall = ''
|
||||
rm -r node_modules/deltachat-node/node/prebuilds
|
||||
|
||||
npm run build
|
||||
npm run build4production
|
||||
|
||||
npm prune --production
|
||||
|
||||
|
|
|
|||
|
|
@ -1,37 +0,0 @@
|
|||
{ lib, stdenv, fetchurl, atomEnv, libXScrnSaver, gtk2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "marp";
|
||||
version = "0.0.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/yhatt/marp/releases/download/v${version}/${version}-Marp-linux-x64.tar.gz";
|
||||
sha256 = "0nklzxwdx5llzfwz1hl2jpp2kwz78w4y63h5l00fh6fv6zisw6j4";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
mkdir {locales,resources}
|
||||
tar --delay-directory-restore -xf $src
|
||||
chmod u+x {locales,resources}
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib/marp $out/bin
|
||||
cp -r ./* $out/lib/marp
|
||||
ln -s $out/lib/marp/Marp $out/bin
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
--set-rpath "${atomEnv.libPath}:${lib.makeLibraryPath [ libXScrnSaver gtk2 ]}:$out/lib/marp" \
|
||||
$out/bin/Marp
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Markdown presentation writer, powered by Electron";
|
||||
homepage = "https://yhatt.github.io/marp/";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.puffnfresh ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,20 +1,20 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, buildGo118Module
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, lima
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
buildGo118Module rec {
|
||||
pname = "colima";
|
||||
version = "0.3.4";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abiosoft";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-KYW3gxf21aWnuRHkysOjArzMSNH3m3XDoi6Sic3N+Po=";
|
||||
sha256 = "sha256-66nKH5jxTzLB9bg2lH1E8Cc0GZ6C/N/+yPYhCVEKOBY=";
|
||||
|
||||
# We need the git revision
|
||||
leaveDotGit = true;
|
||||
|
|
@ -26,7 +26,9 @@ buildGoModule rec {
|
|||
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||
|
||||
vendorSha256 = "sha256-Z4+qwoX04VnLsUIYRfOowFLgcaA9w8oGRl77jzFigIc=";
|
||||
vendorSha256 = "sha256-91Ex3RPWxOHyZcR3Bo+bRdDAFw2mEGiC/uNKjdX2kuw=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
preConfigure = ''
|
||||
ldflags="-X github.com/abiosoft/colima/config.appVersion=${version}
|
||||
|
|
|
|||
|
|
@ -1,15 +1,9 @@
|
|||
{ lib
|
||||
, buildGoPackage
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
}:
|
||||
{ lib, buildGoModule, fetchFromGitHub, makeWrapper }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "docker-slim";
|
||||
version = "1.37.6";
|
||||
|
||||
goPackagePath = "github.com/docker-slim/docker-slim";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker-slim";
|
||||
repo = "docker-slim";
|
||||
|
|
@ -17,16 +11,17 @@ buildGoPackage rec {
|
|||
sha256 = "sha256-Jzi6JC6DRklZhNqmFx6eHx6qR8/fb/JuSpgwtPThcc4=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
"-X ${goPackagePath}/pkg/version.appVersionTag=${version}"
|
||||
"-X ${goPackagePath}/pkg/version.appVersionRev=${src.rev}"
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/docker-slim/docker-slim/pkg/version.appVersionTag=${version}"
|
||||
"-X github.com/docker-slim/docker-slim/pkg/version.appVersionRev=${src.rev}"
|
||||
];
|
||||
|
||||
# docker-slim tries to create its state dir next to the binary (inside the nix
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "btops";
|
||||
version = "0.1.0";
|
||||
|
||||
goPackagePath = "github.com/cmschuetz/btops";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cmschuetz";
|
||||
repo = "btops";
|
||||
rev = version;
|
||||
sha256 = "sha256-eE28PGfpmmhcyeSy3PICebAs+cHAZXPxT+S/4+9ukcY=";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
meta = with lib; {
|
||||
description = "bspwm desktop management that supports dymanic appending, removing, and renaming";
|
||||
homepage = "https://github.com/cmschuetz/btops";
|
||||
maintainers = with maintainers; [ mnacamura ];
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
120
pkgs/applications/window-managers/btops/deps.nix
generated
120
pkgs/applications/window-managers/btops/deps.nix
generated
|
|
@ -1,120 +0,0 @@
|
|||
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/fsnotify/fsnotify";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/fsnotify/fsnotify";
|
||||
rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9";
|
||||
sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/hashicorp/hcl";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/hashicorp/hcl";
|
||||
rev = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168";
|
||||
sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/magiconair/properties";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/magiconair/properties";
|
||||
rev = "c2353362d570a7bfa228149c62842019201cfb71";
|
||||
sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/mitchellh/mapstructure";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mitchellh/mapstructure";
|
||||
rev = "bb74f1db0675b241733089d5a1faa5dd8b0ef57b";
|
||||
sha256 = "1aqk9qr46bwgdc5j7n7als61xvssvyjf4qzfsvhacl4izpygqnw7";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/pelletier/go-toml";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/pelletier/go-toml";
|
||||
rev = "66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12";
|
||||
sha256 = "1n8na0yg90gm0rpifmzrby5r385vvd62cdam3ls7ssy02bjvfw15";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/spf13/afero";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/spf13/afero";
|
||||
rev = "63644898a8da0bc22138abf860edaf5277b6102e";
|
||||
sha256 = "13piahaq4vw1y1sklq5scrsflqx0a8hzmdqfz1fy4871kf2gl8qw";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/spf13/cast";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/spf13/cast";
|
||||
rev = "8965335b8c7107321228e3e3702cab9832751bac";
|
||||
sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/spf13/jwalterweatherman";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/spf13/jwalterweatherman";
|
||||
rev = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394";
|
||||
sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/spf13/pflag";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/spf13/pflag";
|
||||
rev = "583c0c0531f06d5278b7d917446061adc344b5cd";
|
||||
sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/spf13/viper";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/spf13/viper";
|
||||
rev = "15738813a09db5c8e5b60a19d67d3f9bd38da3a4";
|
||||
sha256 = "1mjfzg8zvnxckaq6l8gw99i2msrfqn9yr04dc3b7kd5bpxi6zr4v";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/sys";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/sys";
|
||||
rev = "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b";
|
||||
sha256 = "03fhkng37rczqwfgah5hd7d373jps3hcfx79dmky2fh62yvpcyn3";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/text";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/text";
|
||||
rev = "5c1cf69b5978e5a34c5f9ba09a83e56acc4b7877";
|
||||
sha256 = "03br8p1sb1ffr02l8hyrgcyib7ms0z06wy3v4r1dj2l6q4ghwzfs";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "gopkg.in/yaml.v2";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://gopkg.in/yaml.v2";
|
||||
rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
|
||||
sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
|
@ -1,12 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, appstream
|
||||
, desktop-file-utils
|
||||
, gettext
|
||||
, libxml2
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
|
@ -24,29 +19,16 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-camera";
|
||||
version = "6.0.3";
|
||||
version = "6.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "camera";
|
||||
rev = version;
|
||||
sha256 = "sha256-xIv+mOlZV58XD0Z6Vc2wA1EQUxT5BaQ0zhYc9v+ne1w=";
|
||||
sha256 = "sha256-uccH9rCZaifIlLDx+zat3Zx8ecgKo2M6x+mg7AnuFBs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with meson 0.61
|
||||
# https://github.com/elementary/camera/pull/216
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/camera/commit/ead143b7e3246c5fa9bb37c95d491fb07cea9e04.patch";
|
||||
sha256 = "sha256-2zGigUi6DpjJx8SEvAE3Q3jrm7MggOvLc72lAPMPvs4=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream
|
||||
desktop-file-utils
|
||||
gettext
|
||||
libxml2
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -92,7 +92,10 @@ in makePackage {
|
|||
'';
|
||||
|
||||
# glib-2.62 deprecations
|
||||
NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
|
||||
# -fcommon: gstreamer workaround for -fno-common toolchains:
|
||||
# ld: gsttypefindelement.o:(.bss._gst_disable_registry_cache+0x0): multiple definition of
|
||||
# `_gst_disable_registry_cache'; gst.o:(.bss._gst_disable_registry_cache+0x0): first defined here
|
||||
NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS -fcommon";
|
||||
|
||||
stripDebugList = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -31,8 +31,15 @@ let
|
|||
JDK_HOME = ${openjdk11_headless.home}
|
||||
'' + args.gradleProperties or "");
|
||||
|
||||
#avoids errors about deprecation of GTypeDebugFlags, GTimeVal, etc.
|
||||
NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
#avoids errors about deprecation of GTypeDebugFlags, GTimeVal, etc.
|
||||
"-DGLIB_DISABLE_DEPRECATION_WARNINGS"
|
||||
|
||||
# gstreamer workaround for -fno-common toolchains:
|
||||
# ld: gsttypefindelement.o:(.bss._gst_disable_registry_cache+0x0): multiple definition of
|
||||
# `_gst_disable_registry_cache'; gst.o:(.bss._gst_disable_registry_cache+0x0): first defined here
|
||||
"-fcommon"
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
|
@ -89,7 +96,10 @@ in makePackage {
|
|||
'';
|
||||
|
||||
# glib-2.62 deprecations
|
||||
NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
|
||||
# -fcommon: gstreamer workaround for -fno-common toolchains:
|
||||
# ld: gsttypefindelement.o:(.bss._gst_disable_registry_cache+0x0): multiple definition of
|
||||
# `_gst_disable_registry_cache'; gst.o:(.bss._gst_disable_registry_cache+0x0): first defined here
|
||||
NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS -fcommon";
|
||||
|
||||
stripDebugList = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdeltachat";
|
||||
version = "1.84.0";
|
||||
version = "1.85.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-core-rust";
|
||||
rev = version;
|
||||
hash = "sha256-ZG3siulXVHTbdSd9tmenljFODZ3LWX+BXn6OJfrbEYA=";
|
||||
hash = "sha256-bgx1j2ESAv9cRe3Iv6nYOS7bUAQcXj3Ta4rAC800Nf8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
|||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-vQ+A4dEWh5+BgWOdxd7GTPuHk6M6bHgGnZcWNwR/Urs=";
|
||||
hash = "sha256-7ZdN/7CKFuFOIReM7BkMsO/E2lPyDnl4ssPhK5BPLh8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -116,13 +116,6 @@ qtModule rec {
|
|||
patchShebangs .
|
||||
)
|
||||
|
||||
# Patch library paths in sources
|
||||
sed -i \
|
||||
-e "s,QLibraryInfo::location(QLibraryInfo::DataPath),QLatin1String(\"$out\"),g" \
|
||||
-e "s,QLibraryInfo::location(QLibraryInfo::TranslationsPath),QLatin1String(\"$out/translations\"),g" \
|
||||
-e "s,QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath),QLatin1String(\"$out/libexec\"),g" \
|
||||
src/core/web_engine_library_info.cpp
|
||||
|
||||
sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \
|
||||
src/3rdparty/chromium/device/udev_linux/udev?_loader.cc
|
||||
|
||||
|
|
@ -132,9 +125,11 @@ qtModule rec {
|
|||
substituteInPlace src/3rdparty/chromium/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc \
|
||||
--replace "/usr/share/X11/xkb" "${xkeyboard_config}/share/X11/xkb"
|
||||
|
||||
# Patch library paths in sources
|
||||
substituteInPlace src/core/web_engine_library_info.cpp \
|
||||
--replace "QLibraryInfo::path(QLibraryInfo::DataPath)" "\"$out\"" \
|
||||
--replace "QLibraryInfo::path(QLibraryInfo::TranslationsPath)" "\"$out/translations\""
|
||||
--replace "QLibraryInfo::path(QLibraryInfo::TranslationsPath)" "\"$out/translations\"" \
|
||||
--replace "QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)" "\"$out/libexec\""
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
@ -232,6 +227,12 @@ qtModule rec {
|
|||
|
||||
requiredSystemFeatures = [ "big-parallel" ];
|
||||
|
||||
postInstall = ''
|
||||
# This is required at runtime
|
||||
mkdir $out/libexec
|
||||
mv $dev/libexec/QtWebEngineProcess $out/libexec
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64);
|
||||
description = "A web engine based on the Chromium web browser";
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aws-adfs";
|
||||
version = "2.0.5";
|
||||
version = "2.2.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = "venth";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-OBxKJN14CuWSq88KxSttpK/Paj2sBHrBVMyP+oPkHys=";
|
||||
hash = "sha256-REJYuOGq22onMj4WcfA7i4/cG99UGZA9D99ESIKY1A8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "meross-iot";
|
||||
version = "0.4.4.4";
|
||||
version = "0.4.4.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -19,8 +19,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "albertogeniola";
|
||||
repo = "MerossIot";
|
||||
rev = version;
|
||||
sha256 = "sha256-bazAhCsxr8UNV51UnaGbP7kTC6mcDNM7N78f0jy26ew=";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-PBf8uHEeHXoYZcFD9KCWg1I5QRAILjVMl3oglWsEsag=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
, buildPythonPackage
|
||||
, coloredlogs
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, ghostscript
|
||||
, img2pdf
|
||||
, importlib-metadata
|
||||
|
|
@ -28,7 +27,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ocrmypdf";
|
||||
version = "13.4.6";
|
||||
version = "13.4.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocrmypdf";
|
||||
|
|
@ -40,7 +39,7 @@ buildPythonPackage rec {
|
|||
postFetch = ''
|
||||
rm "$out/.git_archival.txt"
|
||||
'';
|
||||
hash = "sha256-Hd9vsw+UEpE7juYSCiHhXtxaC58OtS/Uy20Jdp6QXPA=";
|
||||
hash = "sha256-jCfMCjh8MdH5K76iyJCgtkgPtpxnCxlXlzttTIzINPk=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
@ -54,11 +53,6 @@ buildPythonPackage rec {
|
|||
tesseract = "${lib.getBin tesseract4}/bin/tesseract";
|
||||
unpaper = "${lib.getBin unpaper}/bin/unpaper";
|
||||
})
|
||||
# https://github.com/ocrmypdf/OCRmyPDF/pull/973
|
||||
(fetchpatch {
|
||||
url = "https://github.com/ocrmypdf/OCRmyPDF/commit/808b24d59f5b541a335006aa6ea7cdc3c991adc0.patch";
|
||||
hash = "sha256-khsH70fWk5fStf94wcRKKX7cCbgD69LtKkngJIqA3+w=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pypck";
|
||||
version = "0.7.14";
|
||||
version = "0.7.15";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "alengwenus";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-v8eCCbSnAmJUmHSNS+lz8JRhDFrqyxgAkgcZ2bzfOTg=";
|
||||
hash = "sha256-OuM/r9rxIl4niY87cEcbZ73x2ZIQbaPZqbMrQ7hZE/g=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -30,6 +30,13 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
postInstall = ''
|
||||
installManPage texlab.1
|
||||
|
||||
# Remove generated dylib of human_name dependency. TexLab statically
|
||||
# links to the generated rlib and doesn't reference the dylib. I
|
||||
# couldn't find any way to prevent building this by passing cargo flags.
|
||||
# See https://github.com/djudd/human-name/blob/master/Cargo.toml#L43
|
||||
rm "$out/lib/libhuman_name${stdenv.hostPlatform.extensions.sharedLibrary}"
|
||||
rmdir "$out/lib"
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
let
|
||||
# having the full version string here makes it easier to update
|
||||
modDirVersion = "5.18.0-zen1";
|
||||
modDirVersion = "5.18.1-zen1";
|
||||
parts = lib.splitString "-" modDirVersion;
|
||||
version = lib.elemAt parts 0;
|
||||
suffix = lib.elemAt parts 1;
|
||||
|
|
@ -20,11 +20,14 @@ buildLinux (args // {
|
|||
owner = "zen-kernel";
|
||||
repo = "zen-kernel";
|
||||
inherit rev;
|
||||
sha256 = "sha256-A0QrY1REbRODnHtmyNqVaiLhDgYCECevfHZCxtoQ9kU=";
|
||||
sha256 = "sha256-LCLfLE85NifuskYl2dxLOJEsUNHLegF8ecYyU4xOCtY=";
|
||||
};
|
||||
|
||||
structuredExtraConfig = with lib.kernel; {
|
||||
ZEN_INTERACTIVE = yes;
|
||||
# TODO: Remove once #175433 reaches master
|
||||
# https://nixpk.gs/pr-tracker.html?pr=175433
|
||||
WERROR = no;
|
||||
};
|
||||
|
||||
extraMeta = {
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildDotnetModule rec {
|
||||
pname = "discordchatexporter-cli";
|
||||
version = "2.34";
|
||||
version = "2.34.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tyrrrz";
|
||||
repo = "discordchatexporter";
|
||||
rev = version;
|
||||
sha256 = "EHpnLUFHR+FC1qlwW0TuLas9aA/CMELHkzbLlNyiwgE=";
|
||||
sha256 = "U+AwxHvyLD2BwrJH3h0yKKHBsgBM/D657TuG9IgllPs=";
|
||||
};
|
||||
|
||||
projectFile = "DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ fetchNuGet }: [
|
||||
(fetchNuGet { pname = "CliFx"; version = "2.2.2"; sha256 = "13g5xlrbyhnbwkyzic5jlhxl0kpvkfrdmb5h2rdf9yp4gp5p9mwg"; })
|
||||
(fetchNuGet { pname = "CliFx"; version = "2.2.5"; sha256 = "1bk716rdswy28h53qy68xywci8k1h2iqdy2iz1yf7v8g0sa2n79p"; })
|
||||
(fetchNuGet { pname = "Gress"; version = "2.0.1"; sha256 = "00xhyfkrlc38nbl6aymr7zwxc3kj0rxvx5gwk6fkfrvi1pzgq0wc"; })
|
||||
(fetchNuGet { pname = "JsonExtensions"; version = "1.2.0"; sha256 = "0g54hibabbqqfhxjlnxwv1rxagpali5agvnpymp2w3dk8h6q66xy"; })
|
||||
(fetchNuGet { pname = "MiniRazor.CodeGen"; version = "2.2.1"; sha256 = "1mrjw3vq59pbiqvayilazjgv6l87j20j8hmhcpbacz9p5bl1hvvr"; })
|
||||
|
|
|
|||
|
|
@ -6,17 +6,17 @@
|
|||
|
||||
buildGoModule {
|
||||
pname = "goofys";
|
||||
version = "unstable-2021-03-26";
|
||||
version = "unstable-2022-04-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kahing";
|
||||
repo = "goofys";
|
||||
# Same as v0.24.0 but migrated to Go modules
|
||||
rev = "0c993271269b539196330a18716a33fbeeebd624";
|
||||
sha256 = "18is5sv2a9wmsm0qpakly988z1qyl2b2hf2105lpxrgl659sf14p";
|
||||
rev = "829d8e5ce20faa3f9f6f054077a14325e00e9249";
|
||||
sha256 = "sha256-6yVMNSwwPZlADXuPBDRlgoz4Stuz2pgv6r6+y2/C8XY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "15yq0msh9icxd5n2zkkqrlwxifizhpa99d4aznv8clg32ybs61fj";
|
||||
vendorSha256 = "sha256-2N8MshBo9+2q8K00eTW5So6d8ZNRzOfQkEKmxR428gI=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
@ -30,8 +30,7 @@ buildGoModule {
|
|||
description = "A high-performance, POSIX-ish Amazon S3 file system written in Go.";
|
||||
license = [ lib.licenses.mit ];
|
||||
maintainers = [ lib.maintainers.adisbladis ];
|
||||
# does not build with go 1.17
|
||||
broken = true;
|
||||
broken = stdenv.isDarwin; # needs to update gopsutil to at least v3.21.3 to include https://github.com/shirou/gopsutil/pull/1042
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -59,19 +59,23 @@ stdenv.mkDerivation rec {
|
|||
makeWrapper
|
||||
];
|
||||
buildInputs = [
|
||||
luaEnv
|
||||
harfbuzz
|
||||
icu
|
||||
fontconfig
|
||||
libiconv
|
||||
luaEnv
|
||||
]
|
||||
++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.AppKit
|
||||
;
|
||||
checkInputs = [
|
||||
poppler_utils
|
||||
];
|
||||
passthru = {
|
||||
# So it will be easier to inspect this environment, in comparison to others
|
||||
inherit luaEnv;
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
postPatch = ''
|
||||
patchShebangs build-aux/*.sh
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
sed -i -e 's|@import AppKit;|#import <AppKit/AppKit.h>|' src/macfonts.m
|
||||
|
|
|
|||
|
|
@ -128,6 +128,7 @@ mapAliases ({
|
|||
brackets = throw "brackets has been removed, it was unmaintained and had open vulnerabilities"; # Added 2021-01-24
|
||||
bridge_utils = throw "'bridge_utils' has been renamed to/replaced by 'bridge-utils'"; # Converted to throw 2022-02-22
|
||||
bro = zeek; # Added 2019-09-29
|
||||
btops = throw "btops has been dropped due to the lack of maintenance from upstream since 2017"; # Added 2022-06-02
|
||||
btrfsProgs = throw "'btrfsProgs' has been renamed to/replaced by 'btrfs-progs'"; # Converted to throw 2022-02-22
|
||||
bud = throw "bud has been removed: abandoned by upstream"; # Added 2022-03-14
|
||||
inherit (libsForQt5.mauiPackages) buho; # added 2022-05-17
|
||||
|
|
@ -826,6 +827,7 @@ mapAliases ({
|
|||
manpages = throw "'manpages' has been renamed to/replaced by 'man-pages'"; # Converted to throw 2022-02-22
|
||||
marathon = throw "marathon has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15
|
||||
mariadb-client = hiPrio mariadb.client; #added 2019.07.28
|
||||
marp = throw "marp has been removed from nixpkgs, as it's unmaintained and has security issues"; # Added 2022-06-04
|
||||
matcha = throw "matcha was renamed to matcha-gtk-theme"; # added 2020-05-09
|
||||
mathics = throw "mathics has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15
|
||||
matrique = spectral; # Added 2020-01-27
|
||||
|
|
|
|||
|
|
@ -25498,8 +25498,6 @@ with pkgs;
|
|||
|
||||
bspwm = callPackage ../applications/window-managers/bspwm { };
|
||||
|
||||
btops = callPackage ../applications/window-managers/btops { };
|
||||
|
||||
bvi = callPackage ../applications/editors/bvi { };
|
||||
|
||||
bviplus = callPackage ../applications/editors/bviplus { };
|
||||
|
|
@ -28015,8 +28013,6 @@ with pkgs;
|
|||
electron = electron_9;
|
||||
};
|
||||
|
||||
marp = callPackage ../applications/office/marp { };
|
||||
|
||||
magnetico = callPackage ../applications/networking/p2p/magnetico { };
|
||||
|
||||
mastodon-bot = nodePackages.mastodon-bot;
|
||||
|
|
|
|||
Loading…
Reference in a new issue