Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
bf6abedefb
|
|
@ -8167,6 +8167,12 @@
|
|||
githubId = 16779;
|
||||
name = "Rickard Nilsson";
|
||||
};
|
||||
riey = {
|
||||
email = "creeper844@gmail.com";
|
||||
github = "Riey";
|
||||
githubId = 14910534;
|
||||
name = "Riey";
|
||||
};
|
||||
rika = {
|
||||
email = "rika@paymentswit.ch";
|
||||
github = "NekomimiScience";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, k3sVersion ? "1.20.4-k3s1" }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, k3sVersion ? "1.20.5-k3s1" }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kube3d";
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "qgroundcontrol";
|
||||
version = "4.1.1";
|
||||
version = "4.1.2";
|
||||
|
||||
qtInputs = [
|
||||
qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2
|
||||
|
|
@ -63,7 +63,7 @@ mkDerivation rec {
|
|||
owner = "mavlink";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1dji7jmwsrgcgzhra94wrgz67ydsdra7p10fw8gbw54gf6ncjfjm";
|
||||
sha256 = "16q0g9b1kyan3qhhp5mmfnrx9h8q7qn83baplbiprqjgpvkxfll4";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gitkraken";
|
||||
version = "7.5.3";
|
||||
version = "7.5.4";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
|
||||
sha256 = "0vxvfq0dh6l1plqbq67gfydr8bh5w3q6d5y3bn3rdia10wa1dac6";
|
||||
sha256 = "1laqki01zcmsl9s18dnwg3x3jbbs0xcipiyj2qlsb1sx9y4x05wm";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "13.10.2",
|
||||
"GITLAB_PAGES_VERSION": "1.36.0",
|
||||
"GITLAB_SHELL_VERSION": "13.17.0"
|
||||
"GITLAB_SHELL_VERSION": "13.17.0",
|
||||
"GITLAB_WORKHORSE_VERSION": "13.10.2"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -69,6 +69,9 @@ class GitLabRepo:
|
|||
|
||||
passthru = {v: self.get_file(v, rev).strip() for v in ['GITALY_SERVER_VERSION', 'GITLAB_PAGES_VERSION',
|
||||
'GITLAB_SHELL_VERSION']}
|
||||
|
||||
passthru["GITLAB_WORKHORSE_VERSION"] = version
|
||||
|
||||
return dict(version=self.rev2version(rev),
|
||||
repo_hash=self.get_git_hash(rev),
|
||||
owner=self.owner,
|
||||
|
|
@ -186,7 +189,7 @@ def update_gitlab_shell():
|
|||
def update_gitlab_workhorse():
|
||||
"""Update gitlab-workhorse"""
|
||||
data = _get_data_json()
|
||||
gitlab_workhorse_version = data['version']
|
||||
gitlab_workhorse_version = data['passthru']['GITLAB_WORKHORSE_VERSION']
|
||||
_call_nix_update('gitlab-workhorse', gitlab_workhorse_version)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -9,12 +9,14 @@
|
|||
|
||||
let
|
||||
baseRustcOpts =
|
||||
[(if release then "-C opt-level=3" else "-C debuginfo=2")]
|
||||
++ ["-C codegen-units=$NIX_BUILD_CORES"]
|
||||
++ ["--remap-path-prefix=$NIX_BUILD_TOP=/" ]
|
||||
++ [(mkRustcDepArgs dependencies crateRenames)]
|
||||
++ [(mkRustcFeatureArgs crateFeatures)]
|
||||
++ extraRustcOpts
|
||||
[
|
||||
(if release then "-C opt-level=3" else "-C debuginfo=2")
|
||||
"-C codegen-units=$NIX_BUILD_CORES"
|
||||
"-C incremental=no"
|
||||
"--remap-path-prefix=$NIX_BUILD_TOP=/"
|
||||
(mkRustcDepArgs dependencies crateRenames)
|
||||
(mkRustcFeatureArgs crateFeatures)
|
||||
] ++ extraRustcOpts
|
||||
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--target ${rust.toRustTargetSpec stdenv.hostPlatform} -C linker=${stdenv.hostPlatform.config}-gcc"
|
||||
# since rustc 1.42 the "proc_macro" crate is part of the default crate prelude
|
||||
# https://github.com/rust-lang/cargo/commit/4d64eb99a4#diff-7f98585dbf9d30aa100c8318e2c77e79R1021-R1022
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ let version_ = lib.splitString "-" crateVersion;
|
|||
version = lib.splitVersion (lib.head version_);
|
||||
rustcOpts = lib.foldl' (opts: opt: opts + " " + opt)
|
||||
(if release then "-C opt-level=3" else "-C debuginfo=2")
|
||||
(["-C codegen-units=$NIX_BUILD_CORES"] ++ extraRustcOpts);
|
||||
(["-C codegen-units=$NIX_BUILD_CORES -C incremental=no"] ++ extraRustcOpts);
|
||||
buildDeps = mkRustcDepArgs buildDependencies crateRenames;
|
||||
authors = lib.concatStringsSep ":" crateAuthors;
|
||||
optLevel = if release then 3 else 0;
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yaru";
|
||||
version = "20.10.6.1";
|
||||
version = "21.04.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ubuntu";
|
||||
repo = "yaru";
|
||||
rev = version;
|
||||
sha256 = "0kcmxfz2rfav7aj5v1vv335vqzyj0n53lbhwx0g6gxxfi0x3vv6v";
|
||||
sha256 = "0z6k8q9b5xjx6xwirqbsqq5jjxw79ar2d61r7cgipqmbjdsjfgjz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ];
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ let
|
|||
|
||||
inherit (lib) optionals optionalString;
|
||||
|
||||
version = "1.15.10";
|
||||
version = "1.15.11";
|
||||
|
||||
go_bootstrap = buildPackages.callPackage ./bootstrap.nix { };
|
||||
|
||||
|
|
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/go/go${version}.src.tar.gz";
|
||||
sha256 = "0rfx20y13cflv68nn8jci1fx34vfdn7qgyavm5hivd0h15pcmny1";
|
||||
sha256 = "1rb1s130yqy80kcl140k5a53xhvw4fmrpmclvqygcv67si0j8nzj";
|
||||
};
|
||||
|
||||
# perl is used for testing go vet
|
||||
|
|
|
|||
|
|
@ -3,6 +3,6 @@
|
|||
# How to obtain `sha256`:
|
||||
# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
|
||||
mkDerivation {
|
||||
version = "23.2.6";
|
||||
sha256 = "sha256-G930sNbr8h5ryI/IE+J6OKhR5ij68ZhGo1YIEjSOwGU=";
|
||||
version = "23.3.1";
|
||||
sha256 = "1nx9yv3l8hf37js7pqs536ywy786mxhkqba1jsmy1b3yc6xki1mq";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
|||
export AS=$CC
|
||||
'';
|
||||
|
||||
configureFlags = lib.optional enableShared [ "--enable-shared" ]
|
||||
configureFlags = lib.optional enableShared "--enable-shared"
|
||||
++ lib.optional (!stdenv.isi686) "--enable-pic"
|
||||
++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--cross-prefix=${stdenv.cc.targetPrefix}";
|
||||
|
||||
|
|
|
|||
|
|
@ -44,7 +44,9 @@ buildPythonPackage rec {
|
|||
|
||||
# Relax version constraint
|
||||
postPatch = ''
|
||||
sed -i 's/coverage < 4/coverage/' setup.py
|
||||
substituteInPlace setup.py \
|
||||
--replace 'coverage < 4' 'coverage' \
|
||||
--replace 'fido2>=0.8.1,<0.9.0' 'fido2>=0.8.1,<1.0.0'
|
||||
'';
|
||||
|
||||
# Test suite writes files to $HOME/.aws/, or /homeless-shelter if unset
|
||||
|
|
|
|||
35
pkgs/development/python-modules/awslambdaric/default.nix
Normal file
35
pkgs/development/python-modules/awslambdaric/default.nix
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, isPy27, pytestCheckHook, autoconf
|
||||
, automake, cmake, gcc, libtool, perl, simplejson }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "awslambdaric";
|
||||
version = "1.0.0";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "aws-lambda-python-runtime-interface-client";
|
||||
rev = "v${version}";
|
||||
sha256 = "13v1lsp3lxbqknvlb3gvljjf3wyrx5jg8sf9yfiaj1sm8pb8pmrf";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ simplejson ];
|
||||
|
||||
nativeBuildInputs = [ autoconf automake cmake libtool perl ];
|
||||
|
||||
buildInputs = [ gcc ];
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "awslambdaric" "runtime_client" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "AWS Lambda Runtime Interface Client for Python";
|
||||
homepage = "https://github.com/aws/aws-lambda-python-runtime-interface-client";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ austinbutler ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -9,17 +9,27 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fido2";
|
||||
version = "0.8.1";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1hzprnd407g2xh9kyv8j8pq949hwr1snmg3fp65pqfbghzv6i424";
|
||||
hash = "sha256-hoDuJSOOIwdZbrOQCg+MDZzJEYkUbtgDlUTxo6ad/m4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six cryptography ];
|
||||
|
||||
checkInputs = [ mock pyfakefs ];
|
||||
|
||||
# Testing with `python setup.py test` doesn't work:
|
||||
# https://github.com/Yubico/python-fido2/issues/108#issuecomment-763513576
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
python -m unittest discover -v
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "fido2" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -19,11 +19,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "internetarchive";
|
||||
version = "1.9.9";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a1614cbf35499d833e07699ddfd344764f86959fd5535aa9ce1203f57a77f970";
|
||||
sha256 = "515e6646a2b917c15f2241670d21f14a014b9c67dc509aef4d4aca5a59cdda65";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -52,7 +52,8 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "A Python and Command-Line Interface to Archive.org";
|
||||
homepage = "https://github.com/jjjake/internetarchive";
|
||||
license = licenses.agpl3;
|
||||
changelog = "https://github.com/jjjake/internetarchive/raw/v${version}/HISTORY.rst";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = [ maintainers.marsam ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
32
pkgs/development/python-modules/makefun/default.nix
Normal file
32
pkgs/development/python-modules/makefun/default.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{ lib
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, setuptools_scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "makefun";
|
||||
version = "1.11.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-2qNQpILtWLVyREPGUUMhkem5ewyDdDh50JExccaigIU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools_scm ];
|
||||
|
||||
# Disabling tests for now due to various (transitive) dependencies on modules
|
||||
# from @smarie which are, as of yet, not part of nixpkgs. Also introduces
|
||||
# a tricky dependency: makefun tests depend on pytest-cases, installing
|
||||
# pytest-cases depends on makefun.
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "makefun" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/smarie/python-makefun";
|
||||
description = "Small library to dynamically create python functions";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ veehaitch ];
|
||||
};
|
||||
}
|
||||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysmappee";
|
||||
version = "0.2.18";
|
||||
version = "0.2.23";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "smappee";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-DnRtKr8aGZ6rcN/wTpcFNaI+EJm07nObfWyBpLkQF38=";
|
||||
sha256 = "sha256-vxCZzkngYnc+hD3gT1x7qAQTFjpmmgRU5F6cusNDNgk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -60,5 +60,8 @@
|
|||
homepage = "https://github.com/solokeys/solo-python";
|
||||
maintainers = with maintainers; [ wucke13 ];
|
||||
license = with licenses; [ asl20 mit ];
|
||||
# solo-python v0.0.27 does not support fido2 >= v0.9
|
||||
# https://github.com/solokeys/solo-python/issues/110
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,26 +1,45 @@
|
|||
{ lib, fetchPypi, buildPythonPackage, setuptools_scm, pytest, mock }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "wakeonlan";
|
||||
version = "1.1.6";
|
||||
version = "2.0.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "5e6013a17004809e676c150689abd94bcc0f12a37ad3fbce1f6270968f95ffa9";
|
||||
src = fetchFromGitHub {
|
||||
owner = "remcohaszing";
|
||||
repo = "pywakeonlan";
|
||||
rev = version;
|
||||
sha256 = "0p9jyiv0adcymbnmbay72g9phlbhsr4kmrwxscbdjq81gcmxsi0y";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "setuptools-scm ~= 1.15.7" "setuptools-scm"
|
||||
'';
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
checkInputs = [ pytest mock ];
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ setuptools_scm ];
|
||||
patches = [
|
||||
# Switch to poetry-core, https://github.com/remcohaszing/pywakeonlan/pull/19
|
||||
(fetchpatch {
|
||||
name = "switch-to-poetry-core.patch";
|
||||
url = "https://github.com/remcohaszing/pywakeonlan/commit/6aa5050ed94ef718dfcd0b946546b6a738f47ee3.patch";
|
||||
sha256 = "1xzj2464ziwm7bp05bzbjwjp9whmgp1py3isr41d92qvnil86vm6";
|
||||
})
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
py.test
|
||||
'';
|
||||
pytestFlagsArray = [ "test_wakeonlan.py" ];
|
||||
|
||||
pythonImportsCheck = [ "wakeonlan" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A small python module for wake on lan";
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "xknx";
|
||||
version = "0.17.5";
|
||||
version = "0.18.0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "XKNX";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-oLm1Bh58mKwbQf9FloqEnypzANikxgdFpAB99h/Mb9U=";
|
||||
sha256 = "sha256-8g8DrFvhecdPsfiw+uKnfJOrLQeuFUziK2Jl3xKmrf4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,63 +0,0 @@
|
|||
{ fetchFromGitHub, lib, mkDerivation
|
||||
# nativeBuildInputs
|
||||
, qmake, pkg-config
|
||||
# Qt
|
||||
, qtbase, qtsvg, qtwebengine
|
||||
# buildInputs
|
||||
, r2-for-cutter
|
||||
, python3
|
||||
, wrapQtAppsHook }:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "radare2-cutter";
|
||||
version = "1.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "radareorg";
|
||||
repo = "cutter";
|
||||
rev = "v${version}";
|
||||
sha256 = "0ljj3j3apbbw628n2nyrxpbnclixx20bqjxm0xwggqzz9vywsar0";
|
||||
};
|
||||
|
||||
postUnpack = "export sourceRoot=$sourceRoot/src";
|
||||
|
||||
# Remove this "very helpful" helper file intended for discovering r2,
|
||||
# as it's a doozy of harddcoded paths and unexpected behavior.
|
||||
# Happily Nix has everything all set so we don't need it,
|
||||
# other than as basis for the qmakeFlags set below.
|
||||
postPatch = ''
|
||||
substituteInPlace Cutter.pro \
|
||||
--replace "include(lib_radare2.pri)" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ qmake pkg-config python3 wrapQtAppsHook ];
|
||||
propagatedBuildInputs = [ python3.pkgs.pyside2 ];
|
||||
buildInputs = [ qtbase qtsvg qtwebengine r2-for-cutter python3 ];
|
||||
|
||||
qmakeFlags = with python3.pkgs; [
|
||||
"CONFIG+=link_pkg-config"
|
||||
"PKGCONFIG+=r_core"
|
||||
# Leaving this enabled doesn't break build but generates errors
|
||||
# at runtime (to console) about being unable to load needed bits.
|
||||
# Disable until can be looked at.
|
||||
"CUTTER_ENABLE_JUPYTER=false"
|
||||
# Enable support for Python plugins
|
||||
"CUTTER_ENABLE_PYTHON=true"
|
||||
"CUTTER_ENABLE_PYTHON_BINDINGS=true"
|
||||
"SHIBOKEN_EXTRA_OPTIONS+=-I${r2-for-cutter}/include/libr"
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
export NIX_LDFLAGS="$NIX_LDFLAGS $(pkg-config --libs python3-embed)"
|
||||
qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH")
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Qt and C++ GUI for radare2 reverse engineering framework";
|
||||
homepage = src.meta.homepage;
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ mic92 dtzWill ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,9 +1,21 @@
|
|||
{lib, stdenv, fetchFromGitHub
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, buildPackages
|
||||
, pkg-config
|
||||
, libusb-compat-0_1, readline, libewf, perl, zlib, openssl
|
||||
, libuv, file, libzip, xxHash
|
||||
, gtk2 ? null, vte ? null, gtkdialog ? null
|
||||
, libusb-compat-0_1
|
||||
, readline
|
||||
, libewf
|
||||
, perl
|
||||
, zlib
|
||||
, openssl
|
||||
, libuv
|
||||
, file
|
||||
, libzip
|
||||
, xxHash
|
||||
, gtk2 ? null
|
||||
, vte ? null
|
||||
, gtkdialog ? null
|
||||
, python3 ? null
|
||||
, ruby ? null
|
||||
, lua ? null
|
||||
|
|
@ -21,108 +33,84 @@ assert pythonBindings -> python3 != null;
|
|||
let
|
||||
inherit (lib) optional;
|
||||
|
||||
generic = {
|
||||
version_commit, # unused
|
||||
gittap,
|
||||
gittip,
|
||||
rev,
|
||||
version,
|
||||
sha256,
|
||||
cs_ver,
|
||||
cs_sha256
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
pname = "radare2";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "radare";
|
||||
repo = "radare2";
|
||||
inherit rev sha256;
|
||||
};
|
||||
|
||||
postPatch = let
|
||||
capstone = fetchFromGitHub {
|
||||
owner = "aquynh";
|
||||
repo = "capstone";
|
||||
# version from $sourceRoot/shlr/Makefile
|
||||
rev = cs_ver;
|
||||
sha256 = cs_sha256;
|
||||
};
|
||||
in ''
|
||||
mkdir -p build/shlr
|
||||
cp -r ${capstone} capstone-${cs_ver}
|
||||
chmod -R +w capstone-${cs_ver}
|
||||
# radare 3.3 compat for radare2-cutter
|
||||
(cd shlr && ln -s ../capstone-${cs_ver} capstone)
|
||||
tar -czvf shlr/capstone-${cs_ver}.tar.gz capstone-${cs_ver}
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -D -m755 $src/binr/r2pm/r2pm $out/bin/r2pm
|
||||
'';
|
||||
|
||||
WITHOUT_PULL="1";
|
||||
makeFlags = [
|
||||
"GITTAP=${gittap}"
|
||||
"GITTIP=${gittip}"
|
||||
"RANLIB=${stdenv.cc.bintools.bintools}/bin/${stdenv.cc.bintools.targetPrefix}ranlib"
|
||||
];
|
||||
configureFlags = [
|
||||
"--with-sysmagic"
|
||||
"--with-syszip"
|
||||
"--with-sysxxhash"
|
||||
"--with-openssl"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ file readline libusb-compat-0_1 libewf perl zlib openssl libuv ]
|
||||
++ optional useX11 [ gtkdialog vte gtk2 ]
|
||||
++ optional rubyBindings [ ruby ]
|
||||
++ optional pythonBindings [ python3 ]
|
||||
++ optional luaBindings [ lua ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
# radare2 exposes r_lib which depends on these libraries
|
||||
file # for its list of magic numbers (`libmagic`)
|
||||
libzip
|
||||
xxHash
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "unix-like reverse engineering framework and commandline tools";
|
||||
homepage = "http://radare.org/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ raskin makefu mic92 ];
|
||||
platforms = with lib.platforms; linux;
|
||||
inherit version;
|
||||
};
|
||||
};
|
||||
in {
|
||||
#<generated>
|
||||
# DO NOT EDIT! Automatically generated by ./update.py
|
||||
radare2 = generic {
|
||||
version_commit = "25741";
|
||||
gittap = "5.1.1";
|
||||
gittip = "a86f8077fc148abd6443384362a3717cd4310e64";
|
||||
rev = "5.1.1";
|
||||
version = "5.1.1";
|
||||
sha256 = "0hv9x31iabasj12g8f04incr1rbcdkxi3xnqn3ggp8gl4h6pf2f3";
|
||||
cs_ver = "4.0.2";
|
||||
cs_sha256 = "0y5g74yjyliciawpn16zhdwya7bd3d7b1cccpcccc2wg8vni1k2w";
|
||||
};
|
||||
r2-for-cutter = generic {
|
||||
version_commit = "24959";
|
||||
gittap = "4.5.1";
|
||||
gittip = "293cf5ae65ba4e28828095dcae212955593ba255";
|
||||
rev = "4.5.1";
|
||||
version = "4.5.1";
|
||||
sha256 = "0qigy1px0jy74c5ig73dc2fqjcy6vcy76i25dx9r3as6zfpkkaxj";
|
||||
cs_ver = "4.0.2";
|
||||
cs_sha256 = "0y5g74yjyliciawpn16zhdwya7bd3d7b1cccpcccc2wg8vni1k2w";
|
||||
};
|
||||
gittap = "5.1.1";
|
||||
gittip = "a86f8077fc148abd6443384362a3717cd4310e64";
|
||||
rev = "5.1.1";
|
||||
version = "5.1.1";
|
||||
sha256 = "0hv9x31iabasj12g8f04incr1rbcdkxi3xnqn3ggp8gl4h6pf2f3";
|
||||
cs_ver = "4.0.2";
|
||||
cs_sha256 = "0y5g74yjyliciawpn16zhdwya7bd3d7b1cccpcccc2wg8vni1k2w";
|
||||
#</generated>
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "radare2";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "radare";
|
||||
repo = "radare2";
|
||||
inherit rev sha256;
|
||||
};
|
||||
|
||||
postPatch =
|
||||
let
|
||||
capstone = fetchFromGitHub {
|
||||
owner = "aquynh";
|
||||
repo = "capstone";
|
||||
# version from $sourceRoot/shlr/Makefile
|
||||
rev = cs_ver;
|
||||
sha256 = cs_sha256;
|
||||
};
|
||||
in
|
||||
''
|
||||
mkdir -p build/shlr
|
||||
cp -r ${capstone} capstone-${cs_ver}
|
||||
chmod -R +w capstone-${cs_ver}
|
||||
tar -czvf shlr/capstone-${cs_ver}.tar.gz capstone-${cs_ver}
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -D -m755 $src/binr/r2pm/r2pm $out/bin/r2pm
|
||||
'';
|
||||
|
||||
WITHOUT_PULL = "1";
|
||||
makeFlags = [
|
||||
"GITTAP=${gittap}"
|
||||
"GITTIP=${gittip}"
|
||||
"RANLIB=${stdenv.cc.bintools.bintools}/bin/${stdenv.cc.bintools.targetPrefix}ranlib"
|
||||
];
|
||||
configureFlags = [
|
||||
"--with-sysmagic"
|
||||
"--with-syszip"
|
||||
"--with-sysxxhash"
|
||||
"--with-openssl"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ file readline libusb-compat-0_1 libewf perl zlib openssl libuv ]
|
||||
++ optional useX11 [ gtkdialog vte gtk2 ]
|
||||
++ optional rubyBindings [ ruby ]
|
||||
++ optional pythonBindings [ python3 ]
|
||||
++ optional luaBindings [ lua ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
# radare2 exposes r_lib which depends on these libraries
|
||||
file # for its list of magic numbers (`libmagic`)
|
||||
libzip
|
||||
xxHash
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "unix-like reverse engineering framework and commandline tools";
|
||||
homepage = "http://radare.org/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ raskin makefu mic92 ];
|
||||
platforms = with lib.platforms; linux;
|
||||
inherit version;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,24 +48,6 @@ def get_radare2_rev() -> str:
|
|||
raise RuntimeError(f"No release found at {feed_url}")
|
||||
|
||||
|
||||
def get_cutter_version() -> str:
|
||||
version_expr = """
|
||||
(with import <nixpkgs> {}; lib.getVersion (qt5.callPackage <radare2/cutter.nix> {}))
|
||||
"""
|
||||
return sh("nix", "eval", "--raw", version_expr.strip(), "-I", "radare2={0}".format(SCRIPT_DIR))
|
||||
|
||||
|
||||
def get_r2_cutter_rev() -> str:
|
||||
version = get_cutter_version()
|
||||
url = f"https://api.github.com/repos/radareorg/cutter/contents?ref=v{version}"
|
||||
with urllib.request.urlopen(url) as response:
|
||||
data = json.load(response) # type: ignore
|
||||
for entry in data:
|
||||
if entry["name"] == "radare2":
|
||||
return entry["sha"]
|
||||
raise Exception("no radare2 submodule found in github.com/radareorg/cutter")
|
||||
|
||||
|
||||
def git(dirname: str, *args: str) -> str:
|
||||
return sh("git", "-C", dirname, *args)
|
||||
|
||||
|
|
@ -94,43 +76,23 @@ def get_repo_info(dirname: str, rev: str) -> Dict[str, str]:
|
|||
)
|
||||
|
||||
|
||||
def write_package_expr(version: str, info: Dict[str, str]) -> str:
|
||||
return f"""generic {{
|
||||
version_commit = "{info["version_commit"]}";
|
||||
gittap = "{info["gittap"]}";
|
||||
gittip = "{info["gittip"]}";
|
||||
rev = "{info["rev"]}";
|
||||
version = "{version}";
|
||||
sha256 = "{info["sha256"]}";
|
||||
cs_ver = "{info["cs_ver"]}";
|
||||
cs_sha256 = "{info["cs_sha256"]}";
|
||||
}}"""
|
||||
|
||||
|
||||
def main() -> None:
|
||||
radare2_rev = get_radare2_rev()
|
||||
r2_cutter_rev = get_r2_cutter_rev()
|
||||
version = get_radare2_rev()
|
||||
|
||||
with tempfile.TemporaryDirectory() as dirname:
|
||||
git(
|
||||
dirname,
|
||||
"clone",
|
||||
"--branch",
|
||||
radare2_rev,
|
||||
version,
|
||||
"https://github.com/radare/radare2",
|
||||
".",
|
||||
)
|
||||
nix_file = str(SCRIPT_DIR.joinpath("default.nix"))
|
||||
|
||||
radare2_info = get_repo_info(dirname, radare2_rev)
|
||||
|
||||
git(dirname, "fetch", r2_cutter_rev)
|
||||
git(dirname, "checkout", r2_cutter_rev)
|
||||
info = get_repo_info(dirname, version)
|
||||
|
||||
timestamp = git(dirname, "log", "-n1", "--format=%at")
|
||||
r2_cutter_version = datetime.fromtimestamp(int(timestamp)).strftime("%Y-%m-%d")
|
||||
|
||||
r2_cutter_info = get_repo_info(dirname, r2_cutter_rev)
|
||||
|
||||
in_block = False
|
||||
with fileinput.FileInput(nix_file, inplace=True) as f:
|
||||
|
|
@ -140,8 +102,13 @@ def main() -> None:
|
|||
print(
|
||||
f""" #<generated>
|
||||
# DO NOT EDIT! Automatically generated by ./update.py
|
||||
radare2 = {write_package_expr(radare2_rev, radare2_info)};
|
||||
r2-for-cutter = {write_package_expr(r2_cutter_version, r2_cutter_info)};
|
||||
gittap = "{info["gittap"]}";
|
||||
gittip = "{info["gittip"]}";
|
||||
rev = "{info["rev"]}";
|
||||
version = "{version}";
|
||||
sha256 = "{info["sha256"]}";
|
||||
cs_ver = "{info["cs_ver"]}";
|
||||
cs_sha256 = "{info["cs_sha256"]}";
|
||||
#</generated>"""
|
||||
)
|
||||
elif "#</generated>" in l:
|
||||
|
|
|
|||
46
pkgs/development/tools/analysis/rizin/cutter.nix
Normal file
46
pkgs/development/tools/analysis/rizin/cutter.nix
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
{ fetchFromGitHub, lib, mkDerivation
|
||||
# nativeBuildInputs
|
||||
, qmake, pkg-config, cmake
|
||||
# Qt
|
||||
, qtbase, qtsvg, qtwebengine, qttools
|
||||
# buildInputs
|
||||
, rizin
|
||||
, python3
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "cutter";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rizinorg";
|
||||
repo = "cutter";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-uIN/NR+swu9Ie0wP2aBhw5WBvTe9NDmzSs+lQMCeavc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake qmake pkg-config python3 wrapQtAppsHook ];
|
||||
propagatedBuildInputs = [ python3.pkgs.pyside2 ];
|
||||
buildInputs = [ qtbase qttools qtsvg qtwebengine rizin python3 ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCUTTER_USE_BUNDLED_RIZIN=OFF"
|
||||
"-DCUTTER_ENABLE_PYTHON=ON"
|
||||
"-DCUTTER_ENABLE_PYTHON_BINDINGS=ON"
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH")
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Free and Open Source Reverse Engineering Platform powered by rizin";
|
||||
homepage = src.meta.homepage;
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ mic92 dtzWill ];
|
||||
};
|
||||
}
|
||||
71
pkgs/development/tools/analysis/rizin/default.nix
Normal file
71
pkgs/development/tools/analysis/rizin/default.nix
Normal file
|
|
@ -0,0 +1,71 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, libusb-compat-0_1
|
||||
, readline
|
||||
, libewf
|
||||
, perl
|
||||
, zlib
|
||||
, openssl
|
||||
, libuv
|
||||
, file
|
||||
, libzip
|
||||
, lz4
|
||||
, xxHash
|
||||
, meson
|
||||
, cmake
|
||||
, ninja
|
||||
, capstone
|
||||
, tree-sitter
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rizin";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/rizinorg/rizin/releases/download/v${version}/rizin-src-${version}.tar.xz";
|
||||
sha256 = "sha256-npUp8wJiKAaQKSigXtndhJLTJ4+pyFqa0FwDLBqR/sE=";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
"-Duse_sys_capstone=true"
|
||||
"-Duse_sys_magic=true"
|
||||
"-Duse_sys_libzip=true"
|
||||
"-Duse_sys_zlib=true"
|
||||
"-Duse_sys_xxhash=true"
|
||||
"-Duse_sys_lz4=true"
|
||||
"-Duse_sys_openssl=true"
|
||||
"-Duse_sys_tree_sitter=true"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [ pkg-config meson ninja cmake ];
|
||||
|
||||
buildInputs = [
|
||||
file
|
||||
libzip
|
||||
capstone
|
||||
readline
|
||||
libusb-compat-0_1
|
||||
libewf
|
||||
perl
|
||||
zlib
|
||||
lz4
|
||||
openssl
|
||||
libuv
|
||||
tree-sitter
|
||||
xxHash
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "UNIX-like reverse engineering framework and command-line toolset.";
|
||||
homepage = "https://rizin.re/";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ raskin makefu mic92 ];
|
||||
platforms = with lib.platforms; linux;
|
||||
inherit version;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,6 +1,15 @@
|
|||
{ lib, stdenv, fetchurl, unzip, jdk, java ? jdk, makeWrapper }:
|
||||
|
||||
rec {
|
||||
let
|
||||
gradleSpec = { version, nativeVersion, sha256 }: rec {
|
||||
inherit nativeVersion;
|
||||
name = "gradle-${version}";
|
||||
src = fetchurl {
|
||||
inherit sha256;
|
||||
url = "https://services.gradle.org/distributions/${name}-bin.zip";
|
||||
};
|
||||
};
|
||||
in rec {
|
||||
gradleGen = {name, src, nativeVersion} : stdenv.mkDerivation {
|
||||
inherit name src nativeVersion;
|
||||
|
||||
|
|
@ -52,35 +61,30 @@ rec {
|
|||
};
|
||||
};
|
||||
|
||||
# NOTE: Gradle 7 is a release candidate, so point to 6.8.
|
||||
gradle_latest = gradle_6_8;
|
||||
|
||||
gradle_6_8 = gradleGen rec {
|
||||
name = "gradle-6.8.3";
|
||||
gradle_7 = gradleGen (gradleSpec {
|
||||
version = "7.0-rc-2";
|
||||
nativeVersion = "0.22-milestone-11";
|
||||
sha256 = "0gzvigyvwwizx90vnzhdnbm5rdaki11inxna11s4y67xkn8hrnx5";
|
||||
});
|
||||
|
||||
gradle_6_8 = gradleGen (gradleSpec {
|
||||
version = "6.8.3";
|
||||
nativeVersion = "0.22-milestone-9";
|
||||
sha256 = "01fjrk5nfdp6mldyblfmnkq2gv1rz1818kzgr0k2i1wzfsc73akz";
|
||||
});
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://services.gradle.org/distributions/${name}-bin.zip";
|
||||
sha256 = "01fjrk5nfdp6mldyblfmnkq2gv1rz1818kzgr0k2i1wzfsc73akz";
|
||||
};
|
||||
};
|
||||
|
||||
gradle_5_6 = gradleGen rec {
|
||||
name = "gradle-5.6.4";
|
||||
gradle_5_6 = gradleGen (gradleSpec {
|
||||
version = "5.6.4";
|
||||
nativeVersion = "0.18";
|
||||
sha256 = "1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d";
|
||||
});
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://services.gradle.org/distributions/${name}-bin.zip";
|
||||
sha256 = "1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d";
|
||||
};
|
||||
};
|
||||
|
||||
gradle_4_10 = gradleGen rec {
|
||||
name = "gradle-4.10.3";
|
||||
gradle_4_10 = gradleGen (gradleSpec {
|
||||
version = "4.10.3";
|
||||
nativeVersion = "0.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://services.gradle.org/distributions/${name}-bin.zip";
|
||||
sha256 = "0vhqxnk0yj3q9jam5w4kpia70i4h0q4pjxxqwynh3qml0vrcn9l6";
|
||||
};
|
||||
};
|
||||
sha256 = "0vhqxnk0yj3q9jam5w4kpia70i4h0q4pjxxqwynh3qml0vrcn9l6";
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cue";
|
||||
version = "0.2.2";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://cue.googlesource.com/cue";
|
||||
rev = "v${version}";
|
||||
sha256 = "1crl5fldczc3jkwf7gvwvghckr6gfinfslzca4ps1098lbq83zcq";
|
||||
sha256 = "1h3809xgmn7dr57i3cnifr7r555i3zh3kfsv0gxa9nd7068w19xm";
|
||||
};
|
||||
|
||||
vendorSha256 = "0l6slaji9nh16jqp1nvib95h2db1xyjh6knk5hj2zaa1rks4b092";
|
||||
vendorSha256 = "10kvss23a8a6q26a7h1bqc3i0nskm2halsvc9wdv9zf9qsz7zjkp";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
24
pkgs/development/tools/rust/cargo-feature/default.nix
Normal file
24
pkgs/development/tools/rust/cargo-feature/default.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{ lib, rustPlatform, fetchFromGitHub }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-feature";
|
||||
version = "0.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Riey";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0n5kzh756ghfs3cydlcn9mfvpgwy1cjg41h0nd9dbi5cr1fp9x1n";
|
||||
};
|
||||
|
||||
cargoSha256 = "0nvl5smibl81b826xcsrjx8p89lcfpj7wqdsvywnj7jd3p5ag03n";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Allows conveniently modify features of crate";
|
||||
homepage = "https://github.com/Riey/cargo-feature";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ riey ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, SDL2_ttf, libsodium, pkg-config }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "devilutionx";
|
||||
version = "unstable-2020-10-20";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "diasurgical";
|
||||
repo = "devilutionX";
|
||||
rev = "432fbc8ef7b98e567b08e44ce91b198374a5ff01";
|
||||
rev = version;
|
||||
sha256 = "03w3bgmzwsbycx3fzvn47fsmabl069gw77yn2fqg89wlgaw1yrr9";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.11.10";
|
||||
version = "5.11.12";
|
||||
suffix = "xanmod1-cacule";
|
||||
in
|
||||
buildLinux (args // rec {
|
||||
|
|
@ -12,7 +12,7 @@ in
|
|||
owner = "xanmod";
|
||||
repo = "linux";
|
||||
rev = modDirVersion;
|
||||
sha256 = "sha256-Pn1rX61mA8FEt5G1GppK/YyzXnB+hdm5pWh/4swQ4VE=";
|
||||
sha256 = "sha256-omRZ9oAmW3mauUolPf/lgMFMwUCYU4YaZ+OS75Ag+lM=";
|
||||
extraPostFetch = ''
|
||||
rm $out/.config
|
||||
'';
|
||||
|
|
|
|||
35
pkgs/os-specific/linux/vendor-reset/default.nix
Normal file
35
pkgs/os-specific/linux/vendor-reset/default.nix
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
{ stdenv, fetchFromGitHub, kernel, lib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "vendor-reset-${version}-${kernel.version}";
|
||||
version = "unstable-2021-02-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gnif";
|
||||
repo = "vendor-reset";
|
||||
rev = "225a49a40941e350899e456366265cf82b87ad25";
|
||||
sha256 = "sha256-xa7P7+mRk4FVgi+YYCcsFLfyNqPmXvy3xhGoTDVqPxw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
|
||||
hardeningDisable = [ "pic" ];
|
||||
|
||||
makeFlags = [
|
||||
"KVER=${kernel.modDirVersion}"
|
||||
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
install -D vendor-reset.ko -t "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/misc/"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Linux kernel vendor specific hardware reset module";
|
||||
homepage = "https://github.com/gnif/vendor-reset";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ wedens ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
broken = kernel.kernelOlder "4.19";
|
||||
};
|
||||
}
|
||||
|
|
@ -12,16 +12,16 @@
|
|||
# server, and the FHS userenv and corresponding NixOS module should
|
||||
# automatically pick up the changes.
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.22.1.4275-48e10484b";
|
||||
version = "1.22.2.4282-a97b03fad";
|
||||
pname = "plexmediaserver";
|
||||
|
||||
# Fetch the source
|
||||
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
|
||||
sha256 = "08x5ay0nvsdc2n584bw0vdqxh33wn0mlwyqciwgvwq873jn39j3z";
|
||||
sha256 = "01krx6vhk24wm2hikxkfv8m53y8b4yqnkii4j9zf48f1a9hlj2zp";
|
||||
} else fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
|
||||
sha256 = "1h5pkd7fzqlbvqv25cdppglw651yc3026hnyim5vy1s1s182paws";
|
||||
sha256 = "04wzv15pnd4sn6cy62m8prvsxpxj4sg3q9ahwsrn2cj31vgayg0i";
|
||||
};
|
||||
|
||||
outputs = [ "out" "basedb" ];
|
||||
|
|
|
|||
|
|
@ -1,31 +1,31 @@
|
|||
# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev
|
||||
{ lib, buildGoPackage, zip, fetchFromGitHub }:
|
||||
{ lib, buildGoPackage, zip, fetchFromGitHub, makeWrapper, xdg-utils }:
|
||||
let
|
||||
webassets = fetchFromGitHub {
|
||||
owner = "gravitational";
|
||||
repo = "webassets";
|
||||
rev = "2d79788dbcd005bdcfe5b5120007d0faf8f1fc82";
|
||||
sha256 = "001a3bx8yyx1hq8y5yiy1jzp122q8gcl369lj0609gaxp6dk5bdw";
|
||||
rev = "8ace0cfcc6867651bed3fd5b5f35aaa2a80e1106";
|
||||
sha256 = "sha256-mzvYysCFMvWHo8Y4cmhAju62jjpe92j564gc12BSdZA=";
|
||||
};
|
||||
in
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "teleport";
|
||||
version = "5.1.2";
|
||||
version = "5.2.1";
|
||||
|
||||
# This repo has a private submodule "e" which fetchgit cannot handle without failing.
|
||||
src = fetchFromGitHub {
|
||||
owner = "gravitational";
|
||||
repo = "teleport";
|
||||
rev = "v${version}";
|
||||
sha256 = "0h1hn2dpdsmhxac06gn6787z2mnfcwb3wn0c2l7l2qhw6iqpgmvh";
|
||||
sha256 = "sha256-8WEVH+04y1/s9KpBlK/LrgHG7qTpu2LqtanKKdi9N08=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/gravitational/teleport";
|
||||
|
||||
subPackages = [ "tool/tctl" "tool/teleport" "tool/tsh" ];
|
||||
|
||||
nativeBuildInputs = [ zip ];
|
||||
nativeBuildInputs = [ zip makeWrapper ];
|
||||
|
||||
postBuild = ''
|
||||
pushd .
|
||||
|
|
@ -48,6 +48,7 @@ buildGoPackage rec {
|
|||
|
||||
postInstall = ''
|
||||
install -Dm755 -t $client/bin $out/bin/tsh
|
||||
wrapProgram $out/bin/tsh --prefix PATH : ${xdg-utils}/bin
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "topgrade";
|
||||
version = "6.7.0";
|
||||
version = "6.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "r-darwish";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-UikJZFSnkYGGGMm6hrOqs+ax9HwUsZPht9wV79rJBgE=";
|
||||
sha256 = "sha256-PPOsb9bne0q/WGAL3W2RGo/0yxyz/XXU3xYXKcCIqX0=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-8MvXpJVwiIThwq8Du/9nQ0QINpqgemwiRpunzIUqkXk=";
|
||||
cargoSha256 = "sha256-IirU/4hE+jo5A9pB7RnePhqcbCZXBCe0Ki6i7eEWIbk=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Foundation;
|
||||
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "yubikey-manager";
|
||||
version = "3.1.2";
|
||||
version = "4.0.1";
|
||||
|
||||
srcs = fetchurl {
|
||||
url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-dwnIOuu0QyWRl6RSdyQw7dGsAZ4xpXpx6jOpCkp4efE=";
|
||||
hash = "sha256-OxbKo5vwOBabU6/2hO4RMWiifo4IVIxz+DlcwP9xO/E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs =
|
||||
|
|
@ -42,8 +42,7 @@ python3Packages.buildPythonPackage rec {
|
|||
--replace 'compdef _ykman_completion ykman;' '_ykman_completion "$@"'
|
||||
'';
|
||||
|
||||
# See https://github.com/NixOS/nixpkgs/issues/29169
|
||||
doCheck = false;
|
||||
checkInputs = with python3Packages; [ pytestCheckHook makefun ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://developers.yubico.com/yubikey-manager";
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cutter-1.04";
|
||||
pname = "tcp-cutter";
|
||||
version = "1.04";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.digitage.co.uk/digitage/files/cutter/${name}.tgz";
|
||||
url = "http://www.digitage.co.uk/digitage/files/cutter/${pname}-${version}.tgz";
|
||||
sha256 = "100iy31a3njif6vh9gfsqrm14hac05rrflla275gd4rkxdlnqcqv";
|
||||
};
|
||||
|
||||
|
|
@ -620,6 +620,7 @@ mapAliases ({
|
|||
qt-3 = throw "qt-3 has been removed from nixpkgs, as it's unmaintained and insecure"; # added 2021-02-15
|
||||
rfkill = throw "rfkill has been removed, as it's included in util-linux"; # added 2020-08-23
|
||||
riak-cs = throw "riak-cs is not maintained anymore"; # added 2020-10-14
|
||||
radare2-cutter = cutter;
|
||||
rkt = throw "rkt was archived by upstream"; # added 2020-05-16
|
||||
ruby_2_0_0 = throw "ruby_2_0_0 was deprecated on 2018-02-13: use a newer version of ruby";
|
||||
ruby_2_1_0 = throw "ruby_2_1_0 was deprecated on 2018-02-13: use a newer version of ruby";
|
||||
|
|
|
|||
|
|
@ -3674,7 +3674,7 @@ in
|
|||
|
||||
curlftpfs = callPackage ../tools/filesystems/curlftpfs { };
|
||||
|
||||
cutter = callPackage ../tools/networking/cutter { };
|
||||
tcp-cutter = callPackage ../tools/networking/tcp-cutter { };
|
||||
|
||||
cwebbin = callPackage ../development/tools/misc/cwebbin { };
|
||||
|
||||
|
|
@ -11244,6 +11244,7 @@ in
|
|||
};
|
||||
cargo-embed = callPackage ../development/tools/rust/cargo-embed { };
|
||||
cargo-expand = callPackage ../development/tools/rust/cargo-expand { };
|
||||
cargo-feature = callPackage ../development/tools/rust/cargo-feature { };
|
||||
cargo-flash = callPackage ../development/tools/rust/cargo-flash { };
|
||||
cargo-fund = callPackage ../development/tools/rust/cargo-fund {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
|
|
@ -12777,6 +12778,7 @@ in
|
|||
gradle_4 = gradle_4_10;
|
||||
gradle_5 = res.gradleGen.gradle_5_6;
|
||||
gradle_6 = res.gradleGen.gradle_6_8;
|
||||
gradle_7 = res.gradleGen.gradle_7;
|
||||
|
||||
gperf = callPackage ../development/tools/misc/gperf { };
|
||||
# 3.1 changed some parameters from int to size_t, leading to mismatches.
|
||||
|
|
@ -13156,12 +13158,14 @@ in
|
|||
|
||||
r10k = callPackage ../tools/system/r10k { };
|
||||
|
||||
inherit (callPackages ../development/tools/analysis/radare2 ({
|
||||
radare2 = callPackage ../development/tools/analysis/radare2 ({
|
||||
inherit (gnome2) vte;
|
||||
lua = lua5;
|
||||
} // (config.radare or {}))) radare2 r2-for-cutter;
|
||||
} // (config.radare or {}));
|
||||
|
||||
radare2-cutter = libsForQt515.callPackage ../development/tools/analysis/radare2/cutter.nix { };
|
||||
rizin = pkgs.callPackage ../development/tools/analysis/rizin { };
|
||||
|
||||
cutter = libsForQt515.callPackage ../development/tools/analysis/rizin/cutter.nix { };
|
||||
|
||||
ragel = ragelStable;
|
||||
|
||||
|
|
@ -19990,6 +19994,8 @@ in
|
|||
|
||||
v86d = callPackage ../os-specific/linux/v86d { };
|
||||
|
||||
vendor-reset = callPackage ../os-specific/linux/vendor-reset { };
|
||||
|
||||
vhba = callPackage ../misc/emulators/cdemu/vhba.nix { };
|
||||
|
||||
virtualbox = callPackage ../os-specific/linux/virtualbox {
|
||||
|
|
|
|||
|
|
@ -655,6 +655,8 @@ in {
|
|||
|
||||
awsiotpythonsdk = callPackage ../development/python-modules/awsiotpythonsdk { };
|
||||
|
||||
awslambdaric = callPackage ../development/python-modules/awslambdaric { };
|
||||
|
||||
axis = callPackage ../development/python-modules/axis { };
|
||||
|
||||
azure-appconfiguration = callPackage ../development/python-modules/azure-appconfiguration { };
|
||||
|
|
@ -4118,6 +4120,8 @@ in {
|
|||
|
||||
mail-parser = callPackage ../development/python-modules/mail-parser { };
|
||||
|
||||
makefun = callPackage ../development/python-modules/makefun { };
|
||||
|
||||
Mako = callPackage ../development/python-modules/Mako { };
|
||||
|
||||
managesieve = callPackage ../development/python-modules/managesieve { };
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user