mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 04:49:01 +02:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
757197a9df
|
|
@ -1516,6 +1516,11 @@
|
|||
githubId = 11037075;
|
||||
name = "Ashley Hooper";
|
||||
};
|
||||
ashvith-shetty = {
|
||||
github = "Ashvith10";
|
||||
githubId = 113123021;
|
||||
name = "Ashvith Shetty";
|
||||
};
|
||||
aske = {
|
||||
email = "aske@fmap.me";
|
||||
github = "aske";
|
||||
|
|
|
|||
|
|
@ -134,6 +134,7 @@ in
|
|||
ProtectProc = "invisible";
|
||||
ProcSubset = "pid";
|
||||
RestrictAddressFamilies = [
|
||||
"AF_UNIX"
|
||||
"AF_INET"
|
||||
"AF_INET6"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@
|
|||
, substituteAll
|
||||
|
||||
# Language dependencies
|
||||
, fetchYarnDeps
|
||||
, mkYarnModules
|
||||
, python3
|
||||
, rustPlatform
|
||||
|
||||
|
|
@ -730,8 +732,14 @@ self: super: {
|
|||
|
||||
markdown-preview-nvim = let
|
||||
# We only need its dependencies `node-modules`.
|
||||
nodeDep = nodePackages."markdown-preview-nvim-../../applications/editors/vim/plugins/markdown-preview-nvim".overrideAttrs {
|
||||
dontNpmInstall = true;
|
||||
nodeDep = mkYarnModules rec {
|
||||
inherit (super.markdown-preview-nvim) pname version;
|
||||
packageJSON = ./markdown-preview-nvim/package.json;
|
||||
yarnLock = "${super.markdown-preview-nvim.src}/yarn.lock";
|
||||
offlineCache = fetchYarnDeps {
|
||||
inherit yarnLock;
|
||||
hash = "sha256-kzc9jm6d9PJ07yiWfIOwqxOTAAydTpaLXVK6sEWM8gg=";
|
||||
};
|
||||
};
|
||||
in super.markdown-preview-nvim.overrideAttrs {
|
||||
patches = [
|
||||
|
|
@ -741,7 +749,7 @@ self: super: {
|
|||
})
|
||||
];
|
||||
postInstall = ''
|
||||
ln -s ${nodeDep}/lib/node_modules/markdown-preview/node_modules $out/app
|
||||
ln -s ${nodeDep}/node_modules $out/app
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ nodejs ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "pluto";
|
||||
version = "5.18.3";
|
||||
version = "5.18.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FairwindsOps";
|
||||
repo = "pluto";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-D85+cT4bRVQwyrXs+NZJetRIHP3I7nbJKqOTjatoxwc=";
|
||||
hash = "sha256-/8ZJXy5FErLnnXpED0UL+xqOo4QZtmR1hpcSpVsE8mw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ysMRE/OwMf4rBnlkpkW9K8ZHEEbHpQ02RXNwLLSr0nY=";
|
||||
|
|
@ -22,6 +22,6 @@ buildGoModule rec {
|
|||
homepage = "https://github.com/FairwindsOps/pluto";
|
||||
description = "Find deprecated Kubernetes apiVersions";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ peterromfeldhk ];
|
||||
maintainers = with maintainers; [ peterromfeldhk kashw2 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -58,7 +58,6 @@ let
|
|||
Chili-Man
|
||||
babariviere
|
||||
kalbasit
|
||||
marsam
|
||||
maxeaubrey
|
||||
timstott
|
||||
zimbatm
|
||||
|
|
|
|||
36
pkgs/data/icons/tau-hydrogen/default.nix
Normal file
36
pkgs/data/icons/tau-hydrogen/default.nix
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
meson,
|
||||
ninja,
|
||||
librsvg,
|
||||
xorg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tau-hydrogen";
|
||||
version = "1.0.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tau-OS";
|
||||
repo = "tau-hydrogen";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-ECrRWWS/Am0lfCIJw/BVZg53oLw79Im8d8KgAYxE+pw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
librsvg
|
||||
xorg.xcursorgen
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "The GTK icon theme for tauOS";
|
||||
homepage = "https://github.com/tau-OS/tau-hydrogen";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ ashvith-shetty ];
|
||||
};
|
||||
})
|
||||
|
|
@ -48,11 +48,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-boxes";
|
||||
version = "44.2";
|
||||
version = "44.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "ndOJwUnQwPpXRW7DY9UaiCVflFVY+530KJTOeO+F34k=";
|
||||
sha256 = "ZIpBuODIdfBOOnh+pnA2vJIehYo25jQ6Q9tyQu5z4XE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -67,13 +67,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell";
|
||||
version = "44.3";
|
||||
version = "44.4";
|
||||
|
||||
outputs = [ "out" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "VWlLccLuTq72DZNCgAPy6qTPABhoSPXja0XP5Qb8Mb8=";
|
||||
sha256 = "HdUebujZL7y5XObd8Ruf7OiNImIsAQFf+pNgFpzUGGY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -66,13 +66,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mutter";
|
||||
version = "44.3";
|
||||
version = "44.4";
|
||||
|
||||
outputs = [ "out" "dev" "man" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "GFy+vyFQ0+RQVQ43G9sTqLTbCWl4sU+ZUh6WbqzHBVE=";
|
||||
sha256 = "M3IKWGywqacyr1oH7RPj89MqGml4EjURQKVLygBrlAw=";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
|
|
|
|||
|
|
@ -64,10 +64,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross.package;
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./iana-etc-1.17.patch;
|
||||
|
|
@ -92,8 +88,6 @@ stdenv.mkDerivation rec {
|
|||
GOOS = stdenv.targetPlatform.parsed.kernel.name;
|
||||
GOARCH = goarch stdenv.targetPlatform;
|
||||
# GOHOSTOS/GOHOSTARCH must match the building system, not the host system.
|
||||
# Go will nevertheless build a for host system that we will copy over in
|
||||
# the install phase.
|
||||
GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name;
|
||||
GOHOSTARCH = goarch stdenv.buildPlatform;
|
||||
|
||||
|
|
@ -116,14 +110,16 @@ stdenv.mkDerivation rec {
|
|||
|
||||
GOROOT_BOOTSTRAP = if useGccGoBootstrap then goBootstrap else "${goBootstrap}/share/go";
|
||||
|
||||
# Note that we use distpack to avoid moving around cross-compiled binaries.
|
||||
# The paths are slightly different when buildPlatform != hostPlatform and
|
||||
# distpack handles assembling outputs in the right place, same as the official
|
||||
# Go binary releases. See also https://pkg.go.dev/cmd/distpack
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
export GOCACHE=$TMPDIR/go-cache
|
||||
# this is compiled into the binary
|
||||
export GOROOT_FINAL=$out/share/go
|
||||
|
||||
export PATH=$(pwd)/bin:$PATH
|
||||
|
||||
${lib.optionalString isCross ''
|
||||
# Independent from host/target, CC should produce code for the building system.
|
||||
# We only set it when cross-compiling.
|
||||
|
|
@ -132,34 +128,16 @@ stdenv.mkDerivation rec {
|
|||
ulimit -a
|
||||
|
||||
pushd src
|
||||
./make.bash
|
||||
bash make.bash -no-banner -distpack
|
||||
popd
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
# Contains the wrong perl shebang when cross compiling,
|
||||
# since it is not used for anything we can deleted as well.
|
||||
rm src/regexp/syntax/make_perl_groups.pl
|
||||
'' + (if (stdenv.buildPlatform.system != stdenv.hostPlatform.system) then ''
|
||||
mv bin/*_*/* bin
|
||||
rmdir bin/*_*
|
||||
${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''
|
||||
rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH}
|
||||
''}
|
||||
'' else lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) ''
|
||||
rm -rf bin/*_*
|
||||
${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''
|
||||
rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH}
|
||||
''}
|
||||
'');
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $GOROOT_FINAL
|
||||
cp -a bin pkg src lib misc api doc go.env $GOROOT_FINAL
|
||||
mkdir -p $out/bin
|
||||
ln -s $GOROOT_FINAL/bin/* $out/bin
|
||||
mkdir -p $out/{share,bin}
|
||||
tar -C $out/share -x -z -f "pkg/distpack/go${version}.$GOOS-$GOARCH.tar.gz"
|
||||
ln -s $out/share/go/bin/* $out/bin
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
WGET_ARGS=( https://download.kde.org/stable/frameworks/5.109/ -A '*.tar.xz' )
|
||||
WGET_ARGS=( https://download.kde.org/stable/frameworks/5.110/ -A '*.tar.xz' )
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pdfhummus";
|
||||
version = "4.5.10";
|
||||
version = "4.5.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "galkahana";
|
||||
repo = "PDF-Writer";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dhbb/9+6ftjde+oh665ujA5CvY+Ume0pz/ghrohcaNE=";
|
||||
hash = "sha256-nTLyFGnY07gDoahYe5YqSmU/URzdvRKQ1MsXt3164+c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qtutilities";
|
||||
version = "6.13.0";
|
||||
version = "6.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Martchus";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-gfGVVjtzpBGrPrp2k3fOIh54EAMSicyikF1CtaO74y8=";
|
||||
hash = "sha256-ic1Xnle1fGZ5elf0yH0BF+3spAmIo9kP62WhXLmBVNc=";
|
||||
};
|
||||
|
||||
buildInputs = [ qtbase cpp-utilities ];
|
||||
|
|
|
|||
|
|
@ -172,7 +172,6 @@
|
|||
, "lv_font_conv"
|
||||
, "madoko"
|
||||
, "markdown-link-check"
|
||||
, {"markdown-preview-nvim": "../../applications/editors/vim/plugins/markdown-preview-nvim"}
|
||||
, "mastodon-bot"
|
||||
, "mathjax"
|
||||
, "meat"
|
||||
|
|
|
|||
1113
pkgs/development/node-packages/node-packages.nix
generated
1113
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -1,5 +1,5 @@
|
|||
{ docbook_xsl
|
||||
, docbook_xml_dtd_45
|
||||
{ docbook_xml_dtd_45
|
||||
, docbook_xsl
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, lib
|
||||
|
|
@ -13,20 +13,20 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cppcheck";
|
||||
version = "2.11.1";
|
||||
version = "2.12.0";
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "danmar";
|
||||
repo = "cppcheck";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-ZQ1EgnC2JBc0AvSW8PtgMzJoWSPt04Xfh8dqOU+KMfw=";
|
||||
hash = "sha256-Rfm63ERmTsmmH8W6aiBMx+NiQjzGuoWHqHRRqWishhw=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
docbook_xsl
|
||||
docbook_xml_dtd_45
|
||||
docbook_xsl
|
||||
installShellFiles
|
||||
libxslt
|
||||
pkg-config
|
||||
|
|
@ -41,9 +41,12 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
makeFlags = [ "PREFIX=$(out)" "MATCHCOMPILER=yes" "FILESDIR=$(out)/share/cppcheck" "HAVE_RULES=yes" ];
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
strictDeps = true;
|
||||
|
||||
# test/testcondition.cpp:4949(TestCondition::alwaysTrueContainer): Assertion failed.
|
||||
doCheck = !(stdenv.isLinux && stdenv.isAarch64);
|
||||
doInstallCheck = true;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
|
|
@ -58,10 +61,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
installManPage cppcheck.1
|
||||
'';
|
||||
|
||||
# test/testcondition.cpp:4949(TestCondition::alwaysTrueContainer): Assertion failed.
|
||||
doCheck = !(stdenv.isLinux && stdenv.isAarch64);
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
|
||||
|
|
@ -73,13 +72,13 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
meta = {
|
||||
description = "A static analysis tool for C/C++ code";
|
||||
homepage = "http://cppcheck.sourceforge.net/";
|
||||
homepage = "http://cppcheck.sourceforge.net";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
longDescription = ''
|
||||
Check C/C++ code for memory leaks, mismatching allocation-deallocation,
|
||||
buffer overruns and more.
|
||||
'';
|
||||
maintainers = with lib.maintainers; [ joachifm ];
|
||||
maintainers = with lib.maintainers; [ joachifm paveloom ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "sqldef";
|
||||
version = "0.16.4";
|
||||
version = "0.16.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "k0kubun";
|
||||
repo = "sqldef";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HQ6WyeKYRd+pY/P2Bsu7W2eMjgpjUhbwEFE7bADrxDY=";
|
||||
hash = "sha256-y28dn/LhqQxbszKwOjpiU93oP1tq/H0NL9vonhERLzw=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-YdZo2XN+425s0K/3COqQx3g1Bpus4uWiwnzrYJ8qdOM=";
|
||||
vendorHash = "sha256-ugLjaKCVgVl2jhH/blQ44y/c8hxQpbdlxUC4u+FgMGM=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -92,12 +92,12 @@ in rec {
|
|||
|
||||
catppuccin = mkTmuxPlugin {
|
||||
pluginName = "catppuccin";
|
||||
version = "unstable-2023-07-15";
|
||||
version = "unstable-2023-08-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "catppuccin";
|
||||
repo = "tmux";
|
||||
rev = "e7b50832f9bc59b0b5ef5316ba2cd6f61e4e22fc";
|
||||
hash = "sha256-9ZfUqEKEexSh06QyR5C+tYd4tNfBi3PsA+STzUv4+/s=";
|
||||
rev = "7a284c98e5df4cc84a1a45ad633916f0b2b916b2";
|
||||
hash = "sha256-jxcxW0gEfXaSt8VM3UIs0dKNKaHb8JSEQBBV3SVjW/A=";
|
||||
};
|
||||
postInstall = ''
|
||||
sed -i -e 's|''${PLUGIN_DIR}/catppuccin-selected-theme.tmuxtheme|''${TMUX_TMPDIR}/catppuccin-selected-theme.tmuxtheme|g' $target/catppuccin.tmux
|
||||
|
|
|
|||
|
|
@ -603,8 +603,8 @@ let
|
|||
|
||||
microcode = {
|
||||
MICROCODE = yes;
|
||||
MICROCODE_INTEL = yes;
|
||||
MICROCODE_AMD = yes;
|
||||
MICROCODE_INTEL = whenOlder "6.6" yes;
|
||||
MICROCODE_AMD = whenOlder "6.6" yes;
|
||||
# Write Back Throttling
|
||||
# https://lwn.net/Articles/682582/
|
||||
# https://bugzilla.kernel.org/show_bug.cgi?id=12309#c655
|
||||
|
|
@ -913,7 +913,7 @@ let
|
|||
SECCOMP = yes; # used by systemd >= 231
|
||||
SECCOMP_FILTER = yes; # ditto
|
||||
POSIX_MQUEUE = yes;
|
||||
FRONTSWAP = yes;
|
||||
FRONTSWAP = whenOlder "6.6" yes;
|
||||
FUSION = yes; # Fusion MPT device support
|
||||
IDE = whenOlder "5.14" no; # deprecated IDE support, removed in 5.14
|
||||
IDLE_PAGE_TRACKING = yes;
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "6.5-rc7";
|
||||
version = "6.6-rc1";
|
||||
extraMeta.branch = lib.versions.majorMinor version;
|
||||
|
||||
# modDirVersion needs to be x.y.z, will always add .0
|
||||
|
|
@ -11,7 +11,7 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchzip {
|
||||
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
|
||||
hash = "sha256-5rIcyXN54o9P+RxHZkI/BTO2Ox6uJ0Fi9NVcrN1HczQ=";
|
||||
hash = "sha256-DRai7HhWVtRB0GiRCvCv2JM2TFKRsZ60ohD6GW0b8As=";
|
||||
};
|
||||
|
||||
# Should the testing kernels ever be built on Hydra?
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl
|
||||
, libelf, cpio, elfutils, zstd, python3Minimal, zlib, pahole
|
||||
, libelf, cpio, elfutils, zstd, python3Minimal, zlib, pahole, kmod
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
|
|
@ -271,7 +271,7 @@ let
|
|||
make modules_install $makeFlags "''${makeFlagsArray[@]}" \
|
||||
$installFlags "''${installFlagsArray[@]}"
|
||||
unlink $out/lib/modules/${modDirVersion}/build
|
||||
unlink $out/lib/modules/${modDirVersion}/source
|
||||
rm -f $out/lib/modules/${modDirVersion}/source
|
||||
|
||||
mkdir -p $dev/lib/modules/${modDirVersion}/{build,source}
|
||||
|
||||
|
|
@ -376,6 +376,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat
|
|||
++ optionals (lib.versionAtLeast version "4.16") [ bison flex ]
|
||||
++ optionals (lib.versionAtLeast version "5.2") [ cpio pahole zlib ]
|
||||
++ optional (lib.versionAtLeast version "5.8") elfutils
|
||||
++ optional (lib.versionAtLeast version "6.6") kmod
|
||||
;
|
||||
|
||||
hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ];
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
let
|
||||
pname = "photofield-ui";
|
||||
version = "0.10.4";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SmilyOrg";
|
||||
repo = "photofield";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-kcKnE4U+XWYfKw5nZSk+xCtYdagHBMZS3hvukEL8p4M=";
|
||||
hash = "sha256-AqOhagqH0wRKjwcRHFVw0izC0DBv9uY3B5MMDBJoFVE=";
|
||||
};
|
||||
|
||||
webui = buildNpmPackage {
|
||||
|
|
@ -37,7 +37,7 @@ buildGoModule rec {
|
|||
pname = "photofield";
|
||||
inherit version src;
|
||||
|
||||
vendorHash = "sha256-g6jRfPALBAgZVuljq/JiCpea7gZl/8akiabxjRmDsFs=";
|
||||
vendorHash = "sha256-0rrBHkKZfStwzIv5Us/8Db6z3ZSqassCMWQMpScZq7Y=";
|
||||
|
||||
preBuild = ''
|
||||
cp -r ${webui}/share/photofield-ui ui/dist
|
||||
|
|
|
|||
|
|
@ -18,13 +18,13 @@
|
|||
|
||||
buildDotnetModule rec {
|
||||
pname = "OpenTabletDriver";
|
||||
version = "0.6.2.0";
|
||||
version = "0.6.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenTabletDriver";
|
||||
repo = "OpenTabletDriver";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-D1/DGvSBgG8wZMmyJ7QAHDcsMjC1YgSpxmSYzs6ntJg=";
|
||||
hash = "sha256-v41qYNBgOXcFnDOJpQYitql1IZP3p8b3may5Pr04dbg=";
|
||||
};
|
||||
|
||||
debPkg = fetchurl {
|
||||
|
|
|
|||
4
pkgs/tools/X11/opentabletdriver/deps.nix
generated
4
pkgs/tools/X11/opentabletdriver/deps.nix
generated
|
|
@ -19,7 +19,6 @@
|
|||
(fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "16.9.4"; sha256 = "11wiyy3ykgk1sa9amy3lgcsg2v7d1sz59ggw647vx8ibpjxijjpp"; })
|
||||
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; })
|
||||
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.4.1"; sha256 = "0z6d1i6xcf0c00z6rs75rgw4ncs9q2m8amasf6mmbf40fm02ry7g"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0-rc.1.21451.13"; sha256 = "0r6945jq7c2f1wjifq514zvngicndjqfnsjya6hqw0yzah0jr56c"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0-rc.1.21451.13"; sha256 = "11dg16x6g0gssb143qpghxz1s41himvhr7yhjwxs9hacx4ij2dm1"; })
|
||||
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.9.4"; sha256 = "1jdx05zmrqj1s7xfgn3wgy10qb5cl1n1jcj5kz43zvkw1amc7ra4"; })
|
||||
|
|
@ -107,7 +106,7 @@
|
|||
(fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; })
|
||||
(fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.3.0"; sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; })
|
||||
(fetchNuGet { pname = "System.Collections.Specialized"; version = "4.3.0"; sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; })
|
||||
(fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta1.20253.1"; sha256 = "16saf1fm9q80bb624fkqz0ksrwpnbw9617d7xg3jib7a2wgagm2r"; })
|
||||
(fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta4.22272.1"; sha256 = "1iy5hwwgvx911g3yq65p4zsgpy08w4qz9j3h0igcf7yci44vw8yd"; })
|
||||
(fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; })
|
||||
(fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.7.0"; sha256 = "06x1m46ddxj0ng28d7gry9gjkqdg2kp89jyf480g5gznyybbs49z"; })
|
||||
(fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; })
|
||||
|
|
@ -139,7 +138,6 @@
|
|||
(fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; })
|
||||
(fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; })
|
||||
(fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; })
|
||||
(fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; })
|
||||
(fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; })
|
||||
(fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; })
|
||||
(fetchNuGet { pname = "System.Net.Http"; version = "4.3.4"; sha256 = "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl"; })
|
||||
|
|
|
|||
|
|
@ -10,6 +10,9 @@
|
|||
, Security
|
||||
, libiconv
|
||||
, installShellFiles
|
||||
# once eza upstream gets support for setting up a compatibilty symlink for exa, we should change
|
||||
# the handling here from postInstall to passing the required argument to the builder.
|
||||
, exaAlias ? true
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
|
|
@ -43,6 +46,8 @@ rustPlatform.buildRustPackage rec {
|
|||
--bash completions/bash/eza \
|
||||
--fish completions/fish/eza.fish \
|
||||
--zsh completions/zsh/_eza
|
||||
'' + lib.optionalString exaAlias ''
|
||||
ln -s eza $out/bin/exa
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -14,16 +14,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rtx";
|
||||
version = "2023.8.2";
|
||||
version = "2023.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jdxcode";
|
||||
repo = "rtx";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-I5S9HR+syvj5H7xJKhtM7Ja+8wlKL6A01SDb9TjeoS8=";
|
||||
hash = "sha256-TH2JC+Cjw+ed1O33QKGq+lonIKlu6pHuY1jtrZh/FMM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-zbJ+U3PZIGp+BYQbc50+Kgh1KFF7svela3DsyogO/r8=";
|
||||
cargoHash = "sha256-zJVCzVgwU9lR3E61w+71eUd7Au9LmJcbHtgLvzTj7r4=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles pkg-config ];
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
|
|
@ -17,9 +18,11 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoHash = "sha256-rrn+ZTAsFs7UTP4xQL3Cy8G6RG7vwT0wMKnXHHIkB90=";
|
||||
|
||||
checkFlags = [
|
||||
# https://github.com/containers/aardvark-dns/issues/379
|
||||
"--skip=test::test::tests::test_backend_network_scoped_custom_dns_server"
|
||||
patches = [
|
||||
(fetchpatch { # https://github.com/containers/aardvark-dns/issues/379
|
||||
url = "https://github.com/containers/aardvark-dns/commit/b13f0434f410934b515f086334414c6f5f55096e.diff";
|
||||
hash = "sha256-6XReIShEe8+WKc5jK5NzCNMEd4INdOn9Sf8UrQLbj+s=";
|
||||
})
|
||||
];
|
||||
|
||||
passthru.tests = { inherit (nixosTests) podman; };
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xjadeo";
|
||||
version = "0.8.12";
|
||||
version = "0.8.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "x42";
|
||||
repo = "xjadeo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-VPmVoCoVyljzqtbkuT3e6jhXClP708V/6zy1bVoET7c=";
|
||||
sha256 = "sha256-CSq11hFNmo41VXOndBoPxRc9NNUUBtzfWx14DCUFieQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
|
|
|||
|
|
@ -30276,6 +30276,8 @@ with pkgs;
|
|||
gtk = res.gtk2;
|
||||
};
|
||||
|
||||
tau-hydrogen = callPackage ../data/icons/tau-hydrogen { };
|
||||
|
||||
theme-jade1 = callPackage ../data/themes/jade1 { };
|
||||
|
||||
theme-obsidian2 = callPackage ../data/themes/obsidian2 { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue