colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

This commit is contained in:
github-actions[bot] 2024-04-12 06:01:23 +00:00 committed by GitHub
parent 3118b08635 27bcfed792
commit c7d839703f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 175 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/module-list.nix
View File

@ -214,6 +214,7 @@
./programs/kclock.nix
./programs/kdeconnect.nix
./programs/lazygit.nix
./programs/kubeswitch.nix
./programs/less.nix
./programs/liboping.nix
./programs/light.nix

56
nixos/modules/programs/kubeswitch.nix Normal file
View File

@ -0,0 +1,56 @@
{
config,
pkgs,
lib,
...
}:
let
cfg = config.programs.kubeswitch;
in
{
options = {
programs.kubeswitch = {
enable = lib.mkEnableOption (lib.mdDoc "kubeswitch");
commandName = lib.mkOption {
type = lib.types.str;
default = "kswitch";
description = "The name of the command to use";
};
package = lib.mkOption {
type = lib.types.package;
default = pkgs.kubeswitch;
defaultText = lib.literalExpression "pkgs.kubeswitch";
description = "The package to install for kubeswitch";
};
};
};
config =
let
shell_files = pkgs.stdenv.mkDerivation rec {
name = "kubeswitch-shell-files";
phases = [ "installPhase" ];
installPhase = ''
mkdir -p $out/share
for shell in bash zsh; do
${cfg.package}/bin/switcher init $shell | sed 's/switch(/${cfg.commandName}(/' > $out/share/${cfg.commandName}_init.$shell
${cfg.package}/bin/switcher --cmd ${cfg.commandName} completion $shell > $out/share/${cfg.commandName}_completion.$shell
done
'';
};
in
lib.mkIf cfg.enable {
environment.systemPackages = [ cfg.package ];
programs.bash.interactiveShellInit = ''
source ${shell_files}/share/${cfg.commandName}_init.bash
source ${shell_files}/share/${cfg.commandName}_completion.bash
'';
programs.zsh.interactiveShellInit = ''
source ${shell_files}/share/${cfg.commandName}_init.zsh
source ${shell_files}/share/${cfg.commandName}_completion.zsh
'';
};
}

4
pkgs/applications/editors/aewan/default.nix
View File

