From b8ccc3385de37a065529b5aca87e841cb0262bd8 Mon Sep 17 00:00:00 2001 From: Vladimir Serov Date: Wed, 1 Jan 2020 21:39:32 +0300 Subject: [PATCH 1/3] maintainer-list: added cab404 --- maintainers/maintainer-list.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4952972eb4de..ff387b5da832 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1075,6 +1075,21 @@ githubId = 510553; name = "Jos van Bakel"; }; + cab404 = { + email = "cab404@mailbox.org"; + github = "cab404"; + githubId = 6453661; + name = "Vladimir Serov"; + keys = [ + # compare with https://keybase.io/cab404 + { longkeyid = "1BB96810926F4E715DEF567E6BA7C26C3FDF7BB3"; + fingerprint = "rsa3072/0xCBDECF658C38079E"; + } + { longkeyid = "1EBC648C64D6045463013B3EB7EFFC271D55DB8A"; + fingerprint = "ed25519/0xB7EFFC271D55DB8A"; + } + ]; + }; calbrecht = { email = "christian.albrecht@mayflower.de"; github = "calbrecht"; From 8c7473e20356ae1f31d013ba8dc8da4f41321849 Mon Sep 17 00:00:00 2001 From: Vladimir Serov Date: Wed, 1 Jan 2020 21:55:25 +0300 Subject: [PATCH 2/3] micronucleus: init at 2.04 --- .../tools/misc/micronucleus/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/tools/misc/micronucleus/default.nix diff --git a/pkgs/development/tools/misc/micronucleus/default.nix b/pkgs/development/tools/misc/micronucleus/default.nix new file mode 100644 index 000000000000..09384a28b0f7 --- /dev/null +++ b/pkgs/development/tools/misc/micronucleus/default.nix @@ -0,0 +1,37 @@ +{ + pkgs +, stdenv +, libusb +, fetchFromGitHub +, lib +}: +stdenv.mkDerivation rec { + pname = "micronucleus"; + version = "2.04"; + + sourceRoot = "source/commandline"; + + src = fetchFromGitHub { + owner = "micronucleus"; + repo = "micronucleus"; + rev = version; + sha256 = "14msy9amlbflw5mqrbs57b7bby3nsgx43srr7215zyhfdgsla0in"; + }; + + buildInputs = [ libusb ]; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/lib/udev + cp micronucleus $out/bin + cp 49-micronucleus.rules $out/lib/udev + ''; + + meta = with lib; { + description = "Upload tool for micronucleus"; + homepage = "https://github.com/micronucleus/micronucleus"; + license = licenses.gpl3; + maintainers = [ maintainers.cab404 ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8aa334676608..20481d4d759f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13219,6 +13219,8 @@ in microsoft_gsl = callPackage ../development/libraries/microsoft_gsl { }; + micronucleus = callPackage ../development/tools/misc/micronucleus { }; + mimalloc = callPackage ../development/libraries/mimalloc { }; minizip = callPackage ../development/libraries/minizip { }; From 8e5b810ac85fd6fbd385016cc43be45462c89707 Mon Sep 17 00:00:00 2001 From: Vladimir Serov Date: Thu, 2 Jan 2020 15:33:24 +0300 Subject: [PATCH 3/3] micronucleus: fixed darwin build --- pkgs/development/tools/misc/micronucleus/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/misc/micronucleus/default.nix b/pkgs/development/tools/misc/micronucleus/default.nix index 09384a28b0f7..9fbafebb10c5 100644 --- a/pkgs/development/tools/misc/micronucleus/default.nix +++ b/pkgs/development/tools/misc/micronucleus/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libusb ]; + makeFlags = stdenv.lib.optionals stdenv.isDarwin [ "CC=cc" ]; installPhase = '' mkdir -p $out/bin