Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
69a9c90876
44 changed files with 231 additions and 146 deletions
|
|
@ -1358,6 +1358,13 @@ Superuser created successfully.
|
|||
<literal>services.ddclient.passwordFile</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The default GNAT version has been changed: The
|
||||
<literal>gnat</literal> attribute now points to
|
||||
<literal>gnat11</literal> instead of <literal>gnat9</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
<section xml:id="sec-release-21.11-notable-changes">
|
||||
|
|
|
|||
|
|
@ -404,6 +404,9 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- The `services.ddclient.password` option was removed, and replaced with `services.ddclient.passwordFile`.
|
||||
|
||||
- The default GNAT version has been changed: The `gnat` attribute now points to `gnat11`
|
||||
instead of `gnat9`.
|
||||
|
||||
## Other Notable Changes {#sec-release-21.11-notable-changes}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ rec {
|
|||
# Check whenever fileSystem is needed for boot. NOTE: Make sure
|
||||
# pathsNeededForBoot is closed under the parent relationship, i.e. if /a/b/c
|
||||
# is in the list, put /a and /a/b in as well.
|
||||
pathsNeededForBoot = [ "/" "/nix" "/nix/store" "/var" "/var/log" "/var/lib" "/var/lib/nixos" "/etc" ];
|
||||
pathsNeededForBoot = [ "/" "/nix" "/nix/store" "/var" "/var/log" "/var/lib" "/var/lib/nixos" "/etc" "/usr" ];
|
||||
fsNeededForBoot = fs: fs.neededForBoot || elem fs.mountPoint pathsNeededForBoot;
|
||||
|
||||
# Check whenever `b` depends on `a` as a fileSystem
|
||||
|
|
|
|||
|
|
@ -569,6 +569,16 @@ in {
|
|||
these sections offer more flexibility.
|
||||
'';
|
||||
|
||||
ca_id = mkOptionalStrParam ''
|
||||
Identity in CA certificate to accept for authentication. The specified
|
||||
identity must be contained in one (intermediate) CA of the remote peer
|
||||
trustchain, either as subject or as subjectAltName. This has the same
|
||||
effect as specifying <literal>cacerts</literal> to force clients under
|
||||
a CA to specific connections; it does not require the CA certificate
|
||||
to be available locally, and can be received from the peer during the
|
||||
IKE exchange.
|
||||
'';
|
||||
|
||||
cacerts = mkCommaSepListParam [] ''
|
||||
List of CA certificates to accept for
|
||||
authentication. The certificates may use a relative path from the
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
let
|
||||
pname = "ledger-live-desktop";
|
||||
version = "2.34.4";
|
||||
version = "2.35.0";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage";
|
||||
sha256 = "00zl7ywmkbhwzkj7p618rin5pd0ix8cas5q1b8ka6ynw4wlg3w5c";
|
||||
hash = "sha256-o2XGBTqyHqQ/yq54B0GBFEk35Zxt2ZWGZCTjbEbKqiw=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
|
|
|||
|
|
@ -36,14 +36,16 @@ self: let
|
|||
inherit (self) emacs;
|
||||
};
|
||||
|
||||
# Use custom elpa url fetcher with fallback/uncompress
|
||||
fetchurl = buildPackages.callPackage ./fetchelpa.nix { };
|
||||
|
||||
generateElpa = lib.makeOverridable ({
|
||||
generated ? ./elpa-generated.nix
|
||||
}: let
|
||||
|
||||
imported = import generated {
|
||||
callPackage = pkgs: args: self.callPackage pkgs (args // {
|
||||
# Use custom elpa url fetcher with fallback/uncompress
|
||||
fetchurl = buildPackages.callPackage ./fetchelpa.nix { };
|
||||
inherit fetchurl;
|
||||
});
|
||||
};
|
||||
|
||||
|
|
@ -69,12 +71,7 @@ self: let
|
|||
dontUnpack = false;
|
||||
srcs = [
|
||||
super.ada-mode.src
|
||||
# ada-mode needs a specific version of wisi, check NEWS or ada-mode's
|
||||
# package-requires to find the version to use.
|
||||
(pkgs.fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/wisi-3.1.3.tar.lz";
|
||||
sha256 = "18dwcc0crds7aw466vslqicidlzamf8avn59gqi2g7y2x9k5q0as";
|
||||
})
|
||||
self.wisi.src
|
||||
];
|
||||
|
||||
sourceRoot = "ada-mode-${self.ada-mode.version}";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "bluetooth_battery";
|
||||
version = "1.2.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TheWeirdDev";
|
||||
repo = "Bluetooth_Headset_Battery_Level";
|
||||
rev = "v${version}";
|
||||
sha256 = "121pkaq9z8p2i35cqs32aygjvf82r961w0axirpmsrbmrwq2hh6g";
|
||||
sha256 = "067qfxh228cy1x95bnjp88dx4k00ajj7ay7fz5vr1gkj2yfa203s";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pybluez ];
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pdfarranger";
|
||||
version = "1.7.1";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1c2mafnz8pv32wzkc2wx4q8y2x7xffpn6ag12dj7ga5n772fb6s3";
|
||||
sha256 = "0xfxcwb24rp0kni2b4wdk6fvhqnhd6fh559ag6wdr4sspzkqwdjf";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libX11 ];
|
||||
|
||||
makeFlags = [ "CC:=$(CC)" ];
|
||||
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -9,9 +9,15 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "559ad188b2913167dcbb37ecfbb7ed474a7ec4bbcb0129d8d5d08cb9208d02c5";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile --replace "@strip" "#@strip"
|
||||
'';
|
||||
|
||||
buildInputs = [ libX11 ];
|
||||
|
||||
preConfigure = ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'';
|
||||
makeFlags = [ "CC:=$(CC)" ];
|
||||
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = {
|
||||
description = "Prints or set the window manager name property of the root window";
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
{
|
||||
"stable": {
|
||||
"version": "95.0.4638.69",
|
||||
"sha256": "1rzg48mbd5n75nq2rfwknyxpmfrddds199ic82c736kcgirpv8rq",
|
||||
"sha256bin64": "1jhxm12sdlgvgnny0p56xsfyxd78mwn9qwc20c33qfvwxrzp9ajp",
|
||||
"version": "96.0.4664.45",
|
||||
"sha256": "01q4fsf2cbx6g9nnaihvc5jj3ap8jq2gf16pnhf7ixzbhgcnm328",
|
||||
"sha256bin64": "0546i4yd1jahv088hjxpq0jc393pscvl5ap3s2qw5jrybliyfd2g",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-08-11",
|
||||
"version": "2021-09-24",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "69ec4fca1fa69ddadae13f9e6b7507efa0675263",
|
||||
"sha256": "031znmkbm504iim5jvg3gmazj4qnkfc7zg8aymjsij18fhf7piz0"
|
||||
"rev": "0153d369bbccc908f4da4993b1ba82728055926a",
|
||||
"sha256": "0y4414h8jqsbz5af6pn91c0vkfp4s281s85g992xfyl785c5zbsi"
|
||||
}
|
||||
},
|
||||
"chromedriver": {
|
||||
"version": "95.0.4638.54",
|
||||
"sha256_linux": "0p228x7w423p3zqwfdba2jj4x4gkxz4267qzzswpba335p3k1nyk",
|
||||
"sha256_darwin": "1yxi8c18fa07w8kdm63v4663lhgx1y56957bkqb7hf459bzz594l"
|
||||
"version": "96.0.4664.35",
|
||||
"sha256_linux": "0iq129a4mj4sjs08s68n82wd8563sw8196xda27wk3pfpprr23db",
|
||||
"sha256_darwin": "1prc7zbgnljqz2d89clpk5c0y48r79zmb9in4vinf3j6p2rxn0vy"
|
||||
}
|
||||
},
|
||||
"beta": {
|
||||
|
|
|
|||
|
|
@ -9,9 +9,9 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1lk8vjl7i8dcjh4jkg8h8bkapcbs465sy8g9c0chfqsywbmf3ndr";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
make install PREFIX=$out
|
||||
'';
|
||||
makeFlags = [ "CC:=$(CC)" ];
|
||||
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://tools.suckless.org/ii/";
|
||||
|
|
|
|||
|
|
@ -4,12 +4,15 @@ stdenv.mkDerivation rec {
|
|||
pname = "sic";
|
||||
version = "1.2";
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
src = fetchurl {
|
||||
url = "https://dl.suckless.org/tools/sic-${version}.tar.gz";
|
||||
sha256 = "ac07f905995e13ba2c43912d7a035fbbe78a628d7ba1c256f4ca1372fb565185";
|
||||
};
|
||||
|
||||
makeFlags = [ "CC:=$(CC)" ];
|
||||
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = {
|
||||
description = "Simple IRC client";
|
||||
homepage = "https://tools.suckless.org/sic/";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,31 @@
|
|||
{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, libretro, mgba }:
|
||||
|
||||
buildKodiBinaryAddon rec {
|
||||
pname = "kodi-libretro-mgba";
|
||||
namespace = "game.libretro.mgba";
|
||||
version = "0.9.2.31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kodi-game";
|
||||
repo = "game.libretro.mgba";
|
||||
rev = "${version}-${rel}";
|
||||
sha256 = "sha256-eZLuNhLwMTtzpLGkymc9cLC83FQJWZ2ZT0iyz4sY4EA=";
|
||||
};
|
||||
|
||||
extraCMakeFlags = [
|
||||
"-DMGBA_LIB=${mgba}/lib/retroarch/cores/mgba_libretro.so"
|
||||
];
|
||||
|
||||
extraBuildInputs = [ mgba ];
|
||||
propagatedBuildInputs = [
|
||||
libretro
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/kodi-game/game.libretro.mgba";
|
||||
description = "mGBA for Kodi";
|
||||
platforms = platforms.all;
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = teams.kodi.members;
|
||||
};
|
||||
}
|
||||
|
|
@ -66,6 +66,7 @@ let
|
|||
"asound.conf"
|
||||
# SSL
|
||||
"ssl/certs"
|
||||
"ca-certificates"
|
||||
"pki"
|
||||
];
|
||||
in concatStringsSep "\n "
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchFromGitHub, callPackage, gnat, zlib, llvm, lib
|
||||
{ stdenv, fetchFromGitHub, fetchpatch, callPackage, gnat, zlib, llvm, lib
|
||||
, backend ? "mcode" }:
|
||||
|
||||
assert backend == "mcode" || backend == "llvm";
|
||||
|
|
@ -14,6 +14,15 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1gyh0xckwbzgslbpw9yrpj4gqs9fm1a2qpbzl0sh143fk1kwjlly";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Allow compilation with GNAT 11, picked from master
|
||||
(fetchpatch {
|
||||
name = "fix-gnat-11-compilation.patch";
|
||||
url = "https://github.com/ghdl/ghdl/commit/8356ea3bb4e8d0e5ad8638c3d50914b64fc360ec.patch";
|
||||
sha256 = "04pzn8g7xha8000wbjjmry6h1grfqyn3bjvj47hi4qwgl21wfjra";
|
||||
})
|
||||
];
|
||||
|
||||
LIBRARY_PATH = "${stdenv.cc.libc}/lib";
|
||||
|
||||
buildInputs = [ gnat zlib ] ++ lib.optional (backend == "llvm") [ llvm ];
|
||||
|
|
|
|||
|
|
@ -46,7 +46,8 @@ in stdenv.mkDerivation (rec {
|
|||
buildInputs = [ libxml2 libffi ]
|
||||
++ optional enablePFM libpfm; # exegesis
|
||||
|
||||
propagatedBuildInputs = [ ncurses zlib ];
|
||||
propagatedBuildInputs = optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ ncurses ]
|
||||
++ [ zlib ];
|
||||
|
||||
checkInputs = [ which ];
|
||||
|
||||
|
|
|
|||
|
|
@ -52,8 +52,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
mkdir -p $out/bin/
|
||||
cp BQN -t $out/bin/
|
||||
ln -s $out/bin/BQN $out/bin/bqn
|
||||
ln -s $out/bin/BQN $out/bin/cbqn
|
||||
# note guard condition for case-insensitive filesystems
|
||||
[ -e $out/bin/bqn ] || ln -s $out/bin/BQN $out/bin/bqn
|
||||
[ -e $out/bin/cbqn ] || ln -s $out/bin/BQN $out/bin/cbqn
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -33,13 +33,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnatcoll-${component}";
|
||||
version = "21.0.0";
|
||||
version = "22.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AdaCore";
|
||||
repo = "gnatcoll-bindings";
|
||||
rev = "v${version}";
|
||||
sha256 = "1214hf0m8iz289rjpxdiddnixj65l2xjwbcr7mq5ysbddmig5992";
|
||||
sha256 = "0wbwnd6jccwfd4jdxbnzhc0jhm8ad4phz6y9b1gk8adykkk6jcz4";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -68,13 +68,13 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
python3 ${component}/setup.py build $buildFlags
|
||||
${python3.interpreter} ${component}/setup.py build --prefix $out $buildFlags
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
python3 ${component}/setup.py install --prefix $out
|
||||
${python3.interpreter} ${component}/setup.py install --prefix $out
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnatcoll-core";
|
||||
version = "21.0.0";
|
||||
version = "22.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AdaCore";
|
||||
repo = "gnatcoll-core";
|
||||
rev = "v${version}";
|
||||
sha256 = "0jgs2299zfbr6jg5bxlhqizi60si2m8vw7zq6ns4yhr38qqdskqg";
|
||||
sha256 = "0fn28dp6bgpp1sshr09m1x85g2gx11xqkiy410hiicfyg5hamh1l";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -51,13 +51,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnatcoll-${component}";
|
||||
version = "21.0.0";
|
||||
version = "22.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AdaCore";
|
||||
repo = "gnatcoll-db";
|
||||
rev = "v${version}";
|
||||
sha256 = "0fdfng3yfy645nlw8l3c2za0zkn6pdhkvyrw20wnjx4k26glgb6r";
|
||||
sha256 = "1c39yg13faadg5mzpq3s83rn24npmpc4yjj0cvj7kqwpqxci4m55";
|
||||
};
|
||||
|
||||
patches = lib.optionals (component == "sqlite") [
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xmlada";
|
||||
version = "21.0.0";
|
||||
version = "22.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "xmlada-${version}-src";
|
||||
owner = "AdaCore";
|
||||
repo = "xmlada";
|
||||
rev = "v${version}";
|
||||
sha256 = "00vljkvck951nj853v9sda5qbfm1mp8y2k61ja2595rmp8qcrazw";
|
||||
sha256 = "1pg6m0sfc1vwvd18r80jv2vwrsb2qgvyl8jmmrmpbdni0npx0kv3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ libpng libjpeg ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
makeFlags = [ "CC:=$(CC)" ];
|
||||
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/2ff" --prefix PATH : "${file}/bin"
|
||||
|
|
|
|||
|
|
@ -1,39 +1,54 @@
|
|||
{ stdenv, lib, fetchFromGitea, pkg-config, meson, ninja, scdoc
|
||||
, freetype, fontconfig, pixman, tllist, check
|
||||
, withHarfBuzz ? true
|
||||
, harfbuzz
|
||||
# Text shaping methods to enable, empty list disables all text shaping.
|
||||
# See `availableShapingTypes` or upstream meson_options.txt for available types.
|
||||
, withShapingTypes ? [ "grapheme" "run" ]
|
||||
, harfbuzz, utf8proc
|
||||
, fcft # for passthru.tests
|
||||
}:
|
||||
|
||||
let
|
||||
# Needs to be reflect upstream meson_options.txt
|
||||
availableShapingTypes = [
|
||||
"grapheme"
|
||||
"run"
|
||||
];
|
||||
|
||||
# Courtesy of sternenseemann and FRidh, commit c9a7fdfcfb420be8e0179214d0d91a34f5974c54
|
||||
mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcft";
|
||||
version = "2.4.5";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "dnkl";
|
||||
repo = "fcft";
|
||||
rev = version;
|
||||
sha256 = "0z4bqap88pydkgcxrsvm3fmcyhi9x7z8knliarvdcvqlk7qnyzfh";
|
||||
sha256 = "0agqldh68hn898d3f6k99kjbz8had5j5k0jyvi71d4k9vhx8cy7c";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
nativeBuildInputs = [ pkg-config meson ninja scdoc ];
|
||||
buildInputs = [ freetype fontconfig pixman tllist ]
|
||||
++ lib.optional withHarfBuzz harfbuzz;
|
||||
++ lib.optionals (withShapingTypes != []) [ harfbuzz ]
|
||||
++ lib.optionals (builtins.elem "run" withShapingTypes) [ utf8proc ];
|
||||
checkInputs = [ check ];
|
||||
|
||||
mesonBuildType = "release";
|
||||
mesonFlags = [
|
||||
(mesonFeatureFlag "text-shaping" withHarfBuzz)
|
||||
];
|
||||
mesonFlags = builtins.map (t:
|
||||
mesonFeatureFlag "${t}-shaping" (lib.elem t withShapingTypes)
|
||||
) availableShapingTypes;
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru.tests = {
|
||||
noShaping = fcft.override { withShapingTypes = []; };
|
||||
onlyGraphemeShaping = fcft.override { withShapingTypes = [ "grapheme" ]; };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://codeberg.org/dnkl/fcft";
|
||||
changelog = "https://codeberg.org/dnkl/fcft/releases/tag/${version}";
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gtk4";
|
||||
version = "4.4.0";
|
||||
version = "4.4.1";
|
||||
|
||||
outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ];
|
||||
outputBin = "dev";
|
||||
|
|
@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz";
|
||||
sha256 = "4KFQj0QWhsOiDf7EivUzsZpLLgF8GOruMdzNt9KSUFs=";
|
||||
sha256 = "D6ramD3GsLxAnLNMFxPB8yZ+Z8CT+GseOxfbYQCj3fQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -29,13 +29,13 @@
|
|||
|
||||
mariadb = stdenv.mkDerivation rec {
|
||||
pname = "mariadb-connector-odbc";
|
||||
version = "3.1.4";
|
||||
version = "3.1.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MariaDB";
|
||||
owner = "mariadb-corporation";
|
||||
repo = "mariadb-connector-odbc";
|
||||
rev = version;
|
||||
sha256 = "1kbz5mng9vx89cw2sx7gsvhbv4h86zwp31fr0hxqing3cwxhkfgw";
|
||||
sha256 = "0wvy6m9qfvjii3kanf2d1rhfaww32kg0d7m57643f79qb05gd6vg";
|
||||
# this driver only seems to build correctly when built against the mariadb-connect-c subrepo
|
||||
# (see https://github.com/NixOS/nixpkgs/issues/73258)
|
||||
fetchSubmodules = true;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchpatch
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
|
|
@ -34,6 +35,13 @@ buildPythonPackage rec {
|
|||
sha256 = "c1f32e0c1807ab2de37bf70af97a36b4436db0bc8af3124632b1f4441038bf95";
|
||||
};
|
||||
|
||||
patches = [ (fetchpatch
|
||||
{ name = "Normalize-file-name-and-path.patch";
|
||||
url = "https://github.com/jupyter-server/jupyter_server/pull/608/commits/345e26cdfd78651954b68708fa44119c2ac0dbd5.patch";
|
||||
sha256 = "1kqz3dyh2w0h1g1fbvqa13q17hb6y32694rlaasyg213mq6g4k32";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
argon2_cffi
|
||||
jinja2
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyTelegramBotAPI";
|
||||
version = "4.1.1";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "cc8011ca05301653f2e5c2d02eadff0e882b611841a76f9e5b911994899df49e";
|
||||
sha256 = "05f85dacbcf0bdf2459698bab4325f3a699d1c04bc61581627d76d075c3d5488";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvolumio";
|
||||
version = "0.1.4";
|
||||
version = "0.1.5";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
|
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
|||
owner = "OnFreund";
|
||||
repo = "PyVolumio";
|
||||
rev = "v${version}";
|
||||
sha256 = "0c6kcz9x0n9w67h2gncyhq0dw3q17nmzipcgx59pwqnn33jan5nf";
|
||||
sha256 = "1nyvflap39cwq1cm9wwl9idvfmz1ixsl80f1dnskx22fk0lmvj4h";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ aiohttp ];
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "total-connect-client";
|
||||
version = "2021.11.2";
|
||||
version = "2021.11.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "craigjmidwinter";
|
||||
repo = "total-connect-client";
|
||||
rev = version;
|
||||
sha256 = "sha256-JXau+NmulnZ0gg2XsXD9EFv3j2FBMqVqzpT1XGvMZuA=";
|
||||
sha256 = "sha256-iggxKefrVZP4ljf8jGRrCAq0/xQLsr54L42KkdjBqgI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "21.0.0";
|
||||
version = "22.0.0";
|
||||
|
||||
gprConfigKbSrc = fetchFromGitHub {
|
||||
name = "gprconfig-kb-${version}-src";
|
||||
owner = "AdaCore";
|
||||
repo = "gprconfig_kb";
|
||||
rev = "v${version}";
|
||||
sha256 = "11qmzfdd0ipmhxl4k2hjidqc9i40bywrfkbiivd3lhscxca5pxpg";
|
||||
sha256 = "0zvd0v5cz0zd1hfnhdd91c6sr3bbv1w715j2gvzx3vxlpx1c2q4n";
|
||||
};
|
||||
in
|
||||
|
||||
|
|
@ -27,7 +27,7 @@ stdenv.mkDerivation {
|
|||
owner = "AdaCore";
|
||||
repo = "gprbuild";
|
||||
rev = "v${version}";
|
||||
sha256 = "1knpwasbrz6sxh3dhkc4izchcz4km04j77r4vxxhi23fbd8v1ynj";
|
||||
sha256 = "0rv0ha0kxzab5hhv0jzkjkmchhlvlx8fci8xalnngrgb9nd4r3v8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,21 +1,20 @@
|
|||
{ lib, stdenv, fetchurl, unzip, jdk, java ? jdk, makeWrapper }:
|
||||
|
||||
let
|
||||
gradleSpec = { version, nativeVersion, sha256 }: rec {
|
||||
inherit nativeVersion;
|
||||
name = "gradle-${version}";
|
||||
rec {
|
||||
gradleGen = { version, nativeVersion, sha256 }: stdenv.mkDerivation {
|
||||
pname = "gradle";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
inherit sha256;
|
||||
url = "https://services.gradle.org/distributions/${name}-bin.zip";
|
||||
url = "https://services.gradle.org/distributions/gradle-${version}-bin.zip";
|
||||
};
|
||||
};
|
||||
in
|
||||
rec {
|
||||
gradleGen = { name, src, nativeVersion }: stdenv.mkDerivation {
|
||||
inherit name src nativeVersion;
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper unzip ];
|
||||
buildInputs = [ java ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -pv $out/lib/gradle/
|
||||
cp -rv lib/ $out/lib/gradle/
|
||||
|
|
@ -44,9 +43,6 @@ rec {
|
|||
echo ${stdenv.cc.cc} > $out/nix-support/manual-runtime-dependencies
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ makeWrapper unzip ];
|
||||
buildInputs = [ java ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Enterprise-grade build system";
|
||||
longDescription = ''
|
||||
|
|
@ -57,7 +53,9 @@ rec {
|
|||
between the flexibility of Ant and the convenience of a
|
||||
build-by-convention behavior.
|
||||
'';
|
||||
homepage = "http://www.gradle.org/";
|
||||
homepage = "https://www.gradle.org/";
|
||||
changelog = "https://docs.gradle.org/${version}/release-notes.html";
|
||||
downloadPage = "https://gradle.org/next-steps/?version=${version}";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ lorenzleutgeb ];
|
||||
|
|
@ -65,20 +63,11 @@ rec {
|
|||
};
|
||||
|
||||
gradle_latest = gradle_7_3;
|
||||
gradle_7_3 = gradleGen (gradleSpec (import ./gradle-7.3-spec.nix));
|
||||
gradle_6_9 = gradleGen (gradleSpec (import ./gradle-6.9.1-spec.nix));
|
||||
|
||||
# NOTE: No GitHub Release for this release, so update.sh does not work.
|
||||
gradle_5_6 = gradleGen (gradleSpec {
|
||||
version = "5.6.4";
|
||||
nativeVersion = "0.18";
|
||||
sha256 = "03d86bbqd19h9xlanffcjcy3vg1k5905vzhf9mal9g21603nfc0z";
|
||||
});
|
||||
gradle_7_3 = gradleGen (import ./gradle-7.3-spec.nix);
|
||||
gradle_6_9 = gradleGen (import ./gradle-6.9.1-spec.nix);
|
||||
|
||||
# NOTE: No GitHub Release for this release, so update.sh does not work.
|
||||
gradle_4_10 = gradleGen (gradleSpec {
|
||||
version = "4.10.3";
|
||||
nativeVersion = "0.14";
|
||||
sha256 = "0vhqxnk0yj3q9jam5w4kpia70i4h0q4pjxxqwynh3qml0vrcn9l6";
|
||||
});
|
||||
# NOTE: No GitHub Release for the following versions. Update.sh will not work.
|
||||
gradle_5_6 = gradleGen (import ./gradle-5.6.4-spec.nix);
|
||||
gradle_4_10 = gradleGen (import ./gradle-4.10.3-spec.nix);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
version = "4.10.3";
|
||||
nativeVersion = "0.14";
|
||||
sha256 = "0vhqxnk0yj3q9jam5w4kpia70i4h0q4pjxxqwynh3qml0vrcn9l6";
|
||||
}
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
version = "5.6.4";
|
||||
nativeVersion = "0.18";
|
||||
sha256 = "03d86bbqd19h9xlanffcjcy3vg1k5905vzhf9mal9g21603nfc0z";
|
||||
}
|
||||
|
|
@ -125,23 +125,23 @@ rec {
|
|||
headers = "1bd87c74863w0sjs8gfxl62kjjscc56dmmw85vhwz01s4niksr02";
|
||||
};
|
||||
|
||||
electron_14 = mkElectron "14.2.0" {
|
||||
armv7l-linux = "a1357716ebda8d7856f233c86a8cbaeccad1c83f1d725d260b0a6510c47042a2";
|
||||
aarch64-linux = "b1f4885c3ad816d89446f64a87b78d5139a27fecbf6317808479bede6fd94ae1";
|
||||
x86_64-linux = "b2faec4744edb20e889c3c85af685c2a6aef90bfff58f55b90038a991cd7691f";
|
||||
i686-linux = "9207af6e3a24dfcc76fded20f26512bcb20f6b652295a4ad3458dc10fd2d7d6e";
|
||||
x86_64-darwin = "d647d658c8c2ec4a69c071e791cf7e823320860f987121bd7390978aecacb073";
|
||||
aarch64-darwin = "f5a7e52b639b94cf9b2ec53969c8014c6d299437c65d98c33d8e5ca812fbfd48";
|
||||
headers = "1y289vr8bws3z6gmhaj3avz95rdhc8gd3rc7bi40jv9j1pnlsd3m";
|
||||
electron_14 = mkElectron "14.2.1" {
|
||||
armv7l-linux = "d95b5055a53ffb4c502885c3b35f0b938c1be3a7b77e378587d99e6ce009e5d5";
|
||||
aarch64-linux = "52d71b92606b639881b82efd369e4cc3fd01cade476cbb25cafb22e05a8c423b";
|
||||
x86_64-linux = "820271f62c17cdfe61ed7bce4eff1e82c375d317b7e8b47f965ce9fa863e5994";
|
||||
i686-linux = "478efa82bf017f65fda6f90405d3ccc6adb073bd4b2ab2985e550b5ac6135cba";
|
||||
x86_64-darwin = "d1684580a1c6e800e488428cc15cb223e9615a456784a7cb86ec116a0afafb85";
|
||||
aarch64-darwin = "b40c8a5b4680d509e1ab799d5a0bee19cebfc5c948196b35d9a92e52ebc8fafd";
|
||||
headers = "14yaw3kml2kmi7sns8z32kv4cd8anyj5nd7rfxcg74hj2pbl9dvp";
|
||||
};
|
||||
|
||||
electron_15 = mkElectron "15.3.0" {
|
||||
armv7l-linux = "dfe2851ef94c17eb905cd8cf00b585be072e20a79a02c0c42585a0f51b8cdb20";
|
||||
aarch64-linux = "e0bb8d663dfbe8b65b9e38d4af992a919adc639acfb8748d95ca5b9bbcd7a83c";
|
||||
x86_64-linux = "7cb9c6c9c61848f7d82aaac47ca97bb78c6061e73b176fd3a323652c07335087";
|
||||
i686-linux = "289ef7d53c440a576839a4ee092284009235d740404ea07e6bf82f33254ae8df";
|
||||
x86_64-darwin = "667da0d56bab968d28c41c1f53b901fb685e56d1f56faf33912a240a0397bab5";
|
||||
aarch64-darwin = "9cf5caafc7cbf0e91483e24d5a696b81618d293a5eccd4d122c57baaab88724c";
|
||||
headers = "0jicbplni608cjxwhlrzxkxc9w9b4h6zqssilc9b0yr73jq1fyrd";
|
||||
electron_15 = mkElectron "15.3.1" {
|
||||
armv7l-linux = "b3e73ad174f692da36a4e1d2cd6b849080ee891027e37126868c88e6b89d82ac";
|
||||
aarch64-linux = "35ebfeeedcb71bd256c24550c75b9515fdda2db7a2ee1deb1097040480a26198";
|
||||
x86_64-linux = "941330103b9ab66a0195dd86e1503b5d2087f93a0b1e8453d8270d47cfe2bfc2";
|
||||
i686-linux = "1eeef6b189b4305845a0832b98efcba773c329e351181debe003562a7885afff";
|
||||
x86_64-darwin = "a91b089b5dc5b1279966511344b805ec84869b6cd60af44f800b363bba25b915";
|
||||
aarch64-darwin = "89fafef20426c0a3a2326172d222d29fc5d24d64c8910b7abddf61bd2c6a6700";
|
||||
headers = "0f665x7yp0xz1p1cl8c3vcw3k7g53c13rkbz8cz3phl6v3n1s1w0";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, fetchFromGitHub, rustPlatform, nixUnstable }:
|
||||
{ lib, fetchFromGitHub, rustPlatform, nix }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rnix-lsp";
|
||||
|
|
@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoSha256 = "sha256-Tw05eOIMJj+zX0fqtn6wJwolKNkYqfVuo/WO/WvYu2k=";
|
||||
|
||||
checkInputs = [ nixUnstable ];
|
||||
checkInputs = [ nix ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A work-in-progress language server for Nix, with syntax checking and basic completion";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
let
|
||||
traceLog = "/tmp/steam-trace-dependencies.log";
|
||||
version = "1.0.0.72";
|
||||
version = "1.0.0.73";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
pname = "steam-original";
|
||||
|
|
@ -10,7 +10,7 @@ in stdenv.mkDerivation {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://repo.steampowered.com/steam/pool/steam/s/steam/steam_${version}.tar.gz";
|
||||
sha256 = "0l54ljnlnx289i1ssnss78251vyga726dnzsrhgnxwn1p1125m45";
|
||||
sha256 = "sha256-uVO6D1K8zGlq12lrIs7aTQEVnj1bk1P4wRUtkPWkNZE=";
|
||||
};
|
||||
|
||||
makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ xorgproto libX11 libXext libXrandr ];
|
||||
|
||||
installFlags = [ "DESTDIR=\${out}" "PREFIX=" ];
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
postPatch = "sed -i '/chmod u+s/d' Makefile";
|
||||
|
||||
|
|
@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
|
|||
cp ${writeText "config.def.h" conf} config.def.h
|
||||
'';
|
||||
|
||||
makeFlags = [ "CC:=$(CC)" ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://tools.suckless.org/slock";
|
||||
description = "Simple X display locker";
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ stdenvNoCC.mkDerivation rec {
|
|||
version = "1.55";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zdharma";
|
||||
owner = "zdharma-continuum";
|
||||
repo = "fast-syntax-highlighting";
|
||||
rev = "v${version}";
|
||||
sha256 = "0h7f27gz586xxw7cc0wyiv3bx0x3qih2wwh05ad85bh2h834ar8d";
|
||||
|
|
@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Syntax-highlighting for Zshell";
|
||||
homepage = "https://github.com/zdharma/fast-syntax-highlighting";
|
||||
homepage = "https://github.com/zdharma-continuum/fast-syntax-highlighting";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -9,19 +9,20 @@
|
|||
, oniguruma
|
||||
, libiconv
|
||||
, Security
|
||||
, libxcb
|
||||
, zlib
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "broot";
|
||||
version = "1.6.6";
|
||||
version = "1.7.1";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Aezi005CKhGwCRZ2HwxFRRORBvVoZEzljTcKQZ8b8XI=";
|
||||
sha256 = "sha256-Gg60jeDfHNKUYynJRgN4oLWhcdApWUdO5kRwl5hrFMM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-d06lvS5ajXPY/AwmE2rkya82mAOeEv04EtBElDvX2+I=";
|
||||
cargoHash = "sha256-xsTlFfgX3Np3M/RqmK30DZBCrY1OXnEkjqBDI+ffd/U=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
@ -29,7 +30,7 @@ rustPlatform.buildRustPackage rec {
|
|||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [ libgit2 oniguruma ] ++ lib.optionals stdenv.isDarwin [
|
||||
buildInputs = [ libgit2 oniguruma libxcb ] ++ lib.optionals stdenv.isDarwin [
|
||||
libiconv
|
||||
Security
|
||||
zlib
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchpatch, fetchFromGitHub
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, pkg-config, autoreconfHook, perl, gperf, bison, flex
|
||||
, gmp, python3, iptables, ldns, unbound, openssl, pcsclite, glib
|
||||
, openresolv
|
||||
|
|
@ -17,13 +17,13 @@ with lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "strongswan";
|
||||
version = "5.8.1"; # Make sure to also update <nixpkgs/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix> when upgrading!
|
||||
version = "5.9.4"; # Make sure to also update <nixpkgs/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix> when upgrading!
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "strongswan";
|
||||
repo = "strongswan";
|
||||
rev = version;
|
||||
sha256 = "1a1hw2jsbwvkdhhxjmq87hz13ivbgvqwks1q3adz14mqgbc64snd";
|
||||
sha256 = "1y1gs232x7hsbccjga9nbkf4bbi5wxazlkg00qd2v1nz86sfy4cd";
|
||||
};
|
||||
|
||||
dontPatchELF = true;
|
||||
|
|
@ -40,19 +40,6 @@ stdenv.mkDerivation rec {
|
|||
./ext_auth-path.patch
|
||||
./firewall_defaults.patch
|
||||
./updown-path.patch
|
||||
|
||||
# Don't use etc/dbus-1/system.d
|
||||
(fetchpatch {
|
||||
url = "https://patch-diff.githubusercontent.com/raw/strongswan/strongswan/pull/150.patch";
|
||||
sha256 = "1irfxb99blb8v3hs0kmlhzkkwbmds1p0gq319z8lmacz36cgyj2c";
|
||||
})
|
||||
|
||||
# fix build with -fno-common tollchain
|
||||
(fetchpatch {
|
||||
name = "fno-common.patch";
|
||||
url = "https://git.strongswan.org/?p=strongswan.git;a=patch;h=91c6387e69c09beaa9b9ca1e28471751a834fc24";
|
||||
sha256 = "0jp9walxwffp5cl7q0hb80h3s2gdj1nn3n8bvnbmwgh2s6pi148f";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = optionalString stdenv.isLinux ''
|
||||
|
|
|
|||
|
|
@ -3,27 +3,26 @@
|
|||
, fetchFromGitHub
|
||||
, cmake
|
||||
, stdenv
|
||||
, libiconv
|
||||
, CoreFoundation
|
||||
, Security
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "hck";
|
||||
version = "0.6.6";
|
||||
version = "0.6.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sstadick";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DUFJZEtJM5Sv41zJvSZ8KsNWFzlictM2T1wS7VxPL04=";
|
||||
sha256 = "sha256-m4YVz3kh4nOkdf6PbbyxjKacUVKdFQet76CMrFYMRHI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-kubQL+p7J2koPDOje5wMxKDeCY4yi0kupfHsJCKYf44=";
|
||||
cargoSha256 = "sha256-4z1kHSev+5+0wpYFEGvvafB50Wz1wr6zObCjvHR9FPU=";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv CoreFoundation Security ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation Security ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A close to drop in replacement for cut that can use a regex delimiter instead of a fixed string";
|
||||
|
|
|
|||
|
|
@ -2244,6 +2244,7 @@ with pkgs;
|
|||
|
||||
broot = callPackage ../tools/misc/broot {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
inherit (xorg) libxcb;
|
||||
};
|
||||
|
||||
bruteforce-luks = callPackage ../tools/security/bruteforce-luks { };
|
||||
|
|
@ -11877,8 +11878,7 @@ with pkgs;
|
|||
inherit (gnome2) libart_lgpl;
|
||||
});
|
||||
|
||||
# aarch64-darwin doesn't support earlier gcc
|
||||
gnat = if (stdenv.isDarwin && stdenv.isAarch64) then gnat11 else gnat9;
|
||||
gnat = gnat11;
|
||||
|
||||
gnat6 = wrapCC (gcc6.cc.override {
|
||||
name = "gnat";
|
||||
|
|
@ -14600,8 +14600,7 @@ with pkgs;
|
|||
java = jdk8; # TODO: upgrade https://github.com/NixOS/nixpkgs/pull/89731
|
||||
};
|
||||
gradle = res.gradleGen.gradle_latest;
|
||||
gradle_4_10 = res.gradleGen.gradle_4_10;
|
||||
gradle_4 = gradle_4_10;
|
||||
gradle_4 = res.gradleGen.gradle_4_10;
|
||||
gradle_5 = res.gradleGen.gradle_5_6;
|
||||
gradle_6 = res.gradleGen.gradle_6_9;
|
||||
gradle_7 = res.gradleGen.gradle_7_3;
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
let
|
||||
inherit (libretro) genesis-plus-gx snes9x;
|
||||
inherit (libretro) genesis-plus-gx mgba snes9x;
|
||||
in
|
||||
|
||||
let self = rec {
|
||||
|
|
@ -78,6 +78,8 @@ let self = rec {
|
|||
|
||||
libretro-genplus = callPackage ../applications/video/kodi-packages/libretro-genplus { inherit genesis-plus-gx; };
|
||||
|
||||
libretro-mgba = callPackage ../applications/video/kodi-packages/libretro-mgba { inherit mgba; };
|
||||
|
||||
libretro-snes9x = callPackage ../applications/video/kodi-packages/libretro-snes9x { inherit snes9x; };
|
||||
|
||||
jellyfin = callPackage ../applications/video/kodi-packages/jellyfin { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue