Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
21465e0ebc
@ -121,3 +121,4 @@ toml,,,,,,mrcjkb
|
||||
toml-edit,,,,,5.1,mrcjkb
|
||||
vstruct,https://github.com/ToxicFrog/vstruct.git,,,,,
|
||||
vusted,,,,,,figsoda
|
||||
xml2lua,,,,,,teto
|
||||
|
||||
|
@ -1633,18 +1633,24 @@ let
|
||||
mktplcRef = {
|
||||
publisher = "github";
|
||||
name = "codespaces";
|
||||
version = "1.14.8";
|
||||
sha256 = "sha256-kCgnOODT1KDi9PMWs3CATXESWoHnDRhCIZhEUSkm14o=";
|
||||
version = "1.16.9";
|
||||
sha256 = "sha256-Zj1dHz8uBHnRpjnD9tUr8OJILRq9Ty91ePiNq6/Vi7c=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "VSCode extensions that provides cloud-hosted development environments for any activity";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=GitHub.codespaces";
|
||||
homepage = "https://github.com/features/codespaces";
|
||||
license = lib.licenses.unfree;
|
||||
};
|
||||
meta = { license = lib.licenses.unfree; };
|
||||
};
|
||||
|
||||
github.copilot = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
publisher = "github";
|
||||
name = "copilot";
|
||||
version = "1.151.659";
|
||||
sha256 = "sha256-6jz7Nb9SGON7AXL4KJwC4H03la9JqLCX+AyBEvxD4HA=";
|
||||
version = "1.156.691";
|
||||
sha256 = "sha256-K7lzwfgqb0gUJAivro/ePaQetM31M+zTBRZMBy92ZuA=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
@ -1660,8 +1666,8 @@ let
|
||||
mktplcRef = {
|
||||
publisher = "github";
|
||||
name = "copilot-chat";
|
||||
version = "0.11.2023120102";
|
||||
sha256 = "sha256-EUegM4sVP/vDikNr4LwnWzhDBSgfxYe6mxnrhSdXhIQ=";
|
||||
version = "0.12.2024013003"; # latest version compatible with vscode 1.86
|
||||
sha256 = "sha256-4ArWVFko2T6ze/i+HTdXAioWC7euWCycDsQxFTrEtUw=";
|
||||
};
|
||||
meta = {
|
||||
description = "GitHub Copilot Chat is a companion extension to GitHub Copilot that houses experimental chat features";
|
||||
|
||||
@ -249,9 +249,9 @@
|
||||
"gpsp": {
|
||||
"owner": "libretro",
|
||||
"repo": "gpsp",
|
||||
"rev": "9fc117ef5c719047818513c7e394c24371cb1dbd",
|
||||
"hash": "sha256-6dPuj+uzqSYA2+Jm+G3u0HEeBFW2i+KmWd3PYbSxBu8=",
|
||||
"date": "unstable-2024-01-15"
|
||||
"rev": "85a2ac6c911ffcc77cf1bab418c78fe5218c0b1a",
|
||||
"hash": "sha256-iHfdsI6E2LQTC9HjqVRBHihVUpagtB8326M8Crll2iY=",
|
||||
"date": "unstable-2024-02-04"
|
||||
},
|
||||
"gw": {
|
||||
"owner": "libretro",
|
||||
@ -277,9 +277,9 @@
|
||||
"mame": {
|
||||
"owner": "libretro",
|
||||
"repo": "mame",
|
||||
"rev": "68520cf9defd1c2762bca7f266f13ad593b7b3f3",
|
||||
"hash": "sha256-moYxyoa6QUCvxVPTr4NpRiEC+7bPETohVSYu4EYegFA=",
|
||||
"date": "unstable-2024-01-03"
|
||||
"rev": "f55fe47b0997d24048700898195cb66bc0bccfb6",
|
||||
"hash": "sha256-JUL4ha7UL+hNG5oi178nLT1aUuxqfev0/bRU6y/Mg7A=",
|
||||
"date": "unstable-2024-02-05"
|
||||
},
|
||||
"mame2000": {
|
||||
"owner": "libretro",
|
||||
@ -361,10 +361,10 @@
|
||||
"mrboom": {
|
||||
"owner": "Javanaise",
|
||||
"repo": "mrboom-libretro",
|
||||
"rev": "c4ec620424fe79f0d6db719d73628f23ae285ada",
|
||||
"hash": "sha256-twocTyayV79a4757Yfoz/P3wnQPgiwsbrBbLmT4EZKQ=",
|
||||
"rev": "865be65118ef70e9a486f872948f4fc805edf643",
|
||||
"hash": "sha256-jdOthryC1QvVvuPZUh/YyZhJeFWk1XhBuCm4hmAy8+Q=",
|
||||
"fetchSubmodules": true,
|
||||
"date": "unstable-2024-01-23"
|
||||
"date": "unstable-2024-02-05"
|
||||
},
|
||||
"mupen64plus": {
|
||||
"owner": "libretro",
|
||||
@ -448,18 +448,18 @@
|
||||
"play": {
|
||||
"owner": "jpd002",
|
||||
"repo": "Play-",
|
||||
"rev": "c0da95cf596834620169173dc12b3f32ca092404",
|
||||
"hash": "sha256-q6ApOsyNS5to+KBYgz+CZJOfNAcII6Eyv0MhcB4Q1bU=",
|
||||
"rev": "34c4c74fbd0ca2223c203bffc23f57157769074b",
|
||||
"hash": "sha256-Nn2VsZOuwyBQxFBGGLVfD5BvvqJBI7g8HoShmH0hch8=",
|
||||
"fetchSubmodules": true,
|
||||
"date": "unstable-2024-01-26"
|
||||
"date": "unstable-2024-02-05"
|
||||
},
|
||||
"ppsspp": {
|
||||
"owner": "hrydgard",
|
||||
"repo": "ppsspp",
|
||||
"rev": "d479b74ed9c3e321bc3735da29bc125a2ac3b9b2",
|
||||
"hash": "sha256-I84zJqEE1X/eo/ukeGA2iZe3lWKvilk+RNGUzl2wZXY=",
|
||||
"rev": "f65c84f4cb8117b273e7fa2ab578c95aedc6dd56",
|
||||
"hash": "sha256-GgXozubq6ByZDWGkUrzeEgKxUaBaIN3NY5/IIRBNn/o=",
|
||||
"fetchSubmodules": true,
|
||||
"date": "unstable-2024-02-04"
|
||||
"date": "unstable-2024-02-05"
|
||||
},
|
||||
"prboom": {
|
||||
"owner": "libretro",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -245,7 +245,7 @@ buildStdenv.mkDerivation {
|
||||
hash = "sha256-cWOyvjIPUU1tavPRqg61xJ53XE4EJTdsFzadfVxyTyM=";
|
||||
})
|
||||
]
|
||||
++ lib.optionals (lib.versionAtLeast version "122" && lib.versionOlder version "122.0.1") [
|
||||
++ lib.optionals (lib.versionAtLeast version "122" && lib.versionOlder version "123") [
|
||||
./122.0-libvpx-mozbz1875201.patch
|
||||
]
|
||||
++ extraPatches;
|
||||
|
||||
@ -3,10 +3,10 @@
|
||||
{
|
||||
firefox = buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "122.0";
|
||||
version = "122.0.1";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "619b735c16970207f3f8fb31dd2350a5e665a802c30501c89aee4817b8b0f7f466da93c66ab238e94967587e538e6858934b18164ff312dbdbfbc3b2bf8bd824";
|
||||
sha512 = "1d4fe1ed351edd748ede2ef6448798a32de9ed7a075a54a7ed5f7baa7b0c4c7f932c2e29f443c9066829e39f22a1dc94be5d00cc994193e949b72aa4a1c8ba41";
|
||||
};
|
||||
|
||||
extraPatches = [
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gatekeeper";
|
||||
version = "3.13.4";
|
||||
version = "3.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-policy-agent";
|
||||
repo = "gatekeeper";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-h6GxU7y6z5wyZjuK7wI6BG0aF2u6hqLsID7ijTNzifc=";
|
||||
hash = "sha256-Mt9bSgmqjj9KkJJW0F2tr2P8GtSy80h9CfMXvIxyKc4=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "twitch-tui";
|
||||
version = "2.6.2";
|
||||
version = "2.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Xithrius";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-q7Z7a/Mfi6djUGK0xvhD0WznxQlDyejZtaq9rSlNz8g=";
|
||||
hash = "sha256-h8qpsrMFFb49yfNb5mKEYRpul0hB0m1rDCvVW6jW+Pg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-utnwDqQe0PScRXUD/mC6/uSX8cjBHLbRsO0GcVntPKk=";
|
||||
cargoHash = "sha256-L7psqmU4Zd7c0mbd4pK/tmPslTaxIhQoWtN0/RRMerA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "lint-staged";
|
||||
version = "15.2.1";
|
||||
version = "15.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okonet";
|
||||
repo = "lint-staged";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CYPDrzEu592gGeZkBYNGwGooRwQyKEj46hnxtBVQDT4=";
|
||||
hash = "sha256-gdL/gOAHcgvKUot6MmC1rUMmcrLgLMf1ISc1oPNWJOQ=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-m7VIEuCVDPd+ZgI8DJa01f/q9uYCzRtVbdfcipBRTmY=";
|
||||
npmDepsHash = "sha256-32E5y0s6Hm8i74zso/yOmCYWZ6y2Sx4rn8ylSb0c8qE=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
|
||||
@ -7,15 +7,19 @@
|
||||
, libxfce4util
|
||||
, xfce4-panel
|
||||
, xfconf
|
||||
, curl
|
||||
, gnome
|
||||
, jq
|
||||
, xclip
|
||||
}:
|
||||
|
||||
mkXfceDerivation {
|
||||
category = "apps";
|
||||
pname = "xfce4-screenshooter";
|
||||
version = "1.10.4";
|
||||
version = "1.10.5";
|
||||
odd-unstable = false;
|
||||
|
||||
sha256 = "sha256-jikvMHpmBLTqwDjTxx4AMU8CnfrtSExFauq+gcTX2E8=";
|
||||
sha256 = "sha256-x1uQIfiUNMYowrCLpwdt1IsHfJLn81f8I/4NBwX/z9k=";
|
||||
|
||||
buildInputs = [
|
||||
exo
|
||||
@ -27,6 +31,14 @@ mkXfceDerivation {
|
||||
xfconf
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
# For Imgur upload action
|
||||
# https://gitlab.xfce.org/apps/xfce4-screenshooter/-/merge_requests/51
|
||||
gappsWrapperArgs+=(
|
||||
--prefix PATH : ${lib.makeBinPath [ curl gnome.zenity jq xclip ]}
|
||||
)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Screenshot utility for the Xfce desktop";
|
||||
maintainers = with maintainers; [ ] ++ teams.xfce.members;
|
||||
|
||||
@ -14,7 +14,9 @@
|
||||
, useHDF ? (!useMinimalFeatures)
|
||||
, useNetCDF ? (!useMinimalFeatures)
|
||||
, useArmadillo ? (!useMinimalFeatures)
|
||||
, useJava ? (!useMinimalFeatures)
|
||||
|
||||
, ant
|
||||
, bison
|
||||
, cmake
|
||||
, gtest
|
||||
@ -36,6 +38,7 @@
|
||||
, libgeotiff
|
||||
, geos
|
||||
, giflib
|
||||
, jdk
|
||||
, libheif
|
||||
, dav1d
|
||||
, libaom
|
||||
@ -94,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
python3.pkgs.setuptools
|
||||
python3.pkgs.wrapPython
|
||||
swig
|
||||
];
|
||||
] ++ lib.optionals useJava [ ant jdk ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DGDAL_USE_INTERNAL_LIBS=OFF"
|
||||
@ -110,6 +113,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON"
|
||||
] ++ lib.optionals (!useTiledb) [
|
||||
"-DGDAL_USE_TILEDB=OFF"
|
||||
] ++ lib.optionals (!useJava) [
|
||||
# This is not strictly needed as the Java bindings wouldn't build anyway if
|
||||
# ant/jdk were not available.
|
||||
"-DBUILD_JAVA_BINDINGS=OFF"
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
@ -144,7 +151,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
openexr
|
||||
xercesc
|
||||
] ++ arrowDeps);
|
||||
in [
|
||||
in
|
||||
[
|
||||
c-blosc
|
||||
brunsli
|
||||
cfitsio
|
||||
@ -178,20 +186,24 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
python3
|
||||
python3.pkgs.numpy
|
||||
] ++ tileDbDeps
|
||||
++ libHeifDeps
|
||||
++ libJxlDeps
|
||||
++ mysqlDeps
|
||||
++ postgresDeps
|
||||
++ popplerDeps
|
||||
++ arrowDeps
|
||||
++ hdfDeps
|
||||
++ netCdfDeps
|
||||
++ armadilloDeps
|
||||
++ darwinDeps
|
||||
++ nonDarwinDeps;
|
||||
++ libHeifDeps
|
||||
++ libJxlDeps
|
||||
++ mysqlDeps
|
||||
++ postgresDeps
|
||||
++ popplerDeps
|
||||
++ arrowDeps
|
||||
++ hdfDeps
|
||||
++ netCdfDeps
|
||||
++ armadilloDeps
|
||||
++ darwinDeps
|
||||
++ nonDarwinDeps;
|
||||
|
||||
postInstall = ''
|
||||
wrapPythonPrograms
|
||||
'' + lib.optionalString useJava ''
|
||||
cd $out/lib
|
||||
ln -s ./jni/libgdalalljni${stdenv.hostPlatform.extensions.sharedLibrary}
|
||||
cd -
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ runCommand, gdal }:
|
||||
{ runCommand, gdal, jdk }:
|
||||
|
||||
let
|
||||
inherit (gdal) pname version;
|
||||
@ -40,5 +40,16 @@ runCommand "${pname}-tests" { meta.timeout = 60; }
|
||||
|
||||
${gdal}/bin/gdalinfo ./test.tif
|
||||
|
||||
# test java bindings
|
||||
cat <<EOF > main.java
|
||||
import org.gdal.gdal.gdal;
|
||||
class Main {
|
||||
public static void main(String[] args) {
|
||||
gdal.AllRegister();
|
||||
}
|
||||
}
|
||||
EOF
|
||||
${jdk}/bin/java -Djava.library.path=${gdal}/lib/ -cp ${gdal}/share/java/gdal-${version}.jar main.java
|
||||
|
||||
touch $out
|
||||
''
|
||||
|
||||
61
pkgs/development/libraries/wayqt/default.nix
Normal file
61
pkgs/development/libraries/wayqt/default.nix
Normal file
@ -0,0 +1,61 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitLab
|
||||
, substituteAll
|
||||
, meson
|
||||
, pkg-config
|
||||
, qttools
|
||||
, ninja
|
||||
, qtbase
|
||||
, qtwayland
|
||||
, wayland
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wayqt";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "desktop-frameworks";
|
||||
repo = "wayqt";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-qlRRkqhKlcsd9lzlqfE0V0gjudELyENu4IH1NfO/+pI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# qmake get qtbase's path, but wayqt need qtwayland
|
||||
(substituteAll {
|
||||
src = ./fix-qtwayland-header-path.diff;
|
||||
qtWaylandPath = "${qtwayland}/include";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
pkg-config
|
||||
qttools
|
||||
ninja
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtwayland
|
||||
wayland
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Duse_qt_version=qt6"
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://gitlab.com/desktop-frameworks/wayqt";
|
||||
description = "Qt-based library to handle Wayland and Wlroots protocols to be used with any Qt project";
|
||||
maintainers = with lib.maintainers; [ rewine ];
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
})
|
||||
@ -0,0 +1,16 @@
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 5c09644..fc65d37 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -39,9 +39,8 @@ elif get_option('use_qt_version') == 'qt6'
|
||||
private_headers: [ 'Gui', 'WaylandClient', 'WaylandGlobalPrivate' ],
|
||||
)
|
||||
|
||||
- qmake = find_program( [ 'qmake-qt6', 'qmake6' ], required: true )
|
||||
- ret = run_command( qmake, '-query', 'QT_INSTALL_HEADERS', check: true )
|
||||
- QtHeaderPath = ret.stdout().strip()
|
||||
+ qmake = find_program( [ 'qmake-qt6', 'qmake6' ], required: false )
|
||||
+ QtHeaderPath = '@qtWaylandPath@'
|
||||
|
||||
QtGlobal = '@0@/QtWaylandGlobal/@1@'.format( QtHeaderPath, QtDeps.version() )
|
||||
|
||||
@ -3455,6 +3455,37 @@ buildLuarocksPackage {
|
||||
};
|
||||
}) {};
|
||||
|
||||
xml2lua = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }:
|
||||
buildLuarocksPackage {
|
||||
pname = "xml2lua";
|
||||
version = "1.5-2";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/xml2lua-1.5-2.rockspec";
|
||||
sha256 = "1h0zszjzi65jc2rmpam7ai38sx2ph09q66jkik5mgzr6cxm1cm4h";
|
||||
}).outPath;
|
||||
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
|
||||
"url": "https://github.com/manoelcampos/xml2lua",
|
||||
"rev": "b24be89a154d49b33295958584944bfd7ba2b24e",
|
||||
"date": "2021-07-13T10:22:09-03:00",
|
||||
"path": "/nix/store/i5dvpc0mhhw7jbrvg4bsz1scs0kvmx5f-xml2lua",
|
||||
"sha256": "1vk3chcpq8b98dss5kwskbzxig58zar0jgi8mizdccw4rx698c44",
|
||||
"hash": "sha256-hDCUTM+EM9Z+rCg+CbL6qLzY/5qaz6J1Q2khfBlkY+4=",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": true,
|
||||
"deepClone": false,
|
||||
"leaveDotGit": false
|
||||
}
|
||||
'') ["date" "path" "sha256"]) ;
|
||||
|
||||
disabled = (luaOlder "5.1");
|
||||
propagatedBuildInputs = [ lua ];
|
||||
|
||||
meta = {
|
||||
homepage = "http://manoelcampos.github.io/xml2lua/";
|
||||
description = "An XML Parser written entirely in Lua that works for Lua 5.1+";
|
||||
license.fullName = "MIT";
|
||||
};
|
||||
}) {};
|
||||
|
||||
}
|
||||
/* GENERATED - do not edit this file */
|
||||
|
||||
@ -365,14 +365,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.34.34";
|
||||
version = "1.34.35";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-lnidW9vZ7hDcplEsdwegfPUu97Guq3kqlCx9axMX09w=";
|
||||
hash = "sha256-kXJa7GEJ+bTR03pQ58lHjOnK9B1b196+gKMew+H4SlA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -8,20 +8,25 @@
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-securitycenter";
|
||||
version = "1.25.0";
|
||||
format = "setuptools";
|
||||
version = "1.26.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-SofrNcO5Rir8iQfwjADlUJnGmf1y1xkBG8r6gBVxva4=";
|
||||
hash = "sha256-wZKuMeXio7CINEm752+2QYd8TONejQ7RNi4ij0LtFVY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
grpc-google-iam-v1
|
||||
google-api-core
|
||||
|
||||
@ -6,12 +6,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hg-evolve";
|
||||
version = "11.1.0";
|
||||
version = "11.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-sMvHvHwLuMT0LaH2XFDePuePbwCXjvl66QGdERR0k6g=";
|
||||
hash = "sha256-HFZN/JJQPlVB57xcUUxyXrrD4EqPg9vYCRAa4PAQHow=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jc";
|
||||
version = "1.24.0";
|
||||
version = "1.25.0";
|
||||
format = "setuptools";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "kellyjonbrazil";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-aEDEp32PR51uRMEmDdWkF/Y0bMT0Lp25lVUpyn/VxlA=";
|
||||
hash = "sha256-viB/avMED5xllmkrF+WpsQbF/b7pyr3p3p+8vJk72+k=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ];
|
||||
|
||||
@ -13,16 +13,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mdformat-gfm";
|
||||
version = "0.3.5";
|
||||
format = "pyproject";
|
||||
version = "0.3.6";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hukkin";
|
||||
repo = pname;
|
||||
repo = "mdformat-gfm";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-7sIa50jCN+M36Y0C05QaAL+TVwLzKxJ0gzpZI1YQFxg=";
|
||||
hash = "sha256-c1jJwyTL8IgQnIAJFoPSuJ8VEYgnQ4slZyV0bHlUHLQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tesla-fleet-api";
|
||||
version = "0.2.6";
|
||||
version = "0.2.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "Teslemetry";
|
||||
repo = "python-tesla-fleet-api";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Kp/amNhDVGuGr2IA5t4R3HpVqUagI8Dzn+PkV15bO6w=";
|
||||
hash = "sha256-yYvC53uBAiLP009HdXdy+FM+tGc5CLQ8OFwP//Zk488=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "3.2.5";
|
||||
version = "3.2.8";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = "checkov";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-28DvlExTH1YELQAgY3d3HrNLCaX2pWiL7l+Y/WQ3z5s=";
|
||||
hash = "sha256-Hd1YOzIH6v8N/oP2cJRUv6OkgOv9aSe7nkvzpsCN3rc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -42,12 +42,12 @@
|
||||
"6.1": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-6.1.75-hardened1.patch",
|
||||
"sha256": "157fl991y8fsllwa0ny851vij3418fcs4nng02qzkc1rqzj625dz",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.75-hardened1/linux-hardened-6.1.75-hardened1.patch"
|
||||
"name": "linux-hardened-6.1.76-hardened1.patch",
|
||||
"sha256": "1hybya6kxcy90cnc7m1gzykbbarqmbybmgrsbanb3gvlbvjghizx",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.76-hardened1/linux-hardened-6.1.76-hardened1.patch"
|
||||
},
|
||||
"sha256": "0mis14ll6xmhw71vfpw1aahi5z207qysha7x316fq4qc6c899lbc",
|
||||
"version": "6.1.75"
|
||||
"sha256": "1zdi4xbk7zyiab7x8z12xqg72zaw3j61slvrbwjfx6pzh47cr005",
|
||||
"version": "6.1.76"
|
||||
},
|
||||
"6.5": {
|
||||
"patch": {
|
||||
@ -62,21 +62,21 @@
|
||||
"6.6": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-6.6.14-hardened1.patch",
|
||||
"sha256": "1r8aw6lb43fgayhdnk10hkllh8kanfww5xzfi5qzkbly28wr8abv",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.6.14-hardened1/linux-hardened-6.6.14-hardened1.patch"
|
||||
"name": "linux-hardened-6.6.15-hardened1.patch",
|
||||
"sha256": "0yj821zaqxhk4yk1fgv1l5kcqsl05nvq8l6djbvhs0nnlmfd85yf",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.6.15-hardened1/linux-hardened-6.6.15-hardened1.patch"
|
||||
},
|
||||
"sha256": "110mz8fjlg1j9wnhhq2ik5alayhf61adajd8jqmcsqprncnnpsgv",
|
||||
"version": "6.6.14"
|
||||
"sha256": "1ajzby6isqji1xlp660m4qj2i2xs003vsjp1jspziwl7hrzhqadb",
|
||||
"version": "6.6.15"
|
||||
},
|
||||
"6.7": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-6.7.2-hardened1.patch",
|
||||
"sha256": "1mkmqf8fc3dg77an9fkqp41141m01x93rydfmdn5ys5336mix8pi",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.7.2-hardened1/linux-hardened-6.7.2-hardened1.patch"
|
||||
"name": "linux-hardened-6.7.3-hardened1.patch",
|
||||
"sha256": "03jdch5fx6ly0haa2jrbjzyjnfv66dh1gkbhy1y79v3ylr4x29x4",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.7.3-hardened1/linux-hardened-6.7.3-hardened1.patch"
|
||||
},
|
||||
"sha256": "0wd6pxh7wy9bzjzwd0rdsdnghpr53qbs722fhg07bi19m8dy8kf3",
|
||||
"version": "6.7.2"
|
||||
"sha256": "0i1bfkawyp917d9v3qa5nqzspzr3ixx7scbfl8x4lms74xjqrw5p",
|
||||
"version": "6.7.3"
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
{
|
||||
"testing": {
|
||||
"version": "6.8-rc2",
|
||||
"hash": "sha256:0zlk5kq06lan0x689dxrxnfpz2zmlmykm1h0cfpgiy05f52kbhlk"
|
||||
"version": "6.8-rc3",
|
||||
"hash": "sha256:1djrivjf84l28slhf14j7cc007pibwyjygq9nml39k6zk8gnhl0x"
|
||||
},
|
||||
"6.5": {
|
||||
"version": "6.5.13",
|
||||
"hash": "sha256:1dfbbydmayfj9npx3z0g38p574pmcx3qgs49dv0npigl48wd9yvq"
|
||||
},
|
||||
"6.1": {
|
||||
"version": "6.1.76",
|
||||
"hash": "sha256:1zdi4xbk7zyiab7x8z12xqg72zaw3j61slvrbwjfx6pzh47cr005"
|
||||
"version": "6.1.77",
|
||||
"hash": "sha256:07grng6rrgpy6c3465hwqhn3gcdam1c8rwya30vgpk8nfxbfqm1v"
|
||||
},
|
||||
"5.15": {
|
||||
"version": "5.15.148",
|
||||
@ -28,11 +28,11 @@
|
||||
"hash": "sha256:06dy270xw4frnrc9p2qjh8chgp02fr5ll5g2b0lx9xqzlq7y86xr"
|
||||
},
|
||||
"6.6": {
|
||||
"version": "6.6.15",
|
||||
"hash": "sha256:1ajzby6isqji1xlp660m4qj2i2xs003vsjp1jspziwl7hrzhqadb"
|
||||
"version": "6.6.16",
|
||||
"hash": "sha256:0c5a9agdr27bwd1z6790whczb858z8i34hhn548lzbdylfamf7dj"
|
||||
},
|
||||
"6.7": {
|
||||
"version": "6.7.3",
|
||||
"hash": "sha256:0i1bfkawyp917d9v3qa5nqzspzr3ixx7scbfl8x4lms74xjqrw5p"
|
||||
"version": "6.7.4",
|
||||
"hash": "sha256:036nk3h7vqzd7gnxan2173kpss5qm2pci1lvd58gh90azigrz3gn"
|
||||
}
|
||||
}
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.10.204-rt100"; # updated by ./update-rt.sh
|
||||
version = "5.10.209-rt101"; # updated by ./update-rt.sh
|
||||
branch = lib.versions.majorMinor version;
|
||||
kversion = builtins.elemAt (lib.splitString "-" version) 0;
|
||||
in buildLinux (args // {
|
||||
@ -17,14 +17,14 @@ in buildLinux (args // {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
|
||||
sha256 = "1vnamiyr378q52xgkg7kvpx80zck729dim77vp06a3q6n580g5gz";
|
||||
sha256 = "1mc8rssk5aypgb58jz6i2bbflfr6qh1kgqpam0k8fqvwcjnjzqj4";
|
||||
};
|
||||
|
||||
kernelPatches = let rt-patch = {
|
||||
name = "rt";
|
||||
patch = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
|
||||
sha256 = "1zbpkira8wf3w46586af72k43j8xkj15f0dgq86z975vl60hdk68";
|
||||
sha256 = "19vlzjhh4m3fppd0y4m40nx2b7ncai1ya726dq1n9qlzzab6iq2a";
|
||||
};
|
||||
}; in [ rt-patch ] ++ kernelPatches;
|
||||
|
||||
|
||||
@ -4,16 +4,16 @@ let
|
||||
# comments with variant added for update script
|
||||
# ./update-zen.py zen
|
||||
zenVariant = {
|
||||
version = "6.7.3"; #zen
|
||||
version = "6.7.4"; #zen
|
||||
suffix = "zen1"; #zen
|
||||
sha256 = "1qm1vhd1x8gd2klcasp8f0x9hqaci4b5ih1nn9qc7vqash14hxy6"; #zen
|
||||
sha256 = "1vk2xfvqx4kplngw8n2c4xxqwxjyiij0dvbynm2y35nf04l6p9bx"; #zen
|
||||
isLqx = false;
|
||||
};
|
||||
# ./update-zen.py lqx
|
||||
lqxVariant = {
|
||||
version = "6.7.3"; #lqx
|
||||
version = "6.7.4"; #lqx
|
||||
suffix = "lqx1"; #lqx
|
||||
sha256 = "19yia3bvzl9yax7z550hw9nb2n7xjmd87gsva52dy1khj49285nx"; #lqx
|
||||
sha256 = "1p8vgz3qsrpv1fbil2nkdlfzq4mfmjy9kvh264ckmwn4iay0kxmw"; #lqx
|
||||
isLqx = true;
|
||||
};
|
||||
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "targetcli";
|
||||
version = "2.1.57";
|
||||
version = "2.1.58";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-iscsi";
|
||||
repo = "${pname}-fb";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7JRNHKku9zTeSafL327hkM/E5EWTKqwPudCfmngvWuo=";
|
||||
hash = "sha256-9QYo7jGk9iWr26j0qPQCqYsJ+vLXAsO4Xs7+7VT9/yc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [ configshell rtslib ];
|
||||
@ -26,6 +26,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
description = "A command shell for managing the Linux LIO kernel target";
|
||||
homepage = "https://github.com/open-iscsi/targetcli-fb";
|
||||
license = licenses.asl20;
|
||||
maintainers = lib.teams.helsinki-systems.members;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,26 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pg_tileserv";
|
||||
version = "1.0.10";
|
||||
version = "1.0.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CrunchyData";
|
||||
repo = "pg_tileserv";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Y8GAmWpnXQGmFcy44wFUQGpA8OvT7u1rY1ZGNg1Qwgs=";
|
||||
hash = "sha256-xTIx39eLmHBUlaUjQy9KGpi5X4AU93DzX+Ofg5PMLWE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Without this, we get error messages like:
|
||||
# vendor/golang.org/x/sys/unix/syscall.go:83:16: unsafe.Slice requires go1.17 or later (-lang was set to go1.16; check go.mod)
|
||||
# The patch was generated by changing "go 1.15" to "go 1.17" and executing `go mod tidy`.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/CrunchyData/pg_tileserv/commit/d8e01469344895267ead9fa35ee7bdb8f966a710.patch";
|
||||
hash = "sha256-1P3dV8h51X+MEH2u1n6RxZvBPXBpQWrZBBCTOoCEWQU=";
|
||||
})
|
||||
];
|
||||
|
||||
vendorHash = "sha256-gXJFuvJ2d/e91TAtBzV3p2MwriJtUlIuNRw1+3iXJBA=";
|
||||
vendorHash = "sha256-8CvYvoIKOYvR7npCV65ZqZGR8KCTH4GabTt/JGQG3uc=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.programVersion=${version}" ];
|
||||
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.55.0";
|
||||
version = "2.56.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "azure-cli-${version}-src";
|
||||
owner = "Azure";
|
||||
repo = "azure-cli";
|
||||
rev = "azure-cli-${version}";
|
||||
hash = "sha256-+4ju+KOQ9LG1nzYnHOZ4mvXf6SazcrIgw/Q2mvetPMc=";
|
||||
hash = "sha256-rlyBp0aVjmOCIb000PdvU7nJlC9vvk+nVmIEtMTKEG8=";
|
||||
};
|
||||
|
||||
# put packages that needs to be overridden in the py package scope
|
||||
|
||||
@ -64,6 +64,8 @@ let
|
||||
azure/cli/core/tests \
|
||||
--ignore=azure/cli/core/tests/test_profile.py \
|
||||
--ignore=azure/cli/core/tests/test_generic_update.py \
|
||||
--ignore=azure/cli/core/tests/test_cloud.py \
|
||||
--ignore=azure/cli/core/tests/test_extension.py \
|
||||
-k 'not metadata_url and not test_send_raw_requests and not test_format_styled_text_legacy_powershell'
|
||||
'';
|
||||
|
||||
@ -102,7 +104,7 @@ let
|
||||
azure-mgmt-billing = overrideAzureMgmtPackage super.azure-mgmt-billing "6.0.0" "zip" "sha256-1PXFpBiKRW/h6zK2xF9VyiBpx0vkHrdpIYQLOfL1wH8=";
|
||||
azure-mgmt-botservice = overrideAzureMgmtPackage super.azure-mgmt-botservice "2.0.0b3" "zip" "sha256-XZGQOeMw8usyQ1tl8j57fZ3uqLshomHY9jO/rbpQOvM=";
|
||||
azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "13.5.0" "zip" "sha256-RK8LGbH4J+nN6gnGBUweZgkqUcMrwe9aVtvZtAvFeBU=";
|
||||
azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "30.3.0" "tar.gz" "sha256-5Sl4Y0D4YqpqIYp61qW+trn7VYM8XKoIUcwzFNBJO2M=";
|
||||
azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "30.4.0" "tar.gz" "sha256-C3Qo/YvRXHy9fGa5uwEOClyzeoBs7x9JSNkHGRV2kzQ=";
|
||||
azure-mgmt-containerinstance = overrideAzureMgmtPackage super.azure-mgmt-containerinstance "10.1.0" "zip" "sha256-eNQ3rbKFdPRIyDjtXwH5ztN4GWCYBh3rWdn3AxcEwX4=";
|
||||
azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "10.1.0" "zip" "sha256-VrX9YfYNvlA8+eNqHCp35BAeQZzQKakZs7ZZKwT8oYc=";
|
||||
azure-mgmt-core = overrideAzureMgmtPackage super.azure-mgmt-core "1.3.2" "zip" "sha256-B/Sv6COlXXBLBI1h7f3BMYwFHtWfJEAyEmNQvpXp1QE=";
|
||||
@ -181,8 +183,8 @@ let
|
||||
azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "9.0.0" "zip"
|
||||
"sha256-TI7l8sSQ2QUgPqiE3Cu/F67Wna+KHbQS3fuIjOb95ZM=";
|
||||
|
||||
azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "7.0.0" "zip"
|
||||
"sha256-WvyNgfiliEt6qawqy8Le8eifhxusMkoZbf6YcyY1SBA=";
|
||||
azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "7.2.0" "tar.gz"
|
||||
"sha256-78/m9/Ug7Qq8/oZRfhyM8CpxL3N6PbDbfLRsbWR5ge0=";
|
||||
|
||||
azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "10.1.0" "zip"
|
||||
"sha256-eJiWTOCk2C79Jotku9bKlu3vU6H8004hWrX+h76MjQM=";
|
||||
|
||||
@ -278,10 +278,10 @@ let
|
||||
]);
|
||||
inherit (ceph-python-env.python) sitePackages;
|
||||
|
||||
version = "18.2.0";
|
||||
version = "18.2.1";
|
||||
src = fetchurl {
|
||||
url = "https://download.ceph.com/tarballs/ceph-${version}.tar.gz";
|
||||
hash = "sha256:0k9nl6xi5brva51rr14m7ig27mmmd7vrpchcmqc40q3c2khn6ns9";
|
||||
hash = "sha256-gHWwNHf0KtI7Hv0MwaCqP6A3YR/AWakfUZTktRyddko=";
|
||||
};
|
||||
in rec {
|
||||
ceph = stdenv.mkDerivation {
|
||||
|
||||
@ -34,6 +34,7 @@ rustPlatform.buildRustPackage rec {
|
||||
description = "Use neovim as pager";
|
||||
homepage = "https://github.com/I60R/page";
|
||||
license = licenses.mit;
|
||||
mainProgram = "page";
|
||||
maintainers = [ maintainers.s1341 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,16 +9,16 @@ in
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "vaultwarden";
|
||||
version = "1.30.1";
|
||||
version = "1.30.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dani-garcia";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-9JCrEe0tla4v207XPgprLqP3g0BslpX8f7xa9aUhQcg=";
|
||||
hash = "sha256-vUAgW/kTFO9yzWFIWqM1f6xEZYH8ojIdt2eOhP9ID8g=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-4KyBMOdTAHe5uD6X69gMd0aqIo4w2Rqrlg+25yY2B6o=";
|
||||
cargoHash = "sha256-+FmVkemZTlFOf+fnTJED3u13pXeAuP/wIvEb96Vwa6I=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = with lib; [ openssl ]
|
||||
@ -37,8 +37,9 @@ rustPlatform.buildRustPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Unofficial Bitwarden compatible server written in Rust";
|
||||
homepage = "https://github.com/dani-garcia/vaultwarden";
|
||||
changelog = "https://github.com/dani-garcia/vaultwarden/releases/tag/${version}";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ msteen ivan ];
|
||||
maintainers = with maintainers; [ SuperSandro2000 ivan ];
|
||||
mainProgram = "vaultwarden";
|
||||
};
|
||||
}
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2024.1.1b";
|
||||
version = "2024.1.2";
|
||||
|
||||
bw_web_builds = fetchFromGitHub {
|
||||
owner = "dani-garcia";
|
||||
repo = "bw_web_builds";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jdr+3sIFdKmi0CI3TyFv+wCbhOBJECKQtx+X5EZjRsQ=";
|
||||
hash = "sha256-XpFGLZpX5BeP6cEZfGlNnh94aS6As0eCnllVyHLrOWo=";
|
||||
};
|
||||
|
||||
in buildNpmPackage rec {
|
||||
@ -24,10 +24,10 @@ in buildNpmPackage rec {
|
||||
owner = "bitwarden";
|
||||
repo = "clients";
|
||||
rev = "web-v${lib.removeSuffix "b" version}";
|
||||
hash = "sha256-695iCkFhPEyyI4ekbjsdWpxgPy+bX392/X30HyL4F4Y=";
|
||||
hash = "sha256-hzAkVzaCjwoZ/PMnsnSmsqUBWLhqfPWuWVujChy0V38=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-IJ5JVz9hHu3NOzFJAyzfhsMfPQgYQGntDEDuBMI/iZc=";
|
||||
npmDepsHash = "sha256-KTqPf8jy8cgGz0+1GssSzEfPVSSQlLenLPgHggNoGfc=";
|
||||
|
||||
postPatch = ''
|
||||
ln -s ${bw_web_builds}/{patches,resources} ..
|
||||
|
||||
@ -90,6 +90,8 @@ makeScopeWithSplicing' {
|
||||
|
||||
waylib = callPackage ../development/libraries/waylib { };
|
||||
|
||||
wayqt = callPackage ../development/libraries/wayqt { };
|
||||
|
||||
} // lib.optionalAttrs pkgs.config.allowAliases {
|
||||
# Convert to a throw on 01-01-2023.
|
||||
# Warnings show up in various cli tool outputs, throws do not.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user