Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
411aad5a4d
73 changed files with 541 additions and 178 deletions
|
|
@ -39,7 +39,7 @@ jobs:
|
|||
|
||||
Check that all providers build with:
|
||||
```
|
||||
@ofborg build terraform-full
|
||||
@ofborg build terraform.full
|
||||
```
|
||||
branch: terraform-providers-update
|
||||
delete-branch: false
|
||||
|
|
|
|||
|
|
@ -6697,6 +6697,15 @@
|
|||
githubId = 37185887;
|
||||
name = "Calvin Kim";
|
||||
};
|
||||
keksbg = {
|
||||
email = "keksbg@riseup.net";
|
||||
name = "Stella";
|
||||
github = "keksbg";
|
||||
githubId = 10682187;
|
||||
keys = [{
|
||||
fingerprint = "AB42 1F18 5A19 A160 AD77 9885 3D6D CA5B 6F2C 2A7A";
|
||||
}];
|
||||
};
|
||||
keldu = {
|
||||
email = "mail@keldu.de";
|
||||
github = "keldu";
|
||||
|
|
@ -13100,6 +13109,12 @@
|
|||
githubId = 61303;
|
||||
name = "Tom Fitzhenry";
|
||||
};
|
||||
tomhoule = {
|
||||
email = "secondary+nixpkgs@tomhoule.com";
|
||||
github = "tomhoule";
|
||||
githubId = 13155277;
|
||||
name = "Tom Houle";
|
||||
};
|
||||
tomsmeets = {
|
||||
email = "tom.tsmeets@gmail.com";
|
||||
github = "TomSmeets";
|
||||
|
|
|
|||
|
|
@ -162,20 +162,20 @@ in {
|
|||
# TODO currently can't install more than one because `lame` clashes
|
||||
stage-trial = mkPianoteq rec {
|
||||
name = "stage-trial";
|
||||
version = "7.4.1";
|
||||
version = "7.5.4";
|
||||
archdir = "x86-64bit";
|
||||
src = fetchPianoteqTrial {
|
||||
name = "pianoteq_stage_linux_trial_v${versionForFile version}.7z";
|
||||
sha256 = "14mbaz6i1rxqayrjjkck9yx8iijkm4q1qz29ymkd7sz2gpk7fcpa";
|
||||
sha256 = "sha256-ybtq+hjnaQxpLxv2KE0ZcbQXtn5DJJsnMwCmh3rlrIc=";
|
||||
};
|
||||
};
|
||||
standard-trial = mkPianoteq rec {
|
||||
name = "standard-trial";
|
||||
version = "7.4.1";
|
||||
version = "7.5.4";
|
||||
archdir = "x86-64bit";
|
||||
src = fetchPianoteqTrial {
|
||||
name = "pianoteq_linux_trial_v${versionForFile version}.7z";
|
||||
sha256 = "01xh4n0h7dd3xqhm0bx0a62mqmfvxvmr5cm5r2g249c9wqg5i32a";
|
||||
sha256 = "sha256-3a3+SKTEhvDtqK5Kg4E6KiLvn5+j6JN6ntIb72u2bdQ=";
|
||||
};
|
||||
};
|
||||
stage-6 = mkPianoteq rec {
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "sptlrx";
|
||||
version = "0.2.0";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raitonoberu";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-b38DACSdnjwPsLMrkt0Ubpqpn/4SDAgrdSlp9iAcxfE=";
|
||||
sha256 = "sha256-UDxmUc902A6+DC254wyvjSzNs95K7QIuDW+24o8VCCc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-/fqWnRQBpLNoTwqrFDKqQuv1r9do1voysBhLuj223S0=";
|
||||
vendorSha256 = "sha256-t9Mkszzuw7YtBnADsZDjwN2AA6MuQH4+zzDiHe302A4=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
|
@ -19,8 +19,7 @@ buildGoModule rec {
|
|||
updateScript = nix-update-script { attrPath = pname; };
|
||||
tests.version = testers.testVersion {
|
||||
package = sptlrx;
|
||||
# TODO Wrong version in `0.2.0`. Has been fixed upstream.
|
||||
version = "v0.1.0";
|
||||
version = "v${version}"; # needed because testVersion uses grep -Fw
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "http://shibatch.sourceforge.net/";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ leenaars];
|
||||
platforms = with platforms; [ linux ] ;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core, libxkbcommon, mesa }:
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exodus";
|
||||
version = "22.7.15";
|
||||
version = "22.7.29";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip";
|
||||
sha256 = "sha256-KAv+H6uJBDGzjg5Qmy54EtiVvV1OGJ6r3XnAQO7qjIg=";
|
||||
sha256 = "sha256-vshcXuFuOuXlmdgqK+pj6dAbeYGNR2YA79AzkeUzNtk=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
@ -73,6 +73,6 @@ stdenv.mkDerivation rec {
|
|||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ mmahut rople380 ];
|
||||
maintainers = with maintainers; [ mmahut rople380 Crafter ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -286,8 +286,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "vscode-neovim";
|
||||
publisher = "asvetliakov";
|
||||
version = "0.0.86";
|
||||
sha256 = "sha256-XZd2xTcTqT6LytVwN+CybaFT71nwdobgZQQddMFdjU4=";
|
||||
version = "0.0.89";
|
||||
sha256 = "sha256-4cCaMw7joaXeq+dk5cPZz6/zXDlxWeP/3IjkgSmmRvs=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
|
|
@ -2508,8 +2508,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "vim";
|
||||
publisher = "vscodevim";
|
||||
version = "1.23.1";
|
||||
sha256 = "sha256-k3z3n+29vqvC/FqjrHUBnYIVcKuJpiT+nITbqVm0Low=";
|
||||
version = "1.23.2";
|
||||
sha256 = "sha256-QC+5FJYjWsEaao1ifgMTJyg7vZ5JUbNNJiV+OuiIaM0=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
|
|
@ -2556,8 +2556,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "viml";
|
||||
publisher = "xadillax";
|
||||
version = "1.0.1";
|
||||
sha256 = "sha256-mzf2PBSbvmgPjchyKmTaf3nASUi5/S9Djpoeh0y8gH0=";
|
||||
version = "2.1.2";
|
||||
sha256 = "sha256-n91Rj1Rpp7j7gndkt0bV+jT1nRMv7+coVoSL5c7Ii3A=";
|
||||
};
|
||||
meta = with lib; {
|
||||
license = licenses.mit;
|
||||
|
|
|
|||
|
|
@ -16,16 +16,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "epick";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vv9k";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-x1C8kY9VpMg7aXgC/jRsLCeUV8uRLobgjSAQdK2/sHk=";
|
||||
sha256 = "sha256-JSKenJEM+FUk/2BtAstIhJ26kFBRDvvFAlBsb0ltUsY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-KgQOlvKRt47lg7NteqBa2DLKkDf93JTzp9EIHn3clxY=";
|
||||
cargoSha256 = "sha256-hFay+XL2oqA7SC+I3wlrzhUmUitO2vbeqfoArU9Jsp4=";
|
||||
|
||||
nativeBuildInputs = lib.optional stdenv.isLinux python3;
|
||||
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "jrnl";
|
||||
version = "2.8.4";
|
||||
version = "3.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jrnl-org";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Edu+GW/D+R5r0R750Z1f8YUVPMYbm9PK4D73sTDzDEc=";
|
||||
sha256 = "sha256-wyN7dlAbQwqvES8qEJ4Zo+fDMM/Lh9tNjf215Ywop10=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
|
|
@ -31,14 +31,24 @@ python3.pkgs.buildPythonApplication rec {
|
|||
pyxdg
|
||||
pyyaml
|
||||
tzlocal
|
||||
ruamel-yaml
|
||||
rich
|
||||
];
|
||||
|
||||
checkInputs = with python3.pkgs; [
|
||||
pytest-bdd
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
toml
|
||||
];
|
||||
|
||||
# Upstream expects a old pytest-bdd version
|
||||
# Once it changes we should update here too
|
||||
# https://github.com/jrnl-org/jrnl/blob/develop/poetry.lock#L732
|
||||
disabledTests = [
|
||||
"bdd"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'tzlocal = ">2.0, <3.0"' 'tzlocal = ">2.0, !=3.0"'
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://code-industry.net/free-pdf-editor/";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfreeRedistributable;
|
||||
platforms = with platforms; [ "x86_64-linux" ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ cmcdragonkai ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://code-industry.net/free-pdf-editor/";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfreeRedistributable;
|
||||
platforms = with platforms; [ "x86_64-linux" ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nerdctl";
|
||||
version = "0.22.0";
|
||||
version = "0.22.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containerd";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XsAAhSJPb/ZpZb6x0c/soFI8FPrZhX6U76rDQs1Sw04=";
|
||||
sha256 = "sha256-B9C35uxu/l4hFaSnjvXn7SChsCvXok/LcHkiwcndyts=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-kpEdskjmRLM8TpjX6z19E8iG+wwI0vfULNWbPgeW3YM=";
|
||||
vendorSha256 = "sha256-cwtjjb0a1VsZbTyz0TintD5Hdc8K0j7EBiE4UwhGU7c=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -4,18 +4,18 @@
|
|||
|
||||
let
|
||||
pname = "signald";
|
||||
version = "0.18.5";
|
||||
version = "0.19.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-2cb1pyBOoOlFqJsNKXA0Q9x4wCE4yzzcfrDDtTp7HMk=";
|
||||
sha256 = "sha256-Ma6kIKRVM8UUU/TvfVp2RVl/FLxFgBQU3mEypnujJ+c=";
|
||||
};
|
||||
|
||||
jre' = jre_minimal.override {
|
||||
jdk = jdk17_headless;
|
||||
# from https://gitlab.com/signald/signald/-/blob/0.18.5/build.gradle#L173
|
||||
# from https://gitlab.com/signald/signald/-/blob/0.19.1/build.gradle#L173
|
||||
modules = [
|
||||
"java.base"
|
||||
"java.management"
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "r53-ddns";
|
||||
version = "1.0.1";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fleaz";
|
||||
repo = "r53-ddns";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256:1pvd1karq1p81rkq2n7mh040n29f7wb8701ax6g2sqm1yz7gxd08";
|
||||
sha256 = "sha256-KJAPhSGaC3upWLfo2eeSD3Vit9Blmbol7s8y3f849N4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256:1jhwds57gi548ahnh5m342csrs5rv9ysy7fqmfvg5w2s9slswq77";
|
||||
vendorSha256 = "sha256-KkyMd94cejWkgg/RJudy1lm/M3lsEJXFGqVTzGIX3qM=";
|
||||
|
||||
meta = with lib; {
|
||||
license = licenses.mit;
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@ let
|
|||
common = { stname, target, postInstall ? "" }:
|
||||
buildGoModule rec {
|
||||
pname = stname;
|
||||
version = "1.20.3";
|
||||
version = "1.20.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "syncthing";
|
||||
repo = "syncthing";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8sxCTPFdf5VDysANUYqic6zq5gipTL6wmPXstJc+6bA=";
|
||||
hash = "sha256-umnlYvCtT+76Yer17T7ZvWJ5sUdXu+7kiRikrmWrIM8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-CJFKY69Iz8GrVpvUdDveMQQFj6RXApfgYjP7B1wfgfo=";
|
||||
|
|
@ -34,9 +34,8 @@ let
|
|||
|
||||
inherit postInstall;
|
||||
|
||||
passthru.tests = with nixosTests; {
|
||||
init = syncthing-init;
|
||||
relay = syncthing-relay;
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) syncthing syncthing-init syncthing-relay;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{ stdenv, lib, qt5, fetchurl, autoPatchelfHook, dpkg, glibc, cpio, xar, undmg, gtk3, pango }:
|
||||
{ stdenv, lib, writeScript, qt5, fetchurl, autoPatchelfHook, dpkg, glibc, cpio, xar, undmg, gtk3, pango, libxcb }:
|
||||
let
|
||||
pname = "synology-drive-client";
|
||||
baseUrl = "https://global.download.synology.com/download/Utility/SynologyDriveClient";
|
||||
buildNumber = "12920";
|
||||
version = "3.1.0";
|
||||
version = "3.1.0-12923";
|
||||
buildNumber = with lib; last (splitString "-" version);
|
||||
meta = with lib; {
|
||||
description = "Desktop application to synchronize files and folders between the computer and the Synology Drive server.";
|
||||
homepage = "https://www.synology.com/en-global/dsm/feature/drive";
|
||||
|
|
@ -12,18 +12,29 @@ let
|
|||
maintainers = with maintainers; [ jcouyang MoritzBoehme ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
};
|
||||
passthru.updateScript = writeScript "update-synology-drive-client" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl common-updater-scripts
|
||||
|
||||
set -eu -o pipefail
|
||||
|
||||
version="$(curl -s https://www.synology.com/en-uk/releaseNote/SynologyDriveClient \
|
||||
| grep -oP '(?<=data-version=")(\d.){2}\d-\d{5}' \
|
||||
| head -1)"
|
||||
update-source-version synology-drive-client "$version"
|
||||
'';
|
||||
|
||||
linux = qt5.mkDerivation {
|
||||
inherit pname version meta;
|
||||
inherit pname version meta passthru;
|
||||
|
||||
src = fetchurl {
|
||||
url = "${baseUrl}/${version}-${buildNumber}/Ubuntu/Installer/x86_64/synology-drive-client-${buildNumber}.x86_64.deb";
|
||||
sha256 = "sha256-UAO/LwqPchIMhjdQP4METjVorMJsbvIDRkp4JxtZgOs=";
|
||||
url = "${baseUrl}/${version}/Ubuntu/Installer/x86_64/synology-drive-client-${buildNumber}.x86_64.deb";
|
||||
sha256 = "sha256-gL08uJbA2S+SuP1afMBmcJMIcu7QRzdiXgIMxSZQl/I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook dpkg ];
|
||||
|
||||
buildInputs = [ glibc gtk3 pango ];
|
||||
buildInputs = [ glibc gtk3 pango libxcb ];
|
||||
|
||||
unpackPhase = ''
|
||||
mkdir -p $out
|
||||
|
|
@ -44,11 +55,11 @@ let
|
|||
};
|
||||
|
||||
darwin = stdenv.mkDerivation {
|
||||
inherit pname version meta;
|
||||
inherit pname version meta passthru;
|
||||
|
||||
src = fetchurl {
|
||||
url = "${baseUrl}/${version}-${buildNumber}/Mac/Installer/synology-drive-client-${buildNumber}.dmg";
|
||||
sha256 = "15wici8ycil1mfh5cf89rfan4kb93wfkdsd4kmpvzjj4bnddwlxa";
|
||||
url = "${baseUrl}/${version}/Mac/Installer/synology-drive-client-${buildNumber}.dmg";
|
||||
sha256 = "0pwm2xi1b9p9zmhy4dhix3aas49i183wxslyidfwvlaphic9qkxm";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cpio xar undmg ];
|
||||
|
|
|
|||
|
|
@ -41,6 +41,6 @@ mkDerivation rec {
|
|||
homepage = "https://www.welle.io/";
|
||||
maintainers = with maintainers; [ ck3d markuskowa ];
|
||||
license = licenses.gpl2Only;
|
||||
platforms = with platforms; [ "x86_64-linux" "i686-linux" ] ++ darwin;
|
||||
platforms = [ "x86_64-linux" "i686-linux" ] ++ platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||
description = "St. Petersburg genome assembler: assembly toolkit containing various assembly pipelines";
|
||||
license = licenses.gpl2Only;
|
||||
homepage = "http://cab.spbu.ru/software/spades/";
|
||||
platforms = with platforms; [ "x86_64-linux" "x86_64-darwin"];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
maintainers = [ maintainers.bzizou ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
58
pkgs/applications/science/math/scalp/default.nix
Normal file
58
pkgs/applications/science/math/scalp/default.nix
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchgit
|
||||
, cmake
|
||||
, withGurobi ? false
|
||||
, gurobi
|
||||
, withCplex ? false
|
||||
, cplex
|
||||
, withLpsolve ? true
|
||||
, lp_solve
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "scalp";
|
||||
version = "unstable-2022-03-15";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://digidev.digi.e-technik.uni-kassel.de/git/scalp.git";
|
||||
# mirrored at https://github.com/wegank/scalp.git
|
||||
rev = "185b84e4ff967f42cf2de5db4db4e6fa0cc18fb8";
|
||||
sha256 = "sha256-NyMZdJwdD3FR6uweYCclJjfcf3Y24Bns1ViwsmJ5izg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals withGurobi [
|
||||
gurobi
|
||||
] ++ lib.optionals withCplex [
|
||||
cplex
|
||||
] ++ lib.optionals withLpsolve [
|
||||
lp_solve
|
||||
];
|
||||
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "\''$ORIGIN" "\''${CMAKE_INSTALL_PREFIX}/lib"
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_TESTS=${lib.boolToString doCheck}"
|
||||
] ++ lib.optionals withGurobi [
|
||||
"-DGUROBI_DIR=${gurobi}"
|
||||
] ++ lib.optionals withCplex [
|
||||
"-DCPLEX_DIR=${cplex}"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Scalable Linear Programming Library";
|
||||
homepage = "https://digidev.digi.e-technik.uni-kassel.de/scalp/";
|
||||
license = licenses.lgpl3;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ wegank ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, lib, rustPlatform, fetchgit
|
||||
, pkg-config, wayland-scanner
|
||||
, minijail-tools, pkg-config, wayland-scanner
|
||||
, libcap, libdrm, libepoxy, minijail, virglrenderer, wayland, wayland-protocols
|
||||
, linux
|
||||
}:
|
||||
|
|
@ -29,7 +29,7 @@ in
|
|||
|
||||
cargoLock.lockFile = ./Cargo.lock;
|
||||
|
||||
nativeBuildInputs = [ pkg-config wayland-scanner ];
|
||||
nativeBuildInputs = [ minijail-tools pkg-config wayland-scanner ];
|
||||
|
||||
buildInputs = [
|
||||
libcap libdrm libepoxy minijail virglrenderer wayland wayland-protocols
|
||||
|
|
@ -37,19 +37,24 @@ in
|
|||
|
||||
postPatch = ''
|
||||
cp ${./Cargo.lock} Cargo.lock
|
||||
sed -i "s|/usr/share/policy/crosvm/|$out/share/policy/|g" \
|
||||
seccomp/*/*.policy
|
||||
sed -i "s|/usr/share/policy/crosvm/|$PWD/seccomp/${arch}/|g" \
|
||||
seccomp/${arch}/*.policy
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
export DEFAULT_SECCOMP_POLICY_DIR=$out/share/policy
|
||||
|
||||
for policy in seccomp/${arch}/*.policy; do
|
||||
compile_seccomp_policy \
|
||||
--default-action trap $policy ''${policy%.policy}.bpf
|
||||
done
|
||||
'';
|
||||
|
||||
buildFeatures = [ "default" "virgl_renderer" "virgl_renderer_next" ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/policy/
|
||||
cp seccomp/${arch}/* $out/share/policy/
|
||||
cp -v seccomp/${arch}/*.bpf $out/share/policy/
|
||||
'';
|
||||
|
||||
CROSVM_CARGO_TEST_KERNEL_BINARY =
|
||||
|
|
|
|||
|
|
@ -1,4 +1,8 @@
|
|||
{ lib, stdenv, mkRustcDepArgs, mkRustcFeatureArgs, rust }:
|
||||
{ lib, stdenv
|
||||
, mkRustcDepArgs, mkRustcFeatureArgs, needUnstableCLI
|
||||
, rust
|
||||
}:
|
||||
|
||||
{ crateName,
|
||||
dependencies,
|
||||
crateFeatures, crateRenames, libName, release, libPath,
|
||||
|
|
@ -18,6 +22,8 @@
|
|||
(mkRustcFeatureArgs crateFeatures)
|
||||
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
"--target" (rust.toRustTargetSpec stdenv.hostPlatform)
|
||||
] ++ lib.optionals (needUnstableCLI dependencies) [
|
||||
"-Z" "unstable-options"
|
||||
] ++ extraRustcOpts
|
||||
# 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
|
||||
|
|
|
|||
|
|
@ -46,17 +46,28 @@ let
|
|||
)
|
||||
else
|
||||
extern;
|
||||
opts = lib.optionalString (dep.stdlib or false) "noprelude:";
|
||||
filename =
|
||||
if lib.any (x: x == "lib" || x == "rlib") dep.crateType
|
||||
then "${dep.metadata}.rlib"
|
||||
else "${dep.metadata}${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
in
|
||||
(if lib.any (x: x == "lib" || x == "rlib") dep.crateType then
|
||||
" --extern ${name}=${dep.lib}/lib/lib${extern}-${dep.metadata}.rlib"
|
||||
else
|
||||
" --extern ${name}=${dep.lib}/lib/lib${extern}-${dep.metadata}${stdenv.hostPlatform.extensions.sharedLibrary}")
|
||||
" --extern ${opts}${name}=${dep.lib}/lib/lib${extern}-${filename}"
|
||||
)
|
||||
dependencies;
|
||||
|
||||
# Create feature arguments for rustc.
|
||||
mkRustcFeatureArgs = lib.concatMapStringsSep " " (f: ''--cfg feature=\"${f}\"'');
|
||||
|
||||
# Whether we need to use unstable command line flags
|
||||
#
|
||||
# Currently just needed for standard library dependencies, which have a
|
||||
# special "noprelude:" modifier. If in later versions of Rust this is
|
||||
# stabilized we can account for that here, too, so we don't opt into
|
||||
# instability unnecessarily.
|
||||
needUnstableCLI = dependencies:
|
||||
lib.any (dep: dep.stdlib or false) dependencies;
|
||||
|
||||
inherit (import ./log.nix { inherit lib; }) noisily echo_colored;
|
||||
|
||||
configureCrate = import ./configure-crate.nix {
|
||||
|
|
@ -64,7 +75,7 @@ let
|
|||
};
|
||||
|
||||
buildCrate = import ./build-crate.nix {
|
||||
inherit lib stdenv mkRustcDepArgs mkRustcFeatureArgs rust;
|
||||
inherit lib stdenv mkRustcDepArgs mkRustcFeatureArgs needUnstableCLI rust;
|
||||
};
|
||||
|
||||
installCrate = import ./install-crate.nix { inherit stdenv; };
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "accerciser";
|
||||
version = "3.38.0";
|
||||
version = "3.40.0";
|
||||
|
||||
format = "other";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0fd9vv2abd2if2qj4nlfy7mpd7rc4sx18zhmxd5ijlnfhkpggbp5";
|
||||
sha256 = "U3VF1kgTwtKxSne2TiQBABXpl3z1+zz4qmXbzgHqNiU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
homepage = "https://upc.lbl.gov/";
|
||||
license = licenses.mit;
|
||||
platforms = with platforms; [ linux ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ zimbatm ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ stdenv.mkDerivation {
|
|||
homepage = "https://github.com/tomhrr/dale";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ amiloradovsky ];
|
||||
platforms = with platforms; [ "i686-linux" "x86_64-linux" ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
# failed on Darwin: linker couldn't find the FFI lib
|
||||
# failed on AArch64: because LLVM 3.5 is failed there
|
||||
};
|
||||
|
|
|
|||
|
|
@ -46,6 +46,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://www.gnu.org/software/gnat";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ ethindp ];
|
||||
platforms = with platforms; [ "x86_64-linux" ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocaml${ocaml.version}-reason";
|
||||
version = "3.8.0";
|
||||
version = "3.8.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/reasonml/reason/releases/download/${version}/reason-${version}.tbz";
|
||||
sha256 = "sha256:0yc94m3ddk599crg33yxvkphxpy54kmdsl599c320wvn055p4y4l";
|
||||
sha256 = "sha256-v827CfYrTBCPJubcOAQxYT5N5LBl348UNk7+Ss6o5BQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -22,13 +22,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "folly";
|
||||
version = "2022.07.25.00";
|
||||
version = "2022.08.01.00";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "folly";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Bb6Txg0GNhkRP1qqeracmYENrO6x79HXMuWU2gtGGxU=";
|
||||
sha256 = "sha256-34yzl/w3ZaxWIKikFwiUpCty5Cn8V5Fgj5oTZ4QV6ZI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -79,6 +79,6 @@ stdenv.mkDerivation rec {
|
|||
description = "A convenience library for the geocoding and reverse geocoding using Nominatim service";
|
||||
license = licenses.lgpl2Plus;
|
||||
maintainers = teams.gnome.members;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -82,6 +82,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://wiki.gnome.org/Projects/LibGWeather";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = teams.gnome.members;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Library to report hypervisor information from inside a VM";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.womfoo ];
|
||||
platforms = with platforms; [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; # fails on aarch64
|
||||
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; # fails on aarch64
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yoda";
|
||||
version = "1.9.5";
|
||||
version = "1.9.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2";
|
||||
hash = "sha256-WRkaDpr6jbU/+qIHn4Uy5bE94b5iJwPW9wYNNhBSi2s=";
|
||||
hash = "sha256-IVI/ova2yPM0iVnzqUhzSpMMollR08kZC0Qk4Tc18qQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python.pkgs; [ cython makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "suitesparse-graphblas";
|
||||
version = "6.2.5";
|
||||
version = "7.1.2";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "DrTimothyAldenDavis";
|
||||
repo = "GraphBLAS";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-N4yFlTxV+lVz70PSHPuWEEFLp0dpsImXYDLUYEo2JQI=";
|
||||
sha256 = "sha256-fz8e2//bJB9SANEw29VrUeaqvmh/aSu6+ZnkMb6C40k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -360,7 +360,7 @@ final: prev: {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz";
|
||||
sha512 = "sha512-Dtsar03XpCBkcEb2ooGWO/WcgblDTLzGhPcustbehwlFXuTMliMDRzXsfygsgYwQoZnAUKRd1rhpvBNEUziOVw==";
|
||||
sha512 = "sha512-yw50J8If2dKP4wYIi695zthsCASQFHiogGvUHHWd3falx/rpsD6Sb1LMLRV9nO3iGG3lozxNJ2PSINxK7xwdpg==";
|
||||
};
|
||||
postInstall = with pkgs; ''
|
||||
wrapProgram "$out/bin/prisma" \
|
||||
|
|
|
|||
22
pkgs/development/python-modules/bech32/default.nix
Normal file
22
pkgs/development/python-modules/bech32/default.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "bech32";
|
||||
version = "1.2.0";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-fW24IUYDvXhx/PpsCCbvaLhbCr2Q+iHChanF4h0r2Jk=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://pypi.org/project/bech32/";
|
||||
license = with licenses; [ mit ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,22 +1,49 @@
|
|||
{ lib, fetchFromGitHub, buildPythonPackage, ed25519, ecdsa , semver, mnemonic
|
||||
, unidecode, mock, pytest , backports-shutil-which, configargparse
|
||||
, python-daemon, pymsgbox, pynacl }:
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, bech32
|
||||
, buildPythonPackage
|
||||
, cryptography
|
||||
, ed25519
|
||||
, ecdsa
|
||||
, semver
|
||||
, mnemonic
|
||||
, unidecode
|
||||
, mock
|
||||
, pytest
|
||||
, backports-shutil-which
|
||||
, configargparse
|
||||
, python-daemon
|
||||
, pymsgbox
|
||||
, pynacl
|
||||
}:
|
||||
|
||||
# XXX: when changing this package, please test the package onlykey-agent.
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "libagent";
|
||||
version = "0.14.4";
|
||||
version = "0.14.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "romanz";
|
||||
repo = "trezor-agent";
|
||||
rev = "v${version}";
|
||||
sha256 = "1ksv494xpga27ifrjyn1bkqaya5h769lqb9rx1ng0n4kvmnrqr3l";
|
||||
sha256 = "sha256-RISAy0efdatr9u4CWNRGnlffkC8ksw1NyRpJWKwqz+s=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ unidecode backports-shutil-which configargparse
|
||||
python-daemon pymsgbox ecdsa ed25519 mnemonic semver pynacl ];
|
||||
propagatedBuildInputs = [
|
||||
unidecode
|
||||
backports-shutil-which
|
||||
configargparse
|
||||
python-daemon
|
||||
pymsgbox
|
||||
ecdsa
|
||||
ed25519
|
||||
mnemonic
|
||||
semver
|
||||
pynacl
|
||||
bech32
|
||||
cryptography
|
||||
];
|
||||
|
||||
checkInputs = [ mock pytest ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,19 @@
|
|||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, hatchling
|
||||
, userpath
|
||||
, argcomplete
|
||||
, packaging
|
||||
, importlib-metadata
|
||||
, pip
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pipx";
|
||||
version = "1.1.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
|
@ -23,6 +26,10 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-6cKKVOgHIoKNfGqvDWK5cwBGBDkgfyRuBRDV6fruBoA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
userpath
|
||||
argcomplete
|
||||
|
|
@ -31,7 +38,9 @@ buildPythonPackage rec {
|
|||
importlib-metadata
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
|
|
@ -61,6 +70,7 @@ buildPythonPackage rec {
|
|||
"legacy_venv"
|
||||
"determination"
|
||||
"json"
|
||||
"test_list_short"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -6,11 +6,12 @@
|
|||
, cffi
|
||||
, cryptography
|
||||
, ibm-sw-tpm2
|
||||
, pkg-config
|
||||
, pkgconfig
|
||||
, pkgconfig # see nativeBuildInputs
|
||||
, pkg-config # see nativeBuildInputs
|
||||
, pycparser
|
||||
, pytestCheckHook
|
||||
, python
|
||||
, pyyaml
|
||||
, setuptools-scm
|
||||
, tpm2-tss
|
||||
}:
|
||||
|
|
@ -27,9 +28,8 @@ buildPythonPackage rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
cffi
|
||||
pkgconfig
|
||||
# somehow propagating from pkgconfig does not work
|
||||
pkg-config
|
||||
pkgconfig # this is the python module
|
||||
pkg-config # this is the actual pkg-config tool
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
|
|
@ -41,6 +41,7 @@ buildPythonPackage rec {
|
|||
cffi
|
||||
asn1crypto
|
||||
cryptography
|
||||
pyyaml
|
||||
];
|
||||
|
||||
# https://github.com/tpm2-software/tpm2-pytss/issues/341
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "validobj";
|
||||
version = "0.5.1";
|
||||
version = "0.6";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "430b0b56931a2cebdb857a9fe9da2467c06a3b4db37b728e7f1a8706e8887705";
|
||||
sha256 = "sha256-BvnHn0Erk87Ce3tYwYf0tBwRJMrG19Af/Y568VJ02uo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ flit ];
|
||||
|
|
|
|||
|
|
@ -43,13 +43,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "quickemu";
|
||||
version = "3.16";
|
||||
version = "4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "quickemu-project";
|
||||
repo = "quickemu";
|
||||
rev = version;
|
||||
sha256 = "sha256-vzgCPpr0ThDXOkvaOcbyvNkJvvoFpDnx68f1Y8sWUcc=";
|
||||
sha256 = "sha256-CiCQg1UsSAwlEnZEmzU2ynn2RZ+wXPv9FV1b9GVkc00=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
stdenv.mkDerivation rec {
|
||||
pname = "qbs";
|
||||
|
||||
version = "1.22.0";
|
||||
version = "1.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qbs";
|
||||
repo = "qbs";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gFPcT/TNsKEUNzkJVaXHCGNmhQ0dV1/NYgQQInYrcNI=";
|
||||
sha256 = "sha256-F8dfSMim4OVGjBEGtIA4bGTNSLwZSwpHWI0J2e7pKCw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
# function correctly.
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "prisma-engines";
|
||||
version = "4.0.0";
|
||||
version = "4.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prisma";
|
||||
|
|
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
|
|||
# Use system openssl.
|
||||
OPENSSL_NO_VENDOR = 1;
|
||||
|
||||
cargoSha256 = "sha256-//Kis4lDi3SxeptCCnLi/GWPj+Kyay2pQbILYnlEkXE=";
|
||||
cargoSha256 = "sha256-srawH5z38/RvmsXIykSNm8D2DKAcleRJdyjKAAkVwgc=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
@ -59,7 +59,7 @@ rustPlatform.buildRustPackage rec {
|
|||
homepage = "https://www.prisma.io/";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ pamplemousse pimeys superherointj ];
|
||||
maintainers = with maintainers; [ pamplemousse pimeys superherointj tomhoule ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-nextest";
|
||||
version = "0.9.30";
|
||||
version = "0.9.33";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nextest-rs";
|
||||
repo = "nextest";
|
||||
rev = "cargo-nextest-${version}";
|
||||
sha256 = "sha256-IHMehqvNvUNeqFFgIEHF4tmjpOPqAdj0s+/NeXvgqbs=";
|
||||
sha256 = "sha256-RWlpco03YKlYv9QaGaySudBUG+rZaKURdgMeqFwrq1E=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-z8lk2+vKYTVPGw+A3NH6FaZNgivvAblAz+OQOHmNoa4=";
|
||||
cargoSha256 = "sha256-azT4enQOdj2/rznU3fA8tr+4a/mRLj/HNsyDNRYLonM=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
|
|
|
|||
22
pkgs/development/tools/twiggy/default.nix
Normal file
22
pkgs/development/tools/twiggy/default.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{ lib
|
||||
, fetchCrate
|
||||
, rustPlatform }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "twiggy";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-NbtS7A5Zl8634Q3xyjVzNraNszjt1uIXqmctArfnqkk=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-94pfhVZ0CNMn+lCl5O+wOyE+D6fVXbH4NAPx92nMNbM=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://rustwasm.github.io/twiggy/";
|
||||
description = "A code size profiler for Wasm";
|
||||
license = with licenses; [ asl20 mit ];
|
||||
maintainers = with maintainers; [ lucperkins ];
|
||||
};
|
||||
}
|
||||
|
|
@ -11,12 +11,12 @@ let
|
|||
dist = {
|
||||
aarch64-darwin = {
|
||||
arch = "arm64";
|
||||
sha256 = "ddeb3c14cebc26bae01b338a8480aea26025bb033d85d33070ad22a401e52fee";
|
||||
sha256 = "62b4b3c63668fa4074b35afe08c212557437ff54c742a500087c74955cec9e04";
|
||||
};
|
||||
|
||||
x86_64-darwin = {
|
||||
arch = "64";
|
||||
sha256 = "c5b249c9262efae5df9f4ccbc39b39e443a82876485174c2007c8dccc0b02f4b";
|
||||
sha256 = "42160a3c3011f43692fcb28b37dec5f708395318681de960f0cb932cea36021f";
|
||||
};
|
||||
}.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
let
|
||||
pname = "postman";
|
||||
version = "9.22.2";
|
||||
version = "9.25.2";
|
||||
meta = with lib; {
|
||||
homepage = "https://www.getpostman.com";
|
||||
description = "API Development Environment";
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://dl.pstmn.io/download/version/${version}/linux64";
|
||||
sha256 = "cfb85d7ae366ee1487ce1b2dab1c19ffa25c214af5c083a09447ed488493b115";
|
||||
sha256 = "118da102904cd7b04c50d3e2c2daac3fc1228f05e541eacef55e8ecbf73d3896";
|
||||
name = "${pname}.tar.gz";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -70,6 +70,6 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ ];
|
||||
# TODO: Add OS X
|
||||
platforms = with platforms; [ "i686-linux" "x86_64-linux" ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sgt-puzzles";
|
||||
version = "20220613.387d323";
|
||||
version = "20220802.8399cff";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz";
|
||||
hash = "sha256-Vcm7gxC9R7vvLkgkHblvEOONGLkYSHGMRfSBktgN/oQ=";
|
||||
hash = "sha256-f68Nj8P8oIJj1LWyq8Iamv32ex+boPH/lsV5t+YhM9o=";
|
||||
};
|
||||
|
||||
sgt-puzzles-menu = fetchurl {
|
||||
|
|
|
|||
|
|
@ -71,6 +71,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://te4.org/";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
platforms = with platforms; [ "i686-linux" "x86_64-linux" ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
buildInputs = [
|
||||
tpm2-tss tpm2-tools opensc openssl sqlite libyaml
|
||||
(python3.withPackages (ps: [ ps.pyyaml ps.cryptography ps.pyasn1-modules ps.tpm2-pytss ]))
|
||||
(python3.withPackages (ps: with ps; [ packaging pyyaml cryptography pyasn1-modules tpm2-pytss ]))
|
||||
];
|
||||
|
||||
outputs = [ "out" "bin" "dev" ];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
nvidia_x11: sha256:
|
||||
|
||||
{ stdenv, lib, fetchFromGitHub, pkg-config, m4, jansson, gtk2, dbus, gtk3, libXv, libXrandr, libXext, libXxf86vm, libvdpau
|
||||
{ stdenv, lib, fetchFromGitHub, fetchpatch, pkg-config, m4, jansson, gtk2, dbus, gtk3
|
||||
, libXv, libXrandr, libXext, libXxf86vm, libvdpau
|
||||
, librsvg, wrapGAppsHook
|
||||
, withGtk2 ? false, withGtk3 ? true
|
||||
}:
|
||||
|
|
@ -43,21 +44,23 @@ in
|
|||
stdenv.mkDerivation {
|
||||
pname = "nvidia-settings";
|
||||
version = nvidia_x11.settingsVersion;
|
||||
|
||||
inherit src;
|
||||
|
||||
nativeBuildInputs = [ pkg-config m4 ];
|
||||
|
||||
buildInputs = [ jansson libXv libXrandr libXext libXxf86vm libvdpau nvidia_x11 gtk2 dbus ]
|
||||
++ lib.optionals withGtk3 [ gtk3 librsvg wrapGAppsHook ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
makeFlags = nvidia_x11.makeFlags ++ [ "NV_USE_BUNDLED_LIBJANSSON=0" ];
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
patches = lib.optional (lib.versionOlder nvidia_x11.settingsVersion "440")
|
||||
(fetchpatch {
|
||||
# fixes "multiple definition of `VDPAUDeviceFunctions'" linking errors
|
||||
url = "https://github.com/NVIDIA/nvidia-settings/commit/a7c1f5fce6303a643fadff7d85d59934bd0cf6b6.patch";
|
||||
hash = "sha256-ZwF3dRTYt/hO8ELg9weoz1U/XcU93qiJL2d1aq1Jlak=";
|
||||
});
|
||||
|
||||
postPatch = lib.optionalString nvidia_x11.useProfiles ''
|
||||
sed -i 's,/usr/share/nvidia/,${nvidia_x11.bin}/share/nvidia/,g' src/gtk+-2.x/ctkappprofile.c
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
makeFlags = nvidia_x11.makeFlags ++ [ "NV_USE_BUNDLED_LIBJANSSON=0" ];
|
||||
|
||||
preBuild = ''
|
||||
if [ -e src/libXNVCtrl/libXNVCtrl.a ]; then
|
||||
( cd src/libXNVCtrl
|
||||
|
|
@ -66,6 +69,13 @@ stdenv.mkDerivation {
|
|||
fi
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config m4 ];
|
||||
|
||||
buildInputs = [ jansson libXv libXrandr libXext libXxf86vm libvdpau nvidia_x11 gtk2 dbus ]
|
||||
++ lib.optionals withGtk3 [ gtk3 librsvg wrapGAppsHook ];
|
||||
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
postInstall = ''
|
||||
${lib.optionalString (!withGtk2) ''
|
||||
rm -f $out/lib/libnvidia-gtk2.so.*
|
||||
|
|
@ -87,7 +97,6 @@ stdenv.mkDerivation {
|
|||
'';
|
||||
|
||||
binaryName = if withGtk3 then ".nvidia-settings-wrapped" else "nvidia-settings";
|
||||
|
||||
postFixup = ''
|
||||
patchelf --set-rpath "$(patchelf --print-rpath $out/bin/$binaryName):$out/lib:${libXv}/lib" \
|
||||
$out/bin/$binaryName
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rt-tests";
|
||||
version = "2.3";
|
||||
version = "2.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/snapshot/${pname}-${version}.tar.gz";
|
||||
sha256 = "Q+rNdpRdsmW2gcsrfwg12EzpvO6qlEP/Mb/OWQMNmr8=";
|
||||
sha256 = "sha256-yuSfeYTaCZ0F1GXQkDnH8PBvyzR2w/XDitN8csHB9xE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-pages";
|
||||
version = "1.59.0";
|
||||
version = "1.62.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-pages";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YfuGpenypYZrX0loLwBya2Yw1tFqEpEK7fcjCHnyHCQ=";
|
||||
sha256 = "sha256-sGZUns6ad4FQ/5VYEi7hhgp35YIdbwyaMYPMbK8hlNA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-CRIrqM6alELkd7904H7+W9IRICPawEZEcVf98hBQogU=";
|
||||
vendorSha256 = "sha256-UHSXhRfegqgKyFl2W/2am9VNIzVYeIuUsVlha8nAZw0=";
|
||||
subPackages = [ "." ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@ in
|
|||
with python3.pkgs;
|
||||
buildPythonApplication rec {
|
||||
pname = "matrix-synapse";
|
||||
version = "1.63.1";
|
||||
version = "1.64.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-AjxvZye3bRjGT355eAnwuP2lvTU/RSnOPxxKqaUxN9g=";
|
||||
sha256 = "sha256-hybl63hbhuUYnMi03z0Yp7L4n0x01z5uR8r5ZwHzgfI=";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "squid";
|
||||
version = "5.4.1";
|
||||
version = "5.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.squid-cache.org/Versions/v5/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-300xCpFmOuWcKbD4GD8iYjxeb3MYaa95OAWYerlMpBw=";
|
||||
sha256 = "sha256-ONJzOKNHWXzg6T0MO+bl9mtnUEF8R0yofuDWG7bRSNs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "oil";
|
||||
version = "0.11.0";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.oilshell.org/download/oil-${version}.tar.xz";
|
||||
hash = "sha256-5eAK53aFLEEjPvwKMQIZloUjSFaAcU0tzsUAr2PQAgg=";
|
||||
hash = "sha256-1zwGfM17SWWIvQ19cSbIfiLRaq+Ee1r94GPJWJEPoP8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "abcMIDI";
|
||||
version = "2022.06.14";
|
||||
version = "2022.08.01";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
|
||||
hash = "sha256-dmd0iPRKm5/GNz3VJ9pJgYiCSTENB0ZAOt3rLjujlYs=";
|
||||
hash = "sha256-qFk/Rij7P17ZlJFjsrW8snp2anCGjqxfytzopIyHLL0=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "blueman";
|
||||
version = "2.3.1";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/blueman-project/blueman/releases/download/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-9swQ+lLgcEG+f8cMnB+5SFeT5BBrwUCcjVXJsfwXq4I=";
|
||||
sha256 = "sha256-hM99f9Fzh1HHfgYF9y5M3UtyMHindo/j81MJmToDUK4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
103
pkgs/tools/filesystems/dwarfs/default.nix
Normal file
103
pkgs/tools/filesystems/dwarfs/default.nix
Normal file
|
|
@ -0,0 +1,103 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
, substituteAll
|
||||
|
||||
, bison
|
||||
, boost
|
||||
, cmake
|
||||
, double-conversion
|
||||
, fmt_8
|
||||
, fuse3
|
||||
, gflags
|
||||
, glog
|
||||
, gtest
|
||||
, jemalloc
|
||||
, libarchive
|
||||
, libevent
|
||||
, libunwind
|
||||
, lz4
|
||||
, openssl
|
||||
, pkg-config
|
||||
, ronn
|
||||
, xxHash
|
||||
, zstd
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dwarfs";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mhx";
|
||||
repo = "dwarfs";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-bGJkgcq8JxueRTX08QpJv1A0O5wXbiIgUY7BrY0Ln/M=";
|
||||
};
|
||||
|
||||
patches = with lib.versions; [
|
||||
(substituteAll {
|
||||
src = ./version_info.patch;
|
||||
|
||||
gitRev = "v${version}";
|
||||
gitDesc = "v${version}";
|
||||
gitBranch = "v${version}";
|
||||
gitId = "v${version}"; # displayed as version number
|
||||
|
||||
versionMajor = major version;
|
||||
versionMinor = minor version;
|
||||
versionPatch = patch version;
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DPREFER_SYSTEM_ZSTD=ON"
|
||||
"-DPREFER_SYSTEM_XXHASH=ON"
|
||||
"-DPREFER_SYSTEM_GTEST=ON"
|
||||
|
||||
# may be added under an option in the future
|
||||
# "-DWITH_LEGACY_FUSE=ON"
|
||||
"-DWITH_TESTS=ON"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
bison
|
||||
cmake
|
||||
pkg-config
|
||||
ronn
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
# dwarfs
|
||||
boost
|
||||
fmt_8
|
||||
fuse3
|
||||
jemalloc
|
||||
libarchive
|
||||
lz4
|
||||
xxHash
|
||||
zstd
|
||||
|
||||
# folly
|
||||
double-conversion
|
||||
glog
|
||||
libevent
|
||||
libunwind
|
||||
openssl
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [ gtest ];
|
||||
# this fails inside of the sandbox due to missing access
|
||||
# to the FUSE device
|
||||
GTEST_FILTER = "-tools.everything";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A fast high compression read-only file system";
|
||||
homepage = "https://github.com/mhx/dwarfs";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ keksbg ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
40
pkgs/tools/filesystems/dwarfs/version_info.patch
Normal file
40
pkgs/tools/filesystems/dwarfs/version_info.patch
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
diff --git a/include/dwarfs/version.h b/include/dwarfs/version.h
|
||||
new file mode 100755
|
||||
index 0000000..9b12c59
|
||||
--- /dev/null
|
||||
+++ b/include/dwarfs/version.h
|
||||
@@ -0,0 +1,16 @@
|
||||
+// autogenerated code, do not modify
|
||||
+
|
||||
+#pragma once
|
||||
+
|
||||
+#define PRJ_VERSION_MAJOR @versionMajor@
|
||||
+#define PRJ_VERSION_MINOR @versionMinor@
|
||||
+#define PRJ_VERSION_PATCH @versionPatch@
|
||||
+
|
||||
+namespace dwarfs {
|
||||
+
|
||||
+extern char const* PRJ_GIT_REV;
|
||||
+extern char const* PRJ_GIT_DESC;
|
||||
+extern char const* PRJ_GIT_BRANCH;
|
||||
+extern char const* PRJ_GIT_ID;
|
||||
+
|
||||
+} // namespace dwarfs
|
||||
diff --git a/src/dwarfs/version.cpp b/src/dwarfs/version.cpp
|
||||
new file mode 100755
|
||||
index 0000000..3af0215
|
||||
--- /dev/null
|
||||
+++ b/src/dwarfs/version.cpp
|
||||
@@ -0,0 +1,12 @@
|
||||
+// autogenerated code, do not modify
|
||||
+
|
||||
+#include "dwarfs/version.h"
|
||||
+
|
||||
+namespace dwarfs {
|
||||
+
|
||||
+char const* PRJ_GIT_REV = "@gitRev@";
|
||||
+char const* PRJ_GIT_DESC = "@gitDesc@";
|
||||
+char const* PRJ_GIT_BRANCH = "@gitBranch@";
|
||||
+char const* PRJ_GIT_ID = "@gitId@";
|
||||
+
|
||||
+} // namespace dwarfs
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "fzf";
|
||||
version = "0.31.0";
|
||||
version = "0.32.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "junegunn";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-HKwf/ogNx+jCNSVHI8rt6WYRbuyT18V4nnMyZ6TmwVQ=";
|
||||
sha256 = "sha256-3iizp1Dn6fxcNUgbK4RkD38Z7KrLUkZDDq3wnIPMjPY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-3ry93xV3KKtFoFGt2yxzMd4jx3QG2+8TBrEEywj7HPQ=";
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nix-direnv";
|
||||
version = "2.1.1";
|
||||
version = "2.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = "nix-direnv";
|
||||
rev = version;
|
||||
sha256 = "sha256-0K2qnoft7eBlhhHiEMHi4FcSy92ufAtAAmIz2dZkm7M=";
|
||||
sha256 = "sha256-6UvOnFmohdhFenpEangbLLEdE0PeessRJjiO0mcydWI=";
|
||||
};
|
||||
|
||||
# Substitute instead of wrapping because the resulting file is
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sanctity";
|
||||
version = "1.2.1";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "annaaurora";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rK4em0maJQS50zPfnuFSxRoXUuFCaw9ZOfmgf70Sdac=";
|
||||
sha256 = "sha256-y6xj4A5SHcW747aFE9TfuurNnuUxjTUeKJmzxeiWqVc=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-IQp/sSVgKY1j6N+UcifEi74dg/PkZJoeqLekeLc/vMU=";
|
||||
cargoSha256 = "sha256-co58YBeFjP9DKzxDegQI7txuJ1smqJxdlRLae+Ppwh0=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Test the 16 terminal colors in all combinations";
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sstp-client";
|
||||
version = "1.0.16";
|
||||
version = "1.0.17";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/sstp-client/sstp-client/sstp-client-${version}.tar.gz";
|
||||
sha256 = "sha256-r74U/RIveHX0+tDtmC0XRRNtLmbMNrl/cu8aERF4TKE=";
|
||||
sha256 = "sha256-Kd07nHERrWmDzWY9Wi8Gnh+KlakTqryOFmlwFGZXkl0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -26,6 +26,6 @@ stdenv.mkDerivation {
|
|||
license = with licenses; [ asl20 cc0 openssl ];
|
||||
maintainers = with maintainers; [ kirelagin ];
|
||||
# "This code requires at least SSE2."
|
||||
platforms = with platforms; [ "x86_64-linux" "i686-linux" ] ++ darwin;
|
||||
platforms = [ "x86_64-linux" "i686-linux" ] ++ platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "naabu";
|
||||
version = "2.0.9";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "naabu";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RmgyltdBk8uiE8EU5fJROJgCz0bTT1aUp8ZzbsnCzow=";
|
||||
sha256 = "sha256-Gx2bYJXSApYhci7yQW45lLZjyfHVV8orPUIumC3+Yxg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-5Rp+/RPUmD3bAPEFGH03swx9/eV7dvvVL3UNwfIGkgQ=";
|
||||
vendorSha256 = "sha256-wXXtebZUL4Nm7M7Eu0Ucks9forCC+6Yb8eyKPb43rxA=";
|
||||
|
||||
buildInputs = [
|
||||
libpcap
|
||||
|
|
|
|||
|
|
@ -1,13 +1,4 @@
|
|||
{ stdenv, lib, fetchFromGitiles, glibc, libcap, qemu }:
|
||||
|
||||
let
|
||||
dumpConstants =
|
||||
if stdenv.buildPlatform == stdenv.hostPlatform then "./dump_constants"
|
||||
else if stdenv.hostPlatform.isAarch32 then "qemu-arm dump_constants"
|
||||
else if stdenv.hostPlatform.isAarch64 then "qemu-aarch64 dump_constants"
|
||||
else if stdenv.hostPlatform.isx86_64 then "qemu-x86_64 dump_constants"
|
||||
else throw "Unsupported host platform";
|
||||
in
|
||||
{ stdenv, lib, fetchFromGitiles, libcap }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "minijail";
|
||||
|
|
@ -19,24 +10,15 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-OpwzISZ5iZNQvJAX7UJJ4gELEaVfcQgY9cqMM0YvBzc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) qemu;
|
||||
buildInputs = [ libcap ];
|
||||
|
||||
makeFlags = [ "ECHO=echo" "LIBDIR=$(out)/lib" ];
|
||||
dumpConstantsFlags = lib.optional (stdenv.hostPlatform.libc == "glibc")
|
||||
"LDFLAGS=-L${glibc.static}/lib";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile --replace /bin/echo echo
|
||||
patchShebangs platform2_preinstall.sh
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
make $makeFlags $buildFlags $dumpConstantsFlags dump_constants
|
||||
${dumpConstants} > constants.json
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
./platform2_preinstall.sh ${version} $out/include/chromeos
|
||||
|
||||
|
|
@ -47,7 +29,6 @@ stdenv.mkDerivation rec {
|
|||
cp -v *.pc $out/lib/pkgconfig
|
||||
cp -v libminijail.h scoped_minijail.h $out/include/chromeos
|
||||
cp -v minijail0 $out/bin
|
||||
cp -v constants.json $out/share/minijail
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -1,9 +1,36 @@
|
|||
{ buildPythonApplication, lib, minijail }:
|
||||
{ lib, stdenv, buildPythonApplication, pkgsBuildTarget, python, minijail }:
|
||||
|
||||
let
|
||||
targetClang = pkgsBuildTarget.targetPackages.clangStdenv.cc;
|
||||
in
|
||||
|
||||
buildPythonApplication {
|
||||
pname = "minijail-tools";
|
||||
inherit (minijail) version src;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile --replace /bin/echo echo
|
||||
'';
|
||||
|
||||
postConfigure = ''
|
||||
substituteInPlace tools/compile_seccomp_policy.py \
|
||||
--replace "'constants.json'" "'$out/share/constants.json'"
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
make libconstants.gen.c libsyscalls.gen.c
|
||||
${targetClang}/bin/${targetClang.targetPrefix}cc -S -emit-llvm \
|
||||
libconstants.gen.c libsyscalls.gen.c
|
||||
${python.pythonForBuild.interpreter} tools/generate_constants_json.py \
|
||||
--output constants.json \
|
||||
libconstants.gen.ll libsyscalls.gen.ll
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share
|
||||
cp -v constants.json $out/share/constants.json
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://android.googlesource.com/platform/external/minijail/+/refs/heads/master/tools/";
|
||||
description = "A set of tools for minijail";
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rsyslog";
|
||||
version = "8.2204.1";
|
||||
version = "8.2206.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.rsyslog.com/files/download/rsyslog/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-ptcx5GrT1k9q1LGbvxv1bKR2CkSiS7loIxidwucfcCg=";
|
||||
sha256 = "sha256-oTdyGLJsB2eno/Z9Fm1TOK98JLRV017JmXThjmhFuic=";
|
||||
};
|
||||
|
||||
#patches = [ ./fix-gnutls-detection.patch ];
|
||||
|
|
|
|||
|
|
@ -1383,6 +1383,7 @@ mapAliases ({
|
|||
telepathy_qt5 = throw "'telepathy_qt5' has been renamed to/replaced by 'libsForQt5.telepathy'"; # Converted to throw 2022-02-22
|
||||
telnet = throw "'telnet' has been renamed to/replaced by 'inetutils'"; # Converted to throw 2022-02-22
|
||||
terminus = throw "terminus has been removed, it was unmaintained in nixpkgs"; # Added 2021-08-21
|
||||
terraform-full = throw "terraform-full has been removed, it was an alias for 'terraform.full'"; # Added 2022-08-02
|
||||
terraform_0_13 = throw "terraform_0_13 has been removed from nixpkgs"; # Added 2022-06-26
|
||||
terraform_0_14 = throw "terraform_0_14 has been removed from nixpkgs"; # Added 2022-06-26
|
||||
terraform_0_15 = throw "terraform_0_15 has been removed from nixpkgs"; # Added 2022-06-26
|
||||
|
|
|
|||
|
|
@ -1195,6 +1195,8 @@ with pkgs;
|
|||
|
||||
davinci-resolve = callPackage ../applications/video/davinci-resolve { };
|
||||
|
||||
dwarfs = callPackage ../tools/filesystems/dwarfs { };
|
||||
|
||||
gamemode = callPackage ../tools/games/gamemode {
|
||||
libgamemode32 = pkgsi686Linux.gamemode.lib;
|
||||
};
|
||||
|
|
@ -34407,6 +34409,8 @@ with pkgs;
|
|||
|
||||
pynac = callPackage ../applications/science/math/pynac { };
|
||||
|
||||
scalp = callPackage ../applications/science/math/scalp { };
|
||||
|
||||
singular = callPackage ../applications/science/math/singular { };
|
||||
|
||||
scilab-bin = callPackage ../applications/science/math/scilab-bin {};
|
||||
|
|
@ -35511,8 +35515,6 @@ with pkgs;
|
|||
;
|
||||
|
||||
terraform = terraform_1;
|
||||
# deprecated
|
||||
terraform-full = terraform.full;
|
||||
|
||||
terraform-providers = recurseIntoAttrs (
|
||||
callPackage ../applications/networking/cluster/terraform-providers { }
|
||||
|
|
@ -35585,6 +35587,8 @@ with pkgs;
|
|||
|
||||
tvheadend = callPackage ../servers/tvheadend { };
|
||||
|
||||
twiggy = callPackage ../development/tools/twiggy { };
|
||||
|
||||
uacme = callPackage ../tools/admin/uacme { };
|
||||
|
||||
ums = callPackage ../servers/ums { };
|
||||
|
|
|
|||
|
|
@ -1235,6 +1235,8 @@ in {
|
|||
|
||||
beautifultable = callPackage ../development/python-modules/beautifultable { };
|
||||
|
||||
bech32 = callPackage ../development/python-modules/bech32 { };
|
||||
|
||||
bedup = callPackage ../development/python-modules/bedup { };
|
||||
|
||||
behave = callPackage ../development/python-modules/behave { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue