Merge master into staging-next

This commit is contained in:
github-actions[bot]
2024-07-05 00:02:21 +00:00
committed by GitHub
93 changed files with 4432 additions and 1325 deletions
+11 -11
View File
@@ -194,7 +194,7 @@ This helper has the same arguments as `buildDotnetModule`, with a few difference
* `pname` and `version` are required, and will be used to find the NuGet package of the tool
* `nugetName` can be used to override the NuGet package name that will be downloaded, if it's different from `pname`
* `nugetSha256` is the hash of the fetched NuGet package. Set this to `lib.fakeHash256` for the first build, and it will error out, giving you the proper hash. Also remember to update it during version updates (it will not error out if you just change the version while having a fetched package in `/nix/store`)
* `nugetHash` is the hash of the fetched NuGet package. `nugetSha256` is also supported, but not recommended. Set this to `lib.fakeHash` for the first build, and it will error out, giving you the proper hash. Also remember to update it during version updates (it will not error out if you just change the version while having a fetched package in `/nix/store`)
* `dotnet-runtime` is set to `dotnet-sdk` by default. When changing this, remember that .NET tools fetched from NuGet require an SDK.
Here is an example of packaging `pbm`, an unfree binary without source available:
@@ -205,7 +205,7 @@ buildDotnetGlobalTool {
pname = "pbm";
version = "1.3.1";
nugetSha256 = "sha256-ZG2HFyKYhVNVYd2kRlkbAjZJq88OADe3yjxmLuxXDUo=";
nugetHash = "sha256-ZG2HFyKYhVNVYd2kRlkbAjZJq88OADe3yjxmLuxXDUo=";
meta = {
homepage = "https://cmd.petabridge.com/index.html";
@@ -241,15 +241,15 @@ $ nuget-to-nix out > deps.nix
Which `nuget-to-nix` will generate an output similar to below
```nix
{ fetchNuGet }: [
(fetchNuGet { pname = "FosterFramework"; version = "0.1.15-alpha"; sha256 = "0pzsdfbsfx28xfqljcwy100xhbs6wyx0z1d5qxgmv3l60di9xkll"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.1"; sha256 = "1gjz379y61ag9whi78qxx09bwkwcznkx2mzypgycibxk61g11da1"; })
(fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.1"; sha256 = "1drbgqdcvbpisjn8mqfgba1pwb6yri80qc4mfvyczqwrcsj5k2ja"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.1"; sha256 = "1g5b30f4l8a1zjjr3b8pk9mcqxkxqwa86362f84646xaj4iw3a4d"; })
(fetchNuGet { pname = "SharpGLTF.Core"; version = "1.0.0-alpha0031"; sha256 = "0ln78mkhbcxqvwnf944hbgg24vbsva2jpih6q3x82d3h7rl1pkh6"; })
(fetchNuGet { pname = "SharpGLTF.Runtime"; version = "1.0.0-alpha0031"; sha256 = "0lvb3asi3v0n718qf9y367km7qpkb9wci38y880nqvifpzllw0jg"; })
(fetchNuGet { pname = "Sledge.Formats"; version = "1.2.2"; sha256 = "1y0l66m9rym0p1y4ifjlmg3j9lsmhkvbh38frh40rpvf1axn2dyh"; })
(fetchNuGet { pname = "Sledge.Formats.Map"; version = "1.1.5"; sha256 = "1bww60hv9xcyxpvkzz5q3ybafdxxkw6knhv97phvpkw84pd0jil6"; })
(fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; })
(fetchNuGet { pname = "FosterFramework"; version = "0.1.15-alpha"; hash = "sha256-lM6eYgOGjl1fx6WFD7rnRi/YAQieM0mx60h0p5dr+l8="; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.1"; hash = "sha256-QbUQXjCzr8j8u/5X0af9jE++EugdoxMhT08F49MZX74="; })
(fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.1"; hash = "sha256-SopZpGaZ48/8dpUwDFDM3ix+g1rP4Yqs1PGuzRp+K7c="; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.1"; hash = "sha256-jajBI5GqG2IIcsIMgxTHfXbMapoXrZGl/EEhShwYq7w="; })
(fetchNuGet { pname = "SharpGLTF.Core"; version = "1.0.0-alpha0031"; hash = "sha256-Bs4baD5wNIH6wAbGK4Xaem0i3luQkOQs37izBWdFx1I="; })
(fetchNuGet { pname = "SharpGLTF.Runtime"; version = "1.0.0-alpha0031"; hash = "sha256-TwJO6b8ubmwBQh6NyHha8+JT5zHDJ4dROBbsEbUaa1M="; })
(fetchNuGet { pname = "Sledge.Formats"; version = "1.2.2"; hash = "sha256-0Ddhuwpu3wwIzA4NuPaEVdMkx6tUukh8uKD6nKoxFPg="; })
(fetchNuGet { pname = "Sledge.Formats.Map"; version = "1.1.5"; hash = "sha256-hkYJ2iWIz7vhPWlDOw2fvTenlh+4/D/37Z71tCEwnK8="; })
(fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; })
]
```
+6 -7
View File
@@ -8049,6 +8049,12 @@
name = "Nova Witterick";
keys = [ { fingerprint = "4304 6B43 8D83 078E 3DF7 10D6 DEB0 E15C 6D2A 5A7C"; } ];
};
heywoodlh = {
email = "nixpkgs@heywoodlh.io";
github = "heywoodlh";
githubId = 18178614;
name = "Spencer Heywood";
};
hh = {
email = "hh@m-labs.hk";
github = "HarryMakes";
@@ -19525,13 +19531,6 @@
githubId = 28858039;
name = "Tuomas Mäkinen";
};
tadeokondrak = {
email = "me@tadeo.ca";
github = "tadeokondrak";
githubId = 4098453;
name = "Tadeo Kondrak";
keys = [ { fingerprint = "0F2B C0C7 E77C 5B42 AC5B 4C18 FBE6 07FC C495 16D3"; } ];
};
tadfisher = {
email = "tadfisher@gmail.com";
github = "tadfisher";
@@ -8,6 +8,7 @@
- [AMDVLK](https://github.com/GPUOpen-Drivers/AMDVLK), AMD's open source Vulkan driver, is now available to be configured as `hardware.amdgpu.amdvlk` option.
This also allows configuring runtime settings of AMDVLK and enabling experimental features.
- The `moonlight-qt` package ([Moonlight game streaming](https://moonlight-stream.org/)) now has HDR support on Linux systems.
## New Services {#sec-release-24.11-new-services}
@@ -23,6 +24,8 @@
- [wg-access-server](https://github.com/freifunkMUC/wg-access-server/), an all-in-one WireGuard VPN solution with a web ui for connecting devices. Available at [services.wg-access-server](#opt-services.wg-access-server.enable).
- [Envision](https://gitlab.com/gabmus/envision), a UI for building, configuring and running Monado, the open source OpenXR runtime. Available as [programs.envision](#opt-programs.envision.enable).
- [Playerctld](https://github.com/altdesktop/playerctl), a daemon to track media player activity. Available as [services.playerctld](option.html#opt-services.playerctld).
## Backward Incompatibilities {#sec-release-24.11-incompatibilities}
+1
View File
@@ -180,6 +180,7 @@
./programs/dublin-traceroute.nix
./programs/ecryptfs.nix
./programs/environment.nix
./programs/envision.nix
./programs/evince.nix
./programs/extra-container.nix
./programs/fcast-receiver.nix
+43
View File
@@ -0,0 +1,43 @@
{
config,
lib,
pkgs,
...
}:
let
cfg = config.programs.envision;
in
{
options = {
programs.envision = {
enable = lib.mkEnableOption "envision";
package = lib.mkPackageOption pkgs "envision" {};
openFirewall = lib.mkEnableOption "the default ports in the firewall for the WiVRn server" // {
default = true;
};
};
};
config = lib.mkIf cfg.enable {
services.avahi = {
enable = true;
publish = {
enable = true;
userServices = true;
};
};
environment.systemPackages = [ cfg.package ];
networking.firewall = lib.mkIf cfg.openFirewall {
allowedTCPPorts = [ 9757 ];
allowedUDPPorts = [ 9757 ];
};
};
meta.maintainers = pkgs.envision.meta.maintainers;
}
+3
View File
@@ -62,6 +62,9 @@ in
description = "DICT.org Dictionary Server";
wantedBy = [ "multi-user.target" ];
environment = { LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive"; };
# Work around the fact that dictd doesn't handle SIGTERM; it terminates
# with code 143 instead of exiting with code 0.
serviceConfig.SuccessExitStatus = [ 143 ];
serviceConfig.Type = "forking";
script = "${pkgs.dict}/sbin/dictd -s -c ${dictdb}/share/dictd/dictd.conf --locale en_US.UTF-8";
};
+9
View File
@@ -634,6 +634,7 @@ let
"LinkLocalAddressing"
"IPv6LinkLocalAddressGenerationMode"
"IPv6StableSecretAddress"
"IPv4LLStartAddress"
"IPv4LLRoute"
"DefaultRouteOnDevice"
"LLMNR"
@@ -656,12 +657,16 @@ let
"IPv6AcceptRA"
"IPv6DuplicateAddressDetection"
"IPv6HopLimit"
"IPv4ReversePathFilter"
"IPv4AcceptLocal"
"IPv4RouteLocalnet"
"IPv4ProxyARP"
"IPv6ProxyNDP"
"IPv6ProxyNDPAddress"
"IPv6SendRA"
"DHCPPrefixDelegation"
"IPv6MTUBytes"
"KeepMaster"
"Bridge"
"Bond"
"VRF"
@@ -703,11 +708,15 @@ let
(assertMinimum "IPv6DuplicateAddressDetection" 0)
(assertInt "IPv6HopLimit")
(assertMinimum "IPv6HopLimit" 0)
(assertValueOneOf "IPv4ReversePathFilter" ["no" "strict" "loose"])
(assertValueOneOf "IPv4AcceptLocal" boolValues)
(assertValueOneOf "IPv4RouteLocalnet" boolValues)
(assertValueOneOf "IPv4ProxyARP" boolValues)
(assertValueOneOf "IPv6ProxyNDP" boolValues)
(assertValueOneOf "IPv6SendRA" boolValues)
(assertValueOneOf "DHCPPrefixDelegation" boolValues)
(assertByteFormat "IPv6MTUBytes")
(assertValueOneOf "KeepMaster" boolValues)
(assertValueOneOf "ActiveSlave" boolValues)
(assertValueOneOf "PrimarySlave" boolValues)
(assertValueOneOf "ConfigureWithoutCarrier" boolValues)
@@ -14,14 +14,14 @@
python3Packages.buildPythonPackage rec {
pname = "hydrus";
version = "578";
version = "580";
format = "other";
src = fetchFromGitHub {
owner = "hydrusnetwork";
repo = "hydrus";
rev = "refs/tags/v${version}";
hash = "sha256-u2SXhL57iNVjRFqerzc/TByB9ArAJx81mxOjTBVBMkg=";
hash = "sha256-QdRItwbgVYgA6PU9Ybimk+/sBe1CHV79ssTrIturVpg=";
};
nativeBuildInputs = [
@@ -60,6 +60,7 @@ python3Packages.buildPythonPackage rec {
lz4
numpy
opencv4
olefile
pillow
pillow-heif
psutil
@@ -74,6 +75,7 @@ python3Packages.buildPythonPackage rec {
pyyaml
qtpy
requests
show-in-file-manager
send2trash
service-identity
twisted
+1 -1
View File
@@ -31,7 +31,7 @@ buildPythonApplication rec {
mainProgram = "cum";
homepage = "https://github.com/Hamuko/cum";
license = licenses.asl20;
maintainers = with maintainers; [ tadeokondrak ];
maintainers = with maintainers; [ ];
platforms = platforms.all;
};
}
+1 -1
View File
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
mainProgram = "fff";
homepage = "https://github.com/dylanaraps/fff";
license = licenses.mit;
maintainers = [ maintainers.tadeokondrak ];
maintainers = [ ];
platforms = platforms.all;
};
}
@@ -1,38 +0,0 @@
--- a/app/app.pro 2023-06-24 19:10:00.653377668 +0800
+++ b/app/app.pro 2023-06-24 19:20:06.632188299 +0800
@@ -49,19 +49,8 @@
INCLUDEPATH += $$PWD/../libs/windows/include
LIBS += ws2_32.lib winmm.lib dxva2.lib ole32.lib gdi32.lib user32.lib d3d9.lib dwmapi.lib dbghelp.lib
}
-macx {
- INCLUDEPATH += $$PWD/../libs/mac/include
- INCLUDEPATH += $$PWD/../libs/mac/Frameworks/SDL2.framework/Versions/A/Headers
- INCLUDEPATH += $$PWD/../libs/mac/Frameworks/SDL2_ttf.framework/Versions/A/Headers
- LIBS += -L$$PWD/../libs/mac/lib -F$$PWD/../libs/mac/Frameworks
-
- # QMake doesn't handle framework-style includes correctly on its own
- QMAKE_CFLAGS += -F$$PWD/../libs/mac/Frameworks
- QMAKE_CXXFLAGS += -F$$PWD/../libs/mac/Frameworks
- QMAKE_OBJECTIVE_CFLAGS += -F$$PWD/../libs/mac/Frameworks
-}
-unix:!macx {
+unix {
CONFIG += link_pkgconfig
PKGCONFIG += openssl sdl2 SDL2_ttf opus
@@ -120,13 +109,12 @@
CONFIG += soundio discord-rpc
}
macx {
- LIBS += -lssl -lcrypto -lavcodec.60 -lavutil.58 -lopus -framework SDL2 -framework SDL2_ttf
LIBS += -lobjc -framework VideoToolbox -framework AVFoundation -framework CoreVideo -framework CoreGraphics -framework CoreMedia -framework AppKit -framework Metal
# For libsoundio
LIBS += -framework CoreAudio -framework AudioUnit
- CONFIG += ffmpeg soundio discord-rpc
+ CONFIG += ffmpeg soundio
}
SOURCES += \
@@ -1,82 +0,0 @@
{ stdenv
, lib
, fetchFromGitHub
, wrapQtAppsHook
, pkg-config
, qmake
, qtquickcontrols2
, SDL2
, SDL2_ttf
, libva
, libvdpau
, libxkbcommon
, alsa-lib
, libpulseaudio
, openssl
, libopus
, ffmpeg
, wayland
, darwin
}:
let
inherit (darwin.apple_sdk_11_0.frameworks) AVFoundation AppKit AudioUnit VideoToolbox;
in
stdenv.mkDerivation rec {
pname = "moonlight-qt";
version = "5.0.1";
src = fetchFromGitHub {
owner = "moonlight-stream";
repo = pname;
rev = "v${version}";
sha256 = "sha256-0ONjUqpM1tUnyaEnMgVl7ff6pND7kyqouv2mpgteZP0=";
fetchSubmodules = true;
};
patches = [ ./darwin.diff ];
nativeBuildInputs = [
wrapQtAppsHook
pkg-config
qmake
];
buildInputs = [
qtquickcontrols2
SDL2
SDL2_ttf
openssl
libopus
ffmpeg
] ++ lib.optionals stdenv.isLinux [
libva
libvdpau
libxkbcommon
alsa-lib
libpulseaudio
wayland
] ++ lib.optionals stdenv.isDarwin [
AVFoundation
AppKit
AudioUnit
VideoToolbox
];
postInstall = lib.optionalString stdenv.isDarwin ''
mkdir $out/Applications $out/bin
mv app/Moonlight.app $out/Applications
rm -r $out/Applications/Moonlight.app/Contents/Frameworks
ln -s $out/Applications/Moonlight.app/Contents/MacOS/Moonlight $out/bin/moonlight
'';
meta = with lib; {
description = "Play your PC games on almost any device";
homepage = "https://moonlight-stream.org";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ luc65r ];
platforms = platforms.all;
mainProgram = "moonlight";
};
}
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://github.com/bkueng/qMasterPassword";
license = licenses.gpl3;
maintainers = with lib.maintainers; [ tadeokondrak teutat3s ];
maintainers = with lib.maintainers; [ teutat3s ];
platforms = platforms.all;
};
}
@@ -16,7 +16,7 @@ maven.buildMavenPackage rec {
hash = "sha256-lg8/diyGhfkUU0w7PEOlxb1WNpJZVDDllxMMsTIU/Cw=";
};
mvnHash = "sha256-yULCBHgctZZU3Deod+nQujssmUy+kgdFdgE3NUuFhOw=";
mvnHash = "sha256-CXJm9YlYsYViChFcH9e2P9pxK0q/tLWODOzZPXZ8hK0=";
mvnParameters = "compile assembly:single -Dmaven.test.skip=true";
nativeBuildInputs = [ makeWrapper ];
@@ -59,16 +59,15 @@ let
cxxStandard = "20";
};
};
mainProgram = if stdenv.isLinux then "telegram-desktop" else "Telegram";
in
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "telegram-desktop";
version = "5.2.2";
src = fetchFromGitHub {
owner = "telegramdesktop";
repo = "tdesktop";
rev = "v${version}";
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-rvd4Ei4MpWiilHCV291UrJkHaUcwth9AWc3PSqjj+EI=";
};
@@ -200,19 +199,19 @@ stdenv.mkDerivation rec {
installPhase = lib.optionalString stdenv.isDarwin ''
mkdir -p $out/Applications
cp -r ${mainProgram}.app $out/Applications
ln -s $out/{Applications/${mainProgram}.app/Contents/MacOS,bin}
cp -r ${finalAttrs.meta.mainProgram}.app $out/Applications
ln -s $out/{Applications/${finalAttrs.meta.mainProgram}.app/Contents/MacOS,bin}
'';
postFixup = lib.optionalString stdenv.isLinux ''
# This is necessary to run Telegram in a pure environment.
# We also use gappsWrapperArgs from wrapGAppsHook.
wrapProgram $out/bin/${mainProgram} \
wrapProgram $out/bin/${finalAttrs.meta.mainProgram} \
"''${gappsWrapperArgs[@]}" \
"''${qtWrapperArgs[@]}" \
--suffix PATH : ${lib.makeBinPath [ xdg-utils ]}
'' + lib.optionalString stdenv.isDarwin ''
wrapQtApp $out/Applications/${mainProgram}.app/Contents/MacOS/${mainProgram}
wrapQtApp $out/Applications/${finalAttrs.meta.mainProgram}.app/Contents/MacOS/${finalAttrs.meta.mainProgram}
'';
passthru = {
@@ -231,6 +230,6 @@ stdenv.mkDerivation rec {
homepage = "https://desktop.telegram.org/";
changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${version}";
maintainers = with maintainers; [ nickcao ];
inherit mainProgram;
mainProgram = if stdenv.hostPlatform.isLinux then "telegram-desktop" else "Telegram";
};
}
})
@@ -71,7 +71,7 @@ buildGoModule rec {
meta = with lib; {
description = "Email client for your terminal";
homepage = "https://aerc-mail.org/";
maintainers = with maintainers; [ tadeokondrak ];
maintainers = with maintainers; [ ];
mainProgram = "aerc";
license = licenses.mit;
platforms = platforms.unix;
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "treesheets";
version = "0-unstable-2024-06-23";
version = "0-unstable-2024-06-29";
src = fetchFromGitHub {
owner = "aardappel";
repo = "treesheets";
rev = "91dea2ba714e9b1fb6ab660ddd295653218bdebc";
hash = "sha256-pn+Ki60lBL+2sKXnhYEly8/Yi94mhiMDxTnWZi4ZFOk=";
rev = "0d3eff693f23929e8b53317b08df9da2d610994f";
hash = "sha256-c5HMxFxDD439kKguW8Mwkjmnavh2MSSiODTgrnZcbjo=";
};
nativeBuildInputs = [
@@ -56,7 +56,7 @@ in maven'.buildMavenPackage {
cp -r ${npmPkg} main/webapp/modules/core/3rdparty
'';
mvnParameters = "-pl !packaging";
mvnHash = "sha256-0qsKUMV9M0ZaddR5ust8VikSrsutdxVNNezKqR+F/6M=";
mvnHash = "sha256-FD4g0Mshz39N1h8MDAk907PhF5TguWTZ7AXKECHuhzQ=";
nativeBuildInputs = [ makeWrapper ];
-1
View File
@@ -377,7 +377,6 @@ stdenv'.mkDerivation (finalAttrs: {
fpletz
globin
ma27
tadeokondrak
];
platforms = lib.platforms.unix;
};
+6 -2
View File
@@ -619,10 +619,14 @@ rec {
fakeRootCommands = ''
mkdir -p ./home/alice
chown 1000 ./home/alice
ln -s ${pkgs.hello.overrideAttrs (o: {
ln -s ${pkgs.hello.overrideAttrs (finalAttrs: prevAttrs: {
# A unique `hello` to make sure that it isn't included via another mechanism by accident.
configureFlags = o.configureFlags or [] ++ [ " --program-prefix=layeredImageWithFakeRootCommands-" ];
configureFlags = prevAttrs.configureFlags or [] ++ [ " --program-prefix=layeredImageWithFakeRootCommands-" ];
doCheck = false;
versionCheckProgram = "${builtins.placeholder "out"}/bin/${finalAttrs.meta.mainProgram}";
meta = prevAttrs.meta // {
mainProgram = "layeredImageWithFakeRootCommands-hello";
};
})} ./hello
'';
};
@@ -5,6 +5,8 @@
# Name of the nuget package to install, if different from pname
, nugetName ? pname
# Hash of the nuget package to install, will be given on first build
# nugetHash uses SRI hash and should be preferred
, nugetHash ? ""
, nugetSha256 ? ""
# Additional nuget deps needed by the tool package
, nugetDeps ? (_: [])
@@ -24,7 +26,7 @@ buildDotnetModule (args // {
nugetDeps = mkNugetDeps {
name = pname;
nugetDeps = { fetchNuGet }: [
(fetchNuGet { pname = nugetName; inherit version; sha256 = nugetSha256; })
(fetchNuGet { pname = nugetName; inherit version; sha256 = nugetSha256; hash = nugetHash; })
] ++ (nugetDeps fetchNuGet);
};
@@ -5,15 +5,19 @@ attrs @
, version
, url ? "https://www.nuget.org/api/v2/package/${pname}/${version}"
, sha256 ? ""
, hash ? ""
, md5 ? ""
, ...
}:
if md5 != "" then
throw "fetchnuget does not support md5 anymore, please use sha256"
throw "fetchnuget does not support md5 anymore, please use 'hash' attribute with SRI hash"
# This is also detected in fetchurl, but we just throw here to avoid confusion
else if (sha256 != "" && hash != "") then
throw "multiple hashes passed to fetchNuGet"
else
buildDotnetPackage ({
src = fetchurl {
inherit url sha256;
inherit url sha256 hash;
name = "${pname}.${version}.zip";
};
@@ -1,11 +1,14 @@
{ linkFarmFromDrvs, fetchurl }:
{ name, nugetDeps ? import sourceFile, sourceFile ? null }:
linkFarmFromDrvs "${name}-nuget-deps" (nugetDeps {
fetchNuGet = { pname, version, sha256
fetchNuGet = { pname, version, sha256 ? "", hash ? ""
, url ? "https://www.nuget.org/api/v2/package/${pname}/${version}" }:
fetchurl {
name = "${pname}.${version}.nupkg";
inherit url sha256;
# There is no need to verify whether both sha256 and hash are
# valid here, because nuget-to-nix does not generate a deps.nix
# containing both.
inherit url sha256 hash;
};
}) // {
inherit sourceFile;
@@ -65,11 +65,11 @@ for package in *; do
for source in "${remote_sources[@]}"; do
url="${base_addresses[$source]}$package/$version/$package.$version.nupkg"
if [[ "$source" == "$used_source" ]]; then
sha256="$(nix-hash --type sha256 --flat --base32 "$version/$package.$version".nupkg)"
hash="$(nix-hash --type sha256 --flat --sri "$version/$package.$version".nupkg)"
found=true
break
else
if sha256=$(nix-prefetch-url "$url" 2>"$tmp"/error); then
if hash=$(nix-prefetch-url "$url" 2>"$tmp"/error); then
# If multiple remote sources are enabled, nuget will try them all
# concurrently and use the one that responds first. We always use the
# first source that has the package.
@@ -91,9 +91,9 @@ for package in *; do
fi
if [[ "$source" != https://api.nuget.org/v3/index.json ]]; then
echo " (fetchNuGet { pname = \"$id\"; version = \"$version\"; sha256 = \"$sha256\"; url = \"$url\"; })"
echo " (fetchNuGet { pname = \"$id\"; version = \"$version\"; hash = \"$hash\"; url = \"$url\"; })"
else
echo " (fetchNuGet { pname = \"$id\"; version = \"$version\"; sha256 = \"$sha256\"; })"
echo " (fetchNuGet { pname = \"$id\"; version = \"$version\"; hash = \"$hash\"; })"
fi
done
cd ..
+48
View File
@@ -0,0 +1,48 @@
{
lib,
stdenv,
fetchFromGitHub,
xcbuild,
darwin,
}:
stdenv.mkDerivation rec {
pname = "choose-gui";
version = "1.3.1";
src = fetchFromGitHub {
owner = "chipsenkbeil";
repo = "choose";
rev = version;
hash = "sha256-oR0GgMinKcBHaZWdE7O+mdbiLKKjkweECKbi80bjW+c=";
};
nativeBuildInputs = [ xcbuild ];
buildInputs = [ darwin.apple_sdk.frameworks.Cocoa ];
buildPhase = ''
runHook preBuild
xcodebuild -arch ${stdenv.hostPlatform.darwinArch} -configuration Release SYMROOT="./output" build
cp ./output/Release/choose choose
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp choose $out/bin/choose
chmod +x $out/bin/choose
runHook postInstall
'';
meta = {
description = "Fuzzy matcher for OS X that uses both std{in,out} and a native GUI";
homepage = "https://github.com/chipsenkbeil/choose";
license = lib.licenses.mit;
platforms = lib.platforms.darwin;
changelog = "https://github.com/chipsenkbeil/choose/blob/${version}/CHANGELOG.md";
maintainers = with lib.maintainers; [ heywoodlh ];
mainProgram = "choose";
};
}
+1 -1
View File
@@ -49,7 +49,7 @@ maven.buildMavenPackage {
pname = "commafeed";
mvnHash = "sha256-YnEDJf4GeyiXxOh8tZZTZdLOJrisG6lmShXU97ueGNE=";
mvnHash = "sha256-LDZv3CBc/FpVMKmZ+kqfBdkTbqZcJMRqeXN35t4rwJI=";
mvnParameters = lib.escapeShellArgs [
"-Dskip.installnodenpm"
-101
View File
@@ -1,101 +0,0 @@
{ lib
, rustPlatform
, fetchFromGitHub
, pkg-config
, wrapGAppsHook3
, atk
, cairo
, gdk-pixbuf
, glib
, gtk3
, libsecret
, libxkbcommon
, openssl
, pango
, sqlite
, vulkan-loader
, stdenv
, darwin
, wayland
}:
let
commitDate = "2024-04-30";
in rustPlatform.buildRustPackage rec {
pname = "cosmic-tasks";
version = "0-unstable-${commitDate}";
src = fetchFromGitHub {
owner = "edfloreshz";
repo = "cosmic-tasks";
rev = "020ae8633b23091f113b19f4b6f992e36404f2e2";
hash = "sha256-ZPEzvscLYH4vJ+5Nh5J9m8ZX2jXXDMOLswSnHaCdSdA=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"accesskit-0.12.2" = "sha256-ksaYMGT/oug7isQY8/1WD97XDUsX2ShBdabUzxWffYw=";
"atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA=";
"clipboard_macos-0.1.0" = "sha256-KVcKQ4DtoZCgFBnejIaQfQxJJJxd/mFzHBI+4PbGBio=";
"cosmic-config-0.1.0" = "sha256-VEE/1XQZaojz9gxTV/Zz++eVplsCfiDPgf/cAr2Rih8=";
"cosmic-text-0.11.2" = "sha256-gUIQFHPaFTmtUfgpVvsGTnw2UKIBx9gl0K67KPuynWs=";
"d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4=";
"glyphon-0.5.0" = "sha256-j1HrbEpUBqazWqNfJhpyjWuxYAxkvbXzRKeSouUoPWg=";
"smithay-client-toolkit-0.18.0" = "sha256-/7twYMt5/LpzxLXAQKTGNnWcfspUkkZsN5hJu7KaANc=";
"smithay-clipboard-0.8.0" = "sha256-LDd56TJ175qsj2/EV/dbBRV9HMU7RzgrG5JP7H2PmhE=";
"softbuffer-0.4.1" = "sha256-a0bUFz6O8CWRweNt/OxTvflnPYwO5nm6vsyc/WcXyNg=";
"taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI=";
"winit-0.29.10" = "sha256-ScTII2AzK3SC8MVeASZ9jhVWsEaGrSQ2BnApTxgfxK4=";
};
};
# COSMIC applications now uses vergen for the About page
# Update the COMMIT_DATE to match when the commit was made
env.VERGEN_GIT_COMMIT_DATE = commitDate;
env.VERGEN_GIT_SHA = src.rev;
nativeBuildInputs = [
pkg-config
wrapGAppsHook3
];
buildInputs = [
atk
cairo
gdk-pixbuf
glib
gtk3
libsecret
libxkbcommon
openssl
pango
sqlite
vulkan-loader
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.AppKit
darwin.apple_sdk.frameworks.CoreFoundation
darwin.apple_sdk.frameworks.CoreGraphics
darwin.apple_sdk.frameworks.CoreServices
darwin.apple_sdk.frameworks.Foundation
darwin.apple_sdk.frameworks.Metal
darwin.apple_sdk.frameworks.QuartzCore
darwin.apple_sdk.frameworks.Security
] ++ lib.optionals stdenv.isLinux [
wayland
];
postFixup = lib.optionalString stdenv.isLinux ''
wrapProgram $out/bin/cosmic-tasks \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libxkbcommon wayland ]}"
'';
meta = with lib; {
description = "Simple task management application for the COSMIC desktop";
homepage = "https://github.com/edfloreshz/cosmic-tasks";
license = licenses.gpl3Only;
maintainers = with maintainers; [ GaetanLepage ];
platforms = platforms.linux;
mainProgram = "cosmic-tasks";
};
}
+1 -1
View File
@@ -5,7 +5,7 @@ buildDotnetGlobalTool {
version = "0.28.2";
executables = "dotnet-csharpier";
nugetSha256 = "sha256-fXyE25niM80pPXCLC80Hm9XEHGUMx0XZOMxdVoA0h18=";
nugetHash = "sha256-fXyE25niM80pPXCLC80Hm9XEHGUMx0XZOMxdVoA0h18=";
meta = with lib; {
description = "Opinionated code formatter for C#";
+1 -1
View File
@@ -8,7 +8,7 @@ buildDotnetGlobalTool {
dotnet-sdk = dotnetCorePackages.sdk_8_0;
dotnet-runtime = dotnetCorePackages.runtime_8_0;
nugetSha256 = "sha256-VkZGnfD8p6oAJ7i9tlfwJfmKfZBHJU7Wdq+K4YjPoRs=";
nugetHash = "sha256-VkZGnfD8p6oAJ7i9tlfwJfmKfZBHJU7Wdq+K4YjPoRs=";
meta = with lib; {
description = "C# REPL with syntax highlighting";
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,100 @@
{
lib,
stdenv,
fetchFromGitLab,
writeScript,
appstream-glib,
cargo,
meson,
ninja,
pkg-config,
rustPlatform,
rustc,
wrapGAppsHook4,
cairo,
desktop-file-utils,
gdb,
gdk-pixbuf,
glib,
gtk4,
gtksourceview5,
libadwaita,
libgit2,
libusb1,
openssl,
pango,
vte-gtk4,
zlib,
unstableGitUpdater,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "envision-unwrapped";
version = "0-unstable-2024-06-25";
src = fetchFromGitLab {
owner = "gabmus";
repo = "envision";
rev = "b594f75778961c281daca398011914e9ac14b753";
hash = "sha256-felt9KdgVrXSgoufw/+gDlluqdv8vySDqwskQ0t2JOM=";
};
strictDeps = true;
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
"libmonado-rs-0.1.0" = "sha256-PsNgfpgso3HhIMXKky/u6Xw8phk1isRpNXKLhvN1wIE=";
};
};
nativeBuildInputs = [
appstream-glib
desktop-file-utils
cargo
meson
ninja
pkg-config
rustPlatform.cargoSetupHook
rustc
wrapGAppsHook4
];
buildInputs = [
cairo
gdk-pixbuf
glib
gtk4
gtksourceview5
libadwaita
libgit2
libusb1
openssl
pango
vte-gtk4
zlib
];
postInstall = ''
wrapProgram $out/bin/envision \
--prefix PATH : "${lib.makeBinPath [ gdb ]}"
'';
passthru.updateScript = writeScript "envision-update" ''
source ${builtins.head (unstableGitUpdater { })}
cp $tmpdir/Cargo.lock ./pkgs/by-name/en/envision-unwrapped/Cargo.lock
'';
meta = {
description = "UI for building, configuring and running Monado, the open source OpenXR runtime";
homepage = "https://gitlab.com/gabmus/envision";
license = lib.licenses.agpl3Only;
mainProgram = "envision";
maintainers = with lib.maintainers; [
pandapip1
Scrumplex
];
platforms = lib.platforms.linux;
};
})
+93
View File
@@ -0,0 +1,93 @@
{ buildFHSEnv, envision-unwrapped }:
buildFHSEnv {
name = "envision";
extraOutputsToInstall = [ "dev" ];
strictDeps = true;
targetPkgs =
pkgs:
[ pkgs.envision-unwrapped ]
++ (with pkgs; [
glibc
gcc
])
++ (
# OpenHMD dependencies
pkgs.openhmd.buildInputs ++ pkgs.openhmd.nativeBuildInputs
)
++ (
# OpenComposite dependencies
pkgs.opencomposite.buildInputs ++ pkgs.opencomposite.nativeBuildInputs ++ [ pkgs.boost ]
)
++ (
# Monado dependencies
(
pkgs.monado.buildInputs
++ pkgs.monado.nativeBuildInputs
++ (with pkgs; [
# Additional dependencies required by Monado when built using Envision
mesa
shaderc
xorg.libX11
xorg.libxcb
xorg.libXrandr
xorg.libXrender
xorg.xorgproto
])
)
)
++ (
# SteamVR driver dependencies
[ pkgs.zlib ])
++ (
# WiVRn dependencies
# TODO: Replace with https://github.com/NixOS/nixpkgs/pull/316975 once merged
(with pkgs; [
avahi
cmake
cli11
ffmpeg
git
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
libmd
libdrm
libpulseaudio
libva
ninja
nlohmann_json
openxr-loader
pipewire
systemdLibs # udev
vulkan-loader
vulkan-headers
x264
])
++ (with pkgs; [
android-tools # For adb installing WiVRn APKs
])
);
profile = ''
export CMAKE_LIBRARY_PATH=/usr/lib
export CMAKE_INCLUDE_PATH=/usr/include
export PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/share/pkgconfig
'';
extraInstallCommands = ''
mkdir -p $out/share/applications $out/share/metainfo
ln -s ${envision-unwrapped}/share/envision $out/share
ln -s ${envision-unwrapped}/share/icons $out/share
ln -s ${envision-unwrapped}/share/applications/org.gabmus.envision.desktop $out/share/applications
ln -s ${envision-unwrapped}/share/metainfo/org.gabmus.envision.appdata.xml $out/share/metainfo
'';
runScript = "envision";
meta = envision-unwrapped.meta // {
description = "${envision-unwrapped.meta.description} (with build environment)";
};
}
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "fanbox-dl";
version = "0.20.0";
version = "0.21.1";
src = fetchFromGitHub {
owner = "hareku";
repo = "fanbox-dl";
rev = "v${version}";
hash = "sha256-OC0buWQlb9sb4SXokOpeUHcQKMLeYN3ZVQGXtoiIMVM=";
hash = "sha256-ncxL0qTEsAgfA6jJoat1WnOylg91PaG/fhcy3NrFxhA=";
};
vendorHash = "sha256-qsdFfAgA72T3iOZRJdteo6T92lGi3yzcKcxj837YnG4=";
vendorHash = "sha256-GD5uxa5XWhlHHBztTpDKCTSym2pdkr/or6aGl9qF29U=";
# pings websites during testing
doCheck = false;
+1 -1
View File
@@ -4,7 +4,7 @@ buildDotnetGlobalTool {
pname = "fantomas";
version = "6.3.9";
nugetSha256 = "sha256-XRPC5cXMoTJLLHe3f5A3+uXakbL+D7DlX0sA52KMZKw=";
nugetHash = "sha256-XRPC5cXMoTJLLHe3f5A3+uXakbL+D7DlX0sA52KMZKw=";
meta = with lib; {
description = "F# source code formatter";
+39 -38
View File
@@ -6,55 +6,56 @@
(fetchNuGet { pname = "Azure.Storage.Blobs"; version = "12.14.1"; sha256 = "1k7jsin7p7zzqbfxvfz5xrzb46vqbbn569m3hd498mvf2f664yz4"; })
(fetchNuGet { pname = "Azure.Storage.Common"; version = "12.13.0"; sha256 = "06ngbyrqabnmbwac7p0yhayjvva7nj6cb3n9agmhd5mvrwhanbvf"; })
(fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; sha256 = "1sldkj8lakggn4hnyabjj1fppqh50fkdrr1k99d4gswpbk5kv582"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.31"; sha256 = "0hki4z9x60vzcg53s8cxnig4g1xnpqcj629r2cg5q1xw0sknfp5d"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.31"; sha256 = "0blf8hl2irl9r9x6f7cih87ps21rcs3b8r09z5wp7jcb5j1cv8fg"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.31"; sha256 = "050dzfy49c4jwcm8dfrz2lqbbyhmgnq485zdhpcnc3w08z0ppbs6"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.31"; sha256 = "0w4sab66rjjyar9z139ls6rx29gvgj3rp3cbrsc8z00y9mw2sl22"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.31"; sha256 = "13kww7x35926wik32z8cnvzhpqp3dwhazkzb569v87x8yww56n3k"; })
(fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; })
(fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; })
(fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "1.1.1"; sha256 = "1bb5p4zlnfn88skkvymxfsn0jybqncl4356hwnic9jxdq2d4fz1w"; })
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; })
(fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "7.0.0"; sha256 = "0n1grglxql9llmrsbbnlz5chx8mxrb5cpvjngm0hfyrkgzcwz90d"; })
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "7.0.0"; sha256 = "1as8cygz0pagg17w22nsf6mb49lr2mcl1x8i3ad1wi8lyzygy1a3"; })
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "7.0.0"; sha256 = "1qifb1pv7s76lih8wnjk418wdk4qwn87q2n6dx54knfvxai410bl"; })
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "7.0.0"; sha256 = "121zs4jp8iimgbpzm3wsglhjwkc06irg1pxy8c1zcdlsg34cfq1p"; })
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "7.0.0"; sha256 = "181d7mp9307fs17lyy42f8cxnjwysddmpsalky4m0pqxcimnr6g7"; })
(fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "7.0.0"; sha256 = "1bqd3pqn5dacgnkq0grc17cgb2i0w8z1raw12nwm3p3zhrfcvgxf"; })
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.0"; sha256 = "1gn7d18i1wfy13vrwhmdv1rmsb4vrk26kqdld4cgvh77yigj90xs"; })
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "7.0.0"; sha256 = "1f5fhpvzwyrwxh3g1ry027s4skmklf6mbm2w0p13h0x6fbmxcb24"; })
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "7.0.0"; sha256 = "1m8ri2m3vlv9vzk0068jkrx0vkk4sqmk1kxmn8pc3wys38d38qaf"; })
(fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "7.0.0"; sha256 = "0b90zkrsk5dw3wr749rbynhpxlg4bgqdnd7d5vdlw2g9c7zlhgx6"; })
(fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "7.0.0"; sha256 = "1liyprh0zha2vgmqh92n8kkjz61zwhr7g16f0gmr297z2rg1j5pj"; })
(fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "7.0.0"; sha256 = "1b4km9fszid9vp2zb3gya5ni9fn8bq62bzaas2ck2r7gs0sdys80"; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.28.1"; sha256 = "0g5a5w34263psh90mp1403m9bh3pcfw6z29vlzdpllzbifk0licr"; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.34.0"; sha256 = "0dgn51k142f73l6fk4bsqrpwqhcw6s8y98548kczbzy7qxcnyp82"; })
(fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.34.0"; sha256 = "0c01dqya958z9ypf0155aqdkvkz9j4j5mgnygxzkisri2cs2w7gs"; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.28.1"; sha256 = "15bq83wi4h8f1lqinijdqd7vg6n2v77hyza20mjqcp1h3hl2vj43"; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.34.0"; sha256 = "0fm4nrihhqn4wrcj2q06rzfrfzgzilb7ch3izkv89c4q74x0yhkb"; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Protocols"; version = "6.28.1"; sha256 = "03zmp6bsxg4chm89pl5sh506jc19aljxbfsvbqazcci5wqyacnr8"; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Protocols.OpenIdConnect"; version = "6.28.1"; sha256 = "0p1ib8559h2i290v7qyz8rq2aybdknplx1p36ylik695l7b3rqvm"; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.28.1"; sha256 = "0ckpjjdy2rv1z7ivqrkc7z16rcqygxzs0la80g8df68p4xxfa0c5"; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.34.0"; sha256 = "1vkjwryz4wdsaawfq3r80qrmfiyv2zp9y6fzkf2014sqw4nf1vwl"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; })
(fetchNuGet { pname = "Microsoft.SourceLink.Common"; version = "1.1.1"; sha256 = "0xkdqs7az2cprar7jzjlgjpd64l6f8ixcmwmpkdm03fyb4s5m0bg"; })
(fetchNuGet { pname = "Microsoft.SourceLink.GitHub"; version = "1.1.1"; sha256 = "099y35f2npvva3jk1zp8hn0vb9pwm2l0ivjasdly6y2idv53s5yy"; })
(fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "8.0.0"; sha256 = "0055f69q3hbagqp8gl3nk0vfn4qyqyxsxyy7pd0g7wm3z28byzmx"; })
(fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; sha256 = "080kab87qgq2kh0ijry5kfdiq9afyzb8s0k3jqi5zbbi540yq4zl"; })
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; sha256 = "1jlpa4ggl1gr5fs7fdcw04li3y3iy05w3klr9lrrlc7v8w76kq71"; })
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.0"; sha256 = "1m0gawiz8f5hc3li9vd5psddlygwgkiw13d7div87kmkf4idza8r"; })
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "8.0.0"; sha256 = "0i7qziz0iqmbk8zzln7kx9vd0lbx1x3va0yi3j1bgkjir13h78ps"; })
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; sha256 = "1zw0bpp5742jzx03wvqc8csnvsbgdqi0ls9jfc5i2vd3cl8b74pg"; })
(fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "8.0.0"; sha256 = "0nppj34nmq25gnrg0wh1q22y4wdqbih4ax493f226azv8mkp9s1i"; })
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; sha256 = "1klcqhg3hk55hb6vmjiq2wgqidsl81aldw0li2z98lrwx26msrr6"; })
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "8.0.0"; sha256 = "1d9b734vnll935661wqkgl7ry60rlh5p876l2bsa930mvfsaqfcv"; })
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "8.0.0"; sha256 = "1mvp3ipw7k33v2qw2yrvc4vl5yzgpk3yxa94gg0gz7wmcmhzvmkd"; })
(fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; sha256 = "0p50qn6zhinzyhq9sy5svnmqqwhw2jajs2pbjh9sah504wjvhscz"; })
(fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; sha256 = "04nm8v5a3zp0ill7hjnwnja3s2676b4wffdri8hdk2341p7mp403"; })
(fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; sha256 = "0aldaz5aapngchgdr7dax9jw5wy7k7hmjgjpfgfv1wfif27jlkqm"; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.5.1"; sha256 = "0kdxb47rafvk6mx0xkf2pik7b638b2d847jlhzi3fvj6swg3v15b"; })
(fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.5.1"; sha256 = "1ny97mhld7vzn5xwxvcy1jhfq4mw15wrk9c77z6cg2fydkgawyzx"; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.5.1"; sha256 = "1zharnx3vhrfdn761w16ygxyj9ig5zn71346aqkk0nmzlll3gfjf"; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Protocols"; version = "7.5.1"; sha256 = "02vqadkw25y2xij3vhdkbpv245dnmvkqfb8l4xd81dnikhk1haav"; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Protocols.OpenIdConnect"; version = "7.5.1"; sha256 = "18rq0cmb06fg86c27ymh7jcvnqpip42anp9hjdy105x063jbjcym"; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.5.1"; sha256 = "14fjr679hwal35mdwdv4w40mnxzfnnx65yc16807zzkyri011zc1"; })
(fetchNuGet { pname = "Microsoft.IdentityModel.Validators"; version = "7.5.1"; sha256 = "1hpihwb58zbzs6000v7d33nyfs0y3k1i1isl9v3a8ak07l0p2n53"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.31"; sha256 = "05s1c6bd4592xhy0y3w0cjckg11hb4pci729v59k3i3hl0hbad4s"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.31"; sha256 = "10s0p30qzfn9zibp1ldnqar87hqs47ni3rwqpvwx4jn3589cl9sn"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.31"; sha256 = "0sah1gf2lccc93n3lmkgiahlz4jwr02cw20bvcwqyikpldy2awds"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.31"; sha256 = "0k16h1fwnvhw1gcx8ib01bidhrls5m56fiy6wldk3ajgs5dif8i6"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.31"; sha256 = "19a4ainxj8jxij7ckglbmlnvrjxp72xfgx0r6lbglzh9dhsakwm7"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.31"; sha256 = "1wmlwzy9bc1fs38r0vpn3ragp8pkimcq6sicj978yhk7brn52z1p"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.31"; sha256 = "0pw2n3j6vbmbghda1cvkhi3c39a49xk0a4w059mfya017adl6kac"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.31"; sha256 = "115c220p0mbk30biaw0sfqprnaghks7lcvvz6n5rsg0kn4fvy7qs"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.31"; sha256 = "1cl561dgdk4mj48zw5xwg7a0cafkx8j2wjd4nlv0x3di300k75k5"; })
(fetchNuGet { pname = "Microsoft.SourceLink.Common"; version = "8.0.0"; sha256 = "0xrr8yd34ij7dqnyddkp2awfmf9qn3c89xmw2f3npaa4wnajmx81"; })
(fetchNuGet { pname = "Microsoft.SourceLink.GitHub"; version = "8.0.0"; sha256 = "1gdx7n45wwia3yvang3ls92sk3wrymqcx9p349j8wba2lyjf9m44"; })
(fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; })
(fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; })
(fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; })
(fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; })
(fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; })
(fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.6.0"; sha256 = "07pff0y96hj0k0izgmqlxydnx8cpsvfymicwi4m3dix979sdly09"; })
(fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "6.34.0"; sha256 = "150ybq4ba9sm3c37d758ngja6wz72f0840d8vfs6bhy6pw0svzwy"; })
(fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "7.5.1"; sha256 = "0priwzi8w2rnspppldl2mhi4fh835dpyyy8f7ri6qbqs7n8l746n"; })
(fetchNuGet { pname = "System.Interactive.Async"; version = "6.0.1"; sha256 = "17zzdxx7ibfwnxspxxi197a0gfgcqdzgrcza8dlwj13yi9vf8b73"; })
(fetchNuGet { pname = "System.IO.Hashing"; version = "6.0.0"; sha256 = "0lga30s3cllg2jkwldgabwrb0jg3dzj859bwj95xhnm3zcklnb41"; })
(fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; sha256 = "10ira8hmv0i54yp9ggrrdm1c06j538sijfjpn1kmnh9j2xk5yzmq"; })
(fetchNuGet { pname = "System.Memory.Data"; version = "1.0.2"; sha256 = "1p8qdg0gzxhjvabryc3xws2629pj8w5zz2iqh86kw8sh0rann9ay"; })
(fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; })
(fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; })
(fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; })
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; })
(fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.5.0"; sha256 = "1pm4ykbcz48f1hdmwpia432ha6qbb9kbrxrrp7cg3m8q8xn52ngn"; })
(fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; })
(fetchNuGet { pname = "System.Text.Encodings.Web"; version = "4.7.2"; sha256 = "0ap286ykazrl42if59bxhzv81safdfrrmfqr3112siwyajx4wih9"; })
(fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; sha256 = "1151hbyrcf8kyg1jz8k9awpbic98lwz9x129rg7zk1wrs6vjlpxl"; })
(fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; sha256 = "1wbypkx0m8dgpsaqgyywz4z760xblnwalb241d5qv9kx8m128i11"; })
(fetchNuGet { pname = "System.Text.Json"; version = "4.7.2"; sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4"; })
(fetchNuGet { pname = "System.Text.Json"; version = "7.0.0"; sha256 = "0scb0lp7wbgcinaa4kqiqs7b8i5nx4ppfad81138jiwd1sl37pyp"; })
(fetchNuGet { pname = "System.Text.Json"; version = "8.0.0"; sha256 = "134savxw0sq7s448jnzw17bxcijsi1v38mirpbb6zfxmqlf04msw"; })
(fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; })
]
+20 -12
View File
@@ -2,30 +2,37 @@
lib,
buildDotnetModule,
fetchFromGitHub,
garnet,
dotnetCorePackages,
nix-update-script,
}:
buildDotnetModule {
buildDotnetModule rec {
pname = "garnet";
version = "1.0.6";
version = "1.0.13";
src = fetchFromGitHub {
owner = "microsoft";
repo = "garnet";
rev = "v${garnet.version}";
hash = "sha256-GBXRRLP4bBvKHr7tqvrOFFkTpUiiSYxj3DBrrehIl84=";
rev = "v${version}";
hash = "sha256-mAZBYVOAbVPKcOpt+vA4uEK+xEx4qXPnAthsPsxiXkw=";
};
projectFile = "main/GarnetServer/GarnetServer.csproj";
nugetDeps = ./deps.nix;
dotnet-sdk = with dotnetCorePackages; combinePackages [ sdk_6_0 sdk_7_0 sdk_8_0 ];
dotnet-sdk = dotnetCorePackages.sdk_8_0;
dotnet-runtime = dotnetCorePackages.runtime_8_0;
dotnetInstallFlags = ["-f" "net8.0"];
dotnetBuildFlags = [
"-f"
"net8.0"
];
dotnetInstallFlags = dotnetBuildFlags;
meta = with lib; {
mainProgram = "GarnetServer";
passthru = {
updateScript = nix-update-script { };
};
meta = {
description = "Remote cache-store from Microsoft Research";
longDescription = ''
A remote cache-store that offers strong performance, scalability,
@@ -33,8 +40,9 @@ buildDotnetModule {
and compatibility with existing Redis clients
'';
homepage = "https://microsoft.github.io/garnet/";
changelog = "https://github.com/microsoft/garnet/releases/tag/v${garnet.version}";
license = licenses.mit;
maintainers = with maintainers; [getchoo];
changelog = "https://github.com/microsoft/garnet/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ getchoo ];
mainProgram = "GarnetServer";
};
}
+9 -20
View File
@@ -2,16 +2,17 @@
, stdenv
, python3Packages
, fetchFromGitHub
, gitUpdater
, resvg
}:
let
version = "3.1.7";
version = "3.1.8";
src = fetchFromGitHub {
owner = "jaseg";
repo = "gerbolyze";
rev = "v${version}";
hash = "sha256-0iTelSlUJUafclRowwsUAoO44nc/AXaOKXnZKfKOIaE=";
hash = "sha256-uF06aU9zT7LjYHreQ8aFQKn/wAesS31LvzHBgD50LfQ=";
fetchSubmodules = true;
};
@@ -43,22 +44,6 @@ let
platforms = platforms.linux;
};
};
# FIXME: check if this downgrade is still required when bumping gerbolyze
# https://github.com/jaseg/gerbolyze/issues/47
resvg' = resvg.overrideAttrs (old: rec {
version = "0.41.0";
src = old.src.override {
rev = "v${version}";
hash = "sha256-plZiyEiBWeV2mwTsNK5Je8Axs/hcHH8aV2VpOix6QCY=";
};
cargoDeps = old.cargoDeps.overrideAttrs (lib.const {
name = "${old.pname}-${version}-vendor.tar.gz";
inherit src;
outputHash = "sha256-U7xzb9e9wh9XbLvlYQ0ofIjH8FuSzVcrXnrehQmZgww=";
});
});
in python3Packages.buildPythonApplication rec {
inherit version src;
pname = "gerbolyze";
@@ -77,7 +62,7 @@ in python3Packages.buildPythonApplication rec {
python3Packages.python-slugify
python3Packages.lxml
python3Packages.gerbonara
resvg'
resvg
svg-flatten
];
@@ -95,7 +80,11 @@ in python3Packages.buildPythonApplication rec {
pythonImportsCheck = [ "gerbolyze" ];
nativeCheckInputs = [ python3Packages.pytestCheckHook resvg' svg-flatten ];
nativeCheckInputs = [ python3Packages.pytestCheckHook resvg svg-flatten ];
passthru.updateScript = gitUpdater {
rev-prefix = "v";
};
meta = with lib; {
description = "Directly render SVG overlays into Gerber and Excellon files";
+3 -3
View File
@@ -38,16 +38,16 @@ let
};
in buildGoModule rec {
pname = "gitea";
version = "1.22.0";
version = "1.22.1";
src = fetchFromGitHub {
owner = "go-gitea";
repo = "gitea";
rev = "v${gitea.version}";
hash = "sha256-LdNEiPch2BZNYMOjE9yWsq78g6DolMjM5wUci3jXj30=";
hash = "sha256-s7su3gMdXv2sT1uYYtx29n7QDvmPU9QB3QR6ctOlE58=";
};
vendorHash = "sha256-8VoJR4p2WnhG6nTFMzBlcrd/B6UwaOU3Q/rnDx9MtWc=";
vendorHash = "sha256-nzhjIfQMzSf1nuBMTIe0xn+NMDFbDZ9jRHu8Nwzmp4w=";
outputs = [ "out" "data" ];
+1 -1
View File
@@ -7,7 +7,7 @@ buildDotnetGlobalTool {
nugetName = "GitVersion.Tool";
version = "5.12.0";
nugetSha256 = "sha256-dclYG2D0uSYqf++y33JCefkYLwbuRCuKd3qLMnx3BDI=";
nugetHash = "sha256-dclYG2D0uSYqf++y33JCefkYLwbuRCuKd3qLMnx3BDI=";
meta = with lib; {
description = "From git log to SemVer in no time";
+2 -2
View File
@@ -11,7 +11,7 @@ maven.buildMavenPackage rec {
hash = "sha256-F/tMRD+nWn/fRPX7cTan371zlOTxh7oR98wREmokULo=";
};
mvnHash = "sha256-b0nkp23gv4kejac/xrvm3xWo3Z8if7zveNUHBg7ZBm4=";
mvnHash = "sha256-6EX+y7/lGdB5LgW9MIER+KgvtPjvMCDjgq89f1g2GlY=";
mvnParameters = "compile assembly:single -Dmaven.test.skip=true";
nativeBuildInputs = [ makeWrapper ];
@@ -20,7 +20,7 @@ maven.buildMavenPackage rec {
runHook preInstall
mkdir -p $out/{bin,lib}
cp /build/source/target/gol-tool-${version}-jar-with-dependencies.jar $out/lib/gol-tool.jar
cp target/gol-tool-${version}-jar-with-dependencies.jar $out/lib/gol-tool.jar
makeWrapper ${jre}/bin/java $out/bin/gol \
--add-flags "-cp $out/lib/gol-tool.jar" \
+14 -1
View File
@@ -6,6 +6,7 @@
copyDesktopItems,
makeDesktopItem,
libxkbcommon,
makeWrapper,
openssl,
pkg-config,
rustPlatform,
@@ -36,6 +37,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [
copyDesktopItems
makeWrapper
pkg-config
];
@@ -102,6 +104,17 @@ rustPlatform.buildRustPackage rec {
postInstall = ''
install -Dm644 assets/linux/icons/hicolor/128x128/apps/org.squidowl.halloy.png \
$out/share/icons/hicolor/128x128/apps/org.squidowl.halloy.png
'' + lib.optionalString stdenv.isDarwin ''
APP_DIR="$out/Applications/Halloy.app/Contents"
mkdir -p "$APP_DIR/MacOS"
cp -r ${src}/assets/macos/Halloy.app/Contents/* "$APP_DIR"
substituteInPlace "$APP_DIR/Info.plist" \
--replace-fail "{{ VERSION }}" "${version}" \
--replace-fail "{{ BUILD }}" "${version}-nixpkgs"
makeWrapper "$out/bin/halloy" "$APP_DIR/MacOS/halloy"
'';
meta = with lib; {
@@ -109,7 +122,7 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/squidowl/halloy";
changelog = "https://github.com/squidowl/halloy/blob/${version}/CHANGELOG.md";
license = licenses.gpl3Only;
maintainers = with maintainers; [ fab ];
maintainers = with maintainers; [ fab iivusly ];
mainProgram = "halloy";
};
}
@@ -11,7 +11,7 @@ maven.buildMavenPackage rec {
hash = "sha256-3DTyo7rPswpEVzFkcprT6FD+ITGJ+qCXFKXEGoCK+oE=";
};
mvnHash = "sha256-m1o0m0foqJhEzWjC9behBeld5HT08WClcZN2xc3fZrI=";
mvnHash = "sha256-UHtvBVw35QBwgCD+nSduR0924ANAOfwrr/a4qPEYsrM=";
mvnParameters = "compile";
nativeBuildInputs = [ makeWrapper ];
+2 -2
View File
@@ -31,13 +31,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "ldc";
version = "1.38.0";
version = "1.39.0";
src = fetchFromGitHub {
owner = "ldc-developers";
repo = "ldc";
rev = "v${finalAttrs.version}";
hash = "sha256-d/UREh+fHRRh0r3H60uPjHute+qspcm9TBFWZMbGDxk=";
hash = "sha256-ZiG0ATsY6Asu2nus3Y404fvqIwtKYoHl1JRUDU5A6mo=";
fetchSubmodules = true;
};
+1 -1
View File
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
homepage = "https://code.videolan.org/videolan/libplacebo";
changelog = "https://code.videolan.org/videolan/libplacebo/-/tags/v${version}";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ primeos tadeokondrak ];
maintainers = with maintainers; [ primeos ];
platforms = platforms.all;
};
}
@@ -7,6 +7,7 @@
ninja,
pkg-config,
cmake,
appstream-glib,
desktop-file-utils,
wrapGAppsHook4,
onnxruntime,
@@ -21,22 +22,22 @@
rev = "3308e68442664552de593957cad0fa443ea183dd";
hash = "sha256-/cOZ2EcZu/Br9v0ComxnOegcEtlC9e8FYt3XHfah7mE=";
};
aprilModel = fetchurl {
name = "april-english-dev-01110_en.april";
url = "https://april.sapples.net/april-english-dev-01110_en.april";
hash = "sha256-d+uV0PpPdwijfoaMImUwHubELcsl5jymPuo9nLrbwfM=";
};
in
stdenv.mkDerivation (finalAttrs: {
pname = "livecaptions";
version = "0.4.1";
version = "0.4.2";
src = fetchFromGitHub {
owner = "abb128";
repo = "LiveCaptions";
rev = "v${finalAttrs.version}";
hash = "sha256-x8NetSooIBlOKzKUMvDkPFtpD6EVGYECnaqWurySUDU=";
hash = "sha256-bLWJQgZopuQ0t2pexazUTj1+C2weRMrL3PUhIHZ0W5M=";
};
model = fetchurl {
name = "april-english-dev-01110_en.april";
url = "https://april.sapples.net/april-english-dev-01110_en.april";
hash = "sha256-d+uV0PpPdwijfoaMImUwHubELcsl5jymPuo9nLrbwfM=";
};
nativeBuildInputs = [
@@ -44,6 +45,7 @@ in
ninja
pkg-config
cmake
appstream-glib # appstreamcli
desktop-file-utils # update-desktop-database
wrapGAppsHook4
];
@@ -57,12 +59,12 @@ in
postUnpack = ''
rm -r source/subprojects/april-asr
ln -sf ${aprilAsr} source/subprojects/april-asr
ln -s ${aprilAsr} source/subprojects/april-asr
'';
preFixup = ''
gappsWrapperArgs+=(
--set APRIL_MODEL_PATH ${aprilModel}
--set APRIL_MODEL_PATH ${finalAttrs.model}
)
'';
+2 -2
View File
@@ -9,11 +9,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "apache-maven";
version = "3.9.6";
version = "3.9.8";
src = fetchurl {
url = "mirror://apache/maven/maven-3/${finalAttrs.version}/binaries/apache-maven-${finalAttrs.version}-bin.tar.gz";
hash = "sha256-bu3SyuNibWrTpcnuMkvSZYU9ZCl/B/AzQwdVvQ4MOks=";
hash = "sha256-BnZyYpB1t0Dj0Kko4hAh3WFaUyh6821MzKROh+CB0QI=";
};
sourceRoot = ".";
+101
View File
@@ -0,0 +1,101 @@
{
stdenv,
lib,
fetchFromGitHub,
darwin,
overrideSDK,
libsForQt5,
pkg-config,
vulkan-headers,
SDL2,
SDL2_ttf,
ffmpeg,
libopus,
libplacebo,
openssl,
alsa-lib,
libpulseaudio,
libva,
libvdpau,
libxkbcommon,
wayland,
nix-update-script,
}:
let
inherit (darwin.apple_sdk_11_0.frameworks)
AVFoundation
AppKit
AudioUnit
VideoToolbox
;
stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;
in
stdenv'.mkDerivation rec {
pname = "moonlight-qt";
version = "6.0.1";
src = fetchFromGitHub {
owner = "moonlight-stream";
repo = pname;
rev = "v${version}";
sha256 = "sha256-zrl8WPXvQ/7FTqFnpwoXEJ85prtgJWoWNsdckw5+JHI=";
fetchSubmodules = true;
};
nativeBuildInputs = [
libsForQt5.qmake
libsForQt5.wrapQtAppsHook
pkg-config
vulkan-headers
];
buildInputs =
[
(SDL2.override { drmSupport = stdenv.isLinux; })
SDL2_ttf
ffmpeg
libopus
libplacebo
libsForQt5.qtquickcontrols2
openssl
]
++ lib.optionals stdenv.isLinux [
alsa-lib
libpulseaudio
libva
libvdpau
libxkbcommon
wayland
]
++ lib.optionals stdenv.isDarwin [
AVFoundation
AppKit
AudioUnit
VideoToolbox
];
qmakeFlags = [ "CONFIG+=disable-prebuilts" ];
postInstall = lib.optionalString stdenv.isDarwin ''
mkdir $out/Applications $out/bin
mv app/Moonlight.app $out/Applications
ln -s $out/Applications/Moonlight.app/Contents/MacOS/Moonlight $out/bin/moonlight
'';
passthru.updateScript = nix-update-script { };
meta = with lib; {
description = "Play your PC games on almost any device";
homepage = "https://moonlight-stream.org";
license = licenses.gpl3Plus;
maintainers = with maintainers; [
azuwis
luc65r
zmitchell
];
platforms = platforms.all;
mainProgram = "moonlight";
};
}
@@ -1,43 +1,53 @@
{ lib
, stdenv
, autoreconfHook
, makeWrapper
, fetchFromGitHub
, ncurses
, parted
, pkg-config
, libconfig
, hdparm
, smartmontools
, dmidecode
}:
stdenv.mkDerivation rec {
pname = "nwipe";
version = "0.34";
version = "0.37";
src = fetchFromGitHub {
owner = "martijnvanbrummelen";
repo = "nwipe";
rev = "v${version}";
sha256 = "sha256-7WI8AwWkg9rOjAbOyDgCVOpeMxvJ5Bd1yvzfSv6TPLs=";
sha256 = "sha256-0mBiWKkMV8i9n158k843caulF90k43ctpMvKhc4HZxY";
};
nativeBuildInputs = [
autoreconfHook
makeWrapper
pkg-config
];
buildInputs = [
ncurses
parted
libconfig
];
preConfigure = ''
sh init.sh || :
postInstall = ''
wrapProgram $out/bin/nwipe \
--prefix PATH : ${lib.makeBinPath [ hdparm smartmontools dmidecode ]}
'';
enableParallelBuilding = true;
meta = with lib; {
description = "Securely erase disks";
mainProgram = "nwipe";
homepage = "https://github.com/martijnvanbrummelen/nwipe";
license = licenses.gpl2Only;
maintainers = with maintainers; [ woffs ];
maintainers = with maintainers; [ vifino woffs ];
platforms = platforms.linux;
};
}
+98
View File
@@ -0,0 +1,98 @@
{
fetchFromGitHub,
lib,
libiconv,
llvmPackages,
MacOSX-SDK,
makeBinaryWrapper,
nix-update-script,
Security,
which,
}:
let
inherit (llvmPackages) stdenv;
in
stdenv.mkDerivation rec {
pname = "odin";
version = "dev-2024-07";
src = fetchFromGitHub {
owner = "odin-lang";
repo = "Odin";
rev = version;
hash = "sha256-FeiVTLwgP0x1EZqqiYkGbKALhZWC4xE6a/3PPcEElAc=";
};
postPatch =
lib.optionalString stdenv.isDarwin ''
substituteInPlace src/linker.cpp \
--replace-fail '/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk' ${MacOSX-SDK}
''
+ ''
substituteInPlace build_odin.sh \
--replace-fail '-framework System' '-lSystem'
patchShebangs build_odin.sh
'';
LLVM_CONFIG = "${llvmPackages.llvm.dev}/bin/llvm-config";
dontConfigure = true;
buildFlags = [ "release" ];
nativeBuildInputs = [
makeBinaryWrapper
which
];
buildInputs = lib.optionals stdenv.isDarwin [
libiconv
Security
];
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp odin $out/bin/odin
mkdir -p $out/share
cp -r base $out/share/base
cp -r core $out/share/core
cp -r vendor $out/share/vendor
wrapProgram $out/bin/odin \
--prefix PATH : ${
lib.makeBinPath (
with llvmPackages;
[
bintools
llvm
clang
lld
]
)
} \
--set-default ODIN_ROOT $out/share
runHook postInstall
'';
passthru.updateScript = nix-update-script { };
meta = {
description = "Fast, concise, readable, pragmatic and open sourced programming language";
downloadPage = "https://github.com/odin-lang/Odin";
homepage = "https://odin-lang.org/";
license = lib.licenses.bsd3;
mainProgram = "odin";
maintainers = with lib.maintainers; [
astavie
luc65r
znaniye
];
platforms = lib.platforms.unix;
broken = stdenv.hostPlatform.isMusl;
};
}
+23 -23
View File
@@ -2,27 +2,27 @@
# Please dont edit it manually, your changes might get overwritten!
{ fetchNuGet }: [
(fetchNuGet { pname = "AtkSharp"; version = "3.24.24.38"; sha256 = "12dv3j8nzhjb5c0093djajdnv8n7m0q7vq2d5ry2v4xk9wqzxpr7"; })
(fetchNuGet { pname = "CairoSharp"; version = "3.24.24.38"; sha256 = "0n3y5w088k81apxik9amfvjdwcic4k2ixxvnrk9cw6d2wh1d5r8d"; })
(fetchNuGet { pname = "dotnet-outdated-tool"; version = "4.1.0"; sha256 = "1i3i2hnf4qszlp3yzwggnvz4qpp3lgrzf19ygsmbvqzw1g7w150c"; })
(fetchNuGet { pname = "Eto.Forms"; version = "2.7.4"; sha256 = "0q50fw646h25an5j8c4p1gck8ja20vy344w1gb7rdp167d573mb3"; })
(fetchNuGet { pname = "Eto.Platform.Gtk"; version = "2.7.4"; sha256 = "0zy35zw1s4al305y4b496f5nf9vmmm7i0jf8j0dlq6df8bfjifcn"; })
(fetchNuGet { pname = "GdkSharp"; version = "3.24.24.38"; sha256 = "0c5gzg106bnnc4wwwhch6lja68623a9hk8r2sjcv35hl5dh21616"; })
(fetchNuGet { pname = "GioSharp"; version = "3.24.24.38"; sha256 = "1b3irarxjbbpf24fw2avdglcslb5653gn6m829yhlcm5ay37pds4"; })
(fetchNuGet { pname = "GLibSharp"; version = "3.24.24.38"; sha256 = "1a0ixdq1gdb46gkb2nnlydsi10bjrbd3risfyaphsy8fbsyzrzvm"; })
(fetchNuGet { pname = "GtkSharp"; version = "3.24.24.38"; sha256 = "0cn8aggci6n088y5giiaxmyzv01rcz37r8pm738q2bsb57zppz2j"; })
(fetchNuGet { pname = "Lidgren.Network"; version = "1.0.2"; sha256 = "0ka0vwyy060wd1dn1551m56fv957mmc7dxlj71g7n6qmsi1mdhif"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
(fetchNuGet { pname = "Mono.Nat"; version = "3.0.3"; sha256 = "1b3alh1wz28y62cflwl1jppigv499cndm8sds32xsmvwpdwiq4yl"; })
(fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; })
(fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; sha256 = "1p9splg1min274dpz7xdfgzrwkyfd3xlkygwpr1xgjvvyjvs6b0i"; })
(fetchNuGet { pname = "PangoSharp"; version = "3.24.24.38"; sha256 = "0cma8j4cy4j3fw0nvsxlqi0azjkvfjsw0wb6k6b2k21rdpy5rbbn"; })
(fetchNuGet { pname = "SharpCompress"; version = "0.32.2"; sha256 = "1p198bl08ia89rf4n6yjpacj3yrz6s574snsfl40l8vlqcdrc1pm"; })
(fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; })
(fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; })
(fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; })
(fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; })
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; })
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; })
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; })
(fetchNuGet { pname = "AtkSharp"; version = "3.24.24.38"; hash = "sha256-J9/+MU+zky18Lk3gfTCox6Jtm1SyjQQAK0vCb5Ecu4k="; })
(fetchNuGet { pname = "CairoSharp"; version = "3.24.24.38"; hash = "sha256-DeXSAuSiGc7SzHb3HsUkLDLe5HZVpRn7VQFNhAAvflg="; })
(fetchNuGet { pname = "dotnet-outdated-tool"; version = "4.1.0"; hash = "sha256-DJTAzwv8472qfj4F9/Oj415M/rbv8e/HpV9j4iwUccQ="; })
(fetchNuGet { pname = "Eto.Forms"; version = "2.7.4"; hash = "sha256-Y9VxSjsm3JbPeoETMvwGQkk02QuXMCSLVUVAQwx3oGA="; })
(fetchNuGet { pname = "Eto.Platform.Gtk"; version = "2.7.4"; hash = "sha256-lrko3UKuGUwbkMhJEE+tdSdnizOJLOILGFQRHfgvw38="; })
(fetchNuGet { pname = "GdkSharp"; version = "3.24.24.38"; hash = "sha256-JpggYCsUlrGZ1CKjCZMawiCjJDWQQc45YdYuA8L7rzA="; })
(fetchNuGet { pname = "GioSharp"; version = "3.24.24.38"; hash = "sha256-RLd7hlelMgp9Eqga+0YxZVHN6GtbCe6IcHct2bPKcaw="; })
(fetchNuGet { pname = "GLibSharp"; version = "3.24.24.38"; hash = "sha256-df/8vV4OeQ2v8k7HPNrKcoEQdfPUWrHmM2S1F3DrEag="; })
(fetchNuGet { pname = "GtkSharp"; version = "3.24.24.38"; hash = "sha256-Uvx7/ylLL4HROPWifMZnOYD9fe0qxlc8QsCayN5TyDI="; })
(fetchNuGet { pname = "Lidgren.Network"; version = "1.0.2"; hash = "sha256-LsJWQ9QVG3teOJL2dlitp6TtTKmhlGBbaBwY4D3fQE0="; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; })
(fetchNuGet { pname = "Mono.Nat"; version = "3.0.3"; hash = "sha256-1BMcebt8V93F0E2j2ixLiewX75WBcuqYMB6JzwOkaqw="; })
(fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; hash = "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="; })
(fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; hash = "sha256-ESyjt/R7y9dDvvz5Sftozk+e/3Otn38bOcLGGh69Ot0="; })
(fetchNuGet { pname = "PangoSharp"; version = "3.24.24.38"; hash = "sha256-dq1c/G05iCmWmWZxwLV0e8qvQMS0620Bd0MSz4hEqjI="; })
(fetchNuGet { pname = "SharpCompress"; version = "0.32.2"; hash = "sha256-9QaWG8N0IwoIddpqcoo2P/shmbrSG0tcTkhFBOhCKdw="; })
(fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; hash = "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="; })
(fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; hash = "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg="; })
(fetchNuGet { pname = "System.Memory"; version = "4.5.4"; hash = "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="; })
(fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; hash = "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U="; })
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; hash = "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak="; })
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="; })
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; hash = "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4="; })
]
+2 -2
View File
@@ -16,13 +16,13 @@
buildGoModule rec {
pname = "picocrypt";
version = "1.34";
version = "1.35";
src = fetchFromGitHub {
owner = "Picocrypt";
repo = "Picocrypt";
rev = version;
hash = "sha256-TO72s8v0cpyKjvi0b74vux3+VzTfW540Drtr2bD5xVw=";
hash = "sha256-0dzJtwJ588c0ldf97u/J2zHkxWr176p6/FLCzMXgjQ0=";
};
sourceRoot = "${src.name}/src";
+2 -2
View File
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "powerjoular";
version = "1.0.0";
version = "1.0.1";
src = fetchFromGitHub {
owner = "joular";
repo = pname;
rev = version;
hash = "sha256-3YKoxZTh9ScudAtsE4CJUbcallm7/vvxIdXwaOZt2hA=";
hash = "sha256-1XNXe5EZHB1kK2C5oyRt4TzfjZivW9DOEvS1MxJHC8E=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -5,16 +5,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "tabiew";
version = "0.3.5";
version = "0.4.1";
src = fetchFromGitHub {
owner = "shshemi";
repo = "tabiew";
rev = "v${version}";
hash = "sha256-ObS+8901Uw9mIzMK14D0UgCWJFRNaQ0tOIq5merHYIo=";
hash = "sha256-/W6ffanDg+p0g5MFUEF9bjWmYPWjZeCGmHqbruju2hk=";
};
cargoHash = "sha256-vOdjHBR/FZjYkLMvPvBZ/xTPKXgchv92BQSLLodymgY=";
cargoHash = "sha256-dBk6lfUG7MFJCOdDt+LpkewnYS/awqCLPLUCFSyi5Y8=";
nativeBuildInputs = [ installShellFiles ];
File diff suppressed because it is too large Load Diff
+99
View File
@@ -0,0 +1,99 @@
{
lib,
rustPlatform,
fetchFromGitHub,
pkg-config,
wrapGAppsHook3,
atk,
cairo,
gdk-pixbuf,
glib,
gtk3,
libsecret,
libxkbcommon,
openssl,
pango,
sqlite,
vulkan-loader,
stdenv,
wayland,
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
pname = "tasks";
version = "0.1.0";
src = fetchFromGitHub {
owner = "edfloreshz";
repo = "tasks";
rev = "refs/tags/${version}";
hash = "sha256-0bXzeKnJ5MIl7vCo+7kyXm3L6QrCdm5sPreca1SPi8U=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"accesskit-0.12.2" = "sha256-ksaYMGT/oug7isQY8/1WD97XDUsX2ShBdabUzxWffYw=";
"atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA=";
"clipboard_macos-0.1.0" = "sha256-temNg+RdvquSLAdkwU5b6dtu9vZkXjnDASS/eJo2rz8=";
"cosmic-config-0.1.0" = "sha256-dYxBp/2JkgFUtkcfzQieHS7MPf6GoOIxuCN/8AZraio=";
"cosmic-text-0.11.2" = "sha256-O8l3Auo+7/aqPYvWQXpOdrVHHdjc1fjoU1nFxqdiZ5I=";
"d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4=";
"glyphon-0.5.0" = "sha256-j1HrbEpUBqazWqNfJhpyjWuxYAxkvbXzRKeSouUoPWg=";
"smithay-client-toolkit-0.18.0" = "sha256-/7twYMt5/LpzxLXAQKTGNnWcfspUkkZsN5hJu7KaANc=";
"smithay-clipboard-0.8.0" = "sha256-MqzynFCZvzVg9/Ry/zrbH5R6//erlZV+nmQ2St63Wnc=";
"softbuffer-0.4.1" = "sha256-a0bUFz6O8CWRweNt/OxTvflnPYwO5nm6vsyc/WcXyNg=";
"taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI=";
"winit-0.29.10" = "sha256-ScTII2AzK3SC8MVeASZ9jhVWsEaGrSQ2BnApTxgfxK4=";
};
};
# COSMIC applications now uses vergen for the About page
# Update the COMMIT_DATE to match when the commit was made
env.VERGEN_GIT_COMMIT_DATE = "2024-07-03";
env.VERGEN_GIT_SHA = "0e8c728c88a9cac1bac130eb083ca0fe58c7121d";
nativeBuildInputs = [
pkg-config
wrapGAppsHook3
];
buildInputs = [
atk
cairo
gdk-pixbuf
glib
gtk3
libsecret
libxkbcommon
openssl
pango
sqlite
vulkan-loader
wayland
];
postFixup = ''
wrapProgram $out/bin/tasks \
--prefix LD_LIBRARY_PATH : "${
lib.makeLibraryPath [
libxkbcommon
wayland
]
}"
'';
passthru = {
updateScript = nix-update-script { };
};
meta = with lib; {
description = "Simple task management application for the COSMIC desktop";
homepage = "https://github.com/edfloreshz/tasks";
license = licenses.gpl3Only;
maintainers = with maintainers; [ GaetanLepage ];
platforms = platforms.linux;
mainProgram = "tasks";
};
}
+8 -3
View File
@@ -5,12 +5,12 @@
python3.pkgs.buildPythonApplication rec {
pname = "wireviz";
version = "0.3.2";
version = "0.4";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-MBgX7dWOr3SorOJQjVlRGlSvL+A7Lg+gC1UoS3un9rU=";
hash = "sha256-lFJG0jkE42h2boCxDzXfWPmKFc2Ycqx598wPhD/jaLM=";
};
nativeBuildInputs = [
@@ -19,12 +19,17 @@ python3.pkgs.buildPythonApplication rec {
];
propagatedBuildInputs = with python3.pkgs; [
click
graphviz
pillow
pyyaml
];
pythonImportsCheck = [ "wireviz" ];
pythonImportsCheck = [
"wireviz"
"wireviz.wireviz"
"wireviz.wv_cli"
];
meta = with lib; {
description = "Easily document cables and wiring harnesses";
+2 -2
View File
@@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "wireless-regdb";
version = "2024.05.08";
version = "2024.07.04";
src = fetchurl {
url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-mu4dhuvrs2O3FL7JQbKCDzHjt/Gkhd3J/L2ZhcfT58Q=";
hash = "sha256-mDKhThviSr/3vjDe48mhr7X9/PR1oNkar+8Dn42F9es=";
};
dontBuild = true;
@@ -28,6 +28,7 @@
, libxmlb
, malcontent
, json-glib
, glib-networking
, libsecret
, valgrind-light
, docbook-xsl-nons
@@ -78,6 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
gtk4
glib
glib-networking
packagekit
appstream
libsoup_3
@@ -1,81 +0,0 @@
{ lib
, fetchFromGitHub
, llvmPackages
, makeBinaryWrapper
, libiconv
, MacOSX-SDK
, Security
, which
}:
let
inherit (llvmPackages) stdenv;
in stdenv.mkDerivation rec {
pname = "odin";
version = "dev-2024-06";
src = fetchFromGitHub {
owner = "odin-lang";
repo = "Odin";
rev = version;
hash = "sha256-Ba+244L855y+XzLcaf1fgQhHVDv2Q77GPapRAYmCQfg=";
};
nativeBuildInputs = [
makeBinaryWrapper which
];
buildInputs = lib.optionals stdenv.isDarwin [
libiconv
Security
];
LLVM_CONFIG = "${llvmPackages.llvm.dev}/bin/llvm-config";
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace src/linker.cpp \
--replace-fail '/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk' ${MacOSX-SDK}
'' + ''
substituteInPlace build_odin.sh \
--replace-fail '-framework System' '-lSystem'
patchShebangs build_odin.sh
'';
dontConfigure = true;
buildFlags = [
"release"
];
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp odin $out/bin/odin
mkdir -p $out/share
cp -r base $out/share/base
cp -r core $out/share/core
cp -r vendor $out/share/vendor
wrapProgram $out/bin/odin \
--prefix PATH : ${lib.makeBinPath (with llvmPackages; [
bintools
llvm
clang
lld
])} \
--set-default ODIN_ROOT $out/share
runHook postInstall
'';
meta = with lib; {
description = "Fast, concise, readable, pragmatic and open sourced programming language";
mainProgram = "odin";
homepage = "https://odin-lang.org/";
license = licenses.bsd3;
maintainers = with maintainers; [ luc65r astavie znaniye ];
platforms = platforms.x86_64 ++ [ "aarch64-darwin" ];
};
}
@@ -16,26 +16,27 @@
buildPythonApplication rec {
pname = "apio";
version = "0.8.1";
format = "pyproject";
version = "0.9.5";
pyproject = true;
src = fetchFromGitHub {
owner = "FPGAwars";
repo = "apio";
rev = "v${version}";
sha256 = "sha256-04qAGTzusMT3GsaRxDoXNJK1Mslzxu+ugQclBJx8xzE=";
hash = "sha256-VU4tOszGkw20DWW2SerFsnjFiSkrSwqBcwosGnHJfU8=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'scons==4.2.0' 'scons' \
--replace '==' '>='
--replace-fail 'scons==4.2.0' 'scons' \
--replace-fail '==' '>='
substituteInPlace apio/managers/scons.py --replace \
substituteInPlace apio/managers/scons.py --replace-fail \
'return "tinyprog --libusb --program"' \
'return "${tinyprog}/bin/tinyprog --libusb --program"'
substituteInPlace apio/util.py --replace \
'_command = join(get_bin_dir(), "tinyprog")' \
substituteInPlace apio/util.py --replace-fail \
'_command = apio_bin_dir / "tinyprog"' \
'_command = "${tinyprog}/bin/tinyprog"'
# semantic-version seems to not support version numbers like the one of tinyprog in Nixpkgs (1.0.24.dev114+gxxxxxxx).
@@ -43,7 +44,7 @@ buildPythonApplication rec {
# This leads to an error like "Error: Invalid version string: '1.0.24.dev114+g97f6353'"
# when executing "apio upload" for a TinyFPGA.
# Replace the dot with a dash to work around this problem.
substituteInPlace apio/managers/scons.py --replace \
substituteInPlace apio/managers/scons.py --replace-fail \
'version = semantic_version.Version(pkg_version)' \
'version = semantic_version.Version(pkg_version.replace(".dev", "-dev"))'
'';
@@ -69,8 +70,15 @@ buildPythonApplication rec {
pytestCheckHook
];
disabledTestPaths = [
# This test fails and is also not executed in upstream's CI
"test2"
];
pytestFlagsArray = [ "--offline" ];
strictDeps = true;
meta = with lib; {
description = "Open source ecosystem for open FPGA boards";
mainProgram = "apio";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
mainProgram = "ctypes.sh";
homepage = "https://github.com/taviso/ctypes.sh";
license = licenses.mit;
maintainers = with maintainers; [ tadeokondrak ];
maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
description = "Official library to interface with the Discord client";
homepage = "https://github.com/discordapp/discord-rpc";
license = licenses.mit;
maintainers = with maintainers; [ tadeokondrak ];
maintainers = with maintainers; [ ];
platforms = platforms.all;
};
}
+1 -1
View File
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
description = "FFmpeg based source library for easy frame accurate access";
mainProgram = "ffmsindex";
license = licenses.mit;
maintainers = with maintainers; [ tadeokondrak ];
maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "lombok";
version = "1.18.32";
version = "1.18.34";
src = fetchurl {
url = "https://projectlombok.org/downloads/lombok-${version}.jar";
sha256 = "sha256-l1dGdOKiX1Z6MTc2rOAN+Hh9RD3jFkB9V/yHfZ8Zpl0=";
sha256 = "sha256-wn1rKv9WJB0bB/y8xrGDcJ5rQyyA9zdO6x2CPobUuBo=";
};
nativeBuildInputs = [ makeWrapper ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
homepage = "http://l-smash.github.io/l-smash/";
description = "MP4 container utilities";
license = licenses.isc;
maintainers = with maintainers; [ tadeokondrak ];
maintainers = with maintainers; [ ];
platforms = platforms.all;
};
}
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
homepage = "https://code.videolan.org/videolan/libplacebo";
changelog = "https://code.videolan.org/videolan/libplacebo/-/tags/v${version}";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ primeos tadeokondrak ];
maintainers = with maintainers; [ primeos ];
platforms = platforms.all;
};
}
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
homepage = "http://www.vapoursynth.com/";
license = licenses.lgpl21;
platforms = platforms.x86_64;
maintainers = with maintainers; [ rnhmjoj sbruder tadeokondrak ];
maintainers = with maintainers; [ rnhmjoj sbruder ];
mainProgram = "vspipe";
};
}
@@ -37,7 +37,7 @@ let
description = "Cross-platform editor for VapourSynth scripts";
homepage = "https://github.com/YomikoR/VapourSynth-Editor";
license = licenses.mit;
maintainers = with maintainers; [ tadeokondrak ];
maintainers = with maintainers; [ ];
platforms = platforms.all;
};
};
+1 -1
View File
@@ -56,6 +56,6 @@ stdenv.mkDerivation rec {
homepage = "http://www.videolan.org/developers/x264.html";
license = licenses.gpl2Plus;
platforms = platforms.unix ++ platforms.windows;
maintainers = with maintainers; [ tadeokondrak ];
maintainers = with maintainers; [ ];
};
}
@@ -0,0 +1,33 @@
{
lib,
fetchPypi,
setuptools,
buildPythonPackage,
}:
buildPythonPackage rec {
pname = "huepy";
version = "1.2.1";
pyproject = true;
src = fetchPypi {
pname = "huepy";
inherit version;
hash = "sha256-Wym+73lzEvt2BhiLxc2Y94q49+AVdkJ6kxLxybILdZ0=";
};
build-system = [ setuptools ];
pythonImportsCheck = [ "huepy" ];
# no test
doCheck = false;
meta = {
description = "Print awesomely in terminals";
homepage = "https://pypi.org/project/huepy/";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ tochiaha ];
platforms = lib.platforms.all;
};
}
@@ -0,0 +1,38 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
pytestCheckHook,
setuptools,
responses,
}:
buildPythonPackage rec {
pname = "pytest-responses";
version = "0.5.1";
pyproject = true;
src = fetchFromGitHub {
owner = "getsentry";
repo = "pytest-responses";
rev = "refs/tags/${version}";
hash = "sha256-6QAiNWCJbo4rmaByrc8VNw39/eF3uqFOss3GJuCvpZg=";
};
build-system = [ setuptools ];
dependencies = [ responses ];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "pytest_responses" ];
meta = {
description = "Plugin for py.test response";
homepage = "https://github.com/getsentry/pytest-responses";
changelog = "https://github.com/getsentry/pytest-responses/blob/${version}/CHANGES";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ tochiaha ];
mainProgram = "pytest-reponses";
};
}
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "thermobeacon-ble";
version = "0.6.2";
version = "0.7.0";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "bluetooth-devices";
repo = "thermobeacon-ble";
rev = "refs/tags/v${version}";
hash = "sha256-Nmu9oS6zkCTqk/cf8+fqDFhVcG/2JuDDumGTCubeS5o=";
hash = "sha256-XeLTY78zg+5HR+GH9bHl2t86ifcWm7AA4zSwJOknsdc=";
};
postPatch = ''
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "ytmusicapi";
version = "1.7.3";
version = "1.7.4";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "sigma67";
repo = "ytmusicapi";
rev = "refs/tags/${version}";
hash = "sha256-a2EZ0uUwdP0QNQh9h4TG1lmPXkvrlDziKiUQwYENXwk=";
hash = "sha256-gD0VpT0hTymubKLRnl45/FkEZ+t9IPA7pY8eIkTnrKM=";
};
build-system = [
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "bearer";
version = "1.44.1";
version = "1.45.0";
src = fetchFromGitHub {
owner = "bearer";
repo = "bearer";
rev = "refs/tags/v${version}";
hash = "sha256-zxogzchI/1GQm/1IGQ59w18pWvQC3V/9T6+UaWkWDVM=";
hash = "sha256-6q9mUv1S44shGr3ScqLNTw1AiFS2sQmAMionsEdfOOw=";
};
vendorHash = "sha256-7rTbLnFfdmRQgQfx2w/mO3Ac5ENEFm5XPzApKwlImkE=";
vendorHash = "sha256-q3JnxFSnMePBfwFdrj69uh65UXqeL0+QUvGjzkS2lGs=";
subPackages = [ "cmd/bearer" ];
+1 -1
View File
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
mainProgram = "drm_info";
homepage = "https://github.com/ascent12/drm_info";
license = licenses.mit;
maintainers = with maintainers; [ tadeokondrak ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
+1 -1
View File
@@ -4,7 +4,7 @@ buildDotnetGlobalTool {
pname = "fable";
version = "4.18.0";
nugetSha256 = "sha256-PbrFjpltRx4lnQDgQrOKSVHwttePMfOnjljOddkFbmY=";
nugetHash = "sha256-PbrFjpltRx4lnQDgQrOKSVHwttePMfOnjljOddkFbmY=";
passthru.updateScript = ./update.sh;
meta = with lib; {
+1 -1
View File
@@ -36,4 +36,4 @@ NUGET_URL="$(curl -f "https://api.nuget.org/v3/index.json" | jq --raw-output '.r
HASH=$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url "$NUGET_URL")")
sed -i "s/version = \".*\"/version = \"$VER\"/" "$NIX_DRV"
sed -i "s#nugetSha256 = \"sha256-.\{44\}\"#nugetSha256 = \"$HASH\"#" "$NIX_DRV"
sed -i "s#nugetHash = \"sha256-.\{44\}\"#nugetHash = \"$HASH\"#" "$NIX_DRV"
@@ -28,7 +28,7 @@ mavenJdk8.buildMavenPackage rec {
sha256 = "sha256-z38I61JR4oiAkImkbwcvXoK5QsdoR986dDrOzhHsCeY=";
};
mvnHash = "sha256-Qbx1cNKFtSEnzhFImtCz2psYts2yhTDKzjmBBZavWwU=";
mvnHash = "sha256-es8M7gV2z1V9VpWOxanJwQyiemabiUw3n4heJB8Q75A=";
nativeBuildInputs = [ jdk8 makeWrapper ];
@@ -10,7 +10,7 @@ buildDotnetGlobalTool rec {
pname = "csharp-ls";
version = "0.14.0";
nugetSha256 = "sha256-agcx7VPIqGhl3NzdGLPwXYJsRuvSjL4SdbNg9vFjIh4=";
nugetHash = "sha256-agcx7VPIqGhl3NzdGLPwXYJsRuvSjL4SdbNg9vFjIh4=";
dotnet-sdk = sdk_8_0;
dotnet-runtime = sdk_8_0;
+1 -1
View File
@@ -25,7 +25,7 @@ mavenJdk17.buildMavenPackage rec {
rev = version;
hash = "sha256-7T9n23qMl4IJQL7yWLXKvRzYcMeXDUwkY8MBFc2t3Rw=";
};
mvnHash = "sha256-bsJlsIXIIVzZyVgEF/SN+GgpZt6v0u800arO1c5QYHk=";
mvnHash = "sha256-FpfHtGIfo84z6v9/nzc47+JeIM43MR9mWhVOPSi0xhM=";
desktop = makeDesktopItem {
name = "RuneLite";
@@ -128,17 +128,12 @@ stdenv.mkDerivation {
++ lib.optional (lib.versionAtLeast kernel.version "5.8") libpfm
++ lib.optional (lib.versionAtLeast kernel.version "6.0") python3.pkgs.setuptools;
env.NIX_CFLAGS_COMPILE = toString ([
env.NIX_CFLAGS_COMPILE = toString [
"-Wno-error=cpp"
"-Wno-error=bool-compare"
"-Wno-error=deprecated-declarations"
"-Wno-error=stringop-truncation"
] ++ lib.optionals (stdenv.cc.isGNU && lib.versions.major stdenv.cc.version == "13") [
# Workaround gcc bug that causes enev simplest `perf top` runs to
# crash: https://gcc.gnu.org/PR111009.
# Can be removed once gcc-13 is updated past 13.2.0.
"-O1"
]);
];
doCheck = false; # requires "sparse"
+1 -1
View File
@@ -14,7 +14,7 @@ maven.buildMavenPackage rec {
};
mvnParameters = "-f h2/pom.xml";
mvnHash = "sha256-hUzE4F+RNCAfoY836pjrivf04xqN4m9SkiLXhmVzZRA=";
mvnHash = "sha256-kWRwaHb9+O07/jq8tgQnYpJa6zFsAMBCEnhT7HNKM4s=";
nativeBuildInputs = [ makeWrapper ];
+7 -11
View File
@@ -1,11 +1,11 @@
{ lib
, stdenv
, buildGo122Module
, buildGoModule
, fetchFromGitHub
, fetchNpmDeps
, cacert
, go_1_22
, git
, go
, enumer
, mockgen
, nodejs
@@ -14,27 +14,22 @@
, nixosTests
}:
let
buildGoModule = buildGo122Module;
go = go_1_22;
in
buildGoModule rec {
pname = "evcc";
version = "0.127.2";
version = "0.128.0";
src = fetchFromGitHub {
owner = "evcc-io";
repo = "evcc";
rev = version;
hash = "sha256-85AhiqAvjr63tfXovH2bt1b583ak1N09EtbLLtW7qeA=";
hash = "sha256-6Ak2OXJfh4d0Fp75MPQ/WQa1y5DuWBEyZaWoK86F6oU=";
};
vendorHash = "sha256-MdfLJpPEi6Cr34W6eJSraKJwBPtR66HM2tJIbPE9mZs=";
vendorHash = "sha256-O8chNEtNEbzNiFzDD1j16V6eS3GKpUWB4PMuBiRNsyU=";
npmDeps = fetchNpmDeps {
inherit src;
hash = "sha256-6Dxf32myqRbKIlYFcQhkuqZVz+lVvmeJ5lqiWPCQAzA=";
hash = "sha256-XG9nefBefF2gdDWA9IYBI2dv6Lig2LqGgOnTjyni0fM=";
};
nativeBuildInputs = [
@@ -78,6 +73,7 @@ buildGoModule rec {
skippedTests = [
# network access
"TestOctopusConfigParse"
"TestTemplates/ac-elwa-2"
"TestTemplates/allinpower"
"TestTemplates/electricitymaps"
"TestTemplates/elering"
+1 -1
View File
@@ -4,7 +4,7 @@ buildDotnetGlobalTool {
pname = "pbm";
version = "1.3.2";
nugetSha256 = "sha256-xu3g8NFLZYnHzBuoIhIiAzaPJqY0xhLWLYi+ORRADH8=";
nugetHash = "sha256-xu3g8NFLZYnHzBuoIhIiAzaPJqY0xhLWLYi+ORRADH8=";
meta = with lib; {
description = "CLI for managing Akka.NET applications and Akka.NET Clusters";
+1 -1
View File
@@ -13,7 +13,7 @@ mavenWithJdk.buildMavenPackage rec {
hash = "sha256-F+o94Oh9qxVdfgwdmyOv+WZl1BjQuzhQWaVrAgScgIU=";
};
mvnHash = "sha256-zqXbLnLmTZHzwH+vgGASR7Jsz1t173DmQMIe2R6B6Ic=";
mvnHash = "sha256-woOSkF5TuzaJ84EndryMoXTMbbK/V/BShM1k+WB8D/c=";
nativeBuildInputs = [ makeWrapper ];
+1 -1
View File
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
description = "Difficulty and pp calculator for osu!";
homepage = "https://github.com/Francesco149/oppai-ng";
license = licenses.unlicense;
maintainers = with maintainers; [ tadeokondrak ];
maintainers = with maintainers; [ ];
mainProgram = "oppai";
platforms = platforms.all;
};
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "cloudfox";
version = "1.14.0";
version = "1.14.1";
src = fetchFromGitHub {
owner = "BishopFox";
repo = "cloudfox";
rev = "refs/tags/v${version}";
hash = "sha256-vh7U66od+i1kmTtpHZ1tuMPTl0AnXoYUKMU16ZgxFBQ=";
hash = "sha256-4LOKCdnNiJdnLsCsoME5CZSFog5W+8IA7HwTe+QfHGY=";
};
vendorHash = "sha256-2+UiaU4S64afH8Y8uz5ZclO5NxTi4YlUZ87ZN1MnLj0=";
+3 -1
View File
@@ -11,7 +11,9 @@ maven.buildMavenPackage rec {
hash = "sha256-rRttA5H0A0c44loBzbKH7Waoted3IsOgxGCD2VM0U/Q=";
};
mvnHash = "sha256-yqMAEjaNHxm/c/cbApiMjkN7V6Gx/crs1LPbD0k0cgk=";
mvnHash = "sha256-lEcAq0H8Uacv02ItjVGfxvtRip5206HtpREBrQDzBDo=";
mvnParameters = "-DskipTests";
nativeBuildInputs = [ makeWrapper ];
+7 -5
View File
@@ -1,24 +1,26 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub, nix-update-script }:
buildGoModule rec {
pname = "sops";
version = "3.8.1";
version = "3.9.0";
src = fetchFromGitHub {
owner = "getsops";
repo = pname;
rev = "v${version}";
hash = "sha256-4K09wLV1+TvYTtvha6YyGhjlhEldWL1eVazNwcEhi3Q=";
hash = "sha256-Q1e3iRIne9/bCLxKdhzP3vt3oxuHJAuG273HdeHZ3so=";
};
vendorHash = "sha256-iRgLspYhwSVuL0yarPdjXCKfjK7TGDZeQCOcIYtNvzA=";
vendorHash = "sha256-3vzKQZTg38/UGVJ/M1jLALCgor7wztsLKVuMqY3adtI=";
subPackages = [ "cmd/sops" ];
ldflags = [ "-s" "-w" "-X github.com/getsops/sops/v3/version.Version=${version}" ];
passthru.updateScript = nix-update-script { };
meta = with lib; {
homepage = "https://github.com/getsops/sops";
homepage = "https://getsops.io/";
description = "Simple and flexible tool for managing secrets";
changelog = "https://github.com/getsops/sops/blob/v${version}/CHANGELOG.rst";
mainProgram = "sops";
+1 -1
View File
@@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://www.sudo.ws/";
# From https://www.sudo.ws/about/license/
license = with licenses; [ sudo bsd2 bsd3 zlib ];
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ rhendric ];
platforms = platforms.linux ++ platforms.freebsd;
mainProgram = "sudo";
};
+1
View File
@@ -212,6 +212,7 @@ mapAliases ({
composable_kernel = throw "'composable_kernel' has been replaced with 'rocmPackages.composable_kernel'"; # Added 2023-10-08
cope = throw "'cope' has been removed, as it is broken in nixpkgs since it was added, and fixing it is not trivial"; # Added 2024-04-12
coriander = throw "'coriander' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27
cosmic-tasks = tasks; # Added 2024-07-04
cpp-ipfs-api = cpp-ipfs-http-client; # Project has been renamed. Added 2022-05-15
crispyDoom = crispy-doom; # Added 2023-05-01
cryptowatch-desktop = throw "Cryptowatch Desktop was sunset on September 30th 2023 and has been removed from nixpkgs"; # Added 2023-12-22
+1 -12
View File
@@ -1229,8 +1229,6 @@ with pkgs;
libredirect = callPackage ../build-support/libredirect { };
livecaptions = callPackage ../applications/misc/livecaptions { };
madonctl = callPackage ../applications/misc/madonctl { };
copyDesktopItems = makeSetupHook {
@@ -5919,8 +5917,6 @@ with pkgs;
nsz = with python3.pkgs; toPythonApplication nsz;
nwipe = callPackage ../tools/security/nwipe { };
nx2elf = callPackage ../tools/compression/nx2elf { };
nx-libs = callPackage ../tools/X11/nx-libs { };
@@ -27466,7 +27462,7 @@ with pkgs;
octomap = callPackage ../development/libraries/octomap { };
odin = callPackage ../development/compilers/odin {
odin = callPackage ../by-name/od/odin/package.nix {
inherit (pkgs.darwin.apple_sdk_11_0) MacOSX-SDK;
inherit (pkgs.darwin.apple_sdk_11_0.frameworks) Security;
llvmPackages = llvmPackages_18;
@@ -32583,13 +32579,6 @@ with pkgs;
moonlight-embedded = callPackage ../applications/misc/moonlight-embedded { };
moonlight-qt = libsForQt5.callPackage ../applications/misc/moonlight-qt {
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
SDL2 = buildPackages.SDL2.override {
drmSupport = stdenv.isLinux;
};
};
mooSpace = callPackage ../applications/audio/mooSpace { };
mop = callPackage ../applications/misc/mop { };
+4
View File
@@ -5632,6 +5632,8 @@ self: super: with self; {
huawei-lte-api = callPackage ../development/python-modules/huawei-lte-api { };
huepy = callPackage ../development/python-modules/huepy { };
huey = callPackage ../development/python-modules/huey { };
hug = callPackage ../development/python-modules/hug { };
@@ -12370,6 +12372,8 @@ self: super: with self; {
pytest-resource-path = callPackage ../development/python-modules/pytest-resource-path { };
pytest-responses = callPackage ../development/python-modules/pytest-responses { };
pytest-runner = callPackage ../development/python-modules/pytest-runner { };
pytest-server-fixtures = callPackage ../development/python-modules/pytest-server-fixtures { };