@ -1,5 +1,7 @@
{ lib, stdenv, fetchurl, fetchpatch, zlib, ncurses }:
{ lib, gccStdenv, fetchurl, fetchpatch, zlib, ncurses }:
let stdenv = gccStdenv;
in
stdenv.mkDerivation rec {
pname = "aewan";
version = "1.0.01";

4
pkgs/applications/editors/vscode/extensions/default.nix
View File

@ -428,8 +428,8 @@ let
mktplcRef = {
name = "vscode-neovim";
publisher = "asvetliakov";
version = "1.7.1";
sha256 = "0ib4sjk7r370ckvaqb4yzgy7csy8pli9z2jhibhhwwcq2748ah4q";
version = "1.8.1";
sha256 = "0kqzry0cbvvy1pkbx5rhnk5ry7j91cbf11vz1s1jrqc7j0hq0yx8";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/asvetliakov.vscode-neovim/changelog";

6
pkgs/by-name/mo/mountpoint-s3/package.nix
View File

@ -8,17 +8,17 @@
rustPlatform.buildRustPackage rec {
pname = "mountpoint-s3";
version = "1.5.0";
version = "1.6.0";
src = fetchFromGitHub {
owner = "awslabs";
repo = "mountpoint-s3";
rev = "v${version}";
hash = "sha256-DsxcQ/FEVcrzPyv9LgssNut4XnbU3mPKbuBwQKLiRLA=";
hash = "sha256-1d2PPbTheUcHw2xS5LEcdchnfwu7szBApv+FnPaxt+I=";
fetchSubmodules = true;
};
cargoHash = "sha256-UOQRdSQ/whlOTZL2vaNiIcKB+Zgpk8tbinWBRWPyllc=";
cargoHash = "sha256-tBi41kdaa4mVHh0MkXJ8kaG1e3CQURIKVk9Lboy1N8Y=";
# thread 'main' panicked at cargo-auditable/src/collect_audit_data.rs:77:9:
# cargo metadata failure: error: none of the selected packages contains these features: libfuse3

63
pkgs/by-name/po/pomodoro-gtk/package.nix Normal file
View File

@ -0,0 +1,63 @@
{ lib
, stdenv
, fetchFromGitLab
, meson
, ninja
, pkg-config
, gjs
, gobject-introspection
, blueprint-compiler
, wrapGAppsHook4
, desktop-file-utils
, libadwaita
, libgda6
, gsound
, gst_all_1
, libportal-gtk4
}:
stdenv.mkDerivation {
pname = "pomodoro-gtk";
version = "1.4.1";
src = fetchFromGitLab {
owner = "idevecore";
repo = "pomodoro";
rev = "44b724557539084991f3eb55b9593053a2c73eba"; # author didn't make a tag
fetchSubmodules = true;
hash = "sha256-krVRVMrrzuqPY/3P9dCz7rVCCW7/j5cpT95XniGpBEs=";
};
postPatch = ''
patchShebangs --build troll/gjspack/bin/gjspack
'';
nativeBuildInputs = [
meson
ninja
pkg-config
gjs # runtime for gjspack
gobject-introspection
blueprint-compiler
wrapGAppsHook4
desktop-file-utils
];
buildInputs = [
gjs
libadwaita
libgda6
gsound
gst_all_1.gst-plugins-base
libportal-gtk4
];
meta = {
description = "A simple and intuitive timer application (also named Planytimer)";
homepage = "https://gitlab.com/idevecore/pomodoro";
license = lib.licenses.gpl3Plus;
mainProgram = "pomodoro";
maintainers = with lib.maintainers; [ aleksana ];
platforms = lib.platforms.unix;
};
}

3
pkgs/development/libraries/flint/default.nix
View File

@ -2,7 +2,6 @@
, stdenv
, fetchurl
, gmp
, mpir
, mpfr
, ntl
, openblas ? null, blas, lapack
@ -22,7 +21,6 @@ stdenv.mkDerivation rec {
buildInputs = [
gmp
mpir
mpfr
ntl
] ++ lib.optionals withBlas [
@ -35,7 +33,6 @@ stdenv.mkDerivation rec {
configureFlags = [
"--with-gmp=${gmp}"
"--with-mpir=${mpir}"
"--with-mpfr=${mpfr}"
"--with-ntl=${ntl}"
] ++ lib.optionals withBlas [

4
pkgs/development/libraries/webkitgtk/default.nix
View File

@ -69,7 +69,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "webkitgtk";
version = "2.44.0";
version = "2.44.1";
name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "6.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}";
outputs = [ "out" "dev" "devdoc" ];
@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
hash = "sha256-xmUw5Bulmx7bpO6J7yCyGI4nO+0El+lQhHKePPvjDIc=";
hash = "sha256-QlsUWbDwTQYAx40au15+36PAYKQg+LIx6aai1dKcVWE=";
};
patches = lib.optionals stdenv.isLinux [

40
pkgs/development/tools/kubeswitch/default.nix
View File

@ -1,4 +1,11 @@
{ lib, buildGoModule, fetchFromGitHub, testers, kubeswitch }:
{
lib,
buildGoModule,
fetchFromGitHub,
testers,
kubeswitch,
installShellFiles,
}:
buildGoModule rec {
pname = "kubeswitch";
@ -6,9 +13,9 @@ buildGoModule rec {
src = fetchFromGitHub {
owner = "danielfoehrKn";
repo = pname;
repo = "kubeswitch";
rev = version;
sha256 = "sha256-zf7o41YYAppRge0EMXgIN8rI5Kco4/n7BJ90b/X6L1M=";
hash = "sha256-zf7o41YYAppRge0EMXgIN8rI5Kco4/n7BJ90b/X6L1M=";
};
vendorHash = null;
@ -16,25 +23,30 @@ buildGoModule rec {
subPackages = [ "cmd/main.go" ];
ldflags = [
"-s" "-w"
"-s"
"-w"
"-X github.com/danielfoehrkn/kubeswitch/cmd/switcher.version=${version}"
"-X github.com/danielfoehrkn/kubeswitch/cmd/switcher.buildDate=1970-01-01"
];
passthru.tests.version = testers.testVersion {
package = kubeswitch;
};
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
mv $out/bin/main $out/bin/switch
mv $out/bin/main $out/bin/switcher
for shell in bash zsh fish; do
$out/bin/switcher --cmd switcher completion $shell > switcher.$shell
installShellCompletion --$shell switcher.$shell
done
'';
meta = with lib; {
description = "The kubectx for operators";
license = licenses.asl20;
passthru.tests.version = testers.testVersion { package = kubeswitch; };
meta = {
changelog = "https://github.com/danielfoehrKn/kubeswitch/releases/tag/${version}";
description = "The kubectx for operators, a drop-in replacement for kubectx";
license = lib.licenses.asl20;
homepage = "https://github.com/danielfoehrKn/kubeswitch";
maintainers = with maintainers; [ bryanasdev000 ];
mainProgram = "switch";
maintainers = with lib.maintainers; [ bryanasdev000 ];
mainProgram = "switcher";
};
}

8
pkgs/misc/ananicy-rules-cachyos/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "ananicy";
version = "unstable-2023-10-11";
version = "unstable-2024-04-10";
src = fetchFromGitHub {
owner = "CachyOS";
repo = "ananicy-rules";
rev = "3dafc3eb667b6ed7024359de78bf961c7248954d";
sha256 = "sha256-bMwM/2R6jdgrQ6C0JnHyMp9L4OWI6KVGcninrr7wLQ8=";
rev = "de55e2f55e6adf559bf4990aa433f5c202dc073d";
sha256 = "sha256-TWaOMVEeTLI67eG5BPyb+OSnz31QvTueQD2yfEEbTEo=";
};
dontConfigure = true;
@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
description = "ananicy-cpp-rules for CachyOS ";
license = licenses.gpl3Only;
platforms = platforms.linux;
maintainers = with maintainers; [ artturin ];
maintainers = with maintainers; [ artturin johnrtitor ];
};
}

21
pkgs/tools/archivers/afio/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub } :
{ lib, stdenv, fetchFromGitHub, fetchpatch } :
stdenv.mkDerivation rec {
version = "2.5.2";
@ -11,11 +11,20 @@ stdenv.mkDerivation rec {
sha256 = "1vbxl66r5rp5a1qssjrkfsjqjjgld1cq57c871gd0m4qiq9rmcfy";
};
/*
* A patch to simplify the installation and for removing the
* hard coded dependency on GCC.
*/
patches = [ ./0001-makefile-fix-installation.patch ];
patches = [
/*
* A patch to simplify the installation and for removing the
* hard coded dependency on GCC.
*/
./0001-makefile-fix-installation.patch
# fix darwin build (include headers)
(fetchpatch {
url = "https://github.com/kholtman/afio/pull/18/commits/a726614f99913ced08f6ae74091c56969d5db210.patch";
name = "darwin-headers.patch";
hash = "sha256-pK8mN29fC2mL4B69Fv82dWFIQMGwquyl825OBDTxzpo=";
})
];
installFlags = [ "DESTDIR=$(out)" ];