alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2020-12-31 18:42:41 +00:00 committed by GitHub
parent bf46afde6b 487141bc93
commit 5dffe03f30
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 513 additions and 388 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/systems/default.nix
View file

@ -124,6 +124,8 @@ rec {
then "${qemu-user}/bin/qemu-${final.qemuArch}"
else if final.isWasi
then "${pkgs.wasmtime}/bin/wasmtime"
else if final.isMmix
then "${pkgs.mmixware}/bin/mmix"
else throw "Don't know how to run ${final.config} executables.";
} // mapAttrs (n: v: v final.parsed) inspect.predicates

30
nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
View file

@ -17,8 +17,7 @@
# The serial ports listed here are:
# - ttyS0: for Tegra (Jetson TX1)
# - ttyAMA0: for QEMU's -machine virt
# Also increase the amount of CMA to ensure the virtual console on the RPi3 works.
boot.kernelParams = ["cma=32M" "console=ttyS0,115200n8" "console=ttyAMA0,115200n8" "console=tty0"];
boot.kernelParams = ["console=ttyS0,115200n8" "console=ttyAMA0,115200n8" "console=tty0"];
boot.initrd.availableKernelModules = [
# Allows early (earlier) modesetting for the Raspberry Pi
@ -30,13 +29,25 @@
sdImage = {
populateFirmwareCommands = let
configTxt = pkgs.writeText "config.txt" ''
[pi3]
kernel=u-boot-rpi3.bin
[pi4]
kernel=u-boot-rpi4.bin
enable_gic=1
armstub=armstub8-gic.bin
# Otherwise the resolution will be weird in most cases, compared to
# what the pi3 firmware does by default.
disable_overscan=1
[all]
# Boot in 64-bit mode.
arm_64bit=1
# U-Boot used to need this to work, regardless of whether UART is actually used or not.
# TODO: check when/if this can be removed.
# U-Boot needs this to work, regardless of whether UART is actually used or not.
# Look in arch/arm/mach-bcm283x/Kconfig in the U-Boot tree to see if this is still
# a requirement in the future.
enable_uart=1
# Prevent the firmware from smashing the framebuffer setup done by the mainline kernel
@ -45,8 +56,17 @@
'';
in ''
(cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/firmware/)
cp ${pkgs.ubootRaspberryPi3_64bit}/u-boot.bin firmware/u-boot-rpi3.bin
# Add the config
cp ${configTxt} firmware/config.txt
# Add pi3 specific files
cp ${pkgs.ubootRaspberryPi3_64bit}/u-boot.bin firmware/u-boot-rpi3.bin
# Add pi4 specific files
cp ${pkgs.ubootRaspberryPi4_64bit}/u-boot.bin firmware/u-boot-rpi4.bin
cp ${pkgs.raspberrypi-armstubs}/armstub8-gic.bin firmware/armstub8-gic.bin
cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2711-rpi-4-b.dtb firmware/
'';
populateRootCommands = ''
mkdir -p ./files/boot

32
nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix
View file

@ -3,36 +3,6 @@
{ config, lib, pkgs, ... }:
{
imports = [
../../profiles/base.nix
../../profiles/installation-device.nix
./sd-image.nix
];
boot.loader.grub.enable = false;
boot.loader.raspberryPi.enable = true;
boot.loader.raspberryPi.version = 4;
imports = [ ./sd-image-aarch64.nix ];
boot.kernelPackages = pkgs.linuxPackages_rpi4;
boot.consoleLogLevel = lib.mkDefault 7;
sdImage = {
firmwareSize = 128;
firmwarePartitionName = "NIXOS_BOOT";
# This is a hack to avoid replicating config.txt from boot.loader.raspberryPi
populateFirmwareCommands =
"${config.system.build.installBootLoader} ${config.system.build.toplevel} -d ./firmware";
# As the boot process is done entirely in the firmware partition.
populateRootCommands = "";
};
fileSystems."/boot/firmware" = {
# This effectively "renames" the attrsOf entry set in sd-image.nix
mountPoint = "/boot";
neededForBoot = true;
};
# the installation media is also the installation target,
# so we don't want to provide the installation configuration.nix.
installer.cloneConfig = false;
}

4
pkgs/applications/audio/milkytracker/default.nix
View file

@ -2,14 +2,14 @@
, SDL2, alsaLib, libjack2, lhasa, perl, rtmidi, zlib, zziplib }:
stdenv.mkDerivation rec {
version = "1.02.00";
version = "1.03.00";
pname = "milkytracker";
src = fetchFromGitHub {
owner = "milkytracker";
repo = "MilkyTracker";
rev = "v${version}";
sha256 = "05a6d7l98k9i82dwrgi855dnccm3f2lkb144gi244vhk1156n0ca";
sha256 = "025fj34gq2kmkpwcswcyx7wdxb89vm944dh685zi4bxx0hz16vvk";
};
nativeBuildInputs = [ cmake pkgconfig makeWrapper ];

28
pkgs/applications/audio/rkrlv2/default.nix
View file

@ -1,26 +1,26 @@
{ stdenv, fetchFromGitHub,
automake, pkgconfig, lv2, fftw, cmake, xorg, libjack2, libsamplerate, libsndfile
}:
{ stdenv, fetchFromGitHub, pkg-config, lv2, fftw, cmake, libXpm
, libXft, libjack2, libsamplerate, libsndfile }:
stdenv.mkDerivation rec {
repo = "rkrlv2";
name = "${repo}-b2.0";
pname = "rkrlv2";
version = "beta_3";
src = fetchFromGitHub {
owner = "ssj71";
inherit repo;
rev = "beta_2";
sha256 = "128jcilbrd1l65c01w2bazsb21x78mng0jjkhi3x9crf1n9qbh2m";
repo = pname;
rev = version;
sha256 = "WjpPNUEYw4aGrh57J+7kkxKFXgCJWNaWAmueFbNUJJo=";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = with xorg; [ automake lv2 fftw cmake libXpm libjack2 libsamplerate libsndfile libXft ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ libXft libXpm lv2 fftw libjack2 libsamplerate libsndfile ];
meta = {
meta = with stdenv.lib; {
description = "Rakarrak effects ported to LV2";
homepage = "https://github.com/ssj71/rkrlv2";
license = stdenv.lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.joelmo ];
platforms = stdenv.lib.platforms.linux;
license = licenses.gpl2Only;
maintainers = [ maintainers.joelmo ];
platforms = platforms.unix;
broken = stdenv.isAarch64; # g++: error: unrecognized command line option '-mfpmath=sse'
};
}

12
pkgs/applications/misc/keeweb/default.nix
View file

@ -4,19 +4,21 @@ let
throwSystem = throw "Unsupported system: ${system}";
pname = "keeweb";
version = "1.16.0";
version = "1.16.5";
name = "${pname}-${version}";
suffix = {
x86_64-linux = "linux.AppImage";
x86_64-darwin = "mac.dmg";
x86_64-darwin = "mac.x64.dmg";
aarch64-darwin = "mac.arm64.dmg";
}.${system} or throwSystem;
src = fetchurl {
url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.${suffix}";
sha256 = {
x86_64-linux = "1pivic7n5nv00s8bb51i2jz2mxgjn92hkc8n0p8662ai1cdng47g";
x86_64-darwin = "0q6k0qgkgzid9yjbfsfpp8l9dr0n8xp25a4jf2bxwickm4irs9mz";
x86_64-linux = "18qcr8zyn20n5zrrha0qwgq2ic10bp189fps87lbnmcjknrkac9g";
x86_64-darwin = "0crpjkcqgs7q5c814bx2npjh9kpyyb87yagm5wcy9j21kwrbqv6k";
aarch64-darwin = "1wkf9inrm5qg0c4xrk0s97mx5j21xvlqwwkvydl513gyfzi2g9gp";
}.${system} or throwSystem;
};
@ -29,7 +31,7 @@ let
homepage = "https://keeweb.info/";
license = licenses.mit;
maintainers = with maintainers; [ sikmir ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
};
linux = appimageTools.wrapType2 rec {

4
pkgs/applications/networking/instant-messengers/teams/default.nix
View file

@ -15,11 +15,11 @@
stdenv.mkDerivation rec {
pname = "teams";
version = "1.3.00.25560";
version = "1.3.00.30857";
src = fetchurl {
url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb";
sha256 = "0kpcd9q6v2qh0dzddykisdbi3djbxj2rl70wchlzrb6bx95hkzmc";
sha256 = "06r48h1fr2si2g5ng8hsnbcmr70iapnafj21v5bzrzzrigzb2n2h";
};
nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook ];

6
pkgs/applications/networking/mailreaders/mailnag/default.nix
View file

@ -24,13 +24,13 @@
python3Packages.buildPythonApplication rec {
pname = "mailnag";
version = "2.0.0";
version = "2.1.0";
src = fetchFromGitHub {
owner = "pulb";
repo = "mailnag";
rev = "v${version}";
sha256 = "0q97v9i96br22z3h6r2mz79i68ib8m8x42yxky78szfrf8j60i30";
sha256 = "08jqs3v01a9gkjca9xgjidhdgvnlm4541z9bwh9m3k5p2g76sz96";
};
buildInputs = [
@ -49,7 +49,7 @@ python3Packages.buildPythonApplication rec {
nativeBuildInputs = [
gettext
wrapGAppsHook
# To later add plugins to
# To later add plugins to
xorg.lndir
];

4
pkgs/development/libraries/kde-frameworks/sonnet.nix
View file

@ -1,6 +1,6 @@
{ mkDerivation, lib
, extra-cmake-modules
, hunspell, qtbase, qttools
, aspell, qtbase, qttools
}:
mkDerivation {
@ -10,6 +10,6 @@ mkDerivation {
broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ hunspell qttools ];
buildInputs = [ aspell qttools ];
propagatedBuildInputs = [ qtbase ];
}

18
pkgs/development/ocaml-modules/irmin/chunk.nix Normal file
View file

@ -0,0 +1,18 @@
{ lib, buildDunePackage, irmin, irmin-mem, irmin-test }:
buildDunePackage rec {
pname = "irmin-chunk";
inherit (irmin) version src useDune2;
propagatedBuildInputs = [ irmin ];
doCheck = true;
checkInputs = [ irmin-mem irmin-test ];
meta = irmin.meta // {
description = "Irmin backend which allow to store values into chunks";
};
}

11
pkgs/development/python-modules/ovito/default.nix
View file

@ -15,26 +15,25 @@
}:
stdenv.mkDerivation rec {
version = "3.3.1";
version = "3.3.5";
pname = "ovito";
src = fetchFromGitLab {
owner = "stuko";
repo = pname;
rev = "v${version}";
sha256 = "0rm1qxa0fanaaqg0idr6rf2s2xlbyn1dzjzwh3rddy9mgl60lj2h";
sha256 = "2tptLK0RU0afSFFE7uzL8bZ5j+nyRyh97ujJAHFh0wQ=";
};
buildInputs = [ cmake ffmpeg netcdf qscintilla zlib boost zlib git fftw hdf5 libssh qt5.qtbase qt5.qtsvg ];
nativeBuildInputs = [ cmake git ];
buildInputs = [ ffmpeg netcdf qscintilla zlib boost zlib fftw hdf5 libssh qt5.qtbase qt5.qtsvg ];
propagatedBuildInputs = with python.pkgs; [ sphinx numpy sip pyqt5 matplotlib ase ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Scientific visualization and analysis software for atomistic simulation data";
homepage = "https://www.ovito.org";
license = licenses.gpl3;
license = with licenses; [ gpl3Only mit ];
maintainers = with maintainers; [ costrouc ];
# ensures not built on hydra
# https://github.com/NixOS/nixpkgs/pull/46846#issuecomment-436388048

4
pkgs/development/python-modules/smart_open/default.nix
View file

@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "smart_open";
version = "4.0.1";
version = "4.1.0";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "49396d86de8e0d609ec40422c59f837dd944dcdf727feed6f2ff8cbdc0e3bc8e";
sha256 = "26af5c1a3f2b76aab8c3200310f0fc783790ec5a231ffeec102e620acdd6262e";
};
# nixpkgs version of moto is >=1.2.0, remove version pin to fix build

19
pkgs/development/tools/hover/default.nix
View file

@ -1,10 +1,10 @@
{ lib
, buildGoModule
, buildFHSUserEnv
, binutils
, dejavu_fonts
, pkgconfig
, pkg-config
, fetchFromGitHub
, stdenv
, roboto
, writeScript
, xorg
@ -18,7 +18,7 @@
let
pname = "hover";
version = "0.43.0";
version = "0.46.1";
libs = with xorg; [
libX11.dev
@ -36,23 +36,23 @@ let
hover = buildGoModule rec {
inherit pname version;
meta = with stdenv.lib; {
meta = with lib; {
description = "A build tool to run Flutter applications on desktop";
homepage = "https://github.com/go-flutter-desktop/hover";
license = licenses.bsd3;
platforms = platforms.linux ++ platforms.darwin;
platforms = platforms.linux;
maintainers = [ maintainers.ericdallo maintainers.thiagokokada];
};
subPackages = [ "." ];
vendorSha256 = "1wr08phjm87dxim47i8449rmq5wfscvjyz65g3lxmv468x209pam";
vendorSha256 = "1ixfmhp5g57hn23zyf85hy9jnyadayhdbalj4d0bx4q4p5c9qchi";
src = fetchFromGitHub {
rev = "v${version}";
owner = "go-flutter-desktop";
repo = pname;
sha256 = "0iw6sxg86wfdbihl2hxzn43ppdzl1p7g5b9wl8ac3xa9ix8759ax";
sha256 = "04f3dx2dcllfrw3ay1sbb72pj18ln7bxi9rrcaahqhsd7bn2ff9k";
};
nativeBuildInputs = [ addOpenGLRunpath makeWrapper ];
@ -75,7 +75,7 @@ let
chmod -R a+rx $out/share/assets
wrapProgram "$out/bin/hover" \
--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath libs}
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath libs}
'';
postFixup = ''
@ -87,12 +87,13 @@ in
buildFHSUserEnv rec {
name = pname;
targetPkgs = pkgs: [
binutils
dejavu_fonts
flutter
gcc
go
hover
pkgconfig
pkg-config
roboto
] ++ libs;

11
pkgs/development/tools/mpfshell/default.nix
View file

@ -1,20 +1,23 @@
{ lib, python3Packages, fetchFromGitHub }:
python3Packages.buildPythonPackage rec {
name = "mpfshell-${version}";
version = "0.8.1";
pname = "mpfshell-unstable";
version = "2020-04-11";
src = fetchFromGitHub {
owner = "wendlers";
repo = "mpfshell";
rev = version;
sha256 = "1n4ap4yfii54y125f9n9krc0lc0drwg3hsq4z6g89xbswdx9sygr";
rev = "429469fcccbda770fddf7a4277f5db92b1217664";
sha256 = "0md6ih9vp65dacqy8gki3b2p4v76xb9ijqmxymk4b4f9z684x2m7";
};
propagatedBuildInputs = with python3Packages; [
pyserial colorama websocket_client
];
doCheck = false;
pythonImportsCheck = [ "mp.mpfshell" ];
meta = with lib; {
homepage = "https://github.com/wendlers/mpfshell";
description = "A simple shell based file explorer for ESP8266 Micropython based devices";

4
pkgs/games/trackballs/default.nix
View file

@ -4,13 +4,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "trackballs";
version = "1.3.1";
version = "1.3.2";
src = fetchFromGitHub {
owner = "trackballs";
repo = "trackballs";
rev = "v${version}";
sha256 = "1yjzz50r57aahy7wcbsmhrd40abzyriq40j49225ya7m9g28vmgl";
sha256 = "G+KfQgqk+iI+Beb/ZRul2ArCBcvwYQ/ftEWzdrtwb18=";
};
buildInputs = [ cmake zlib SDL2 SDL2_ttf SDL2_mixer SDL2_image guile gettext libGLU libGL ];

12
pkgs/misc/uboot/default.nix
View file

@ -314,6 +314,18 @@ in {
filesToInstall = ["u-boot.bin"];
};
ubootRaspberryPi4_32bit = buildUBoot {
defconfig = "rpi_4_32b_defconfig";
extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot.bin"];
};
ubootRaspberryPi4_64bit = buildUBoot {
defconfig = "rpi_4_defconfig";
extraMeta.platforms = ["aarch64-linux"];
filesToInstall = ["u-boot.bin"];
};
ubootRaspberryPiZero = buildUBoot {
defconfig = "rpi_0_w_defconfig";
extraMeta.platforms = ["armv6l-linux"];

568
pkgs/misc/vim-plugins/generated.nix
View file

File diff suppressed because it is too large Load diff

8
pkgs/misc/vim-plugins/vim-plugin-names
View file

@ -1,8 +1,8 @@
907th/vim-auto-save
aca/completion-tabnine
ackyshake/Spacegray.vim@main
airblade/vim-gitgutter
airblade/vim-rooter
ajh17/Spacegray.vim
aklt/plantuml-syntax
altercation/vim-colors-solarized
alvan/vim-closetag
@ -34,7 +34,7 @@ bling/vim-bufferline
blueyed/vim-diminactive
bogado/file-line
bohlender/vim-smt2
brennanfee/vim-gui-position
brennanfee/vim-gui-position@main
bronson/vim-trailing-whitespace
brooth/far.vim
buoto/gotests-vim
@ -399,7 +399,7 @@ nvim-treesitter/nvim-treesitter-textobjects
nvim-treesitter/playground
ocaml/vim-ocaml
octol/vim-cpp-enhanced-highlight
Olical/conjure
Olical/conjure@main
OrangeT/vim-csharp
osyo-manga/shabadou.vim
osyo-manga/vim-anzu
@ -507,8 +507,8 @@ slashmili/alchemist.vim
sodapopcan/vim-twiggy
solarnz/arcanist.vim
sonph/onehalf
steelsojka/completion-buffers
srcery-colors/srcery-vim
steelsojka/completion-buffers
stefandtw/quickfix-reflector.vim
stephpy/vim-yaml
sunaku/vim-dasht

25
pkgs/os-specific/linux/erofs-utils/default.nix Normal file
View file

@ -0,0 +1,25 @@
{ stdenv, fetchgit, autoreconfHook, pkgconfig, fuse, libuuid, lz4 }:
stdenv.mkDerivation rec {
pname = "erofs-utils";
version = "1.2";
outputs = [ "out" "man" ];
src = fetchgit {
url =
"https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git";
rev = "v" + version;
sha256 = "07hvijq2hsn3gg1kb8abrfk23n83j57yx8kyv4wqgwhhvd30myjc";
};
buildInputs = [ autoreconfHook pkgconfig fuse libuuid lz4 ];
configureFlags = [ "--enable-fuse" ];
meta = with stdenv.lib; {
description = "Userspace utilities for linux-erofs file system";
license = with licenses; [ gpl2 ];
maintainers = with maintainers; [ ehmry ];
platforms = platforms.linux;
};
}

51
pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix Normal file
View file

@ -0,0 +1,51 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig }:
let
inherit (stdenv.lib) optionals;
in
stdenv.mkDerivation {
pname = "raspberrypi-armstubs";
version = "2020-10-08";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "tools";
rev = "fc0e73c13865450e95edd046200e42a6e52d8256";
sha256 = "1g6ikpjcrm5x0rk5aiwjdd8grf997qkvgamcrdxy6k9ln746h25s";
};
NIX_CFLAGS_COMPILE = [
"-march=armv8-a+crc"
];
preConfigure = ''
cd armstubs
'';
makeFlags = [
"CC8=${stdenv.cc.targetPrefix}cc"
"LD8=${stdenv.cc.targetPrefix}ld"
"OBJCOPY8=${stdenv.cc.targetPrefix}objcopy"
"OBJDUMP8=${stdenv.cc.targetPrefix}objdump"
"CC=${stdenv.cc.targetPrefix}cc"
"LD=${stdenv.cc.targetPrefix}ld"
"OBJCOPY=${stdenv.cc.targetPrefix}objcopy"
"OBJDUMP=${stdenv.cc.targetPrefix}objdump"
]
++ optionals (stdenv.isAarch64) [ "armstub8.bin" "armstub8-gic.bin" ]
++ optionals (stdenv.isAarch32) [ "armstub7.bin" "armstub8-32.bin" "armstub8-32-gic.bin" ]
;
installPhase = ''
mkdir -vp $out/
cp -v *.bin $out/
'';
meta = with stdenv.lib; {
description = "Firmware related ARM stubs for the Raspberry Pi";
homepage = https://github.com/raspberrypi/tools;
license = licenses.bsd3;
platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ];
maintainers = with maintainers; [ samueldr ];
};
}

6
pkgs/os-specific/linux/kernel/common-config.nix
View file

@ -819,6 +819,12 @@ let
# See comments on https://github.com/NixOS/nixpkgs/commit/9b67ea9106102d882f53d62890468071900b9647
CRYPTO_AEGIS128_SIMD = whenAtLeast "5.4" no;
# Distros should configure the default as a kernel option.
# We previously defined it on the kernel command line as cma=
# The kernel command line will override a platform-specific configuration from its device tree.
# https://github.com/torvalds/linux/blob/856deb866d16e29bd65952e0289066f6078af773/kernel/dma/contiguous.c#L35-L44
CMA_SIZE_MBYTES = freeform "32";
};
};
in

6
pkgs/shells/zsh/oh-my-zsh/default.nix
View file

@ -5,15 +5,15 @@
, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
stdenv.mkDerivation rec {
version = "2020-12-30";
version = "2020-12-31";
pname = "oh-my-zsh";
rev = "a4a79eaa8cdf39f35dcd1753b973e830ff7b00b8";
rev = "0e7c81316cab30d28d362f69ddc72be83029ac34";
src = fetchFromGitHub {
inherit rev;
owner = "ohmyzsh";
repo = "ohmyzsh";
sha256 = "4L0G1ECFkwg7iytIvg2WQionf48a4LLGIKobopgMm4g=";
sha256 = "cdI0R7F41/UJV0ur8iTH0DQw+L+YvaCVmyGTJEMZr04=";
};
installPhase = ''

28
pkgs/tools/security/ghidra/default.nix
View file

@ -1,6 +1,15 @@
{ stdenv, fetchzip, lib, makeWrapper, autoPatchelfHook
, openjdk11, pam, makeDesktopItem, icoutils
}: let
{ stdenv
, fetchzip
, lib
, makeWrapper
, autoPatchelfHook
, openjdk11
, pam
, makeDesktopItem
, icoutils
}:
let
pkg_path = "$out/lib/ghidra";
@ -13,23 +22,22 @@
categories = "Development;";
};
in stdenv.mkDerivation rec {
pname = "ghidra";
version = "9.2";
versiondate = "20201113";
version = "9.2.1";
versiondate = "20201215";
src = fetchzip {
url = "https://www.ghidra-sre.org/ghidra_${version}_PUBLIC_${versiondate}.zip";
sha256 = "0lcvmbq04qkdsf0bz509frgw79bhyxyixkqg1k712p3576ng3nby";
sha256 = "0rjzmx0nbv9flb666mk3w2dqliyfzjyc4ldjfmb5d29wpgnf9bnz";
};
nativeBuildInputs = [
makeWrapper
autoPatchelfHook
icoutils
];
]
++ lib.optionals stdenv.isLinux [ autoPatchelfHook ];
buildInputs = [
stdenv.cc.cc.lib
@ -62,7 +70,7 @@ in stdenv.mkDerivation rec {
meta = with lib; {
description = "A software reverse engineering (SRE) suite of tools developed by NSA's Research Directorate in support of the Cybersecurity mission";
homepage = "https://ghidra-sre.org/";
platforms = [ "x86_64-linux" ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];
license = licenses.asl20;
maintainers = with maintainers; [ ck3d govanify ];
};

6
pkgs/top-level/all-packages.nix
View file

@ -18219,6 +18219,8 @@ in
dstat = callPackage ../os-specific/linux/dstat { };
erofs-utils = callPackage ../os-specific/linux/erofs-utils { };
# unstable until the first 1.x release
fscrypt-experimental = callPackage ../os-specific/linux/fscrypt { };
fscryptctl-experimental = callPackage ../os-specific/linux/fscryptctl { };
@ -19267,6 +19269,8 @@ in
raspberrypi-eeprom = callPackage ../os-specific/linux/raspberrypi-eeprom {};
raspberrypi-armstubs = callPackage ../os-specific/linux/firmware/raspberrypi/armstubs.nix {};
regionset = callPackage ../os-specific/linux/regionset { };
rfkill_udev = callPackage ../os-specific/linux/rfkill/udev.nix { };
@ -19452,6 +19456,8 @@ in
ubootRaspberryPi2
ubootRaspberryPi3_32bit
ubootRaspberryPi3_64bit
ubootRaspberryPi4_32bit
ubootRaspberryPi4_64bit
ubootRaspberryPiZero
ubootRock64
ubootRockPi4

2
pkgs/top-level/ocaml-packages.nix
View file

@ -429,6 +429,8 @@ let
irmin = callPackage ../development/ocaml-modules/irmin { };
irmin-chunk = callPackage ../development/ocaml-modules/irmin/chunk.nix { };
irmin-fs = callPackage ../development/ocaml-modules/irmin/fs.nix { };
irmin-git = callPackage ../development/ocaml-modules/irmin/git.nix { };