Merge master into staging-next
This commit is contained in:
commit
0fe33caad3
|
@ -88,11 +88,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "brave";
|
||||
version = "1.18.75";
|
||||
version = "1.18.77";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
sha256 = "1njgdw7ml30xs517brc7z7piy6lcylrfjhz6wn1dp7gywsxfgx1h";
|
||||
sha256 = "AV3bqtWaoy6AVnt8K/Qo+7hguAIsPJPZhgLSeOvJ7JY=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
@ -147,6 +147,8 @@ stdenv.mkDerivation rec {
|
|||
ln -sf ${xdg_utils}/bin/xdg-mime $out/opt/brave.com/brave/xdg-mime
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://brave.com/";
|
||||
description = "Privacy-oriented browser for Desktop and Laptop computers";
|
||||
|
|
5
pkgs/applications/networking/browsers/brave/update.sh
Executable file
5
pkgs/applications/networking/browsers/brave/update.sh
Executable file
|
@ -0,0 +1,5 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl gnused common-updater-scripts
|
||||
|
||||
version="$(curl -sL https://brave-browser-apt-release.s3.brave.com/dists/stable/main/binary-amd64/Packages | sed -r -n 's/^Version: (.*)/\1/p' | head -n1)"
|
||||
update-source-version brave "$version"
|
|
@ -1,20 +1,20 @@
|
|||
{ stdenv, buildGoPackage, fetchFromGitHub }:
|
||||
{ stdenv, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "desync";
|
||||
version = "0.4.0";
|
||||
rev = "v${version}";
|
||||
|
||||
goPackagePath = "github.com/folbricht/desync";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
rev = "v${version}";
|
||||
owner = "folbricht";
|
||||
repo = "desync";
|
||||
sha256 = "17qh0g1paa7212j761q9z246k10a3xrwd8fgiizw3lr9adn50kdk";
|
||||
sha256 = "0j9hixgkja268r2zn2dglrmlrb2z57sgz6q3wqb8dfwpan7b5rsy";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
vendorSha256 = "1gajh99jb6mbwk93dypddhl7r7n8h2s11s3s82firbrb5k24s4pz";
|
||||
|
||||
# nix builder doesn't have access to test data; tests fail for reasons unrelated to binary being bad.
|
||||
doCheck = false;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Content-addressed binary distribution system";
|
||||
|
|
312
pkgs/applications/networking/sync/desync/deps.nix
generated
312
pkgs/applications/networking/sync/desync/deps.nix
generated
|
@ -1,312 +0,0 @@
|
|||
[
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/datadog/zstd";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/datadog/zstd";
|
||||
rev = "v1.3.4";
|
||||
sha256 = "06wphl43ji23c0cmmm6fd3wszbwq36mdp1jarak2a6hmxl6yf0b8";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/davecgh/go-spew";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/davecgh/go-spew";
|
||||
rev = "v1.1.1";
|
||||
sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/dchest/siphash";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/dchest/siphash";
|
||||
rev = "v1.2.0";
|
||||
sha256 = "01qhv9zd9l6p7pwf1fj022mp9s5496rk4lnm3yvpjsiwp6k4af8c";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/fatih/color";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/fatih/color";
|
||||
rev = "v1.7.0";
|
||||
sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/folbricht/tempfile";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/folbricht/tempfile";
|
||||
rev = "v0.0.1";
|
||||
sha256 = "0vz08qvbniqxc24vhmcbq5ncnz97ncp4jbxgcf0hziazxfp114z3";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/go-ini/ini";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/go-ini/ini";
|
||||
rev = "v1.38.2";
|
||||
sha256 = "0xbnw1nd22q6k863n5gs0nxld15w0p8qxbhfky85akcb5rk1vwi9";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/gopherjs/gopherjs";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/gopherjs/gopherjs";
|
||||
rev = "0210a2f0f73c";
|
||||
sha256 = "1n80xjfc1dkxs8h8mkpw83n89wi5n7hzc3rxhwjs76rkxpq3rc9j";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/hanwen/go-fuse";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/hanwen/go-fuse";
|
||||
rev = "1d35017e9701";
|
||||
sha256 = "11rggvkd6lc5lcpsfvc9iip4z9cingzpkpshaskv2cirbxdynyi8";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/inconshreveable/mousetrap";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/inconshreveable/mousetrap";
|
||||
rev = "v1.0.0";
|
||||
sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/jtolds/gls";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/jtolds/gls";
|
||||
rev = "v4.2.1";
|
||||
sha256 = "1vm37pvn0k4r6d3m620swwgama63laz8hhj3pyisdhxwam4m2g1h";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/kr/fs";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/kr/fs";
|
||||
rev = "v0.1.0";
|
||||
sha256 = "11zg176x9hr9q7fsk95r6q0wf214gg4czy02slax4x56n79g6a7q";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/mattn/go-colorable";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mattn/go-colorable";
|
||||
rev = "v0.0.9";
|
||||
sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/mattn/go-isatty";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mattn/go-isatty";
|
||||
rev = "v0.0.4";
|
||||
sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/mattn/go-runewidth";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mattn/go-runewidth";
|
||||
rev = "v0.0.3";
|
||||
sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/minio/minio-go";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/minio/minio-go";
|
||||
rev = "v6.0.6";
|
||||
sha256 = "0bgivqw1n1189lksp85djw1rqcan2axyh4jv9q54iclrjkpbab37";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/mitchellh/go-homedir";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mitchellh/go-homedir";
|
||||
rev = "v1.0.0";
|
||||
sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/pkg/errors";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/pkg/errors";
|
||||
rev = "v0.8.0";
|
||||
sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/pkg/sftp";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/pkg/sftp";
|
||||
rev = "v1.8.2";
|
||||
sha256 = "040flbir6sv213xzs75vkd5fd7bmm3fqxfcnsx8fr77zkn52hm4m";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/pmezard/go-difflib";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/pmezard/go-difflib";
|
||||
rev = "v1.0.0";
|
||||
sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/smartystreets/assertions";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/smartystreets/assertions";
|
||||
rev = "7c9eb446e3cf";
|
||||
sha256 = "1dix6qgaj6kw38hicy3zs3lvacl1kn0n267b3xw0vvdkqf1v0395";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/smartystreets/goconvey";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/smartystreets/goconvey";
|
||||
rev = "ef6db91d284a";
|
||||
sha256 = "16znlpsms8z2qc3airawyhzvrzcp70p9bx375i19bg489hgchxb7";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/spf13/cobra";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/spf13/cobra";
|
||||
rev = "v0.0.3";
|
||||
sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/spf13/pflag";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/spf13/pflag";
|
||||
rev = "v1.0.2";
|
||||
sha256 = "005598piihl3l83a71ahj10cpq9pbhjck4xishx1b4dzc02r9xr2";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/stretchr/testify";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/stretchr/testify";
|
||||
rev = "v1.2.2";
|
||||
sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "golang.org/x/crypto";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/crypto";
|
||||
rev = "0709b304e793";
|
||||
sha256 = "0i05s09y5pavmfh71fgih7syxg58x7a4krgd8am6d3mnahnmab5c";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "golang.org/x/net";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/net";
|
||||
rev = "161cd47e91fd";
|
||||
sha256 = "0254ld010iijygbzykib2vags1dc0wlmcmhgh4jl8iny159lhbcv";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "golang.org/x/sync";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/sync";
|
||||
rev = "1d60e4601c6f";
|
||||
sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "golang.org/x/sys";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/sys";
|
||||
rev = "49385e6e1522";
|
||||
sha256 = "0spbldahns09fdxkxflb1x24f8k2awdlnr6k5i7ci4fqd19r1dv4";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "golang.org/x/text";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/text";
|
||||
rev = "v0.3.0";
|
||||
sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "gopkg.in/cheggaaa/pb.v1";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://gopkg.in/cheggaaa/pb.v1";
|
||||
rev = "v1.0.25";
|
||||
sha256 = "0vxqiw6f3xyv0zy3g4lksf8za0z8i0hvfpw92hqimsy84f79j3dp";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "gopkg.in/ini.v1";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://gopkg.in/ini.v1";
|
||||
rev = "v1.38.2";
|
||||
sha256 = "0xbnw1nd22q6k863n5gs0nxld15w0p8qxbhfky85akcb5rk1vwi9";
|
||||
};
|
||||
}
|
||||
]
|
|
@ -4,16 +4,16 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unifont";
|
||||
version = "13.0.04";
|
||||
version = "13.0.05";
|
||||
|
||||
ttf = fetchurl {
|
||||
url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf";
|
||||
sha256 = "sha256-p0wSTyXCXuWIw+hDZ4HZPxgdBJ6oOOqOuX6FzZJmwrE=";
|
||||
sha256 = "0ff7zbyqi45q0171rl9ckj6lpfhcj8a9850d8j89m7wbwky32isf";
|
||||
};
|
||||
|
||||
pcf = fetchurl {
|
||||
url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz";
|
||||
sha256 = "sha256-sKY2qshNV3zXfD2BSbfs0qom1gPt7vD5QmVEkACmx18=";
|
||||
sha256 = "16n666p6rs6l4r8grh67gy4ls33qfnbb5xk7cksywzjwdh42js0r";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ];
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, fetchzip }:
|
||||
|
||||
let
|
||||
version = "13.0.04";
|
||||
version = "13.0.05";
|
||||
in fetchzip rec {
|
||||
name = "unifont_upper-${version}";
|
||||
|
||||
|
@ -9,7 +9,7 @@ in fetchzip rec {
|
|||
|
||||
postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/unifont_upper.ttf";
|
||||
|
||||
sha256 = "0bji0crx84nbjf1m1lzql7icrb02zbs3l66dn21pvr9czsry870f";
|
||||
sha256 = "1cpi44fzsiq3yqg38763awgri1ma46421c3v8167bsxzsx7vzlkp";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Unicode font for glyphs above the Unicode Basic Multilingual Plane";
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl }:
|
||||
{ stdenv, fetchurl, makeWrapper, jdk }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "lombok-1.18.16";
|
||||
|
@ -8,9 +8,17 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1msys7xkaj0d7fi112fmb2z50mk46db58agzrrdyimggsszwn1kj";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
outputs = [ "out" "bin" ];
|
||||
|
||||
buildCommand = ''
|
||||
mkdir -p $out/share/java
|
||||
cp $src $out/share/java/lombok.jar
|
||||
|
||||
makeWrapper ${jdk}/bin/java $bin/bin/lombok \
|
||||
--add-flags "-cp ${jdk}/lib/openjdk/lib/tools.jar:$out/share/java/lombok.jar" \
|
||||
--add-flags lombok.launch.Main
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
|
34
pkgs/development/libraries/qrcodegen/default.nix
Normal file
34
pkgs/development/libraries/qrcodegen/default.nix
Normal file
|
@ -0,0 +1,34 @@
|
|||
{ stdenv, fetchFromGitHub }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qrcodegen";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nayuki";
|
||||
repo = "QR-Code-generator";
|
||||
rev = "v${version}";
|
||||
sha256 = "0iq9sv9na0vg996aqrxrjn9rrbiyy7sc9vslw945p3ky22pw3lql";
|
||||
};
|
||||
|
||||
preBuild = "cd c";
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib $out/include/qrcodegen
|
||||
cp libqrcodegen.a $out/lib
|
||||
cp qrcodegen.h $out/include/qrcodegen/
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib;
|
||||
{
|
||||
description = "qrcode generator library in multiple languages";
|
||||
|
||||
longDescription = ''
|
||||
This project aims to be the best, clearest library for generating QR Codes. My primary goals are flexible options and absolute correctness. Secondary goals are compact implementation size and good documentation comments.
|
||||
'';
|
||||
|
||||
homepage = "https://github.com/nayuki/QR-Code-generator";
|
||||
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ mcbeth ];
|
||||
};
|
||||
}
|
|
@ -17,6 +17,9 @@ buildPythonPackage rec {
|
|||
checkInputs = [ nose ];
|
||||
propagatedBuildInputs = [ six ];
|
||||
|
||||
# performance tests tend to fail sometimes
|
||||
NOSE_EXCLUDE = "test_benchmarks";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/erikrose/parsimonious";
|
||||
description = "Fast arbitrary-lookahead parser written in pure Python";
|
||||
|
|
|
@ -3,31 +3,42 @@
|
|||
, mock
|
||||
, numpy
|
||||
, pillow
|
||||
, pytest
|
||||
, cython
|
||||
, pytestcov
|
||||
, pytest
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "word_cloud";
|
||||
version = "1.6.0";
|
||||
version = "1.8.1";
|
||||
|
||||
# tests are not included in pypi tarball
|
||||
src = fetchFromGitHub {
|
||||
owner = "amueller";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1ncjr90m3w3b4zi23kw6ai11gxahdyah96x8jb2yn2x4573022x2";
|
||||
sha256 = "sha256-4EFQfv+Jn9EngUAyDoJP0yv9zr9Tnbrdwq1YzDacB9Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cython ];
|
||||
propagatedBuildInputs = [ matplotlib numpy pillow ];
|
||||
|
||||
# Tests require extra dependencies
|
||||
checkInputs = [ mock pytest pytestcov ];
|
||||
# skip tests which make assumptions about installation
|
||||
|
||||
checkPhase = ''
|
||||
pytest -k 'not cli_as_executable'
|
||||
PATH=$out/bin:$PATH pytest test
|
||||
'';
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# https://github.com/amueller/word_cloud/pull/616
|
||||
url = "https://github.com/amueller/word_cloud/commit/858a8ac4b5b08494c1d25d9e0b35dd995151a1e5.patch";
|
||||
sha256 = "sha256-+aDTMPtOibVwjPrRLxel0y4JFD5ERB2bmJi4zRf/asg=";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A little word cloud generator in Python";
|
||||
homepage = "https://github.com/amueller/word_cloud";
|
||||
|
|
|
@ -1,23 +1,25 @@
|
|||
{ lib, mkDerivation, fetchFromGitHub
|
||||
, cmake, ffmpeg, libopus, qtbase, qtmultimedia, qtsvg, pkgconfig, protobuf
|
||||
, python3Packages, SDL2 }:
|
||||
{ lib, mkDerivation, fetchgit
|
||||
, cmake, ffmpeg, libevdev, libopus, udev, qtbase, qtmacextras, qtmultimedia
|
||||
, qtsvg , pkg-config, protobuf , python3Packages, SDL2, stdenv }:
|
||||
|
||||
with stdenv.lib;
|
||||
mkDerivation rec {
|
||||
pname = "chiaki";
|
||||
version = "1.3.0";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
src = fetchgit {
|
||||
url = "https://git.sr.ht/~thestr4ng3r/chiaki";
|
||||
rev = "v${version}";
|
||||
owner = "thestr4ng3r";
|
||||
repo = "chiaki";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "07w7srxxr8zjp91p5n1sqf4j8lljfrm78lz1m15s2nzlm579015h";
|
||||
sha256 = "0l532i9j6wmzbxqx7fg69kgfd1zy1r1wlw6f756vpxpgswivi892";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake pkgconfig protobuf python3Packages.python python3Packages.protobuf
|
||||
cmake pkg-config protobuf python3Packages.python python3Packages.protobuf
|
||||
];
|
||||
buildInputs = [ ffmpeg libopus qtbase qtmultimedia qtsvg protobuf SDL2 ];
|
||||
buildInputs = [ ffmpeg libopus qtbase qtmultimedia qtsvg protobuf SDL2 ]
|
||||
++ optionals stdenv.hostPlatform.isLinux [ libevdev udev]
|
||||
++ optionals (stdenv.isDarwin) [ qtmacextras ];
|
||||
|
||||
doCheck = true;
|
||||
installCheckPhase = "$out/bin/chiaki --help";
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jwt-cli";
|
||||
version = "3.2.1";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mike-engel";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "07mnkr7hi29fyyyn7llb30p4ndiqz4gf1lnhm44qm09alaxmfvws";
|
||||
sha256 = "09zi55ffkhsckvqj84xnxn9bgfkrj9wnzqbh9hfsxzbk4xy7fc2h";
|
||||
};
|
||||
|
||||
cargoSha256 = "0jkzy7ssg9v9phhlldq6s4rfs3sn17y2r1k0jr10g9j15lzixa04";
|
||||
cargoSha256 = "1k13pw202fr5mvd0ys39n3dxwcl3sd01j6izfb28k06b6pav3wc8";
|
||||
|
||||
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
|
||||
|
||||
|
|
|
@ -21936,6 +21936,8 @@ in
|
|||
java = if stdenv.isLinux then jre else jdk;
|
||||
};
|
||||
|
||||
qrcodegen = callPackage ../development/libraries/qrcodegen { };
|
||||
|
||||
qrencode = callPackage ../development/libraries/qrencode { };
|
||||
|
||||
geeqie = callPackage ../applications/graphics/geeqie { };
|
||||
|
|
Loading…
Reference in a new issue