Merge master into staging-next

This commit is contained in:
github-actions[bot] 2023-06-26 00:02:44 +00:00 committed by GitHub
commit 054d9759ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
43 changed files with 508 additions and 171 deletions

View File

@ -52,6 +52,8 @@
- `services.lemmy.settings.federation` was removed in 0.17.0 and no longer has any effect. To enable federation, the hostname must be set in the configuration file and then federation must be enabled in the admin web UI. See the [release notes](https://github.com/LemmyNet/lemmy/blob/c32585b03429f0f76d1e4ff738786321a0a9df98/RELEASES.md#upgrade-instructions) for more details.
- `spamassassin` no longer supports the `Hashcash` module. The module needs to be removed from the `loadplugin` list if it was copied over from the default `initPreConf` option.
## Other Notable Changes {#sec-release-23.11-notable-changes}
- The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration.

View File

@ -77,9 +77,9 @@ in
loadplugin Mail::SpamAssassin::Plugin::Check
#loadplugin Mail::SpamAssassin::Plugin::DCC
loadplugin Mail::SpamAssassin::Plugin::DKIM
loadplugin Mail::SpamAssassin::Plugin::DMARC
loadplugin Mail::SpamAssassin::Plugin::DNSEval
loadplugin Mail::SpamAssassin::Plugin::FreeMail
loadplugin Mail::SpamAssassin::Plugin::Hashcash
loadplugin Mail::SpamAssassin::Plugin::HeaderEval
loadplugin Mail::SpamAssassin::Plugin::HTMLEval
loadplugin Mail::SpamAssassin::Plugin::HTTPSMismatch

View File

@ -0,0 +1,44 @@
{ lib
, stdenv
, alsa-lib
, darwin
, fetchFromGitHub
, pkg-config
, protobuf
, rustPlatform
}:
rustPlatform.buildRustPackage rec {
pname = "music-player";
version = "0.2.0-alpha.13";
src = fetchFromGitHub {
owner = "tsirysndr";
repo = "music-player";
rev = "v${version}";
hash = "sha256-LuO64E5kJdMgd5h0+Sb8Wg7hxUmS8E7bKT3NIyd9+Lc=";
};
cargoHash = "sha256-Xn0OUHMgKxzDvhO+xRv5jMa50OzEtl6yhHbJ1R/a56Y=";
nativeBuildInputs = [
protobuf
rustPlatform.bindgenHook
] ++ lib.optionals stdenv.isLinux [
pkg-config
];
buildInputs = lib.optionals stdenv.isLinux [
alsa-lib
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.AudioUnit
];
meta = with lib; {
description = "An extensible music player daemon written in Rust";
homepage = "https://github.com/tsirysndr/music-player";
changelog = "https://github.com/tsirysndr/music-player/releases/tag/v${version}";
license = licenses.mit;
maintainers = [ maintainers.marsam ];
};
}

View File

@ -11,13 +11,13 @@
buildDotnetModule rec {
pname = "archisteamfarm";
# nixpkgs-update: no auto update
version = "5.4.6.3";
version = "5.4.7.2";
src = fetchFromGitHub {
owner = "justarchinet";
repo = pname;
rev = version;
hash = "sha256-TAGb3LPS0Jpm3dGGkQbrtTBFCE/xos2ZbNq5UwnrGZY=";
hash = "sha256-qKG4eFF/YTb7wlABBtEjOqBYvtVTLKCXqTD9idkhnI4=";
};
dotnet-runtime = dotnetCorePackages.aspnetcore_7_0;

View File

@ -2,8 +2,8 @@
# Please dont edit it manually, your changes might get overwritten!
{ fetchNuGet }: [
(fetchNuGet { pname = "AngleSharp"; version = "0.17.1"; sha256 = "038idg33ydy72362qplsd7y8ldifi9zg02dhjli6wy4p47hyqcph"; })
(fetchNuGet { pname = "AngleSharp.XPath"; version = "2.0.1"; sha256 = "0sdxqjwvyf0l1cp4n4i84g7rly8z7ramq0y7vsgqvf6hzx7dnk5i"; })
(fetchNuGet { pname = "AngleSharp"; version = "1.0.2"; sha256 = "0808lnbggp3dl116amxj1hz8cfh1a3hi8q10qwgdiwhqx919jslb"; })
(fetchNuGet { pname = "AngleSharp.XPath"; version = "2.0.3"; sha256 = "1z6j171ffw2w5c44j2d7kqki6c8j229i3xbi6pgpk9pas41mdrxx"; })
(fetchNuGet { pname = "ConfigureAwaitChecker.Analyzer"; version = "5.0.0.1"; sha256 = "01llfwhra5m3jj1qpa4rj1hbh01drirakzjc2963vkl9iwrzscyl"; })
(fetchNuGet { pname = "CryptSharpStandard"; version = "1.0.0"; sha256 = "0nikzb92z4a2n969sz747ginwxsbrap5741bcwwxr4r6m2na9jz7"; })
(fetchNuGet { pname = "Humanizer"; version = "2.14.1"; sha256 = "18cycx9gvbc3735chdi2r583x73m2fkz1ws03yi3g640j9zv00fp"; })
@ -61,7 +61,7 @@
(fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "7.0.0"; sha256 = "1f13vsfs1rp9bmdp3khk4mk2fif932d72yxm2wszpsr239x4s2bf"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "7.0.0"; sha256 = "1w49rg0n5wb1m5wnays2mmym7qy7bsi2b1zxz97af2rkbw3s3hbd"; })
(fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; })
(fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.6.0"; sha256 = "02s98d8nwz5mg4mymcr86qdamy71a29g2091xg452czmd3s3x2di"; })
(fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.6.2"; sha256 = "1wwmg6hn4dp2mvwn2bm81wccdw149lq17xdnpz17mvg4zcwmax7g"; })
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; })
(fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; })
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; })
@ -71,14 +71,14 @@
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; })
(fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; })
(fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; })
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.6.0"; sha256 = "1bnwpwg7k72z06027ip4yi222863r8sv14ck9nj8h64ckiw2r256"; })
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.6.2"; sha256 = "1a658bnh5q3lfkrr81h3lyx1mc3hggnjr1bpmim71rr2s42ad70v"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; })
(fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; })
(fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.6.0"; sha256 = "1rz22chnis11dwjrqrcvvmfw80fi2a7756a7ahwy6jlnr250zr61"; })
(fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.6.0"; sha256 = "16vpicp4q2kbpgr3qwpsxg7srabxqszx23x6smjvvrvz7qmr5v8i"; })
(fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.6.2"; sha256 = "0asbrbdyyig1p034smf79lszzbfv1cn6q181i7d4p2vsiqpjp9sj"; })
(fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.6.2"; sha256 = "0lcj8kkcnxbwiaw6j0xf4fxqpa6z0s41nq52spvckfg4367lg4fg"; })
(fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; })
(fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.0.3"; sha256 = "12f5h28115vv7j17whq7f9fwnww3p7iwfbkq3m24m0si303cgqbw"; })
(fetchNuGet { pname = "MSTest.TestFramework"; version = "3.0.3"; sha256 = "0d9nmgj97qpd4w8x609amcawmcywm2q0r2w1p2hvyah0p5s9m0f3"; })
(fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.0.4"; sha256 = "02jffh6kmkccakr51v3iwwq3281sypdilpjjf845dwrsl9ksf73k"; })
(fetchNuGet { pname = "MSTest.TestFramework"; version = "3.0.4"; sha256 = "0dz0mn6bp3bb650k992mr2lga7xn1xc3qfbdfivgknfccyy8d6k8"; })
(fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; })
(fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; })
(fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; })
@ -86,10 +86,10 @@
(fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; })
(fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; })
(fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; })
(fetchNuGet { pname = "NLog"; version = "5.1.3"; sha256 = "0r09pd9cax95gn5bxskfhmalfd5qi3xx5j14znvryd1vn2vy6fln"; })
(fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.2.3"; sha256 = "0p3zj9l45iv4khmrp5wx0ry9pc8yg3n3ml73mrckhjjw0p5f2lw2"; })
(fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.2.3"; sha256 = "059h8r09jk84mbpljfqfbpp19w1wn3bs2nr9wdfg1p8z6mqawm01"; })
(fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; })
(fetchNuGet { pname = "NLog"; version = "5.2.0"; sha256 = "1j27wrjxjpfy10s5182d477y6qb50fdak6r0vx44bbsakmv0zv3s"; })
(fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.0"; sha256 = "08rlrag6ilxn1wyd5ivsny0rgidsn3imsx5bqjwv5dlwdjh5acfh"; })
(fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.0"; sha256 = "1fmdp6bjzcj1nfpnlzcyszl8jnmr35gd79ngqx6cikpg8xpyczhr"; })
(fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; sha256 = "0s37d1p4md0k6d4cy6sq36f2dgkd9qfbzapxhkvi8awwh0vrynhj"; })
(fetchNuGet { pname = "protobuf-net"; version = "3.2.16"; sha256 = "0pwlqlq2p8my2sr8b0cvdav5cm8wpwf3s4gy7s1ba701ac2zyb9y"; })
(fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.16"; sha256 = "00znhikq7valr3jaxg66cwli9hf75wkmmpf6rf8p790hf8lxq0c5"; })
(fetchNuGet { pname = "SteamKit2"; version = "2.5.0-beta.1"; sha256 = "0691285g4z12hv5kpv72l36h45086n14rw56x3dnixcvrjzg2q01"; })
@ -99,7 +99,6 @@
(fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.5.0"; sha256 = "1s6axf6fin8sss3bvzp0s039rxrx71vx4rl559miw12bz3lld8kc"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.5.0"; sha256 = "0hq93gy5vyrigpdk9lhqwxglxwkbxa8ydllwcqs4bwfcsspzrs83"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.5.0"; sha256 = "17hx7kc187higm0gk67dndng3n7932sn3fwyj48l45cvyr3025h7"; })
(fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; })
(fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; })
(fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; sha256 = "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"; })
(fetchNuGet { pname = "System.Composition"; version = "7.0.0"; sha256 = "1aii681g7a4gv8fvgd6hbnbbwi6lpzfcnl3k0k8hqx4m7fxp2f32"; })
@ -115,6 +114,6 @@
(fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; })
(fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "7.0.1"; sha256 = "1nq9ngkqha70rv41692c79zq09cx6m85wkp3xj9yc31s62afyl5i"; })
(fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; })
(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 = "zxcvbn-core"; version = "7.0.92"; sha256 = "1pbi0n3za8zsnkbvq19njy4h4hy12a6rv4rknf4a2m1kdhxb3cgx"; })
]

