Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
f2adf20b71
@ -13434,6 +13434,12 @@
|
||||
github = "zeri42";
|
||||
githubId = 68825133;
|
||||
};
|
||||
zombiezen = {
|
||||
name = "Ross Light";
|
||||
email = "ross@zombiezen.com";
|
||||
github = "zombiezen";
|
||||
githubId = 181535;
|
||||
};
|
||||
zseri = {
|
||||
name = "zseri";
|
||||
email = "zseri.devel@ytrizja.de";
|
||||
|
||||
@ -244,8 +244,6 @@ in
|
||||
security.apparmor.includes."nixos/security.wrappers" = ''
|
||||
include "${pkgs.apparmorRulesFromClosure { name="security.wrappers"; } [
|
||||
securityWrapper
|
||||
pkgs.stdenv.cc.cc
|
||||
pkgs.stdenv.cc.libc
|
||||
]}"
|
||||
'';
|
||||
|
||||
|
||||
@ -11,11 +11,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "drawio";
|
||||
version = "16.0.2";
|
||||
version = "16.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm";
|
||||
sha256 = "980af60ea53fd0c255cfa3faa9407b146658074ea411bc491f53a047352b5b66";
|
||||
sha256 = "b86ff3f77b17e7da66979fe8ea878685c0018273f5d0302f10d3094d502452ee";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lightburn";
|
||||
version = "1.0.04";
|
||||
version = "1.0.06";
|
||||
|
||||
nativeBuildInputs = [
|
||||
p7zip
|
||||
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z";
|
||||
sha256 = "sha256-3uuYxDxlBlu3/4BhII36s+PsLJCmHDIE3fRAz6GO/js=";
|
||||
sha256 = "sha256-2Wlyt9Xw/FNaFkN1Q6utXdGzp42piebESQARhfpvRhM=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "snapmaker-luban";
|
||||
version = "4.1.1";
|
||||
version = "4.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Snapmaker/Luban/releases/download/v${version}/snapmaker-luban-${version}-linux-x64.tar.gz";
|
||||
sha256 = "sha256-M+e3dNK1Z1Nkswac04TkuYHFX/Y/Cz4Z6P1xGv99kOo=";
|
||||
sha256 = "sha256-gS3MyXD5B9YQ+EXmIPZ+rDUE5H1AjRL64yXQX+5TM2Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,13 +1,16 @@
|
||||
{ fetchFromGitHub, automake, autoconf, which, pkg-config, libtool, lib, stdenv }:
|
||||
{ fetchFromGitHub, automake, autoconf, which, pkg-config, libtool, lib, stdenv, gnutls, asciidoc, doxygen
|
||||
, withTLS ? true
|
||||
, withDocs ? true
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcoap";
|
||||
version = "4.2.1";
|
||||
version = "4.3.0";
|
||||
src = fetchFromGitHub {
|
||||
repo = "libcoap";
|
||||
owner = "obgm";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "1jkvha52lic13f13hnppizkl80bb2rciayb5hxici0gj6spphgha";
|
||||
sha256 = "1l031ys833gch600g9g3lvbsr4nysx6glbbj4lwvx3ywl0jr6l9k";
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
automake
|
||||
@ -15,16 +18,15 @@ stdenv.mkDerivation rec {
|
||||
which
|
||||
libtool
|
||||
pkg-config
|
||||
];
|
||||
] ++ lib.optional withTLS gnutls ++ lib.optionals withDocs [ doxygen asciidoc ] ;
|
||||
preConfigure = "./autogen.sh";
|
||||
configureFlags = [
|
||||
"--disable-documentation"
|
||||
"--disable-shared"
|
||||
];
|
||||
configureFlags = [ "--disable-shared" ]
|
||||
++ lib.optional (!withDocs) "--disable-documentation"
|
||||
++ lib.optional withTLS "--enable-dtls";
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/obgm/libcoap";
|
||||
description = "A CoAP (RFC 7252) implementation in C";
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
license = licenses.bsd2;
|
||||
maintainers = [ maintainers.kmein ];
|
||||
};
|
||||
|
||||
@ -27,11 +27,11 @@ with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mutt";
|
||||
version = "2.1.4";
|
||||
version = "2.1.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
|
||||
sha256 = "0yfvnjqw9l99kdcr995by3mx5vwad6b530x93yb8ipr3xa1bcq9k";
|
||||
sha256 = "1q1bq5qfv67s6ynbqga19ifaprgavhdbgg154kb9ffingvj0k8wj";
|
||||
};
|
||||
|
||||
patches = optional smimeSupport (fetchpatch {
|
||||
|
||||
77
pkgs/applications/science/machine-learning/streamlit/default.nix
Normal file → Executable file
77
pkgs/applications/science/machine-learning/streamlit/default.nix
Normal file → Executable file
@ -1,23 +1,79 @@
|
||||
{ lib, buildPythonApplication, fetchPypi
|
||||
, altair, astor, base58, blinker, boto3, botocore, click, enum-compat
|
||||
, future, pillow, protobuf, requests, toml, tornado_5, tzlocal, validators, watchdog
|
||||
, jinja2, setuptools
|
||||
{
|
||||
# Nix
|
||||
lib,
|
||||
buildPythonApplication,
|
||||
fetchPypi,
|
||||
|
||||
# Build inputs
|
||||
altair,
|
||||
astor,
|
||||
base58,
|
||||
blinker,
|
||||
boto3,
|
||||
botocore,
|
||||
click,
|
||||
cachetools,
|
||||
enum-compat,
|
||||
future,
|
||||
GitPython,
|
||||
jinja2,
|
||||
pillow,
|
||||
pyarrow,
|
||||
pydeck,
|
||||
pympler,
|
||||
protobuf,
|
||||
requests,
|
||||
setuptools,
|
||||
toml,
|
||||
tornado,
|
||||
tzlocal,
|
||||
validators,
|
||||
watchdog,
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
let
|
||||
click_7 = click.overridePythonAttrs(old: rec {
|
||||
version = "7.1.2";
|
||||
src = old.src.override {
|
||||
inherit version;
|
||||
sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a";
|
||||
};
|
||||
});
|
||||
in buildPythonApplication rec {
|
||||
pname = "streamlit";
|
||||
version = "0.50.2";
|
||||
version = "1.2.0";
|
||||
format = "wheel"; # the only distribution available
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version format;
|
||||
sha256 = "1wymv7qckafs0p2jdjlxjaf1xrhm3iyd185jkldanbb0na5n3ndz";
|
||||
sha256 = "1dzb68a8n8wvjppcmqdaqnh925b2dg6rywv51ac9q09zjxb6z11n";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
altair astor base58 blinker boto3 botocore click enum-compat
|
||||
future pillow protobuf requests toml tornado_5 tzlocal validators watchdog
|
||||
jinja2 setuptools
|
||||
altair
|
||||
astor
|
||||
base58
|
||||
blinker
|
||||
boto3
|
||||
botocore
|
||||
cachetools
|
||||
click_7
|
||||
enum-compat
|
||||
future
|
||||
GitPython
|
||||
jinja2
|
||||
pillow
|
||||
protobuf
|
||||
pyarrow
|
||||
pydeck
|
||||
pympler
|
||||
requests
|
||||
setuptools
|
||||
toml
|
||||
tornado
|
||||
tzlocal
|
||||
validators
|
||||
watchdog
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
@ -30,5 +86,4 @@ buildPythonApplication rec {
|
||||
maintainers = with maintainers; [ yrashk ];
|
||||
license = licenses.asl20;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -3,14 +3,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "calc";
|
||||
version = "2.14.0.8";
|
||||
version = "2.14.0.13";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://github.com/lcn2/calc/releases/download/${version}/${pname}-${version}.tar.bz2"
|
||||
"http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2"
|
||||
];
|
||||
sha256 = "sha256-rWosRO7qfgbvylOE8Qf/rudWRAenR0181JKKU7Gig4Y=";
|
||||
sha256 = "sha256-naNBismaWnzLjlUy49Rz9OfkhUcFdbnWxs917ogxTjk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -0,0 +1,55 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, makeWrapper
|
||||
, git
|
||||
, pandoc
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gg-scm";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gg-scm";
|
||||
repo = "gg";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kLmu4h/EBbSFHrffvusKq38X3/ID9bOlLMvEUtnFGhk=";
|
||||
};
|
||||
patches = [ ./skip-broken-revert-tests.patch ];
|
||||
subPackages = [ "cmd/gg" ];
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
"-X" "main.versionInfo=${version}"
|
||||
"-X" "main.buildCommit=a0b348c9cef33fa46899f5e55e3316f382a09f6a+"
|
||||
];
|
||||
|
||||
vendorSha256 = "sha256-+ZmNXB+I6vPRbACwEkfl/vVmqoZy67Zn9SBrham5zRk=";
|
||||
|
||||
nativeBuildInputs = [ git pandoc installShellFiles makeWrapper ];
|
||||
buildInputs = [ git ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/gg --suffix PATH : ${git}/bin
|
||||
pandoc --standalone --to man misc/gg.1.md -o misc/gg.1
|
||||
installManPage misc/gg.1
|
||||
installShellCompletion --cmd gg \
|
||||
--bash misc/gg.bash \
|
||||
--zsh misc/_gg.zsh
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
mainProgram = "gg";
|
||||
description = "Git with less typing";
|
||||
longDescription = ''
|
||||
gg is an alternative command-line interface for Git heavily inspired by Mercurial.
|
||||
It's designed for less typing in common workflows,
|
||||
making Git easier to use for both novices and advanced users alike.
|
||||
'';
|
||||
homepage = "https://gg-scm.io/";
|
||||
changelog = "https://github.com/gg-scm/gg/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ zombiezen ];
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,12 @@
|
||||
diff --git a/cmd/gg/revert_test.go b/cmd/gg/revert_test.go
|
||||
index 9420e9b..ff6ca93 100644
|
||||
--- a/cmd/gg/revert_test.go
|
||||
+++ b/cmd/gg/revert_test.go
|
||||
@@ -592,6 +592,7 @@ func TestRevert_LocalRename(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestRevert_UnknownFile(t *testing.T) {
|
||||
+ t.Skip("Broken in 1.1.0")
|
||||
t.Parallel()
|
||||
t.Run("EmptyRepo", func(t *testing.T) {
|
||||
t.Parallel()
|
||||
@ -2,11 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "p4";
|
||||
version = "2020.1.2007551";
|
||||
version = "2021.2.2201121";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cdist2.perforce.com/perforce/r20.1/bin.linux26x86_64/helix-core-server.tgz";
|
||||
sha256 = "0ly9b838zrpp6841fzapizdd3xmria55bwfrh2j29qwxiwzqj80y";
|
||||
# actually https://cdist2.perforce.com/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz but upstream deletes releases
|
||||
url = "http://web.archive.org/web/20211118024943/https://cdist2.perforce.com/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz";
|
||||
sha256 = "sha256-cmIMVek4lwVYJQbW8ziABftPZ0iIoAoSpR7cKuN4I7M=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
@ -16,8 +17,7 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp p4 p4broker p4d p4p $out/bin
|
||||
install -D --target $out/bin p4 p4broker p4d p4p
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@ -510,8 +510,7 @@ rec {
|
||||
tarball must contain an RPM specfile. */
|
||||
|
||||
buildRPM = attrs: runInLinuxImage (stdenv.mkDerivation ({
|
||||
prePhases = [ pkgs.prepareImagePhase pkgs.sysInfoPhase ];
|
||||
dontUnpack = true;
|
||||
prePhases = [ "prepareImagePhase" "sysInfoPhase" ];
|
||||
dontConfigure = true;
|
||||
|
||||
outDir = "rpms/${attrs.diskImage.name}";
|
||||
@ -536,9 +535,7 @@ rec {
|
||||
buildPhase = ''
|
||||
eval "$preBuild"
|
||||
|
||||
# Hacky: RPM looks for <basename>.spec inside the tarball, so
|
||||
# strip off the hash.
|
||||
srcName="$(stripHash "$src")"
|
||||
srcName="$(rpmspec --srpm -q --qf '%{source}' *.spec)"
|
||||
cp "$src" "$srcName" # `ln' doesn't work always work: RPM requires that the file is owned by root
|
||||
|
||||
export HOME=/tmp/home
|
||||
|
||||
@ -9,20 +9,23 @@ with vmTools;
|
||||
|
||||
buildHelloInVM = runInLinuxVM hello;
|
||||
|
||||
buildPanInVM = runInLinuxVM pan;
|
||||
buildPcmanrmInVM = runInLinuxVM (pcmanfm.overrideAttrs (old: {
|
||||
# goes out-of-memory with many cores
|
||||
enableParallelBuilding = false;
|
||||
}));
|
||||
|
||||
|
||||
testRPMImage = makeImageTestScript diskImages.fedora16x86_64;
|
||||
testRPMImage = makeImageTestScript diskImages.fedora27x86_64;
|
||||
|
||||
|
||||
buildPatchelfRPM = buildRPM {
|
||||
name = "patchelf-rpm";
|
||||
src = patchelf.src;
|
||||
diskImage = diskImages.fedora16x86_64;
|
||||
diskImage = diskImages.fedora27x86_64;
|
||||
diskImageFormat = "qcow2";
|
||||
};
|
||||
|
||||
|
||||
testUbuntuImage = makeImageTestScript diskImages.ubuntu810i386;
|
||||
testUbuntuImage = makeImageTestScript diskImages.ubuntu1804i386;
|
||||
|
||||
|
||||
buildInDebian = runInLinuxImage (stdenv.mkDerivation {
|
||||
|
||||
77
pkgs/desktops/gnome/apps/gnome-text-editor/default.nix
Normal file
77
pkgs/desktops/gnome/apps/gnome-text-editor/default.nix
Normal file
@ -0,0 +1,77 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, meson
|
||||
, fetchurl
|
||||
, python3
|
||||
, pkg-config
|
||||
, gtk4
|
||||
, glib
|
||||
, gtksourceview5
|
||||
, gsettings-desktop-schemas
|
||||
, wrapGAppsHook4
|
||||
, ninja
|
||||
, gnome
|
||||
, enchant
|
||||
, icu
|
||||
, itstool
|
||||
, libadwaita
|
||||
, libxml2
|
||||
, pcre
|
||||
, appstream-glib
|
||||
, desktop-file-utils
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-text-editor";
|
||||
version = "41.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-YZ7FINbgkF1DEWcCTkPc4Nv2o0Xy1IaTUB1w3HYm+GE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream-glib
|
||||
desktop-file-utils
|
||||
itstool
|
||||
libxml2 # for xmllint
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
enchant
|
||||
icu
|
||||
glib
|
||||
gsettings-desktop-schemas
|
||||
gtk4
|
||||
gtksourceview5
|
||||
libadwaita
|
||||
pcre
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x build-aux/meson/postinstall.py
|
||||
patchShebangs build-aux/meson/postinstall.py
|
||||
substituteInPlace build-aux/meson/postinstall.py \
|
||||
--replace "gtk-update-icon-cache" "gtk4-update-icon-cache"
|
||||
'';
|
||||
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = "gnome-text-editor";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://gitlab.gnome.org/GNOME/gnome-text-editor";
|
||||
description = "A Text Editor for GNOME";
|
||||
maintainers = teams.gnome.members;
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go-jsonnet";
|
||||
version = "0.17.0";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "go-jsonnet";
|
||||
rev = "v${version}";
|
||||
sha256 = "1rprs8l15nbrx4dw4pdg81c5l22zhj80pl4zwqgsm4113wyyvc98";
|
||||
sha256 = "sha256-o/IjXskGaMhvQmTsAS745anGBMI2bwHf/EOEp57H8LU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "0nsm4gsbbn8myz4yfi6m7qc3iizhdambsr18iks0clkdn3mi2jn1";
|
||||
vendorSha256 = "sha256-fZBhlZrLcC4xj5uvb862lBOczGnJa9CceS3D8lUhBQo=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "apache-activemq";
|
||||
version = "5.16.2";
|
||||
version = "5.16.3";
|
||||
|
||||
src = fetchurl {
|
||||
sha256 = "sha256-IS/soe5Lx1C+/UWnNcv+8AwMmu5FHvURbpkTMMGrEFs=";
|
||||
sha256 = "sha256-GEbaKYXsZCU+zEGlTxR3cx60dQ/oQKndn9/uiOXJQlI=";
|
||||
url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz";
|
||||
};
|
||||
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tdlib";
|
||||
version = "1.7.12";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tdlib";
|
||||
repo = "td";
|
||||
# https://github.com/tdlib/td/issues/1790
|
||||
rev = "a69030239c53951db8a1b0af6408f24d63f5dcb7";
|
||||
sha256 = "tqytmjij79YzvBP1abbA/Oavx28mvEGESn39b3HYAMg=";
|
||||
rev = "b3ab664a18f8611f4dfcd3054717504271eeaa7a";
|
||||
sha256 = "OBgzFBi+lIBbKnHDm5D/F3Xi4s1x4geb+1OoBP3F+qY=";
|
||||
};
|
||||
|
||||
buildInputs = [ gperf openssl readline zlib ];
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ mkDerivation, fetchurl, makeWrapper, lib, php }:
|
||||
let
|
||||
pname = "php-cs-fixer";
|
||||
version = "3.3.2";
|
||||
version = "3.4.0";
|
||||
in
|
||||
mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar";
|
||||
sha256 = "sha256-iny2/L+RbwHUtCO3hQtEAbxocnUBG29DcyJnmk/EYT8=";
|
||||
sha256 = "sha256-UlZ3L5JaFN988WaHeZZRdl9yif29zFO0LMiFDGkMFuQ=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@ -7,11 +7,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohue";
|
||||
version = "3.0.10";
|
||||
version = "3.0.11";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-LwtE9F5ic0aZ9/q3dSWn20O27yW/QD/Yi1NPdFmiP10=";
|
||||
sha256 = "sha256-McC5DX3Cti9eGpPniywNY2DvbAqHSFwhek85TJN/zn0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, libsodium
|
||||
, pytestCheckHook
|
||||
}:
|
||||
@ -17,6 +18,15 @@ buildPythonPackage rec {
|
||||
sha256 = "sha256-nttR9PQimhqd2pByJ5IJzJ4RmSI4y7lcX7a7jcK+vqc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fixes build on 32-bit platforms
|
||||
(fetchpatch {
|
||||
name = "fix-crypto_kdf_derive_from_key-32bit.patch";
|
||||
url = "https://github.com/saltstack/libnacl/commit/e8a1f95ee1d4d0806fb6aee793dcf308b05d485d.patch";
|
||||
sha256 = "sha256-z6TAVNfPcuWZ/hRgk6Aa8I1IGzne7/NYnUOOQ3TjGVU=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ libsodium ];
|
||||
|
||||
postPatch =
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "vpk";
|
||||
version = "1.3.3";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ValvePython";
|
||||
repo = "vpk";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-kFKu4fuclanMdlfA/2ZccglM7rSzaq9BbbSaKuIN+Pk=";
|
||||
hash = "sha256-SPkPb8kveAR2cN9kd2plS+TjmBYBCfa6pJ0c22l69M0=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
||||
28
pkgs/development/tools/perseus-cli/default.nix
Normal file
28
pkgs/development/tools/perseus-cli/default.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ lib, rustPlatform, fetchCrate, makeWrapper, wasm-pack }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "perseus-cli";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-YyQQjuxNUxuo2PFluGyT/CpG22tgjRCfmFKA5MFRgHo=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-SKxPsltXFH+ENexn/KDD43hGLSTgvtU9hv9Vdi2oeFA=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/perseus \
|
||||
--prefix PATH : "${lib.makeBinPath [ wasm-pack ]}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://arctic-hen7.github.io/perseus";
|
||||
description = "A high-level web development framework for Rust with full support for server-side rendering and static generation";
|
||||
maintainers = with maintainers; [ max-niederman ];
|
||||
license = with licenses; [ mit ];
|
||||
mainProgram = "perseus";
|
||||
};
|
||||
}
|
||||
@ -2,7 +2,7 @@
|
||||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2021.12.6";
|
||||
version = "2021.12.7";
|
||||
components = {
|
||||
"abode" = ps: with ps; [ abodepy ];
|
||||
"accuweather" = ps: with ps; [ accuweather ];
|
||||
|
||||
@ -265,7 +265,7 @@ let
|
||||
extraBuildInputs = extraPackages py.pkgs;
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2021.12.6";
|
||||
hassVersion = "2021.12.7";
|
||||
|
||||
in with py.pkgs; buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
@ -282,7 +282,7 @@ in with py.pkgs; buildPythonApplication rec {
|
||||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = version;
|
||||
hash = "sha256:0n01cjbbyb1i63z8zxkjlwssqpv6y41jzs7b7jk78w3qnbg15bk3";
|
||||
hash = "sha256:0jcnk43wm3xwvsfyvbswq681v2c3xmki1bakn0l12j6paida784y";
|
||||
};
|
||||
|
||||
# leave this in, so users don't have to constantly update their downstream patch handling
|
||||
|
||||
@ -4,11 +4,11 @@ buildPythonPackage rec {
|
||||
# the frontend version corresponding to a specific home-assistant version can be found here
|
||||
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
|
||||
pname = "home-assistant-frontend";
|
||||
version = "20211227.0";
|
||||
version = "20211229.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-HdjkquxQM3Vxl+avM0fGanUkCMoTlBHodXIfNhW2lC4=";
|
||||
sha256 = "sha256-2hACC2542jz1DID7nV28keVVDDBOLW1QDYTLM4S1ZJ0=";
|
||||
};
|
||||
|
||||
# there is nothing to strip in this package
|
||||
|
||||
@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "blueberry";
|
||||
version = "1.4.5";
|
||||
version = "1.4.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-DDxrreo133DIn5XhXKgWvbhPV2NXdyyywC+e73W5aY4=";
|
||||
sha256 = "sha256-4SKEkoIEflOX5WXJ7X3onrieecT2NoH/eV3H3Cx/SYQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lfs";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Canop";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nRJ73j3l3xaFImhrHEGmfqESEEjVKhIwdNZNc/RqOcU=";
|
||||
sha256 = "sha256-3zGCVT3SfQm72CF2MasT7k5r1Jx9DRUrXKHBSpvcv10=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-iAz2s92hWkLCXoQ09mKCyI0yHvH55WaTSl+a5gz44bU=";
|
||||
cargoSha256 = "sha256-Q4eNvOY5c4KybDKVhcOznxGPUgyjgEYPD8+9r6sECXA=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Get information on your mounted disks";
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "autorandr";
|
||||
version = "1.11";
|
||||
version = "1.12.1";
|
||||
|
||||
buildInputs = [ python3Packages.python ];
|
||||
|
||||
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "phillipberndt";
|
||||
repo = "autorandr";
|
||||
rev = version;
|
||||
sha256 = "0rmnqk2bi6bbd2if1rll37mlzlqxzmnazfffdhcpzskxwyaj4yn5";
|
||||
sha256 = "sha256-7SNnbgV6PeseBD6wdilEIOfOL2KVDpnlkSn9SBgRhhM=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -17,6 +17,9 @@
|
||||
, coreutils
|
||||
, autoreconfHook
|
||||
, autoSignDarwinBinariesHook
|
||||
|
||||
# updater only
|
||||
, writeScript
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -69,6 +72,17 @@ stdenv.mkDerivation rec {
|
||||
$out/bin/mc
|
||||
'';
|
||||
|
||||
passthru.updateScript = writeScript "update-mc" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl pcre common-updater-scripts
|
||||
|
||||
set -eu -o pipefail
|
||||
|
||||
# Expect the text in format of "Current version is: 4.8.27; ...".
|
||||
new_version="$(curl -s https://midnight-commander.org/ | pcregrep -o1 'Current version is: (([0-9]+\.?)+);')"
|
||||
update-source-version mc "$new_version"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "File Manager and User Shell for the GNU Project";
|
||||
downloadPage = "https://www.midnight-commander.org/downloads/";
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bpytop";
|
||||
version = "1.0.67";
|
||||
version = "1.0.68";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aristocratos";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nvpIqX16WP9kslFo1ne5+QAZcvG+WFm5kDVOLN4C+b0=";
|
||||
sha256 = "sha256-NHfaWWwNpGhqu/ALcW4p4X6sktEyLbKQuNHpAUUw4LY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -11,8 +11,6 @@ buildGoModule rec {
|
||||
sha256 = "sha256-C9e2KsnoggjWZp8gx757MbFdGxmfh+TtAd+luS3ycHU=";
|
||||
};
|
||||
|
||||
runVend = true;
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
35
pkgs/tools/wayland/wluma/default.nix
Normal file
35
pkgs/tools/wayland/wluma/default.nix
Normal file
@ -0,0 +1,35 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, rustPlatform
|
||||
, vulkan-loader
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wluma";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maximbaz";
|
||||
repo = "wluma";
|
||||
rev = version;
|
||||
sha256 = "sha256-fqBEJS+SQoPNNEw6jyoiZjq/chY73bQ+cM21F8RdNPE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/wluma \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ vulkan-loader ]}"
|
||||
'';
|
||||
|
||||
cargoSha256 = "sha256-dZBA6VeJRHmqpazRwjLP1kYcYYN5LCFWkIaXqp4/RkQ=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Automatic brightness adjustment based on screen contents and ALS";
|
||||
homepage = "https://github.com/maximbaz/wluma";
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ yevhenshymotiuk ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -519,6 +519,8 @@ with pkgs;
|
||||
|
||||
packr = callPackage ../development/libraries/packr { };
|
||||
|
||||
perseus-cli = callPackage ../development/tools/perseus-cli { };
|
||||
|
||||
pet = callPackage ../development/tools/pet { };
|
||||
|
||||
pkger = callPackage ../development/libraries/pkger { };
|
||||
@ -2628,6 +2630,8 @@ with pkgs;
|
||||
|
||||
wlsunset = callPackage ../tools/wayland/wlsunset { };
|
||||
|
||||
wluma = callPackage ../tools/wayland/wluma { };
|
||||
|
||||
wob = callPackage ../tools/wayland/wob { };
|
||||
|
||||
wshowkeys = callPackage ../tools/wayland/wshowkeys { };
|
||||
@ -25130,6 +25134,8 @@ with pkgs;
|
||||
|
||||
fnott = callPackage ../applications/misc/fnott { };
|
||||
|
||||
gg-scm = callPackage ../applications/version-management/git-and-tools/gg { };
|
||||
|
||||
gigalixir = with python3Packages; toPythonApplication gigalixir;
|
||||
|
||||
go-libp2p-daemon = callPackage ../servers/go-libp2p-daemon { };
|
||||
@ -31324,6 +31330,8 @@ with pkgs;
|
||||
|
||||
gnome-connections = callPackage ../desktops/gnome/apps/gnome-connections { };
|
||||
|
||||
gnome-text-editor = callPackage ../desktops/gnome/apps/gnome-text-editor { };
|
||||
|
||||
gnome-tour = callPackage ../desktops/gnome/core/gnome-tour { };
|
||||
|
||||
hhexen = callPackage ../games/hhexen { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user