From ae9f18ea15a3476313102942a03fea8db56f3d6b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 17 Jan 2021 00:07:02 +0000 Subject: [PATCH 1/6] brave: 1.18.77 -> 1.18.78 --- 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 9eed9b627e67..a286915e8786 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.77"; + version = "1.18.78"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "AV3bqtWaoy6AVnt8K/Qo+7hguAIsPJPZhgLSeOvJ7JY="; + sha256 = "3M5W3BWGHtP+kfZZsH1nVzyGAsub4gjXyBwO8kR/Qvs="; }; dontConfigure = true; From a79ef12d0b47e8fdb88c005f0b62e542f053a219 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 17 Jan 2021 11:40:49 +0100 Subject: [PATCH 2/6] cantoolz: init at 3.7.0 --- pkgs/tools/networking/cantoolz/default.nix | 62 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 64 insertions(+) create mode 100644 pkgs/tools/networking/cantoolz/default.nix diff --git a/pkgs/tools/networking/cantoolz/default.nix b/pkgs/tools/networking/cantoolz/default.nix new file mode 100644 index 000000000000..11a0315184c9 --- /dev/null +++ b/pkgs/tools/networking/cantoolz/default.nix @@ -0,0 +1,62 @@ +{ lib +, bitstring +, buildPythonApplication +, fetchFromGitHub +, fetchpatch +, flask +, mido +, numpy +, pyserial +, pytestCheckHook +, pythonOlder +}: + +buildPythonApplication rec { + pname = "cantoolz"; + version = "3.7.0"; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "CANToolz"; + repo = "CANToolz"; + rev = "v${version}"; + sha256 = "0xkj7zyx6pz866q61c84mdagpgdyd633v85hk7qxhamca33rc4yi"; + }; + + patches = [ + (fetchpatch { + # Replace time.clock() which was removed, https://github.com/CANToolz/CANToolz/pull/30 + url = "https://github.com/CANToolz/CANToolz/pull/30/commits/d75574523d3b273c40fb714532c4de27f9e6dd3e.patch"; + sha256 = "0g91hywg5q6f2qk1awgklywigclrbhh6a6mwd0kpbkk1wawiiwbc"; + }) + ]; + + propagatedBuildInputs = [ + flask + pyserial + mido + numpy + bitstring + ]; + + checkInputs = [ pytestCheckHook ]; + disabledTests = [ "test_process" ]; + pythonImportsCheck = [ "cantoolz" ]; + + meta = with lib; { + description = "Black-box CAN network analysis framework"; + longDescription = '' + CANToolz is a framework for analysing CAN networks and devices. It + provides multiple modules that can be chained using CANToolz's pipe + system and used by security researchers, automotive/OEM security + testers in black-box analysis. + + CANToolz can be used for ECU discovery, MitM testing, fuzzing, brute + forcing, scanning or R&D, testing and validation. More can easily be + implemented with a new module. + ''; + homepage = "https://github.com/CANToolz/CANToolz"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 100a2aea8530..4b286cebf7a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2904,6 +2904,8 @@ in cantata = libsForQt5.callPackage ../applications/audio/cantata { }; + cantoolz = python3Packages.callPackage ../tools/networking/cantoolz { }; + can-utils = callPackage ../os-specific/linux/can-utils { }; caudec = callPackage ../applications/audio/caudec { }; From 03a317d9625a7b87ddbe639d74a45f99f8105b7e Mon Sep 17 00:00:00 2001 From: Daniel Nilsson Date: Fri, 18 Dec 2020 22:19:21 +0100 Subject: [PATCH 3/6] maintainers: add vq --- maintainers/maintainer-list.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 50efa11c97c6..32c41b6bf8ae 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9660,6 +9660,10 @@ email = "oliver.huntuk@gmail.com"; name = "Oliver Hunt"; }; + vq = { + email = "vq@erq.se"; + name = "Daniel Nilsson"; + }; vrthra = { email = "rahul@gopinath.org"; github = "vrthra"; From 5c56cfd61b1f39f6989ac3cf163f3a5dda74ed5a Mon Sep 17 00:00:00 2001 From: Daniel Nilsson Date: Fri, 18 Dec 2020 21:58:28 +0100 Subject: [PATCH 4/6] liblxi: init at 1.13 Apply suggestions from code review Co-authored-by: Ivar <41924494+IvarWithoutBones@users.noreply.github.com> Co-authored-by: Sandro --- pkgs/development/libraries/liblxi/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/libraries/liblxi/default.nix diff --git a/pkgs/development/libraries/liblxi/default.nix b/pkgs/development/libraries/liblxi/default.nix new file mode 100644 index 000000000000..ebb8cbe0376c --- /dev/null +++ b/pkgs/development/libraries/liblxi/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub +, pkg-config, autoreconfHook +, libtirpc, rpcsvc-proto, avahi, libxml2 +}: + +stdenv.mkDerivation rec { + pname = "liblxi"; + version = "1.13"; + + src = fetchFromGitHub { + owner = "lxi-tools"; + repo = "liblxi"; + rev = "v${version}"; + sha256 = "129m0k2wrlgs25qkskynljddqspasla1x8iq51vmg38nhnilpqf6"; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config rpcsvc-proto ]; + + buildInputs = [ libtirpc avahi libxml2 ]; + + meta = with stdenv.lib; { + description = "Library for communicating with LXI compatible instruments"; + longDescription = '' + liblxi is an open source software library which offers a simple + API for communicating with LXI compatible instruments. + The API allows applications to easily discover instruments + on networks and communicate SCPI commands. + ''; + homepage = "https://lxi-tools.github.io/"; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = [ maintainers.vq ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 313cfa208d7a..c617da63da6f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14802,6 +14802,8 @@ in libltc = callPackage ../development/libraries/libltc { }; + liblxi = callPackage ../development/libraries/liblxi { }; + libmaxminddb = callPackage ../development/libraries/libmaxminddb { }; libmcrypt = callPackage ../development/libraries/libmcrypt {}; From 143091fae69a0ca8391661fefdaa70f5559b31f5 Mon Sep 17 00:00:00 2001 From: Daniel Nilsson Date: Fri, 18 Dec 2020 21:58:43 +0100 Subject: [PATCH 5/6] lxi-tools: init at 1.21 Apply suggestions from code review Co-authored-by: Ivar <41924494+IvarWithoutBones@users.noreply.github.com> Co-authored-by: Sandro --- pkgs/tools/networking/lxi-tools/default.nix | 34 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/tools/networking/lxi-tools/default.nix diff --git a/pkgs/tools/networking/lxi-tools/default.nix b/pkgs/tools/networking/lxi-tools/default.nix new file mode 100644 index 000000000000..3f3e62fb8075 --- /dev/null +++ b/pkgs/tools/networking/lxi-tools/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub +, autoreconfHook, pkg-config +, liblxi, readline, lua +}: + +stdenv.mkDerivation rec { + pname = "lxi-tools"; + version = "1.21"; + + src = fetchFromGitHub { + owner = "lxi-tools"; + repo = "lxi-tools"; + rev = "v${version}"; + sha256 = "0rkp6ywsw2zv7hpbr12kba79wkcwqin7xagxxhd968rbfkfdxlwc"; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + buildInputs = [ liblxi readline lua ]; + + meta = with stdenv.lib; { + description = "Tool for communicating with LXI compatible instruments"; + longDescription = '' + lxi-tools is a collection of open source software tools + that enables control of LXI compatible instruments such + as modern oscilloscopes, power supplies, + spectrum analyzers etc. + ''; + homepage = "https://lxi-tools.github.io/"; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = [ maintainers.vq ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c617da63da6f..7ad4f3dab5b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23323,6 +23323,8 @@ in lv2-cpp-tools = callPackage ../applications/audio/lv2-cpp-tools { }; + lxi-tools = callPackage ../tools/networking/lxi-tools { }; + lynx = callPackage ../applications/networking/browsers/lynx { }; lyrebird = callPackage ../applications/audio/lyrebird { }; From a67d49dfefc96098b073a1d7a4a9bd2fa53aba45 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Sat, 16 Jan 2021 21:57:41 +0100 Subject: [PATCH 6/6] metapixel: init at 1.0.2 --- pkgs/tools/graphics/metapixel/default.nix | 33 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/tools/graphics/metapixel/default.nix diff --git a/pkgs/tools/graphics/metapixel/default.nix b/pkgs/tools/graphics/metapixel/default.nix new file mode 100644 index 000000000000..a97be7f809cd --- /dev/null +++ b/pkgs/tools/graphics/metapixel/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, libpng, libjpeg, giflib, perl, pkg-config }: + +stdenv.mkDerivation rec { + pname = "metapixel"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "schani"; + repo = pname; + rev = "98ee9daa093b6c334941242e63f90b1c2876eb4f"; + fetchSubmodules = true; + sha256 = "0r7n3a6bvcxkbpda4mwmrpicii09iql5z69nkjqygkwxw7ny3309"; + }; + + makeFlags = [ "metapixel" ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libpng libjpeg giflib perl ]; + + installPhase = '' + mkdir -p $out/bin + cp metapixel $out/bin/metapixel + cp metapixel-prepare $out/bin/metapixel-prepare + cp metapixel-sizesort $out/bin/metapixel-sizesort + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/schani/metapixel"; + description = "Tool for generating photomosaics"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 692fdbf96cbd..3f6b50aecaae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -713,6 +713,8 @@ in albert = libsForQt5.callPackage ../applications/misc/albert {}; + metapixel = callPackage ../tools/graphics/metapixel { }; + ### APPLICATIONS/TERMINAL-EMULATORS alacritty = callPackage ../applications/terminal-emulators/alacritty {