View File

@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq common-updater-scripts
#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq common-updater-scripts nix-prefetch prefetch-npm-deps
set -euo pipefail
cd "$(dirname "${BASH_SOURCE[0]}")"

View File

@ -9,11 +9,11 @@ buildNpmPackage {
repo = "ASF-ui";
# updated by the update script
# this is always the commit that should be used with asf-ui from the latest asf version
rev = "3078d92e8b8d79571b771f452a53d1789330c541";
hash = "sha256-K3YTgsde9aqtmKuFKjXpoWe6USGpKBlC6eeazuOYTqk=";
rev = "0dc9b31a571fe840ac1661b9e9777f253304529d";
hash = "sha256-gY+4H6roqqoRFTwyNboXKg8LM7BfxQYYij/eilohFNY=";
};
npmDepsHash = "sha256-L+aWsGMUmIsPJRQ4XPg8WOWOqHKcfDQTqUK+vGBHi0Y=";
npmDepsHash = "sha256-3sRjlFuFyG8j8CPKG8Gj5QhE4YD9DJ5qaTJlNJT2Oao=";
installPhase = ''
runHook preInstall

View File

@ -1,11 +1,11 @@
{
"packageVersion": "114.0.1-2",
"packageVersion": "114.0.2-1",
"source": {
"rev": "114.0.1-2",
"sha256": "1di8kfzc27wz89cfq8xgs17lyayikpmqwn5npdzllzppp0dx0894"
"rev": "114.0.2-1",
"sha256": "0snwwr15kd69p6xjbwcika8w04q0qgx6qmv5gy01y9gjc0hcv10q"
},
"firefox": {
"version": "114.0.1",
"sha512": "d422982e0271a68aa8064977b3a6b6f9412a30e7261ba06385c416e00e8ba0eb488d81a8929355fc92d35469d3308ec928f00e4de7248ed6390d5d900d7bce8f"
"version": "114.0.2",
"sha512": "1d514d09c6b964b96c6d52d54b89a89a92d53a6fe669e16a6370346c980db4d0ac6c502fa89219c71b680566b9eb982e9b3191c21f81d7326f34f6c837c0a872"
}
}

