From bbaed0d6d546104b1f52eafb490f718536ba4588 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 11 Dec 2020 21:53:32 +0000 Subject: [PATCH 01/16] autoconf: license is GPLv3+ 2.64 was the last GPLv2+ release. --- pkgs/development/tools/misc/autoconf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index 93add837290b..936cc9a14545 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/pkgs/development/tools/misc/autoconf/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { can use, in the form of M4 macro calls. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; }; From a3dd6cdb9b6f5138119eac11f902730bc5977c5d Mon Sep 17 00:00:00 2001 From: Jeffrey McBeth Date: Sat, 19 Dec 2020 08:49:13 -0500 Subject: [PATCH 02/16] qrcodegen: init at 1.6.0 --- .../libraries/qrcodegen/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/libraries/qrcodegen/default.nix diff --git a/pkgs/development/libraries/qrcodegen/default.nix b/pkgs/development/libraries/qrcodegen/default.nix new file mode 100644 index 000000000000..b5faaf90ef7a --- /dev/null +++ b/pkgs/development/libraries/qrcodegen/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dca2d81b9b2e..d5dc04f1a5b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21744,6 +21744,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 { }; From 5d84589c3d74fe522f1930e7bc816481f366d658 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 29 Dec 2020 22:07:31 +0100 Subject: [PATCH 03/16] python3.pkgs.wordcloud: 1.6.0 -> 1.8.1 Co-authored-by: Sandro Co-authored-by: Jonathan Ringer --- .../python-modules/wordcloud/default.nix | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/wordcloud/default.nix b/pkgs/development/python-modules/wordcloud/default.nix index d005527b4c35..6ed44c1e0c20 100644 --- a/pkgs/development/python-modules/wordcloud/default.nix +++ b/pkgs/development/python-modules/wordcloud/default.nix @@ -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"; From 4f8057ec837d0c9a79930c21f1673ebc98074d67 Mon Sep 17 00:00:00 2001 From: Charles Duffy Date: Tue, 8 Dec 2020 18:13:56 -0600 Subject: [PATCH 04/16] desync: 0.4.0 -> 0.9.0 --- .../networking/sync/desync/default.nix | 18 +- .../networking/sync/desync/deps.nix | 312 ------------------ 2 files changed, 9 insertions(+), 321 deletions(-) delete mode 100644 pkgs/applications/networking/sync/desync/deps.nix diff --git a/pkgs/applications/networking/sync/desync/default.nix b/pkgs/applications/networking/sync/desync/default.nix index 9831ab34b2eb..7f7d2fb277a1 100644 --- a/pkgs/applications/networking/sync/desync/default.nix +++ b/pkgs/applications/networking/sync/desync/default.nix @@ -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"; diff --git a/pkgs/applications/networking/sync/desync/deps.nix b/pkgs/applications/networking/sync/desync/deps.nix deleted file mode 100644 index 7f5f3251d162..000000000000 --- a/pkgs/applications/networking/sync/desync/deps.nix +++ /dev/null @@ -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"; - }; - } -] From 536a40c3d7bfc645bb4e9ff55b35f1d73b05ca64 Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Wed, 30 Dec 2020 19:08:07 +0100 Subject: [PATCH 05/16] chiaki: 1.3.0 -> 2.0.1 Also switch the upstream repository from github to git.sr.ht, since the project has been moved to sourcehut. Signed-off-by: Rouven Czerwinski --- pkgs/games/chiaki/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/games/chiaki/default.nix b/pkgs/games/chiaki/default.nix index 27dde97ead7b..d703833d452e 100644 --- a/pkgs/games/chiaki/default.nix +++ b/pkgs/games/chiaki/default.nix @@ -1,21 +1,20 @@ -{ lib, mkDerivation, fetchFromGitHub -, cmake, ffmpeg, libopus, qtbase, qtmultimedia, qtsvg, pkgconfig, protobuf +{ lib, mkDerivation, fetchgit +, cmake, ffmpeg, libopus, qtbase, qtmultimedia, qtsvg, pkg-config, protobuf , python3Packages, SDL2 }: 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 ]; From 4d9d82632fa10daf7bdead9e368a3550470e1846 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Thu, 31 Dec 2020 11:06:53 +0100 Subject: [PATCH 06/16] brave: add update script The Brave package often seems to get very outdated. This is bad for a browser, where vulnerabilities are high impact. This change adds an update script, so that r-ryantm will suggest updates. We find the latest version using their Debian package database (since we are using the Debian package anyway). --- pkgs/applications/networking/browsers/brave/default.nix | 2 ++ pkgs/applications/networking/browsers/brave/update.sh | 5 +++++ 2 files changed, 7 insertions(+) create mode 100755 pkgs/applications/networking/browsers/brave/update.sh diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index c1926820ece1..03f451cb382f 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -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"; diff --git a/pkgs/applications/networking/browsers/brave/update.sh b/pkgs/applications/networking/browsers/brave/update.sh new file mode 100755 index 000000000000..b7d974ad259d --- /dev/null +++ b/pkgs/applications/networking/browsers/brave/update.sh @@ -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" From e2a9d90153ccb34d292bca9304335fc9668dbc54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Thu, 31 Dec 2020 11:10:14 +0100 Subject: [PATCH 07/16] brave: 1.18.75 -> 1.18.77 Changelog: https://community.brave.com/t/release-channel-1-18-77/191009 --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 03f451cb382f..9931b6003fb0 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -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; From 9da0c51027b3d09a607044fe0fd3dce2a9044e2e Mon Sep 17 00:00:00 2001 From: snicket2100 <57048005+snicket2100@users.noreply.github.com> Date: Fri, 11 Dec 2020 21:19:35 +0100 Subject: [PATCH 08/16] parsimonious: excluding unpredictable tests --- pkgs/development/python-modules/parsimonious/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/parsimonious/default.nix b/pkgs/development/python-modules/parsimonious/default.nix index 69e6d1d2bb2c..25d87a7f2f1f 100644 --- a/pkgs/development/python-modules/parsimonious/default.nix +++ b/pkgs/development/python-modules/parsimonious/default.nix @@ -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"; From 4d461177a7d0e4e74bab1afd2e798d18d88860a5 Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Wed, 30 Dec 2020 19:09:43 +0100 Subject: [PATCH 09/16] chiaki: add DualShock4 touchpad support Chiaki supports the touchpad on DualShock4 controllers when they are connected via USB and requires libevdev & udev for this. Add both libraries if chiaki is to be built for a Linux host. --- pkgs/games/chiaki/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/games/chiaki/default.nix b/pkgs/games/chiaki/default.nix index d703833d452e..22e1c31eff1f 100644 --- a/pkgs/games/chiaki/default.nix +++ b/pkgs/games/chiaki/default.nix @@ -1,7 +1,8 @@ { lib, mkDerivation, fetchgit -, cmake, ffmpeg, libopus, qtbase, qtmultimedia, qtsvg, pkg-config, protobuf -, python3Packages, SDL2 }: +, cmake, ffmpeg, libevdev, libopus, udev, qtbase, qtmultimedia +, qtsvg , pkg-config, protobuf , python3Packages, SDL2, stdenv }: +with stdenv.lib; mkDerivation rec { pname = "chiaki"; version = "2.0.1"; @@ -16,7 +17,8 @@ mkDerivation rec { nativeBuildInputs = [ 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]; doCheck = true; installCheckPhase = "$out/bin/chiaki --help"; From b5a0c7466c286b852436d6aaed5826a639212641 Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Wed, 30 Dec 2020 20:00:35 +0100 Subject: [PATCH 10/16] chiaki: fix build on darwin Darwin requires qtmacextra in the buildInputs, otherwise compilation fails with: CMake Error at /nix/store/05nmn6v1hrk56zqs61s2awvykha51fx9-qtbase-5.12.7-dev/lib/cmake/Qt5/Qt5Config.cmake:28 (find_package): By not providing "FindQt5MacExtras.cmake" in CMAKE_MODULE_PATH this project has asked CMake to find a package configuration file provided by "Qt5MacExtras", but CMake did not find one. Could not find a package configuration file provided by "Qt5MacExtras" with any of the following names: Qt5MacExtrasConfig.cmake qt5macextras-config.cmake Add the installation prefix of "Qt5MacExtras" to CMAKE_PREFIX_PATH or set "Qt5MacExtras_DIR" to a directory containing one of the above files. If "Qt5MacExtras" provides a separate development package or SDK, be sure it has been installed. Call Stack (most recent call first): gui/CMakeLists.txt:7 (find_package) -- Configuring incomplete, errors occurred! See also "/tmp/nix-build-chiaki-2.0.1.drv-0/chiaki/build/CMakeFiles/CMakeOutput.log". --- pkgs/games/chiaki/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/games/chiaki/default.nix b/pkgs/games/chiaki/default.nix index 22e1c31eff1f..63afec7264ce 100644 --- a/pkgs/games/chiaki/default.nix +++ b/pkgs/games/chiaki/default.nix @@ -1,5 +1,5 @@ { lib, mkDerivation, fetchgit -, cmake, ffmpeg, libevdev, libopus, udev, qtbase, qtmultimedia +, cmake, ffmpeg, libevdev, libopus, udev, qtbase, qtmacextras, qtmultimedia , qtsvg , pkg-config, protobuf , python3Packages, SDL2, stdenv }: with stdenv.lib; @@ -18,7 +18,8 @@ mkDerivation rec { cmake pkg-config protobuf python3Packages.python python3Packages.protobuf ]; buildInputs = [ ffmpeg libopus qtbase qtmultimedia qtsvg protobuf SDL2 ] - ++ optionals stdenv.hostPlatform.isLinux [ libevdev udev]; + ++ optionals stdenv.hostPlatform.isLinux [ libevdev udev] + ++ optionals (stdenv.isDarwin) [ qtmacextras ]; doCheck = true; installCheckPhase = "$out/bin/chiaki --help"; From 136c0d01d25b030c0d103e989de2d5340904dc51 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 1 Jan 2021 10:48:32 +0100 Subject: [PATCH 11/16] autoconf: use buildPackages when overriding version to fix cross Like bf46afde6b22942ea605983f66ee23038986ba07 --- pkgs/top-level/all-packages.nix | 22 +++++++++++----------- pkgs/top-level/beam-packages.nix | 16 ++++++++-------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d57e7a6edd2a..6a9bec8247f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5222,7 +5222,7 @@ in libcloudproviders = callPackage ../development/libraries/libcloudproviders { }; libcoap = callPackage ../applications/networking/libcoap { - autoconf = autoconf269; + autoconf = buildPackages.autoconf269; }; libcryptui = callPackage ../development/libraries/libcryptui { @@ -8141,7 +8141,7 @@ in verilator = callPackage ../applications/science/electronics/verilator {}; verilog = callPackage ../applications/science/electronics/verilog { - autoconf = autoconf269; + autoconf = buildPackages.autoconf269; }; versus = callPackage ../applications/networking/versus { }; @@ -8251,7 +8251,7 @@ in watchman = callPackage ../development/tools/watchman { inherit (darwin.apple_sdk.frameworks) CoreServices; - autoconf = autoconf269; + autoconf = buildPackages.autoconf269; }; wavefunctioncollapse = callPackage ../tools/graphics/wavefunctioncollapse {}; @@ -8377,7 +8377,7 @@ in uhttpmock = callPackage ../development/libraries/uhttpmock { }; uim = callPackage ../tools/inputmethods/uim { - autoconf = autoconf269; + autoconf = buildPackages.autoconf269; }; uhub = callPackage ../servers/uhub { }; @@ -8572,7 +8572,7 @@ in # It needs a cross compiler for mipsel to build the firmware it will # load into the Ben Nanonote gccCross = pkgsCross.ben-nanonote.buildPackages.gccCrossStageStatic; - autoconf = autoconf269; + autoconf = buildPackages.autoconf269; }; clipnotify = callPackage ../tools/misc/clipnotify { }; @@ -11119,7 +11119,7 @@ in autobuild = callPackage ../development/tools/misc/autobuild { }; - autoconf = autoconf270; + autoconf = buildPackages.autoconf270; autoconf-archive = callPackage ../development/tools/misc/autoconf-archive { }; @@ -14564,7 +14564,7 @@ in libmatchbox = callPackage ../development/libraries/libmatchbox { }; libmatheval = callPackage ../development/libraries/libmatheval { - autoconf = autoconf269; + autoconf = buildPackages.autoconf269; guile = guile_2_0; }; @@ -24740,7 +24740,7 @@ in vbindiff = callPackage ../applications/editors/vbindiff { }; vcprompt = callPackage ../applications/version-management/vcprompt { - autoconf = autoconf269; + autoconf = buildPackages.autoconf269; }; vcs = callPackage ../applications/video/vcs { }; @@ -25207,7 +25207,7 @@ in }; x11basic = callPackage ../development/compilers/x11basic { - autoconf = autoconf269; + autoconf = buildPackages.autoconf269; }; x11vnc = callPackage ../tools/X11/x11vnc { }; @@ -25516,7 +25516,7 @@ in zeronet = callPackage ../applications/networking/p2p/zeronet { }; zexy = callPackage ../applications/audio/pd-plugins/zexy { - autoconf = autoconf269; + autoconf = buildPackages.autoconf269; }; zgrviewer = callPackage ../applications/graphics/zgrviewer {}; @@ -26909,7 +26909,7 @@ in }; kallisto = callPackage ../applications/science/biology/kallisto { - autoconf = autoconf269; + autoconf = buildPackages.autoconf269; }; kssd = callPackage ../applications/science/biology/kssd { }; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 542c721e215e..52268276a033 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -1,4 +1,4 @@ -{ callPackage, wxGTK30, openssl_1_0_2, autoconf269 }: +{ callPackage, wxGTK30, openssl_1_0_2, buildPackages }: rec { lib = callPackage ../development/beam-modules/lib.nix {}; @@ -20,7 +20,7 @@ rec { wxGTK = wxGTK30; # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 parallelBuild = true; - autoconf = autoconf269; + autoconf = buildPackages.autoconf269; }; erlangR23_odbc = erlangR23.override { odbcSupport = true; }; erlangR23_javac = erlangR23.override { javacSupport = true; }; @@ -34,7 +34,7 @@ rec { wxGTK = wxGTK30; # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 parallelBuild = true; - autoconf = autoconf269; + autoconf = buildPackages.autoconf269; }; erlangR22_odbc = erlangR22.override { odbcSupport = true; }; erlangR22_javac = erlangR22.override { javacSupport = true; }; @@ -46,7 +46,7 @@ rec { # R21 erlangR21 = lib.callErlang ../development/interpreters/erlang/R21.nix { wxGTK = wxGTK30; - autoconf = autoconf269; + autoconf = buildPackages.autoconf269; }; erlangR21_odbc = erlangR21.override { odbcSupport = true; }; erlangR21_javac = erlangR21.override { javacSupport = true; }; @@ -58,7 +58,7 @@ rec { # R20 erlangR20 = lib.callErlang ../development/interpreters/erlang/R20.nix { wxGTK = wxGTK30; - autoconf = autoconf269; + autoconf = buildPackages.autoconf269; }; erlangR20_odbc = erlangR20.override { odbcSupport = true; }; erlangR20_javac = erlangR20.override { javacSupport = true; }; @@ -71,7 +71,7 @@ rec { erlangR19 = lib.callErlang ../development/interpreters/erlang/R19.nix { wxGTK = wxGTK30; openssl = openssl_1_0_2; - autoconf = autoconf269; + autoconf = buildPackages.autoconf269; }; erlangR19_odbc = erlangR19.override { odbcSupport = true; }; erlangR19_javac = erlangR19.override { javacSupport = true; }; @@ -84,7 +84,7 @@ rec { erlangR18 = lib.callErlang ../development/interpreters/erlang/R18.nix { wxGTK = wxGTK30; openssl = openssl_1_0_2; - autoconf = autoconf269; + autoconf = buildPackages.autoconf269; }; erlangR18_odbc = erlangR18.override { odbcSupport = true; }; erlangR18_javac = erlangR18.override { javacSupport = true; }; @@ -95,7 +95,7 @@ rec { # Basho fork, using custom builder. erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-basho.nix { - autoconf = autoconf269; + autoconf = buildPackages.autoconf269; }; erlang_basho_R16B02_odbc = erlang_basho_R16B02.override { odbcSupport = true; From b095078f44302d1ad9dfc85369b39a81e99983d8 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Thu, 31 Dec 2020 15:41:51 -0800 Subject: [PATCH 12/16] gnutls: fix build on darwin Incompatible with staged update to autoconf 2.70. No effect on linux as autoconf is only needed on darwin. --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a9bec8247f6..326335cba115 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13371,6 +13371,7 @@ in gnutls = callPackage ../development/libraries/gnutls/default.nix { inherit (darwin.apple_sdk.frameworks) Security; util-linux = util-linuxMinimal; # break the cyclic dependency + autoconf = buildPackages.autoconf269; }; gnutls-kdh = callPackage ../development/libraries/gnutls-kdh/3.5.nix { From 63476e2b7347175d1714e0cc6cec26e60baaf0aa Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Fri, 1 Jan 2021 08:44:35 +0100 Subject: [PATCH 13/16] unifont: 13.0.04 -> 13.0.05 --- pkgs/data/fonts/unifont/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index ce2a92ce48ae..3a9f107c4c7e 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -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 ]; From a9e7aa93296307acf1d33aaf433b21e8cd75a946 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Fri, 1 Jan 2021 08:44:46 +0100 Subject: [PATCH 14/16] unifont_upper: 13.0.04 -> 13.0.05 --- pkgs/data/fonts/unifont_upper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/unifont_upper/default.nix b/pkgs/data/fonts/unifont_upper/default.nix index 2daf66e75109..04480aaeec72 100644 --- a/pkgs/data/fonts/unifont_upper/default.nix +++ b/pkgs/data/fonts/unifont_upper/default.nix @@ -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"; From bd970a5e1736c3ef6b6914851ce76da8a8386570 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Fri, 1 Jan 2021 11:39:07 +0100 Subject: [PATCH 15/16] jwt-cli: 3.2.1 -> 3.3.0 --- pkgs/tools/security/jwt-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/jwt-cli/default.nix b/pkgs/tools/security/jwt-cli/default.nix index 728ea0a92da5..db73bb958eb6 100644 --- a/pkgs/tools/security/jwt-cli/default.nix +++ b/pkgs/tools/security/jwt-cli/default.nix @@ -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; From 9ce91be010e177d946994319f237685ca066dc3d Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 12 Nov 2020 23:05:24 +0100 Subject: [PATCH 16/16] lombok: add bin output with lombok wrapper script The wrapper can be used, e.g., to run the delombok command. --- pkgs/development/libraries/java/lombok/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/java/lombok/default.nix b/pkgs/development/libraries/java/lombok/default.nix index 5a1210036056..6d09bead53e4 100644 --- a/pkgs/development/libraries/java/lombok/default.nix +++ b/pkgs/development/libraries/java/lombok/default.nix @@ -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 = {