mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-10 16:45:51 +03:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
536833ef29
@ -7998,6 +7998,12 @@
|
||||
githubId = 488556;
|
||||
name = "Javier Aguirre";
|
||||
};
|
||||
javimerino = {
|
||||
email = "merino.jav@gmail.com";
|
||||
name = "Javi Merino";
|
||||
github = "JaviMerino";
|
||||
githubId = 44926;
|
||||
};
|
||||
jayesh-bhoot = {
|
||||
name = "Jayesh Bhoot";
|
||||
email = "jb@jayeshbhoot.com";
|
||||
@ -14623,7 +14629,7 @@
|
||||
};
|
||||
quantenzitrone = {
|
||||
email = "quantenzitrone@protonmail.com";
|
||||
github = "Quantenzitrone";
|
||||
github = "quantenzitrone";
|
||||
githubId = 74491719;
|
||||
matrix = "@quantenzitrone:matrix.org";
|
||||
name = "quantenzitrone";
|
||||
@ -19387,11 +19393,11 @@
|
||||
name = "Uli Baum";
|
||||
};
|
||||
xfix = {
|
||||
email = "konrad@borowski.pw";
|
||||
email = "kamila@borowska.pw";
|
||||
matrix = "@xfix:matrix.org";
|
||||
github = "xfix";
|
||||
githubId = 1297598;
|
||||
name = "Konrad Borowski";
|
||||
name = "Kamila Borowska";
|
||||
};
|
||||
xfnw = {
|
||||
email = "xfnw+nixos@riseup.net";
|
||||
|
||||
@ -146,6 +146,8 @@ in
|
||||
CapabilityBoundingSet = "";
|
||||
DeviceAllow = if builtins.elem options.device [ "cuda" "auto" ] then [
|
||||
# https://docs.nvidia.com/dgx/pdf/dgx-os-5-user-guide.pdf
|
||||
# CUDA not working? Check DeviceAllow and PrivateDevices first!
|
||||
"/dev/nvidia0"
|
||||
"/dev/nvidia1"
|
||||
"/dev/nvidia2"
|
||||
"/dev/nvidia3"
|
||||
@ -160,7 +162,6 @@ in
|
||||
DevicePolicy = "closed";
|
||||
LockPersonality = true;
|
||||
MemoryDenyWriteExecute = true;
|
||||
PrivateDevices = true;
|
||||
PrivateUsers = true;
|
||||
ProtectHome = true;
|
||||
ProtectHostname = true;
|
||||
|
||||
@ -12,6 +12,7 @@ let
|
||||
ln -s /run/wrappers/bin/perf.plugin $out/libexec/netdata/plugins.d/perf.plugin
|
||||
ln -s /run/wrappers/bin/slabinfo.plugin $out/libexec/netdata/plugins.d/slabinfo.plugin
|
||||
ln -s /run/wrappers/bin/freeipmi.plugin $out/libexec/netdata/plugins.d/freeipmi.plugin
|
||||
ln -s /run/wrappers/bin/systemd-journal.plugin $out/libexec/netdata/plugins.d/systemd-journal.plugin
|
||||
'';
|
||||
|
||||
plugins = [
|
||||
@ -254,7 +255,7 @@ in {
|
||||
# Capabilities
|
||||
CapabilityBoundingSet = [
|
||||
"CAP_DAC_OVERRIDE" # is required for freeipmi and slabinfo plugins
|
||||
"CAP_DAC_READ_SEARCH" # is required for apps plugin
|
||||
"CAP_DAC_READ_SEARCH" # is required for apps and systemd-journal plugin
|
||||
"CAP_FOWNER" # is required for freeipmi plugin
|
||||
"CAP_SETPCAP" # is required for apps, perf and slabinfo plugins
|
||||
"CAP_SYS_ADMIN" # is required for perf plugin
|
||||
@ -263,6 +264,7 @@ in {
|
||||
"CAP_NET_RAW" # is required for fping app
|
||||
"CAP_SYS_CHROOT" # is required for cgroups plugin
|
||||
"CAP_SETUID" # is required for cgroups and cgroups-network plugins
|
||||
"CAP_SYSLOG" # is required for systemd-journal plugin
|
||||
];
|
||||
# Sandboxing
|
||||
ProtectSystem = "full";
|
||||
@ -318,6 +320,14 @@ in {
|
||||
permissions = "u+rx,g+x,o-rwx";
|
||||
};
|
||||
|
||||
"systemd-journal.plugin" = {
|
||||
source = "${cfg.package}/libexec/netdata/plugins.d/systemd-journal.plugin.org";
|
||||
capabilities = "cap_dac_read_search,cap_syslog+ep";
|
||||
owner = cfg.user;
|
||||
group = cfg.group;
|
||||
permissions = "u+rx,g+x,o-rwx";
|
||||
};
|
||||
|
||||
"slabinfo.plugin" = {
|
||||
source = "${cfg.package}/libexec/netdata/plugins.d/slabinfo.plugin.org";
|
||||
capabilities = "cap_dac_override+ep";
|
||||
|
||||
@ -75,7 +75,7 @@ rustPlatform.buildRustPackage rec {
|
||||
description = "Polkadot Node Implementation";
|
||||
homepage = "https://polkadot.network";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ akru andresilva asymmetric FlorianFranzen RaghavSood ];
|
||||
maintainers = with maintainers; [ akru andresilva FlorianFranzen RaghavSood ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "photoflare";
|
||||
version = "1.6.12";
|
||||
version = "1.6.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PhotoFlare";
|
||||
repo = "photoflare";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-UIEHQil7NsdIKQlrNPpf7rxj6O6P1xlz0E7FNYTcdT4=";
|
||||
sha256 = "sha256-0eAuof/FBro2IKxkJ6JHauW6C96VTPxy7QtfPVzPFi4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake qttools ];
|
||||
|
||||
@ -19,13 +19,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "p2pool";
|
||||
version = "3.7";
|
||||
version = "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SChernykh";
|
||||
repo = "p2pool";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WGavhxCGM10LXKvrXT3A2SOMSJRuoA/wAlEj7NFs8Ok=";
|
||||
sha256 = "sha256-e/QXwRVtgl9+BaKbkeztCPfXORhef1HaKBPzKvVPVpM=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -2,16 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kluctl";
|
||||
version = "2.20.8";
|
||||
version = "2.22.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kluctl";
|
||||
repo = "kluctl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-F4vEHzN44+d0EtfJukEq5WVm8aLVWqmT5Xcpa/DBPng=";
|
||||
hash = "sha256-s7ADEWy3wx2hGeJzfXPVSBv+bAOoOQPsF75Sq02T/AI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-x5Zy8H7DzxU+uBCUL6edv8x2LwiIjXl5UrRUMDtUEk8=";
|
||||
subPackages = [ "cmd" ];
|
||||
|
||||
vendorHash = "sha256-EEOVd15f1SK8InSIG+TuVwWibkf+ePJ5AGZpiMD+RaQ=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.version=v${version}" ];
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pachyderm";
|
||||
version = "2.7.2";
|
||||
version = "2.7.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pachyderm";
|
||||
repo = "pachyderm";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+DqkYzRS1H6PGthljAqsmLAnGtKkX4g0drZiRh8b1v4=";
|
||||
hash = "sha256-h0xr94DNmqjpRcas0F+UxQEnCHt5VGU2CRtv+GzJl00=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-q8Cx+J5BjMvO5wuvH5Tc5Oa9rjW7vXvS4DhSVv/E3E4=";
|
||||
vendorHash = "sha256-UBuCAIwx1UOh9bsk3eNlTOozB55RIvuKQ0P1WRkJNaI=";
|
||||
|
||||
subPackages = [ "src/server/cmd/pachctl" ];
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
(if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec {
|
||||
pname = "signalbackup-tools";
|
||||
version = "20231106-1";
|
||||
version = "20231107-1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bepaald";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-alQOYh1I4t1OppHbjsbDK6wc599Z0uDAyQjCtKM72ak=";
|
||||
hash = "sha256-5JF/cU2yz1TDKUSAiZJ5LQfvsGSQtuww543O03gkZ+Y=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -103,14 +103,14 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "telegram-desktop";
|
||||
version = "4.11.3";
|
||||
version = "4.11.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "telegramdesktop";
|
||||
repo = "tdesktop";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-Xjb8um3TA2yIPrCdEV1BJ10keyAqTnlU20ZZ0T3P3ls=";
|
||||
hash = "sha256-NkUm05bR5y5TAI5SL0en029n9903PzarQ6HC2vot27o=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wayvnc";
|
||||
version = "0.7.1";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "any1";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hmlzv1WaT+KucR7RGPC3bKcIdTxPOvK2s17nDucdu7c=";
|
||||
sha256 = "sha256-6at0p1Xc25K5l6sq2uMWpaLVvZMNlWC0ybyZyrIw41I=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@ -21,14 +21,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wpsoffice";
|
||||
version = "11.1.0.11704";
|
||||
version = "11.1.0.11708";
|
||||
|
||||
src = if useChineseVersion then fetchurl {
|
||||
url = "https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2019/${lib.last (lib.splitString "." version)}/wps-office_${version}_amd64.deb";
|
||||
hash = "sha256-ffLSon9FpQZDQ1uapchBUkVaHOXs+H/6kHJLNiWqwiE=";
|
||||
hash = "sha256-GcWRrJ0I1Q6D2VK6YsPmd5Uir5LcIBFJa1amV2sUurk=";
|
||||
} else fetchurl {
|
||||
url = "https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${lib.last (lib.splitString "." version)}/wps-office_${version}.XA_amd64.deb";
|
||||
hash = "sha256-nxpMEWKiNjjEUoVJkhpvjnCuWBCCGjPk+sUlKz+KjMI=";
|
||||
hash = "sha256-J40/wrmMz/r4eb2X/rbxWn04UcSsag7SO3aSqBLFSN4=";
|
||||
};
|
||||
|
||||
unpackCmd = "dpkg -x $src .";
|
||||
|
||||
20
pkgs/applications/version-management/guilt/darwin-fix.patch
Normal file
20
pkgs/applications/version-management/guilt/darwin-fix.patch
Normal file
@ -0,0 +1,20 @@
|
||||
uname -s is used to determine the differences between the command line
|
||||
utilities like stat or awk in linux and darwin. However, in nix, guilt
|
||||
will be using the nix versions of this programs, not the ones
|
||||
installed in the system. Therefore, guilt should use the command-line
|
||||
parameters that the linux forms of these commands expect, even if it
|
||||
is being run on Darwin.
|
||||
|
||||
diff --git a/guilt b/guilt
|
||||
index bf50343..cfc9332 100755
|
||||
--- a/guilt
|
||||
+++ b/guilt
|
||||
@@ -986,7 +986,7 @@ guards_file="$GUILT_DIR/$branch/guards"
|
||||
pager="more"
|
||||
[ ! -z "$PAGER" ] && pager="$PAGER"
|
||||
|
||||
-UNAME_S=`uname -s`
|
||||
+UNAME_S="Linux"
|
||||
|
||||
if [ -r "$GUILT_PATH/os.$UNAME_S" ]; then
|
||||
. "$GUILT_PATH/os.$UNAME_S"
|
||||
92
pkgs/applications/version-management/guilt/default.nix
Normal file
92
pkgs/applications/version-management/guilt/default.nix
Normal file
@ -0,0 +1,92 @@
|
||||
{ asciidoc
|
||||
, docbook_xml_dtd_45
|
||||
, docbook_xsl
|
||||
, fetchFromGitHub
|
||||
, gawk
|
||||
, git
|
||||
, gnused
|
||||
, lib
|
||||
, makeWrapper
|
||||
, openssl
|
||||
, perl
|
||||
, stdenv
|
||||
, xmlto
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "guilt";
|
||||
version = "0.37-rc1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jeffpc";
|
||||
repo = "guilt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7OgRbMGYWtGvrZxKfJe0CkpmU3AUkPebF5NyTsfXeGA=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
patches = [
|
||||
./guilt-help-mandir.patch
|
||||
./darwin-fix.patch
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
asciidoc
|
||||
docbook_xml_dtd_45
|
||||
docbook_xsl
|
||||
makeWrapper
|
||||
perl
|
||||
xmlto
|
||||
];
|
||||
buildInputs = [
|
||||
gawk
|
||||
git
|
||||
gnused
|
||||
] ++ lib.optionals stdenv.isDarwin [ openssl ];
|
||||
makeFlags = [
|
||||
"PREFIX=$(out)"
|
||||
];
|
||||
|
||||
postBuild = ''
|
||||
make -j $NIX_BUILD_CORES doc
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
patchShebangs regression/run-tests regression/*.sh
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
make PREFIX=$out install-doc
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/guilt --prefix PATH : ${lib.makeBinPath buildInputs}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Manage patches like quilt, on top of a git repository";
|
||||
longDescription = ''
|
||||
Andrew Morton originally developed a set of scripts for
|
||||
maintaining kernel patches outside of any SCM tool. Others
|
||||
extended these into a suite called quilt]. The basic idea behind
|
||||
quilt is to maintain patches instead of maintaining source
|
||||
files. Patches can be added, removed or reordered, and they can
|
||||
be refreshed as you fix bugs or update to a new base
|
||||
revision. quilt is very powerful, but it is not integrated with
|
||||
the underlying SCM tools. This makes it difficult to visualize
|
||||
your changes.
|
||||
|
||||
Guilt allows one to use quilt functionality on top of a Git
|
||||
repository. Changes are maintained as patches which are
|
||||
committed into Git. Commits can be removed or reordered, and the
|
||||
underlying patch can be refreshed based on changes made in the
|
||||
working directory. The patch directory can also be placed under
|
||||
revision control, so you can have a separate history of changes
|
||||
made to your patches.
|
||||
'';
|
||||
homepage = "https://github.com/jeffpc/guilt";
|
||||
maintainers = with lib.maintainers; [ javimerino ];
|
||||
license = [ licenses.gpl2 ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
nixpkgs' post-installation fixup moves the pages to share/man. Tell guilt-help so that it can find them.
|
||||
|
||||
diff --git a/guilt-help b/guilt-help
|
||||
index 93442a3..b29e059 100755
|
||||
--- a/guilt-help
|
||||
+++ b/guilt-help
|
||||
@@ -34,7 +34,7 @@ case $# in
|
||||
;;
|
||||
esac
|
||||
|
||||
-MANDIR=`dirname $0`/../man
|
||||
+MANDIR=`dirname $0`/../share/man
|
||||
MANDIR=`(cd "$MANDIR"; pwd)`
|
||||
exec man -M "$MANDIR" "$page"
|
||||
|
||||
@ -47,7 +47,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
gnome.adwaita-icon-theme
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
pythonPath = with python3.pkgs; [
|
||||
pygobject3
|
||||
pycairo
|
||||
];
|
||||
|
||||
73
pkgs/by-name/op/open-english-wordnet/package.nix
Normal file
73
pkgs/by-name/op/open-english-wordnet/package.nix
Normal file
@ -0,0 +1,73 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, gzip
|
||||
, python3
|
||||
, stdenvNoCC
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (self: {
|
||||
pname = "open-english-wordnet";
|
||||
version = "2022";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "globalwordnet";
|
||||
repo = "english-wordnet";
|
||||
rev = "${self.version}-edition";
|
||||
hash = "sha256-a1fWIp39uuJZL1aFX/r+ttLB1+kwh/XPHwphgENTQ5M=";
|
||||
};
|
||||
|
||||
patches = lib.mapAttrsToList (rev: hash: fetchpatch {
|
||||
url = "https://github.com/globalwordnet/english-wordnet/commit/${rev}.patch";
|
||||
inherit hash;
|
||||
}) {
|
||||
# Upstream commit bumping the version number, accidentally ommited from the tagged release
|
||||
"bc07902f8995b62c70f01a282b23f40f30630540" = "sha256-1e4MG/k86g3OFUhiShCCbNXnvDKrYFr1KlGVsGl++KI=";
|
||||
# PR #982, “merge.py: Make result independent of filesystem order”
|
||||
"6da46a48dd76a48ad9ff563e6c807b8271fc83cd" = "sha256-QkkJH7NVGy/IbeSWkotU80IGF4esz0b8mIL9soHdQtQ=";
|
||||
};
|
||||
|
||||
# TODO(nicoo): make compression optional?
|
||||
nativeBuildInputs = [
|
||||
gzip
|
||||
(python3.withPackages (p: with p; [ pyyaml ]))
|
||||
];
|
||||
|
||||
# TODO(nicoo): generate LMF and WNDB versions with separate outputs
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
echo Generating wn.xml
|
||||
python scripts/from-yaml.py
|
||||
python scripts/merge.py
|
||||
|
||||
echo Compressing
|
||||
gzip --best --no-name --stdout ./wn.xml > 'oewn:${self.version}.xml.gz'
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dt $out/share/wordnet 'oewn:${self.version}.xml.gz'
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Lexical network of the English language";
|
||||
longDescription = ''
|
||||
Open English WordNet is a lexical network of the English language grouping
|
||||
words into synsets and linking them according to relationships such as
|
||||
hypernymy, antonymy and meronymy. It is intended to be used in natural
|
||||
language processing applications and provides deep lexical information
|
||||
about the English language as a graph.
|
||||
|
||||
Open English WordNet is a fork of the Princeton Wordnet developed under an
|
||||
open source methodology.
|
||||
'';
|
||||
homepage = "https://en-word.net/";
|
||||
license = licenses.cc-by-40;
|
||||
maintainers = with maintainers; [ nicoo ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
})
|
||||
@ -40,15 +40,15 @@
|
||||
, i3Support ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "polybar";
|
||||
version = "3.6.3";
|
||||
version = "3.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-FKkPSAEMzptnjJq3xTk+fpD8XjASQ3smX5imstDyLNE=";
|
||||
owner = "polybar";
|
||||
repo = "polybar";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-Z1rL9WvEZHr5M03s9KCJ6O6rNuaK7PpwUDaatYuCocI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@ -113,4 +113,4 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with maintainers; [ afldcr Br1ght0ne fortuneteller2k ckie ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "sketchybar-app-font";
|
||||
version = "1.0.17";
|
||||
version = "1.0.20";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/kvndrsslr/sketchybar-app-font/releases/download/v${finalAttrs.version}/sketchybar-app-font.ttf";
|
||||
hash = "sha256-sDMasHVcITTSUP9B87w4I7IZ44tYmabNNWl+kE3dUoE=";
|
||||
hash = "sha256-pf3SSxzlNIdbXXHfRauFCnrVUMOd5J9sSUE9MsfWrwo=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gtk4-layer-shell";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
outputBin = "devdoc";
|
||||
@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "wmww";
|
||||
repo = "gtk4-layer-shell";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-MG/YW4AhC2joUX93Y/pzV4s8TrCo5Z/I3hAT70jW8dw=";
|
||||
hash = "sha256-decjPkFkYy7kIjyozsB7BEmw33wzq1EQyIBrxO36984=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@ -16,14 +16,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.7.25";
|
||||
version = "0.7.26";
|
||||
pname = "libsolv";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openSUSE";
|
||||
repo = "libsolv";
|
||||
rev = version;
|
||||
sha256 = "sha256-OSYfv8dTyoa2f1T/zCEruKczickP5jS05xjYLQQiFaY=";
|
||||
sha256 = "sha256-NGybpl/Fd46pmSYMNGocStQQCXr5pX34PCmN/hFKeyk=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "neatvnc";
|
||||
version = "0.7.0";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "any1";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-R+PvD7E/z+Gc7h2y0pUYaCkzfgpxzwToOr4pKSrOnxU=";
|
||||
sha256 = "sha256-bRlz5RW+NUSTgzjRM9alZjSrzmF8/7p4IIXqK/HEcJo=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ailment";
|
||||
version = "9.2.75";
|
||||
version = "9.2.76";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-k3CX0ntqbKBL9xLTPifwjTqwYEDLlNdEHlIPiokkkPA=";
|
||||
hash = "sha256-RIYGWPvQ2n+NgZHw2pGEvgWAtbpb/rdyb6/K4JClRxM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "angr";
|
||||
version = "9.2.75";
|
||||
version = "9.2.76";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@ -41,7 +41,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = "angr";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-tDOO0wn5gYxK1CuMWhu/i4Xk3CfcuhPvxsG0LI7BlA4=";
|
||||
hash = "sha256-B3oYh0okbIeEvBjBHvY29QTqPyR2TTzLmz6fMsIRcs0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "archinfo";
|
||||
version = "9.2.75";
|
||||
version = "9.2.76";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-t8kxGwLEVVp1WMFA+yFLMAPJBT46m0ZFG2lhWMxoolw=";
|
||||
hash = "sha256-g1qlcaSByXhF+6ffxwbV/0tXFdmLySH3TcDuok4y6xw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "claripy";
|
||||
version = "9.2.75";
|
||||
version = "9.2.76";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = "claripy";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ErPk93hDKV1QyGOjxYNaLzNuq6Od374G8qOxWiJwpuo=";
|
||||
hash = "sha256-BwhM5J+20ZvP0d+9TAqy0AgRuPU6XoLKgM88WJdf3Qg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -16,14 +16,14 @@
|
||||
|
||||
let
|
||||
# The binaries are following the argr projects release cycle
|
||||
version = "9.2.75";
|
||||
version = "9.2.76";
|
||||
|
||||
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
|
||||
binaries = fetchFromGitHub {
|
||||
owner = "angr";
|
||||
repo = "binaries";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-xiYkXC3/JPgXJ23ISl0LVrdm368hDPCG5NqQM6lDXf4=";
|
||||
hash = "sha256-01Y4UKTkaO6bYtVTvv4KFzkEdj4qKiWKaC80/iKa/Eg=";
|
||||
};
|
||||
|
||||
in
|
||||
@ -38,7 +38,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = "cle";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-F2kgEffFWK7i1BgU5ulsNJitGcGcEziYRU+y86wKgXU=";
|
||||
hash = "sha256-uMT9LvDkXl3SueR80pgGJRkWbymDRmGEn8HV93K/VNc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -4,14 +4,17 @@
|
||||
, jaxlib
|
||||
, pythonRelaxDepsHook
|
||||
, setuptools-scm
|
||||
, cloudpickle
|
||||
, jax
|
||||
, matplotlib
|
||||
, msgpack
|
||||
, numpy
|
||||
, optax
|
||||
, pyyaml
|
||||
, rich
|
||||
, tensorstore
|
||||
, typing-extensions
|
||||
, matplotlib
|
||||
, cloudpickle
|
||||
, einops
|
||||
, keras
|
||||
, pytest-xdist
|
||||
, pytestCheckHook
|
||||
@ -37,24 +40,27 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cloudpickle
|
||||
jax
|
||||
matplotlib
|
||||
msgpack
|
||||
numpy
|
||||
optax
|
||||
pyyaml
|
||||
rich
|
||||
tensorstore
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
# See https://github.com/google/flax/pull/2882.
|
||||
pythonRemoveDeps = [ "orbax" ];
|
||||
passthru.optional-dependencies = {
|
||||
all = [ matplotlib ];
|
||||
};
|
||||
|
||||
pythonImportsCheck = [
|
||||
"flax"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
cloudpickle
|
||||
einops
|
||||
keras
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
@ -85,22 +91,6 @@ buildPythonPackage rec {
|
||||
"tests/checkpoints_test.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# See https://github.com/google/flax/issues/2554.
|
||||
"test_async_save_checkpoints"
|
||||
"test_jax_array0"
|
||||
"test_jax_array1"
|
||||
"test_keep0"
|
||||
"test_keep1"
|
||||
"test_optimized_lstm_cell_matches_regular"
|
||||
"test_overwrite_checkpoints"
|
||||
"test_save_restore_checkpoints_target_empty"
|
||||
"test_save_restore_checkpoints_target_none"
|
||||
"test_save_restore_checkpoints_target_singular"
|
||||
"test_save_restore_checkpoints_w_float_steps"
|
||||
"test_save_restore_checkpoints"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Neural network library for JAX";
|
||||
homepage = "https://github.com/google/flax";
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "folium";
|
||||
version = "0.14.0";
|
||||
version = "0.15.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "python-visualization";
|
||||
repo = "folium";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-zxLFj5AeTVAxE0En7ZlbBdJEm3WrcPv23MgOhyfNi14=";
|
||||
hash = "sha256-xaz9oelkyS8lWECCmKs8P3mHB3Usv0KMUoh/K7rBnAs=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "formencode";
|
||||
version = "2.0.1";
|
||||
version = "2.1.0";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "FormEncode";
|
||||
inherit version;
|
||||
sha256 = "8f2974112c2557839d5bae8b76490104c03830785d923abbdef148bf3f710035";
|
||||
sha256 = "sha256-63TSIweKKM8BX6iJZsbjTy0Y11EnMY1lwUS+2a/EJj8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -17,14 +17,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nilearn";
|
||||
version = "0.10.1";
|
||||
version = "0.10.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-koo2Tn7XfRXQK38icZfqfHj0Ty/ngP61VdbXz5Iy+EY=";
|
||||
hash = "sha256-A+9Npy0a6HsuPyi3cdx+BUZKoXliblfDAFlWJahlQnM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ hatch-vcs ];
|
||||
|
||||
@ -18,11 +18,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "orange-canvas-core";
|
||||
version = "0.1.33";
|
||||
version = "0.1.35";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-w3krij7+CtJl1XoJz3RRAAp2aKqMCQg/PBh5erf/Phs=";
|
||||
hash = "sha256-xLCwjeNDx9RqxlNkIWMo0Pcrg7akGuu4Rv9oRDgOK18=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -44,7 +44,7 @@
|
||||
let
|
||||
self = buildPythonPackage rec {
|
||||
pname = "orange3";
|
||||
version = "3.36.1";
|
||||
version = "3.36.2";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -52,7 +52,7 @@ let
|
||||
owner = "biolab";
|
||||
repo = "orange3";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-O5ZN5O1vMkqiv83Q5UoaDefGnqVnDLPmYLLG20cdajk=";
|
||||
hash = "sha256-v9lk5vGhBaR2PHZ+Jq0hy1WaCsbeLe+vZlTaHBkfacU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydrawise";
|
||||
version = "2023.10.0";
|
||||
version = "2023.11.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "dknowles2";
|
||||
repo = "pydrawise";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-CSjYLiOvnm1kFp4DL3w/YmAsDcbaCfLfGT0xUZy+GZ0=";
|
||||
hash = "sha256-gKOyTvdETGzKlpU67UKaHYTIvnAX9znHIynP3BiVbt4=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, buildPythonPackage
|
||||
, isPyPy
|
||||
, pkgs
|
||||
, python
|
||||
, six
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -31,31 +31,14 @@ buildPythonPackage rec {
|
||||
tests/test__ped_ped.py
|
||||
'';
|
||||
|
||||
patches = [
|
||||
./fix-test-pythonpath.patch
|
||||
(fetchpatch {
|
||||
url = "https://github.com/dcantrell/pyparted/commit/07ba882d04fa2099b53d41370416b97957d2abcb.patch";
|
||||
hash = "sha256-yYfLdy+TOKfN3gtTMgOWPebPTRYyaOYh/yFTowCbdjg=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/dcantrell/pyparted/commit/a01b4eeecf63b0580c192c7c2db7a5c406a7ad6d.patch";
|
||||
hash = "sha256-M/8hYiKUBzaTOxPYDFK5BAvCm6WJGx+693qwj3HzdRA=";
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
PATH="${pkgs.parted}/sbin:$PATH"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkgs.pkg-config ];
|
||||
nativeCheckInputs = [ six ];
|
||||
nativeCheckInputs = [ six pytestCheckHook ];
|
||||
propagatedBuildInputs = [ pkgs.parted ];
|
||||
|
||||
checkPhase = ''
|
||||
patchShebangs Makefile
|
||||
make test PYTHON=${python.executable}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/dcantrell/pyparted/";
|
||||
description = "Python interface for libparted";
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
diff -ur a/Makefile b/Makefile
|
||||
--- a/Makefile 1980-01-02 00:00:00.000000000 +0100
|
||||
+++ b/Makefile 2020-02-18 20:04:14.068243263 +0100
|
||||
@@ -39,19 +39,19 @@
|
||||
@$(PYTHON) setup.py build
|
||||
|
||||
test: all
|
||||
- @env PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src \
|
||||
+ @env PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src:$$PYTHONPATH \
|
||||
$(PYTHON) -m unittest discover -v
|
||||
|
||||
coverage: all
|
||||
@echo "*** Running unittests with $(COVERAGE) for $(PYTHON) ***"
|
||||
- @env PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src \
|
||||
+ @env PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src:$$PYTHONPATH \
|
||||
$(COVERAGE) run --branch -m unittest discover -v
|
||||
$(COVERAGE) report --include="build/lib.*/parted/*" --show-missing
|
||||
$(COVERAGE) report --include="build/lib.*/parted/*" > coverage-report.log
|
||||
|
||||
check: clean
|
||||
env PYTHON=python3 $(MAKE) ; \
|
||||
- env PYTHON=python3 PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src \
|
||||
+ env PYTHON=python3 PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src:$$PYTHONPATH \
|
||||
tests/pylint/runpylint.py
|
||||
|
||||
dist:
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvex";
|
||||
version = "9.2.75";
|
||||
version = "9.2.76";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-8P8xOb4P1JsbPZya8s1Bl16VsYtHQdAD05sc8EAcEpM=";
|
||||
hash = "sha256-JlwqxKJaJ3sk2mROUOaF0N5d4V7LM43VqEXnuSO45BY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -27,17 +27,17 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.19.0";
|
||||
pname = "tensorflow_probability";
|
||||
version = "0.21.0";
|
||||
pname = "tensorflow-probability";
|
||||
|
||||
# first build all binaries and generate setup.py using bazel
|
||||
bazel-wheel = buildBazelPackage {
|
||||
name = "${pname}-${version}-py2.py3-none-any.whl";
|
||||
name = "tensorflow_probability-${version}-py2.py3-none-any.whl";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tensorflow";
|
||||
repo = "probability";
|
||||
rev = "v" + version;
|
||||
hash = "sha256-ZkQ20Qt/RF/leVP6Kc38tGgPz+C6lEuHvoL+s97oksE=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-DsJd1E5n86xNS7Ci0DXxoUxQ9jH8OwTZq2UuLlQtMUU=";
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
# needed to create the output wheel in installPhase
|
||||
@ -54,8 +54,7 @@ let
|
||||
LIBTOOL = lib.optionalString stdenv.isDarwin "${cctools}/bin/libtool";
|
||||
|
||||
fetchAttrs = {
|
||||
# FIXME: tensorflow is currently marked as broken, update the hash once it's fixed
|
||||
sha256 = "sha256-0ChXujA2XpnkybrraN3FIJA/QkxLCfX97id2jMFzFJk=";
|
||||
sha256 = "sha256-1iO/eXz1wvSIRTmGuGZDF9VeDVTiWYnjw0Cby4n/6HM=";
|
||||
};
|
||||
|
||||
buildAttrs = {
|
||||
@ -117,6 +116,6 @@ in buildPythonPackage {
|
||||
description = "Library for probabilistic reasoning and statistical analysis";
|
||||
homepage = "https://www.tensorflow.org/probability/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; []; # This package is maintainerless.
|
||||
maintainers = with maintainers; [ GaetanLepage ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tlds";
|
||||
version = "2023102600";
|
||||
version = "2023110300";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kichik";
|
||||
repo = "tlds";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ncbgR/syMChIL0/FGLOHxHJMUzH0G+rZX9aCXun7yc4=";
|
||||
hash = "sha256-rmKqY7Z4bBR4r+w4gH04g0Xm9N7QeMVcuFR3pB/pOQY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "wikitextparser";
|
||||
version = "0.54.0";
|
||||
version = "0.55.5";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "5j9";
|
||||
repo = "wikitextparser";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AGQfjUNxeleuTS200QMdZS8CSD2t4ah5NMm9TIYjVHk=";
|
||||
hash = "sha256-cmzyRbq4tCbuyrNnT0UYxoxuwXrFkIcWdrogSTfxSys=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -43,14 +43,14 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "godot";
|
||||
version = "4.1.1";
|
||||
commitHash = "bd6af8e0ea69167dd0627f3bd54f9105bda0f8b5";
|
||||
version = "4.1.3-stable";
|
||||
commitHash = "fc79201851a16215f9554884aa242ed957801b10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "godotengine";
|
||||
repo = "godot";
|
||||
rev = commitHash;
|
||||
hash = "sha256-0CErsMTrBC/zYcabAtjYn8BWAZ1HxgozKdgiqdsn3q8=";
|
||||
hash = "sha256-z5JRPhdEO20AodS12MApgur0BMHGToUjo2r2eI77nNc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -8,9 +8,9 @@ in
|
||||
|
||||
buildDotnetGlobalTool rec {
|
||||
pname = "csharp-ls";
|
||||
version = "0.8.0";
|
||||
version = "0.10.0";
|
||||
|
||||
nugetSha256 = "sha256-F3N6ESE/VmQA5sOMm3eqSkhSNVCCsnAXTCC+McsAnQw=";
|
||||
nugetSha256 = "sha256-1t8U2Q4lIlj2QwbnevAMMGcqtpPh5zk0Bd7EHa7qvCI=";
|
||||
|
||||
dotnet-sdk = sdk_7_0;
|
||||
dotnet-runtime = sdk_7_0;
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opengrok";
|
||||
version = "1.12.15";
|
||||
version = "1.12.21";
|
||||
|
||||
# binary distribution
|
||||
src = fetchurl {
|
||||
url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-AEKzhNSNJOOyK/fiAepqios7xoexAi4M4zbMTPdyyeA=";
|
||||
hash = "sha256-SjA5J9fILU/FBNXRS/cvGZVWAK2qqOyMsd6wC/CJYaE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "nest-cli";
|
||||
version = "10.1.17";
|
||||
version = "10.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nestjs";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-03GDrKjlvl3O3kJlbbyDYxtlfwLkZbvxC9gvP534zSY=";
|
||||
hash = "sha256-vnF+ES6RK4iiIJsWUV57DqoLischh+1MlmlK46Z6USY=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-nZ9ant2c+15bRBikFcKZW8aiFqI3WC6hktSiBfnma/I=";
|
||||
npmDepsHash = "sha256-9yd+k+HpARM63/esW+av0zfcuAVsp9Lkfp6hmUQO5Yg=";
|
||||
|
||||
env = {
|
||||
npm_config_build_from_source = true;
|
||||
@ -37,6 +37,5 @@ buildNpmPackage rec {
|
||||
license = licenses.mit;
|
||||
mainProgram = "nest";
|
||||
maintainers = [ maintainers.ehllie ];
|
||||
broken = stdenv.isDarwin; # https://github.com/nestjs/nest-cli/pull/2281
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "oh-my-posh";
|
||||
version = "18.11.0";
|
||||
version = "18.22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jandedobbeleer";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-sUP2xBrh7JpAaHhiMm6AilgEUNIfK1U2hbloUJYHn6c=";
|
||||
hash = "sha256-lQqDXiT+DRLmU+4DBvj2Gnd1RjaRgMorhXo1BmJLQqU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-i5K7f70MevNJcRsP2P9rsMZRpKPVWsTx9M4t2AoEJew=";
|
||||
vendorHash = "sha256-/SVS0Vd6GvKEAzRobxaTwJ+uy8dwCINBOYzQN65ppAs=";
|
||||
|
||||
sourceRoot = "${src.name}/src";
|
||||
|
||||
|
||||
@ -6,6 +6,15 @@ let
|
||||
|
||||
in
|
||||
(haskell.lib.compose.overrideCabal (drv: {
|
||||
# pandoc-cli's pandoc executable report the libraries version via --version, match that,
|
||||
inherit (static.scope.pandoc) version;
|
||||
# but prevent haskellPackages.mkDerivation from recomputing the src tarball based on that.
|
||||
inherit (static) src;
|
||||
# Make it possible to recover the cli version if necessary.
|
||||
passthru = drv.passthru or {} // {
|
||||
cliVersion = static.version;
|
||||
};
|
||||
|
||||
configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"];
|
||||
buildDepends = drv.buildDepends or [] ++ [haskellPackages.file-embed];
|
||||
buildTools = (drv.buildTools or []) ++ [ removeReferencesTo ];
|
||||
|
||||
@ -2,27 +2,20 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-readme";
|
||||
version = "3.2.0";
|
||||
version = "3.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "livioribeiro";
|
||||
owner = "webern";
|
||||
repo = pname;
|
||||
# Git tag is missing, see upstream issue:
|
||||
# https://github.com/livioribeiro/cargo-readme/issues/61
|
||||
rev = "cf66017c0120ae198210ebaf58a0be6a78372974";
|
||||
sha256 = "sha256-/ufHHM13L83M3UYi6mjdhIjgXx7bZgzvR/X02Zsx7Fw=";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FFWHADATEfvZvxGwdkj+eTVoq7pnPuoUAhMGTokUkMs=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-Isd05qOuVBNfXOI5qsaDOhjF7QIKAG5xrZsBFK2PpQQ=";
|
||||
cargoSha256 = "sha256-OEArMqOiT+PZ+zMRt9h0EzeP7ikFuOYR8mFGtm+xCkQ=";
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Fixup warning thrown at build when running test-suite
|
||||
# unused return, see upstream PR:
|
||||
# https://github.com/livioribeiro/cargo-readme/pull/62
|
||||
url = "https://github.com/livioribeiro/cargo-readme/commit/060f2daaa2b2cf981bf490dc36bcc6527545ea03.patch";
|
||||
sha256 = "sha256-wlAIgTI9OqtA/Jnswoqp7iOj+1zjrUZA7JpHUiF/n+s=";
|
||||
})
|
||||
# disable doc tests
|
||||
cargoTestFlags = [
|
||||
"--bins" "--lib"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "squawk";
|
||||
version = "0.24.1";
|
||||
version = "0.24.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sbdchd";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-XQU/1uAas1bT7FSgBzJSPRe4ET9ysjpFGhV+qi23AAY=";
|
||||
hash = "sha256-gFJaW7Mb3HKN6D/qnpfNQVxBOKbxIBZOVWJ63wiGoeU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Qg2VcsAqXpYamO35t/lvlXUPTdjAqZ4z3Nm0hYdhjEM=";
|
||||
cargoHash = "sha256-a1kAVIyGnVF3IWkDQbmV3L9cfY+1564RW6eWfBHbTZ8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@ -16,7 +16,11 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-em3Y56saB7K3Wr31Y0boc38xGb57gdveN0Cstgy8y20=";
|
||||
};
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error -Wno-error=sign-compare";
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
"-Wno-error"
|
||||
"-Wno-error=discarded-qualifiers" # for Linux 4.19 compatibility
|
||||
"-Wno-error=sign-compare"
|
||||
];
|
||||
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
|
||||
@ -43,6 +47,6 @@ stdenv.mkDerivation rec {
|
||||
platforms = platforms.linux;
|
||||
license = with licenses; [ lgpl21Only gpl2Only ];
|
||||
homepage = "https://www.displaylink.com/";
|
||||
broken = kernel.kernelOlder "4.19";
|
||||
broken = kernel.kernelOlder "4.19" || kernel.kernelAtLeast "6.6";
|
||||
};
|
||||
}
|
||||
|
||||
@ -52,21 +52,31 @@
|
||||
"6.1": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-6.1.60-hardened1.patch",
|
||||
"sha256": "1k0807jpjljf2fcjxnmvd9rb8y8xqj21x2qn4yd72c58jkii52qq",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.60-hardened1/linux-hardened-6.1.60-hardened1.patch"
|
||||
"name": "linux-hardened-6.1.61-hardened1.patch",
|
||||
"sha256": "0d9zhh32dx1q828q50kmznmsa6yinppbklhgg8ix7b7k23857ha6",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.61-hardened1/linux-hardened-6.1.61-hardened1.patch"
|
||||
},
|
||||
"sha256": "02pvymr1dgd36mp7yikxqqv0sfrpwi1grnvxvx6jbbx6wmx0wljq",
|
||||
"version": "6.1.60"
|
||||
"sha256": "1kk4d7ph6pvgdrdmaklg15wf58nw9n7yqgkag7jdvqinzh99sb5d",
|
||||
"version": "6.1.61"
|
||||
},
|
||||
"6.4": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-6.4.16-hardened1.patch",
|
||||
"sha256": "10lydnnhhq9ynng1gfaqh1mncsb0dmr27zzcbygs1xigy2bl70n9",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.4.16-hardened1/linux-hardened-6.4.16-hardened1.patch"
|
||||
},
|
||||
"sha256": "0zgj1z97jyx7wf12zrnlcp0mj4cl43ais9qsy6dh1jwylf2fq9ln",
|
||||
"version": "6.4.16"
|
||||
},
|
||||
"6.5": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-6.5.8-hardened1.patch",
|
||||
"sha256": "09dvz9massj8rwrwvr2n1y2v8k4c3ic8gfrp049p7g0npzag2cwl",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.5.8-hardened1/linux-hardened-6.5.8-hardened1.patch"
|
||||
"name": "linux-hardened-6.5.10-hardened1.patch",
|
||||
"sha256": "0p2lj7ryiizr1sxvm2kgds3l8sg9fns35y2fcyqq61lg7ymzj1fi",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.5.10-hardened1/linux-hardened-6.5.10-hardened1.patch"
|
||||
},
|
||||
"sha256": "05zpdh4dxaadq52hlczdmwb7bsqfm3q45v7bdqbsmplhgn4wm719",
|
||||
"version": "6.5.8"
|
||||
"sha256": "12sswml8jvabv6bqx35lg3jj6gq8jjk365rghjngdy5d0j34jpx1",
|
||||
"version": "6.5.10"
|
||||
}
|
||||
}
|
||||
|
||||
@ -4,12 +4,12 @@
|
||||
"hash": "sha256:1zzd32ya4hldfywicgpnc2cyd412s7q9c31qvxx2nl9nkx11xsxv"
|
||||
},
|
||||
"6.5": {
|
||||
"version": "6.5.10",
|
||||
"hash": "sha256:12sswml8jvabv6bqx35lg3jj6gq8jjk365rghjngdy5d0j34jpx1"
|
||||
"version": "6.5.11",
|
||||
"hash": "sha256:06dmb4hbwrms0lp4axphwgj8wbnzsym70sx55lxr501b53wlmqif"
|
||||
},
|
||||
"6.1": {
|
||||
"version": "6.1.61",
|
||||
"hash": "sha256:1kk4d7ph6pvgdrdmaklg15wf58nw9n7yqgkag7jdvqinzh99sb5d"
|
||||
"version": "6.1.62",
|
||||
"hash": "sha256:1v453q4sf0j8708ivs1zmdf645hgimqvxfc8xz7czgnnmipn3zdr"
|
||||
},
|
||||
"5.15": {
|
||||
"version": "5.15.137",
|
||||
@ -20,19 +20,19 @@
|
||||
"hash": "sha256:1h944syk7n6c4j1djlx19n77alzwbxcdza77c9ykicgfynhpgsm0"
|
||||
},
|
||||
"5.4": {
|
||||
"version": "5.4.259",
|
||||
"hash": "sha256:195v4fidavzm637glj6580006mrcaygnbj4za874imb62bxf9rpz"
|
||||
"version": "5.4.260",
|
||||
"hash": "sha256:1zpbaipd2j3idj8h9iznlj0ywcq5nkhwj707a1f9ixf82h3q4c4q"
|
||||
},
|
||||
"4.19": {
|
||||
"version": "4.19.297",
|
||||
"hash": "sha256:0c9xxqgv2i36hrr06dwz7f3idc04xpv0a5pxg08xdh03cnyf12cx"
|
||||
"version": "4.19.298",
|
||||
"hash": "sha256:0mhgq6hdcls1af7nj999x1mds5b37s7vwin8nsb4q0lnx2y1da4x"
|
||||
},
|
||||
"4.14": {
|
||||
"version": "4.14.328",
|
||||
"hash": "sha256:1igcpvnhwwrczfdsafmszvi0456k7f6j4cgpfw6v6afw09p95d8x"
|
||||
"version": "4.14.329",
|
||||
"hash": "sha256:1dvb4xf0b7snabznl7bg7gga7ffdmywy8vr8q65pzl9yf6fnhdny"
|
||||
},
|
||||
"6.6": {
|
||||
"version": "6.6",
|
||||
"hash": "sha256:1l2nisx9lf2vdgkq910n5ldbi8z25ky1zvl67zgwg2nxcdna09nr"
|
||||
"version": "6.6.1",
|
||||
"hash": "sha256:0d42b1hbvv9w3y3q4wydr6il0g5a823n54a06p4p5vcpgkadf7ns"
|
||||
}
|
||||
}
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nfs-ganesha";
|
||||
version = "5.6";
|
||||
version = "5.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nfs-ganesha";
|
||||
repo = "nfs-ganesha";
|
||||
rev = "V${version}";
|
||||
sha256 = "sha256-QXs42HY2h/s2cT1pG2QjSV2HVAjpo2WSymXEYGgF8rI=";
|
||||
sha256 = "sha256-4GYte9kPUR4kFHrUzHXtiMGbuRhZ+4iw1hmqi+geljc=";
|
||||
};
|
||||
|
||||
preConfigure = "cd src";
|
||||
|
||||
@ -15,11 +15,11 @@ let
|
||||
# var/www/onlyoffice/documentserver/server/DocService/docservice
|
||||
onlyoffice-documentserver = stdenv.mkDerivation rec {
|
||||
pname = "onlyoffice-documentserver";
|
||||
version = "7.4.1";
|
||||
version = "7.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ONLYOFFICE/DocumentServer/releases/download/v${lib.concatStringsSep "." (lib.take 3 (lib.splitVersion version))}/onlyoffice-documentserver_amd64.deb";
|
||||
sha256 = "sha256-60S8M1Y9BxuMxXGxEaxW82Va5lSnZZPfQnPq2ivTXdU=";
|
||||
sha256 = "sha256-0rtxKSVIyCzYnhRneLOEu1e1qtAO6dGBAUr/oKq95Hw=";
|
||||
};
|
||||
|
||||
preferLocalBuild = true;
|
||||
|
||||
@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
|
||||
owner = "fuyufjh";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-gTyjj7NND5IYtnXhc454cWSzhAE+DwfPRGEWrHH+GNM=";
|
||||
hash = "sha256-oP0yIdYytXSsbZ2pNaZ8Rrak1qJsudTe/oP6dGncGUM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-yKHAZpELuUD7wlM3Mi7XvxbKgdU1QxD9hsvIFcj3twE=";
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gping";
|
||||
version = "1.14.0";
|
||||
version = "1.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "orf";
|
||||
repo = "gping";
|
||||
rev = "gping-v${version}";
|
||||
hash = "sha256-ReP+s2p0X39LVvl3/QF7fsYkU+OvsQyMhyuH8v4HuVU=";
|
||||
hash = "sha256-22Nio6yfkL9HWNrI+kk5dGfojTtB/h0sizCWH9w9so8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-FTiNxCoEe/iMz68F1CpJHypgrhn4WwwWowuN9I1rl6E=";
|
||||
cargoHash = "sha256-YfvcCnFXDoZXp/Aug0jVQkilsvSzS+JF90U0QvVFksE=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, callPackage, rustPlatform, fetchFromGitHub, nixosTests
|
||||
, pkg-config, openssl
|
||||
, libiconv, Security, CoreServices
|
||||
, libiconv, Security, CoreServices, SystemConfiguration
|
||||
, dbBackend ? "sqlite", libmysqlclient, postgresql }:
|
||||
|
||||
let
|
||||
@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = with lib; [ openssl ]
|
||||
++ optionals stdenv.isDarwin [ libiconv Security CoreServices ]
|
||||
++ optionals stdenv.isDarwin [ libiconv Security CoreServices SystemConfiguration ]
|
||||
++ optional (dbBackend == "mysql") libmysqlclient
|
||||
++ optional (dbBackend == "postgresql") postgresql;
|
||||
|
||||
|
||||
@ -13,12 +13,13 @@
|
||||
, withConnPubSub ? false, google-cloud-cpp, grpc
|
||||
, withConnPrometheus ? false, snappy
|
||||
, withSsl ? true, openssl
|
||||
, withSystemdJournal ? (!stdenv.isDarwin), systemd
|
||||
, withDebug ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
# Don't forget to update go.d.plugin.nix as well
|
||||
version = "1.43.0";
|
||||
version = "1.43.2";
|
||||
pname = "netdata";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@ -26,8 +27,8 @@ stdenv.mkDerivation rec {
|
||||
repo = "netdata";
|
||||
rev = "v${version}";
|
||||
hash = if withCloudUi
|
||||
then "sha256-hrwuJLO9/K5QT3j8d5RYHcpBHChpKvwajaCoUfikw88="
|
||||
else "sha256-+bX6pVpW6N1ms04k63sJg0E9XMOai5K9IjEQPeVCzs8=";
|
||||
then "sha256-ZhSuU2VTJPFJ3ja5eHx5uTuR19LleoID8Efr9FTyg74="
|
||||
else "sha256-t2awo118mYbuoNiKiAxM5xpRmQSha+/NR5G+shsotek=";
|
||||
fetchSubmodules = true;
|
||||
|
||||
# Remove v2 dashboard distributed under NCUL1. Make sure an empty
|
||||
@ -52,6 +53,7 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optionals withConnPubSub [ google-cloud-cpp grpc ]
|
||||
++ lib.optionals withConnPrometheus [ snappy ]
|
||||
++ lib.optionals (withCloud || withConnPrometheus) [ protobuf ]
|
||||
++ lib.optionals withSystemdJournal [ systemd ]
|
||||
++ lib.optionals withSsl [ openssl ];
|
||||
|
||||
patches = [
|
||||
@ -93,6 +95,10 @@ stdenv.mkDerivation rec {
|
||||
$out/libexec/netdata/plugins.d/perf.plugin.org
|
||||
mv $out/libexec/netdata/plugins.d/slabinfo.plugin \
|
||||
$out/libexec/netdata/plugins.d/slabinfo.plugin.org
|
||||
${lib.optionalString withSystemdJournal ''
|
||||
mv $out/libexec/netdata/plugins.d/systemd-journal.plugin \
|
||||
$out/libexec/netdata/plugins.d/systemd-journal.plugin.org
|
||||
''}
|
||||
${lib.optionalString withIpmi ''
|
||||
mv $out/libexec/netdata/plugins.d/freeipmi.plugin \
|
||||
$out/libexec/netdata/plugins.d/freeipmi.plugin.org
|
||||
@ -109,6 +115,8 @@ stdenv.mkDerivation rec {
|
||||
"--sysconfdir=/etc"
|
||||
"--disable-ebpf"
|
||||
"--with-jemalloc=${jemalloc}"
|
||||
] ++ lib.optionals (withSystemdJournal) [
|
||||
"--enable-plugin-systemd-journal"
|
||||
] ++ lib.optionals (!withDBengine) [
|
||||
"--disable-dbengine"
|
||||
] ++ lib.optionals (!withCloud) [
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGo121Module rec {
|
||||
pname = "netdata-go-plugins";
|
||||
version = "0.56.3";
|
||||
version = "0.56.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netdata";
|
||||
repo = "go.d.plugin";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-T7UB7qrcMTqIFRzBxbXmSqtcEFgZd0/z4EYuH/ydVi4=";
|
||||
hash = "sha256-7dR1TL2Ycb+7yHoFklrKdXXxIG4Tx+fAG5ScAAtbVRw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-N0p03urHC3d17VQ4TIs7mAemW9ZSpQw20EwwD6lSLLc=";
|
||||
vendorHash = "sha256-Faa+7tT3sPxlT6eQEmFotOJnt9b49ffDPEHt5V7tQa0=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -2506,6 +2506,8 @@ with pkgs;
|
||||
|
||||
gst = callPackage ../applications/version-management/gst { };
|
||||
|
||||
guilt = callPackage ../applications/version-management/guilt { };
|
||||
|
||||
gut = callPackage ../applications/version-management/gut { };
|
||||
|
||||
hred = callPackage ../development/tools/hred { };
|
||||
@ -34174,9 +34176,7 @@ with pkgs;
|
||||
|
||||
pnglatex = with python3Packages; toPythonApplication pnglatex;
|
||||
|
||||
polybar = callPackage ../applications/misc/polybar { };
|
||||
|
||||
polybarFull = callPackage ../applications/misc/polybar {
|
||||
polybarFull = polybar.override {
|
||||
alsaSupport = true;
|
||||
githubSupport = true;
|
||||
mpdSupport = true;
|
||||
@ -41285,7 +41285,7 @@ with pkgs;
|
||||
vazir-code-font = callPackage ../data/fonts/vazir-code-font { };
|
||||
|
||||
vaultwarden = callPackage ../tools/security/vaultwarden {
|
||||
inherit (darwin.apple_sdk.frameworks) Security CoreServices;
|
||||
inherit (darwin.apple_sdk.frameworks) Security CoreServices SystemConfiguration;
|
||||
};
|
||||
vaultwarden-sqlite = vaultwarden;
|
||||
vaultwarden-mysql = vaultwarden.override { dbBackend = "mysql"; };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user