View File

@ -11,6 +11,12 @@ buildGoModule rec {
sha256 = "sha256-Qtpg8DvIFkba+Do8IwemBF0rt85wS4Tq7yOLsdpQFCs=";
};
ldflags = [
"-s" "-w"
"-X github.com/Necoro/feed2imap-go/pkg/version.version=${version}"
"-X github.com/Necoro/feed2imap-go/pkg/version.commit=nixpkgs"
];
vendorHash = "sha256-WFbfSzU1N2RAOMfCM7wqiAQ6R1HRaT0EfX4KYhstHJU=";
# The print-cache tool is not an end-user tool (https://github.com/Necoro/feed2imap-go/issues/94)

View File

@ -1,20 +1,36 @@
{ stdenv, lib, fetchurl, autoPatchelfHook, udev }:
{ stdenv, lib, fetchurl, autoPatchelfHook, udev, libusb }:
let
arch = if stdenv.isx86_64 then "x86_64"
arch =
if stdenv.isx86_64 then "x86_64"
else if stdenv.isi686 then "i686"
else if stdenv.isAarch64 then "aarch64"
else throw "unsupported architecture";
in stdenv.mkDerivation rec {
pname = "sdrplay";
version = "3.07.1";
src = fetchurl {
srcs = rec {
aarch64 = {
url = "https://www.sdrplay.com/software/SDRplay_RSP_API-ARM64-${version}.run";
hash = "sha256-GJPFW6W8Ke4mnczcSLFYfioOMGCfFn2/EIA07VnmVGY=";
};
x86_64 = {
url = "https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-${version}.run";
sha256 = "1a25c7rsdkcjxr7ffvx2lwj7fxdbslg9qhr8ghaq1r53rcrqgzmf";
};
i686 = x86_64;
};
in
stdenv.mkDerivation rec {
pname = "sdrplay";
inherit version;
src = fetchurl srcs."${arch}";
nativeBuildInputs = [ autoPatchelfHook ];
buildInputs = [ udev stdenv.cc.cc.lib ];
buildInputs = [ libusb udev stdenv.cc.cc.lib ];
unpackPhase = ''
sh "$src" --noexec --target source
@ -46,7 +62,7 @@ in stdenv.mkDerivation rec {
homepage = "https://www.sdrplay.com/downloads/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
maintainers = [ maintainers.pmenke ];
maintainers = with maintainers; [ pmenke zaninime ];
platforms = platforms.linux;
};
}

View File

@ -3,16 +3,16 @@
rustPlatform.buildRustPackage rec {
pname = "elan";
version = "1.4.5";
version = "1.4.6";
src = fetchFromGitHub {
owner = "leanprover";
repo = "elan";
rev = "v${version}";
sha256 = "sha256-KCRKVVNC2tJZWgqdQ8NPUzJHPexhF58cuO8Iyx81UJo=";
sha256 = "sha256-+GCmPT7dtd+XvmJv19XllZ6G4rB0+CYUt+lorr44aEQ=";
};
cargoHash = "sha256-nFaDWDmDskZ0TKFG5KZk/vLn6ZzU3+mPD6y1wFxhLXg=";
cargoHash = "sha256-iWZutcYyBVujwjMHFUwwE/xDk6o5tPng1ZQ2mHgTbVk=";
nativeBuildInputs = [ pkg-config makeWrapper ];

View File

@ -1,11 +0,0 @@
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -406,7 +406,7 @@ dependencies = [
[[package]]
name = "eww"
-version = "0.3.0"
+version = "0.4.0"
dependencies = [
"anyhow",
"bincode",

View File

@ -11,25 +11,25 @@
rustPlatform.buildRustPackage rec {
pname = "eww";
version = "0.4.0";
version = "unstable-2023-06-10";
src = fetchFromGitHub {
owner = "elkowar";
repo = pname;
rev = "v${version}";
sha256 = "sha256-wzgWx3QxZvCAzRKLFmo/ru8hsIQsEDNeb4cPdlEyLxE=";
repo = "eww";
rev = "25e50eda46379bccd8a7887c18ee35833e0460e8";
hash = "sha256-8e6gHSg6FDp6nU5v89D44Tqb1lR5aQpS0lXOVqzoUS4=";
};
cargoSha256 = "sha256-9RfYDF31wFYylhZv53PJpZofyCdMiUiH/nhRB2Ni/Is=";
cargoPatches = [ ./Cargo.lock.patch ];
cargoHash = "sha256-dC7yVJdR7mO0n+sxWwigM1Q4tbDv5ZuOINHHlUIPdA0=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gtk3 gdk-pixbuf ] ++ lib.optional withWayland gtk-layer-shell;
buildNoDefaultFeatures = withWayland;
buildFeatures = lib.optional withWayland "wayland";
buildNoDefaultFeatures = true;
buildFeatures = [
(if withWayland then "wayland" else "x11")
];
cargoBuildFlags = [ "--bin" "eww" ];

View File

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "numix-icon-theme-square";
version = "23.06.11";
version = "23.06.21";
src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
sha256 = "sha256-pm3sEx3OJkS4sz+sg09HeTSdQZTdjyxJCsjYWCA4mN0=";
sha256 = "sha256-eJELv8lRgV687vu0PQfvZoSTaPtVyTniRINRxIIVjJg=";
};
nativeBuildInputs = [ gtk3 ];

View File

@ -32,11 +32,13 @@ stdenvNoCC.mkDerivation rec {
installPhase = ''
runHook preInstall
mkdir -p $out/share/themes
mv gtk3/rose-pine-gtk $out/share/themes/rose-pine
mv gtk3/rose-pine-moon-gtk $out/share/themes/rose-pine-moon
mv gtk3/rose-pine-dawn-gtk $out/share/themes/rose-pine-dawn
mv gnome_shell/moon/gnome-shell $out/share/themes/rose-pine-moon
mkdir -p $out/share/themes/rose-pine{,-dawn,-moon}/gtk-4.0
variants=("rose-pine" "rose-pine-dawn" "rose-pine-moon")
for n in "''${variants[@]}"; do
cp -r $src/gtk3/"''${n}"-gtk/* $out/share/themes/"''${n}"
cp -r $src/gtk4/"''${n}".css $out/share/themes/"''${n}"/gtk-4.0/gtk.css
done
runHook postInstall
'';

View File

@ -23,13 +23,13 @@
stdenv.mkDerivation rec {
pname = "gvm-libs";
version = "22.6.2";
version = "22.6.3";
src = fetchFromGitHub {
owner = "greenbone";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-b7a9LD291LT28TujOQ3DE76+wtmBYeAGrXZXTM0quWw=";
hash = "sha256-YxM4vss528sR6uPNoUIBVvJtRF/zIepz31YMRyQu9wU=";
};
nativeBuildInputs = [

View File

@ -1,20 +1,25 @@
{lib, stdenv, fetchFromGitHub, cmake}:
{ lib
, stdenv
, fetchFromGitHub
, cmake
, buildExamples ? false
}:
stdenv.mkDerivation rec {
version = "1.4.3";
stdenv.mkDerivation (finalAttrs: {
version = "1.5.0";
pname = "nanoflann";
src = fetchFromGitHub {
owner = "jlblancoc";
repo = "nanoflann";
rev = "v${version}";
sha256 = "sha256-NcewcNQcI1CjMNibRF9HCoE2Ibs0/Hy4eOkJ20W3wLo=";
rev = "v${finalAttrs.version}";
hash = "sha256-vPLL6l4sFRi7nvIfdMbBn/gvQ1+1lQHlZbR/2ok0Iw8=";
};
nativeBuildInputs = [ cmake ];
cmakeFlags = [
"-DBUILD_EXAMPLES=OFF"
"-DBUILD_EXAMPLES=${if buildExamples then "ON" else "OFF"}"
];
doCheck = true;
@ -22,8 +27,22 @@ stdenv.mkDerivation rec {
meta = {
homepage = "https://github.com/jlblancoc/nanoflann";
license = lib.licenses.bsd2;
description = "Header only C++ library for approximate nearest neighbor search";
longDescription = ''
nanoflann is a C++11 header-only library for building KD-Trees of datasets
with different topologies: R2, R3 (point clouds), SO(2) and SO(3) (2D and
3D rotation groups). No support for approximate NN is provided. nanoflann
does not require compiling or installing. You just need to #include
<nanoflann.hpp> in your code.
This library is a fork of the flann library by Marius Muja and David
G. Lowe, and born as a child project of MRPT. Following the original
license terms, nanoflann is distributed under the BSD license. Please, for
bugs use the issues button or fork and open a pull request.
'';
changelog = "https://github.com/jlblancoc/nanoflann/blob/v${finalAttrs.version}/CHANGELOG.md";
license = lib.licenses.bsd2;
maintainers = [ lib.maintainers.AndersonTorres ];
platforms = lib.platforms.unix;
};
}
})

View File

@ -0,0 +1,42 @@
{ lib
, stdenv
, fetchFromGitHub
}:
let
libExt = stdenv.hostPlatform.extensions.sharedLibrary;
in
stdenv.mkDerivation rec {
pname = "whereami";
version = "unstable-2022-02-18";
src = fetchFromGitHub {
owner = "gpakosz";
repo = pname;
rev = "ba364cd54fd431c76c045393b6522b4bff547f50";
sha256 = "XhRqW0wdXzlmyBf1cjqtQvztuyV4buxVl19Q0uyEOhk=";
};
makeFlags = [
"-C_gnu-make"
"build-library"
"binsubdir=platform"
];
installPhase = ''
runHook preInstall
mkdir -p $out/lib $out/include
cp bin/platform/library${libExt} $out/lib/libwhereami${libExt}
cp src/whereami.h $out/include/whereami.h
runHook postInstall
'';
meta = with lib; {
description = "Locate the current executable and running module/library";
homepage = "https://github.com/gpakosz/whereami";
license = with licenses; [ mit wtfpl ];
maintainers = with maintainers; [ emilytrau ];
platforms = platforms.all;
};
}

View File

@ -1,20 +1,36 @@
{ lib, buildPythonPackage, fetchPypi, numpy, future }:
{ lib
, buildPythonPackage
, fetchPypi
, numpy
, future
, pythonOlder
}:
buildPythonPackage rec {
pname = "autograd";
version = "1.5";
version = "1.6.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-2AvSJRVNHbE8tOrM96GMNYvnIJJkG2hxf5b88dFqzQs=";
hash = "sha256-hzHgigxOOJ2GlaQAcq2kUSZBwRO2ys6PTPvo636a7es=";
};
propagatedBuildInputs = [ numpy future ];
propagatedBuildInputs = [
numpy
future
];
# Currently, the PyPI tarball doesn't contain the tests. When that has been
# fixed, enable testing. See: https://github.com/HIPS/autograd/issues/404
doCheck = false;
pythonImportsCheck = [
"autograd"
];
meta = with lib; {
homepage = "https://github.com/HIPS/autograd";
description = "Compute derivatives of NumPy code efficiently";

View File

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "knx-frontend";
version = "2023.6.9.195839";
version = "2023.6.23.191712";
format = "pyproject";
# TODO: source build, uses yarn.lock
src = fetchPypi {
pname = "knx_frontend";
inherit version;
hash = "sha256-lShWlrnELpDamXT2OQvQTKOCOODv+iSxJ9pA5tIgxdM=";
hash = "sha256-MeurZ6731qjeBK6HTwXYLVs6+nXF9Hf1p8/NNwxmae4=";
};
nativeBuildInputs = [

View File

@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "meraki";
version = "1.33.0";
version = "1.34.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-uzrnKYCythDa+DK1X87zcL9O4cmjRDqxR2hXoN286KQ=";
hash = "sha256-rAFoIKHrhHRqcXmvbzlFKFIaHxVLp6CJUhNASwHhpPk=";
};
propagatedBuildInputs = [

View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "zeroconf";
version = "0.64.0";
version = "0.68.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "jstasiak";
repo = "python-zeroconf";
rev = "refs/tags/${version}";
hash = "sha256-u9MZoJyTmbUBeFbsw2EtwfNDzXKAZOwNc+4TanbQg3A=";
hash = "sha256-xhWl0OUzTz+msZ5UgLrb/wqQTKuuFnpgpk7SPGyyI7Q=";
};
nativeBuildInputs = [

View File

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "lightningcss";
version = "1.21.0";
version = "1.21.1";
src = fetchFromGitHub {
owner = "parcel-bundler";
repo = "lightningcss";
rev = "refs/tags/v${version}";
sha256 = "ECBW0fXX7RrsnBrClwbFIa1i9GfqaYJXIP0zm68Ds84=";
sha256 = "knYiK3+4mZNExVLFOj+cLbR8gdsm8CAHQY6xpdsqiew=";
};
cargoHash = "sha256-Y7aLtsnInNnh5p5keBHrfFlIi7F1tRasDmX4BFLLicU=";
cargoHash = "sha256-aUtx5wqH6E1AkXoXiiu9ODMziX6k/HG0H0wQSQttOig=";
buildFeatures = [
"cli"

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "qc";
version = "0.4.0";
version = "0.5.0";
src = fetchFromGitHub {
owner = "qownnotes";
repo = "qc";
rev = "v${version}";
hash = "sha256-6dH7pmsd7kUgwHplvCfNqoq/ucDY/UZnyVxC3VvV+fQ=";
hash = "sha256-lNS2wrjG70gi6mpIYMvuusuAJL3LkAVh8za+KnBTioc=";
};
vendorHash = "sha256-7t5rQliLm6pMUHhtev/kNrQ7AOvmA/rR93SwNQhov6o=";
@ -26,8 +26,11 @@ buildGoModule rec {
];
postInstall = ''
export HOME=$(mktemp -d)
installShellCompletion --cmd qc \
--zsh ./misc/completions/zsh/_qc
--bash <($out/bin/qc completion bash) \
--fish <($out/bin/qc completion fish) \
--zsh <($out/bin/qc completion zsh)
'';
meta = with lib; {

View File

@ -9,16 +9,16 @@
buildGoModule rec {
pname = "supabase-cli";
version = "1.64.8";
version = "1.73.0";
src = fetchFromGitHub {
owner = "supabase";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-ueOOEiJ6NWwBaSarXWiAZLnNZg/1RM9Tej602selbC8=";
sha256 = "sha256-Gl5jIMh0zH7BWFKny4cT3QpwM0/W9Bd9ycRYbNPxXAQ=";
};
vendorSha256 = "sha256-dNK8ZqV6Cr88BsGWQEU8uAzi+eOQh0IhKpKmjUbrViA=";
vendorSha256 = "sha256-6wJxAD3s5UcAqPJy6CzHe1aP097+aXHjBNG4BJ0zhmQ=";
ldflags = [
"-s"

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "vendir";
version = "0.33.2";
version = "0.34.3";
src = fetchFromGitHub {
owner = "vmware-tanzu";
repo = "carvel-vendir";
rev = "v${version}";
sha256 = "sha256-jXPyOnGCyXe06pazppo6czJ4CpaeEscRbanchDnz2tw=";
sha256 = "sha256-oeKzbe272Mg0pp+MW6/oBw64/OAzTSmo1qSNAoRqmOE=";
};
vendorHash = null;

View File

@ -1,6 +1,5 @@
{ lib
, stdenv
, fetchpatch
, fetchurl
, fetchFromGitHub
, makeWrapper
@ -17,10 +16,10 @@
}:
let
version = "2.0";
version = "2.1";
prebuilt_server = fetchurl {
url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}";
sha256 = "sha256-niQWFfV4zWkLtDMRAA3r3s9qnFCnCCsAGVLxj28h3cI=";
sha256 = "sha256-W4vxlAJkuTDHGhxhTFfaIkf1Ky1CQLyoZcxtNm3/Zog=";
};
in
stdenv.mkDerivation rec {
@ -31,24 +30,14 @@ stdenv.mkDerivation rec {
owner = "Genymobile";
repo = pname;
rev = "v${version}";
sha256 = "sha256-PWH+XLKraFfjXovnZpREXBaQVyOyP8yIMYDMiF6ddXg=";
sha256 = "sha256-M5zOKwqQ0y70gsI+c0Or7hUzz4fH/8DqcOeKq4Vryc4=";
};
# Remove in the next patch release
patches = [
(fetchpatch {
name = "fix-macos-build-error.patch";
url = "https://github.com/Genymobile/scrcpy/commit/6b769675fa68e60c9765022e43c4d7b1e329353a.patch";
hash = "sha256-lQx01HI0nTWdZFusLIswZT2iOgkP84btqF6F58tGNko=";
})
];
# postPatch:
# screen.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly.
# display.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly.
# This can happen when running on non-NixOS because then scrcpy seems to have a hard time using the host OpenGL-supporting hardware.
# It would be better to fix the OpenGL problem, but that seems much more intrusive.
postPatch = ''
substituteInPlace app/src/screen.c \
substituteInPlace app/src/display.c \
--replace "SDL_RENDERER_ACCELERATED" "SDL_RENDERER_ACCELERATED || SDL_RENDERER_SOFTWARE"
'';

View File

@ -82,7 +82,7 @@
, enabledProviders ? []
}:
let
version = "2.6.0";
version = "2.6.2";
airflow-src = fetchFromGitHub rec {
owner = "apache";
@ -91,7 +91,7 @@ let
# Download using the git protocol rather than using tarballs, because the
# GitHub archive tarballs don't appear to include tests
forceFetchGit = true;
hash = "sha256-CsLOj68+tSOI7drZq6QH+C2EB/9trg5cFAYAQp/06m8=";
hash = "sha256-ejZw71lMhfnqy4Ziha8/ufmX+SkOfopkeCskf02ZQgA=";
};
# airflow bundles a web interface, which is built using webpack by an undocumented shell script in airflow's source tree.

View File

@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "bind";
version = "9.18.14";
version = "9.18.16";
src = fetchurl {
url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-muEu32rDxDCzPs0afAwMYIddJVGF64eFD6ml55SmSgk=";
sha256 = "sha256-yII0/gfudcPIqeWRUv7mS3FGQ96OIs+Y2j200LV+B3U=";
};
outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];

View File

@ -1,42 +1,71 @@
{ lib, fetchurl, perlPackages, makeWrapper, gnupg, re2c, gcc, gnumake }:
{ lib, fetchurl, perlPackages, makeBinaryWrapper, gnupg, re2c, gcc, gnumake, libxcrypt, openssl, coreutils, poppler_utils, tesseract, iana-etc }:
perlPackages.buildPerlPackage rec {
pname = "SpamAssassin";
version = "3.4.6";
version = "4.0.0";
src = fetchurl {
url = "mirror://apache/spamassassin/source/Mail-${pname}-${version}.tar.bz2";
sha256 = "044ng2aazqy8g0m17q0a4939ck1ca4x230q2q7q7jndvwkrpaj5w";
hash = "sha256-5aoXBQowvHK6qGr9xgSMrepNHsLsxh14dxegWbgxnog=";
};
# ExtUtil::MakeMaker is bundled with Perl, but the bundled version
# causes build errors for aarch64-darwin, so we override it with the
# latest version. We can drop the dependency to go back to the
# bundled version when the version that comes with Perl is ≥7.57_02.
#
# Check the version bundled with Perl like this:
# perl -e 'use ExtUtils::MakeMaker qw($VERSION); print "$VERSION\n"'
nativeBuildInputs = [ makeWrapper perlPackages.ExtUtilsMakeMaker ];
patches = [
./satest-no-clean-path.patch
./sa_compile-use-perl5lib.patch
];
nativeBuildInputs = [ makeBinaryWrapper ];
buildInputs = (with perlPackages; [
HTMLParser NetCIDRLite NetDNS NetAddrIP DBFile HTTPDate MailDKIM LWP
LWPProtocolHttps IOSocketSSL DBI EncodeDetect IPCountry NetIdent
Razor2ClientAgent MailSPF NetDNSResolverProgrammable Socket6
]);
ArchiveZip EmailAddressXS NetLibIDN2 MaxMindDBReader GeoIP MailDMARC
MaxMindDBReaderXS
]) ++ [
openssl
];
# Enabling 'taint' mode is desirable, but that flag disables support
# for the PERL5LIB environment variable. Needs further investigation.
makeFlags = [ "PERL_BIN=${perlPackages.perl}/bin/perl" "PERL_TAINT=no" ];
makeFlags = [ "PERL_BIN=${perlPackages.perl}/bin/perl" "ENABLE_SSL=yes" ];
makeMakerFlags = [ "SYSCONFDIR=/etc LOCALSTATEDIR=/var/lib/spamassassin" ];
doCheck = false;
checkInputs = (with perlPackages; [
TextDiff # t/strip2.t
]) ++ [
coreutils # date, t/basic_meta.t
poppler_utils # pdftotext, t/extracttext.t
tesseract # tesseract, t/extracttext.t
iana-etc # t/dnsbl_subtests.t (/etc/protocols used by Net::DNS::Nameserver)
re2c gcc gnumake
];
preCheck = ''
substituteInPlace t/spamc_x_e.t \
--replace "/bin/echo" "${coreutils}/bin/echo"
export C_INCLUDE_PATH='${lib.makeSearchPathOutput "include" "include" [ libxcrypt ]}'
export HARNESS_OPTIONS="j''${NIX_BUILD_CORES}"
export HOME=$NIX_BUILD_TOP/home
mkdir -p $HOME
mkdir t/log # pre-create to avoid race conditions
'';
postInstall = ''
mkdir -p $out/share/spamassassin
mv "rules/"* $out/share/spamassassin/
for n in "$out/bin/"*; do
wrapProgram "$n" --prefix PERL5LIB : "$PERL5LIB" --prefix PATH : ${lib.makeBinPath [ gnupg re2c gcc gnumake ]}
# Skip if this isn't a perl script
if ! head -n1 "$n" | grep -q bin/perl; then
continue
fi
echo "Wrapping $n for taint mode"
orig="$out/bin/.$(basename "$n")-wrapped"
mv "$n" "$orig"
# We don't inherit argv0 so that $^X works properly in e.g. sa-compile
makeWrapper "${perlPackages.perl}/bin/perl" "$n" \
--add-flags "-T $perlFlags $orig" \
--prefix PATH : ${lib.makeBinPath [ gnupg re2c gcc gnumake ]} \
--prefix C_INCLUDE_PATH : ${lib.makeSearchPathOutput "include" "include" [ libxcrypt ]}
done
'';

View File

@ -0,0 +1,23 @@
diff -ru orig/t/sa_compile.t new/t/sa_compile.t
--- orig/t/sa_compile.t 2022-12-14 06:03:26.000000000 +0000
+++ new/t/sa_compile.t 2023-06-25 12:30:39.735577152 +0000
@@ -40,7 +40,7 @@
# we now have an "installed" version we can run sa-compile with. Ensure
# sarun() will use it appropriately
-$scr = "$instdir/$temp_binpath/spamassassin";
+$scr = "$perl_cmd -T $instdir/$temp_binpath/spamassassin";
$scr_localrules_args = $scr_cf_args = ""; # use the default rules dir, from our "install"
&set_rules('
@@ -86,8 +86,8 @@
# -------------------------------------------------------------------
rmtree( glob "~/.spamassassin/sa-compile.cache". { safe => 1 }); # reset test
-system_or_die "TMP=$instdir TMPDIR=$instdir $instdir/$temp_binpath/sa-compile --quiet -p $cwd/$workdir/user.cf --keep-tmps -D 2>$instdir/sa-compile.debug"; # --debug
-$scr = "$instdir/$temp_binpath/spamassassin";
+system_or_die "TMP=$instdir TMPDIR=$instdir $perl_cmd -T $instdir/$temp_binpath/sa-compile --quiet -p $cwd/$workdir/user.cf --keep-tmps -D 2>$instdir/sa-compile.debug"; # --debug
+$scr = "$perl_cmd -T $instdir/$temp_binpath/spamassassin";
$scr_localrules_args = $scr_cf_args = ""; # use the default rules dir, from our "install"
%patterns = (

View File

@ -0,0 +1,18 @@
diff -ru orig/t/SATest.pm new/t/SATest.pm
--- orig/t/SATest.pm 2023-06-25 11:26:27.663204415 +0000
+++ new/t/SATest.pm 2023-06-25 11:34:08.902174669 +0000
@@ -65,9 +65,12 @@
# Clean PATH so taint doesn't complain
if (!$RUNNING_ON_WINDOWS) {
- $ENV{'PATH'} = '/bin:/usr/bin:/usr/local/bin';
+ # untaint PATH
+ $ENV{'PATH'} =~ /^(.+)$/;
+ $ENV{'PATH'} = $1;
+ # $ENV{'PATH'} = '/bin:/usr/bin:/usr/local/bin';
# Remove tainted envs, at least ENV used in FreeBSD
- delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
+ # delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
} else {
# Windows might need non-system directories in PATH to run a Perl installation
# The best we can do is clean out obviously bad stuff such as relative paths or \..\

View File

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "nats-server";
version = "2.9.18";
version = "2.9.19";
src = fetchFromGitHub {
owner = "nats-io";
repo = pname;
rev = "v${version}";
hash = "sha256-Eda6i4kJbvX1Wzkwd9YSd3fes3kdkekKKhIt7xH8Yi8=";
hash = "sha256-CiDvDnnUR/jaEWU+bceH6uIr9QBtsAz+6vnQjT3sNQQ=";
};
vendorHash = "sha256-m/15F0BHCAEcNlRf71jJP5bjrrqRgX/CQm8SddpTkYw=";

View File

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "spicedb";
version = "1.22.0";
version = "1.22.2";
src = fetchFromGitHub {
owner = "authzed";
repo = "spicedb";
rev = "v${version}";
hash = "sha256-Q8NqWV9s4DrN3lEGkAYYm59HCIo6dIpQQHbzepKao+o=";
hash = "sha256-KfS0GH6gebpQDdbO49mu148GUnv6B08OHOTbkR3h7xE=";
};
vendorHash = "sha256-61TnfP62a5bUtBLxDe1FpF28hcPGzyuO5D/JNTqAfx8=";
vendorHash = "sha256-7um5V8AcHXn6UgOluUokuTRJED57tAC4ushVCR37ORA=";
subPackages = [ "cmd/spicedb" ];

View File

@ -16,14 +16,14 @@ let
in
python.pkgs.buildPythonApplication rec {
pname = "esphome";
version = "2023.6.1";
version = "2023.6.2";
format = "setuptools";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-26oVqSNXuCyovybe0vi10rD89eSQHFYn+WHpGLMn2QA=";
hash = "sha256-ne9Su7Tp0p1fWQ6ivvWPkdEskTZpqIjQvh26D3Ta4Sc=";
};
postPatch = ''

View File

@ -5,21 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "spacer";
version = "0.1.7";
version = "0.1.8";
src = fetchFromGitHub {
owner = "samwho";
repo = "spacer";
rev = "v${version}";
hash = "sha256-eFXxcOhUqyo3eUws3RCO0w+0XGlxZAonKFTphnrhHs8=";
hash = "sha256-F2PrBlS9uL6BQtjNNabCpl3ofavsUGlBy/Hotm42Oec=";
};
cargoHash = "sha256-z7igJc8HHqpiY2an4hFWoZElwgF5NUA+TFPqxuowC/w=";
# Cargo.lock is outdated
preConfigure = ''
cargo metadata --offline
'';
cargoHash = "sha256-aeXvqgSKRvm9W6sc5XCkwhMYUncj8pEPyQpYQr+fj7Y=";
meta = with lib; {
description = "CLI tool to insert spacers when command output stops";

View File

@ -0,0 +1,31 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "tgpt";
version = "1.6.11";
src = fetchFromGitHub {
owner = "aandrew-me";
repo = "tgpt";
rev = "refs/tags/v${version}";
hash = "sha256-WcHPryzdFFS8eXaLPtwRd3xZwZ/x+MfwsA8wO2tRSYI=";
};
vendorHash = "sha256-2I5JJWxM6aZx0eZu7taUTL11Y/5HIrXYC5aezrTbbsM=";
ldflags = [
"-s"
"-w"
];
meta = with lib; {
description = "ChatGPT in terminal without needing API keys";
homepage = "https://github.com/aandrew-me/tgpt";
changelog = "https://github.com/aandrew-me/tgpt/releases/tag/v${version}";
license = licenses.gpl3Only;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
buildGoModule rec {
pname = "pritunl-client";
@ -14,8 +14,16 @@ buildGoModule rec {
modRoot = "cli";
vendorHash = "sha256-miwGLWpoaavg/xcw/0pNBYCdovBnvjP5kdaaGPcRuWk=";
nativeBuildInputs = [
installShellFiles
];
postInstall = ''
mv $out/bin/cli $out/bin/pritunl-client
installShellCompletion --cmd pritunl-client \
--bash <($out/bin/pritunl-client completion bash) \
--fish <($out/bin/pritunl-client completion fish) \
--zsh <($out/bin/pritunl-client completion zsh)
'';
meta = with lib; {

View File

@ -0,0 +1,13 @@
diff --git a/client/src/proxmark3.c b/client/src/proxmark3.c
index 6c77bfad3..0d41a2d6b 100644
--- a/client/src/proxmark3.c
+++ b/client/src/proxmark3.c
@@ -1098,7 +1098,7 @@ int main(int argc, char *argv[]) {
#ifdef HAVE_GUI
-# if defined(_WIN32)
+# if defined(_WIN32) || (defined(__MACH__) && defined(__APPLE__))
InitGraphics(argc, argv, script_cmds_file, script_cmd, stayInCommandLoop);
MainGraphics();
# else

View File

@ -1,11 +1,28 @@
{ lib, mkDerivation, fetchFromGitHub, pkg-config, gcc-arm-embedded, bluez5
{ lib
, stdenv
, fetchFromGitHub
, pkg-config
, gcc-arm-embedded
, readline
, hardwarePlatform ? "PM3RDV4"
, hardwarePlatformExtras ? "" }:
mkDerivation rec {
, bzip2
, openssl
, jansson
, whereami
, lua
, Foundation
, AppKit
, withGui ? true, wrapQtAppsHook, qtbase
, withPython ? true, python3
, withBlueshark ? false, bluez5
, withGeneric ? false
, withSmall ? false
, withoutFunctions ? []
, hardwarePlatform ? if withGeneric then "PM3GENERIC" else "PM3RDV4"
, hardwarePlatformExtras ? lib.optionalString withBlueshark "BTADDON"
, standalone ? "LF_SAMYRUN"
}:
assert withBlueshark -> stdenv.hostPlatform.isLinux;
stdenv.mkDerivation rec {
pname = "proxmark3-rrg";
version = "4.16191";
@ -16,23 +33,54 @@ mkDerivation rec {
sha256 = "sha256-l0aDp0s9ekUUHqkzGfVoSIf/4/GN2uiVGL/+QtKRCOs=";
};
nativeBuildInputs = [ pkg-config gcc-arm-embedded ];
buildInputs = [ bluez5 readline ];
makeFlags = [
"PLATFORM=${hardwarePlatform}"
"PLATFORM_EXTRAS=${hardwarePlatformExtras}"
patches = [
# Don't check for DISPLAY env variable on Darwin. pm3 uses this to test if
# XQuartz is installed, however it is not actually required for GUI features
./darwin-always-gui.patch
];
installPhase = ''
install -Dt $out/bin client/proxmark3
install -Dt $out/firmware bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf
postPatch = ''
# Remove hardcoded paths on Darwin
substituteInPlace Makefile.defs \
--replace "/usr/bin/ar" "ar" \
--replace "/usr/bin/ranlib" "ranlib"
# Replace hardcoded path to libwhereami
substituteInPlace client/Makefile \
--replace "/usr/include/whereami.h" "${whereami}/include/whereami.h"
'';
nativeBuildInputs = [
pkg-config
gcc-arm-embedded
] ++ lib.optional withGui wrapQtAppsHook;
buildInputs = [
readline
bzip2
openssl
jansson
whereami
lua
] ++ lib.optional withGui qtbase
++ lib.optional withPython python3
++ lib.optional withBlueshark bluez5
++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation AppKit ];
makeFlags = [
"PREFIX=${placeholder "out"}"
"UDEV_PREFIX=${placeholder "out"}/etc/udev/rules.d"
"PLATFORM=${hardwarePlatform}"
"PLATFORM_EXTRAS=${hardwarePlatformExtras}"
"STANDALONE=${standalone}"
"USE_BREW=0"
] ++ lib.optional withSmall "PLATFORM_SIZE=256"
++ map (x: "SKIP_${x}=1") withoutFunctions;
enableParallelBuilding = true;
meta = with lib; {
description = "Client for proxmark3, powerful general purpose RFID tool";
homepage = "https://rfidresearchgroup.com/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ nyanotech ];
maintainers = with maintainers; [ nyanotech emilytrau ];
platforms = platforms.unix;
};
}

View File

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "bottom";
version = "0.9.2";
version = "0.9.3";
src = fetchFromGitHub {
owner = "ClementTsang";
repo = pname;
rev = version;
hash = "sha256-QHr4FvoXIqsAE7wE/eFKH18ivagVpZkQbGO7qR0dev8=";
hash = "sha256-hKgk2wIfFvYOKYo90rzGlntvRRWId4UUgSevY1KLhik=";
};
cargoHash = "sha256-KsM28vcu/C8orB+TSDGu4nGSpxX1mnEP2Yg7Fu4uh5Q=";
cargoHash = "sha256-2iMjxjObh3V+HM79y8hQF+i7eQ+sjNl3kDopCbCsSZg=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -11646,7 +11646,9 @@ with pkgs;
inherit (callPackages ../tools/security/proxmark3 { gcc-arm-embedded = gcc-arm-embedded-8; })
proxmark3 proxmark3-unstable;
proxmark3-rrg = libsForQt5.callPackage ../tools/security/proxmark3/proxmark3-rrg.nix { };
proxmark3-rrg = libsForQt5.callPackage ../tools/security/proxmark3/proxmark3-rrg.nix {
inherit (darwin.apple_sdk.frameworks) Foundation AppKit;
};
proxychains = callPackage ../tools/networking/proxychains { };
@ -24860,6 +24862,8 @@ with pkgs;
# bump when majoring of packages have updated
webrtc-audio-processing = webrtc-audio-processing_0_3;
whereami = callPackage ../development/libraries/whereami { };
wildmidi = callPackage ../development/libraries/wildmidi { };
wiredtiger = callPackage ../development/libraries/wiredtiger { };
@ -27303,6 +27307,8 @@ with pkgs;
smemstat = callPackage ../os-specific/linux/smemstat { };
tgpt = callPackage ../tools/misc/tgpt { };
tgt = callPackage ../tools/networking/tgt { };
lkl = callPackage ../applications/virtualization/lkl { };
@ -33111,6 +33117,8 @@ with pkgs;
else
libsForQt5.callPackage ../applications/audio/musescore { };
music-player = callPackage ../applications/audio/music-player { };
mmh = callPackage ../applications/networking/mailreaders/mmh { };
mutt = callPackage ../applications/networking/mailreaders/mutt { };

View File

@ -14256,6 +14256,28 @@ with self; {
};
};
MailDMARC = buildPerlPackage {
pname = "Mail-DMARC";
version = "1.20230215";
src = fetchurl {
url = "mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DMARC-1.20230215.tar.gz";
hash = "sha256-V9z1R1nLkkSOVukUE0D2E0QnTFjZ3WWqkKqczw5+uQM=";
};
buildInputs = [ ExtUtilsMakeMaker FileShareDirInstall ];
doCheck = false; # uses actual DNS at runtime
checkInputs = [ XMLSAX XMLValidatorSchema TestException TestFileShareDir TestMore TestOutput ];
propagatedBuildInputs = [
ConfigTiny DBDSQLite DBIxSimple EmailMIME EmailSender Encode FileShareDir GetoptLong
IOCompress IO IOSocketSSL NetDNS NetIDNEncode NetIP NetSSLeay RegexpCommon Socket6
SysSyslog URI XMLLibXML
];
meta = {
description = "Perl implementation of DMARC";
homepage = "https://github.com/msimerson/mail-dmarc";
license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
MailMaildir = buildPerlPackage {
version = "1.0.0";
pname = "Mail-Maildir";
@ -18001,6 +18023,21 @@ with self; {
};
};
NetLibIDN2 = buildPerlModule {
pname = "Net-LibIDN2";
version = "1.02";
src = fetchurl {
url = "mirror://cpan/authors/id/T/TH/THOR/Net-LibIDN2-1.02.tar.gz";
hash = "sha256-0fMK/GrPplQbAMCafkx059jkuknjJ3wLvEGuNcE5DQc=";
};
propagatedBuildInputs = [ pkgs.libidn2 ];
meta = {
description = "Perl bindings for GNU Libidn2";
homepage = "https://github.com/gnuthor/Net--LibIDN2";
license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
NetNetmask = buildPerlPackage {
pname = "Net-Netmask";
version = "2.0001";