Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
50249cdaf2
51 changed files with 491 additions and 148 deletions
|
|
@ -877,6 +877,21 @@ in mkLicense lset) ({
|
|||
fullName = "Non-Profit Open Software License 3.0";
|
||||
};
|
||||
|
||||
nvidiaCuda = {
|
||||
shortName = "CUDA EULA";
|
||||
fullName = "CUDA Toolkit End User License Agreement (EULA)";
|
||||
url = "https://docs.nvidia.com/cuda/eula/index.html#cuda-toolkit-supplement-license-agreement";
|
||||
free = false;
|
||||
};
|
||||
|
||||
nvidiaCudaRedist = {
|
||||
shortName = "CUDA EULA";
|
||||
fullName = "CUDA Toolkit End User License Agreement (EULA)";
|
||||
url = "https://docs.nvidia.com/cuda/eula/index.html#cuda-toolkit-supplement-license-agreement";
|
||||
free = false;
|
||||
redistributable = true;
|
||||
};
|
||||
|
||||
obsidian = {
|
||||
fullName = "Obsidian End User Agreement";
|
||||
url = "https://obsidian.md/eula";
|
||||
|
|
|
|||
|
|
@ -497,6 +497,8 @@ The module update takes care of the new config syntax and the data itself (user
|
|||
- `keepTerminfo` controls whether `TERMINFO` and `TERMINFO_DIRS` are preserved
|
||||
for `root` and the `wheel` group.
|
||||
|
||||
- `virtualisation.googleComputeImage` now provides `efi` option to support UEFI booting.
|
||||
|
||||
- CoreDNS can now be built with external plugins by overriding `externalPlugins` and `vendorHash` arguments like this:
|
||||
|
||||
```
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ in
|
|||
defaultText = "pkgs.trust-dns";
|
||||
description = mdDoc ''
|
||||
Trust-dns package to use.
|
||||
Only `bin/trust-dns` need be provided: the other trust-dns utilities (client and resolver) are not needed.
|
||||
The package must provide `meta.mainProgram` which names the server binary; any other utilities (client, resolver) are not needed.
|
||||
'';
|
||||
};
|
||||
quiet = mkOption {
|
||||
|
|
@ -135,7 +135,7 @@ in
|
|||
flags = (lib.optional cfg.debug "--debug") ++ (lib.optional cfg.quiet "--quiet");
|
||||
flagsStr = builtins.concatStringsSep " " flags;
|
||||
in ''
|
||||
${cfg.package}/bin/trust-dns --config ${configFile} ${flagsStr}
|
||||
${cfg.package}/bin/${cfg.package.meta.mainProgram} --config ${configFile} ${flagsStr}
|
||||
'';
|
||||
Type = "simple";
|
||||
Restart = "on-failure";
|
||||
|
|
|
|||
|
|
@ -44,10 +44,17 @@ in
|
|||
GZIP compression level of the resulting disk image (1-9).
|
||||
'';
|
||||
};
|
||||
virtualisation.googleComputeImage.efi = mkEnableOption "EFI booting";
|
||||
};
|
||||
|
||||
#### implementation
|
||||
config = {
|
||||
boot.initrd.availableKernelModules = [ "nvme" ];
|
||||
boot.loader.grub = mkIf cfg.efi {
|
||||
device = mkForce "nodev";
|
||||
efiSupport = true;
|
||||
efiInstallAsRemovable = true;
|
||||
};
|
||||
|
||||
system.build.googleComputeImage = import ../../lib/make-disk-image.nix {
|
||||
name = "google-compute-image";
|
||||
|
|
@ -62,6 +69,7 @@ in
|
|||
'';
|
||||
format = "raw";
|
||||
configFile = if cfg.configFile == null then defaultConfigFile else cfg.configFile;
|
||||
partitionTableType = if cfg.efi then "efi" else "legacy";
|
||||
inherit (cfg) diskSize;
|
||||
inherit config lib pkgs;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ appimageTools.wrapType2 {
|
|||
description = "P2P note-taking tool";
|
||||
homepage = "https://anytype.io/";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ bbigras ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,6 +46,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/nwg-piotr/nwg-launchers";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ bbigras ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,27 +1,17 @@
|
|||
{ stdenvNoCC
|
||||
{ lib
|
||||
, buildLua
|
||||
, mpv-unwrapped
|
||||
, lib
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
buildLua {
|
||||
inherit (mpv-unwrapped) src version;
|
||||
pname = "mpv-acompressor";
|
||||
version = mpv-unwrapped.version;
|
||||
|
||||
src = "${mpv-unwrapped.src.outPath}/TOOLS/lua/acompressor.lua";
|
||||
|
||||
dontBuild = true;
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
install -Dm644 ${src} $out/share/mpv/scripts/acompressor.lua
|
||||
'';
|
||||
|
||||
passthru.scriptName = "acompressor.lua";
|
||||
scriptPath = "TOOLS/lua/acompressor.lua";
|
||||
|
||||
meta = with lib; {
|
||||
inherit (mpv-unwrapped.meta) license;
|
||||
description = "Script to toggle and control ffmpeg's dynamic range compression filter.";
|
||||
homepage = "https://github.com/mpv-player/mpv/blob/master/TOOLS/lua/acompressor.lua";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ nicoo ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
22
pkgs/applications/video/mpv/scripts/buildLua.nix
Normal file
22
pkgs/applications/video/mpv/scripts/buildLua.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{ lib
|
||||
, stdenvNoCC }:
|
||||
|
||||
let fileName = pathStr: lib.last (lib.splitString "/" pathStr);
|
||||
in
|
||||
lib.makeOverridable (
|
||||
{ pname, scriptPath ? "${pname}.lua", ... }@args:
|
||||
stdenvNoCC.mkDerivation (lib.attrsets.recursiveUpdate {
|
||||
dontBuild = true;
|
||||
preferLocalBuild = true;
|
||||
|
||||
outputHashMode = "recursive";
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -m644 -Dt $out/share/mpv/scripts ${scriptPath}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.scriptName = fileName scriptPath;
|
||||
meta.platforms = lib.platforms.all;
|
||||
} args)
|
||||
)
|
||||
|
|
@ -1,11 +1,9 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, stdenvNoCC }:
|
||||
, buildLua }:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
buildLua {
|
||||
pname = "chapterskip";
|
||||
passthru.scriptName = "chapterskip.lua";
|
||||
|
||||
version = "unstable-2022-09-08";
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -15,17 +13,8 @@ stdenvNoCC.mkDerivation {
|
|||
hash = "sha256-OTrLQE3rYvPQamEX23D6HttNjx3vafWdTMxTiWpDy90=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
preferLocalBuild = true;
|
||||
installPhase = "install -Dt $out/share/mpv/scripts chapterskip.lua";
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [ "--version=branch" ];
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://github.com/po5/chapterskip";
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ nicoo ];
|
||||
maintainers = with lib.maintainers; [ nicoo ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,13 +3,14 @@
|
|||
, config
|
||||
}:
|
||||
|
||||
lib.recurseIntoAttrs
|
||||
let buildLua = callPackage ./buildLua.nix { };
|
||||
in lib.recurseIntoAttrs
|
||||
({
|
||||
acompressor = callPackage ./acompressor.nix { };
|
||||
acompressor = callPackage ./acompressor.nix { inherit buildLua; };
|
||||
autocrop = callPackage ./autocrop.nix { };
|
||||
autodeint = callPackage ./autodeint.nix { };
|
||||
autoload = callPackage ./autoload.nix { };
|
||||
chapterskip = callPackage ./chapterskip.nix { };
|
||||
chapterskip = callPackage ./chapterskip.nix { inherit buildLua; };
|
||||
convert = callPackage ./convert.nix { };
|
||||
inhibit-gnome = callPackage ./inhibit-gnome.nix { };
|
||||
mpris = callPackage ./mpris.nix { };
|
||||
|
|
@ -27,7 +28,7 @@ lib.recurseIntoAttrs
|
|||
webtorrent-mpv-hook = callPackage ./webtorrent-mpv-hook.nix { };
|
||||
cutter = callPackage ./cutter.nix { };
|
||||
}
|
||||
// (callPackage ./occivink.nix { }))
|
||||
// (callPackage ./occivink.nix { inherit buildLua; }))
|
||||
// lib.optionalAttrs config.allowAliases {
|
||||
youtube-quality = throw "'youtube-quality' is no longer maintained, use 'quality-menu' instead"; # added 2023-07-14
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,17 @@
|
|||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, buildLua
|
||||
}:
|
||||
|
||||
let
|
||||
script = { n, ... }@p:
|
||||
stdenvNoCC.mkDerivation (lib.attrsets.recursiveUpdate {
|
||||
pname = "mpv_${n}";
|
||||
passthru.scriptName = "${n}.lua";
|
||||
camelToKebab = let
|
||||
inherit (lib.strings) match stringAsChars toLower;
|
||||
isUpper = match "[A-Z]";
|
||||
in stringAsChars (c: if isUpper c != null then "-${toLower c}" else c);
|
||||
|
||||
mkScript = name: args:
|
||||
buildLua (lib.attrsets.recursiveUpdate rec {
|
||||
pname = camelToKebab name;
|
||||
src = fetchFromGitHub {
|
||||
owner = "occivink";
|
||||
repo = "mpv-scripts";
|
||||
|
|
@ -17,37 +20,26 @@ let
|
|||
};
|
||||
version = "unstable-2022-10-02";
|
||||
|
||||
dontBuild = true;
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/mpv/scripts
|
||||
cp -r scripts/${n}.lua $out/share/mpv/scripts/
|
||||
'';
|
||||
scriptPath = "scripts/${pname}.lua";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/occivink/mpv-scripts";
|
||||
license = licenses.unlicense;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ nicoo ];
|
||||
};
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
} p);
|
||||
} args);
|
||||
|
||||
in
|
||||
{
|
||||
lib.mapAttrs (name: lib.makeOverridable (mkScript name)) {
|
||||
|
||||
# Usage: `pkgs.mpv.override { scripts = [ pkgs.mpvScripts.seekTo ]; }`
|
||||
seekTo = script {
|
||||
n = "seek-to";
|
||||
seekTo = {
|
||||
meta.description = "Mpv script for seeking to a specific position";
|
||||
outputHash = "sha256-3RlbtUivmeoR9TZ6rABiZSd5jd2lFv/8p/4irHMLshs=";
|
||||
};
|
||||
|
||||
blacklistExtensions = script {
|
||||
n = "blacklist-extensions";
|
||||
blacklistExtensions = {
|
||||
meta.description = "Automatically remove playlist entries based on their extension.";
|
||||
outputHash = "sha256-qw9lz8ofmvvh23F9aWLxiU4YofY+YflRETu+nxMhvVE=";
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,13 +41,13 @@ assert lib.assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been renam
|
|||
assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been removed. Please refer https://wiki.hyprland.org/Configuring/XWayland";
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprland" + lib.optionalString debug "-debug";
|
||||
version = "0.31.0";
|
||||
version = "0.32.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = finalAttrs.pname;
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-8n67P8wvtFgjOufTj4y1sRpBcbMrlhSlH7d8dOhUKns=";
|
||||
hash = "sha256-HrnlCdZBqqE37gFORapfSGEGcqhCyhX2aSMRnDEmR0k=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -42,8 +42,8 @@ wlroots.overrideAttrs
|
|||
domain = "gitlab.freedesktop.org";
|
||||
owner = "wlroots";
|
||||
repo = "wlroots";
|
||||
rev = "3406c1b17a4a7e6d4e2a7d9c1176affa72bce1bc";
|
||||
hash = "sha256-ecDhdYLXWHsxMv+EWG36mCNDvzRbu9qfjH7dLxL7aGM=";
|
||||
rev = "47bf87ade2bd32395615a385ebde1fefbcdf79a2";
|
||||
hash = "sha256-jU0I6FoCKnj4zIBL4daosFWh81U1fM719Z6cae8PxSY=";
|
||||
};
|
||||
|
||||
pname =
|
||||
|
|
|
|||
|
|
@ -23,13 +23,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation (self: {
|
||||
pname = "xdg-desktop-portal-hyprland";
|
||||
version = "1.2.3";
|
||||
version = "1.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "xdg-desktop-portal-hyprland";
|
||||
rev = "v${self.version}";
|
||||
hash = "sha256-y8q4XUwx+gVK7i2eLjfR32lVo7TYvEslyzrmzYEaPZU=";
|
||||
hash = "sha256-IKcRTKzlcDsbD5xydRNc9s4c4KjcQHaZgOc5kWPOAtU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,20 +7,24 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "jasper";
|
||||
version = "4.0.0";
|
||||
version = "4.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jasper-software";
|
||||
repo = "jasper";
|
||||
rev = "version-${finalAttrs.version}";
|
||||
hash = "sha256-v/AFx40JWdbTCa008tDz/n9cXgpAkKv4rSiGJ8yx1YQ=";
|
||||
hash = "sha256-IQBszOKou5Q1lgDy2LICHFmOKYJ3/djmuHGNalVHeBQ=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" "man" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
# Since "build" already exists and is populated, cmake tries to use it,
|
||||
# throwing uncomprehensible error messages...
|
||||
cmakeBuildDir = "build-directory";
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
38
pkgs/by-name/mc/mcuboot-imgtool/package.nix
Normal file
38
pkgs/by-name/mc/mcuboot-imgtool/package.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{ lib
|
||||
, fetchPypi
|
||||
, python3Packages
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "mfgtool-imgtool";
|
||||
version = "1.10.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "imgtool";
|
||||
hash = "sha256-A7NOdZNKw9lufEK2vK8Rzq9PRT98bybBfXJr0YMQS0A=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
cbor2
|
||||
click
|
||||
cryptography
|
||||
intelhex
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "MCUboot's image signing and key management";
|
||||
homepage = "https://github.com/mcu-tools/mcuboot/tree/main/scripts";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ otavio ];
|
||||
mainProgram = "imgtool";
|
||||
};
|
||||
}
|
||||
50
pkgs/by-name/me/memtree/package.nix
Normal file
50
pkgs/by-name/me/memtree/package.nix
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, python3Packages
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "memtree";
|
||||
version = "unstable-2023-11-04";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nbraud";
|
||||
repo = "memtree";
|
||||
rev = "093caeef26ee944b5bf4408710f63494e442b5ff";
|
||||
hash = "sha256-j4LqWy7DxeV7pjwnCfpkHwug4p48kux6BM6oDJmvuUo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
rich
|
||||
];
|
||||
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
hypothesis
|
||||
pytest
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
python -m pytest -v
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
pythonImportChecks = [ "memtree" ];
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [ "--version=branch" ];
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Render cgroups tree annotated by memory usage";
|
||||
homepage = "https://github.com/nbraud/memtree";
|
||||
maintainers = with maintainers; [ nicoo ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -30,6 +30,6 @@ buildGoModule rec {
|
|||
"An experiment in scalable routing as an encrypted IPv6 overlay network";
|
||||
homepage = "https://yggdrasil-network.github.io/";
|
||||
license = licenses.lgpl3;
|
||||
maintainers = with maintainers; [ bbigras ehmry gazally lassulus ];
|
||||
maintainers = with maintainers; [ ehmry gazally lassulus ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,38 +1,38 @@
|
|||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, callPackage
|
||||
, runCommand
|
||||
, gtk-engine-murrine
|
||||
, gnome-themes-extra
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "tokyo-night-gtk";
|
||||
version = "2023.01.17";
|
||||
let
|
||||
prefix = "tokyo-night-gtk";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Fausto-Korpsvart";
|
||||
repo = "Tokyo-Night-GTK-Theme";
|
||||
rev = "f7ae3421ac0d415ca57fb6224e093e12b8a980bb";
|
||||
sha256 = "sha256-90V55pRfgiaP1huhD+3456ziJ2EU24iNQHt5Ro+g+M0=";
|
||||
};
|
||||
packages = lib.mapAttrs' (type: content: {
|
||||
name = type;
|
||||
|
||||
propagatedUserEnvPkgs = [
|
||||
gtk-engine-murrine
|
||||
];
|
||||
value = lib.mapAttrs' (variantName: variant: {
|
||||
name = variantName;
|
||||
value = callPackage ./generic.nix { inherit prefix type variantName variant; };
|
||||
}) content;
|
||||
}) (lib.importJSON ./variants.json);
|
||||
in packages // {
|
||||
# Not using `symlinkJoin` because it's massively inefficient in this case
|
||||
full = runCommand "${prefix}_full" {
|
||||
preferLocalBuild = true;
|
||||
|
||||
dontBuild = true;
|
||||
propagatedUserEnvPkgs = [
|
||||
gtk-engine-murrine
|
||||
gnome-themes-extra
|
||||
];
|
||||
} ''
|
||||
mkdir -p $out/share/{icons,themes,${prefix}}
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/themes
|
||||
cp -a themes/* $out/share/themes
|
||||
runHook postInstall
|
||||
${lib.concatStrings (lib.forEach (lib.attrValues (lib.attrsets.mergeAttrsList (lib.attrValues packages))) (variant:
|
||||
''
|
||||
ln -s ${variant}/share/${variant.ptype}/Tokyonight-${variant.pvariant} $out/share/${variant.ptype}/Tokyonight-${variant.pvariant}
|
||||
ln -s ${variant}/share/${prefix}/LICENSE $out/share/${prefix}/LICENSE 2>/dev/null || true
|
||||
''
|
||||
))}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A GTK theme based on the Tokyo Night colour palette.";
|
||||
homepage = "www.pling.com/p/1681315/";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with lib.maintainers; [ garaiza-93 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
77
pkgs/data/themes/tokyo-night-gtk/generic.nix
Normal file
77
pkgs/data/themes/tokyo-night-gtk/generic.nix
Normal file
|
|
@ -0,0 +1,77 @@
|
|||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, writeScript
|
||||
, gtk-engine-murrine
|
||||
, gnome-themes-extra
|
||||
, prefix ? ""
|
||||
, type ? ""
|
||||
, variantName ? ""
|
||||
, variant ? ""
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "${prefix}_${type}-${variantName}";
|
||||
version = "unstable-2023-05-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Fausto-Korpsvart";
|
||||
repo = "Tokyo-Night-GTK-Theme";
|
||||
rev = "e9790345a6231cd6001f1356d578883fac52233a";
|
||||
hash = "sha256-Q9UnvmX+GpvqSmTwdjU4hsEsYhA887wPqs5pyqbIhmc=";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [
|
||||
gtk-engine-murrine
|
||||
gnome-themes-extra
|
||||
];
|
||||
|
||||
dontPatch = true;
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
dontFixup = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/{${type},${prefix}}
|
||||
cp -a ${type}/Tokyonight-${variant} $out/share/${type}
|
||||
cp -a LICENSE $out/share/${prefix}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = writeScript "update.sh" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl common-updater-scripts tree jq
|
||||
res="$(curl ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \
|
||||
-sL "https://api.github.com/repos/${finalAttrs.src.owner}/${finalAttrs.src.repo}/commits/HEAD")"
|
||||
|
||||
rev="$(echo $res | jq '.sha' --raw-output)"
|
||||
version="unstable-$(echo $res | jq '.commit | .author | .date' --raw-output | sed 's/T.*$//')"
|
||||
update-source-version ${prefix}-variants.${type}.${variantName} "$version" "$rev" --ignore-same-hash
|
||||
|
||||
commonjq1='.[] .contents .[] | {(.name): .name} | walk(if type=="object" then with_entries(.key|=ascii_downcase) else . end)'
|
||||
commonjq2='reduce inputs as $in (.; . + $in)'
|
||||
commontree="-dJ -L 1 --noreport ${finalAttrs.src}"
|
||||
|
||||
echo $(tree $commontree/icons | jq "$commonjq1" | jq "$commonjq2" | jq '{icons: .}') \
|
||||
$(tree $commontree/themes | jq "$commonjq1" | jq "$commonjq2" | jq '{themes: .}') | \
|
||||
jq 'reduce inputs as $in (.; . + $in)' | sed "s/[tT]okyonight-//g" > \
|
||||
"$(git rev-parse --show-toplevel)/pkgs/data/themes/${prefix}/variants.json"
|
||||
'';
|
||||
|
||||
# For "full" in default.nix
|
||||
ptype = type;
|
||||
pvariant = variant;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A GTK theme based on the Tokyo Night colour palette";
|
||||
homepage = "https://www.pling.com/p/1681315";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ garaiza-93 Madouura ];
|
||||
};
|
||||
})
|
||||
18
pkgs/data/themes/tokyo-night-gtk/variants.json
Normal file
18
pkgs/data/themes/tokyo-night-gtk/variants.json
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
{
|
||||
"icons": {
|
||||
"dark": "Dark",
|
||||
"dark-cyan": "Dark-Cyan",
|
||||
"light": "Light",
|
||||
"moon": "Moon"
|
||||
},
|
||||
"themes": {
|
||||
"dark-b": "Dark-B",
|
||||
"dark-bl": "Dark-BL",
|
||||
"dark-b-lb": "Dark-B-LB",
|
||||
"dark-bl-lb": "Dark-BL-LB",
|
||||
"storm-b": "Storm-B",
|
||||
"storm-bl": "Storm-BL",
|
||||
"storm-b-lb": "Storm-B-LB",
|
||||
"storm-bl-lb": "Storm-BL-LB"
|
||||
}
|
||||
}
|
||||
|
|
@ -361,7 +361,7 @@ backendStdenv.mkDerivation rec {
|
|||
description = "A compiler for NVIDIA GPUs, math libraries, and tools";
|
||||
homepage = "https://developer.nvidia.com/cuda-toolkit";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
license = licenses.unfree;
|
||||
license = licenses.nvidiaCuda;
|
||||
maintainers = teams.cuda.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ let
|
|||
inherit (lib.meta) getExe;
|
||||
inherit (lib.strings) optionalString;
|
||||
in
|
||||
backendStdenv.mkDerivation {
|
||||
backendStdenv.mkDerivation (finalAttrs: {
|
||||
# NOTE: Even though there's no actual buildPhase going on here, the derivations of the
|
||||
# redistributables are sensitive to the compiler flags provided to stdenv. The patchelf package
|
||||
# is sensitive to the compiler flags provided to stdenv, and we depend on it. As such, we are
|
||||
|
|
@ -164,11 +164,15 @@ backendStdenv.mkDerivation {
|
|||
outputSpecified = true;
|
||||
|
||||
meta = {
|
||||
inherit description platforms;
|
||||
license = lib.licenses.unfree;
|
||||
inherit platforms;
|
||||
description = "${description}. By downloading and using the packages you accept the terms and conditions of the ${finalAttrs.meta.license.shortName}";
|
||||
license = lib.licenses.nvidiaCudaRedist // {
|
||||
url = "https://developer.download.nvidia.com/compute/cuda/redist/${releaseAttrs.license_path or "${pname}/LICENSE.txt"}";
|
||||
};
|
||||
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
|
||||
maintainers = lib.teams.cuda.members;
|
||||
# Force the use of the default, fat output by default (even though `dev` exists, which
|
||||
# causes Nix to prefer that output over the others if outputSpecified isn't set).
|
||||
outputsToInstall = [ "out" ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -46,11 +46,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "go";
|
||||
version = "1.20.10";
|
||||
version = "1.20.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
|
||||
hash = "sha256-ctL1GAXEcVAGbBA3VMdf3bLBnUjJIZ+jPR5GaWyEHbs=";
|
||||
hash = "sha256-01XFrjqPd2PJ7J3CUVOq43OVjLy2DdCekai1bHYhsvw=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@ let
|
|||
inherit (llvmPackages) stdenv;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "odin";
|
||||
version = "dev-2023-08";
|
||||
version = "dev-2023-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "odin-lang";
|
||||
repo = "Odin";
|
||||
rev = version;
|
||||
hash = "sha256-pmgrauhB5/JWBkwrAm7tCml9IYQhXyGXsNVDKTntA0M=";
|
||||
hash = "sha256-5plcr+j9aFSaLfLQXbG4WD1GH6rE7D3uhlUbPaDEYf8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -33,10 +33,12 @@ let
|
|||
, jq
|
||||
|
||||
, version
|
||||
, hash
|
||||
, phpSrc ? null
|
||||
, hash ? null
|
||||
, extraPatches ? [ ]
|
||||
, packageOverrides ? (final: prev: { })
|
||||
, phpAttrsOverrides ? (attrs: { })
|
||||
, pearInstallPhar ? (callPackage ./install-pear-nozlib-phar.nix { })
|
||||
|
||||
# Sapi flags
|
||||
, cgiSupport ? true
|
||||
|
|
@ -192,6 +194,11 @@ let
|
|||
|
||||
mkWithExtensions = prevArgs: prevExtensionFunctions: extensions:
|
||||
mkBuildEnv prevArgs prevExtensionFunctions { inherit extensions; };
|
||||
|
||||
defaultPhpSrc = fetchurl {
|
||||
url = "https://www.php.net/distributions/php-${version}.tar.bz2";
|
||||
inherit hash;
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (
|
||||
let
|
||||
|
|
@ -278,6 +285,15 @@ let
|
|||
substituteInPlace configure --replace "-lstdc++" "-lc++"
|
||||
'';
|
||||
|
||||
# When compiling PHP sources from Github, this file is missing and we
|
||||
# need to install it ourselves.
|
||||
# On the other hand, a distribution includes this file by default.
|
||||
preInstall = ''
|
||||
if [[ ! -f ./pear/install-pear-nozlib.phar ]]; then
|
||||
cp ${pearInstallPhar} ./pear/install-pear-nozlib.phar
|
||||
fi
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
test -d $out/etc || mkdir $out/etc
|
||||
cp php.ini-production $out/etc/php.ini
|
||||
|
|
@ -291,10 +307,7 @@ let
|
|||
$dev/share/man/man1/
|
||||
'';
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.php.net/distributions/php-${version}.tar.bz2";
|
||||
inherit hash;
|
||||
};
|
||||
src = if phpSrc == null then defaultPhpSrc else phpSrc;
|
||||
|
||||
patches = [ ./fix-paths-php7.patch ] ++ extraPatches;
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
{
|
||||
fetchurl
|
||||
}:
|
||||
|
||||
fetchurl {
|
||||
url = "https://pear.php.net/install-pear-nozlib.phar";
|
||||
hash = "sha256-UblKVcsm030tNSA6mdeab+h7ZhANNz7MkFf4Z1iigjs=";
|
||||
}
|
||||
|
|
@ -153,8 +153,14 @@ in
|
|||
description = "NVIDIA CUDA Deep Neural Network library (cuDNN)";
|
||||
homepage = "https://developer.nvidia.com/cudnn";
|
||||
sourceProvenance = with sourceTypes; [binaryNativeCode];
|
||||
# TODO: consider marking unfreRedistributable when not using runfile
|
||||
license = licenses.unfree;
|
||||
license = {
|
||||
shortName = "cuDNN EULA";
|
||||
fullName = "NVIDIA cuDNN Software License Agreement (EULA)";
|
||||
url = "https://docs.nvidia.com/deeplearning/sdk/cudnn-sla/index.html#supplement";
|
||||
free = false;
|
||||
} // lib.optionalAttrs (!useCudatoolkitRunfile) {
|
||||
redistributable = true;
|
||||
};
|
||||
platforms = ["x86_64-linux"];
|
||||
maintainers = with maintainers; [mdaiter samuela];
|
||||
# Force the use of the default, fat output by default (even though `dev` exists, which
|
||||
|
|
|
|||
48
pkgs/development/python-modules/bork/default.nix
Normal file
48
pkgs/development/python-modules/bork/default.nix
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
|
||||
, build
|
||||
, coloredlogs
|
||||
, packaging
|
||||
, toml
|
||||
, twine
|
||||
, wheel
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bork";
|
||||
version = "7.0.0";
|
||||
pyproject = true;
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "duckinator";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-frwkU2YesYK0RJNz9yqiXj1XeTZ8jg5oClri4hEYokg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build
|
||||
coloredlogs
|
||||
packaging
|
||||
toml
|
||||
twine
|
||||
wheel
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"bork"
|
||||
"bork.api"
|
||||
"bork.cli"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python build and release management tool";
|
||||
homepage = "https://github.com/duckinator/bork";
|
||||
maintainers = with maintainers; [ nicoo ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
42
pkgs/development/python-modules/zcbor/default.nix
Normal file
42
pkgs/development/python-modules/zcbor/default.nix
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
|
||||
# build dependencies
|
||||
, setuptools
|
||||
|
||||
# dependencies
|
||||
, cbor2
|
||||
, pyyaml
|
||||
, regex
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zcbor";
|
||||
version = "0.7.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-0mGp7Hnq8ZNEUx/9eQ6UD9/cOuLl6S5Aif1qNh1+jYA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cbor2
|
||||
pyyaml
|
||||
regex
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "zcbor" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A low footprint CBOR library in the C language (C++ compatible), tailored for use in microcontrollers";
|
||||
homepage = "https://pypi.org/project/zcbor/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ otavio ];
|
||||
};
|
||||
}
|
||||
|
|
@ -46,5 +46,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ atalii ];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "alr";
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -46,6 +46,6 @@ rustPlatform.buildRustPackage rec {
|
|||
description = "A highly efficient daemon for streaming data from Kafka into Delta Lake";
|
||||
homepage = "https://github.com/delta-io/kafka-delta-ingest";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ bbigras ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "ols";
|
||||
version = "nightly-2023-07-09";
|
||||
version = "nightly-2023-11-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DanielGavin";
|
||||
repo = "ols";
|
||||
rev = "255ad5958026dc3a3116f621eaebd501b8b26a22";
|
||||
hash = "sha256-XtlIZToNvmU4GhUJAxuVmKvKwnPebaxjv7jp/AgE/uM=";
|
||||
rev = "b19c24eb17e7c16bcfb3144665fd405fd5e580f3";
|
||||
hash = "sha256-c8mHVdXbn7aRKI/QBIZvBvl4sCNK49q+crQmTCjptwM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ buildGoModule {
|
|||
# use make instead of default checks because e2e does not work with `buildGoDir`
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
HOME="$(mktemp -d)"
|
||||
# We do not set trimpath for tests, in case they reference test assets
|
||||
export GOFLAGS=''${GOFLAGS//-trimpath/}
|
||||
|
||||
|
|
|
|||
|
|
@ -4,16 +4,16 @@ let
|
|||
# comments with variant added for update script
|
||||
# ./update-zen.py zen
|
||||
zenVariant = {
|
||||
version = "6.6"; #zen
|
||||
version = "6.6.1"; #zen
|
||||
suffix = "zen1"; #zen
|
||||
sha256 = "0rda54h5lg2llbwkj2h4mqfshjyha1dzlcwhx099is7g2lfzksxx"; #zen
|
||||
sha256 = "13m820wggf6pkp351w06mdn2lfcwbn08ydwksyxilqb88vmr0lpq"; #zen
|
||||
isLqx = false;
|
||||
};
|
||||
# ./update-zen.py lqx
|
||||
lqxVariant = {
|
||||
version = "6.5.10"; #lqx
|
||||
version = "6.5.11"; #lqx
|
||||
suffix = "lqx1"; #lqx
|
||||
sha256 = "10bny5x2a3brfamyajvnl75h7s64vvmymgnvwgaq82q4bmsfcdd1"; #lqx
|
||||
sha256 = "02k4cfiygrfgyp3x6ivr7h6klknjzd5cwpszjnzcy2jc547512pd"; #lqx
|
||||
isLqx = true;
|
||||
};
|
||||
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {
|
||||
|
|
|
|||
|
|
@ -7,15 +7,15 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "trust-dns";
|
||||
version = "0.23.0";
|
||||
version = "0.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bluejekyll";
|
||||
repo = "trust-dns";
|
||||
owner = "hickory-dns";
|
||||
repo = "hickory-dns";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CfFEhZEk1Z7VG0n8EvyQwHvZIOEES5GKpm5tMeqhRVY=";
|
||||
hash = "sha256-w87WpuFKSOdObNiqET/pp2sJql1q0+xyns8+nMPj0xE=";
|
||||
};
|
||||
cargoHash = "sha256-jmow/jtdbuKFovXWA5xbgM67iJmkwP35hiOivIJ5JdM=";
|
||||
cargoHash = "sha256-sLhhwSsyzdxq7V9rpD42cu76T1mt4uCOx2NAmIf5sF8=";
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
@ -29,5 +29,6 @@ rustPlatform.buildRustPackage rec {
|
|||
maintainers = with maintainers; [ colinsane ];
|
||||
platforms = platforms.linux;
|
||||
license = with licenses; [ asl20 mit ];
|
||||
mainProgram = "hickory-dns";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ let
|
|||
};
|
||||
variants = if stdenv.isLinux then
|
||||
{
|
||||
version = "5.0.21";
|
||||
sha256 = "sha256-knAqb6bT1KpO1Gi4sKhG22OtCPhOR3NMmhRjUgseUPM=";
|
||||
version = "5.0.22";
|
||||
sha256 = "sha256-NIsx6nwXGsuk+ff+LOCwOMpT/HAaNn89t4jtJvKprIA=";
|
||||
patches = [ ./fix-build-with-boost-1.79-5_0-linux.patch ];
|
||||
}
|
||||
else lib.optionalAttrs stdenv.isDarwin
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ let
|
|||
};
|
||||
in
|
||||
buildMongoDB {
|
||||
version = "6.0.10";
|
||||
sha256 = "sha256-7YJ0Ndyl635ebDWuIGfC5DFIGUXr518ghC/0Qq42HEM=";
|
||||
version = "6.0.11";
|
||||
sha256 = "sha256-hIbbCDQ0Sqnm6ohtEpbdGWk18nLIlr6T0T9UL6WAFA8=";
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "mongodb-6.1.0-rc-more-specific-cache-alignment-types.patch";
|
||||
|
|
|
|||
|
|
@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/sorah/envchain";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ bbigras ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,13 +43,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fastfetch";
|
||||
version = "2.2.2";
|
||||
version = "2.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastfetch-cli";
|
||||
repo = "fastfetch";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-ejyAXwVsxI16J295WHfMLMtF/kGW89l3N0qV0mH4DX0=";
|
||||
hash = "sha256-JaD0R1vfHoWMhipMtTW0dlggR7RbD2evHfHrjoZJBmk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -19,6 +19,6 @@ rustPlatform.buildRustPackage rec {
|
|||
description = "An autojump \"zap to directory\" helper";
|
||||
homepage = "https://github.com/euank/pazi";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ bbigras ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ rustPlatform.buildRustPackage rec {
|
|||
description = "A minimal, blazing fast, and extremely customizable prompt for any shell";
|
||||
homepage = "https://starship.rs";
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ bbigras danth davidtwco Br1ght0ne Frostman marsam ];
|
||||
maintainers = with maintainers; [ danth davidtwco Br1ght0ne Frostman marsam ];
|
||||
mainProgram = "starship";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
|
|||
description = "Intuitive, config-driven terminal multiplexer designed for software & systems engineers";
|
||||
homepage = "https://github.com/austinjones/tab-rs";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ bbigras ];
|
||||
maintainers = with maintainers; [ ];
|
||||
mainProgram = "tab";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ rustPlatform.buildRustPackage rec {
|
|||
description = "Command-line DNS client";
|
||||
homepage = "https://dns.lookup.dog";
|
||||
license = licenses.eupl12;
|
||||
maintainers = with maintainers; [ bbigras figsoda ];
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
mainProgram = "dog";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "picosnitch";
|
||||
version = "0.14.0";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b58255a78a0bf652224ee22ca83137d75ea77b7eb1ad2d11159b56b6788f6201";
|
||||
sha256 = "5d427eb46de448e4109f68ed435dd38426df8200aea5bb668639aabe1f0b4580";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -53,6 +53,11 @@ buildGoModule rec {
|
|||
fi
|
||||
'';
|
||||
|
||||
# plugin test is flaky, see https://github.com/FiloSottile/age/issues/517
|
||||
checkFlags = [
|
||||
"-skip" "TestScript/plugin"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://age-encryption.org/";
|
||||
description = "Modern encryption tool with small explicit keys";
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
}:
|
||||
buildGoModule rec {
|
||||
pname = "cosign";
|
||||
version = "2.2.0";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sigstore";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VE/rm85KZs3JWMsidIlUGJ9JrtZ4VBI+Go1yujq7z1s=";
|
||||
hash = "sha256-J/CQonW/ICrNUSQXVZPMR+WACZYJH0eH6bXhdXE27TY=";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
|
@ -28,7 +28,7 @@ buildGoModule rec {
|
|||
|
||||
nativeBuildInputs = [ pkg-config installShellFiles ];
|
||||
|
||||
vendorHash = "sha256-mpT4/BS/NofMueBbwhh4v6pNEONEpWM9RDKuYZ+9BtA=";
|
||||
vendorHash = "sha256-RPwU6W6a9mnfriyz3ASvamZ3jEG6C2ug/MTp1Pahc/Q=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/cosign"
|
||||
|
|
@ -52,6 +52,7 @@ buildGoModule rec {
|
|||
rm pkg/cosign/ctlog_test.go # Require network access
|
||||
rm pkg/cosign/tlog_test.go # Require network access
|
||||
rm cmd/cosign/cli/verify/verify_blob_attestation_test.go # Require network access
|
||||
rm cmd/cosign/cli/verify/verify_blob_test.go # Require network access
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec {
|
|||
+ lib.optionalString nvidiaSupport ", and NVIDIA GPU usage";
|
||||
homepage = "https://github.com/bvaisvil/zenith";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ bbigras ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,9 +40,10 @@ lib.fix (self: {
|
|||
let
|
||||
### texlive.combine backward compatibility
|
||||
# if necessary, convert old style { pkgs = [ ... ]; } packages to attribute sets
|
||||
ensurePkgSets = ps: if ! __fromCombineWrapper && builtins.any (p: p ? pkgs && builtins.all (p: p ? tlType) p.pkgs) ps
|
||||
then let oldStyle = builtins.partition (p: p ? pkgs && builtins.all (p: p ? tlType) p.pkgs) ps;
|
||||
in oldStyle.wrong ++ lib.concatMap toTLPkgSets oldStyle.right
|
||||
isOldPkgList = p: ! p.outputSpecified or false && p ? pkgs && builtins.all (p: p ? tlType) p.pkgs;
|
||||
ensurePkgSets = ps: if ! __fromCombineWrapper && builtins.any isOldPkgList ps
|
||||
then let oldPkgLists = builtins.partition isOldPkgList ps;
|
||||
in oldPkgLists.wrong ++ lib.concatMap toTLPkgSets oldPkgLists.right
|
||||
else ps;
|
||||
|
||||
pkgList = rec {
|
||||
|
|
|
|||
|
|
@ -33965,7 +33965,7 @@ with pkgs;
|
|||
wlroots = wlroots_0_15;
|
||||
};
|
||||
|
||||
mpvScripts = import ../applications/video/mpv/scripts { inherit lib callPackage config; };
|
||||
mpvScripts = callPackage ../applications/video/mpv/scripts { };
|
||||
|
||||
open-in-mpv = callPackage ../applications/video/open-in-mpv { };
|
||||
|
||||
|
|
@ -35892,7 +35892,9 @@ with pkgs;
|
|||
|
||||
tofi = callPackage ../applications/misc/tofi { };
|
||||
|
||||
tokyo-night-gtk = callPackage ../data/themes/tokyo-night-gtk { };
|
||||
tokyo-night-gtk = tokyo-night-gtk-variants.full;
|
||||
|
||||
tokyo-night-gtk-variants = recurseIntoAttrs (callPackage ../data/themes/tokyo-night-gtk { });
|
||||
|
||||
topydo = callPackage ../applications/misc/topydo { };
|
||||
|
||||
|
|
|
|||
|
|
@ -1573,6 +1573,8 @@ self: super: with self; {
|
|||
enablePython = true;
|
||||
});
|
||||
|
||||
bork = callPackage ../development/python-modules/bork { };
|
||||
|
||||
boschshcpy = callPackage ../development/python-modules/boschshcpy { };
|
||||
|
||||
bottombar = callPackage ../development/python-modules/bottombar { };
|
||||
|
|
@ -15975,6 +15977,8 @@ self: super: with self; {
|
|||
|
||||
zc_lockfile = callPackage ../development/python-modules/zc_lockfile { };
|
||||
|
||||
zcbor = callPackage ../development/python-modules/zcbor { };
|
||||
|
||||
zconfig = callPackage ../development/python-modules/zconfig { };
|
||||
|
||||
zcs = callPackage ../development/python-modules/zcs { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue