Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
4632436394
|
|
@ -122,6 +122,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- `tut` has been updated from 1.0.34 to 2.0.0, and now uses the TOML format for the configuration file instead of INI. Additional information can be found [here](https://github.com/RasmusLindroth/tut/releases/tag/2.0.0).
|
||||
|
||||
- `i3status-rust` has been updated from 0.22.0 to 0.30.5, and this brings many changes to its configuration format. Additional information can be found [here](https://github.com/greshake/i3status-rust/blob/v0.30.0/NEWS.md).
|
||||
|
||||
- The `wordpress` derivation no longer contains any builtin plugins or themes. If you need them you have to add them back to prevent your site from breaking. You can find them in `wordpressPackages.{plugins,themes}`.
|
||||
|
||||
- `llvmPackages_rocm.llvm` will not contain `clang` or `compiler-rt`. `llvmPackages_rocm.clang` will not contain `llvm`. `llvmPackages_rocm.clangNoCompilerRt` has been removed in favor of using `llvmPackages_rocm.clang-unwrapped`.
|
||||
|
|
|
|||
|
|
@ -1,7 +1,11 @@
|
|||
# This jobset is used to generate a NixOS channel that contains a
|
||||
# small subset of Nixpkgs, mostly useful for servers that need fast
|
||||
# security updates.
|
||||
|
||||
#
|
||||
# Individual jobs can be tested by running:
|
||||
#
|
||||
# nix-build nixos/release-small.nix -A <jobname>
|
||||
#
|
||||
{ nixpkgs ? { outPath = (import ../lib).cleanSource ./..; revCount = 56789; shortRev = "gfedcba"; }
|
||||
, stableBranch ? false
|
||||
, supportedSystems ? [ "aarch64-linux" "x86_64-linux" ] # no i686-linux
|
||||
|
|
|
|||
|
|
@ -1,32 +1,41 @@
|
|||
{ lib, stdenv, ladspa-sdk, pkgs, ... }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, ladspa-sdk
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (self: {
|
||||
pname = "tap-plugins";
|
||||
version = "1.0.1";
|
||||
version = "unstable-2020-12-09";
|
||||
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "tomszilagyi";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0c6qhyf8smlypc36vmpr42dm3mrzk6pg9cc9r0vx22qbrd5zfpjw";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tomscii";
|
||||
repo = "tap-plugins";
|
||||
rev = "5d882799f37dffe37fc73451f2c5b4fb24316f3b";
|
||||
hash = "sha256-bwybMxIAbOzPr43QGshjbnRK5GdziGiYDsTutZdSj4s=";
|
||||
};
|
||||
|
||||
buildInputs = [ ladspa-sdk ];
|
||||
buildInputs = [
|
||||
ladspa-sdk
|
||||
];
|
||||
|
||||
preInstall = ''
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile --replace /usr/local "$out"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://tomscii.sig7.se/tap-plugins/";
|
||||
description = "Tom's Audio Processing plugins";
|
||||
longDescription = ''
|
||||
A number of LADSPA plugins including: TAP AutoPanner, TAP Chorus/Flanger, TAP DeEsser,
|
||||
TAP Dynamics (Mono & Stereo), TAP Equalizer and TAP Equalizer/BW, TAP Fractal Doubler, TAP Pink/Fractal Noise,
|
||||
TAP Pitch Shifter, TAP Reflector, TAP Reverberator, TAP Rotary Speaker, TAP Scaling Limiter,
|
||||
TAP Sigmoid Booster, TAP Stereo Echo, TAP Tremolo, TAP TubeWarmth, TAP Vibrato.
|
||||
A number of LADSPA plugins including: TAP AutoPanner, TAP Chorus/Flanger,
|
||||
TAP DeEsser, TAP Dynamics (Mono & Stereo), TAP Equalizer and TAP
|
||||
Equalizer/BW, TAP Fractal Doubler, TAP Pink/Fractal Noise, TAP Pitch
|
||||
Shifter, TAP Reflector, TAP Reverberator, TAP Rotary Speaker, TAP Scaling
|
||||
Limiter, TAP Sigmoid Booster, TAP Stereo Echo, TAP Tremolo, TAP
|
||||
TubeWarmth, TAP Vibrato.
|
||||
'';
|
||||
homepage = "https://tap-plugins.sourceforge.net/ladspa.html";
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.fps ];
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = [ lib.maintainers.AndersonTorres ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -157,6 +157,28 @@ rec {
|
|||
'';
|
||||
});
|
||||
|
||||
# check that the vim-doc hook correctly generates the tag
|
||||
# for neovim packages from luaPackages
|
||||
# we know for a fact gitsigns-nvim has a doc folder and comes from luaPackages
|
||||
checkForTagsLuaPackages = vimPlugins.gitsigns-nvim.overrideAttrs(oldAttrs: {
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
[ -f $out/doc/tags ]
|
||||
'';
|
||||
});
|
||||
|
||||
nvim_with_gitsigns_plugin = neovim.override {
|
||||
extraName = "-with-gitsigns-plugin";
|
||||
configure.packages.plugins = {
|
||||
start = [
|
||||
vimPlugins.gitsigns-nvim
|
||||
];
|
||||
};
|
||||
};
|
||||
checkHelpLuaPackages = runTest nvim_with_gitsigns_plugin ''
|
||||
export HOME=$TMPDIR
|
||||
${nvim_with_gitsigns_plugin}/bin/nvim -i NONE -c 'help gitsigns' +quitall! -e
|
||||
'';
|
||||
|
||||
# nixpkgs should detect that no wrapping is necessary
|
||||
nvimShouldntWrap = wrapNeovim2 "-should-not-wrap" nvimAutoDisableWrap;
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{
|
||||
"version": "3.150.0",
|
||||
"version": "3.150.7",
|
||||
"appimage": {
|
||||
"x86_64-linux": {
|
||||
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.150.0/standard-notes-3.150.0-linux-x86_64.AppImage",
|
||||
"hash": "sha512-qDjZ/WQdxXCoTA2PVRiSrIukO+N6gB9UdK7Fed5cvd+xFGteSmfPpP7R6wbvTkxkAe4gkH57taeWg+Tt1jW+nA=="
|
||||
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.150.7/standard-notes-3.150.7-linux-x86_64.AppImage",
|
||||
"hash": "sha512-uJJloClRiyBneNrRjsRnq0AiSlJyZFrS97bdkDU89Oz0GCaVjQMnAz87gPu9H45qqjQyIogtOnd6Wpkw2/5WJA=="
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.150.0/standard-notes-3.150.0-linux-arm64.AppImage",
|
||||
"hash": "sha512-KxK5Z3x611kp2TU5MTxwBfPirlPRbe8zSbF4mjMGDuzmTK3beqHhIGUh4Lud5opMyvUlbVxQf4SxslMxh7uvmw=="
|
||||
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.150.7/standard-notes-3.150.7-linux-arm64.AppImage",
|
||||
"hash": "sha512-rzMu2VsrQJmaQFSJjyMLcL2/jXvMAQgzrOw179fGOPBKP+LA6hQ7XYBXL/abb9ZwAz5NO/uV6QUS8HDciKtIZw=="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -927,8 +927,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "gitlens";
|
||||
publisher = "eamodio";
|
||||
version = "2023.2.2804";
|
||||
sha256 = "sha256-3jQ0CpAGrPLQPpwZx2u3ylfOwy6cBu7WLr0w3h8IM2Y=";
|
||||
version = "2023.3.1505";
|
||||
sha256 = "sha256-USAbI2x6UftNfIEJy2Pbqa/BTYJnUBCNjsdm0Pfrz0o=";
|
||||
};
|
||||
meta = with lib; {
|
||||
changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -28,11 +28,11 @@
|
|||
"vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk="
|
||||
},
|
||||
"aiven": {
|
||||
"hash": "sha256-InYRBUjOJ29dbnXTcz/ErPhEMyRdKn+YxHrAyBZNLdo=",
|
||||
"hash": "sha256-unOLrWai4oMd+1Jc+s6OHLEZLew7HM+zVyZkIprBN7k=",
|
||||
"homepage": "https://registry.terraform.io/providers/aiven/aiven",
|
||||
"owner": "aiven",
|
||||
"repo": "terraform-provider-aiven",
|
||||
"rev": "v4.1.0",
|
||||
"rev": "v4.1.1",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-VAYCx0DHG+J8zzYFP2UyZ+W6cOgi8G+PQktEBOWbjSk="
|
||||
},
|
||||
|
|
@ -46,11 +46,11 @@
|
|||
"vendorHash": "sha256-JOaw8rKH7eb3RiP/FD+M7VEXCRfVuarTjfEusz1yGmQ="
|
||||
},
|
||||
"alicloud": {
|
||||
"hash": "sha256-QefplcJVXduBbado4Ykg2Ngybb/oxf6/ulCgRqJGm0A=",
|
||||
"hash": "sha256-g+ksw5Yc3qiCGopxGMX9dEXCa3UDXfa8Evxx9qYjkzU=",
|
||||
"homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
|
||||
"owner": "aliyun",
|
||||
"repo": "terraform-provider-alicloud",
|
||||
"rev": "v1.200.0",
|
||||
"rev": "v1.201.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
|
@ -476,11 +476,11 @@
|
|||
"vendorHash": "sha256-zPO+TbJsFrgfjSaSrX5YRop/0LDDw/grNNntaIGiBU0="
|
||||
},
|
||||
"gridscale": {
|
||||
"hash": "sha256-ahYCrjrJPEItGyqbHYtgkIH/RzMyxBQkebSAyd8gwYo=",
|
||||
"hash": "sha256-deEP1x5rGIgX/CcRK4gWYbCsV1IKY7CFkwQl+uKhbEk=",
|
||||
"homepage": "https://registry.terraform.io/providers/gridscale/gridscale",
|
||||
"owner": "gridscale",
|
||||
"repo": "terraform-provider-gridscale",
|
||||
"rev": "v1.17.0",
|
||||
"rev": "v1.18.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
|
@ -503,11 +503,11 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"heroku": {
|
||||
"hash": "sha256-HRwG8VNl13HdibczNDWiCS74vrRImM/g3zn4MgQQx3s=",
|
||||
"hash": "sha256-r7aj1plLIqnESNIbXWqgXX+xyH1+iv9GAeKjtyza5vc=",
|
||||
"homepage": "https://registry.terraform.io/providers/heroku/heroku",
|
||||
"owner": "heroku",
|
||||
"repo": "terraform-provider-heroku",
|
||||
"rev": "v5.1.12",
|
||||
"rev": "v5.2.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
|
@ -765,11 +765,11 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"newrelic": {
|
||||
"hash": "sha256-bf4t4xcA/K4atLyDVzkeLw5zm9sBz/dUBiivVaz4hNU=",
|
||||
"hash": "sha256-p+RsuBthW5ohY1PC7Z/PNyLjpif/blQuonCRm+R0uTc=",
|
||||
"homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
|
||||
"owner": "newrelic",
|
||||
"repo": "terraform-provider-newrelic",
|
||||
"rev": "v3.16.0",
|
||||
"rev": "v3.16.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-yF2yk85RLbvmULakODOV2V0Z9dzKfLClUSZTnECdO3o="
|
||||
},
|
||||
|
|
@ -811,11 +811,11 @@
|
|||
"vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
|
||||
},
|
||||
"oci": {
|
||||
"hash": "sha256-ZERJIZ1nsvvMhZe9hjcZt5F1lFNFV4TP0ifNin+MC5M=",
|
||||
"hash": "sha256-OceXVqPbjJnPNKbf5vKzbTBEES1+CNCa/dTfPFgdACM=",
|
||||
"homepage": "https://registry.terraform.io/providers/oracle/oci",
|
||||
"owner": "oracle",
|
||||
"repo": "terraform-provider-oci",
|
||||
"rev": "v4.111.0",
|
||||
"rev": "v4.112.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
|
@ -847,13 +847,13 @@
|
|||
"vendorHash": "sha256-zKtBDnvlQHe+q0OZUMUGu1gNsx2wIrIoArtJrt0VaBk="
|
||||
},
|
||||
"openstack": {
|
||||
"hash": "sha256-KUv921SV88aUAsEkJY8TUgmO1h2xC5aUcapcRN1FEys=",
|
||||
"hash": "sha256-XjOij2mgBoQIgIMkk6U54O+0+ye80qUNJCuwjZx6Nu8=",
|
||||
"homepage": "https://registry.terraform.io/providers/terraform-provider-openstack/openstack",
|
||||
"owner": "terraform-provider-openstack",
|
||||
"repo": "terraform-provider-openstack",
|
||||
"rev": "v1.50.0",
|
||||
"rev": "v1.51.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-aoJDRzackPjWxkrsQclweUFH3Bqdcj1aTJuTHZ7Dh7g="
|
||||
"vendorHash": "sha256-62q67aaOZA3fQmyL8bEHB+W497bcx9Xy7kKrbkjkbaI="
|
||||
},
|
||||
"opentelekomcloud": {
|
||||
"hash": "sha256-fkEQ4VWGJiPFTA6Wz8AxAiL4DOW+Kewl8T9ywy/yPME=",
|
||||
|
|
@ -919,13 +919,13 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"rabbitmq": {
|
||||
"hash": "sha256-ZhK9zwBaod+s4tGCSBUjW7ijKeucyToXVQDPlMFmIvk=",
|
||||
"hash": "sha256-ArteHTNNUxgiBJamnR1bJFDrvNnqjbJ6D3mj1XlpVUA=",
|
||||
"homepage": "https://registry.terraform.io/providers/cyrilgdn/rabbitmq",
|
||||
"owner": "cyrilgdn",
|
||||
"repo": "terraform-provider-rabbitmq",
|
||||
"rev": "v1.7.0",
|
||||
"rev": "v1.8.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-JAhdryowDvb4LroKPcGrDibjSriSW6FqFbU7+DwjQEQ="
|
||||
"vendorHash": "sha256-j+3qtGlueKZgf0LuNps4Wc9G3EmpSgl8ZNSLqslyizI="
|
||||
},
|
||||
"rancher2": {
|
||||
"hash": "sha256-DInP+DpCBOsBdlg1tiujlmN20WB5VQbeHgOiabEv9Zc=",
|
||||
|
|
@ -1099,11 +1099,11 @@
|
|||
"vendorHash": "sha256-GkmUKSnqkabwGCl22/90529BWb0oJaIJHYHlS/h3KNY="
|
||||
},
|
||||
"tencentcloud": {
|
||||
"hash": "sha256-iQHueKyp1bYj5/hRDmUFENSc5V7Q3+eq3mmYGIvPOG8=",
|
||||
"hash": "sha256-M1ymjlqA/rynuoGI9v1oO4+vaAWopvFezdPANn4oWNY=",
|
||||
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
|
||||
"owner": "tencentcloudstack",
|
||||
"repo": "terraform-provider-tencentcloud",
|
||||
"rev": "v1.79.15",
|
||||
"rev": "v1.79.16",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
|
@ -1181,14 +1181,14 @@
|
|||
"vendorHash": "sha256-yTcroKTdYv0O8cX80A451I1vjYclVjA8P69fsb0wY/U="
|
||||
},
|
||||
"vault": {
|
||||
"hash": "sha256-cYSw5aN7TvVMUY+YnyyosB4HjiosXYB7kDiNDQ258Eg=",
|
||||
"hash": "sha256-HI+/vGQPwQWnTYyYZa5a7N1esWf2EQL2lziuZMv8DNE=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/vault",
|
||||
"owner": "hashicorp",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-vault",
|
||||
"rev": "v3.13.0",
|
||||
"rev": "v3.14.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-EOBNoEW9GI21IgXSiEN93B3skxfCrBkNwLxGXaso1oE="
|
||||
"vendorHash": "sha256-Ox8Onq44NdE/KMrmzbOpKetJKww9T2PvEliLbWU/bLU="
|
||||
},
|
||||
"vcd": {
|
||||
"hash": "sha256-EG4WSnUZr/QfUT1qqOBOGze5Ztxp0HSB9Q1YYgLXQqk=",
|
||||
|
|
|
|||
|
|
@ -168,9 +168,9 @@ rec {
|
|||
mkTerraform = attrs: pluggable (generic attrs);
|
||||
|
||||
terraform_1 = mkTerraform {
|
||||
version = "1.4.0";
|
||||
hash = "sha256-jt+axusOYbJmGJpim8i76Yfb/QgWduUmZMIiIs0CJoA=";
|
||||
vendorHash = "sha256-M22VONnPs0vv2L3q/2RjE0+Jna/Kv95xubVNthp5bMc=";
|
||||
version = "1.4.1";
|
||||
hash = "sha256-Tj9j3WGfP851Q7RctW+8Xmz9NbQLE3/QKYHBGvLe1/s=";
|
||||
vendorHash = "sha256-xAVgyn8MqwLvY85+neQ8jQYkl/j0RY4fG6qBbiMmIOc=";
|
||||
patches = [ ./provider-path-0_15.patch ];
|
||||
passthru = {
|
||||
inherit plugins;
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
let
|
||||
pname = "trilium-desktop";
|
||||
version = "0.59.1";
|
||||
version = "0.59.2";
|
||||
|
||||
linuxSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
|
||||
linuxSource.sha256 = "04jmpz8riz71vzs13yy0prwfq3sji36n7mgap80q2xwx445bxrka";
|
||||
linuxSource.sha256 = "1mnggfb16vi02dikhnsc3nbdrb0m25f9lch4d1r65lr6svw7sxjp";
|
||||
|
||||
darwinSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-mac-x64-${version}.zip";
|
||||
darwinSource.sha256 = "014phlv5mkn5pzbr9gwgy87d57wnkxa6g0pi3k2d4d29fj9v1f44";
|
||||
darwinSource.sha256 = "0j07yxfgvqn76bfpbqlvabdkbfrhp5g4f58w9gf6g1n9ky7w7dzj";
|
||||
|
||||
meta = metaCommon // {
|
||||
mainProgram = "trilium";
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
|
||||
let
|
||||
serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
|
||||
serverSource.sha256 = "073hxqszd6sh2fcczs8c1sgby0pg97d3h99rjdrj7y2j85hflp5a";
|
||||
version = "0.59.1";
|
||||
serverSource.sha256 = "1i7rrzj40ixi4l4hhxdn9n0b8zmm40ycprhaklh9kk39v38rai3y";
|
||||
version = "0.59.2";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "trilium-server";
|
||||
inherit version;
|
||||
|
|
|
|||
|
|
@ -1,48 +1,34 @@
|
|||
{ stdenv, lib, rust, rustPlatform, fetchgit, fetchpatch
|
||||
, clang, pkg-config, protobuf, python3, wayland-scanner
|
||||
{ lib, rustPlatform, fetchgit, pkg-config, protobuf, python3, wayland-scanner
|
||||
, libcap, libdrm, libepoxy, minijail, virglrenderer, wayland, wayland-protocols
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "crosvm";
|
||||
version = "107.1";
|
||||
version = "111.1";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://chromium.googlesource.com/chromiumos/platform/crosvm";
|
||||
rev = "5a49a836e63aa6e9ae38b80daa09a013a57bfb7f";
|
||||
sha256 = "F+5i3R7Tbd9xF63Olnyavzg/hD+8HId1duWm8bvAmLA=";
|
||||
rev = "9ad89972330f70fca5a29967f226cf905977bf7f";
|
||||
sha256 = "hvP3V7kzfPXOIe+6GBWupfhW5SM3ifoqmx7dyTgSTeU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
patches = [
|
||||
# Backport seccomp sandbox update for recent Glibc.
|
||||
# fetchpatch is not currently gerrit/gitiles-compatible, so we
|
||||
# have to use the mirror.
|
||||
# https://github.com/NixOS/nixpkgs/pull/133604
|
||||
(fetchpatch {
|
||||
url = "https://github.com/google/crosvm/commit/aae01416807e7c15270b3d44162610bcd73952ff.patch";
|
||||
sha256 = "nQuOMOwBu8QvfwDSuTz64SQhr2dF9qXt2NarbIU55tU=";
|
||||
})
|
||||
cargoSha256 = "S8zeOB+S5ZTuHqWNjxDIa4ev24ose/fByYwPrhR9OY8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config protobuf python3 rustPlatform.bindgenHook wayland-scanner
|
||||
];
|
||||
|
||||
cargoSha256 = "1jg9x5adz1lbqdwnzld4xg4igzmh90nd9xm287cgkvh5fbmsjfjv";
|
||||
|
||||
nativeBuildInputs = [ clang pkg-config protobuf python3 wayland-scanner ];
|
||||
|
||||
buildInputs = [
|
||||
libcap libdrm libepoxy minijail virglrenderer wayland wayland-protocols
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs third_party/minijail/tools/*.py
|
||||
substituteInPlace build.rs --replace '"clang"' '"${stdenv.cc.targetPrefix}clang"'
|
||||
'';
|
||||
|
||||
"CARGO_TARGET_${lib.toUpper (builtins.replaceStrings ["-"] ["_"] (rust.toRustTarget stdenv.hostPlatform))}_LINKER" =
|
||||
"${stdenv.cc.targetPrefix}cc";
|
||||
|
||||
# crosvm mistakenly expects the stable protocols to be in the root
|
||||
# of the pkgdatadir path, rather than under the "stable"
|
||||
# subdirectory.
|
||||
|
|
|
|||
|
|
@ -12,4 +12,4 @@ luarocksMoveDataHook () {
|
|||
}
|
||||
|
||||
echo "Using luarocksMoveDataHook"
|
||||
preDistPhases+=" luarocksMoveDataHook"
|
||||
preFixupHooks+=(luarocksMoveDataHook)
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "apispec";
|
||||
version = "6.2.0";
|
||||
version = "6.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-GpSaYLtMQr7leqr11DwYTfPi6W2WWORC513UQ1z2CWE=";
|
||||
hash = "sha256-bLCNks5z/ws79Gyy6lwA1XKJsPJ5+wJWo99GgYK6U0Q=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "go-tools";
|
||||
version = "2023.1.2";
|
||||
version = "2023.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dominikh";
|
||||
repo = "go-tools";
|
||||
rev = version;
|
||||
sha256 = "sha256-Xnylkv0n3FExQ4e4pmD6DAUqGtud80wHHoVY56UXfOU=";
|
||||
sha256 = "sha256-ZgPRUkvokHwMHWQMjQJ3Uprt+lf2CAv1kmpUI93J0Cs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-o9UtS6AMgRYuAkOWdktG2Kr3QDBDQTOGSlya69K2br8=";
|
||||
|
|
|
|||
|
|
@ -1,54 +1,107 @@
|
|||
{ lib, stdenv, fetchurl, alsa-lib, pkg-config, gtk2, gtk3, fltk13 }:
|
||||
# Comes from upstream as as bundle of several tools,
|
||||
# some use gtk2, some gtk3 (and some even fltk13).
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, alsa-lib
|
||||
, fltk13
|
||||
, gtk2
|
||||
, gtk3
|
||||
, pkg-config
|
||||
, python3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (self: {
|
||||
pname = "alsa-tools";
|
||||
version = "1.2.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://alsa/tools/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-NacQJ6AfTX3kci4iNSDpQN5os8VwtsZxaRVnrij5iT4=";
|
||||
url = "mirror://alsa/tools/alsa-tools-${self.version}.tar.bz2";
|
||||
hash = "sha256-NacQJ6AfTX3kci4iNSDpQN5os8VwtsZxaRVnrij5iT4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ alsa-lib gtk2 gtk3 fltk13 ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
python3
|
||||
];
|
||||
|
||||
patchPhase = ''
|
||||
export tools="as10k1 hda-verb hdspmixer echomixer hdajackretask hdspconf hwmixvolume mixartloader rmedigicontrol sscape_ctl vxloader envy24control hdajacksensetest hdsploader ld10k1 pcxhrloader sb16_csp us428control"
|
||||
# export tools="as10k1 hda-verb hdspmixer qlo10k1 seq usx2yloader echomixer hdajackretask hdspconf hwmixvolume mixartloader rmedigicontrol sscape_ctl vxloader envy24control hdajacksensetest hdsploader ld10k1 pcxhrloader sb16_csp us428control"
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
fltk13
|
||||
gtk2
|
||||
gtk3
|
||||
];
|
||||
|
||||
env.TOOLSET = lib.concatStringsSep " " [
|
||||
"as10k1"
|
||||
"echomixer"
|
||||
"envy24control"
|
||||
"hda-verb"
|
||||
"hdajackretask"
|
||||
"hdajacksensetest"
|
||||
"hdspconf"
|
||||
"hdsploader"
|
||||
"hdspmixer"
|
||||
"hwmixvolume"
|
||||
"ld10k1"
|
||||
# "qlo10k1" # needs Qt
|
||||
"mixartloader"
|
||||
"pcxhrloader"
|
||||
"rmedigicontrol"
|
||||
"sb16_csp"
|
||||
# "seq" # mysterious configure error
|
||||
"sscape_ctl"
|
||||
"us428control"
|
||||
# "usx2yloader" # tries to create /etc/hptplug/usb
|
||||
"vxloader"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs hwmixvolume/
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
for tool in $tools; do
|
||||
echo "Tool: $tool:"
|
||||
cd "$tool"; ./configure --prefix="$out"; cd -
|
||||
runHook preConfigure
|
||||
|
||||
for tool in $TOOLSET; do
|
||||
echo "Configuring $tool:"
|
||||
pushd "$tool"
|
||||
./configure --prefix="$out"
|
||||
popd
|
||||
done
|
||||
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
for tool in $tools; do
|
||||
cd "$tool"; make; cd -
|
||||
runHook preBuild
|
||||
|
||||
echo "Building $tool:"
|
||||
for tool in $TOOLSET; do
|
||||
pushd "$tool"
|
||||
make
|
||||
popd
|
||||
done
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
for tool in $tools; do
|
||||
cd "$tool"; make install; cd -
|
||||
runHook preInstall
|
||||
|
||||
echo "Installing $tool:"
|
||||
for tool in $TOOLSET; do
|
||||
pushd "$tool"
|
||||
make install
|
||||
popd
|
||||
done
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "http://www.alsa-project.org/";
|
||||
description = "ALSA, the Advanced Linux Sound Architecture tools";
|
||||
|
||||
longDescription = ''
|
||||
The Advanced Linux Sound Architecture (ALSA) provides audio and
|
||||
MIDI functionality to the Linux-based operating system.
|
||||
'';
|
||||
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.fps ];
|
||||
description = "ALSA Tools";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [ lib.maintainers.AndersonTorres ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -17,16 +17,16 @@ let
|
|||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kanidm";
|
||||
version = "1.1.0-alpha.10";
|
||||
version = "1.1.0-alpha.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "fb76326234bffd9c9f3f24808d113f2c335c86fe";
|
||||
hash = "sha256-nE3zyigorAbDp5mgXzoyXWGOG+GaFC//SS/7Z9zj1Ps=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-TVGLL1Ir/Nld0kdhWmcYYmChrW42ctJPY/U7wtuEwCo=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-/CcmKYPtBHNdhJnO0OmZtW/39HH58qmCE9hFbIiNsaE=";
|
||||
cargoSha256 = "sha256-xYnZlPpnNPzk4IWuEcPQHudYR9IVsr4/JMHV7H1HAXw=";
|
||||
|
||||
KANIDM_BUILD_PROFILE = "release_nixos_${arch}";
|
||||
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "tailscale";
|
||||
version = "1.36.2";
|
||||
version = "1.38.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tailscale";
|
||||
repo = "tailscale";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5rGRe4ENIQVz8KDy1OuSKtD7UMVYmU2DaJAn7wrhXVQ=";
|
||||
hash = "sha256-2VTYZhC/U32fzEJCxkCB35IqQBALKXQA23SvhY57lSU=";
|
||||
};
|
||||
vendorHash = "sha256-xdZlwv/2knOE7xaGeNHYNdztflhLLmirGzPOJpDvk3s=";
|
||||
vendorHash = "sha256-LIvaxSo+4LuHUk8DIZ27IaRQwaDnjW6Jwm5AEc/V95A=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];
|
||||
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mbuffer";
|
||||
version = "20220418";
|
||||
version = "20230301";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz";
|
||||
sha256 = "sha256-blgB+fX/EURdHQMCi1oDzQivVAhpe3+UxCeDMiijAMc=";
|
||||
sha256 = "sha256-U/diCd7AD6soPcC8UyKw5jRrCdou27ZDWi1Kj0glLQE=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "cmst";
|
||||
version = "2022.11.30";
|
||||
version = "2023.03.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "cmst";
|
||||
owner = "andrew-bibb";
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "sha256-4zrV+VPtzMVaNjY/t1Fix0bODRMgtC3t+kFM1meNzlA=";
|
||||
sha256 = "sha256-yTqPxywPbtxTy1PPG+Mq64u8MrB27fEdmt1B0pn0BVk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake qttools ];
|
||||
|
|
|
|||
|
|
@ -25655,7 +25655,10 @@ with pkgs;
|
|||
|
||||
systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { };
|
||||
|
||||
tailscale = callPackage ../servers/tailscale { };
|
||||
tailscale = callPackage ../servers/tailscale {
|
||||
# Version 1.38.1 requires Go >= 1.20
|
||||
buildGoModule = buildGo120Module;
|
||||
};
|
||||
|
||||
tailspin = callPackage ../tools/misc/tailspin { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue