mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 12:29:02 +02:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
be07e18261
|
|
@ -6985,6 +6985,12 @@
|
|||
githubId = 17029738;
|
||||
name = "Jean-Charles Quillet";
|
||||
};
|
||||
jedsek = {
|
||||
email = "jedsek@qq.com";
|
||||
github = "jedsek";
|
||||
githubId = 63626406;
|
||||
name = "Jedsek";
|
||||
};
|
||||
jefdaj = {
|
||||
email = "jefdaj@gmail.com";
|
||||
github = "jefdaj";
|
||||
|
|
|
|||
|
|
@ -426,6 +426,21 @@ with lib.maintainers; {
|
|||
shortName = "Linux Kernel";
|
||||
};
|
||||
|
||||
lisp = {
|
||||
members = [
|
||||
raskin
|
||||
lukego
|
||||
nagy
|
||||
uthar
|
||||
];
|
||||
githubTeams = [
|
||||
"lisp"
|
||||
];
|
||||
scope = "Maintain the Lisp ecosystem.";
|
||||
shortName = "lisp";
|
||||
enableFeatureFreezePing = true;
|
||||
};
|
||||
|
||||
llvm = {
|
||||
members = [
|
||||
dtzWill
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ let
|
|||
configPath = pkgs.writeText "smokeping.conf" configFile;
|
||||
cgiHome = pkgs.writeScript "smokeping.fcgi" ''
|
||||
#!${pkgs.bash}/bin/bash
|
||||
${cfg.package}/bin/smokeping_cgi ${configPath}
|
||||
${cfg.package}/bin/smokeping_cgi /etc/smokeping.conf
|
||||
'';
|
||||
in
|
||||
|
||||
|
|
@ -307,6 +307,7 @@ in
|
|||
source = "${pkgs.fping}/bin/fping";
|
||||
};
|
||||
};
|
||||
environment.etc."smokeping.conf".source = configPath;
|
||||
environment.systemPackages = [ pkgs.fping ];
|
||||
users.users.${cfg.user} = {
|
||||
isNormalUser = false;
|
||||
|
|
@ -327,18 +328,23 @@ in
|
|||
# Thus, we need to make `smokepingHome` (which is given to `thttpd -d` below) `755`.
|
||||
homeMode = "755";
|
||||
};
|
||||
users.groups.${cfg.user} = {};
|
||||
users.groups.${cfg.user} = { };
|
||||
systemd.services.smokeping = {
|
||||
requiredBy = [ "multi-user.target"];
|
||||
reloadTriggers = [ configPath ];
|
||||
requiredBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
User = cfg.user;
|
||||
Restart = "on-failure";
|
||||
ExecStart = "${cfg.package}/bin/smokeping --config=${configPath} --nodaemon";
|
||||
ExecStart = "${cfg.package}/bin/smokeping --config=/etc/smokeping.conf --nodaemon";
|
||||
};
|
||||
preStart = ''
|
||||
mkdir -m 0755 -p ${smokepingHome}/cache ${smokepingHome}/data
|
||||
rm -f ${smokepingHome}/cropper
|
||||
ln -s ${cfg.package}/htdocs/cropper ${smokepingHome}/cropper
|
||||
rm -f ${smokepingHome}/css
|
||||
ln -s ${cfg.package}/htdocs/css ${smokepingHome}/css
|
||||
rm -f ${smokepingHome}/js
|
||||
ln -s ${cfg.package}/htdocs/js ${smokepingHome}/js
|
||||
rm -f ${smokepingHome}/smokeping.fcgi
|
||||
ln -s ${cgiHome} ${smokepingHome}/smokeping.fcgi
|
||||
${cfg.package}/bin/smokeping --check --config=${configPath}
|
||||
|
|
|
|||
|
|
@ -31,11 +31,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wasabiwallet";
|
||||
version = "2.0.2.2";
|
||||
version = "2.0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz";
|
||||
sha256 = "sha256-Mwr2TwJsA7+G5U2FHOC6SMgiYxuy6fAiA3t7oJGSVaA=";
|
||||
sha256 = "sha256-RlWaeOK6XqxyCIQQp1/X6iG9t7f3ER5K+S3ZvPg6wBg=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@ let
|
|||
in {
|
||||
nightly = libsForQt5.callPackage ./generic.nix rec {
|
||||
pname = "citra-nightly";
|
||||
version = "1765";
|
||||
version = "1873";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "citra-emu";
|
||||
repo = "citra-nightly";
|
||||
rev = "nightly-${version}";
|
||||
sha256 = "0d3dfh63cmsy5idbypdz3ibydmb4a35sfv7qmxxlcpc390pp9cvq";
|
||||
sha256 = "1csn9n1s2mvxwk2mahwm8mc4zgn40im374hcsqgz8gaxjkmnx288";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
@ -30,13 +30,13 @@ in {
|
|||
|
||||
canary = libsForQt5.callPackage ./generic.nix rec {
|
||||
pname = "citra-canary";
|
||||
version = "2146";
|
||||
version = "2440";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "citra-emu";
|
||||
repo = "citra-canary";
|
||||
rev = "canary-${version}";
|
||||
sha256 = "1wnym0nklngimf5gaaa2703nz4g5iy572wlgp88h67rrh9b4f04r";
|
||||
sha256 = "06f2qnvywyaf8jc43jrzjhfshj3k21ggk8wdrvd9wjsmrryvqgbz";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
|
|||
"-DUSE_SYSTEM_BOOST=ON"
|
||||
"-DCITRA_USE_BUNDLED_FFMPEG=OFF"
|
||||
"-DCITRA_USE_BUNDLED_QT=OFF"
|
||||
"-DCITRA_USE_BUNDLED_SDL2=OFF"
|
||||
"-DUSE_SYSTEM_SDL2=ON"
|
||||
|
||||
# We dont want to bother upstream with potentially outdated compat reports
|
||||
"-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON"
|
||||
|
|
@ -65,6 +65,10 @@ stdenv.mkDerivation rec {
|
|||
++ lib.optional enableFdk "-DENABLE_FDK=ON";
|
||||
|
||||
postPatch = ''
|
||||
# Fix file not found when looking in var/empty instead of opt
|
||||
mkdir externals/dynarmic/src/dynarmic/ir/var
|
||||
ln -s ../opt externals/dynarmic/src/dynarmic/ir/var/empty
|
||||
|
||||
# Prep compatibilitylist
|
||||
ln -s ${compat-list} ./dist/compatibility_list/compatibility_list.json
|
||||
|
||||
|
|
|
|||
|
|
@ -29,13 +29,13 @@
|
|||
|
||||
buildDotnetModule rec {
|
||||
pname = "ryujinx";
|
||||
version = "1.1.687"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
|
||||
version = "1.1.692"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ryujinx";
|
||||
repo = "Ryujinx";
|
||||
rev = "460f96967de6f5cb729ed57baaa4dad2178c8cb6";
|
||||
sha256 = "008mjih7lp2zq86g750s237d9g2p2jqfryp6izac3iqr3s7dbr6g";
|
||||
rev = "1b41b285ac7f551c3495ced436ce3930ad7223b4";
|
||||
sha256 = "07s42xmdagi97i7c3mm9qak9msgv4c75say10dl4nha784kxkbvp";
|
||||
};
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_7_0;
|
||||
|
|
|
|||
25
pkgs/applications/emulators/ryujinx/deps.nix
generated
25
pkgs/applications/emulators/ryujinx/deps.nix
generated
|
|
@ -2,24 +2,25 @@
|
|||
# Please dont edit it manually, your changes might get overwritten!
|
||||
|
||||
{ fetchNuGet }: [
|
||||
(fetchNuGet { pname = "Avalonia"; version = "0.10.18"; sha256 = "01x7fc8rdkzba40piwi1ngsk7f8jawzn5bcq2la96hphsiahaarh"; })
|
||||
(fetchNuGet { pname = "Avalonia"; version = "0.10.19"; sha256 = "1yzrbp0b6kv9h9d4kl96ldr6ln40xj1j2yvbvpm0pgv7ajwr7qhc"; })
|
||||
(fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2020091801"; sha256 = "04jm83cz7vkhhr6n2c9hya2k8i2462xbf6np4bidk55as0jdq43a"; })
|
||||
(fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "0.10.18"; sha256 = "1qbb527jvhv2p8dcxi7lhm3lczy96j546gb5w09gh90dmzaq45bw"; })
|
||||
(fetchNuGet { pname = "Avalonia.Desktop"; version = "0.10.18"; sha256 = "0iaby5696km0yl0bs2a8i6a5ypras54mimnmh9wjwarwniqj8yjs"; })
|
||||
(fetchNuGet { pname = "Avalonia.Diagnostics"; version = "0.10.18"; sha256 = "1qsrzv1fz73p46p9v60qqds229znfv9hawnams5hxwl46jn2v9cp"; })
|
||||
(fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "0.10.18"; sha256 = "173apfayxkm3lgj7xk9xzsbxmdhv44svr49ccqnd1dii7y69bgny"; })
|
||||
(fetchNuGet { pname = "Avalonia.Markup.Xaml.Loader"; version = "0.10.18"; sha256 = "0vcbhwckzxgcq9wxim91zk30kzjaydr9szl4rbr3rz85447hj9pi"; })
|
||||
(fetchNuGet { pname = "Avalonia.Native"; version = "0.10.18"; sha256 = "1hvmjs7wfcbycviky79g1p5q3bzs8j31sr53nnqxqy6pnbmg0nxg"; })
|
||||
(fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "0.10.18"; sha256 = "0phxxz4r1llklvp4svy9qlsms3qw77crai3ww70g03fifmmr9qq2"; })
|
||||
(fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "0.10.19"; sha256 = "0wlmr4dlz8x3madm7xwhmsf0kgdnwcy6n7zvfd9x6h0bllii1lbn"; })
|
||||
(fetchNuGet { pname = "Avalonia.Desktop"; version = "0.10.19"; sha256 = "0vghwp1wx6l1z0dlvd9aqdaikz6k34q0i9yzaphqlzjp6ms2g2ny"; })
|
||||
(fetchNuGet { pname = "Avalonia.Diagnostics"; version = "0.10.19"; sha256 = "1zlcp8mwn2nscrdsvxlspny22m054gsva9az27pvk7s2s5mrqgfk"; })
|
||||
(fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "0.10.19"; sha256 = "01fin1w9nwa3c9kpvbri26x1r4g59hmayx9r5hxwbhq7s7vm5ghr"; })
|
||||
(fetchNuGet { pname = "Avalonia.Markup.Xaml.Loader"; version = "0.10.19"; sha256 = "19b74qs4bfslzldvs87r3skynw9k0bh7m6a2g9q67xb9ppwspr8n"; })
|
||||
(fetchNuGet { pname = "Avalonia.Native"; version = "0.10.19"; sha256 = "0c9rw2wckyx9h5yfhm0af5zbs53n9bnhv0mlshl7mn0p92v1wfl3"; })
|
||||
(fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "0.10.19"; sha256 = "0klk9hqas0h3d3lmr0di175nw2kwq5br1xpprkb4y4m83r5lfy0s"; })
|
||||
(fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.18"; sha256 = "1vi83d9q6m2zd7b5snyzjxsj3vdp5bmi5vqhfslzghslpbhj2zwv"; })
|
||||
(fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.19"; sha256 = "16cl9ssmyif2a25fq9kvxs2vr83j589yns53zkfr3wmggl9n6lf2"; })
|
||||
(fetchNuGet { pname = "Avalonia.Svg"; version = "0.10.18"; sha256 = "06h7yh2lkm4rqfchn7nxqjbqx4afh42w61z9sby7b5gj56h5a84q"; })
|
||||
(fetchNuGet { pname = "Avalonia.Svg.Skia"; version = "0.10.18"; sha256 = "0s25aq3xz0km55jwdxp59z8cc0d1zqaag1hiwnxdzd30id2ahn66"; })
|
||||
(fetchNuGet { pname = "Avalonia.Win32"; version = "0.10.18"; sha256 = "1rvqydbzdi2n6jw4xx9q8i025w5zsgcli9vmv0vw1d51rd4cnc4k"; })
|
||||
(fetchNuGet { pname = "Avalonia.X11"; version = "0.10.18"; sha256 = "0bzhbnz0dimxbpjxcrphnjn8nk37hqw0b83s2nsha4gzqvpc75b2"; })
|
||||
(fetchNuGet { pname = "Avalonia.Win32"; version = "0.10.19"; sha256 = "1pd3jmrdc738j7b4d8rzaj7fxrfq1m2pl3i62z2ym3h0sxl51xy2"; })
|
||||
(fetchNuGet { pname = "Avalonia.X11"; version = "0.10.19"; sha256 = "1h71w73r7r9ci059qwsjqnhp60l8sfd3i3xsw37qfnbhslcna6hh"; })
|
||||
(fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; sha256 = "1sldkj8lakggn4hnyabjj1fppqh50fkdrr1k99d4gswpbk5kv582"; })
|
||||
(fetchNuGet { pname = "Concentus"; version = "1.1.7"; sha256 = "0y5z444wrbhlmsqpy2sxmajl1fbf74843lvgj3y6vz260dn2q0l0"; })
|
||||
(fetchNuGet { pname = "DiscordRichPresence"; version = "1.1.3.18"; sha256 = "0p4bhaggjjfd4gl06yiphqgncxgcq2bws4sjkrw0n2ldf3hgrps3"; })
|
||||
(fetchNuGet { pname = "DynamicData"; version = "7.12.11"; sha256 = "159037gd4rn8z5wdkbnb296rw5csay8rjigi1h4n35mjfg4nhm8f"; })
|
||||
(fetchNuGet { pname = "DynamicData"; version = "7.13.1"; sha256 = "0hy2ba2nkhgp23glkinhfx3v892fkkf4cr9m41daaahnl2r2l8y1"; })
|
||||
(fetchNuGet { pname = "ExCSS"; version = "4.1.4"; sha256 = "1y50xp6rihkydbf5l73mr3qq2rm6rdfjrzdw9h1dw9my230q5lpd"; })
|
||||
(fetchNuGet { pname = "Fizzler"; version = "1.2.1"; sha256 = "1w5jb1d0figbv68dydbnlcsfmqlc3sv9z1zxp7d79dg2dkarc4qm"; })
|
||||
(fetchNuGet { pname = "FluentAvaloniaUI"; version = "1.4.5"; sha256 = "1j5ivy83f13dgn09qrfkq44ijvh0m9rbdx8760g47di70c4lda7j"; })
|
||||
|
|
@ -275,5 +276,5 @@
|
|||
(fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; })
|
||||
(fetchNuGet { pname = "Tmds.DBus"; version = "0.9.0"; sha256 = "0vvx6sg8lxm23g5jvm5wh2gfs95mv85vd52lkq7d1b89bdczczf3"; })
|
||||
(fetchNuGet { pname = "UnicornEngine.Unicorn"; version = "2.0.2-rc1-fb78016"; sha256 = "1r43b5fd5q8xq8b5nk11jsz2gnm96dh7sxc0rrv2p605ivz7icin"; })
|
||||
(fetchNuGet { pname = "XamlNameReferenceGenerator"; version = "1.5.1"; sha256 = "11sld5a9z2rdglkykvylghka7y37ny18naywpgpxp485m9bc63wc"; })
|
||||
(fetchNuGet { pname = "XamlNameReferenceGenerator"; version = "1.6.1"; sha256 = "0348gj9g5rl0pj2frx4vscj6602gfyn9ba3i1rmfcrxh9jwwa09m"; })
|
||||
]
|
||||
|
|
|
|||
|
|
@ -33,14 +33,14 @@ stdenv.mkDerivation rec {
|
|||
"snes9x-gtk"
|
||||
else
|
||||
"snes9x";
|
||||
version = "1.62.1";
|
||||
version = "1.62.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "snes9xgit";
|
||||
repo = "snes9x";
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-y/tNJmmgigMEqjBWLyqxM/GQ2jcu4YXZjP0AbIjoPLg=";
|
||||
hash = "sha256-+KHpvz7nfwGXjzDAK/V+2JDRT1sa0kXDkg7XcRyvSP8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
47
pkgs/applications/graphics/brlcad/default.nix
Normal file
47
pkgs/applications/graphics/brlcad/default.nix
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, fontconfig
|
||||
, libX11
|
||||
, libXi
|
||||
, freetype
|
||||
, mesa
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "brlcad";
|
||||
version = "7.34.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BRL-CAD";
|
||||
repo = pname;
|
||||
rev = "refs/tags/rel-${lib.replaceStrings [ "." ] [ "-" ] version}";
|
||||
hash = "sha256-Re5gEXlqdPxniaEP13Q0v0O9rt40V5NrxoUpcNBwn7s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
fontconfig
|
||||
libX11
|
||||
libXi
|
||||
freetype
|
||||
mesa
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBRLCAD_ENABLE_STRICT=OFF"
|
||||
"-DCMAKE_BUILD_TYPE=Release"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://brlcad.org";
|
||||
description = "BRL-CAD is a powerful cross-platform open source combinatorial solid modeling system";
|
||||
license = with licenses; [ lgpl21 bsd2 ];
|
||||
maintainers = with maintainers; [ GaetanLepage ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -41,17 +41,20 @@ stdenv.mkDerivation rec {
|
|||
buildInputs =
|
||||
[ boost ffmpeg gettext glew ilmbase
|
||||
freetype libjpeg libpng libsamplerate libsndfile libtiff libwebp
|
||||
opencolorio openexr openimagedenoise openimageio openjpeg python zlib zstd fftw jemalloc
|
||||
opencolorio openexr openimageio openjpeg python zlib zstd fftw jemalloc
|
||||
alembic
|
||||
(opensubdiv.override { inherit cudaSupport; })
|
||||
tbb
|
||||
embree
|
||||
gmp
|
||||
pugixml
|
||||
potrace
|
||||
libharu
|
||||
libepoxy
|
||||
]
|
||||
++ lib.optional (!stdenv.isAarch64) [
|
||||
openimagedenoise
|
||||
embree
|
||||
]
|
||||
++ (if (!stdenv.isDarwin) then [
|
||||
libXi libX11 libXext libXrender
|
||||
libGLU libGL openal
|
||||
|
|
@ -70,8 +73,6 @@ stdenv.mkDerivation rec {
|
|||
pythonPath = with python310Packages; [ numpy requests ];
|
||||
|
||||
postPatch = ''
|
||||
# allow usage of dynamically linked embree
|
||||
rm build_files/cmake/Modules/FindEmbree.cmake
|
||||
'' +
|
||||
(if stdenv.isDarwin then ''
|
||||
: > build_files/cmake/platform/platform_apple_xcode.cmake
|
||||
|
|
@ -121,6 +122,9 @@ stdenv.mkDerivation rec {
|
|||
"-DWITH_IMAGE_OPENJPEG=ON"
|
||||
"-DWITH_OPENCOLLADA=${if colladaSupport then "ON" else "OFF"}"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isAarch64 [
|
||||
"-DWITH_CYCLES_EMBREE=OFF"
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
"-DWITH_CYCLES_OSL=OFF" # requires LLVM
|
||||
"-DWITH_OPENVDB=OFF" # OpenVDB currently doesn't build on darwin
|
||||
|
|
@ -171,7 +175,7 @@ stdenv.mkDerivation rec {
|
|||
# say: "We've decided to cancel the BL offering for an indefinite period."
|
||||
# OptiX, enabled with cudaSupport, is non-free.
|
||||
license = with licenses; [ gpl2Plus ] ++ optional cudaSupport unfree;
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ];
|
||||
maintainers = with maintainers; [ goibhniu veprbl ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "fluidd";
|
||||
version = "1.23.3";
|
||||
version = "1.23.4";
|
||||
|
||||
src = fetchurl {
|
||||
name = "fluidd-v${version}.zip";
|
||||
url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip";
|
||||
sha256 = "sha256-CCIu6DNU71oL0JIW3mQ5ThRSjbXeBmJ4FbF6i2dERbc=";
|
||||
sha256 = "sha256-ofGjIxxk7tBEa4jbNSCNzZJBHvv+mA1u03f9KtdjIbQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ stdenv, lib, makeDesktopItem, makeWrapper, makeBinaryWrapper, lndir, config
|
||||
, buildPackages
|
||||
, jq, xdg-utils, writeText
|
||||
|
||||
## various stuff that can be plugged in
|
||||
|
|
@ -275,7 +276,7 @@ let
|
|||
# Symbolic link: wrap the link's target.
|
||||
oldExe="$(readlink -v --canonicalize-existing "$executablePath")"
|
||||
rm "$executablePath"
|
||||
elif wrapperCmd=$(${makeBinaryWrapper.extractCmd} "$executablePath"); [[ $wrapperCmd ]]; then
|
||||
elif wrapperCmd=$(${buildPackages.makeBinaryWrapper.extractCmd} "$executablePath"); [[ $wrapperCmd ]]; then
|
||||
# If the executable is a binary wrapper, we need to update its target to
|
||||
# point to $out, but we can't just edit the binary in-place because of length
|
||||
# issues. So we extract the command used to create the wrapper and add the
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "arkade";
|
||||
version = "0.9.5";
|
||||
version = "0.9.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexellis";
|
||||
repo = "arkade";
|
||||
rev = version;
|
||||
sha256 = "sha256-gC7HdOrmOIYTaksx/CxXMt4wIly3RBL1SsQRbwQWLi8=";
|
||||
sha256 = "sha256-EkpoXmaJ679B0sATDP/asJaywY4RFN7NNYc+7uyMQEA=";
|
||||
};
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, libpcap
|
||||
, openssl
|
||||
, stdenv
|
||||
, alsa-lib
|
||||
, expat
|
||||
|
|
@ -14,21 +15,22 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sniffnet";
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gyulyvgc";
|
||||
repo = "sniffnet";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-QEMd/vOi0DFCq7AJHhii7rnBAHS89XP3/b2UIewAgLc=";
|
||||
hash = "sha256-sJUc14MXaCS4OHtwdCuwI1b7NAlOnaGsXBNUYCEXJqQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-VcmiM7prK5l8Ow8K9TGUR2xfx9648IoU6i40hOGAqGQ=";
|
||||
cargoHash = "sha256-neRVpJmI4TgzvIQqKNqBr61O7rR8246PcxG50IIKE/M=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
libpcap
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
alsa-lib
|
||||
expat
|
||||
|
|
@ -43,6 +45,11 @@ rustPlatform.buildRustPackage rec {
|
|||
rustPlatform.bindgenHook
|
||||
];
|
||||
|
||||
# requires internet access
|
||||
checkFlags = [
|
||||
"--skip=secondary_threads::check_updates::tests::fetch_latest_release_from_github"
|
||||
];
|
||||
|
||||
postFixup = lib.optionalString stdenv.isLinux ''
|
||||
patchelf $out/bin/sniffnet \
|
||||
--add-rpath ${lib.makeLibraryPath [ vulkan-loader xorg.libX11 ]}
|
||||
|
|
|
|||
|
|
@ -1,19 +1,23 @@
|
|||
{ lib, stdenv, fetchurl, zlib }:
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, coin-utils, zlib, osi }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.17.6";
|
||||
version = "1.17.7";
|
||||
pname = "clp";
|
||||
src = fetchurl {
|
||||
url = "https://www.coin-or.org/download/source/Clp/Clp-${version}.tgz";
|
||||
sha256 = "0ap1f0lxppa6pnbc4bg7ih7a96avwaki482nig8w5fr3vg9wvkzr";
|
||||
src = fetchFromGitHub {
|
||||
owner = "coin-or";
|
||||
repo = "Clp";
|
||||
rev = "releases/${version}";
|
||||
hash = "sha256-CfAK/UbGaWvyk2ZxKEgziVruzZfz7WMJVi/YvdR/UNA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ zlib ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
propagatedBuildInputs = [ zlib coin-utils osi ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
license = licenses.epl10;
|
||||
license = licenses.epl20;
|
||||
homepage = "https://github.com/coin-or/Clp";
|
||||
description = "An open-source linear programming solver written in C++";
|
||||
platforms = platforms.darwin ++ [ "x86_64-linux" ];
|
||||
|
|
|
|||
48
pkgs/applications/video/bilibili/default.nix
Normal file
48
pkgs/applications/video/bilibili/default.nix
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, electron
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bilibili";
|
||||
version = "1.9.2-1";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_amd64.deb";
|
||||
hash = "sha256-y3dUBImvcIG89m82RaIOa0cxJXIAIGa+n3FJkASacaY=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
|
||||
ar x $src
|
||||
tar xf data.tar.xz
|
||||
|
||||
runHook postUnpack
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
cp -r usr/share $out/share
|
||||
sed -i "s|Exec=.*|Exec=$out/bin/bilibili|" $out/share/applications/*.desktop
|
||||
cp -r opt/apps/io.github.msojocs.bilibili/files/bin/app $out/opt
|
||||
makeWrapper ${electron}/bin/electron $out/bin/bilibili \
|
||||
--argv0 "bilibili" \
|
||||
--add-flags "$out/opt/app.asar"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Electron-based bilibili desktop client";
|
||||
homepage = "https://github.com/msojocs/bilibili-linux";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jedsek ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,33 +1,87 @@
|
|||
{ lib, stdenv, fetchurl, cmake, meson, ninja, pkg-config
|
||||
, cairo, doctest, libdrm, libexecinfo, libinput, libjpeg, libxkbcommon, wayland
|
||||
, wayland-protocols, wf-config, wlroots, mesa
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, wf-config
|
||||
, cairo
|
||||
, doctest
|
||||
, libdrm
|
||||
, libexecinfo
|
||||
, libinput
|
||||
, libjpeg
|
||||
, libxkbcommon
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, wayland-scanner
|
||||
, wlroots
|
||||
, pango
|
||||
, xorg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wayfire";
|
||||
version = "0.7.2";
|
||||
version = "0.7.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/WayfireWM/wayfire/releases/download/v${version}/wayfire-${version}.tar.xz";
|
||||
sha256 = "1gasijjyfl00zpy6j9hh6qpwv0sw42h9irycbnm693j3vw9mcy66";
|
||||
src = fetchFromGitHub {
|
||||
owner = "WayfireWM";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-Z+rR9pY244I3i/++XZ4ROIkq3vtzMgcxxHvJNxFD9is=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake meson ninja pkg-config wayland ];
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
wayland-scanner
|
||||
];
|
||||
|
||||
|
||||
buildInputs = [
|
||||
cairo doctest libdrm libexecinfo libinput libjpeg libxkbcommon wayland
|
||||
wayland-protocols wf-config wlroots mesa
|
||||
wf-config
|
||||
libdrm
|
||||
libexecinfo
|
||||
libinput
|
||||
libjpeg
|
||||
libxkbcommon
|
||||
wayland-protocols
|
||||
xorg.xcbutilwm
|
||||
wayland
|
||||
cairo
|
||||
pango
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
wlroots
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
cmake
|
||||
doctest
|
||||
];
|
||||
|
||||
# CMake is just used for finding doctest.
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
mesonFlags = [ "--sysconfdir" "/etc" ];
|
||||
doCheck = true;
|
||||
|
||||
mesonFlags = [
|
||||
"--sysconfdir /etc"
|
||||
"-Duse_system_wlroots=enabled"
|
||||
"-Duse_system_wfconfig=enabled"
|
||||
];
|
||||
|
||||
passthru.providedSessions = [ "wayfire" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wayfire.org/";
|
||||
description = "3D Wayland compositor";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ qyliss wucke13 ];
|
||||
maintainers = with maintainers; [ qyliss wucke13 rewine ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,27 +1,61 @@
|
|||
{ stdenv, lib, fetchurl, meson, ninja, pkg-config, wayland, wrapGAppsHook
|
||||
, gtk3, libevdev, libxml2, wayfire, wayland-protocols, wf-config, wf-shell
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, wayland
|
||||
, wrapGAppsHook
|
||||
, wayfire
|
||||
, wf-shell
|
||||
, wf-config
|
||||
, wayland-scanner
|
||||
, wayland-protocols
|
||||
, gtk3
|
||||
, libevdev
|
||||
, libxml2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wcm";
|
||||
version = "0.7.0";
|
||||
version = "0.7.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/WayfireWM/wcm/releases/download/v${version}/wcm-${version}.tar.xz";
|
||||
sha256 = "19za1fnlf5hz4n4mxxwqcr5yxp6mga9ah539ifnjnqrgvj19cjlj";
|
||||
src = fetchFromGitHub {
|
||||
owner = "WayfireWM";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-LJR9JGl49o4O6LARofz3jOeAqseGcmzVhMnhk/aobUU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config wayland wrapGAppsHook ];
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
wayland-scanner
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3 libevdev libxml2 wayfire wayland
|
||||
wayland-protocols wf-config wf-shell
|
||||
wayfire
|
||||
wf-config
|
||||
wf-shell
|
||||
wayland
|
||||
wayland-protocols
|
||||
gtk3
|
||||
libevdev
|
||||
libxml2
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Denable_wdisplays=false"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/WayfireWM/wcm";
|
||||
description = "Wayfire Config Manager";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ qyliss wucke13 ];
|
||||
maintainers = with maintainers; [ qyliss wucke13 rewine ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,20 +1,46 @@
|
|||
{ stdenv, lib, fetchurl, cmake, meson, ninja, pkg-config
|
||||
, doctest, glm, libevdev, libxml2
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, doctest
|
||||
, glm
|
||||
, libevdev
|
||||
, libxml2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wf-config";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/WayfireWM/wf-config/releases/download/v${version}/wf-config-${version}.tar.xz";
|
||||
sha256 = "1w75yxhz0nvw4mlv38sxp8k8wb5h99b51x3fdvizc3yaxanqa8kx";
|
||||
src = fetchFromGitHub {
|
||||
owner = "WayfireWM";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ADUBvDJcPYEB9ZvaFIgTfemo1WYwiWgCWX/z2yrEPtA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake meson ninja pkg-config ];
|
||||
buildInputs = [ doctest libevdev libxml2 ];
|
||||
propagatedBuildInputs = [ glm ];
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libevdev
|
||||
libxml2
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
glm
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
cmake
|
||||
doctest
|
||||
];
|
||||
# CMake is just used for finding doctest.
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
|
|
@ -24,7 +50,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/WayfireWM/wf-config";
|
||||
description = "Library for managing configuration files, written for Wayfire";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ qyliss wucke13 ];
|
||||
maintainers = with maintainers; [ qyliss wucke13 rewine ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,29 +1,53 @@
|
|||
{ stdenv, lib, fetchurl, meson, ninja, pkg-config, wayland, alsa-lib, gtkmm3, gtk-layer-shell, pulseaudio, wayfire, wf-config
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, wayland-scanner
|
||||
, wayfire
|
||||
, wf-config
|
||||
, alsa-lib
|
||||
, gtkmm3
|
||||
, gtk-layer-shell
|
||||
, pulseaudio
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wf-shell";
|
||||
version = "0.7.0";
|
||||
|
||||
# > Note to packagers: do not use the autogenerated "Source code"
|
||||
# > archives from GitHub, but the wf-shell-0.4.0.tar.xz file.
|
||||
src = fetchurl {
|
||||
url = "https://github.com/WayfireWM/wf-shell/releases/download/v${version}/wf-shell-${version}.tar.xz";
|
||||
sha256 = "1isybm9lcpxwyf6zh2vzkwrcnw3q7qxm21535g4f08f0l68cd5bl";
|
||||
src = fetchFromGitHub {
|
||||
owner = "WayfireWM";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-iQUBuNjbZuf51A69RC6NsMHFZCFRv+d9XZ0HtP6OpOA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config wayland ];
|
||||
buildInputs = [
|
||||
alsa-lib gtkmm3 gtk-layer-shell pulseaudio wayfire wf-config
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
wayland-scanner
|
||||
];
|
||||
|
||||
mesonFlags = [ "--sysconfdir" "/etc" ];
|
||||
buildInputs = [
|
||||
wayfire
|
||||
wf-config
|
||||
alsa-lib
|
||||
gtkmm3
|
||||
gtk-layer-shell
|
||||
pulseaudio
|
||||
];
|
||||
|
||||
mesonFlags = [ "--sysconfdir /etc" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/WayfireWM/wf-shell";
|
||||
description = "GTK3-based panel for Wayfire";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ qyliss wucke13 ];
|
||||
maintainers = with maintainers; [ qyliss wucke13 rewine ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ get_image_digest(){
|
|||
imageTag="latest"
|
||||
fi
|
||||
|
||||
skopeo --insecure-policy --tmpdir=$TMPDIR inspect "docker://$imageName:$imageTag" | jq '.Digest' -r
|
||||
skopeo --override-os "${os}" --override-arch "${arch}" --insecure-policy --tmpdir=$TMPDIR inspect "docker://$imageName:$imageTag" | jq '.Digest' -r
|
||||
}
|
||||
|
||||
get_name() {
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ let
|
|||
dtkcore = callPackage ./library/dtkcore { };
|
||||
dtkgui = callPackage ./library/dtkgui { };
|
||||
dtkwidget = callPackage ./library/dtkwidget { };
|
||||
deepin-pdfium = callPackage ./library/deepin-pdfium { };
|
||||
qt5platform-plugins = callPackage ./library/qt5platform-plugins { };
|
||||
qt5integration = callPackage ./library/qt5integration { };
|
||||
deepin-wayland-protocols = callPackage ./library/deepin-wayland-protocols { };
|
||||
|
|
@ -28,6 +29,7 @@ let
|
|||
gio-qt = callPackage ./library/gio-qt { };
|
||||
image-editor = callPackage ./library/image-editor { };
|
||||
udisks2-qt5 = callPackage ./library/udisks2-qt5 { };
|
||||
util-dfm = callPackage ./library/util-dfm { };
|
||||
|
||||
#### CORE
|
||||
dde-control-center = callPackage ./core/dde-control-center { };
|
||||
|
|
|
|||
42
pkgs/desktops/deepin/library/deepin-pdfium/default.nix
Normal file
42
pkgs/desktops/deepin/library/deepin-pdfium/default.nix
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, qmake
|
||||
, pkg-config
|
||||
, libchardet
|
||||
, lcms2
|
||||
, openjpeg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deepin-pdfium";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-gUIQ+fZ7VaYaIj1hbzER10ceoJZbvhJlnDTFIShMrKw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
buildInputs = [
|
||||
libchardet
|
||||
lcms2
|
||||
openjpeg
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "development library for pdf on deepin";
|
||||
homepage = "https://github.com/linuxdeepin/deepin-pdfium";
|
||||
license = licenses.lgpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
62
pkgs/desktops/deepin/library/util-dfm/default.nix
Normal file
62
pkgs/desktops/deepin/library/util-dfm/default.nix
Normal file
|
|
@ -0,0 +1,62 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, pkg-config
|
||||
, qtbase
|
||||
, libmediainfo
|
||||
, libsecret
|
||||
, libisoburn
|
||||
, libuuid
|
||||
, udisks
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "util-dfm";
|
||||
version = "1.2.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-+qqirRkvVyKvt+Pu/ghQjMe+O6a7/7IoJL8AWL4QlvE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix: use pkgconfig to check mount";
|
||||
url = "https://github.com/linuxdeepin/util-dfm/commit/fb8425a8c13f16e86db38ff84f43347fdc8ea468.diff";
|
||||
sha256 = "sha256-PGSRfnQ1MGmq0V3NBCoMk4p/T2x19VA04u9C+WcBKow=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
libmediainfo
|
||||
libsecret
|
||||
libuuid
|
||||
libisoburn
|
||||
udisks
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib"
|
||||
"-DPROJECT_VERSION=${version}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Toolkits of libdfm-io,libdfm-mount and libdfm-burn";
|
||||
homepage = "https://github.com/linuxdeepin/util-dfm";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
|
|
@ -119,7 +119,5 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.gpl2Plus;
|
||||
maintainers = teams.gnome.members;
|
||||
platforms = platforms.unix;
|
||||
# requires <gio/gdesktopappinfo.h>
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
description = "A JVM-based Common Lisp implementation";
|
||||
license = lib.licenses.gpl3 ;
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
maintainers = lib.teams.lisp.members;
|
||||
platforms = lib.platforms.linux;
|
||||
homepage = "https://common-lisp.net/project/armedbear/";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Clozure Common Lisp";
|
||||
homepage = "https://ccl.clozure.com/";
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
maintainers = lib.teams.lisp.members;
|
||||
platforms = attrNames options;
|
||||
# assembler failures during build, x86_64-darwin broken since 2020-10-14
|
||||
broken = (stdenv.isDarwin && stdenv.isx86_64);
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ in llvmPackages_15.stdenv.mkDerivation {
|
|||
meta = {
|
||||
description = "A Common Lisp implementation based on LLVM with C++ integration";
|
||||
license = lib.licenses.lgpl21Plus ;
|
||||
maintainers = [lib.maintainers.raskin lib.maintainers.uthar];
|
||||
maintainers = lib.teams.lisp.members;
|
||||
platforms = ["x86_64-linux" "x86_64-darwin"];
|
||||
# Upstream claims support, but breaks with:
|
||||
# error: use of undeclared identifier 'aligned_alloc'
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
ANSI Common Lisp standard.
|
||||
'';
|
||||
license = licenses.publicDomain;
|
||||
maintainers = [ ];
|
||||
maintainers = lib.teams.lisp.members;
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Lisp implementation aiming to be small, fast and easy to embed";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
maintainers = lib.teams.lisp.members;
|
||||
platforms = platforms.unix;
|
||||
# never built on aarch64-darwin since first introduction in nixpkgs
|
||||
broken = stdenv.isDarwin && stdenv.isAarch64;
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Lisp implementation aiming to be small, fast and easy to embed";
|
||||
homepage = "https://common-lisp.net/project/ecl/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
maintainers = lib.teams.lisp.members;
|
||||
platforms = platforms.unix;
|
||||
changelog = "https://gitlab.com/embeddable-common-lisp/ecl/-/raw/${version}/CHANGELOG";
|
||||
};
|
||||
|
|
|
|||
54
pkgs/development/compilers/gbforth/default.nix
Normal file
54
pkgs/development/compilers/gbforth/default.nix
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, gforth
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "gbforth";
|
||||
version = "unstable-2023-03-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ams-hackers";
|
||||
repo = "gbforth";
|
||||
rev = "428fcf5054fe301e90ac74b1d920ee3ecc375b5b";
|
||||
hash = "sha256-v1bdwT15Wg1VKpo74Cc3tsTl1uOKvKdlHWtbZkJ/qbA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/gbforth $out/bin
|
||||
cp -r lib shared src gbforth.fs $out/share/gbforth/
|
||||
makeWrapper ${gforth}/bin/gforth $out/bin/gbforth \
|
||||
--set GBFORTH_PATH $out/share/gbforth/lib \
|
||||
--add-flags $out/share/gbforth/gbforth.fs
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
$out/bin/gbforth examples/simon/simon.fs
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://gbforth.org/";
|
||||
description = "A Forth-based Game Boy development kit";
|
||||
longDescription = ''
|
||||
A Forth-based Game Boy development kit.
|
||||
It features a Forth-based assembler, a cross-compiler with support for
|
||||
lazy code generation and a library of useful words.
|
||||
'';
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ fgaz ];
|
||||
};
|
||||
}
|
||||
|
|
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = {
|
||||
description = "GNU Common Lisp compiler working via GCC";
|
||||
maintainers = [ lib.maintainers.raskin ];
|
||||
maintainers = lib.teams.lisp.members;
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "GNU Common Lisp compiler working via GCC";
|
||||
maintainers = [ maintainers.raskin ];
|
||||
maintainers = lib.teams.lisp.members;
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -60,6 +60,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://common-lisp.net/project/mkcl/";
|
||||
license = licenses.lgpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = lib.teams.lisp.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-UFqXQBeIQMSV4O439j9s06p1hh7xA98Tu79FsjK9PIY=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = with ocamlPackages; [
|
||||
ocaml
|
||||
];
|
||||
|
|
@ -23,9 +25,7 @@ stdenv.mkDerivation rec {
|
|||
num
|
||||
];
|
||||
|
||||
configureFlags = [ "--prefix" "${placeholder "out"}" ];
|
||||
|
||||
dontAddPrefix = true;
|
||||
prefixKey = "-prefix ";
|
||||
|
||||
meta = with lib; {
|
||||
description = "ReactiveML: a programming language for implementing interactive systems";
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Lisp compiler";
|
||||
homepage = "http://www.sbcl.org";
|
||||
license = licenses.publicDomain; # and FreeBSD
|
||||
maintainers = [ maintainers.raskin ];
|
||||
maintainers = lib.teams.lisp.members;
|
||||
platforms = attrNames options;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
description = "ANSI Common Lisp Implementation";
|
||||
homepage = "http://clisp.cons.org";
|
||||
maintainers = with lib.maintainers; [ raskin ];
|
||||
maintainers = lib.teams.lisp.members;
|
||||
platforms = lib.platforms.unix;
|
||||
# problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062
|
||||
broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64;
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
description = "ANSI Common Lisp Implementation";
|
||||
homepage = "http://clisp.cons.org";
|
||||
maintainers = with lib.maintainers; [ raskin ];
|
||||
maintainers = lib.teams.lisp.members;
|
||||
# problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,22 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.11.6";
|
||||
pname = "coinutils";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coin-or";
|
||||
repo = "CoinUtils";
|
||||
rev = "releases/${version}";
|
||||
hash = "sha256-avXp7eKSZ/Fe1QmSJiNDMnPQ70LlOHrBeUYb9lhka8c=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
license = licenses.epl20;
|
||||
homepage = "https://github.com/coin-or/CoinUtils";
|
||||
description = "Collection of classes and helper functions that are generally useful to multiple COIN-OR projects";
|
||||
maintainers = with maintainers; [ tmarkus ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,19 +1,21 @@
|
|||
{ stdenv, lib, fetchurl, gfortran, pkg-config
|
||||
, blas, zlib, bzip2
|
||||
{ stdenv, lib, fetchFromGitHub, gfortran, pkg-config
|
||||
, blas, zlib, bzip2, coin-utils
|
||||
, withGurobi ? false, gurobi
|
||||
, withCplex ? false, cplex }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osi";
|
||||
version = "0.108.6";
|
||||
version = "0.108.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.coin-or.org/download/source/Osi/Osi-${version}.tgz";
|
||||
sha256 = "1n2jlpq4aikbp0ncs16f7q1pj7yk6kny1bh4fmjaqnwrjw63zvsp";
|
||||
src = fetchFromGitHub {
|
||||
owner = "coin-or";
|
||||
repo = "Osi";
|
||||
rev = "releases/${version}";
|
||||
hash = "sha256-MTmt/MgsfEAXor2EZXJX05bQg5oOtMaN7oNxGv2PHJg=";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
[ blas zlib bzip2 ]
|
||||
[ blas zlib bzip2 coin-utils ]
|
||||
++ lib.optional withGurobi gurobi
|
||||
++ lib.optional withCplex cplex;
|
||||
nativeBuildInputs = [ gfortran pkg-config ];
|
||||
|
|
@ -35,7 +37,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "An abstract base class to a generic linear programming (LP) solver";
|
||||
homepage = "https://github.com/coin-or/Osi";
|
||||
license = licenses.epl10;
|
||||
license = licenses.epl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -222,6 +222,9 @@ let
|
|||
patches = [];
|
||||
propagatedBuildInputs = args.propagatedBuildInputs or []
|
||||
++ lispLibs ++ javaLibs ++ nativeLibs;
|
||||
meta = (args.meta or {}) // {
|
||||
maintainers = args.meta.maintainers or lib.teams.lisp.members;
|
||||
};
|
||||
})));
|
||||
|
||||
# Build the set of lisp packages using `lisp`
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiounifi";
|
||||
version = "44";
|
||||
version = "45";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "Kane610";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-SRI7c0cmrNSTOEyRbs6JGEg5O9tws+Dwn0G8HUqWEqc=";
|
||||
hash = "sha256-VwuZj0TBc8BBO6ZxpIAR0s0hrOI1muiT4AsDZ+xZPcI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "appthreat-vulnerability-db";
|
||||
version = "5.0.1";
|
||||
version = "5.0.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "AppThreat";
|
||||
repo = "vulnerability-db";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-u5gI5agNm1RT0FzsdQaqivKwiY5k7G/mtlSWCNP4V10=";
|
||||
hash = "sha256-3cCXpckhZEJnTbt0Id9NCmKVr7vmtM186Bp94HWW2Zo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -19,14 +19,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyterlab";
|
||||
version = "3.6.1";
|
||||
version = "3.6.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-rumMF0GA6YowRwKX0QuVno5k8iiJcMDeZfCm0rSAcDQ=";
|
||||
hash = "sha256-Nz6c+4py7dKUvhTxZmJWOiIM7PD7Jt56qxr5optom4I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{ lib
|
||||
{ stdenv
|
||||
, lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isPy27
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
, cython
|
||||
, numpy
|
||||
|
|
@ -13,22 +14,21 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "nitime";
|
||||
version = "0.9";
|
||||
disabled = isPy27;
|
||||
version = "0.10.1";
|
||||
disabled = pythonOlder "3.7";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-bn2QrbsfqUJim84vH5tt5T6h3YsGAlgu9GCMiNQ0OHQ=";
|
||||
hash = "sha256-NnoVrSt6MTTcNup1e+/1v5JoHCYcycuQH4rHLzXJt+Y=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
buildInputs = [ cython ];
|
||||
propagatedBuildInputs = [ numpy scipy matplotlib networkx nibabel ];
|
||||
|
||||
disabledTests = [
|
||||
# https://github.com/nipy/nitime/issues/197
|
||||
"test_FilterAnalyzer"
|
||||
];
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
doCheck = !stdenv.isDarwin; # tests hang indefinitely
|
||||
pythonImportsCheck = [ "nitime" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://nipy.org/nitime";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, pythonOlder
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
|
|
@ -17,16 +18,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pygmt";
|
||||
version = "0.8.0";
|
||||
version = "0.9.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GenericMappingTools";
|
||||
repo = "pygmt";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-wbqJaibRZW7qiNyLArr7I/dzHprILHQpORtdHWkIfSE=";
|
||||
hash = "sha256-XDIAFIU+chewMDEoQDYqSYvK1tT9afh44w3Yd7ILZIc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -34,20 +35,41 @@ buildPythonPackage rec {
|
|||
--replace "env.get(\"GMT_LIBRARY_PATH\", \"\")" "env.get(\"GMT_LIBRARY_PATH\", \"${gmt}/lib\")"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
propagatedBuildInputs = [ numpy netcdf4 pandas packaging xarray ];
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
netcdf4
|
||||
pandas
|
||||
packaging
|
||||
xarray
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-mpl
|
||||
ghostscript
|
||||
ipython
|
||||
];
|
||||
|
||||
# The *entire* test suite requires network access
|
||||
doCheck = false;
|
||||
|
||||
doCheck = false; # the *entire* test suite requires network access
|
||||
nativeCheckInputs = [ pytestCheckHook pytest-mpl ghostscript ipython ];
|
||||
postBuild = ''
|
||||
export HOME=$TMP
|
||||
'';
|
||||
pythonImportsCheck = [ "pygmt" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pygmt"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Python interface for the Generic Mapping Tools";
|
||||
homepage = "https://github.com/GenericMappingTools/pygmt";
|
||||
license = licenses.bsd3;
|
||||
changelog = "https://github.com/GenericMappingTools/pygmt/releases/tag/v${version}";
|
||||
# pygmt.exceptions.GMTCLibNotFoundError: Error loading the GMT shared library '/nix/store/r3xnnqgl89vrnq0kzxx0bmjwzks45mz8-gmt-6.1.1/lib/libgmt.dylib'
|
||||
broken = stdenv.isDarwin;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, callPackage
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, pythonRelaxDepsHook
|
||||
, torch
|
||||
, pythonOlder
|
||||
, spacy
|
||||
|
|
@ -22,6 +23,10 @@ buildPythonPackage rec {
|
|||
hash = "sha256-Up9ZlLlAM0CDXEYDI95KsLzA0TBz/uZFqEgZLmNIABA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
torch
|
||||
spacy
|
||||
|
|
@ -30,6 +35,10 @@ buildPythonPackage rec {
|
|||
transformers
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"transformers"
|
||||
];
|
||||
|
||||
# Test fails due to missing arguments for trfs2arrays().
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, flex, bison }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "minizinc";
|
||||
version = "2.7.0";
|
||||
version = "2.7.1";
|
||||
|
||||
nativeBuildInputs = [ cmake flex bison ];
|
||||
|
||||
|
|
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "MiniZinc";
|
||||
repo = "libminizinc";
|
||||
rev = version;
|
||||
sha256 = "sha256-ukgzQ7ooiO13hQjWrsul/pvHPBbs1hkJJKLTQwv+cLg=";
|
||||
sha256 = "sha256-cVqsyQw28cNRMVIY/lRbKnJ8QYxWGlWrucRhwBKBfD4=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "jcli";
|
||||
version = "0.0.41";
|
||||
version = "0.0.42";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jenkins-zh";
|
||||
repo = "jenkins-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-oZtbjfquCYMMYgKe7sclRQDXnkNwAEY/GvwenGBnVk4=";
|
||||
hash = "sha256-t9NE911TjAvoCsmf9F989DNQ+s9GhgUF7cwuyHefWts=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-bmPnxFvdKU5zuMsCDboSOxP5f7NnMRwS/gN0sW7eTRA=";
|
||||
|
|
|
|||
102
pkgs/development/tools/qtcreator/qt6.nix
Normal file
102
pkgs/development/tools/qtcreator/qt6.nix
Normal file
|
|
@ -0,0 +1,102 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, cmake
|
||||
, pkg-config
|
||||
, ninja
|
||||
, python3
|
||||
, qtbase
|
||||
, qt5compat
|
||||
, qtdeclarative
|
||||
, qtdoc
|
||||
, qtquick3d
|
||||
, qtquicktimeline
|
||||
, qtserialport
|
||||
, qtsvg
|
||||
, qttools
|
||||
, qtwebengine
|
||||
, qtshadertools
|
||||
, wrapQtAppsHook
|
||||
, yaml-cpp
|
||||
, litehtml
|
||||
, gumbo
|
||||
, llvmPackages
|
||||
, rustc-demangle
|
||||
, elfutils
|
||||
, perf
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qtcreator";
|
||||
version = "9.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.qt.io/official_releases/${pname}/${lib.versions.majorMinor version}/${version}/qt-creator-opensource-src-${version}.tar.xz";
|
||||
sha256 = "sha256-7KWMxcoNOXiWlAVCYZzyA/WWLuPIggCBIics23Ifoyg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
qttools
|
||||
wrapQtAppsHook
|
||||
python3
|
||||
ninja
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtdoc
|
||||
qtsvg
|
||||
qtquick3d
|
||||
qtwebengine
|
||||
qtserialport
|
||||
qtshadertools
|
||||
qt5compat
|
||||
qtdeclarative
|
||||
qtquicktimeline
|
||||
yaml-cpp
|
||||
litehtml
|
||||
gumbo
|
||||
llvmPackages.libclang
|
||||
llvmPackages.llvm
|
||||
rustc-demangle
|
||||
elfutils
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
# workaround for missing CMAKE_INSTALL_DATAROOTDIR
|
||||
# in pkgs/development/tools/build-managers/cmake/setup-hook.sh
|
||||
"-DCMAKE_INSTALL_DATAROOTDIR=${placeholder "out"}/share"
|
||||
# qtdeclarative in nixpkgs does not provide qmlsc
|
||||
# fix can't find Qt6QmlCompilerPlusPrivate
|
||||
"-DQT_NO_FIND_QMLSC=TRUE"
|
||||
"-DWITH_DOCS=ON"
|
||||
"-DBUILD_DEVELOPER_DOCS=ON"
|
||||
"-DBUILD_QBS=OFF"
|
||||
"-DQTC_CLANG_BUILDMODE_MATCH=ON"
|
||||
"-DCLANGTOOLING_LINK_CLANG_DYLIB=ON"
|
||||
];
|
||||
|
||||
qtWrapperArgs = [
|
||||
"--set-default PERFPROFILER_PARSER_FILEPATH ${lib.getBin perf}/bin"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
substituteInPlace $out/share/applications/org.qt-project.qtcreator.desktop \
|
||||
--replace "Exec=qtcreator" "Exec=$out/bin/qtcreator"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cross-platform IDE tailored to the needs of Qt developers";
|
||||
longDescription = ''
|
||||
Qt Creator is a cross-platform IDE (integrated development environment)
|
||||
tailored to the needs of Qt developers. It includes features such as an
|
||||
advanced code editor, a visual debugger and a GUI designer.
|
||||
'';
|
||||
homepage = "https://wiki.qt.io/Qt_Creator";
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = [ maintainers.rewine ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -32,13 +32,13 @@ let
|
|||
in
|
||||
mkDerivation rec {
|
||||
pname = "renderdoc";
|
||||
version = "1.25";
|
||||
version = "1.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "baldurk";
|
||||
repo = "renderdoc";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0+9fxNj0TZUQwOh9kww00/k/J8ciuWfYQS4e1aCcd7Y=";
|
||||
sha256 = "sha256-z3qHW7hVde51TkRZO3Ld8DbUODa2Gbnh3zosW2O8eOQ=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,31 +1,31 @@
|
|||
{ fetchurl, fetchzip }:
|
||||
{
|
||||
x86_64-darwin = fetchzip {
|
||||
sha256 = "sha256-hGa1SrueZWGokeJb+p/6eaYv1AP1a2TUiGo+rcJBw3Y=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.26/AdGuardHome_darwin_amd64.zip";
|
||||
sha256 = "sha256-R4Id8neiQypnj2hYYWEYSY10eJ7yId5k95aMnphvqEs=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.27/AdGuardHome_darwin_amd64.zip";
|
||||
};
|
||||
aarch64-darwin = fetchzip {
|
||||
sha256 = "sha256-wm8scjBaQuKJQu2OfYWDQqF2TLdPEZQEGSgaLzoGTb0=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.26/AdGuardHome_darwin_arm64.zip";
|
||||
sha256 = "sha256-EWQ02mIWYQfYEc8A9+U6N14v0h4kux8Cg7x4Xfj5uL0=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.27/AdGuardHome_darwin_arm64.zip";
|
||||
};
|
||||
i686-linux = fetchurl {
|
||||
sha256 = "sha256-nie5WOeMajq8ucOwLHDXMG1FU7wBS3GTQHKCn0XjBCQ=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.26/AdGuardHome_linux_386.tar.gz";
|
||||
sha256 = "sha256-Hmy3A2KuWk+Myqha/Typd6sY4rHI7kTAGLnz9XH1KRA=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.27/AdGuardHome_linux_386.tar.gz";
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
sha256 = "sha256-Ai6QzmNrALHKxJIX5gx5GQiLlcpKRuT+ALxN0PDJQ9E=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.26/AdGuardHome_linux_amd64.tar.gz";
|
||||
sha256 = "sha256-mNBv8F4BJHXJ86vnSM+0sfEkS3jB8TcMhM+6RJ5zgYM=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.27/AdGuardHome_linux_amd64.tar.gz";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
sha256 = "sha256-cJ7vvv4Yyo0r01eOuZI6jqc4LFmSDmVl84aJjwxkuR4=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.26/AdGuardHome_linux_arm64.tar.gz";
|
||||
sha256 = "sha256-2J06RvoKZJj3qRj6fg4l+S6soR+5gpCCupcJ75ggvD8=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.27/AdGuardHome_linux_arm64.tar.gz";
|
||||
};
|
||||
armv6l-linux = fetchurl {
|
||||
sha256 = "sha256-DfeSBIOO/vZQExbrqku28s8a9s22tfuojccIwe37tS4=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.26/AdGuardHome_linux_armv6.tar.gz";
|
||||
sha256 = "sha256-U3np5JP2/otbEkn+S5xtNO+RuUt6CkWMK4iftoTT460=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.27/AdGuardHome_linux_armv6.tar.gz";
|
||||
};
|
||||
armv7l-linux = fetchurl {
|
||||
sha256 = "sha256-OHoU8dP5b2jqFTfn4FCxL88HrQntcxZ5enMFr/YN1zI=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.26/AdGuardHome_linux_armv7.tar.gz";
|
||||
sha256 = "sha256-y5/svgOJS3KbUJLbgjy9VOpog9W7xGyyx96JtdVyzjk=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.27/AdGuardHome_linux_armv7.tar.gz";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "adguardhome";
|
||||
version = "0.107.26";
|
||||
version = "0.107.27";
|
||||
src = sources.${system} or (throw "Source for ${pname} is not available for ${system}");
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -16,16 +16,16 @@
|
|||
|
||||
buildGo120Module rec {
|
||||
pname = "evcc";
|
||||
version = "0.114.1";
|
||||
version = "0.115.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evcc-io";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-c+XHSO6waDyju8oXFWGYeaCCqyaYdU2JLXr+NDXijdU=";
|
||||
hash = "sha256-vA2HpkzNuHulUUZKL6Wm2Y052v4JdC5V8hADq78rK5c=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-O58Y9mfHmNUWtHmdO3hvZQbFlcqfZs0GmQDcx2RKRUs=";
|
||||
vendorHash = "sha256-/TqA2WTNJ3cSrqLgEly1KHGvMA/MQ+p364G0ne0ezfQ=";
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit src;
|
||||
|
|
@ -62,10 +62,6 @@ buildGo120Module rec {
|
|||
"-w"
|
||||
];
|
||||
|
||||
npmInstallFlags = [
|
||||
"--legacy-peer-deps"
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
make ui
|
||||
'';
|
||||
|
|
@ -75,6 +71,10 @@ buildGo120Module rec {
|
|||
preCheck = ''
|
||||
# requires network access
|
||||
rm meter/template_test.go
|
||||
rm charger/template_test.go
|
||||
rm vehicle/template_test.go
|
||||
# times out (since 0.115.0, bisected to 31ab90e6381b30278731bd01effa62bdfb884ebc)
|
||||
rm util/templates/render_testing.go
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "matrix-hookshot",
|
||||
"version": "3.0.1",
|
||||
"version": "3.2.0",
|
||||
"description": "A bridge between Matrix and multiple project management services, such as GitHub, GitLab and JIRA.",
|
||||
"main": "lib/app.js",
|
||||
"repository": "https://github.com/matrix-org/matrix-hookshot",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"version": "3.0.1",
|
||||
"srcHash": "GQfQWOyiI/rxRsj9GYoc2wPaG8phl+2d9Hulxrar5Jc=",
|
||||
"version": "3.2.0",
|
||||
"srcHash": "7u3JT7BFoJB95vlpKagMgWzoJg0vPYX4CEoqANW0FL4=",
|
||||
"yarnHash": "0ivizv90wrbz583xjvbakv6vg782h7pjm5zbm8wb9qkpnj735avz",
|
||||
"cargoHash": "/yEupeMwzTh/Ujbh2mPXXQbUCajFK/yl1QM3XmFS/Cc="
|
||||
"cargoHash": "CVJoDaQzyMJUaCx7MQg/bQHVicbkmwNpwncLSbWQwbA="
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mediawiki";
|
||||
version = "1.39.2";
|
||||
version = "1.39.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://releases.wikimedia.org/mediawiki/${lib.versions.majorMinor version}/mediawiki-${version}.tar.gz";
|
||||
sha256 = "sha256-3bUdIooZymjNiHHYUBdfa+9Gh0R27RRm8BXPmEbZx6U=";
|
||||
hash = "sha256-41dpNDh2r0JJbaQ64vRyJPuMd5uPRXBcQUfG/zUizB0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -29,7 +29,9 @@ stdenv.mkDerivation rec {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests.mediawiki = nixosTests.mediawiki;
|
||||
passthru.tests = {
|
||||
inherit (nixosTests.mediawiki) mysql postgresql;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "The collaborative editing software that runs Wikipedia";
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "zigbee2mqtt";
|
||||
version = "1.30.2";
|
||||
version = "1.30.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Koenkk";
|
||||
repo = "zigbee2mqtt";
|
||||
rev = version;
|
||||
hash = "sha256-6xSFnaKUE2YtyeeaKenRbD479N1Pv/tBu4YO8mFwJxU=";
|
||||
hash = "sha256-kAdyuJl9UY5E5+8nNj2f1mdH+/f/V66JloAngEaQcsU=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-h577FK84UhfZ2HVbwf1XOMyMBS7qfsRJFte05zUZ0bk=";
|
||||
npmDepsHash = "sha256-V9wyEdoi6JnaIKNp7OWwBTHNcLY2qg0juDJG/MKn5X8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "docker-credential-gcr";
|
||||
version = "2.1.7";
|
||||
version = "2.1.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleCloudPlatform";
|
||||
repo = "docker-credential-gcr";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/+c0bvPdw1FKXw0pfp7v5ArA/PrHU2b7wrt80vAXfCo=";
|
||||
sha256 = "sha256-6f84NRqMx0NX+3g+pCYgRYkGK4DaQmUEau3oMswUmSE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "enumer";
|
||||
version = "1.5.7";
|
||||
version = "1.5.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dmarkham";
|
||||
repo = "enumer";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-2fVWrrWOiCtg7I3Lul2PgQ2u/qDEDioPSB61Tp0rfEo=";
|
||||
hash = "sha256-+YTsXYWVmJ32V/Eptip3WAiqIYv+6nqbdph0K2XzLdc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-BmFv0ytRnjaB7z7Gb+38Fw2ObagnaFMnMhlejhaGxsk=";
|
||||
vendorHash = "sha256-+dCitvPz2JUbybXVJxUOo1N6+SUPCSjlacL8bTSlb7w=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Go tool to auto generate methods for enums";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "pritunl-client";
|
||||
version = "1.3.3477.58";
|
||||
version = "1.3.3484.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pritunl";
|
||||
repo = "pritunl-client-electron";
|
||||
rev = version;
|
||||
sha256 = "sha256-XsYdmJINzeZgvofsKTG/4dXNv4r46FLkEmNGQki1tmU=";
|
||||
sha256 = "sha256-thIbw/Iek2vNNmkOBHrzEhTbaOm05CsbjqORQKC2jIs=";
|
||||
};
|
||||
|
||||
modRoot = "cli";
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "grype";
|
||||
version = "0.60.0";
|
||||
version = "0.61.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anchore";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-CKaUNv4ymLksZ9zpI8jD4lC0keNNNSpUADSTo3evoIo=";
|
||||
hash = "sha256-PPCeEhV4+iSGDBUIN89wlEUEX20bkcX3B7LxU7JDZQc=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
|
|
@ -28,7 +28,7 @@ buildGoModule rec {
|
|||
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-2zZlURnArgHK/zfIxHoWn5W6mfd5T7CbAlSqDnal1Mw=";
|
||||
vendorHash = "sha256-L77tzgcshTNAvg6fKkgN6zdDws76wWoJvygAdArscVI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -3804,6 +3804,8 @@ with pkgs;
|
|||
|
||||
biliass = with python3.pkgs; toPythonApplication biliass;
|
||||
|
||||
bilibili = callPackage ../applications/video/bilibili { };
|
||||
|
||||
bindfs = callPackage ../tools/filesystems/bindfs { };
|
||||
|
||||
binwalk = with python3Packages; toPythonApplication binwalk;
|
||||
|
|
@ -14578,6 +14580,8 @@ with pkgs;
|
|||
gerbil-support = callPackage ../development/compilers/gerbil/gerbil-support.nix { };
|
||||
gerbilPackages-unstable = gerbil-support.gerbilPackages-unstable; # NB: don't recurseIntoAttrs for (unstable!) libraries
|
||||
|
||||
gbforth = callPackage ../development/compilers/gbforth { };
|
||||
|
||||
inherit (let
|
||||
num =
|
||||
if (with stdenv.targetPlatform; isVc4 || libc == "relibc") then 6
|
||||
|
|
@ -18646,6 +18650,12 @@ with pkgs;
|
|||
inherit (linuxPackages) perf;
|
||||
};
|
||||
|
||||
qtcreator-qt6 = qt6Packages.callPackage ../development/tools/qtcreator/qt6.nix {
|
||||
inherit (linuxPackages) perf;
|
||||
stdenv = llvmPackages_14.stdenv;
|
||||
llvmPackages = llvmPackages_14;
|
||||
};
|
||||
|
||||
qxmledit = libsForQt5.callPackage ../applications/editors/qxmledit {} ;
|
||||
|
||||
r10k = callPackage ../tools/system/r10k { };
|
||||
|
|
@ -29127,6 +29137,8 @@ with pkgs;
|
|||
|
||||
bristol = callPackage ../applications/audio/bristol { };
|
||||
|
||||
brlcad = callPackage ../applications/graphics/brlcad { };
|
||||
|
||||
bjumblr = callPackage ../applications/audio/bjumblr { };
|
||||
|
||||
bschaffl = callPackage ../applications/audio/bschaffl { };
|
||||
|
|
@ -34577,7 +34589,7 @@ with pkgs;
|
|||
inherit (wayfireApplications) wayfire wcm;
|
||||
wayfireApplications-unwrapped = recurseIntoAttrs (
|
||||
(callPackage ../applications/window-managers/wayfire/applications.nix { }).
|
||||
extend (_: _: { wlroots = wlroots_0_14; })
|
||||
extend (_: _: { wlroots = wlroots_0_16; })
|
||||
);
|
||||
wayfirePlugins = recurseIntoAttrs (
|
||||
callPackage ../applications/window-managers/wayfire/plugins.nix {
|
||||
|
|
@ -37193,6 +37205,8 @@ with pkgs;
|
|||
|
||||
cliquer = callPackage ../development/libraries/science/math/cliquer { };
|
||||
|
||||
coin-utils = callPackage ../development/libraries/science/math/coin-utils { };
|
||||
|
||||
ecos = callPackage ../development/libraries/science/math/ecos { };
|
||||
|
||||
flintqs = callPackage ../development/libraries/science/math/flintqs { };
|
||||
|
|
|
|||
|
|
@ -633,7 +633,7 @@ in {
|
|||
linux_default = packages.linux_6_1;
|
||||
# Update this when adding the newest kernel major version!
|
||||
linux_latest = packages.linux_6_2;
|
||||
linux_mptcp = packages.linux_mptcp_95;
|
||||
linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake";
|
||||
linux_rt_default = packages.linux_rt_5_4;
|
||||
linux_rt_latest = packages.linux_rt_6_1;
|
||||
linux_hardkernel_latest = packages.hardkernel_4_14;
|
||||
|
|
|
|||
Loading…
Reference in a new issue