Merge master into haskell-updates

This commit is contained in:
github-actions[bot] 2023-09-23 00:11:31 +00:00 committed by GitHub
commit c7e7b8497d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
256 changed files with 3856 additions and 8617 deletions

View File

@ -0,0 +1,7 @@
# bmake {#bmake-hook}
[bmake](https://www.crufty.net/help/sjg/bmake.html) is the portable variant of
NetBSD make utility.
In Nixpkgs, `bmake` comes with a hook that overrides the default build, check,
install and dist phases.

View File

@ -8,6 +8,7 @@ The stdenv built-in hooks are documented in [](#ssec-setup-hooks).
autoconf.section.md
automake.section.md
autopatchelf.section.md
bmake.section.md
breakpoint.section.md
cmake.section.md
gdk-pixbuf.section.md

View File

@ -9486,6 +9486,11 @@
githubId = 894884;
name = "Jakub Kozłowski";
};
kupac = {
github = "Kupac";
githubId = 8224569;
name = "László Kupcsik";
};
kurnevsky = {
email = "kurnevsky@gmail.com";
github = "kurnevsky";
@ -12382,6 +12387,12 @@
fingerprint = "7BC1 77D9 C222 B1DC FB2F 0484 C061 089E FEBF 7A35";
}];
};
nicegamer7 = {
name = "Kermina Awad";
email = "kerminaawad@gmail.com";
github = "nicegamer7";
githubId = 8083772;
};
nickcao = {
name = "Nick Cao";
email = "nickcao@nichi.co";

View File

@ -172,24 +172,19 @@ in
(mkIf (cfg.enable || cfg.mobile.enable || cfg.bigscreen.enable) {
security.wrappers = {
kscreenlocker_greet = {
setuid = true;
owner = "root";
group = "root";
source = "${getBin libsForQt5.kscreenlocker}/libexec/kscreenlocker_greet";
};
start_kdeinit = {
setuid = true;
owner = "root";
group = "root";
source = "${getBin libsForQt5.kinit}/libexec/kf5/start_kdeinit";
};
kwin_wayland = {
owner = "root";
group = "root";
capabilities = "cap_sys_nice+ep";
source = "${getBin plasma5.kwin}/bin/kwin_wayland";
};
} // mkIf (!cfg.runUsingSystemd) {
start_kdeinit = {
setuid = true;
owner = "root";
group = "root";
source = "${getBin libsForQt5.kinit}/libexec/kf5/start_kdeinit";
};
};
environment.systemPackages =

View File

@ -58,14 +58,14 @@
}:
stdenv.mkDerivation rec {
pname = "ardour";
version = "7.4";
version = "7.5";
# We can't use `fetchFromGitea` here, as attempting to fetch release archives from git.ardour.org
# result in an empty archive. See https://tracker.ardour.org/view.php?id=7328 for more info.
src = fetchgit {
url = "git://git.ardour.org/ardour/ardour.git";
rev = version;
hash = "sha256-CUGhJi3ji0F6v41Y08sQvo7oKITOJ96ojdJL+FyCxmw=";
hash = "sha256-cmYt6fGYuuVs6YhAXaO9AG6TrYLDVUaE1/iC67rt76I=";
};
bundledContent = fetchzip {

View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "hydrogen";
version = "1.2.1";
version = "1.2.2";
src = fetchFromGitHub {
owner = "hydrogen-music";
repo = pname;
rev = version;
sha256 = "sha256-09zN6OVqVohk153gqXy6C0uHcBhZX2JJL4d6f4BU4Lg=";
sha256 = "sha256-A9mLiPh7ZMWJ11PcVP07IxZ8WdV2HkkKLix77egbC0M=";
};
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];

View File

@ -1,11 +1,13 @@
{ lib
, rustPlatform
, fetchFromGitHub
, makeWrapper
, pkg-config
, stdenv
, openssl
, withALSA ? true
, withALSA ? stdenv.isLinux
, alsa-lib
, alsa-plugins
, withPortAudio ? false
, portaudio
, withPulseAudio ? false
@ -26,7 +28,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-tbDlWP0sUIa0W9HhdYNOvo9cGeqFemclhA7quh7f/Rw=";
nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [
nativeBuildInputs = [ pkg-config makeWrapper ] ++ lib.optionals stdenv.isDarwin [
rustPlatform.bindgenHook
];
@ -41,6 +43,11 @@ rustPlatform.buildRustPackage rec {
++ lib.optional withPortAudio "portaudio-backend"
++ lib.optional withPulseAudio "pulseaudio-backend";
postFixup = lib.optionalString withALSA ''
wrapProgram "$out/bin/librespot" \
--set ALSA_PLUGIN_DIR '${alsa-plugins}/lib/alsa-lib'
'';
meta = with lib; {
description = "Open Source Spotify client library and playback daemon";
homepage = "https://github.com/librespot-org/librespot";

View File

@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "ocenaudio";
version = "3.12.6";
version = "3.12.7";
src = fetchurl {
url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}";
sha256 = "sha256-kQR0FaZbcdKf1yKHwTA525qzyFldSESQq6NRSZipUQw=";
sha256 = "sha256-+D/JvC0emKdxzd0l2n1QZ0geosrMpdpaxru5z61kqxA=";
};
nativeBuildInputs = [

View File

@ -22,13 +22,13 @@
stdenv.mkDerivation rec {
pname = "yoshimi";
version = "2.3.0.2";
version = "2.3.0.3";
src = fetchFromGitHub {
owner = "Yoshimi";
repo = pname;
rev = version;
hash = "sha256-zFwfKy8CVecGhgr48T+eDNHfMdctfrNGenc/XJctyw8=";
hash = "sha256-IsmhLUGqoa4Le86LE9SHFiXeiIKgwNfLaPFYXxnC9BM=";
};
sourceRoot = "${src.name}/src";

View File

@ -38,13 +38,13 @@ let
in
stdenv.mkDerivation rec {
pname = "cudatext";
version = "1.198.0";
version = "1.199.0";
src = fetchFromGitHub {
owner = "Alexey-T";
repo = "CudaText";
rev = version;
hash = "sha256-zm5acOTcjQdgKf6cSPP3mE070TVXbV6ixVa/+7g/SFE=";
hash = "sha256-07IXz2xhnAJFq4YbxjY6EjWiS5MCgylDphYUDk7ILfM=";
};
postPatch = ''

View File

@ -11,13 +11,13 @@
},
"ATFlatControls": {
"owner": "Alexey-T",
"rev": "2023.09.03",
"hash": "sha256-8mopVCqhmDW5MkrOzjt9+iBVgOf7/SbZy0Y40CzuNG0="
"rev": "2023.09.07",
"hash": "sha256-/ebjEOnmMH9pj8EZfyGP98fzBvSJepLTJGqK6xWoQWc="
},
"ATSynEdit": {
"owner": "Alexey-T",
"rev": "2023.09.03",
"hash": "sha256-Sk7G4dP5703yq26MC/c1EBhphBVWIbanvHJMcFJDqfk="
"rev": "2023.09.18",
"hash": "sha256-JwZ9abeodtPqzZZ8NlAEZQLgb81DB2NPBcbBphwhpb0="
},
"ATSynEdit_Cmp": {
"owner": "Alexey-T",
@ -26,8 +26,8 @@
},
"EControl": {
"owner": "Alexey-T",
"rev": "2023.05.31",
"hash": "sha256-sejyNiPmTboP6HlXao+RaMaEf67tAv4mXDHVkkMErPE="
"rev": "2023.08.18",
"hash": "sha256-X/KFQfLAnbcquLSsOk0ve0X5SzoEgEG0q0JY4TuQXpY="
},
"ATSynEdit_Ex": {
"owner": "Alexey-T",
@ -51,7 +51,7 @@
},
"bgrabitmap": {
"owner": "bgrabitmap",
"rev": "v11.5.5",
"hash": "sha256-M4ql+9zk5AJfmmHb9EG0PsJZGWcMm9/Y0lrPQqnKqcU="
"rev": "v11.5.6",
"hash": "sha256-7TuHCCaH8/RxiVQmDILPW4T6op/XW6djwA5iSh/Yb5w="
}
}

View File

@ -862,10 +862,18 @@ self: super: {
dontBuild = true;
};
nvim-navbuddy = super.nvim-navbuddy.overrideAttrs {
dependencies = with self; [ nui-nvim nvim-lspconfig nvim-navic ];
};
vim-mediawiki-editor = super.vim-mediawiki-editor.overrideAttrs {
passthru.python3Dependencies = [ python3.pkgs.mwclient ];
};
nvim-navic = super.nvim-navic.overrideAttrs {
dependencies = with self; [ nvim-lspconfig ];
};
nvim-spectre = super.nvim-spectre.overrideAttrs {
dependencies = with self; [ plenary-nvim ];
};

View File

@ -28,13 +28,13 @@
buildDotnetModule rec {
pname = "ryujinx";
version = "1.1.999"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
version = "1.1.1012"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
src = fetchFromGitHub {
owner = "Ryujinx";
repo = "Ryujinx";
rev = "7f96dbc0242f169caeb8461237bc01a23c115f56";
sha256 = "1fi1bfbz07k9n8civ7gv0rlksdm59wpjcq50hrj7dgwnkrlmxdi2";
rev = "e6700b314f1384f015666767baf9ea1d8411e330";
sha256 = "1szgmvwril7zwfbvqz850xavrk70i56i1yyqfh9mxpxlc3n9xxzr";
};
dotnet-sdk = dotnetCorePackages.sdk_7_0;

View File

@ -34,15 +34,6 @@ let
categories = [ "System" ];
})
(makeDesktopItem {
name = "x64";
exec = "x64";
comment = "VICE: C64 Emulator";
desktopName = "VICE: C64 Emulator";
genericName = "Commodore 64 emulator";
categories = [ "System" ];
})
(makeDesktopItem {
name = "x64dtv";
exec = "x64dtv";
@ -55,8 +46,8 @@ let
(makeDesktopItem {
name = "x64sc";
exec = "x64sc";
comment = "VICE: C64 SC Emulator";
desktopName = "VICE: C64 SC Emulator";
comment = "VICE: C64 Emulator";
desktopName = "VICE: C64 Emulator";
genericName = "Commodore 64 SC emulator";
categories = [ "System" ];
})
@ -127,11 +118,11 @@ let
in
stdenv.mkDerivation rec {
pname = "vice";
version = "3.6.1";
version = "3.7.1";
src = fetchurl {
url = "mirror://sourceforge/vice-emu/vice-${version}.tar.gz";
sha256 = "sha256-IN+EyFGq8vUABRCSf20xsy8mmRbTUUZcNm3Ar8ncFQw=";
sha256 = "sha256-fjgR5gJNsGmL+8MhuzJFckRriFPQG0Bz8JhllXsMq5g=";
};
nativeBuildInputs = [

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "yEd";
version = "3.23.1";
version = "3.23.2";
src = fetchzip {
url = "https://www.yworks.com/resources/yed/demo/${pname}-${version}.zip";
sha256 = "sha256-MboljULek5vCcHpRFL9kdT4AROTD774AOBYeOTzcdig=";
sha256 = "sha256-u83OmIzq9VygKbfa886mj6BIa/9ET1btry2nR/wxeyI=";
};
nativeBuildInputs = [ makeWrapper unzip wrapGAppsHook ];

View File

@ -9,43 +9,43 @@
let
pname = "1password";
version = if channel == "stable" then "8.10.9" else "8.10.12-10.BETA";
version = if channel == "stable" then "8.10.16" else "8.10.16-43.BETA";
sources = {
stable = {
x86_64-linux = {
url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz";
hash = "sha256-Ef0ee41WVN46IOYbdyF1w8Ud2s7ncR71/5TFnQwOnVU=";
hash = "sha256-p9JTJUwPqJAAykhfVwlEkPlqgZ0h9VLQR3K2BYABn5I=";
};
aarch64-linux = {
url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz";
hash = "sha256-IuRPCphagpx0jynJmhL9ETSzS0JaWCpDaodt0TDm7xs=";
hash = "sha256-RyG1QzmErwJi31pytlOjWE6QfhWjvZQuaTEtIEpg02k=";
};
x86_64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
hash = "sha256-KwMYxe6WpLFXaJ3jyEOc18IYO/pwZ7RiPF/7RN2c5xg=";
hash = "sha256-a2U6jmHMZY4PgigLCzTAOOtt5xOSV6sqJy7Tr2y2VvQ=";
};
aarch64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
hash = "sha256-MDc2Okc8nZbAPPn0ihoraDe9kNI5xx654DdTe7AlD3E=";
hash = "sha256-0LKAiY+eLYeWG/66d7n92aqI2nHZMijS0YM/d9TqYFo=";
};
};
beta = {
x86_64-linux = {
url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz";
hash = "sha256-SnfFd+ksJc69r7GGFUYCLH0NAwwiSxEDyaIRTrj/VWo=";
hash = "sha256-7udgyaj84rnh5yn2RuvZzjDC6QsVdHh7vkJrStlW93I=";
};
aarch64-linux = {
url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz";
hash = "sha256-5PDlMe/EZNBkfIrf6se4B5TKVYycSSoqiv0iMEPiIrA=";
hash = "sha256-2c5pL5C3BgimI8D4+Be/FkKKDBflo5Oc24nzaI4Oa4Y=";
};
x86_64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
hash = "sha256-nn8lnn52MkKcFRluH9k8IoAu4vZ1C9Uk/+k6TQ6CKFs=";
hash = "sha256-f7Wme98qrmdzfipBoEEEa9PSOMiTqAica8gwKfZJLCE=";
};
aarch64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
hash = "sha256-ACeFyaDzo1I4w/9CrkQ5iO/JBHYRbxxzMDhTX4oI548=";
hash = "sha256-6hK+qEG5gUo8XBOnxYIC+x5L9ah8m6c6YS/WpIGjENo=";
};
};
};

View File

@ -2,13 +2,13 @@
let
pname = "anytype";
version = "0.34.3";
version = "0.35.2";
name = "Anytype-${version}";
nameExecutable = pname;
src = fetchurl {
url = "https://anytype-release.fra1.cdn.digitaloceanspaces.com/Anytype-${version}.AppImage";
name = "Anytype-${version}.AppImage";
sha256 = "sha256-YJMpCEQ6eJYISGeYgvS6TcQwU2eD6fjgHrHRKA6CQJU=";
sha256 = "RLkAC9rNGHdbX/EfDTfpbBBKaY+BqdFuCMm99mkjOjw=";
};
appimageContents = appimageTools.extractType2 { inherit name src; };
in

View File

@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "cherrytree";
version = "0.99.56";
version = "1.0.1";
src = fetchFromGitHub {
owner = "giuspen";
repo = "cherrytree";
rev = version;
hash = "sha256-kDbUn81YfSMAX7FKcw+nDSrsNvrhOX0+NmgZUYNqCqQ=";
hash = "sha256-A/4OcsAOECgQnENj2l9BX713KHG+zk5cJE+yyHXw1TM=";
};
nativeBuildInputs = [

View File

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "coreaction";
version = "4.4.0";
version = "4.5.0";
src = fetchFromGitLab {
owner = "cubocore/coreapps";
repo = pname;
rev = "v${version}";
sha256 = "sha256-rJ4EFKk/zlvQqptbL81WdqqZQUR9hYADFkXuw11SzRc=";
hash = "sha256-qhYuLqWXCpOJCqg+JJ8VQQokNEQVwxpHAtYGITxHZ3Y=";
};
nativeBuildInputs = [

View File

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "corearchiver";
version = "4.4.0";
version = "4.5.0";
src = fetchFromGitLab {
owner = "cubocore/coreapps";
repo = pname;
rev = "v${version}";
sha256 = "sha256-rn0rasFWSjgBIOpKIb35xsEewOfAQOr4kEiA1GhShg0=";
hash = "sha256-TKBr/CFY4ixQnJuaN+wJB88s6g4lvQz4rwq9YsccRYk=";
};
nativeBuildInputs = [

View File

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "corefm";
version = "4.4.0";
version = "4.5.0";
src = fetchFromGitLab {
owner = "cubocore/coreapps";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ue0OOBf0PAxYHTfo37RvxnsKxzAEGIiGltXBVZpI6lk=";
hash = "sha256-mCFFT/vHzfC4jl1I8SkgaX8qu+AFNNcwUZx4eJeE+i4=";
};
nativeBuildInputs = [

View File

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "coregarage";
version = "4.4.0";
version = "4.5.0";
src = fetchFromGitLab {
owner = "cubocore/coreapps";
repo = pname;
rev = "v${version}";
sha256 = "sha256-NsCJS+FyHWj2aLXlbzxcHEcdZ2cViZmJlh501/48xdI=";
hash = "sha256-WCSc3ppYaktj9WnPb4n7SmSNWxT2HiXNmPKS3md3ST4=";
};
nativeBuildInputs = [

View File

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "corehunt";
version = "4.4.0";
version = "4.5.0";
src = fetchFromGitLab {
owner = "cubocore/coreapps";
repo = pname;
rev = "v${version}";
sha256 = "sha256-txQ/uoSwseo0i4/CqdQm3wN9/3p3gioRG9IuJTsgSF4=";
hash = "sha256-Xir1RQG7AlO166lZq1TJssiWoSixY6EfLEjxek+9ifo=";
};
nativeBuildInputs = [

View File

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "coreimage";
version = "4.4.0";
version = "4.5.0";
src = fetchFromGitLab {
owner = "cubocore/coreapps";
repo = pname;
rev = "v${version}";
sha256 = "sha256-8ILnZQIErLakiNfGZ91/vY+9XS/eOHcAnIFIuT1x9Mg=";
hash = "sha256-SyGIeoYC4bTBWZ0adOfYJpWkW3/bvFNZg5zK2MN27kA=";
};
nativeBuildInputs = [

View File

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "coreinfo";
version = "4.4.0";
version = "4.5.0";
src = fetchFromGitLab {
owner = "cubocore/coreapps";
repo = pname;
rev = "v${version}";
sha256 = "sha256-EWz2FQQzWVeP2qw1pz2Lg3COUo2y7/9a105R1Bj0Aqw=";
hash = "sha256-DmvmFMttEvNnIp1zwCe0BLrMx3Wlw1U9LcJwyb4Mx9U=";
};
nativeBuildInputs = [

View File

@ -8,7 +8,7 @@ mkDerivation rec {
owner = "cubocore/coreapps";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Hylz1x9Wsk0iVhpNBFZJChsl3gIvJDICgpITjIXDZAg=";
hash = "sha256-Hylz1x9Wsk0iVhpNBFZJChsl3gIvJDICgpITjIXDZAg=";
};
nativeBuildInputs = [

View File

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "corepad";
version = "4.4.0";
version = "4.5.0";
src = fetchFromGitLab {
owner = "cubocore/coreapps";
repo = pname;
rev = "v${version}";
sha256 = "sha256-MZdEdGfCaQp5DuDDYRNXi37O+O/aRS8XgAN0Jma/J3k=";
hash = "sha256-qiw6P+I9iAcFcBWiMKAzyxM6waXx/2TPVQHLcLjAnoY=";
};
nativeBuildInputs = [

View File

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "corepaint";
version = "4.4.0";
version = "4.5.0";
src = fetchFromGitLab {
owner = "cubocore/coreapps";
repo = pname;
rev = "v${version}";
sha256 = "sha256-wRF2Z2n9rEixmKYDRqKxQad2JDSxsgfGIWQWpjz/+yU=";
hash = "sha256-ndknVT/gl2P0s3ADW0txiVtAyI/l/ZFWEgufFleS0A4=";
};
nativeBuildInputs = [

View File

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "corepdf";
version = "4.4.0";
version = "4.5.0";
src = fetchFromGitLab {
owner = "cubocore/coreapps";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Dm3RDVHw1JXSC3HdS0k/IVTO/o5vaWiCr5vPDjr2uFk=";
hash = "sha256-t3r/bF/uKoprdDoRjrmYTND0Jws+jX6tAGnBeqofBF8=";
};
nativeBuildInputs = [

View File

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "corepins";
version = "4.4.0";
version = "4.5.0";
src = fetchFromGitLab {
owner = "cubocore/coreapps";
repo = pname;
rev = "v${version}";
sha256 = "sha256-wrP9Jm3T9gzEwEjNH2SXSqwP/+YRxVIyQRSPxdYgPCs=";
hash = "sha256-vA2Phs+sEs+Gd73xzj6vb91Krm8q3+koWDM7rCUayTQ=";
};
nativeBuildInputs = [

View File

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "corerenamer";
version = "4.4.0";
version = "4.5.0";
src = fetchFromGitLab {
owner = "cubocore/coreapps";
repo = pname;
rev = "v${version}";
sha256 = "sha256-hjI7KK+/u7OcqyjrZkRtBTfo8obDNqdudlFYcJR0dl8=";
hash = "sha256-jN1keyo2tDlgUu243173zgChw2nhvbsLPH9af6jDhKs=";
};
nativeBuildInputs = [

View File

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "coreshot";
version = "4.4.0";
version = "4.5.0";
src = fetchFromGitLab {
owner = "cubocore/coreapps";
repo = pname;
rev = "v${version}";
sha256 = "sha256-K/K6630ctWG856igXF1fAukwu6FbsBzF8JxG8K3gICc=";
hash = "sha256-XPECvwZkJIoN/r5oFWJpgl/WASpybgLjCK/F0XVMHyU=";
};
nativeBuildInputs = [

View File

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "corestats";
version = "4.4.0";
version = "4.5.0";
src = fetchFromGitLab {
owner = "cubocore/coreapps";
repo = pname;
rev = "v${version}";
sha256 = "sha256-AhM7Rvxh8WZPrpDzhY6DYALVe4VlF9b77oX61AVntI0=";
hash = "sha256-584dSlXhPfvTBeDjex1o2TZPoG40tl1fNDiIYqjyzOI=";
};
nativeBuildInputs = [

View File

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "corestuff";
version = "4.4.0";
version = "4.5.0";
src = fetchFromGitLab {
owner = "cubocore/coreapps";
repo = pname;
rev = "v${version}";
sha256 = "sha256-F0kddb622W44MDkZOh4YTyFQ+J/UGGbkcrWXCSDYcek=";
hash = "sha256-2tnJMBbROGWZQDWjy/xGBNkv7DXXKLWrHf2XnMjOjWQ=";
};
patches = [

View File

@ -12,13 +12,13 @@
mkDerivation rec {
pname = "coreterminal";
version = "4.4.0";
version = "4.5.0";
src = fetchFromGitLab {
owner = "cubocore/coreapps";
repo = pname;
rev = "v${version}";
sha256 = "sha256-sFNKyqzNrPAGitmR8YEtIf6vtnvAP7+jXk4GFnDeGJs=";
hash = "sha256-zMSE1gQ2HJQCqil3MB4slRe0Cojv2XRLd8wLTokF8H0=";
};
nativeBuildInputs = [

View File

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "coretime";
version = "4.4.0";
version = "4.5.0";
src = fetchFromGitLab {
owner = "cubocore/coreapps";
repo = pname;
rev = "v${version}";
sha256 = "sha256-XTX4oeUFwfZE0ey1NjXpAzw0x+4d8IGwU/sEojRwBBY=";
hash = "sha256-0x3014UG861lXRwIBpYiiYVPmhln9Q20jJ4tIO50Tjs=";
};
nativeBuildInputs = [

View File

@ -30,13 +30,13 @@
mkDerivation rec {
pname = "coretoppings";
version = "4.4.0";
version = "4.5.0";
src = fetchFromGitLab {
owner = "cubocore/coreapps";
repo = pname;
rev = "v${version}";
sha256 = "sha256-3wLDTN3SrbQNs43nQmSBrSB0bD6YineBQ8eNPDws1G8=";
hash = "sha256-IYUkPGgFGI6889IyromMBobIoqSZtALVsSswQ7O1Bp0=";
};
patches = [

View File

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "coreuniverse";
version = "4.4.0";
version = "4.5.0";
src = fetchFromGitLab {
owner = "cubocore/coreapps";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ThEzuwBrPUkXURcW9KiXJs8ExqYWZamlfeQ1IggMWdc=";
hash = "sha256-SjD37+uLKJrPvjxK0douNgGCUq9He3EK86takZlrX7Q=";
};
nativeBuildInputs = [

View File

@ -16,8 +16,8 @@ index 4c40d4c..5dbb6ff 100644
SystemXdgMime::SystemXdgMime()
{
- appsDirs << QDir::home().filePath(".local/share/applications/");
- appsDirs << "/usr/local/share/applications/" << "/usr/share/applications/";
- appsDirs << "/usr/share/applications/kde4/" << "/usr/share/gnome/applications/";
- appsDirs << QDir::root().filePath("usr/local/share/applications/") << QDir::root().filePath("usr/share/applications/");
- appsDirs << QDir::root().filePath("usr/share/applications/kde4/") << QDir::root().filePath("usr/share/gnome/applications/");
+ appsDirs << QDir::home().filePath(".nix-profile/share/applications/");
+ appsDirs << "/run/current-system/sw/share/applications/";
+ appsDirs << "/run/current-system/sw/share/applications/kde4/";

View File

@ -10,13 +10,13 @@
mkDerivation rec {
pname = "libcprime";
version = "4.4.1";
version = "4.5.0";
src = fetchFromGitLab {
owner = "cubocore";
repo = pname;
rev = "v${version}";
sha256 = "sha256-6kkKmF9mARhSm93ZrWJiwRNmpkiCxyhSD3W7X3gYuu4=";
hash = "sha256-j6WFLcjDMkYl+9HCmhMRttwtjNX05oP5mfdOsoLC7og=";
};
patches = [

View File

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "libcsys";
version = "4.4.1";
version = "4.5.0";
src = fetchFromGitLab {
owner = "cubocore";
repo = pname;
rev = "v${version}";
sha256 = "sha256-IWzgRwouI/0bQBuEd9CV0Ue6cF2HwRw3jMdLyGA1+TY=";
hash = "sha256-1MHyx01w+dCeAeumcSXRBStgAec2yu1rLwaZaCXRgTc=";
};
nativeBuildInputs = [

View File

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "sha256-xZFQQDK+yGAv4IbuNe2dvNa3GDASeJY2mOYw94goAIM=";
};
# Set vendorSha256 to null because dstask vendors its dependencies (meaning
# Set vendorHash to null because dstask vendors its dependencies (meaning
# that third party dependencies are stored in the repository).
#
# Ref <https://github.com/NixOS/nixpkgs/pull/87383#issuecomment-633204382>

View File

@ -1,40 +0,0 @@
{ lib
, buildGoModule
, fetchFromGitHub
, pkg-config
, vips
}:
buildGoModule rec {
pname = "go-thumbnailer";
version = "0.1.0";
src = fetchFromGitHub {
owner = "donovanglover";
repo = pname;
rev = version;
sha256 = "sha256-sgd5kNnDXcSesGT+OignZ+APjNSxSP0Z60dr8cWO6sU=";
};
buildInputs = [
vips
];
nativeBuildInputs = [
pkg-config
];
vendorHash = "sha256-4zgsoExdhEqvycGerNVxZ6LnjeRRO+f6DhJdINR5ZyI=";
postInstall = ''
mkdir -p $out/share/thumbnailers
substituteAll ${./go.thumbnailer} $out/share/thumbnailers/go.thumbnailer
'';
meta = with lib; {
description = "A cover thumbnailer written in Go for performance and reliability";
homepage = "https://github.com/donovanglover/go-thumbnailer";
license = licenses.mit;
maintainers = with maintainers; [ donovanglover ];
};
}

View File

@ -1,3 +0,0 @@
[Thumbnailer Entry]
Exec=@out@/bin/go-thumbnailer %s %i %o
MimeType=inode/directory

View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "moonlight-embedded";
version = "2.5.3";
version = "2.6.0";
src = fetchFromGitHub {
owner = "moonlight-stream";
repo = "moonlight-embedded";
rev = "v${version}";
sha256 = "sha256-TUS0eTlQA7O59EvJHrQkqDQexv84ucza6kE4t98AGPs=";
sha256 = "sha256-BZYFN6X6UNllwlovnpEwDSocA5ZfSDUOyr8JTg4z9ak=";
fetchSubmodules = true;
};

View File

@ -19,13 +19,13 @@ let
in
stdenv.mkDerivation rec {
pname = "p2pool";
version = "3.5";
version = "3.6.2";
src = fetchFromGitHub {
owner = "SChernykh";
repo = "p2pool";
rev = "v${version}";
sha256 = "sha256-qwdEmDfH+TE0WF2HIVCn23RlzelLBvCOu9VKpScdO68=";
sha256 = "sha256-wpWdJSaX1PrAgQkOF+aiAWUWfDja1FIkLO3W+rM3cVI=";
fetchSubmodules = true;
};

View File

@ -1,10 +1,10 @@
{ appimageTools, fetchurl, lib }:
let
pname = "protonup-qt";
version = "2.8.0";
version = "2.8.2";
src = fetchurl {
url = "https://github.com/DavidoTek/ProtonUp-Qt/releases/download/v${version}/ProtonUp-Qt-${version}-x86_64.AppImage";
hash = "sha256-o3Tsrdrj5qDcTqhdgdf4Lcpp9zfBQY+/l3Ohm1A/pm4=";
hash = "sha256-y7PoYbZBwkohqVEb/vGE0B8TTCtMncZIozABs0KJpL0=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };
in

View File

@ -97,6 +97,7 @@ python3Packages.buildPythonApplication rec {
description = "Linux compatible UI for the Elgato Stream Deck";
homepage = "https://streamdeck-linux-gui.github.io/streamdeck-linux-gui/";
license = licenses.mit;
mainProgram = "streamdeck";
maintainers = with maintainers; [ majiir ];
};
}

View File

@ -2,17 +2,18 @@
, qmake, qttools
, qtsvg, qtxmlpatterns
, wrapQtAppsHook
, autoPatchelfHook
}:
stdenv.mkDerivation rec {
pname = "valentina";
version = "0.7.51";
version = "0.7.52";
src = fetchFromGitLab {
owner = "smart-pattern";
repo = "valentina";
rev = "v${version}";
hash = "sha256-N9fC2tCP4TVNncatHaz5W5Mp3jOmAcEWYCl30+0myaE=";
hash = "sha256-DmNRBxqyBvDTdA7Sz9X04Dhejtxx7tOVpST+SkUNguM=";
};
postPatch = ''
@ -20,7 +21,7 @@ stdenv.mkDerivation rec {
--replace '$$[QT_INSTALL_BINS]/$$LRELEASE' '${lib.getDev qttools}/bin/lrelease'
'';
nativeBuildInputs = [ qmake qttools wrapQtAppsHook installShellFiles ];
nativeBuildInputs = [ qmake qttools wrapQtAppsHook installShellFiles autoPatchelfHook ];
buildInputs = [ qtsvg qtxmlpatterns ];

View File

@ -2,8 +2,8 @@
, python3
, fetchFromGitHub
, gobject-introspection
, gtk3
, wrapGAppsHook
, killall
}:
python3.pkgs.buildPythonApplication rec {
@ -22,8 +22,9 @@ python3.pkgs.buildPythonApplication rec {
wrapGAppsHook
];
propagatedBuildInputs = with python3.pkgs; [
pygobject3
propagatedBuildInputs = [
python3.pkgs.pygobject3
killall
];
# has no tests

View File

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "avalanchego";
version = "1.10.9";
version = "1.10.10";
src = fetchFromGitHub {
owner = "ava-labs";
repo = pname;
rev = "v${version}";
hash = "sha256-ofIpTDlD8ztC5vR975GhH/yYb4LqVs17kdfbU2UN6gg=";
hash = "sha256-ExBVKcKBoPKbPvF/CQ85FihXZINdShPeyUhCfoeHUWM=";
};
vendorHash = "sha256-EjdlIfY5he1P1JMJNwPNHFSwhlczGZb2ygvxviggesM=";
vendorHash = "sha256-7puWqJaccSJRh9w3V3hiWAvr2TRVutHSkHrfbrIaDPE=";
# go mod vendor has a bug, see: https://github.com/golang/go/issues/57529
proxyVendor = true;

View File

@ -12,7 +12,6 @@
, python3, perl
, which
, llvmPackages_attrName
, rustc
, libuuid
, overrideCC
# postPatch:
@ -388,7 +387,7 @@ let
# Use nixpkgs Rust compiler instead of the one shipped by Chromium.
# We do intentionally not set rustc_version as nixpkgs will never do incremental
# rebuilds, thus leaving this empty is fine.
rust_sysroot_absolute = "${rustc}";
rust_sysroot_absolute = "${buildPackages.rustc}";
# Building with rust is disabled for now - this matches the flags in other major distributions.
enable_rust = false;
} // lib.optionalAttrs (!(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) {

View File

@ -2,12 +2,12 @@
let
pname = "polypane";
version = "14.1.0";
version = "15.0.0";
src = fetchurl {
url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage";
name = "${pname}-${version}.AppImage";
sha256 = "sha256-UJ4Ccz9PjpmZqJGbJjw3lyqR3VCl9xf3F6WUoBaUEVg=";
sha256 = "sha256-O0VWgx6FKulELZuJgMwFgGSo+EaCqb9dgneF2XFnq7U=";
};
appimageContents = appimageTools.extractType2 {

View File

@ -23,7 +23,7 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
version = "6.2.3105.45";
version = "6.2.3105.48";
suffix = {
aarch64-linux = "arm64";
@ -33,8 +33,8 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
hash = {
aarch64-linux = "sha256-AumYFbCa5+Ou89e6MDQZFlyCu30IvX8jbz+deRojzOQ=";
x86_64-linux = "sha256-9U7vPvmCbwgkYGIZblKghuqClhOfGSEQqTVkaDgc0Ms=";
aarch64-linux = "sha256-SIuHulBZ7r0gaIdkF3zM3mzLOyiUWCM7YM2teA7T9is=";
x86_64-linux = "sha256-LsyeX+nPlOtMCWv1Zu46OZ7yMm9feqyGR73saAwM1SU=";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};

View File

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "arkade";
version = "0.10.0";
version = "0.10.7";
src = fetchFromGitHub {
owner = "alexellis";
repo = "arkade";
rev = version;
hash = "sha256-XjJt2bLGBl6T3nrTdwr8lNKW0cBZH+gYFAy6lkNtwgw=";
hash = "sha256-6KgQR8QIgbrI2XhORhDjcC2PK+XbmDWNBjjjE3qOAhQ=";
};
CGO_ENABLED = 0;

View File

@ -1,39 +1,52 @@
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
{ lib
, stdenv
, buildGoModule
, fetchFromGitHub
, installShellFiles
, nix-update-script
}:
buildGoModule rec {
pname = "cmctl";
version = "1.11.2";
version = "1.13.0";
src = fetchFromGitHub {
owner = "cert-manager";
repo = "cert-manager";
rev = "4767427a40e0e193c976fd6bc228f50de8950572";
sha256 = "128s5vd4hp5mr0rnb21grzmijzx0ibpv71as36dcgw7z4v3gq7lx";
rev = "v${version}";
hash = "sha256-o51CIwZeBq3XrNvu6n6dVCsmXH2pU7l3igw61KjI0cw=";
};
vendorHash = "sha256-+r0QpD97r6dokUr07Qjb9kvoK+oz2rvml0cIebtYuHg=";
sourceRoot = "${src.name}/cmd/ctl";
subPackages = [ "cmd/ctl" ];
vendorHash = "sha256-szDFQ5zxZ4IUMaIe/eyQAouomR6kpQXn/LZ3MEBbx0Y=";
ldflags = [
"-s" "-w"
"-s"
"-w"
"-X github.com/cert-manager/cert-manager/cmd/ctl/pkg/build.name=cmctl"
"-X github.com/cert-manager/cert-manager/cmd/ctl/pkg/build/commands.registerCompletion=true"
"-X github.com/cert-manager/cert-manager/pkg/util.AppVersion=v${version}"
"-X github.com/cert-manager/cert-manager/pkg/util.AppGitCommit=${src.rev}"
];
nativeBuildInputs = [ installShellFiles ];
nativeBuildInputs = [
installShellFiles
];
# Trusted by this computer: no: x509: “cert-manager” certificate is not trusted
doCheck = !stdenv.isDarwin;
postInstall = ''
mv $out/bin/ctl $out/bin/cmctl
'' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd cmctl \
--bash <($out/bin/cmctl completion bash) \
--fish <($out/bin/cmctl completion fish) \
--zsh <($out/bin/cmctl completion zsh)
'';
passthru.updateScript = ./update.sh;
passthru.updateScript = nix-update-script { };
meta = with lib; {
description = "A CLI tool for managing cert-manager service on Kubernetes clusters";

View File

@ -1,41 +0,0 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl gnugrep gnused jq
set -x -eu -o pipefail
NIXPKGS_PATH="$(git rev-parse --show-toplevel)"
CMCTL_PATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
OLD_VERSION="$(nix-instantiate --eval -E "with import $NIXPKGS_PATH {}; cmctl.version or (builtins.parseDrvName cmctl.name).version" | tr -d '"')"
LATEST_TAG="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/cert-manager/cert-manager/releases" | jq '.[].tag_name' --raw-output | sed '/-/d' | sort --version-sort -r | head -n 1)"
LATEST_VERSION="${LATEST_TAG:1}"
if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then
SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/cert-manager/cert-manager/archive/refs/tags/${LATEST_TAG}.tar.gz)
TAG_SHA=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/cert-manager/cert-manager/git/ref/tags/${LATEST_TAG}" | jq -r '.object.sha')
TAG_COMMIT_SHA=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/cert-manager/cert-manager/git/tags/${TAG_SHA}" | jq '.object.sha' --raw-output)
setKV () {
sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" "${CMCTL_PATH}/default.nix"
}
setKV version ${LATEST_VERSION}
setKV sha256 "${SHA256}"
setKV rev ${TAG_COMMIT_SHA}
setKV vendorSha256 "0000000000000000000000000000000000000000000000000000" # The same as lib.fakeSha256
set +e
VENDOR_SHA256=$(nix-build --no-out-link -A cmctl $NIXPKGS_PATH 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g')
set -e
if [ -n "${VENDOR_SHA256:-}" ]; then
setKV vendorSha256 ${VENDOR_SHA256}
else
echo "Update failed. VENDOR_SHA256 is empty."
exit 1
fi
echo "updated cmctl to $LATEST_VERSION, please commit changes."
else
echo "cmctl is already up-to-date at $OLD_VERSION"
fi

View File

@ -51,7 +51,7 @@ let
k3sVersion = "1.24.10+k3s1"; # k3s git tag
k3sCommit = "546a94e9ae1c3be6f9c0dcde32a6e6672b035bc8"; # k3s git commit at the above version
k3sRepoSha256 = "sha256-HfkGb3GtR2wQkVIze26aFh6A6W0fegr8ovpSel7oujQ=";
k3sVendorSha256 = "sha256-YAerisDr/knlKPaO2fVMZA4FUpwshFmkpi3mJAmLqKM=";
k3sVendorHash = "sha256-YAerisDr/knlKPaO2fVMZA4FUpwshFmkpi3mJAmLqKM=";
# Based on the traefik charts here: https://github.com/k3s-io/k3s/blob/v1.24.10%2Bk3s1/scripts/download#L29-L32
# see also https://github.com/k3s-io/k3s/blob/v1.24.10%2Bk3s1/manifests/traefik.yaml#L8-L16
@ -170,7 +170,7 @@ let
version = k3sVersion;
src = k3sRepo;
vendorSha256 = k3sVendorSha256;
vendorHash = k3sVendorHash;
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libseccomp sqlite.dev ];
@ -221,7 +221,7 @@ buildGoModule rec {
version = k3sVersion;
src = k3sRepo;
vendorSha256 = k3sVendorSha256;
vendorHash = k3sVendorHash;
postPatch = ''
# Nix prefers dynamically linked binaries over static binary.
@ -279,7 +279,7 @@ buildGoModule rec {
# Specifically, it has a 'go generate' which runs part of the package. See
# this comment:
# https://github.com/NixOS/nixpkgs/pull/158089#discussion_r799965694
# So, why do we use buildGoModule at all? For the `vendorSha256` / `go mod download` stuff primarily.
# So, why do we use buildGoModule at all? For the `vendorHash` / `go mod download` stuff primarily.
buildPhase = ''
patchShebangs ./scripts/package-cli ./scripts/download ./scripts/build-upload

View File

@ -51,7 +51,7 @@ let
k3sVersion = "1.25.3+k3s1"; # k3s git tag
k3sCommit = "f2585c1671b31b4b34bddbb3bf4e7d69662b0821"; # k3s git commit at the above version
k3sRepoSha256 = "0zwf3iwjcidx14zw36s1hr0q8wmmbfc0rfqwd7fmpjq597h8zkms";
k3sVendorSha256 = "sha256-U67tJRGqPFk5AfRe7I50zKGC9HJ2oh+iI/C7qF/76BQ=";
k3sVendorHash = "sha256-U67tJRGqPFk5AfRe7I50zKGC9HJ2oh+iI/C7qF/76BQ=";
# taken from ./manifests/traefik.yaml, extracted from '.spec.chart' https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/download#L9
# The 'patch' and 'minor' versions are currently hardcoded as single digits only, so ignore the trailing two digits. Weird, I know.
@ -169,7 +169,7 @@ let
version = k3sVersion;
src = k3sRepo;
vendorSha256 = k3sVendorSha256;
vendorHash = k3sVendorHash;
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libseccomp sqlite.dev ];
@ -219,7 +219,7 @@ buildGoModule rec {
version = k3sVersion;
src = k3sRepo;
vendorSha256 = k3sVendorSha256;
vendorHash = k3sVendorHash;
patches = [
./0001-script-download-strip-downloading-just-package-CRD.patch
@ -281,7 +281,7 @@ buildGoModule rec {
# Specifically, it has a 'go generate' which runs part of the package. See
# this comment:
# https://github.com/NixOS/nixpkgs/pull/158089#discussion_r799965694
# So, why do we use buildGoModule at all? For the `vendorSha256` / `go mod download` stuff primarily.
# So, why do we use buildGoModule at all? For the `vendorHash` / `go mod download` stuff primarily.
buildPhase = ''
patchShebangs ./scripts/package-cli ./scripts/download ./scripts/build-upload

View File

@ -2,7 +2,7 @@
k3sVersion = "1.26.6+k3s1";
k3sCommit = "3b1919b0d55811707bd1168f0abf11cccc656c26";
k3sRepoSha256 = "1g82bkq4w0jpfn1fanj1d24bj46rw908wk50p3cm47rqiqlys72y";
k3sVendorSha256 = "sha256-+a9/q5a28zA9SmAdp2IItHR1MdJvlbMW5796bHTfKBw=";
k3sVendorHash = "sha256-+a9/q5a28zA9SmAdp2IItHR1MdJvlbMW5796bHTfKBw=";
chartVersions = import ./chart-versions.nix;
k3sRootVersion = "0.12.2";
k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k";

View File

@ -1,14 +1,14 @@
{
k3sVersion = "1.27.5+k3s1";
k3sCommit = "8d074ecb5a8765a09eeef6f8be7987055210bc40";
k3sRepoSha256 = "0bv0r1l97zip9798d8r3ldymmdhlrfw3j9i0nvads1sd1d4az6m6";
k3sVendorSha256 = "sha256-dFLBa/Sn3GrOPWsTFkP0H2HASE8XB99Orxx5K7nnNio=";
k3sVersion = "1.27.6+k3s1";
k3sCommit = "bd04941a294793ec92e8703d5e5da14107902e88";
k3sRepoSha256 = "04chr8gp0yprihigy1yzhvi2baby053fav384gq0sjq6bkp3fzd8";
k3sVendorHash = "sha256-LH9OsBK0Pq/NGEHprbIgYKQsslYdR3i4LYVvo5P0K+8=";
chartVersions = import ./chart-versions.nix;
k3sRootVersion = "0.12.2";
k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k";
k3sCNIVersion = "1.3.0-k3s1";
k3sCNISha256 = "0zma9g4wvdnhs9igs03xlx15bk2nq56j73zns9xgqmfiixd9c9av";
containerdVersion = "1.7.3-k3s1";
containerdSha256 = "03352jn1igsqi23sll06mdsvdbkfhrscqa2ackwczx1a3innxv9r";
containerdVersion = "1.7.6-k3s1.27";
containerdSha256 = "1kzjqw56pcdpsqdkw2k5a3pnpf8n93dh4jc2yybgqz3nyj4fw0a8";
criCtlVersion = "1.26.0-rc.0-k3s1";
}

View File

@ -5,7 +5,7 @@ lib:
# commit hash
k3sCommit,
k3sRepoSha256 ? lib.fakeHash,
k3sVendorSha256 ? lib.fakeHash,
k3sVendorHash ? lib.fakeHash,
# taken from ./scripts/version.sh VERSION_ROOT https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L47
k3sRootVersion,
k3sRootSha256 ? lib.fakeHash,
@ -182,7 +182,7 @@ let
version = k3sVersion;
src = k3sRepo;
vendorSha256 = k3sVendorSha256;
vendorHash = k3sVendorHash;
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libseccomp sqlite.dev ];
@ -238,7 +238,7 @@ buildGoModule rec {
tags = [ "libsqlite3" "linux" "ctrd" ];
src = k3sRepo;
vendorSha256 = k3sVendorSha256;
vendorHash = k3sVendorHash;
postPatch = ''
# Nix prefers dynamically linked binaries over static binary.
@ -296,7 +296,7 @@ buildGoModule rec {
# Specifically, it has a 'go generate' which runs part of the package. See
# this comment:
# https://github.com/NixOS/nixpkgs/pull/158089#discussion_r799965694
# So, why do we use buildGoModule at all? For the `vendorSha256` / `go mod download` stuff primarily.
# So, why do we use buildGoModule at all? For the `vendorHash` / `go mod download` stuff primarily.
buildPhase = ''
patchShebangs ./scripts/package-cli ./scripts/download ./scripts/build-upload

View File

@ -101,7 +101,7 @@ cat >versions.nix <<EOF
k3sVersion = "${K3S_VERSION}";
k3sCommit = "${K3S_COMMIT}";
k3sRepoSha256 = "${K3S_REPO_SHA256}";
k3sVendorSha256 = "${FAKE_HASH}";
k3sVendorHash = "${FAKE_HASH}";
chartVersions = import ./chart-versions.nix;
k3sRootVersion = "${K3S_ROOT_VERSION}";
k3sRootSha256 = "${K3S_ROOT_SHA256}";
@ -114,13 +114,13 @@ cat >versions.nix <<EOF
EOF
set +e
K3S_VENDOR_SHA256=$(nix-prefetch -I nixpkgs=${NIXPKGS_ROOT} "{ sha256 }: (import ${NIXPKGS_ROOT}. {}).k3s_1_${MINOR_VERSION}.goModules.overrideAttrs (_: { vendorSha256 = sha256; })")
K3S_VENDOR_HASH=$(nix-prefetch -I nixpkgs=${NIXPKGS_ROOT} "{ sha256 }: (import ${NIXPKGS_ROOT}. {}).k3s_1_${MINOR_VERSION}.goModules.overrideAttrs (_: { vendorHash = sha256; })")
set -e
if [ -n "${K3S_VENDOR_SHA256:-}" ]; then
sed -i "s|${FAKE_HASH}|${K3S_VENDOR_SHA256}|g" ./versions.nix
if [ -n "${K3S_VENDOR_HASH:-}" ]; then
sed -i "s|${FAKE_HASH}|${K3S_VENDOR_HASH}|g" ./versions.nix
else
echo "Update failed. K3S_VENDOR_SHA256 is empty."
echo "Update failed. K3S_VENDOR_HASH is empty."
exit 1
fi

View File

@ -12,16 +12,16 @@
buildGoModule rec {
pname = "kubebuilder";
version = "3.11.1";
version = "3.12.0";
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = "kubebuilder";
rev = "v${version}";
hash = "sha256-VT9S8Ijf684rowfoU1kvgPSTzR8ZGr3GwxWiYHWLANc=";
hash = "sha256-drg7hFUEFoicZxzorO365b3eFN9NRdhWYn9bIk+sSY8=";
};
vendorHash = "sha256-5XUYmAfFH6UlLF09PqcSLUxkgZ5iHZGj0Vurab+Jl1g=";
vendorHash = "sha256-qH7+DDGYRCrXI3B2dN/4pZMBqSXKkZUvIrtVEg0Ep+c=";
subPackages = ["cmd"];

View File

@ -27,7 +27,7 @@ let
in
buildGoPackage rec {
pname = "amazon-ssm-agent";
version = "3.2.1297.0";
version = "3.2.1478.0";
goPackagePath = "github.com/aws/${pname}";
@ -37,7 +37,7 @@ buildGoPackage rec {
rev = version;
owner = "aws";
repo = "amazon-ssm-agent";
hash = "sha256-zRs7RsShZPH3hb5MsADUNrTfHbJVwCELE9mCqEWaTng=";
hash = "sha256-SS0N3Wcksk2vq52K6GYE9z4hrckXGqiuCuYPHkH4SWc=";
};
patches = [
@ -49,7 +49,7 @@ buildGoPackage rec {
./0002-version-gen-don-t-use-unnecessary-constants.patch
];
# See the list https://github.com/aws/amazon-ssm-agent/blob/3.2.1297.0/makefile#L120-L138
# See the list https://github.com/aws/amazon-ssm-agent/blob/3.2.1478.0/makefile#L120-L138
# The updater is not built because it cannot work on NixOS
subPackages = [
"core"

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "starboard";
version = "0.15.13";
version = "0.15.15";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
sha256 = "sha256-8sEhR32CaTYGHi6tdhjGl8c42QUbaaUDdFwtpEFwRHo=";
sha256 = "sha256-aKxRjPXvj9rGUheUjpjGWlzg9I6LaCxfc6FJV8Kzj3I=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@ -20,7 +20,7 @@ buildGoModule rec {
find "$out" -name .git -print0 | xargs -0 rm -rf
'';
};
vendorHash = "sha256-JEji1wPXLfVireuIVD2Ct/1Nvf92ukwRpMDCrT/CbOE=";
vendorHash = "sha256-dUqcg9/kJfKWIygem0rmtgOiYOHpfWOdH4YV0mYhxeQ=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "temporal";
version = "1.21.5";
version = "1.22.0";
src = fetchFromGitHub {
owner = "temporalio";
repo = "temporal";
rev = "v${version}";
hash = "sha256-G8HqoTdkAAGSadJRF+22hD8q0htwl21HWupfx1/5muc=";
hash = "sha256-7AdbGsgdDsSUtj8TkZl4CcvF2Xk1l9W9Vdos+fEsIVI=";
};
vendorHash = "sha256-AVij8Xb729UQt8BuRf+SoGhoDFzsVELAFV5xCBwnx4c=";
vendorHash = "sha256-gDiVB34fICaS6IyQCAa4ePff/vsT7/7HnJM9ZjiOh4k=";
excludedPackages = [ "./build" ];

View File

@ -2,18 +2,18 @@
buildGoModule rec {
pname = "weave-gitops";
version = "0.29.0";
version = "0.31.2";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = "v${version}";
sha256 = "sha256-d/MC+QJypLvURLRRp4U3oErf+MdyJ291Pa+gNPkV4xQ=";
sha256 = "sha256-bzYvyqLMdVdgp8C71mnykzB9HEIPDXQ+SpBOScKybJ8=";
};
ldflags = [ "-s" "-w" "-X github.com/weaveworks/weave-gitops/cmd/gitops/version.Version=${version}" ];
vendorHash = "sha256-qwuV/c4lWjtmLp197EOScgZHMe4Wmnbj/Jy8x0n2VSo=";
vendorHash = "sha256-3woVoEh+bU8QOzOEk7hnxxVe0mlPozqUDuP0Rn/9J6k=";
subPackages = [ "cmd/gitops" ];

View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "zarf";
version = "0.29.1";
version = "0.29.2";
src = fetchFromGitHub {
owner = "defenseunicorns";
repo = "zarf";
rev = "v${version}";
hash = "sha256-m/eyy3MpHHlxlWU9Y7tsQw5jGGZIKCvBkIgoRmvecBI=";
hash = "sha256-eSKoh1Ab2rzpOOHRi+FZ92ic92Q6bFpu1jYIPhmoqQc=";
};
vendorHash = "sha256-p1QLNbkNlIwqHzLjGX5YGC2Xxu0nAjmMfGwKXhi9XkU=";

View File

@ -2,13 +2,13 @@
(if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec {
pname = "signalbackup-tools";
version = "20230921";
version = "20230922-4";
src = fetchFromGitHub {
owner = "bepaald";
repo = pname;
rev = version;
hash = "sha256-wxJPz6zm/mZEW7/p5Aac2PQRf3mmXj84k2hz2RzuNbw=";
hash = "sha256-6VzcylvGyEB+5KYX1r9wEEfSECh+O947KdcN3DMJxE0=";
};
postPatch = ''

View File

@ -11,16 +11,16 @@
buildGoModule rec {
pname = "rymdport";
version = "3.4.0";
version = "3.5.0";
src = fetchFromGitHub {
owner = "Jacalz";
repo = "rymdport";
rev = "v${version}";
hash = "sha256-nqB4KZdYSTiyIaslFN6ncwJnD8+7ZgHj/SXAa5YAt9k=";
hash = "sha256-aNLAj8rQSRp6fsEu052uc2gJE55A996YJY7tDApjHxA=";
};
vendorHash = "sha256-03qdjeU6u0mBcdWlMhs9ORaeBkPNMO4Auqy/rOFIaVM=";
vendorHash = "sha256-8TxuExcxiBTHVA9DTLfElKOq45a2EVLxqmByDyKJQ4c=";
nativeBuildInputs = [
pkg-config

View File

@ -19,14 +19,14 @@
let
pname = "qownnotes";
appname = "QOwnNotes";
version = "23.8.1";
version = "23.9.4";
in
stdenv.mkDerivation {
inherit pname appname version;
src = fetchurl {
url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz";
hash = "sha256-ZS9OzC+pdtYY4xLQ3G31/Sw/xx4qgDjp+nAcPJdl0tk=";
hash = "sha256-e5x3YeWCaTNoQR924r2EseqDOfFluj58MGS78DzfJUM=";
};
nativeBuildInputs = [

View File

@ -7,12 +7,12 @@
}:
stdenv.mkDerivation rec {
version = "4.0.22";
version = "4.0.23";
pname = "flmsg";
src = fetchurl {
url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz";
sha256 = "sha256-ueOkhmxrd4OT5g8z78TWUZuxT5SbF9300UWe7UByfD0=";
sha256 = "sha256-3eR0wrzkNjlqm5xW5dtgihs33cVUmZeS0/rf+xnPeRY=";
};
buildInputs = [

View File

@ -0,0 +1,66 @@
{ lib
, stdenv
, ant
, fetchFromGitHub
, jdk11_headless
, jre
, makeWrapper
}:
stdenv.mkDerivation rec {
pname = "trimmomatic";
version = "0.39";
src = fetchFromGitHub {
owner = "usadellab";
repo = "Trimmomatic";
rev = "v${version}";
hash = "sha256-u+ubmacwPy/vsEi0YQCv0fTnVDesQvqeQDEwCbS8M6I=";
};
# Set source and target version to 11
postPatch = ''
substituteInPlace ./build.xml \
--replace 'source="1.5" target="1.5"' 'release="11"'
'';
nativeBuildInputs = [ jdk11_headless ant makeWrapper ];
buildPhase = ''
runHook preBuild
ant
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin $out/share
cp dist/jar/trimmomatic-${version}.jar $out/share/
cp -r adapters $out/share/
makeWrapper ${jre}/bin/java $out/bin/trimmomatic \
--add-flags "-cp $out/share/trimmomatic-${version}.jar org.usadellab.trimmomatic.Trimmomatic"
runHook postInstall
'';
meta = {
description = "A flexible read trimming tool for Illumina NGS data";
longDescription = ''
Trimmomatic performs a variety of useful trimming tasks for illumina
paired-end and single ended data: adapter trimming, quality trimming,
cropping to a specified length, length filtering, quality score
conversion.
'';
homepage = "http://www.usadellab.org/cms/?page=trimmomatic";
downloadPage = "https://github.com/usadellab/Trimmomatic/releases";
license = lib.licenses.gpl3Only;
sourceProvenance = [
lib.sourceTypes.fromSource
lib.sourceTypes.binaryBytecode # source bundles dependencies as jars
];
maintainers = [ lib.maintainers.kupac ];
};
}

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "cvc5";
version = "1.0.7";
version = "1.0.8";
src = fetchFromGitHub {
owner = "cvc5";
repo = "cvc5";
rev = "cvc5-${version}";
hash = "sha256-0uT2Lzz0ZbfNWZBptjaGI1fN0mMniBz41eEwipGc5fc=";
hash = "sha256-2sJKHD7Wzznut4hKOyxgc4LR4H+4u3m8Gq02+v+m5lM=";
};
nativeBuildInputs = [ pkg-config cmake flex ];

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "git-codereview";
version = "1.5.0";
version = "1.6.0";
src = fetchFromGitHub {
owner = "golang";
repo = "review";
rev = "v${version}";
hash = "sha256-Dy7gHT6WmZ1TjA5s+VmOUkaRvrA9v7mWQSLPscgBHgY=";
hash = "sha256-oHW73Y31z+0jOJdSJJa550mJYV8IP2fN+oNwT+3sySM=";
};
vendorHash = null;

View File

@ -1,6 +1,7 @@
{ lib, stdenv
, fetchCrate
, rustPlatform
, installShellFiles
, pkg-config
, libsodium
, openssl
@ -22,7 +23,7 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-mRi0NUETTdYE/oM+Jo7gW/zNby8dPAKl6XhzP0Qzsf0=";
doCheck = false;
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ installShellFiles pkg-config ];
buildInputs = [ openssl libsodium xxHash ]
++ (lib.optionals gitImportSupport [ libgit2 ])
++ (lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
@ -31,6 +32,13 @@ rustPlatform.buildRustPackage rec {
buildFeatures = lib.optional gitImportSupport "git";
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd pijul \
--bash <($out/bin/pijul completion bash) \
--fish <($out/bin/pijul completion fish) \
--zsh <($out/bin/pijul completion zsh)
'';
meta = with lib; {
description = "A distributed version control system";
homepage = "https://pijul.org";

View File

@ -38,7 +38,7 @@ update_version() {
(cd "$root" && update-source-version "sourcehut.python.pkgs.$1" "$version")
# Update vendorSha256 of Go modules
# Update vendorHash of Go modules
retry=true
while "$retry"; do
retry=false;

View File

@ -7,10 +7,10 @@
stdenv.mkDerivation rec {
pname = "bilibili";
version = "1.11.4-2";
version = "1.12.0-1";
src = fetchurl {
url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_amd64.deb";
hash = "sha256-nUixkNZPIqeMUdjJxaNrHODFbShDqHFHVoKRZKAVjyc=";
hash = "sha256-WSnHyO71VIZDXYTcTCXcXZUkw5ScbIscs9daQokj3kA=";
};
unpackPhase = ''

View File

@ -46,13 +46,13 @@ let
in
stdenv.mkDerivation rec {
pname = "mkvtoolnix";
version = "78.0";
version = "79.0";
src = fetchFromGitLab {
owner = "mbunkus";
repo = "mkvtoolnix";
rev = "release-${version}";
sha256 = "sha256-iImcpuGZsRlwBTPyPUsfHAOkOIhc8eYs6rinl8O78oU=";
sha256 = "sha256-M+CST7A/obfuGH4lyV68vrhmzEIFCa7DRgApKbPh/uQ=";
};
nativeBuildInputs = [

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "ddev";
version = "1.22.2";
version = "1.22.3";
src = fetchFromGitHub {
owner = "ddev";
repo = "ddev";
rev = "v${version}";
hash = "sha256-S3NesYJH66vqMSDSd2UKWyjOjrZYasY0sWqYMiQC7i0=";
hash = "sha256-KxBnnNs7dmNGZR048FSDoCZ7+P1IXnhH6iy7e0y+2f8=";
};
vendorHash = null;

View File

@ -1,28 +1,49 @@
{ lib, stdenv, fetchFromGitHub }:
{ lib
, stdenv
, fetchFromGitHub
, testers
, vpcs
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "vpcs";
version = "0.8.2";
version = "0.8.3";
src = fetchFromGitHub {
owner = "GNS3";
repo = pname;
rev = "v${version}";
sha256 = "sha256-joEXRMtNZMQumkYDX1gdpGAV+XdNKiAMj3dh1GZxeqc=";
repo = "vpcs";
rev = "v${finalAttrs.version}";
hash = "sha256-OKi4sC4fmKtkJkkpHZ6OfeIDaBafVrJXGXh1R6gLPFY=";
};
buildPhase = ''(
cd src
./mk.sh ${stdenv.buildPlatform.linuxArch}
)'';
sourceRoot = "${finalAttrs.src.name}/src";
buildPhase = ''
runHook preBuild
MKOPT="CC=${stdenv.cc.targetPrefix}cc" ./mk.sh ${stdenv.buildPlatform.linuxArch}
runHook postBuild
'';
installPhase = ''
install -D -m555 src/vpcs $out/bin/vpcs;
install -D -m444 man/vpcs.1 $out/share/man/man1/vpcs.1;
runHook preInstall
install -D -m555 vpcs $out/bin/vpcs
install -D -m444 ../man/vpcs.1 $out/share/man/man1/vpcs.1
runHook postInstall
'';
enableParallelBuilding = true;
passthru = {
tests.version = testers.testVersion {
package = vpcs;
command = "vpcs -v";
};
};
meta = with lib; {
description = "A simple virtual PC simulator";
longDescription = ''
@ -30,9 +51,10 @@ stdenv.mkDerivation rec {
ping/traceroute them, or ping/traceroute the other hosts/routers from the
VPCS when you study the Cisco routers in the dynamips.
'';
inherit (src.meta) homepage;
inherit (finalAttrs.src.meta) homepage;
license = licenses.bsd2;
platforms = platforms.linux;
maintainers = with maintainers; [ ];
platforms = platforms.linux ++ platforms.darwin;
mainProgram = "vpcs";
maintainers = with maintainers; [ anthonyroussel ];
};
}
})

View File

@ -36,7 +36,7 @@
stdenv.mkDerivation rec {
pname = "phosh";
version = "0.27.0";
version = "0.30.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
repo = pname;
rev = "v${version}";
fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects
sha256 = "sha256-dnSYeXn3aPwvxeIjjk+PsnOVKyuGlxXMXGWDdrRrIM0=";
sha256 = "sha256-AfyVtgWqvlN1n+O+apf6H9eXnXN2D0BC4dea2V4Plog=";
};
nativeBuildInputs = [

View File

@ -23,7 +23,8 @@ stdenv.mkDerivation (finalAttrs: {
makeFlags = [
"-C sources"
"CC=${stdenv.cc.targetPrefix}cc"
"CC:=$(CC)"
"AR:=$(AR)"
];
preInstall = ''

View File

@ -0,0 +1,37 @@
{ lib
, stdenvNoCC
, fetchurl
, unzip
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "alt-tab-macos";
version = "6.61.0";
src = fetchurl {
url = "https://github.com/lwouis/alt-tab-macos/releases/download/v${finalAttrs.version}/AltTab-${finalAttrs.version}.zip";
hash = "sha256-crmeYVeSmu5avNSd3dCbEeGnuqonh1HC5NnEOz8OB2U=";
};
sourceRoot = ".";
nativeBuildInputs = [ unzip ];
installPhase = ''
runHook preInstall
mkdir -p $out/Applications
cp -r *.app $out/Applications
runHook postInstall
'';
meta = with lib; {
description = "Windows alt-tab on macOS";
homepage = "https://alt-tab-macos.netlify.app";
license = licenses.gpl3Plus;
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
maintainers = with maintainers; [ emilytrau Enzime ];
platforms = platforms.darwin;
};
})

View File

@ -4,28 +4,29 @@
, fetchpatch
, getopt
, ksh
, bc
, tzdata
, pkgsMusl # for passthru.tests
}:
stdenv.mkDerivation (finalAttrs: {
pname = "bmake";
version = "20230723";
version = "20230909";
src = fetchurl {
url = "http://www.crufty.net/ftp/pub/sjg/bmake-${finalAttrs.version}.tar.gz";
hash = "sha256-xCoNlRuiP3ZlMxMJ+74h7cARNqI8uUFoULQxW+X7WQQ=";
hash = "sha256-Hl5sdlQN/oEEQmzX/T9xXMZAT5A5ySA0RwErjy9re4Y=";
};
patches = [
# make bootstrap script aware of the prefix in /nix/store
./bootstrap-fix.patch
# preserve PATH from build env in unit tests
./fix-unexport-env-test.patch
# Always enable ksh test since it checks in a impure location /bin/ksh
./unconditional-ksh-test.patch
./001-bootstrap-fix.diff
# decouple tests from build phase
./dont-test-while-installing.diff
./002-dont-test-while-installing.diff
# preserve PATH from build env in unit tests
./003-fix-unexport-env-test.diff
# Always enable ksh test since it checks in a impure location /bin/ksh
./004-unconditional-ksh-test.diff
];
# Make tests work with musl
@ -68,18 +69,22 @@ stdenv.mkDerivation (finalAttrs: {
doCheck = true;
nativeCheckInputs = [
bc
tzdata
] ++ lib.optionals (stdenv.hostPlatform.libc != "musl") [
ksh
];
# Disabled tests:
# directive-export{,-gmake}: another failure related to TZ variables
# opt-chdir: ofborg complains about it somehow
# opt-keep-going-indirect: not yet known
# varmod-localtime: musl doesn't support TZDIR and this test relies on impure,
# implicit paths
env.BROKEN_TESTS = builtins.concatStringsSep " " [
"opt-chdir"
"directive-export"
"directive-export-gmake"
"opt-chdir" # works on my machine -- AndersonTorres
"opt-keep-going-indirect"
"varmod-localtime"
];
@ -92,6 +97,8 @@ stdenv.mkDerivation (finalAttrs: {
runHook postCheck
'';
strictDeps = true;
setupHook = ./setup-hook.sh;
passthru.tests.bmakeMusl = pkgsMusl.bmake;
@ -100,9 +107,12 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "http://www.crufty.net/help/sjg/bmake.html";
description = "Portable version of NetBSD 'make'";
license = lib.licenses.bsd3;
mainProgram = "bmake";
maintainers = with lib.maintainers; [ thoughtpolice AndersonTorres ];
platforms = lib.platforms.unix;
broken = stdenv.isAarch64; # failure on gnulib-tests
# ofborg: x86_64-linux builds the musl package, aarch64-linux doesn't
broken = stdenv.targetPlatform.isMusl && stdenv.buildPlatform.isAarch64;
};
})
# TODO: report the quirks and patches to bmake devteam (especially the Musl one)
# TODO: investigate Musl support

View File

@ -0,0 +1,22 @@
{ lib
, stdenv
, fetchurl
}:
stdenv.mkDerivation (finalAttrs: {
pname = "clzip";
version = "1.13";
src = fetchurl {
url = "mirror://savannah/lzip/clzip/clzip-${finalAttrs.version}.tar.gz";
hash = "sha256-esn79QNr9Q+wtqIOhNIpPLDSTUBE6vM8vpdgu55/6no=";
};
meta = with lib; {
homepage = "https://www.nongnu.org/lzip/clzip.html";
description = "C language version of lzip";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ rs0vere ];
platforms = platforms.all;
};
})

View File

@ -0,0 +1,30 @@
{ buildGoModule
, lib
, fetchFromGitHub
}: buildGoModule rec {
pname = "cntb";
version = "1.4.6";
src = fetchFromGitHub {
owner = "contabo";
repo = "cntb";
rev = "v${version}";
hash = "sha256-bvWNcEUSSHEk8fwwPdowATGEHIAj+TN8Z+A156sPVtA=";
# docs contains two files with the same name but different cases,
# this leads to a different hash on case insensitive filesystems (e.g. darwin)
postFetch = ''
rm -rf $out/openapi/docs
'';
};
subPackages = [ "." ];
vendorHash = "sha256-++y2C3jYuGZ0ovRFoxeqnx7S9EwoOZBJ5zxeLGWjkqc=";
meta = with lib; {
description = "CLI tool for managing your products from Contabo like VPS and VDS";
homepage = "https://github.com/contabo/cntb";
license = licenses.gpl3Only;
maintainers = with maintainers; [ aciceri ];
};
}

View File

@ -2,6 +2,7 @@
, stdenv
, fetchFromGitLab
, autoreconfHook
, perl
, po4a
}:
@ -19,6 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
autoreconfHook
perl
po4a
];

View File

@ -0,0 +1,32 @@
{ lib
, fetchFromGitHub
, rustPlatform
, pkg-config
, pango
}:
rustPlatform.buildRustPackage rec {
pname = "i3bar-river";
version = "0.1.3";
src = fetchFromGitHub {
owner = "MaxVerevkin";
repo = "i3bar-river";
rev = "v${version}";
hash = "sha256-c5R5V5J1ETBl6JAdNDSxa94OeMyqbTAUmJHJCo1B+WQ=";
};
cargoHash = "sha256-D/WKv8rhb/ZGuVEZDp83PZxJydHbnZUQp+kVNlMBUCs=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ pango ];
meta = with lib; {
description = "A port of i3bar for river";
homepage = "https://github.com/MaxVerevkin/i3bar-river";
license = licenses.gpl3Only;
maintainers = with maintainers; [ nicegamer7 ];
mainProgram = "i3bar-river";
platforms = platforms.linux;
};
}

View File

@ -16,8 +16,6 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-IWviLboZz421/Amz/QG4o8jYaG8Y/l5PvmvXfK5nzJE=";
};
sourceRoot = "${finalAttrs.src.name}/src";
nativeBuildInputs = [
pkg-config
];
@ -32,8 +30,15 @@ stdenv.mkDerivation (finalAttrs: {
strictDeps = true;
makeFlags = [ "-C" "src" ];
installFlags = [ "prefix=$(out)" ];
postPatch = ''
substituteInPlace src/config.mk \
--replace pkg-config "$PKG_CONFIG"
'';
meta = {
homepage = "https://www.uninformativ.de/git/katriawm/file/README.html";
description = "A non-reparenting, dynamic window manager with decorations";

View File

@ -0,0 +1,41 @@
{ lib
, stdenv
, darwin
, fetchFromGitHub
, openssl
, pkg-config
, rustPlatform
}:
rustPlatform.buildRustPackage rec {
pname = "matrix-commander-rs";
version = "0.1.32";
src = fetchFromGitHub {
owner = "8go";
repo = "matrix-commander-rs";
rev = "refs/tags/v${version}";
hash = "sha256-Bp4bP77nWi0XLhI4/wsry6fEW2BR90Y+XqV/WCinwJo=";
};
cargoHash = "sha256-HPkpCnlSZ9sY40gc4dLOdcBhATvJVeqk7GJ0+XqjHVk=";
nativeBuildInputs = [
pkg-config
];
buildInputs = [
openssl
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];
meta = with lib; {
description = "CLI-based Matrix client app for sending and receiving";
homepage = "https://github.com/8go/matrix-commander-rs";
changelog = "https://github.com/8go/matrix-commander-rs/releases/tag/v${version}";
license = licenses.gpl3Only;
maintainers = with maintainers; [ fab ];
mainProgram = "matrix-commander-rs";
};
}

View File

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, ncurses }:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "netproc";
version = "unstable-2022-02-11";
version = "0.6.6";
src = fetchFromGitHub {
owner = "berghetti";
repo = "netproc";
rev = "87a10ce31ae150847674ad87ef84ef2fd374b420";
sha256 = "sha256-YSKDOvqWLCrnP1qjmzMuRgjXiXZ9D4AuxXm/3xzS4gc=";
rev = finalAttrs.version;
sha256 = "sha256-OQWlFwCga33rTseLeO8rAd+pkLHbSNf3YI5OSwrdIyk=";
};
buildInputs = [ ncurses ];
@ -17,9 +17,10 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Tool to monitor network traffic based on processes";
license = licenses.gpl3;
homepage = "https://github.com/berghetti/netproc";
platforms = platforms.linux;
license = licenses.gpl3;
mainProgram = "netproc";
maintainers = [ maintainers.azuwis ];
platforms = platforms.linux;
};
}
})

View File

@ -0,0 +1,55 @@
{ lib, fetchFromGitHub, buildGoModule, installShellFiles }:
buildGoModule rec {
pname = "orchard";
version = "0.12.0";
src = fetchFromGitHub {
owner = "cirruslabs";
repo = pname;
rev = version;
hash = "sha256-+QNYlZ3/GiDtCySZPOlrDy03lkdGGvbFCWidQhbZJYQ=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
postFetch = ''
cd "$out"
git rev-parse HEAD > $out/COMMIT
find "$out" -name .git -print0 | xargs -0 rm -rf
'';
};
vendorHash = "sha256-BrzS+QtpGUHcYNNmSI6FlBtcYwNFri7R6nlVvFihdb4=";
nativeBuildInputs = [ installShellFiles ];
ldflags = [
"-w"
"-s"
"-X github.com/cirruslabs/orchard/internal/version.Version=${version}"
];
# ldflags based on metadata from git and source
preBuild = ''
ldflags+=" -X github.com/cirruslabs/orchard/internal/version.Commit=$(cat COMMIT)"
'';
subPackages = [ "cmd/orchard" ];
postInstall = ''
export HOME="$(mktemp -d)"
installShellCompletion --cmd orchard \
--bash <($out/bin/orchard completion bash) \
--zsh <($out/bin/orchard completion zsh) \
--fish <($out/bin/orchard completion fish)
'';
meta = with lib; {
mainProgram = "orchard";
description =
"Orchestrator for running Tart Virtual Machines on a cluster of Apple Silicon devices";
homepage = "https://github.com/cirruslabs/orchard";
license = licenses.fairsource09;
maintainers = with maintainers; [ techknowlogick ];
};
}

View File

@ -18,13 +18,18 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-TJ47c77vQ/aRBJ2uEiFLuAR4dd4CMEo+iAAx0HCFbmA=";
};
strictDeps = true;
nativeBuildInputs = [
autoreconfHook
intltool
pkg-config
gtk2 # for autoconf macros
];
buildInputs = [ gtk2 ];
buildInputs = [
gtk2
];
meta = with lib; {
description = "A simple screen testing tool";

Some files were not shown because too many files have changed in this diff Show More