Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

Merge master into staging-next

authored by github-actions[bot] and committed by GitHub bf6abede 9f7f61b0

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