Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
191e60634e
77 changed files with 1418 additions and 883 deletions
|
|
@ -13294,7 +13294,7 @@
|
|||
};
|
||||
piturnah = {
|
||||
email = "peterhebden6@gmail.com";
|
||||
github = "piturnah";
|
||||
github = "Piturnah";
|
||||
githubId = 20472367;
|
||||
name = "Peter Hebden";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -278,6 +278,12 @@ in
|
|||
You can't set services.kubo.settings.Pinning.RemoteServices because the ``config replace`` subcommand used at startup does not work with it.
|
||||
'';
|
||||
}
|
||||
{
|
||||
assertion = !((lib.versionAtLeast cfg.package.version "0.21") && (builtins.hasAttr "Experimental" cfg.settings) && (builtins.hasAttr "AcceleratedDHTClient" cfg.settings.Experimental));
|
||||
message = ''
|
||||
The `services.kubo.settings.Experimental.AcceleratedDHTClient` option was renamed to `services.kubo.settings.Routing.AcceleratedDHTClient` in Kubo 0.21.
|
||||
'';
|
||||
}
|
||||
];
|
||||
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
|
|
|||
|
|
@ -26,13 +26,13 @@ assert withQt -> wrapQtAppsHook != null;
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "carla";
|
||||
version = "2.5.5";
|
||||
version = "2.5.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "falkTX";
|
||||
repo = finalAttrs.pname;
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-kXQ0dv4KrwvfxdP73zimof9XKpAz5E6hQrFOjLG4hKU=";
|
||||
hash = "sha256-/ZIproky1AHJHvV62xWm0nrzNBOjvBBv93V0KespVjU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ft2-clone";
|
||||
version = "1.68";
|
||||
version = "1.69";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "8bitbubsy";
|
||||
repo = "ft2-clone";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mO8GrLyO7Zr9+lRy2WQ4OeRWDGmo22mPnZbajL78hJ8=";
|
||||
sha256 = "sha256-tm0yTh46UKnsjH9hv3cMW0YL2x3OTRL+14x4c7w124U=";
|
||||
};
|
||||
|
||||
# Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh)
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, chromaprint
|
||||
{
|
||||
chromaprint
|
||||
, cmake
|
||||
, docbook_xml_dtd_45
|
||||
, docbook_xsl
|
||||
, fetchurl
|
||||
, ffmpeg
|
||||
, flac
|
||||
, id3lib
|
||||
, lib
|
||||
, libogg
|
||||
, libvorbis
|
||||
, libxslt
|
||||
|
|
@ -20,18 +20,19 @@
|
|||
, qtquickcontrols
|
||||
, qttools
|
||||
, readline
|
||||
, stdenv
|
||||
, taglib
|
||||
, wrapQtAppsHook
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kid3";
|
||||
version = "3.9.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-xBCWDpYiXeChxIiMPqHG3CyiRau2kUdDJtzcPtvWpSA=";
|
||||
url = "https://download.kde.org/stable/kid3/${finalAttrs.version}/kid3-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-xBCWDpYiXeChxIiMPqHG3CyiRau2kUdDJtzcPtvWpSA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -42,6 +43,7 @@ stdenv.mkDerivation rec {
|
|||
python3
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
chromaprint
|
||||
ffmpeg
|
||||
|
|
@ -68,9 +70,10 @@ stdenv.mkDerivation rec {
|
|||
export DOCBOOKDIR="${docbook_xsl}/xml/xsl/docbook/"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://kid3.kde.org/";
|
||||
meta = {
|
||||
description = "A simple and powerful audio tag editor";
|
||||
homepage = "https://kid3.kde.org/";
|
||||
license = lib.licenses.lgpl2Plus;
|
||||
longDescription = ''
|
||||
If you want to easily tag multiple MP3, Ogg/Vorbis, FLAC, MPC, MP4/AAC,
|
||||
MP2, Opus, Speex, TrueAudio, WavPack, WMA, WAV and AIFF files (e.g. full
|
||||
|
|
@ -100,8 +103,7 @@ stdenv.mkDerivation rec {
|
|||
- Edit synchronized lyrics and event timing codes, import and export
|
||||
LRC files.
|
||||
'';
|
||||
license = licenses.lgpl2Plus;
|
||||
maintainers = [ maintainers.AndersonTorres ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ lib.maintainers.AndersonTorres ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ fftwSinglePrec lv2 ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://drobilla.net/software/mda-lv2/";
|
||||
homepage = "http://drobilla.net/software/mda-lv2.html";
|
||||
description = "An LV2 port of the MDA plugins by Paul Kellett";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
|
|
|
|||
|
|
@ -1,38 +1,63 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkg-config, wrapGAppsHook, alsa-lib, gtk3, libpulseaudio }:
|
||||
{
|
||||
alsa-lib
|
||||
, fetchFromGitHub
|
||||
, gtk3
|
||||
, lib
|
||||
, libpulseaudio
|
||||
, pkg-config
|
||||
, stdenv
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "praat";
|
||||
version = "6.3.10";
|
||||
version = "6.3.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "praat";
|
||||
repo = "praat";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wnw8GKMukiraZgMMzd3S2NldC/cnRSILNo+D1Rqhr4k=";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-HN4w7n0nh7voL/QKhGQwCcGfzn+nyFOwluESlP3B6VM=";
|
||||
};
|
||||
|
||||
configurePhase = ''
|
||||
cp makefiles/makefile.defs.linux.pulse makefile.defs
|
||||
'';
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
gtk3
|
||||
libpulseaudio
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"AR=${stdenv.cc.targetPrefix}ar"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
install -Dt $out/bin praat
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
|
||||
cp makefiles/makefile.defs.linux.pulse makefile.defs
|
||||
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
|
||||
buildInputs = [ alsa-lib gtk3 libpulseaudio ];
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dt $out/bin praat
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Doing phonetics by computer";
|
||||
homepage = "https://www.fon.hum.uva.nl/praat/";
|
||||
license = licenses.gpl2Plus; # Has some 3rd-party code in it though
|
||||
maintainers = with maintainers; [ orivej ];
|
||||
platforms = platforms.linux;
|
||||
license = lib.licenses.gpl2Plus; # Has some 3rd-party code in it though
|
||||
maintainers = with lib.maintainers; [ orivej ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
27
pkgs/applications/editors/heh/default.nix
Normal file
27
pkgs/applications/editors/heh/default.nix
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "heh";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ndd7xv";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-IIF/bkTLwR8pCs/hJ625T3NsiKf/6Zf1cW2i4lsiK4U=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-tDvqaNVuzv1BlS/oNI1D/WV1b5uHreT3Ak/6ruqKXQc=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A cross-platform terminal UI used for modifying file data in hex or ASCII.";
|
||||
homepage = "https://github.com/ndd7xv/heh";
|
||||
changelog = "https://github.com/ndd7xv/heh/releases/tag/${src.rev}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ piturnah ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
, unzip, libsecret, libXScrnSaver, libxshmfence, buildPackages
|
||||
, atomEnv, at-spi2-atk, autoPatchelfHook
|
||||
, systemd, fontconfig, libdbusmenu, glib, buildFHSEnv, wayland
|
||||
, libglvnd
|
||||
, libglvnd, libkrb5
|
||||
|
||||
# Populate passthru.tests
|
||||
, tests
|
||||
|
|
@ -71,7 +71,7 @@ let
|
|||
};
|
||||
|
||||
buildInputs = [ libsecret libXScrnSaver libxshmfence ]
|
||||
++ lib.optionals (!stdenv.isDarwin) ([ at-spi2-atk ] ++ atomEnv.packages);
|
||||
++ lib.optionals (!stdenv.isDarwin) ([ at-spi2-atk libkrb5 ] ++ atomEnv.packages);
|
||||
|
||||
runtimeDependencies = lib.optionals stdenv.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu wayland ];
|
||||
|
||||
|
|
|
|||
|
|
@ -24,21 +24,21 @@ let
|
|||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "05yl6v11ndayz081m3j6dhclj0hshsf0ism7z31hmq6qvfl1sw0k";
|
||||
x86_64-darwin = "16x1ppfi3n9gnxg2la2pzj67mlj507879hpqinhpz57dvys421h8";
|
||||
aarch64-linux = "0m5k9rm14isj9x1j3nw3zvcxxz523396id7yhi8bpncr4ac8a087";
|
||||
aarch64-darwin = "1kbhf3v71qhw4ql6pp8x5m68lgycjzxzm17c9ri0zn0b86ffp8d3";
|
||||
armv7l-linux = "07lp0schicpnzs52gfbi9y8zfkwxhh92zv29afzy6vxdlqvmrf21";
|
||||
x86_64-linux = "0hc1pfrhmdydwgyz3mjp45nmzs101iffam7ciximqmnhf1s1x4qf";
|
||||
x86_64-darwin = "1snrr4lsa5qdpdl80wx8ymxp8h1bhd5ablhcgkhzvmj5dh7jrywk";
|
||||
aarch64-linux = "0pm5znbjm79ziwdx37cc75qnbf0jv3yrm2xg7cykavn43gz97abw";
|
||||
aarch64-darwin = "0bq5hvgv228x7vby4475cc65g24kpv9kvj06p6c0y6a2a79j45by";
|
||||
armv7l-linux = "11gxpqflakp4cwzkpqrwsd6m5fls1vnaigppc4bq9flfknwkjfrx";
|
||||
}.${system} or throwSystem;
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.80.2";
|
||||
version = "1.81.0";
|
||||
pname = "vscode";
|
||||
|
||||
# This is used for VS Code - Remote SSH test
|
||||
rev = "2ccd690cbff1569e4a83d7c43d45101f817401dc";
|
||||
rev = "6445d93c81ebe42c4cbd7a60712e0b17d9463e97";
|
||||
|
||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
|
||||
|
|
@ -62,7 +62,7 @@ in
|
|||
src = fetchurl {
|
||||
name = "vscode-server-${rev}.tar.gz";
|
||||
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
|
||||
sha256 = "1425bngv0n2xpd7yp9xbmxv95adr9vv0vzy1wvqvgpd8p6h05r7n";
|
||||
sha256 = "07x9lmkyhra4hplsgdhh97dixsx92i7lab5z5ihs2wqvvzl69ah2";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -28,13 +28,13 @@
|
|||
|
||||
buildDotnetModule rec {
|
||||
pname = "ryujinx";
|
||||
version = "1.1.968"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
|
||||
version = "1.1.974"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ryujinx";
|
||||
repo = "Ryujinx";
|
||||
rev = "487261592eb9e9c31cacd08860f8894027bb1a07";
|
||||
sha256 = "002qgnh7xb9i9yqm4a3m9m7sbx1iz7ng8k5nnanlq897djs3hy0g";
|
||||
rev = "5a0aa074b661753d8f0202a73d9f6f3ac6e2ab11";
|
||||
sha256 = "0f1wivwf7hnsqi7sgqjrikxvakrk8dmywpmyd36a3s5lbk878wp3";
|
||||
};
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_7_0;
|
||||
|
|
|
|||
12
pkgs/applications/emulators/ryujinx/deps.nix
generated
12
pkgs/applications/emulators/ryujinx/deps.nix
generated
|
|
@ -20,7 +20,7 @@
|
|||
(fetchNuGet { pname = "Avalonia.X11"; version = "0.10.21"; sha256 = "08vbdiv2k9vp8gp59rk0z63jyn8hlv8a4956jczy05ail5qfl94v"; })
|
||||
(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 = "DiscordRichPresence"; version = "1.2.1.24"; sha256 = "0maw0yd6xgwy0cgk593z3zva0r5j267zpdmmpq8avj3zbna6n4x1"; })
|
||||
(fetchNuGet { pname = "DynamicData"; version = "7.14.2"; sha256 = "07k79w4702masq71rk865mi3h1kaxamyp7dgl08ny4n22gg8482k"; })
|
||||
(fetchNuGet { pname = "ExCSS"; version = "4.1.4"; sha256 = "1y50xp6rihkydbf5l73mr3qq2rm6rdfjrzdw9h1dw9my230q5lpd"; })
|
||||
(fetchNuGet { pname = "Fizzler"; version = "1.2.1"; sha256 = "1w5jb1d0figbv68dydbnlcsfmqlc3sv9z1zxp7d79dg2dkarc4qm"; })
|
||||
|
|
@ -40,9 +40,9 @@
|
|||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "2.9.6"; sha256 = "18mr1f0wpq0fir8vjnq0a8pz50zpnblr7sabff0yqx37c975934a"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.4"; sha256 = "0wd6v57p53ahz5z9zg4iyzmy3src7rlsncyqpcag02jjj1yx6g58"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.4.0"; sha256 = "12rn6gl4viycwk3pz5hp5df63g66zvba4hnkwr3f0876jj5ivmsw"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.5.0"; sha256 = "0hjzca7v3qq4wqzi9chgxzycbaysnjgj28ps20695x61sia6i3da"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.6.0"; sha256 = "0qvkwkbqz4dhkxsisanax1lwm3nzyyb4kgb40qczxbl8g251cjp2"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.4.0"; sha256 = "0rhylcwa95bxawcgixk64knv7p7xrykdjcabmx3gknk8hvj1ai9y"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.5.0"; sha256 = "1l6v0ii5lapmfnfpjwi3j5bwlx8v9nvyani5pwvqzdfqsd5m7mp5"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.6.0"; sha256 = "1yfvwygx795c9lswpiv8q19zydifarzljdmvv67vjmi559cm8b1q"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.4.0"; sha256 = "1h2f0z9xnw987x8bydka1sd42ijqjx973md6v1gvpy1qc6ad244g"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.4.0"; sha256 = "195gqnpwqkg2wlvk8x6yzm7byrxfq9bki20xmhf6lzfsdw3z4mf2"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.6.3"; sha256 = "1xxzd2yxlbq2h4k6flp7lvffmmwrjlyha2z1yvrxxymiyyggk2zg"; })
|
||||
|
|
@ -164,7 +164,7 @@
|
|||
(fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; })
|
||||
(fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12"; sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; })
|
||||
(fetchNuGet { pname = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; })
|
||||
(fetchNuGet { pname = "System.Collections.Immutable"; version = "6.0.0"; sha256 = "1js98kmjn47ivcvkjqdmyipzknb9xbndssczm8gq224pbaj1p88c"; })
|
||||
(fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; sha256 = "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"; })
|
||||
(fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; })
|
||||
(fetchNuGet { pname = "System.Console"; version = "4.0.0"; sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; })
|
||||
(fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; })
|
||||
|
|
@ -218,7 +218,7 @@
|
|||
(fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; })
|
||||
(fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; })
|
||||
(fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; })
|
||||
(fetchNuGet { pname = "System.Reflection.Metadata"; version = "6.0.1"; sha256 = "0fjqifk4qz9lw5gcadpfalpplyr0z2b3p9x7h0ll481a9sqvppc9"; })
|
||||
(fetchNuGet { pname = "System.Reflection.Metadata"; version = "7.0.0"; sha256 = "1wilasn2qmj870h2bhw348lspamm7pbinpb4m89icg113510l00v"; })
|
||||
(fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; })
|
||||
(fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; })
|
||||
(fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; })
|
||||
|
|
@ -257,7 +257,7 @@
|
|||
(fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; })
|
||||
(fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; })
|
||||
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; })
|
||||
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; })
|
||||
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "7.0.0"; sha256 = "0sn6hxdjm7bw3xgsmg041ccchsa4sp02aa27cislw3x61dbr68kq"; })
|
||||
(fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; })
|
||||
(fetchNuGet { pname = "System.Text.Encodings.Web"; version = "4.7.2"; sha256 = "0ap286ykazrl42if59bxhzv81safdfrrmfqr3112siwyajx4wih9"; })
|
||||
(fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; })
|
||||
|
|
|
|||
|
|
@ -26,12 +26,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tuba";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "GeopJr";
|
||||
repo = "Tuba";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sLdkSIevz2spL+Q5sS+ugqEbqJTXrLxmszzijtKvY6k=";
|
||||
hash = "sha256-1XbgsdIcnlXJtNEzDgEfHVJHF9naz3HplCPc2cKFUWw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "clusterctl";
|
||||
version = "1.4.4";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = "cluster-api";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ohk3CKcB6LD1gRKDDNYK+MbFxWa7QEiqmRYYpSkwj8E=";
|
||||
hash = "sha256-rbKPI5hG7R6mRILuvY9BoRDvosw3txFs2q696abrpjY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QzD0Stbr8QuQ8n9l9qv16KFqSFBsRbxETmQ8LHdk3nI=";
|
||||
vendorHash = "sha256-t494o9orCVva81v7t0HfKkL8H3cr26scyFSeYZQyqcM=";
|
||||
|
||||
subPackages = [ "cmd/clusterctl" ];
|
||||
|
||||
|
|
@ -43,6 +43,6 @@ buildGoModule rec {
|
|||
description = "Kubernetes cluster API tool";
|
||||
homepage = "https://cluster-api.sigs.k8s.io/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ zowoq qjoly ];
|
||||
maintainers = with maintainers; [ qjoly ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
(callPackage ./generic.nix { }) {
|
||||
channel = "edge";
|
||||
version = "23.7.2";
|
||||
sha256 = "0wc829dzk0in0srq0vbcagrd5ylz2d758032anzlzkf4m3lr9hdw";
|
||||
vendorSha256 = "sha256-16j5B96UDZITY1LEWZKtfAnww7ZcUjKh/cARLaYy9wk=";
|
||||
version = "23.8.1";
|
||||
sha256 = "0ajcxfqbaimrj8ylbk3s2djv2jpczm4c6z39b4fdak68sylmvb9z";
|
||||
vendorSha256 = "sha256-sj3KJLPO4pxnGov2Oiqj1FgAQ2atf3FJPINmeKjPUZQ=";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gnmic";
|
||||
version = "0.31.3";
|
||||
version = "0.31.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openconfig";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+TxOl+at/SQIC1x/LwCgk4JmvOPY2el7HE1reAkmVn8=";
|
||||
hash = "sha256-bX8oZk0psPqoXFU8b2JQmfFaPz18yiuSVXDmhoOnpFg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4cmFoDMgD9TKacZ2RD73kQKDrpN5xuSKZ4ikcWAd5Rw=";
|
||||
vendorHash = "sha256-hIG3kG2e9Y2hnHJ+96cPLgnlp5ParsLgWQY0HZTDggY=";
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubo";
|
||||
version = "0.20.0"; # When updating, also check if the repo version changed and adjust repoVersion below
|
||||
version = "0.21.0"; # When updating, also check if the repo version changed and adjust repoVersion below
|
||||
rev = "v${version}";
|
||||
|
||||
passthru.repoVersion = "13"; # Also update kubo-migrator when changing the repo version
|
||||
passthru.repoVersion = "14"; # Also update kubo-migrator when changing the repo version
|
||||
|
||||
# Kubo makes changes to it's source tarball that don't match the git source.
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz";
|
||||
hash = "sha256-3Oj/x3EkceNO8/Ik7+U43wi1aL0lYJi1FA0AjtdJRDI=";
|
||||
hash = "sha256-tS7hiv7KnALR+hCn/TPUwqp/xIOLnQ3ReSb1bNBnwUY=";
|
||||
};
|
||||
|
||||
# tarball contains multiple files/directories
|
||||
|
|
|
|||
|
|
@ -1,31 +1,47 @@
|
|||
{ lib, stdenv, fetchurl, cmake }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, bzip2
|
||||
, cmake
|
||||
, fetchurl
|
||||
, fftw
|
||||
, llvmPackages
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cmtk";
|
||||
version = "3.3.1";
|
||||
version = "3.3.2";
|
||||
|
||||
src = fetchurl {
|
||||
name = "cmtk-source.tar.gz";
|
||||
url = "https://www.nitrc.org/frs/download.php/8198/CMTK-${version}-Source.tar.gz//?i_agree=1&download_now=1";
|
||||
sha256 = "1nmsga9m7vcc4y4a6zl53ra3mwlgjwdgsq1j291awkn7zr1az6qs";
|
||||
url = "https://www.nitrc.org/frs/download.php/13188/CMTK-${finalAttrs.version}-Source.tar.gz//?i_agree=1&download_now=1";
|
||||
hash = "sha256-iE164NCOSOypZLLZfZy9RTyrS+YnY9ECqfb4QhlsMS4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [
|
||||
bzip2
|
||||
fftw
|
||||
zlib
|
||||
] ++ lib.optionals stdenv.cc.isClang [
|
||||
llvmPackages.openmp
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
"-std=c++11"
|
||||
(lib.optional stdenv.cc.isClang "-Wno-error=c++11-narrowing")
|
||||
(lib.optionalString stdenv.cc.isGNU "-std=c++11")
|
||||
(lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing")
|
||||
(lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dfinite=isfinite")
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "Computational Morphometry Toolkit ";
|
||||
description = "Computational Morphometry Toolkit";
|
||||
longDescription = ''A software toolkit for computational morphometry of
|
||||
biomedical images, CMTK comprises a set of command line tools and a
|
||||
back-end general-purpose library for processing and I/O'';
|
||||
maintainers = with maintainers; [ tbenst ];
|
||||
platforms = platforms.all;
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Plus;
|
||||
homepage = "https://www.nitrc.org/projects/cmtk/";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@
|
|||
, openssl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "github-desktop";
|
||||
version = "3.2.1";
|
||||
version = "3.2.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/shiftkey/desktop/releases/download/release-${version}-linux1/GitHubDesktop-linux-${version}-linux1.deb";
|
||||
hash = "sha256-OdvebRvOTyadgNjzrv6CGDPkljfpo4RVvVAc+X9hjSo=";
|
||||
url = "https://github.com/shiftkey/desktop/releases/download/release-${finalAttrs.version}-linux1/GitHubDesktop-linux-${finalAttrs.version}-linux1.deb";
|
||||
hash = "sha256-p+qr9/aEQcfkKArC3oTyIijHkaNzLum3xXeSnNexgbU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -50,16 +50,16 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
unpackPhase = ''
|
||||
mkdir -p $TMP/${pname} $out/{opt,bin}
|
||||
cp $src $TMP/${pname}.deb
|
||||
ar vx ${pname}.deb
|
||||
tar --no-overwrite-dir -xvf data.tar.xz -C $TMP/${pname}/
|
||||
mkdir -p $TMP/${finalAttrs.pname} $out/{opt,bin}
|
||||
cp $src $TMP/${finalAttrs.pname}.deb
|
||||
ar vx ${finalAttrs.pname}.deb
|
||||
tar --no-overwrite-dir -xvf data.tar.xz -C $TMP/${finalAttrs.pname}/
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
cp -R $TMP/${pname}/usr/share $out/
|
||||
cp -R $TMP/${pname}/usr/lib/${pname}/* $out/opt/
|
||||
ln -sf $out/opt/${pname} $out/bin/${pname}
|
||||
cp -R $TMP/${finalAttrs.pname}/usr/share $out/
|
||||
cp -R $TMP/${finalAttrs.pname}/usr/lib/${finalAttrs.pname}/* $out/opt/
|
||||
ln -sf $out/opt/${finalAttrs.pname} $out/bin/${finalAttrs.pname}
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
|
|
@ -72,12 +72,12 @@ stdenv.mkDerivation rec {
|
|||
(lib.getLib systemd)
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "GUI for managing Git and GitHub.";
|
||||
homepage = "https://desktop.github.com/";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dan4ik605743 ];
|
||||
platforms = platforms.linux;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ dan4ik605743 ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "advanced-scene-switcher";
|
||||
version = "1.22.1";
|
||||
version = "1.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WarmUpTill";
|
||||
repo = "SceneSwitcher";
|
||||
rev = version;
|
||||
hash = "sha256-SV5hnTIRJ6ZruA5t/G6zRAC/+oalTABor3h66eF+KHM=";
|
||||
hash = "sha256-X1qeMNTC2Hsl3Yh3E7PYVWAMGjGylF/EBkgW4WrtH40=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ in stdenvNoCC.mkDerivation {
|
|||
${optionalString (local_manifests != []) ''
|
||||
mkdir .repo/local_manifests
|
||||
for local_manifest in ${concatMapStringsSep " " toString local_manifests}; do
|
||||
cp $local_manifest .repo/local_manifests/$(stripHash $local_manifest; echo $strippedName)
|
||||
cp $local_manifest .repo/local_manifests/$(stripHash $local_manifest)
|
||||
done
|
||||
''}
|
||||
|
||||
|
|
|
|||
|
|
@ -35,13 +35,13 @@ rec {
|
|||
}:
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "23.7.1";
|
||||
version = "23.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "notofonts";
|
||||
repo = "notofonts.github.io";
|
||||
rev = "noto-monthly-release-${version}";
|
||||
hash = "sha256-+P0mQ3PaGGPGK3SFPtCe7wrjMgOgZeRpkEQulLeu/zs=";
|
||||
hash = "sha256-TYCJzioZcNFV8N5wLr7Fo69g/p5GQF/tbGgYoLUV7Us=";
|
||||
};
|
||||
|
||||
_variants = map (variant: builtins.replaceStrings [ " " ] [ "" ] variant) variants;
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "assemblyscript";
|
||||
version = "0.27.6";
|
||||
version = "0.27.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AssemblyScript";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jN8P3EL3giDIZSExkjm5ZUwgkN3EIQhVpMqfx273yZU=";
|
||||
sha256 = "sha256-EwpIUD9+IjJlWOnUEXgvx60i59ftQyHcPTQVWVoOGNQ=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-9ILa1qY2GpP2RckcZYcCMmgCwdXIImOm+D8nldeoQL8=";
|
||||
|
|
|
|||
|
|
@ -17,7 +17,8 @@
|
|||
, libxml2
|
||||
, libyaml
|
||||
, libffi
|
||||
, llvmPackages
|
||||
, llvmPackages_13
|
||||
, llvmPackages_15
|
||||
, makeWrapper
|
||||
, openssl
|
||||
, pcre2
|
||||
|
|
@ -53,28 +54,29 @@ let
|
|||
"https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-${arch}.tar.gz";
|
||||
|
||||
genericBinary = { version, sha256s, rel ? 1 }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crystal-binary";
|
||||
inherit version;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crystal-binary";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = binaryUrl version rel;
|
||||
sha256 = sha256s.${stdenv.system};
|
||||
};
|
||||
|
||||
buildCommand = ''
|
||||
mkdir -p $out
|
||||
tar --strip-components=1 -C $out -xf ${src}
|
||||
patchShebangs $out/bin/crystal
|
||||
'';
|
||||
|
||||
meta.platforms = lib.attrNames sha256s;
|
||||
src = fetchurl {
|
||||
url = binaryUrl version rel;
|
||||
sha256 = sha256s.${stdenv.system};
|
||||
};
|
||||
|
||||
generic = (
|
||||
buildCommand = ''
|
||||
mkdir -p $out
|
||||
tar --strip-components=1 -C $out -xf ${src}
|
||||
patchShebangs $out/bin/crystal
|
||||
'';
|
||||
|
||||
meta.platforms = lib.attrNames sha256s;
|
||||
};
|
||||
|
||||
generic =
|
||||
{ version
|
||||
, sha256
|
||||
, binary
|
||||
, llvmPackages
|
||||
, doCheck ? true
|
||||
, extraBuildInputs ? [ ]
|
||||
, buildFlags ? [ "all" "docs" "release=1"]
|
||||
|
|
@ -244,9 +246,7 @@ let
|
|||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ david50407 manveru peterhoeg donovanglover ];
|
||||
};
|
||||
})
|
||||
);
|
||||
|
||||
});
|
||||
in
|
||||
rec {
|
||||
binaryCrystal_1_2 = genericBinary {
|
||||
|
|
@ -263,6 +263,7 @@ rec {
|
|||
version = "1.2.2";
|
||||
sha256 = "sha256-nyOXhsutVBRdtJlJHe2dALl//BUXD1JeeQPgHU4SwiU=";
|
||||
binary = binaryCrystal_1_2;
|
||||
llvmPackages = llvmPackages_13;
|
||||
extraBuildInputs = [ libatomic_ops ];
|
||||
};
|
||||
|
||||
|
|
@ -270,18 +271,21 @@ rec {
|
|||
version = "1.7.3";
|
||||
sha256 = "sha256-ULhLGHRIZbsKhaMvNhc+W74BwNgfEjHcMnVNApWY+EE=";
|
||||
binary = binaryCrystal_1_2;
|
||||
llvmPackages = llvmPackages_13;
|
||||
};
|
||||
|
||||
crystal_1_8 = generic {
|
||||
version = "1.8.2";
|
||||
sha256 = "sha256-YAORdipzpC9CrFgZUFlFfjzlJQ6ZeA2ekVu8IfPOxR8=";
|
||||
binary = binaryCrystal_1_2;
|
||||
llvmPackages = llvmPackages_15;
|
||||
};
|
||||
|
||||
crystal_1_9 = generic {
|
||||
version = "1.9.2";
|
||||
sha256 = "sha256-M1oUFs7/8ljszga3StzLOLM1aA4fSfVPQlsbuDHGd84=";
|
||||
binary = binaryCrystal_1_2;
|
||||
llvmPackages = llvmPackages_15;
|
||||
};
|
||||
|
||||
crystal = crystal_1_9;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
, libuuid
|
||||
, python3
|
||||
, bc
|
||||
, llvmPackages_9
|
||||
, lib
|
||||
, buildPackages
|
||||
}:
|
||||
|
|
@ -24,17 +23,12 @@ else if stdenv.isAarch64 then
|
|||
else
|
||||
throw "Unsupported architecture";
|
||||
|
||||
buildStdenv = if stdenv.isDarwin then
|
||||
llvmPackages_9.stdenv
|
||||
else
|
||||
stdenv;
|
||||
|
||||
buildType = if stdenv.isDarwin then
|
||||
"CLANGPDB"
|
||||
else
|
||||
"GCC5";
|
||||
|
||||
edk2 = buildStdenv.mkDerivation {
|
||||
edk2 = stdenv.mkDerivation {
|
||||
pname = "edk2";
|
||||
version = "202305";
|
||||
|
||||
|
|
@ -42,7 +36,7 @@ edk2 = buildStdenv.mkDerivation {
|
|||
# pass targetPrefix as an env var
|
||||
(fetchpatch {
|
||||
url = "https://src.fedoraproject.org/rpms/edk2/raw/08f2354cd280b4ce5a7888aa85cf520e042955c3/f/0021-Tweak-the-tools_def-to-support-cross-compiling.patch";
|
||||
sha256 = "sha256-E1/fiFNVx0aB1kOej2DJ2DlBIs9tAAcxoedym2Zhjxw=";
|
||||
hash = "sha256-E1/fiFNVx0aB1kOej2DJ2DlBIs9tAAcxoedym2Zhjxw=";
|
||||
})
|
||||
];
|
||||
|
||||
|
|
@ -62,8 +56,7 @@ edk2 = buildStdenv.mkDerivation {
|
|||
# trick taken from https://src.fedoraproject.org/rpms/edk2/blob/08f2354cd280b4ce5a7888aa85cf520e042955c3/f/edk2.spec#_319
|
||||
${"GCC5_${targetArch}_PREFIX"}=stdenv.cc.targetPrefix;
|
||||
|
||||
makeFlags = [ "-C BaseTools" ]
|
||||
++ lib.optionals (stdenv.cc.isClang) [ "CXX=llvm BUILD_AR=ar BUILD_CC=clang BUILD_CXX=clang++ BUILD_AS=clang BUILD_LD=ld" ];
|
||||
makeFlags = [ "-C BaseTools" ];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-return-type" + lib.optionalString (stdenv.cc.isGNU) " -Wno-error=stringop-truncation";
|
||||
|
||||
|
|
@ -89,7 +82,7 @@ edk2 = buildStdenv.mkDerivation {
|
|||
};
|
||||
|
||||
passthru = {
|
||||
mkDerivation = projectDscPath: attrsOrFun: buildStdenv.mkDerivation (finalAttrs:
|
||||
mkDerivation = projectDscPath: attrsOrFun: stdenv.mkDerivation (finalAttrs:
|
||||
let
|
||||
attrs = lib.toFunction attrsOrFun finalAttrs;
|
||||
in
|
||||
|
|
|
|||
|
|
@ -19,17 +19,23 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-jJKA5JEHsmqQ/IKb1aNmOtoVaGKNjcgTKyo5VCiJbXM=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
guile
|
||||
pkg-config
|
||||
texinfo # for makeinfo
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
guile
|
||||
libevent
|
||||
texinfo
|
||||
];
|
||||
|
||||
autoreconfPhase = "./autogen.sh";
|
||||
makeFlags = [
|
||||
"GUILE_AUTO_COMPILE=0"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/wingo/fibers";
|
||||
|
|
|
|||
|
|
@ -1,25 +1,33 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, fixDarwinDylibNames
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "3.4.3";
|
||||
pname = "LASzip";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LASzip";
|
||||
repo = "LASzip";
|
||||
rev = version;
|
||||
sha256 = "09lcsgxwv0jq50fhsgfhx0npbf1zcwn3hbnq6q78fshqksbxmz7m";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-9fzal54YaocONtguOCxnP7h1LejQPQ0dKFiCzfvTjCY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
fixDarwinDylibNames
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Turn quickly bulky LAS files into compact LAZ files without information loss";
|
||||
homepage = "https://laszip.org";
|
||||
changelog = "https://github.com/LASzip/LASzip/releases/tag/${finalAttrs.src.rev}";
|
||||
license = lib.licenses.lgpl2;
|
||||
maintainers = [ lib.maintainers.michelk ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@ let
|
|||
soVersion = "5";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "liblinear";
|
||||
version = "2.46";
|
||||
version = "2.47";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cjlin1";
|
||||
repo = "liblinear";
|
||||
rev = "v${builtins.replaceStrings ["."] [""] version}";
|
||||
sha256 = "sha256-mKd6idfr6mIIDEie8DCS+drtfpgKoS/5UXI0JenTxlA=";
|
||||
sha256 = "sha256-so7uCc/52NdN0V2Ska8EUdw/wSegaudX5AF+c0xe5jk=";
|
||||
};
|
||||
|
||||
makeFlags = [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" ];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ callPackage }:
|
||||
|
||||
callPackage ./generic.nix {
|
||||
version = "2.28.3";
|
||||
hash = "sha256-w5bJErCNRZLE8rHcuZlK3bOqel97gPPMKH2cPGUR6Zw=";
|
||||
version = "2.28.4";
|
||||
hash = "sha256-88Lnj9NgS5PWg2hydvb9cwi6s6BG3UMvkUH2Ny1jmtE=";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ callPackage }:
|
||||
|
||||
callPackage ./generic.nix {
|
||||
version = "3.4.0";
|
||||
hash = "sha256-1YA4hp/VEjph5k0qJqhhH4nBbTP3Qu2pl7WpuvPkVfg=";
|
||||
version = "3.4.1";
|
||||
hash = "sha256-NIjyRcVbg6lT6+RlTz5Jt6V9T85mvta5grOSLIAK9Ts=";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,6 +42,12 @@ stdenv.mkDerivation rec {
|
|||
"-DGEN_FILES=off"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
# Parallel checking causes test failures
|
||||
# https://github.com/Mbed-TLS/mbedtls/issues/4980
|
||||
enableParallelChecking = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.trustedfirmware.org/projects/mbed-tls/";
|
||||
changelog = "https://github.com/Mbed-TLS/mbedtls/blob/${pname}-${version}/ChangeLog";
|
||||
|
|
|
|||
|
|
@ -3,21 +3,22 @@
|
|||
, fetchPypi
|
||||
, poetry-core
|
||||
, pythonOlder
|
||||
, requests
|
||||
, aiohttp
|
||||
, backoff
|
||||
, importlib-metadata
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cohere";
|
||||
version = "4.9.0";
|
||||
version = "4.16.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-4d89x+Pg5HZSUyxryH6OuMMGiMfeHXQX5Wy0XS++obY=";
|
||||
hash = "sha256-i6kbjugulAcmmInFb+rH4WB50dM7SDO1HNW/JgD4OTQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -25,9 +26,10 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
aiohttp
|
||||
backoff
|
||||
importlib-metadata
|
||||
requests
|
||||
];
|
||||
|
||||
# tests require CO_API_KEY
|
||||
|
|
|
|||
43
pkgs/development/python-modules/getjump/default.nix
Normal file
43
pkgs/development/python-modules/getjump/default.nix
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
{ lib
|
||||
, beautifulsoup4
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pillow
|
||||
, poetry-core
|
||||
, requests
|
||||
, rich
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "getjump";
|
||||
version = "2.4.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-gu6h9Yb0xdfvdmoeZGQPFCJhBJxuQ4iWlQquig1ljnY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
beautifulsoup4
|
||||
pillow
|
||||
requests
|
||||
rich
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"getjump"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Get and save images from jump web viewer";
|
||||
homepage = "https://github.com/eggplants/getjump";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.marsam ];
|
||||
mainProgram = "jget";
|
||||
};
|
||||
}
|
||||
|
|
@ -80,7 +80,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "langchain";
|
||||
version = "0.0.240";
|
||||
version = "0.0.247";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -89,7 +89,7 @@ buildPythonPackage rec {
|
|||
owner = "hwchase17";
|
||||
repo = "langchain";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-7UwAdOzEgu3K/Gfq8D/GHNGxD6KhSx0xGMxtmpdnYxQ=";
|
||||
hash = "sha256-Eq9jXfVJuoiNWkJanol/tqQU+kOrftMii90743DeI3Y=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/libs/langchain";
|
||||
|
|
|
|||
|
|
@ -3,28 +3,33 @@
|
|||
, fetchPypi
|
||||
, numpy
|
||||
, laszip
|
||||
, setuptools
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "laspy";
|
||||
version = "2.4.1";
|
||||
format = "setuptools";
|
||||
version = "2.5.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-E8rsxzJcsiQsslOUmE0hs7X3lsiLy0S8LtLTzxuXKsQ=";
|
||||
hash = "sha256-uqPJxswVVjbxYRSREfnPwkPb0U9synKclLNWsxxmjy4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
laszip
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
|
|
@ -36,7 +41,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Interface for reading/modifying/creating .LAS LIDAR files";
|
||||
homepage = "https://github.com/laspy/laspy";
|
||||
changelog = "https://github.com/laspy/laspy/blob/2.4.1/CHANGELOG.md";
|
||||
changelog = "https://github.com/laspy/laspy/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ matthewcroughan ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,48 +1,44 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, scikit-build-core
|
||||
, distlib
|
||||
, pytestCheckHook
|
||||
, pyproject-metadata
|
||||
, pathspec
|
||||
, pybind11
|
||||
, cmake
|
||||
, LASzip
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "laszip-python";
|
||||
version = "0.2.1";
|
||||
version = "0.2.3";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tmontaigu";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-ujKoUm2Btu25T7ZrSGqjRc3NR1qqsQU8OwHQDSx8grY=";
|
||||
hash = "sha256-MiPzL9TDCf1xnCv7apwdfcpkFnBRi4PO/atTQxqL8cw=";
|
||||
};
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-std=c++17";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pybind11
|
||||
scikit-build-core
|
||||
scikit-build-core.optional-dependencies.pyproject
|
||||
cmake
|
||||
];
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
buildInputs = [
|
||||
pybind11
|
||||
LASzip
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
cd ..
|
||||
'';
|
||||
|
||||
# There are no tests
|
||||
doCheck = false;
|
||||
|
||||
|
|
@ -51,6 +47,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Unofficial bindings between Python and LASzip made using pybind11";
|
||||
homepage = "https://github.com/tmontaigu/laszip-python";
|
||||
changelog = "https://github.com/tmontaigu/laszip-python/blob/${src.rev}/Changelog.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ matthewcroughan ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,19 +1,27 @@
|
|||
{ lib, stdenv, buildPythonPackage, fetchFromGitHub, python, isPy27
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, mpv
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mpv";
|
||||
version = "1.0.1";
|
||||
disabled = isPy27;
|
||||
version = "1.0.4";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jaseg";
|
||||
repo = "python-mpv";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-UCJ1PknnWQiFciTEMxTUqDzz0Z8HEWycLuQqYeyQhoM=";
|
||||
hash = "sha256-qP5Biw4sTLioAhmMZX+Pemue2PWc3N7afAe38dwJv3U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
buildInputs = [ mpv ];
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -30,5 +38,6 @@ buildPythonPackage rec {
|
|||
description = "A python interface to the mpv media player";
|
||||
homepage = "https://github.com/jaseg/python-mpv";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ onny ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
71
pkgs/development/python-modules/pyradiomics/default.nix
Normal file
71
pkgs/development/python-modules/pyradiomics/default.nix
Normal file
|
|
@ -0,0 +1,71 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
, numpy
|
||||
, pykwalify
|
||||
, pywavelets
|
||||
, setuptools
|
||||
, simpleitk
|
||||
, six
|
||||
, versioneer
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyradiomics";
|
||||
version = "3.1.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AIM-Harvard";
|
||||
repo = "pyradiomics";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-/qFNN63Bbq4DUZDPmwUGj1z5pY3ujsbqFJpVXbO+b8E=";
|
||||
name = "pyradiomics";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools versioneer ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
pykwalify
|
||||
pywavelets
|
||||
simpleitk
|
||||
six
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
preCheck = ''
|
||||
rm -rf radiomics
|
||||
'';
|
||||
# tries to access network at collection time:
|
||||
disabledTestPaths = [ "tests/test_wavelet.py" ];
|
||||
# various urllib download errors and (probably related) missing feature errors:
|
||||
disabledTests = [
|
||||
"brain1_shape2D-original_shape2D"
|
||||
"brain2_shape2D-original_shape2D"
|
||||
"breast1_shape2D-original_shape2D"
|
||||
"lung1_shape2D-original_shape2D"
|
||||
"lung2_shape2D-original_shape2D"
|
||||
];
|
||||
# note the above elements of disabledTests are patterns, not exact tests,
|
||||
# so simply setting `disabledTests` does not suffice:
|
||||
pytestFlagsArray = [
|
||||
"-k '${toString (lib.intersperse "and" (lib.forEach disabledTests (t: "not ${t}")))}'"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"radiomics"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://pyradiomics.readthedocs.io";
|
||||
description = "Extraction of Radiomics features from 2D and 3D images and binary masks";
|
||||
changelog = "https://github.com/AIM-Harvard/pyradiomics/releases/tag/v${version}";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ bcdarwin ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,38 +1,43 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, altair
|
||||
, blinker
|
||||
, buildPythonApplication
|
||||
, buildPythonPackage
|
||||
, cachetools
|
||||
, click
|
||||
, fetchPypi
|
||||
, gitpython
|
||||
, importlib-metadata
|
||||
, jinja2
|
||||
, numpy
|
||||
, packaging
|
||||
, pandas
|
||||
, pillow
|
||||
, protobuf3
|
||||
, pyarrow
|
||||
, pydeck
|
||||
, pympler
|
||||
, python-dateutil
|
||||
, pythonOlder
|
||||
, requests
|
||||
, rich
|
||||
, semver
|
||||
, setuptools
|
||||
, tenacity
|
||||
, toml
|
||||
, tornado
|
||||
, typing-extensions
|
||||
, tzlocal
|
||||
, validators
|
||||
, watchdog
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
buildPythonPackage rec {
|
||||
pname = "streamlit";
|
||||
version = "1.24.0";
|
||||
version = "1.24.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version format;
|
||||
hash = "sha256-NSX6zpTHh5JzPFbWOja0iEUVDjume7UKGa20xZdagiU=";
|
||||
hash = "sha256-/V8LZHmOlwY2RAj7WJt3WVMUpjFdE7LXULljx66X82I=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -42,21 +47,23 @@ buildPythonApplication rec {
|
|||
click
|
||||
gitpython
|
||||
importlib-metadata
|
||||
jinja2
|
||||
numpy
|
||||
packaging
|
||||
pandas
|
||||
pillow
|
||||
protobuf3
|
||||
pyarrow
|
||||
pydeck
|
||||
pympler
|
||||
python-dateutil
|
||||
requests
|
||||
rich
|
||||
semver
|
||||
setuptools
|
||||
tenacity
|
||||
toml
|
||||
tornado
|
||||
typing-extensions
|
||||
tzlocal
|
||||
validators
|
||||
] ++ lib.optionals (!stdenv.isDarwin) [
|
||||
watchdog
|
||||
];
|
||||
|
||||
|
|
@ -75,7 +82,7 @@ buildPythonApplication rec {
|
|||
homepage = "https://streamlit.io/";
|
||||
changelog = "https://github.com/streamlit/streamlit/releases/tag/${version}";
|
||||
description = "The fastest way to build custom ML tools";
|
||||
maintainers = with maintainers; [ yrashk ];
|
||||
maintainers = with maintainers; [ natsukium yrashk ];
|
||||
license = licenses.asl20;
|
||||
};
|
||||
}
|
||||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "api-linter";
|
||||
version = "1.55.0";
|
||||
version = "1.55.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googleapis";
|
||||
repo = "api-linter";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-aywqb//fhygphjX3suVfqNIG0saPPnhgLPA/DBpSVQY=";
|
||||
hash = "sha256-OBx8zlxDLlPy6hfA8A9+F0bOglAzY81d9U7uCje0vyo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-oK1d9aQ43Zj+Xt4tMhn+Lz1Q09psqqdTUqbgEdkuBvg=";
|
||||
vendorHash = "sha256-x8mncoXVK7p6xxgaZL/Fv6dHgeOj2rWr55ovvk6zwQE=";
|
||||
|
||||
subPackages = [ "cmd/api-linter" ];
|
||||
|
||||
|
|
@ -23,7 +23,7 @@ buildGoModule rec {
|
|||
"-w"
|
||||
];
|
||||
|
||||
# reference: https://github.com/googleapis/api-linter/blob/v1.55.0/.github/workflows/release.yaml#L76
|
||||
# reference: https://github.com/googleapis/api-linter/blob/v1.55.2/.github/workflows/release.yaml#L76
|
||||
preBuild = ''
|
||||
cat > cmd/api-linter/version.go <<EOF
|
||||
package main
|
||||
|
|
|
|||
59
pkgs/development/tools/database/prqlc/default.nix
Normal file
59
pkgs/development/tools/database/prqlc/default.nix
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, openssl
|
||||
, sqlite
|
||||
, zlib
|
||||
, stdenv
|
||||
, darwin
|
||||
, python3
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "prqlc";
|
||||
version = "0.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prql";
|
||||
repo = "prql";
|
||||
rev = version;
|
||||
hash = "sha256-m5W7ddGlgxaQR+nCFygfLWU6QBDUOK9POPdR2H62j9Q=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-7vjDWiod52fuAPHbB/UmqG9YZb8GvyZGMgdYr2qI+uM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
rustPlatform.bindgenHook
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
openssl
|
||||
sqlite
|
||||
zlib
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.CoreFoundation
|
||||
darwin.apple_sdk.frameworks.CoreServices
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
env = {
|
||||
PYO3_PYTHON = "${python3}/bin/python3";
|
||||
};
|
||||
|
||||
# we are only interested in the prqlc binary
|
||||
postInstall = ''
|
||||
rm -r $out/bin/compile-files $out/bin/mdbook-prql $out/lib
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A CLI for the PRQL compiler - a simple, powerful, pipelined SQL replacement";
|
||||
homepage = "https://github.com/prql/prql";
|
||||
changelog = "https://github.com/prql/prql/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ dit7ya ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "vitess";
|
||||
version = "17.0.0";
|
||||
version = "17.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vitessio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-J/lvOP8MsHOWnq7kKRqIktME0ewtilkyOv8pD1wSnPc=";
|
||||
hash = "sha256-EvCH1NxsGQzkXv0i5WOZXG9jeile0IHyZAoINgBIwYs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QcCgDOqKSI+NPCdQJY4v6qU31nLQPIF8fs2qkLOk+DU=";
|
||||
vendorHash = "sha256-0OrPbMG7ElOD+9/kWx1HtvGUBiFpIsNs5Vu7QofzE6Q=";
|
||||
|
||||
buildInputs = [ sqlite ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ddosify";
|
||||
version = "1.0.4";
|
||||
version = "1.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-QJbIKzEYZO/LoOHKwXMlIY6q646+FdHwhA3WcXNA+F8=";
|
||||
sha256 = "sha256-oCbEAEBZJsMnnVu2N6eiQiaywovWmGUSVpUyWyS7TpM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-cGhMhX+SEv9fejViLZrEwXg584o204OQ5iR6AkxKnXo=";
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@
|
|||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "frink";
|
||||
version = "2023-05-22";
|
||||
version = "2023-07-31";
|
||||
|
||||
src = fetchurl {
|
||||
# Upstream does not provide versioned download links
|
||||
url = "https://web.archive.org/web/20230526123219/https://frinklang.org/frinkjar/frink.jar";
|
||||
sha256 = "sha256-IgINJvt9G5f1HELKhV5BHIu9NoA8STDqNg/dVTFzK0Y=";
|
||||
url = "https://web.archive.org/web/20230806114836/https://frinklang.org/frinkjar/frink.jar";
|
||||
sha256 = "sha256-u44g/pM4ie3NcBh6MZpN8+oWZLYz0LN5ozetee1iXNk=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@ let bins = [ "crane" "gcrane" ]; in
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "go-containerregistry";
|
||||
version = "0.15.2";
|
||||
version = "0.16.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Bva962laaHJAHwiQAMPtOBkwqce1ww+sBGkjV1TjrwQ=";
|
||||
sha256 = "sha256-uqTWeA449MhHFWJwyqJgLsQHvjfk46S1YA+Yss5muSk=";
|
||||
};
|
||||
vendorHash = null;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubeswitch";
|
||||
version = "0.7.2";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "danielfoehrKn";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-p4/nYZt+OwNsFX9f9ySfQaz6gbz+8Mvt00W2Rs4dpCY=";
|
||||
sha256 = "sha256-7BQhkFvOgmLuzBEvAou8KANhxWna5KVokIF4DEIVU2g=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
subPackages = [ "cmd/main.go" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "metals";
|
||||
version = "0.11.12";
|
||||
version = "1.0.0";
|
||||
|
||||
deps = stdenv.mkDerivation {
|
||||
name = "${pname}-deps-${version}";
|
||||
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
outputHashMode = "recursive";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = "sha256-3zYjjrd3Hc2T4vwnajiAMNfTDUprKJZnZp2waRLQjI4=";
|
||||
outputHash = "sha256-futBxdMEJN0UdDvlk5FLUUmcG7r7P7D81IhbC2oYn5s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper setJavaClassPath ];
|
||||
|
|
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
homepage = "https://scalameta.org/metals/";
|
||||
license = licenses.asl20;
|
||||
description = "Work-in-progress language server for Scala";
|
||||
description = "Language server for Scala";
|
||||
maintainers = with maintainers; [ fabianhjr tomahna ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "act";
|
||||
version = "0.2.48";
|
||||
version = "0.2.49";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nektos";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-fEV7WiWoI0TGEAAG0HVRW42TEOlHbB91BZcn9h9G5c8=";
|
||||
hash = "sha256-dJt8XrcB1rYt6os3enLQz0YuqXNIqQTh85BIJdXwi2A=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-r6eJl9KhOWPLqCqe3OTjUbENbZU/1NjOoxssaAh0g78=";
|
||||
vendorHash = "sha256-QPpwYec2Y0x/VOsiTWvObKrNWGGE7dj8Cl5eM2l8ibk=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "terraform-ls";
|
||||
version = "0.31.3";
|
||||
version = "0.31.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-OzqJ/F3GeIaX4/z1KJdok8kUfualRzHv1AIM8dt8Kik=";
|
||||
hash = "sha256-0IP+83nGODSH/ELKsOA9ylm5fvREtRyiZASMNnwYIL4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-pEuen7CWniFzLgL1v+Xt1l6hde3YpyOMmQalj08UBX8=";
|
||||
vendorHash = "sha256-FDKprWyOltFy5WmXME/EfLuYRj92WuhgOV0VdWGanHg=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -32,13 +32,13 @@ let
|
|||
in
|
||||
mkDerivation rec {
|
||||
pname = "renderdoc";
|
||||
version = "1.27";
|
||||
version = "1.28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "baldurk";
|
||||
repo = "renderdoc";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-zkot9LbbZyzQ7CLSEVPsospAo9u7WR2VHjQdnpNiLR0=";
|
||||
sha256 = "sha256-a8f/lbNcsWdYAmhNnTelyYX5J/XhINHRfguRFXQa3uY=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-hack";
|
||||
version = "0.5.28";
|
||||
version = "0.5.29";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-434imb66AINKeW50ITc4RRYO9v7sH3fs1DEwSBc3mys=";
|
||||
sha256 = "sha256-Z3UExZghVw7Pbgh5nHuiC8cFVefBE0yZ2k5laam8myY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-oDrpQskQV5hG9Ksp0TJcXjm/J9q/K831mOzxH+CXjfg=";
|
||||
cargoSha256 = "sha256-5X3MX2KV87mOcN/cL/lFU9K9/j04zn5C7teIXFqj7Wk=";
|
||||
|
||||
# some necessary files are absent in the crate version
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-llvm-cov";
|
||||
version = "0.5.24";
|
||||
version = "0.5.25";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Woayb/SgSCHwYYYezQXsna9N0Jot0/iga+jrOhjsSvc=";
|
||||
sha256 = "sha256-4ctwvDLluJsLWJPInoFGqxmEzlEuBtEJb3/x+q/5pDA=";
|
||||
};
|
||||
cargoSha256 = "sha256-8rP/wtDFH7hL3jt/QpWqriRwxlm0E2QvIqbCLiN7ZiM=";
|
||||
cargoSha256 = "sha256-QghbQYfoCd+ppNz/g5NlCnrFYpsjesQlcgMCEKUgN2k=";
|
||||
|
||||
# skip tests which require llvm-tools-preview
|
||||
checkFlags = [
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wasmedge";
|
||||
version = "0.13.2";
|
||||
version = "0.13.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WasmEdge";
|
||||
repo = "WasmEdge";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-AU+EfNC6Au93ajj8cMTbJDvJ5iWLtT5Law7l55Knxuk=";
|
||||
sha256 = "sha256-IZMYeuneKtcuvbEVgkF2C3gbxJe7GlXRNEYwpFxtiKA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -48,6 +48,12 @@ lib.makeScope
|
|||
glibc = glibc22;
|
||||
};
|
||||
|
||||
findutils = callPackage ./findutils {
|
||||
bash = bash_2_05;
|
||||
gcc = gcc2;
|
||||
glibc = glibc22;
|
||||
};
|
||||
|
||||
gawk = callPackage ./gawk {
|
||||
bash = bash_2_05;
|
||||
tinycc = tinycc-mes;
|
||||
|
|
@ -141,6 +147,7 @@ lib.makeScope
|
|||
echo ${binutils-mes.tests.get-version}
|
||||
echo ${bzip2.tests.get-version}
|
||||
echo ${diffutils.tests.get-version}
|
||||
echo ${findutils.tests.get-version}
|
||||
echo ${gawk.tests.get-version}
|
||||
echo ${gcc2.tests.get-version}
|
||||
echo ${gcc2-mes.tests.get-version}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,72 @@
|
|||
{ lib
|
||||
, buildPlatform
|
||||
, hostPlatform
|
||||
, fetchurl
|
||||
, bash
|
||||
, gcc
|
||||
, glibc
|
||||
, binutils
|
||||
, linux-headers
|
||||
, gnumake
|
||||
, gnugrep
|
||||
, gnused
|
||||
, gawk
|
||||
, gnutar
|
||||
, gzip
|
||||
}:
|
||||
let
|
||||
pname = "findutils";
|
||||
version = "4.4.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/findutils/findutils-${version}.tar.gz";
|
||||
sha256 = "0amn0bbwqvsvvsh6drfwz20ydc2czk374lzw5kksbh6bf78k4ks3";
|
||||
};
|
||||
in
|
||||
bash.runCommand "${pname}-${version}" {
|
||||
inherit pname version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
gcc
|
||||
binutils
|
||||
gnumake
|
||||
gnused
|
||||
gnugrep
|
||||
gawk
|
||||
gnutar
|
||||
gzip
|
||||
];
|
||||
|
||||
passthru.tests.get-version = result:
|
||||
bash.runCommand "${pname}-get-version-${version}" {} ''
|
||||
${result}/bin/find --version
|
||||
mkdir $out
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "GNU Find Utilities, the basic directory searching utilities of the GNU operating system";
|
||||
homepage = "https://www.gnu.org/software/findutils";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = teams.minimal-bootstrap.members;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
} ''
|
||||
# Unpack
|
||||
tar xzf ${src}
|
||||
cd findutils-${version}
|
||||
|
||||
# Configure
|
||||
export C_INCLUDE_PATH="${glibc}/include:${linux-headers}/include"
|
||||
export LIBRARY_PATH="${glibc}/lib"
|
||||
export LIBS="-lc -lnss_files -lnss_dns -lresolv"
|
||||
bash ./configure \
|
||||
--prefix=$out \
|
||||
--build=${buildPlatform.config} \
|
||||
--host=${hostPlatform.config}
|
||||
|
||||
# Build
|
||||
make
|
||||
|
||||
# Install
|
||||
make install
|
||||
''
|
||||
|
|
@ -1,31 +1,31 @@
|
|||
{ fetchurl, fetchzip }:
|
||||
{
|
||||
x86_64-darwin = fetchzip {
|
||||
sha256 = "sha256-7GoW0Re4NZa31mmNPto9fCVzKCl5ymUYQCwmDfuAnIc=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.35/AdGuardHome_darwin_amd64.zip";
|
||||
sha256 = "sha256-jIrzE1Je2dhMJuq3k8KL1VoHru5qaUAJCR3kumE9aO0=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.36/AdGuardHome_darwin_amd64.zip";
|
||||
};
|
||||
aarch64-darwin = fetchzip {
|
||||
sha256 = "sha256-A3EGk+dsh1/m4rAWKNq6va75pA4OFLo9kSLb0b/1uZA=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.35/AdGuardHome_darwin_arm64.zip";
|
||||
sha256 = "sha256-9BgGGCP8n+5Op+S1/yT/kdMvmiNgKkkXLQmqF2plJZY=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.36/AdGuardHome_darwin_arm64.zip";
|
||||
};
|
||||
i686-linux = fetchurl {
|
||||
sha256 = "sha256-8OIxMXjCZEurxInuDRAzEZ/Vjn1ixzZRMqXiSKgx7GE=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.35/AdGuardHome_linux_386.tar.gz";
|
||||
sha256 = "sha256-yPxLYXtH4bwQk2M2VTS5aJWTJciNaeXRRAcMBHuvkcA=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.36/AdGuardHome_linux_386.tar.gz";
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
sha256 = "sha256-japMeJETDPy0RaxJOs6dDktQfTZ1sLB4jotxLYZhxfc=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.35/AdGuardHome_linux_amd64.tar.gz";
|
||||
sha256 = "sha256-sG64t1x70uKk844dT1g9GzJ+DgHuv7sUEBaVqoEmWOw=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.36/AdGuardHome_linux_amd64.tar.gz";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
sha256 = "sha256-E1MsoM3ZDaEPFLvXWt/+0hv8CVu2v9xlX0rvh4vmj6Y=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.35/AdGuardHome_linux_arm64.tar.gz";
|
||||
sha256 = "sha256-rUSfo1uJGbxx1n/VcLyq5zqiDo4g0caCpVcL2uZUSkE=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.36/AdGuardHome_linux_arm64.tar.gz";
|
||||
};
|
||||
armv6l-linux = fetchurl {
|
||||
sha256 = "sha256-LovoihsVGtDif7sSqS3CE3QXNv2v2aSLr/x9sq2j78E=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.35/AdGuardHome_linux_armv6.tar.gz";
|
||||
sha256 = "sha256-ruICFAGEMXDeLvoOxHg2oEaYDHkoGZI+SozDXmmD9VU=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.36/AdGuardHome_linux_armv6.tar.gz";
|
||||
};
|
||||
armv7l-linux = fetchurl {
|
||||
sha256 = "sha256-ArTTEWD0yYLRrX8jytkMtKWLbEfr90O4i73dMjA+sdE=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.35/AdGuardHome_linux_armv7.tar.gz";
|
||||
sha256 = "sha256-mTGufMIKkj2R7QuNWKSKMt9KdwlZe9ORtJK5hIaeH/E=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.36/AdGuardHome_linux_armv7.tar.gz";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "adguardhome";
|
||||
version = "0.107.35";
|
||||
version = "0.107.36";
|
||||
src = sources.${system} or (throw "Source for ${pname} is not available for ${system}");
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dolt";
|
||||
version = "1.8.4";
|
||||
version = "1.8.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dolthub";
|
||||
repo = "dolt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vvtYhvfzuB/Yo/Oy6YedYVIvnOP7nM/4z/798i28v6U=";
|
||||
sha256 = "sha256-wsSSUd3i3PXEQfvpstcNXM9PK4K/Uw/xcT5Iu0vRKqQ=";
|
||||
};
|
||||
|
||||
modRoot = "./go";
|
||||
subPackages = [ "cmd/dolt" ];
|
||||
vendorHash = "sha256-qMK95buygi0c2rluoFlqmMko72x5kFFoUBPIohmkfNQ=";
|
||||
vendorHash = "sha256-bLqoitXf4O2WFkArkvm3IeeKU8XQpSIicWwDD4aOWrg=";
|
||||
proxyVendor = true;
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "zigbee2mqtt";
|
||||
version = "1.32.1";
|
||||
version = "1.32.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Koenkk";
|
||||
repo = "zigbee2mqtt";
|
||||
rev = version;
|
||||
hash = "sha256-HHu3aycYvcv7c4CMvv9GzeB4ZAleLDW/nRKmWahSQ88=";
|
||||
hash = "sha256-ghJMSWb2bYtJhthV7KOLn9q1Tf3dCtBCCDrnjlen5JU=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-uryyBFGNdsOVferTNTQ8+O3gv+lJ3mCuaU/47UzqcMk=";
|
||||
npmDepsHash = "sha256-2OjUBOCaVFU7Ct1n15AHm6QmzsIaGtti8zsElXcVSA8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "carapace";
|
||||
version = "0.25.3";
|
||||
version = "0.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rsteube";
|
||||
repo = "${pname}-bin";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-N1rPAK+fjFqojxMMRgohTwhlYxHC0fUICZ+fcG23gUE=";
|
||||
sha256 = "sha256-1e2hrAoFtnG1lU7evYnJXs65qmLNvO6fO9kPqjv66YE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-LooEhKK+JSUaEMio81WGMv5l1SqEIs2r978yEc7sPlo=";
|
||||
vendorHash = "sha256-T0N6e96F/4HkHKYNiPFME/PUJGh+pbTmmb4SdZiDVgw=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "copilot-cli";
|
||||
version = "1.29.0";
|
||||
version = "1.29.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sXYdP1HvwamKKvCNM5T2vu86y5mQ9MD44SrFgqWfQkE=";
|
||||
sha256 = "sha256-Mfh3Bym9aVvCaRHcSyg68KqA1Zx0tt7x52IOzvC+61M=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-TbgxXkLIEu7jSnngVRbp4E22GgOkXSB0b8JzHI/pNGk=";
|
||||
vendorHash = "sha256-0QPUvKGuR4fhXUoak6PqkBXsg+WkAOlSluci6/+ULB8=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -42,14 +42,14 @@ let
|
|||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "gimme-aws-creds";
|
||||
version = "2.7.0"; # N.B: if you change this, check if overrides are still up-to-date
|
||||
version = "2.7.1"; # N.B: if you change this, check if overrides are still up-to-date
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nike-Inc";
|
||||
repo = "gimme-aws-creds";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PGDTCQUwWoRCYu6rm63ftIYLyAIIJ4SDvP4IGkxn3hs=";
|
||||
hash = "sha256-vn3DzDqu19g6Z/RcWsktJxmeg6oK9NIEyjpH9g1tXNs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python.pkgs; [
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
{ lib
|
||||
, lxd-unwrapped
|
||||
, linkFarm
|
||||
, makeWrapper
|
||||
, stdenv
|
||||
, symlinkJoin
|
||||
, writeShellScriptBin
|
||||
, acl
|
||||
|
|
@ -12,13 +14,18 @@
|
|||
, criu
|
||||
, dnsmasq
|
||||
, gnutar
|
||||
, gptfdisk
|
||||
, gzip
|
||||
, iproute2
|
||||
, iptables
|
||||
, OVMF
|
||||
, qemu_kvm
|
||||
, qemu-utils
|
||||
, rsync
|
||||
, spice-gtk
|
||||
, squashfsTools
|
||||
, virtiofsd
|
||||
, xz
|
||||
,
|
||||
}:
|
||||
let
|
||||
binPath = lib.makeBinPath [
|
||||
|
|
@ -29,17 +36,63 @@ let
|
|||
criu
|
||||
dnsmasq
|
||||
gnutar
|
||||
gptfdisk
|
||||
gzip
|
||||
iproute2
|
||||
iptables
|
||||
qemu_kvm
|
||||
qemu-utils
|
||||
rsync
|
||||
squashfsTools
|
||||
virtiofsd
|
||||
xz
|
||||
|
||||
(writeShellScriptBin "apparmor_parser" ''
|
||||
exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@"
|
||||
'')
|
||||
];
|
||||
|
||||
clientBinPath = [
|
||||
spice-gtk
|
||||
];
|
||||
|
||||
ovmf-2mb = OVMF.override {
|
||||
secureBoot = true;
|
||||
csmSupport = false;
|
||||
fdSize2MB = true;
|
||||
};
|
||||
|
||||
ovmf-4mb = OVMF.override {
|
||||
secureBoot = true;
|
||||
csmSupport = false;
|
||||
fdSize4MB = true;
|
||||
};
|
||||
|
||||
ovmf-4mb-csm = OVMF.override {
|
||||
secureBoot = true;
|
||||
csmSupport = false;
|
||||
fdSize2MB = false;
|
||||
fdSize4MB = true;
|
||||
};
|
||||
|
||||
ovmf-prefix = if stdenv.hostPlatform.isAarch64 then "AAVMF" else "OVMF";
|
||||
|
||||
# mimic ovmf from https://github.com/canonical/lxd-pkg-snap/blob/3abebe1dfeb20f9b7729556960c7e9fe6ad5e17c/snapcraft.yaml#L378
|
||||
# also found in /snap/lxd/current/share/qemu/ on a snap install
|
||||
ovmf = linkFarm "lxd-ovmf" [
|
||||
{ name = "OVMF_CODE.2MB.fd"; path = "${ovmf-2mb.fd}/FV/${ovmf-prefix}_CODE.fd"; }
|
||||
{ name = "OVMF_CODE.4MB.CSM.fd"; path = "${ovmf-4mb-csm.fd}/FV/${ovmf-prefix}_CODE.fd"; }
|
||||
{ name = "OVMF_CODE.4MB.fd"; path = "${ovmf-4mb.fd}/FV/${ovmf-prefix}_CODE.fd"; }
|
||||
{ name = "OVMF_CODE.fd"; path = "${ovmf-2mb.fd}/FV/${ovmf-prefix}_CODE.fd"; }
|
||||
|
||||
{ name = "OVMF_VARS.2MB.fd"; path = "${ovmf-2mb.fd}/FV/${ovmf-prefix}_VARS.fd"; }
|
||||
{ name = "OVMF_VARS.2MB.ms.fd"; path = "${ovmf-2mb.fd}/FV/${ovmf-prefix}_VARS.fd"; }
|
||||
{ name = "OVMF_VARS.4MB.CSM.fd"; path = "${ovmf-4mb-csm.fd}/FV/${ovmf-prefix}_VARS.fd"; }
|
||||
{ name = "OVMF_VARS.4MB.fd"; path = "${ovmf-4mb.fd}/FV/${ovmf-prefix}_VARS.fd"; }
|
||||
{ name = "OVMF_VARS.4MB.ms.fd"; path = "${ovmf-4mb.fd}/FV/${ovmf-prefix}_VARS.fd"; }
|
||||
{ name = "OVMF_VARS.fd"; path = "${ovmf-2mb.fd}/FV/${ovmf-prefix}_VARS.fd"; }
|
||||
{ name = "OVMF_VARS.ms.fd"; path = "${ovmf-2mb.fd}/FV/${ovmf-prefix}_VARS.fd"; }
|
||||
];
|
||||
in
|
||||
symlinkJoin {
|
||||
name = "lxd-${lxd-unwrapped.version}";
|
||||
|
|
@ -49,11 +102,13 @@ symlinkJoin {
|
|||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
postBuild = ''
|
||||
wrapProgram $out/bin/lxd --prefix PATH : ${lib.escapeShellArg binPath}
|
||||
wrapProgram $out/bin/lxd --prefix PATH : ${lib.escapeShellArg binPath}:${qemu_kvm}/libexec:$out/bin --set LXD_OVMF_PATH ${ovmf}
|
||||
|
||||
wrapProgram $out/bin/lxc --prefix PATH : ${lib.makeBinPath clientBinPath}
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit (lxd-unwrapped) tests;
|
||||
inherit (lxd-unwrapped) tests ui;
|
||||
};
|
||||
|
||||
inherit (lxd-unwrapped) meta pname version;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "scaleway-cli";
|
||||
version = "2.18.0";
|
||||
version = "2.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scaleway";
|
||||
repo = "scaleway-cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ytnYrvvfO8L+TI1x0ydDBnh5lurWL1avCPVAlK/cOuI=";
|
||||
sha256 = "sha256-DJTgmUH/n1TBKrgBN+8oG2ziRlAXzj6gOtjv4QjNkC8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-UWWnT6ft/eGCn/6T1IDQSdfgv8htxDL2cFl4reAx51k=";
|
||||
vendorHash = "sha256-RnTj59WsyY/cWkhe2bucMvzrI8EwC3I1kxccBCfFqtI=";
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "lazydocker";
|
||||
version = "0.21.0";
|
||||
version = "0.21.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jesseduffield";
|
||||
repo = "lazydocker";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CALMpedDCBlsYt31JOlwH1SOEhy/DFP6SdjoVkQ2KOs=";
|
||||
sha256 = "sha256-fzHsLKtlyTKcuOqTYtoE5Wv0Y45tAMgRpYmXA4oYrVY=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -5,17 +5,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "opentelemetry-collector";
|
||||
version = "0.81.0";
|
||||
version = "0.82.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-collector";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-yywmnJUTigDYeiAuK0f2511vh6sS4oD4hJLPozAlWz4=";
|
||||
hash = "sha256-EYkHfqwCxNIrE+wRMo/kwOVfuQfgrgcpmSL1gVwDebo=";
|
||||
};
|
||||
# there is a nested go.mod
|
||||
sourceRoot = "${src.name}/cmd/otelcorecol";
|
||||
vendorHash = "sha256-BNIQ0pTHGgwWw1cy7au6hUeECC8oGsSkxaX5BUCRG9Y=";
|
||||
vendorHash = "sha256-lebysPwGTOj2W0OKmj/2sIH5wMKfhZYwHWYjqa2dfKw=";
|
||||
|
||||
# upstream strongly recommends disabling CGO
|
||||
# additionally dependencies have had issues when GCO was enabled that weren't caught upstream
|
||||
|
|
|
|||
2
pkgs/tools/networking/edgedb/Cargo.lock
generated
2
pkgs/tools/networking/edgedb/Cargo.lock
generated
|
|
@ -884,7 +884,7 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
|
|||
|
||||
[[package]]
|
||||
name = "edgedb-cli"
|
||||
version = "3.3.0"
|
||||
version = "3.4.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"arc-swap",
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "edgedb";
|
||||
version = "3.3.0";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "edgedb";
|
||||
repo = "edgedb-cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6uhwuAGZ/XU+eENNo0H7hOdrDDx0fWvPVZAEOm5mdcY=";
|
||||
sha256 = "sha256-w6YpjSmh517yat45l4gGdV6qWD4O3aCx/6LL5wea+RA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
@ -33,9 +33,9 @@ rustPlatform.buildRustPackage rec {
|
|||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"edgedb-derive-0.5.0" = "sha256-y/mN0XuJtQBtkLmbk2s7hK5joGEH5Ge6sLCD88WyL9o=";
|
||||
"edgeql-parser-0.1.0" = "sha256-Y3gXxPuR7qnTL4fu2nZIa3e20YV1fLvm2jHAng+Ke2Q=";
|
||||
"indexmap-2.0.0-pre" = "sha256-QMOmoUHE1F/sp+NeDpgRGqqacWLHWG02YgZc5vAdXZY=";
|
||||
"rexpect-0.5.0" = "sha256-vstAL/fJWWx7WbmRxNItKpzvgGF3SvJDs5isq9ym/OA=";
|
||||
"edgeql-parser-0.1.0" = "sha256-Y3gXxPuR7qnTL4fu2nZIa3e20YV1fLvm2jHAng+Ke2Q=";
|
||||
"rustyline-8.0.0" = "sha256-CrICwQbHPzS4QdVIEHxt2euX+g+0pFYe84NfMp1daEc=";
|
||||
"serde_str-1.0.0" = "sha256-CMBh5lxdQb2085y0jc/DrV6B8iiXvVO2aoZH/lFFjak=";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,27 +2,39 @@
|
|||
, python3
|
||||
, fetchFromGitHub
|
||||
|
||||
, installShellFiles
|
||||
, bubblewrap
|
||||
, nix-output-monitor
|
||||
, cacert
|
||||
, git
|
||||
, nix
|
||||
|
||||
, withAutocomplete ? true
|
||||
, withSandboxSupport ? false
|
||||
, withNom ? false
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "nixpkgs-review";
|
||||
version = "2.9.3";
|
||||
version = "2.10.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Mic92";
|
||||
repo = "nixpkgs-review";
|
||||
rev = version;
|
||||
sha256 = "sha256-Pcyhrw6oR+tLf/qgLnb7qx3003ldv3KuDVg6QsEhQp0=";
|
||||
hash = "sha256-uMcTwRmELk/vFI7vU4+UUvBDhlF+gVgohIXE0Sm1/d8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
python3.pkgs.setuptools
|
||||
] ++ lib.optionals withAutocomplete [
|
||||
python3.pkgs.argcomplete
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ python3.pkgs.argcomplete ];
|
||||
|
||||
makeWrapperArgs =
|
||||
let
|
||||
binPath = [ nix git ]
|
||||
|
|
@ -38,6 +50,15 @@ python3.pkgs.buildPythonApplication rec {
|
|||
|
||||
doCheck = false;
|
||||
|
||||
postInstall = lib.optionalString withAutocomplete ''
|
||||
for cmd in nix-review nixpkgs-review; do
|
||||
installShellCompletion --cmd $cmd \
|
||||
--bash <(register-python-argcomplete $out/bin/$cmd) \
|
||||
--fish <(register-python-argcomplete $out/bin/$cmd -s fish) \
|
||||
--zsh <(register-python-argcomplete $out/bin/$cmd -s zsh)
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Review pull-requests on https://github.com/NixOS/nixpkgs";
|
||||
homepage = "https://github.com/Mic92/nixpkgs-review";
|
||||
|
|
|
|||
1252
pkgs/tools/text/autocorrect/Cargo.lock
generated
1252
pkgs/tools/text/autocorrect/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "autocorrect";
|
||||
version = "2.6.2";
|
||||
version = "2.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "huacnlee";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-QHQQrUQCfDAlAtDcfrAkOwRhQkO+HcwnPfJ5+jb1290=";
|
||||
sha256 = "sha256-njgngDowyRfOY9+BnBSNWow5GkdGhRu2YPXkA6n23qE=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ buildGoModule rec {
|
|||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X oss.terrastruct.com/d2/lib/version.Version=${version}"
|
||||
"-X oss.terrastruct.com/d2/lib/version.Version=v${version}"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
|
@ -41,7 +41,10 @@ buildGoModule rec {
|
|||
export TESTDATA_ACCEPT=1
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion { package = d2; };
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = d2;
|
||||
version = "v${version}";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A modern diagram scripting language that turns text to diagrams";
|
||||
|
|
|
|||
|
|
@ -32,17 +32,17 @@ let
|
|||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "diffsitter";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "afnanenayet";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-KrmK0RJdNJcZGM/7IxDP5IbJMTY3v6MkHA1SQW+U3hw=";
|
||||
sha256 = "sha256-8nKZ8zcZSSF7Qd36kA9IQjio+TIhlQWRgMqKrsdInj4=";
|
||||
fetchSubmodules = false;
|
||||
};
|
||||
|
||||
cargoHash = "sha256-3HALOoa3QDl9KE2UHxszzDw/VuDLLmjccXQvBBrfrHA=";
|
||||
cargoHash = "sha256-LEBAMb9tROpjrWEfucw+2ZaytnoyJE477IH3MyeUGEA=";
|
||||
|
||||
buildNoDefaultFeatures = true;
|
||||
buildFeatures = [
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "govc";
|
||||
version = "0.30.6";
|
||||
version = "0.30.7";
|
||||
|
||||
subPackages = [ "govc" ];
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ buildGoModule rec {
|
|||
rev = "v${version}";
|
||||
owner = "vmware";
|
||||
repo = "govmomi";
|
||||
sha256 = "sha256-gk8V7/4N8+KDy0lRu04xwbrnXQWxZQTkvdb2ZI3AfM8=";
|
||||
sha256 = "sha256-8cBS92O5AEeXQyLwOTAWbjvj1oPJiHLBooRgl5pt0Mk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-iLmQdjN0EXJuwC3NT5FKdHhJ4KvNAvnsBGAO9bypdqg=";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "jumppad";
|
||||
version = "0.5.31";
|
||||
version = "0.5.35";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jumppad-labs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2BdhJ11Mwd2w8VZfGcGJc6GuaKrVKjCqXLDggiiwyt0=";
|
||||
hash = "sha256-ZqP1m2Fbm9bn9uxJ7Ll4Vqa+STIrxX0jALGZJmOyAT8=";
|
||||
};
|
||||
vendorHash = "sha256-LneL4SzvcThfqqWdKpAU3mFAW1FVRTU9/T3l+yKBSME=";
|
||||
|
||||
|
|
|
|||
|
|
@ -1786,6 +1786,8 @@ with pkgs;
|
|||
|
||||
headset-charge-indicator = callPackage ../tools/audio/headset-charge-indicator { };
|
||||
|
||||
heh = callPackage ../applications/editors/heh { };
|
||||
|
||||
hexdiff = callPackage ../tools/misc/hexdiff { };
|
||||
|
||||
httm = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/httm { };
|
||||
|
|
@ -3710,10 +3712,7 @@ with pkgs;
|
|||
|
||||
github-copilot-intellij-agent = callPackage ../development/tools/github-copilot-intellij-agent { };
|
||||
|
||||
github-desktop = callPackage ../applications/version-management/github-desktop {
|
||||
openssl = openssl_1_1;
|
||||
curl = curl.override { openssl = openssl_1_1; };
|
||||
};
|
||||
github-desktop = callPackage ../applications/version-management/github-desktop { };
|
||||
|
||||
github-to-sqlite = with python3Packages; toPythonApplication github-to-sqlite;
|
||||
|
||||
|
|
@ -15422,19 +15421,11 @@ with pkgs;
|
|||
inherit (darwin.apple_sdk.frameworks) CoreServices;
|
||||
};
|
||||
|
||||
inherit (callPackages ../development/compilers/crystal {
|
||||
llvmPackages = llvmPackages_13;
|
||||
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
|
||||
})
|
||||
inherit (darwin.apple_sdk_11_0.callPackage ../development/compilers/crystal { })
|
||||
crystal_1_2
|
||||
crystal_1_7;
|
||||
|
||||
inherit (callPackages ../development/compilers/crystal {
|
||||
llvmPackages = llvmPackages_15;
|
||||
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
|
||||
})
|
||||
crystal_1_9
|
||||
crystal_1_7
|
||||
crystal_1_8
|
||||
crystal_1_9
|
||||
crystal;
|
||||
|
||||
crystal2nix = callPackage ../development/compilers/crystal2nix { };
|
||||
|
|
@ -16611,6 +16602,8 @@ with pkgs;
|
|||
|
||||
pony-corral = callPackage ../development/compilers/ponyc/pony-corral.nix { };
|
||||
|
||||
prqlc = callPackage ../development/tools/database/prqlc { };
|
||||
|
||||
qbe = callPackage ../development/compilers/qbe { };
|
||||
|
||||
rasm = callPackage ../development/compilers/rasm { };
|
||||
|
|
@ -38025,8 +38018,6 @@ with pkgs;
|
|||
|
||||
stone-kingdoms = callPackage ../games/stone-kingdoms { };
|
||||
|
||||
streamlit = python3Packages.callPackage ../applications/science/machine-learning/streamlit { };
|
||||
|
||||
stt = callPackage ../tools/audio/stt { };
|
||||
|
||||
stuntrally = callPackage ../games/stuntrally
|
||||
|
|
@ -38761,6 +38752,8 @@ with pkgs;
|
|||
|
||||
sc2-headless = callPackage ../applications/science/machine-learning/sc2-headless { };
|
||||
|
||||
streamlit = with python3Packages; toPythonApplication streamlit;
|
||||
|
||||
uarmsolver = callPackage ../applications/science/machine-learning/uarmsolver { };
|
||||
|
||||
### SCIENCE/MATH
|
||||
|
|
|
|||
|
|
@ -4182,6 +4182,8 @@ self: super: with self; {
|
|||
|
||||
georss-wa-dfes-client = callPackage ../development/python-modules/georss-wa-dfes-client { };
|
||||
|
||||
getjump = callPackage ../development/python-modules/getjump { };
|
||||
|
||||
getmac = callPackage ../development/python-modules/getmac { };
|
||||
|
||||
getkey = callPackage ../development/python-modules/getkey { };
|
||||
|
|
@ -9574,6 +9576,8 @@ self: super: with self; {
|
|||
|
||||
pyrad = callPackage ../development/python-modules/pyrad { };
|
||||
|
||||
pyradiomics = callPackage ../development/python-modules/pyradiomics { };
|
||||
|
||||
pyradios = callPackage ../development/python-modules/pyradios { };
|
||||
|
||||
pyrainbird = callPackage ../development/python-modules/pyrainbird { };
|
||||
|
|
@ -12173,6 +12177,8 @@ self: super: with self; {
|
|||
|
||||
streamlabswater = callPackage ../development/python-modules/streamlabswater { };
|
||||
|
||||
streamlit = callPackage ../development/python-modules/streamlit { };
|
||||
|
||||
streamz = callPackage ../development/python-modules/streamz { };
|
||||
|
||||
strenum = callPackage ../development/python-modules/strenum { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue