Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
30e6d926d2
@ -759,13 +759,6 @@
|
||||
githubId = 11699655;
|
||||
name = "Stanislas Lange";
|
||||
};
|
||||
angustrau = {
|
||||
name = "Angus Trau";
|
||||
email = "nix@angus.ws";
|
||||
matrix = "@angustrau:matrix.org";
|
||||
github = "angustrau";
|
||||
githubId = 13267947;
|
||||
};
|
||||
anhdle14 = {
|
||||
name = "Le Anh Duc";
|
||||
email = "anhdle14@icloud.com";
|
||||
@ -3388,6 +3381,12 @@
|
||||
githubId = 18535642;
|
||||
name = "Emily";
|
||||
};
|
||||
emilytrau = {
|
||||
name = "Emily Trau";
|
||||
email = "nix@angus.ws";
|
||||
github = "emilytrau";
|
||||
githubId = 13267947;
|
||||
};
|
||||
enderger = {
|
||||
email = "endergeryt@gmail.com";
|
||||
github = "enderger";
|
||||
|
||||
@ -223,7 +223,7 @@ with lib.maintainers; {
|
||||
|
||||
openstack = {
|
||||
members = [
|
||||
angustrau
|
||||
emilytrau
|
||||
SuperSandro2000
|
||||
];
|
||||
scope = "Maintain the ecosystem around OpenStack";
|
||||
|
||||
@ -15,13 +15,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "indicator-sound-switcher";
|
||||
version = "2.3.6";
|
||||
version = "2.3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yktoo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "APU8Y0xUhRd9RbMSG9TD0TBvFLu/VlLGauf56z8gZDw=";
|
||||
sha256 = "sha256-agzU3Z3E6NvCnlsz9L719LqMTm8EmYg3TY/2lWTYgKs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xmrig";
|
||||
version = "6.16.3";
|
||||
version = "6.16.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xmrig";
|
||||
repo = "xmrig";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YR/8ApkuZtO2vJA/VlZ06JdQnGDbTzQ5fNqHgBpFZjQ=";
|
||||
sha256 = "sha256-hfdKhTUGoVN4DIURO+e3MOSpsL6GWxOV3LItd0nA51Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tektoncd-cli";
|
||||
version = "0.21.0";
|
||||
version = "0.22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tektoncd";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-VGdYnynEm0ShG96W0uKiWBbUy/EitX3od5Nnho6T0pg=";
|
||||
sha256 = "sha256-AmJN7hnYuhxYNG/qs7yv3phhffYKVaM8f7irhi9wRfA=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "alfaview";
|
||||
version = "8.34.0";
|
||||
version = "8.37.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://production-alfaview-assets.alfaview.com/stable/linux/${pname}_${version}.deb";
|
||||
sha256 = "sha256-85bsu6l/B+lHkjFBXNQ9BEzOn1oYTsFgungG06p9nD0=";
|
||||
sha256 = "sha256-hU4tqDu95ej8ChiWJq3ZPhEwxBcmTQkA/n///pPVa5U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -3,12 +3,12 @@ electron, libsecret }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tutanota-desktop";
|
||||
version = "3.91.6";
|
||||
version = "3.91.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/tutao/tutanota/releases/download/tutanota-release-${version}/${pname}-${version}-unpacked-linux.tar.gz";
|
||||
name = "tutanota-desktop-${version}.tar.gz";
|
||||
sha256 = "sha256-REoYLxU9p0lECKNwcDHidO+jTCKS1yQSzed9GSHSNGI=";
|
||||
sha256 = "sha256-RlEgpXco0lkkjlJ8FZz4MxYznKLPl1Lxkb5MSmhOTzI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation {
|
||||
nativeBuildInputs =
|
||||
[ autoreconfHook ]
|
||||
++ lib.optional withReadline readline;
|
||||
enableParallelBuild = true;
|
||||
enableParallelBuilding = true;
|
||||
configureFlags = with lib;
|
||||
optional (!withReadline) "--without-readline"
|
||||
++ optional enableEmu "--enable-emu"
|
||||
|
||||
30
pkgs/applications/networking/novnc/default.nix
Normal file
30
pkgs/applications/networking/novnc/default.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ lib, stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "novnc";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "novnc";
|
||||
repo = "noVNC";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Z+bks7kcwj+Z3uf/t0u25DnGOM60QhSH6uuoIi59jqU=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 utils/novnc_proxy "$out/bin/novnc"
|
||||
install -dm755 "$out/share/webapps/novnc/"
|
||||
cp -a app core po vendor vnc.html karma.conf.js package.json vnc_lite.html "$out/share/webapps/novnc/"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "VNC client web application";
|
||||
homepage = "https://novnc.com";
|
||||
license = with licenses; [ mpl20 ofl bsd3 bsd2 mit ];
|
||||
maintainers = with maintainers; [ neverbehave ];
|
||||
};
|
||||
}
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
description = "BitTorrent DHT library";
|
||||
homepage = "https://github.com/transmission/dht";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ angustrau ];
|
||||
maintainers = with maintainers; [ emilytrau ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
homepage = "https://gitlab.gnome.org/World/Fragments";
|
||||
description = "A GTK3 BitTorrent Client";
|
||||
maintainers = with maintainers; [ angustrau ];
|
||||
maintainers = with maintainers; [ emilytrau ];
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
description = "uTorrent Transport Protocol library";
|
||||
homepage = "https://github.com/transmission/libutp";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ angustrau ];
|
||||
maintainers = with maintainers; [ emilytrau ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,9 +1,10 @@
|
||||
{ fetchurl
|
||||
, lib
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, aqbanking
|
||||
, boost
|
||||
, cmake
|
||||
, gettext
|
||||
, glib
|
||||
, glibcLocales
|
||||
, gtest
|
||||
@ -16,7 +17,6 @@
|
||||
, libxml2
|
||||
, libxslt
|
||||
, makeWrapper
|
||||
, perl
|
||||
, perlPackages
|
||||
, pkg-config
|
||||
, swig
|
||||
@ -28,13 +28,15 @@ stdenv.mkDerivation rec {
|
||||
pname = "gnucash";
|
||||
version = "4.9";
|
||||
|
||||
# raw source code doesn't work out of box; fetchFromGitHub not usable
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Gnucash/gnucash/releases/download/${version}/gnucash-${version}.tar.bz2";
|
||||
sha256 = "0bdpzb0wc9bjph5iff7133ppnkcqzfd10yi2qagij4mpq4q1qmcs";
|
||||
url = "https://github.com/Gnucash/gnucash/releases/download/${version}/${pname}-${version}.tar.bz2";
|
||||
hash = "sha256-mlUcMMG3EhmfwiJ6EJr7mE177xjhOBcLvHIlxsH6ty0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
gettext
|
||||
makeWrapper
|
||||
wrapGAppsHook
|
||||
];
|
||||
@ -53,11 +55,15 @@ stdenv.mkDerivation rec {
|
||||
libofx
|
||||
libxml2
|
||||
libxslt
|
||||
perl
|
||||
pkg-config
|
||||
swig
|
||||
webkitgtk
|
||||
] ++ (with perlPackages; [ FinanceQuote DateManip ]);
|
||||
]
|
||||
++ (with perlPackages; [
|
||||
DateManip
|
||||
FinanceQuote
|
||||
perl
|
||||
]);
|
||||
|
||||
patches = [
|
||||
# this patch disables test-gnc-timezone and test-gnc-datetime which fail due to nix datetime challenges
|
||||
@ -68,16 +74,14 @@ stdenv.mkDerivation rec {
|
||||
./0003-remove-valgrind.patch
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
export GUILE_AUTO_COMPILE=0 # this needs to be an env variable and not a cmake flag to suppress guile warning
|
||||
'';
|
||||
# this needs to be an environment variable and not a cmake flag to suppress
|
||||
# guile warning
|
||||
GUILE_AUTO_COMPILE="0";
|
||||
|
||||
# `make check` target does not define its prerequisites but expects them to
|
||||
# have already been built. The list of targets below was built through trial
|
||||
# and error based on failing tests.
|
||||
doCheck = true;
|
||||
|
||||
/*
|
||||
GNUcash's `make check` target does not define its prerequisites but expects them to have already been built.
|
||||
The list of targets below was built through trial and error based on failing tests.
|
||||
*/
|
||||
preCheck = ''
|
||||
make \
|
||||
test-account-object \
|
||||
@ -156,12 +160,15 @@ stdenv.mkDerivation rec {
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--set GNC_DBD_DIR ${libdbiDrivers}/lib/dbd # specify where db drivers are
|
||||
--set GSETTINGS_SCHEMA_DIR ${glib.makeSchemaPath "$out" "${pname}-${version}"} # specify where nix puts the gnome settings schemas
|
||||
# db drivers location
|
||||
--set GNC_DBD_DIR ${libdbiDrivers}/lib/dbd
|
||||
# gnome settings schemas location on Nix
|
||||
--set GSETTINGS_SCHEMA_DIR ${glib.makeSchemaPath "$out" "${pname}-${version}"}
|
||||
)
|
||||
'';
|
||||
|
||||
# wrapGAppsHook would wrap all binaries including the cli utils which need Perl wrapping
|
||||
# wrapGAppsHook would wrap all binaries including the cli utils which need
|
||||
# Perl wrapping
|
||||
dontWrapGApps = true;
|
||||
|
||||
# gnucash is wrapped using the args constructed for wrapGAppsHook.
|
||||
@ -176,15 +183,31 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Personal and small business double entry accounting application.";
|
||||
longDescription = ''
|
||||
Designed to be easy to use, yet powerful and flexible, GnuCash allows you to track bank accounts, stocks, income and expenses.
|
||||
As quick and intuitive to use as a checkbook register, it is based on professional accounting principles to ensure balanced books and accurate reports.
|
||||
'';
|
||||
|
||||
homepage = "https://www.gnucash.org/";
|
||||
description = "Free software for double entry accounting";
|
||||
longDescription = ''
|
||||
GnuCash is personal and small-business financial-accounting software,
|
||||
freely licensed under the GNU GPL and available for GNU/Linux, BSD,
|
||||
Solaris, Mac OS X and Microsoft Windows.
|
||||
|
||||
Designed to be easy to use, yet powerful and flexible, GnuCash allows you
|
||||
to track bank accounts, stocks, income and expenses. As quick and
|
||||
intuitive to use as a checkbook register, it is based on professional
|
||||
accounting principles to ensure balanced books and accurate reports.
|
||||
|
||||
Some interesting features:
|
||||
|
||||
- Double-Entry Accounting
|
||||
- Stock/Bond/Mutual Fund Accounts
|
||||
- Small-Business Accounting
|
||||
- Reports, Graphs
|
||||
- QIF/OFX/HBCI Import, Transaction Matching
|
||||
- Scheduled Transactions
|
||||
- Financial Calculations
|
||||
'';
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.domenkozar ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ domenkozar AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
# TODO: investigate Darwin support
|
||||
|
||||
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/logisim-evolution/logisim-evolution";
|
||||
description = "Digital logic designer and simulator";
|
||||
maintainers = with maintainers; [ angustrau ];
|
||||
maintainers = with maintainers; [ emilytrau ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
homepage = "http://www.cburch.com/logisim/";
|
||||
description = "Educational tool for designing and simulating digital logic circuits";
|
||||
maintainers = with maintainers; [ angustrau ];
|
||||
maintainers = with maintainers; [ emilytrau ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
@ -54,11 +54,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "go";
|
||||
version = "1.16.13";
|
||||
version = "1.16.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/go/go${version}.src.tar.gz";
|
||||
sha256 = "sha256-sJJmVOrrAe9DgWY49C17FoHy0/QblVnwdzVSK3r61Bo=";
|
||||
sha256 = "sha256-RniYzTohbeVNy5AU9UHv536beacVTbwf0t13iwxj+1Y=";
|
||||
};
|
||||
|
||||
# perl is used for testing go vet
|
||||
|
||||
@ -54,11 +54,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "go";
|
||||
version = "1.17.6";
|
||||
version = "1.17.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/go/go${version}.src.tar.gz";
|
||||
sha256 = "sha256-TcG78/9h8MH/Kxk1Xm2IFRpwEmJopHx2FHdobvlHSMg=";
|
||||
sha256 = "sha256-wQjNM7c7GRGgK2l3Qd896kPgGlxOCOQJ6LOg43RdK00=";
|
||||
};
|
||||
|
||||
# perl is used for testing go vet
|
||||
|
||||
@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "http://aften.sourceforge.net/";
|
||||
license = licenses.lgpl21Only;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ angustrau ];
|
||||
maintainers = with maintainers; [ emilytrau ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "http://portmedia.sourceforge.net/portmidi/";
|
||||
description = "Platform independent library for MIDI I/O";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ angustrau ];
|
||||
maintainers = with maintainers; [ emilytrau ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -32,6 +32,6 @@ buildPythonPackage rec {
|
||||
description = "Python language bindings for ev3dev";
|
||||
homepage = "https://github.com/ev3dev/ev3dev-lang-python";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ angustrau ];
|
||||
maintainers = with maintainers; [ emilytrau ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -32,6 +32,6 @@ buildPythonPackage rec {
|
||||
description = "Checks for out-of-date package versions";
|
||||
homepage = "https://github.com/jumptrading/luddite";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ angustrau ];
|
||||
maintainers = with maintainers; [ emilytrau ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -32,6 +32,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/ManimCommunity/ManimPango";
|
||||
license = licenses.mit;
|
||||
description = "Binding for Pango";
|
||||
maintainers = [ maintainers.angustrau ];
|
||||
maintainers = [ maintainers.emilytrau ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "meshtastic";
|
||||
version = "1.2.81";
|
||||
version = "1.2.82";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "meshtastic";
|
||||
repo = "Meshtastic-python";
|
||||
rev = version;
|
||||
sha256 = "sha256-ITE3gtcvXMisARlmnhlSzkZr/tGLiDq8aSO6d6jmlOw=";
|
||||
sha256 = "sha256-HPSJ1D453yQCkPXQodZdISnNwPpk5TZaJ/BY8EbYImI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -32,6 +32,6 @@ buildPythonPackage rec {
|
||||
'';
|
||||
homepage = "https://github.com/lmas/opensimplex";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ angustrau ];
|
||||
maintainers = with maintainers; [ emilytrau ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyenvisalink";
|
||||
version = "4.3";
|
||||
version = "4.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "151a9bdefa2772cc9d2f913a32792625a4dc80c6c08086783ebc57de355e68a1";
|
||||
sha256 = "sha256-YUYiCid+XAlfytkyz4Td5CG1zBOrsLx4/nuRubRE14w=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
description = "A library for writing RGB frames to a fake webcam device on Linux";
|
||||
homepage = "https://github.com/jremmons/pyfakewebcam";
|
||||
license = licenses.lgpl3Only;
|
||||
maintainers = with maintainers; [ angustrau ];
|
||||
maintainers = with maintainers; [ emilytrau ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -54,6 +54,6 @@ buildPythonPackage rec {
|
||||
description = "A GUI system for pygame";
|
||||
homepage = "https://github.com/MyreMylar/pygame_gui";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ angustrau ];
|
||||
maintainers = with maintainers; [ emilytrau ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -72,7 +72,7 @@ buildPythonPackage rec {
|
||||
description = "Python library for games";
|
||||
homepage = "https://www.pygame.org/";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ angustrau ];
|
||||
maintainers = with maintainers; [ emilytrau ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyhumps";
|
||||
version = "3.5.0";
|
||||
version = "3.5.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "nficano";
|
||||
repo = "humps";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dnNtx0VTD2e89yXMz0+acDhOaLBSkAA7n2io6qypN5E=";
|
||||
hash = "sha256-6F61y0niPPuZBci15j68MFXzzBBimvbZ24+i9AZ7XJs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -37,7 +37,7 @@ buildPythonPackage rec {
|
||||
description = "2d physics library";
|
||||
homepage = "https://www.pymunk.org";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ angustrau ];
|
||||
maintainers = with maintainers; [ emilytrau ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -19,6 +19,6 @@ buildPythonPackage rec {
|
||||
description = "Easy to use i18n library";
|
||||
homepage = "https://github.com/danhper/python-i18n";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ angustrau ];
|
||||
maintainers = with maintainers; [ emilytrau ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -23,6 +23,6 @@ buildPythonPackage rec {
|
||||
description = "Giving you a random User-Agent Header";
|
||||
homepage = "https://github.com/Animenosekai/useragents";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ angustrau ];
|
||||
maintainers = with maintainers; [ emilytrau ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, cython
|
||||
, h5py
|
||||
, matplotlib
|
||||
, numpy
|
||||
@ -28,6 +29,10 @@ buildPythonPackage rec {
|
||||
sha256 = "1vwqyv215yf51j1278cn7l8mpqmy1grm9j7z3hxjlz4w65cff324";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cython
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
spglib
|
||||
numpy
|
||||
@ -44,6 +49,11 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# slight disagreement between caastepxbin versions
|
||||
"test_castep_phonon_read_bands"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "castepxbin==0.1.0" "castepxbin>=0.1.0"
|
||||
|
||||
@ -38,6 +38,6 @@ buildPythonPackage rec {
|
||||
description = "A module grouping multiple translation APIs";
|
||||
homepage = "https://github.com/Animenosekai/translate";
|
||||
license = with licenses; [ agpl3Only ];
|
||||
maintainers = with maintainers; [ angustrau ];
|
||||
maintainers = with maintainers; [ emilytrau ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -8,12 +8,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "yangson";
|
||||
version = "1.4.12";
|
||||
version = "1.4.13";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Dx7jxhO3aGCT1Mq6QDsvZLDcC7EY3dX2ltM0tLxSW8Y=";
|
||||
sha256 = "sha256-SuKpSwIjZioyqmxlcKJ+UXP+ADfJwUwCCttmMAiEkZ4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "tfsec";
|
||||
version = "1.1.3";
|
||||
version = "1.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pJyITEIngSWTDGfCcm8Z6YD6Pkbum0Vk71hqWk+CnUc=";
|
||||
sha256 = "sha256-Af/rEsVWtMik0sBRZkMfZyyhn8SK9uDjRwTLcPkQpPE=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/aquasecurity/tfsec";
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jenkins";
|
||||
version = "2.319.2";
|
||||
version = "2.319.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
|
||||
sha256 = "0lx5fng98l9qci5jqwav8dmcnp7k7glfg0ccwqi0xqk90jqqs302";
|
||||
url = "http://get.jenkins.io/war-stable/${version}/jenkins.war";
|
||||
sha256 = "sha256-c92Rs5W89i/iXm0wdHZfFRDJ5YTswen69EBRBkGBtDQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "sqlfluff";
|
||||
version = "0.9.4";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-KNYxHBtPRsxEFrBJsfz5G7ZRZpVQxOph9UUKKhbHA9Y=";
|
||||
hash = "sha256-kWGj0THunXXv3fz9oRLPx314bBU8mdHElmz0v7ALNpE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
||||
@ -43,7 +43,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
description = "An IDE for programming in MIPS assembly language intended for educational-level use";
|
||||
homepage = "https://courses.missouristate.edu/KenVollmar/MARS/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ angustrau ];
|
||||
maintainers = with maintainers; [ emilytrau ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Graphical front-end for command-line debuggers";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ angustrau ];
|
||||
maintainers = with lib.maintainers; [ emilytrau ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
|
||||
description = "New user interface for spim, a MIPS simulator";
|
||||
homepage = "http://spimsimulator.sourceforge.net/";
|
||||
license = licenses.bsdOriginal;
|
||||
maintainers = with maintainers; [ angustrau ];
|
||||
maintainers = with maintainers; [ emilytrau ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
|
||||
description = "A MIPS32 simulator";
|
||||
homepage = "http://spimsimulator.sourceforge.net/";
|
||||
license = licenses.bsdOriginal;
|
||||
maintainers = with maintainers; [ angustrau ];
|
||||
maintainers = with maintainers; [ emilytrau ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "A simple but powerful graphical interface to gdb";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ angustrau ];
|
||||
maintainers = with maintainers; [ emilytrau ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
24
pkgs/games/itch-setup/default.nix
Normal file
24
pkgs/games/itch-setup/default.nix
Normal file
@ -0,0 +1,24 @@
|
||||
{ lib, writeShellScriptBin, steam-run, fetchurl }:
|
||||
let
|
||||
|
||||
pname = "itch-setup";
|
||||
version = "1.26.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://broth.itch.ovh/itch-setup/linux-amd64/${version}/unpacked/default";
|
||||
hash = "sha256-bcJKqhgZK42Irx12BIvbTDMb/DHEOEXljetlDokF7x8=";
|
||||
executable = true;
|
||||
};
|
||||
|
||||
in
|
||||
(writeShellScriptBin pname ''exec ${steam-run}/bin/steam-run ${src} "$@"'') // {
|
||||
|
||||
passthru = { inherit pname version src; };
|
||||
meta = with lib; {
|
||||
description = "An installer for the itch.io desktop app";
|
||||
homepage = "https://github.com/itchio/itch-setup";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ pasqui23 ];
|
||||
};
|
||||
}
|
||||
64
pkgs/games/itch/default.nix
Normal file
64
pkgs/games/itch/default.nix
Normal file
@ -0,0 +1,64 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchurl
|
||||
, libnotify
|
||||
, nss
|
||||
, gtk3
|
||||
, fetchFromGitHub
|
||||
, makeDesktopItem
|
||||
, itch-setup
|
||||
, runtimeShell
|
||||
}:
|
||||
stdenvNoCC.mkDerivation rec{
|
||||
pname = "itch";
|
||||
version = "25.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "itchio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Pi3l3uK4kr+N3p7fGQuqckYIzycRqJHDVX00reoSbp4=";
|
||||
};
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = pname;
|
||||
exec = pname;
|
||||
icon = pname;
|
||||
desktopName = pname;
|
||||
mimeType = "x-scheme-handler/itchio;x-scheme-handler/itch";
|
||||
comment = "Install and play itch.io games easily";
|
||||
extraDesktopEntries = {
|
||||
TryExec = "itch %U";
|
||||
Categories = "Game;";
|
||||
};
|
||||
})
|
||||
];
|
||||
|
||||
itchBin = ''
|
||||
#!${runtimeShell}
|
||||
exec ${itch-setup}/bin/itch-setup --prefer-launch -- "$@"
|
||||
'';
|
||||
|
||||
passAsFile = [ "itchBin" ];
|
||||
|
||||
# as taken from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=itch
|
||||
installPhase = ''
|
||||
install -Dm0777 $itchBinPath $out/bin/itch
|
||||
for icon in release/images/itch-icons/icon*.png
|
||||
do
|
||||
iconsize="''${icon#release/images/itch-icons/icon}"
|
||||
iconsize="''${iconsize%.png}"
|
||||
icondir="$out/share/icons/hicolor/''${iconsize}x''${iconsize}/apps/"
|
||||
install -Dm644 "$icon" "$icondir/itch.png"
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "The best way to play itch.io games";
|
||||
homepage = "https://github.com/itchio/itch";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ pasqui23 ];
|
||||
};
|
||||
}
|
||||
@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
|
||||
Escape from a hostile computer system! Harvest data to create an armada of battle-processes to aid your escape! Take command directly and play the game as an RTS, or use the game's built-in editor and compiler to write your own unit AI in a simplified version of C.
|
||||
'';
|
||||
homepage = "https://linleyh.itch.io/liberation-circuit";
|
||||
maintainers = with maintainers; [ angustrau ];
|
||||
maintainers = with maintainers; [ emilytrau ];
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
@ -4,32 +4,40 @@
|
||||
, SDL2
|
||||
, SDL2_net
|
||||
, alsa-lib
|
||||
, copyDesktopItems
|
||||
, fluidsynth
|
||||
, gtest
|
||||
, libGL
|
||||
, libGLU
|
||||
, libogg
|
||||
, libpng
|
||||
, libslirp
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, meson
|
||||
, libmt32emu
|
||||
, ninja
|
||||
, opusfile
|
||||
, pkg-config
|
||||
, libpulseaudio
|
||||
, glib
|
||||
, libjack2
|
||||
, libsndfile
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dosbox-staging";
|
||||
version = "0.77.1";
|
||||
version = "0.78.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "07jwmmm1bhfxavlhl854cj8l5iy5hqx5hpwkkjbcwqg7yh9jfs2x";
|
||||
hash = "sha256-gozFZcJorZtbEK0joksig6qWmAMy03hmBHiyJMONfpk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
gtest
|
||||
makeWrapper
|
||||
meson
|
||||
@ -42,42 +50,63 @@ stdenv.mkDerivation rec {
|
||||
SDL2_net
|
||||
alsa-lib
|
||||
fluidsynth
|
||||
glib
|
||||
libGL
|
||||
libGLU
|
||||
libjack2
|
||||
libmt32emu
|
||||
libogg
|
||||
libpng
|
||||
libpulseaudio
|
||||
libslirp
|
||||
libsndfile
|
||||
opusfile
|
||||
];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
"-I${SDL2_net}/include/SDL2"
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"--buildtype=release"
|
||||
"-Db_asneeded=true"
|
||||
"-Ddefault_library=static"
|
||||
"-Dfluidsynth:enable-floats=true"
|
||||
"-Dfluidsynth:try-static-deps=true"
|
||||
"-Dtry_static_libs=png"
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "dosbox-staging";
|
||||
exec = "dosbox-staging";
|
||||
icon = "dosbox-staging";
|
||||
comment = "x86 dos emulator enhanced";
|
||||
desktopName = "DosBox-Staging";
|
||||
genericName = "DOS emulator";
|
||||
categories = "Emulator;Game;";
|
||||
})
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
# Rename binary, add a wrapper, and copy manual to avoid conflict with
|
||||
# vanilla dosbox. Doing it this way allows us to work with frontends and
|
||||
# original dosbox. Doing it this way allows us to work with frontends and
|
||||
# launchers that expect the binary to be named dosbox, but get out of the
|
||||
# way of vanilla dosbox if the user desires to install that as well.
|
||||
|
||||
mv $out/bin/dosbox $out/bin/${pname}
|
||||
makeWrapper $out/bin/dosbox-staging $out/bin/dosbox
|
||||
cp $out/share/man/man1/dosbox.1.gz $out/share/man/man1/${pname}.1.gz
|
||||
|
||||
# Create a symlink to dosbox manual instead of merely copying it
|
||||
pushd $out/share/man/man1/
|
||||
mv dosbox.1.gz ${pname}.1.gz
|
||||
ln -s ${pname}.1.gz dosbox.1.gz
|
||||
popd
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://dosbox-staging.github.io/";
|
||||
description = "A modernized DOS emulator";
|
||||
longDescription = ''
|
||||
DOSBox Staging is an attempt to revitalize DOSBox's development
|
||||
process. It's not a rewrite, but a continuation and improvement on the
|
||||
existing DOSBox codebase while leveraging modern development tools and
|
||||
practices.
|
||||
'';
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ joshuafern ];
|
||||
maintainers = with maintainers; [ joshuafern AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
priority = 101;
|
||||
};
|
||||
}
|
||||
# TODO: report upstream about not finding SDL2_net
|
||||
|
||||
@ -795,7 +795,7 @@ let
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=faustinoaq.lex-flex-yacc-bison";
|
||||
homepage = "https://github.com/faustinoaq/vscode-lex-flex-yacc-bison";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ angustrau ];
|
||||
maintainers = with maintainers; [ emilytrau ];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2022.2.3";
|
||||
version = "2022.2.5";
|
||||
components = {
|
||||
"abode" = ps: with ps; [ abodepy ];
|
||||
"accuweather" = ps: with ps; [ accuweather ];
|
||||
|
||||
@ -121,7 +121,7 @@ let
|
||||
extraBuildInputs = extraPackages python.pkgs;
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2022.2.3";
|
||||
hassVersion = "2022.2.5";
|
||||
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
@ -139,7 +139,7 @@ in python.pkgs.buildPythonApplication rec {
|
||||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = version;
|
||||
hash = "sha256:OqyWm7O8ajxBlWGzvNhZvFmy5p2dINfMQ3cQ304Er18=";
|
||||
hash = "sha256-BQrhZCmPbhu7fB5/tqr6LxpzOKPq9fPDXBrQPOv0yA4=";
|
||||
};
|
||||
|
||||
# leave this in, so users don't have to constantly update their downstream patch handling
|
||||
|
||||
@ -13,6 +13,7 @@ let
|
||||
google_translate = [ mutagen ];
|
||||
nest = [ ha-av ];
|
||||
onboarding = [ pymetno rpi-bad-power ];
|
||||
version = [ aioaseko ];
|
||||
voicerss = [ mutagen ];
|
||||
yandextts = [ mutagen ];
|
||||
zha = [ pydeconz ];
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "grafana";
|
||||
version = "8.3.5";
|
||||
version = "8.3.6";
|
||||
|
||||
excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)";
|
||||
|
||||
@ -10,15 +10,15 @@ buildGoModule rec {
|
||||
rev = "v${version}";
|
||||
owner = "grafana";
|
||||
repo = "grafana";
|
||||
sha256 = "sha256-frkrYDiPxP3zDpZyYp/9MbNthaJlBF4Z+DdBs2G4jE8=";
|
||||
sha256 = "sha256-XYgSXgZJKsVYMtlvMq84OuQBbrbFJUh6m/lKCbOlzus=";
|
||||
};
|
||||
|
||||
srcStatic = fetchurl {
|
||||
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
|
||||
sha256 = "sha256-1gk9MK110K5bV3hIPAE2dSS8wgH12dxvmNu3Ku/42e0=";
|
||||
sha256 = "sha256-8gR95+xCJD3e25WxbmtXBMsS7HdbB+vwrcZ9sApSxFk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Wg4VELJyrR/VbaFNamoziRU66GTVJxBUZ1vluKjn0O8=";
|
||||
vendorSha256 = "sha256:0bj9a45jciaayqlrakdndzjdw4x600xw48wwy1id4n50h2mkrbp8";
|
||||
|
||||
nativeBuildInputs = [ wire ];
|
||||
|
||||
|
||||
@ -10,6 +10,7 @@
|
||||
, bzip2, lz4, lzo, snappy, xz, zlib, zstd
|
||||
, cracklib, judy, libevent, libxml2
|
||||
, linux-pam, numactl, pmdk
|
||||
, fmt_8
|
||||
, withStorageMroonga ? true, kytea, libsodium, msgpack, zeromq
|
||||
, withStorageRocks ? true
|
||||
}:
|
||||
@ -173,7 +174,8 @@ in stdenv.mkDerivation (common // {
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ linux-pam ]
|
||||
++ lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) pmdk.dev
|
||||
++ lib.optional (!stdenv.hostPlatform.isDarwin) mytopEnv
|
||||
++ lib.optionals withStorageMroonga [ kytea libsodium msgpack zeromq ];
|
||||
++ lib.optionals withStorageMroonga [ kytea libsodium msgpack zeromq ]
|
||||
++ lib.optionals (lib.versionAtLeast common.version "10.7") [ fmt_8 ];
|
||||
|
||||
patches = common.patches;
|
||||
|
||||
@ -235,17 +237,27 @@ in stdenv.mkDerivation (common // {
|
||||
in {
|
||||
mariadb_104 = mariadbPackage {
|
||||
# Supported until 2024-06-18
|
||||
version = "10.4.22";
|
||||
sha256 = "000ca1hdnj2jg051cjgdd2ralgwgh2p8nwb1x6b85202xdpc7ga4";
|
||||
version = "10.4.23";
|
||||
sha256 = "1wlhjd1xvk6p2lb93v8kfjk1scyjz882fx0i0sjyyk047mh2i852";
|
||||
};
|
||||
mariadb_105 = mariadbPackage {
|
||||
# Supported until 2025-06-24
|
||||
version = "10.5.13";
|
||||
sha256 = "0n0w1pyypv6wsknaqyykj3lc9zv6smji4q5jcf90w4rid330iw0n";
|
||||
version = "10.5.14";
|
||||
sha256 = "02y292mfvr6ils4m61lh9vy74z3w2xkz6xinpgg9wl5h7q29gzaf";
|
||||
};
|
||||
mariadb_106 = mariadbPackage {
|
||||
# Supported until 2026-07
|
||||
version = "10.6.5";
|
||||
sha256 = "13qaqb2h6kysfdi3h1l9zbb2qlpjgxb1n8mxnj5jm96r50209gp0";
|
||||
version = "10.6.6";
|
||||
sha256 = "1hz1iwkgrlhhrn5ypxszfp5ngfmfakjxl3ihzsm4845xhzn1fr77";
|
||||
};
|
||||
mariadb_107 = mariadbPackage {
|
||||
# Supported until 2023-02
|
||||
version = "10.7.2";
|
||||
sha256 = "1cx5s8vq7s3r4w1drmp549kl2nyijzq6ds2mcjyzc7bk9ylipx6p";
|
||||
};
|
||||
mariadb_108 = mariadbPackage {
|
||||
# Supported until 2023-05
|
||||
version = "10.8.1";
|
||||
sha256 = "0ns0z8w3374jrfdrmq7ncag089xwmf7wkr5aq3p9shk1b5mln9z2";
|
||||
};
|
||||
}
|
||||
|
||||
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
|
||||
url = "https://static.realvnc.com/media/documents/LICENSE-4.0a_en.pdf";
|
||||
free = false;
|
||||
};
|
||||
maintainers = with maintainers; [ angustrau ];
|
||||
maintainers = with maintainers; [ emilytrau ];
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -54,7 +54,7 @@ python3Packages.buildPythonApplication rec {
|
||||
description = "A modern emoji picker for Linux";
|
||||
homepage = "https://github.com/tom-james-watson/emote";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ angustrau ];
|
||||
maintainers = with maintainers; [ emilytrau ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -13,9 +13,6 @@ buildGoModule rec {
|
||||
|
||||
vendorSha256 = "sha256-eiFG6lgsY5hf+XT3Kf5uA4Ai8vBbPsh1T4ObV+rj30Y=";
|
||||
|
||||
# remove when built with >= go 1.17
|
||||
tags = [ "zip117" ];
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
|
||||
|
||||
excludedPackages = [ "kobotest" ];
|
||||
|
||||
@ -1,31 +1,116 @@
|
||||
{ lib, fetchurl, appimageTools }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, zlib
|
||||
, libusb1
|
||||
, libGL
|
||||
, qmake
|
||||
, wrapQtAppsHook
|
||||
, mkDerivation
|
||||
|
||||
, qttools
|
||||
, qtbase
|
||||
, qt3d
|
||||
, qtsvg
|
||||
, qtserialport
|
||||
, qtdeclarative
|
||||
, qtquickcontrols
|
||||
, qtquickcontrols2
|
||||
, qtgraphicaleffects
|
||||
, qtwayland
|
||||
}:
|
||||
let
|
||||
pname = "qflipper";
|
||||
version = "0.5.3";
|
||||
name = "${pname}-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://update.flipperzero.one/builds/qFlipper/${version}/qFlipper-x86_64-${version}.AppImage";
|
||||
sha256 = "sha256-UFGFl1zb0t1y7FBd5EX1YS3npWM5slL/wLiTOF/CLNM=";
|
||||
version = "0.8.2";
|
||||
timestamp = "99999999999";
|
||||
commit = "nix-${version}";
|
||||
hash = "sha256-BaqKlF2SZueykFhtj91McP39oXYAx+lz8eXhn5eouqg=";
|
||||
|
||||
udev_rules = ''
|
||||
#Flipper Zero serial port
|
||||
SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="5740", ATTRS{manufacturer}=="Flipper Devices Inc.", TAG+="uaccess"
|
||||
#Flipper Zero DFU
|
||||
SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", ATTRS{manufacturer}=="STMicroelectronics", TAG+="uaccess"
|
||||
'';
|
||||
|
||||
in
|
||||
mkDerivation {
|
||||
pname = "qFlipper";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flipperdevices";
|
||||
repo = "qFlipper";
|
||||
rev = version;
|
||||
inherit hash;
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
appimageContents = appimageTools.extractType2 { inherit name src; };
|
||||
|
||||
in appimageTools.wrapType2 {
|
||||
inherit name src;
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
qmake
|
||||
qttools
|
||||
];
|
||||
|
||||
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ];
|
||||
buildInputs = [
|
||||
zlib
|
||||
libusb1
|
||||
libGL
|
||||
wrapQtAppsHook
|
||||
|
||||
extraInstallCommands = ''
|
||||
mv $out/bin/${name} $out/bin/qFlipper
|
||||
install -m 444 -D ${appimageContents}/qFlipper.desktop -t $out/share/applications
|
||||
cp -r ${appimageContents}/usr/share/icons $out/share
|
||||
qtbase
|
||||
qt3d
|
||||
qtsvg
|
||||
qtserialport
|
||||
qtdeclarative
|
||||
qtquickcontrols
|
||||
qtquickcontrols2
|
||||
qtgraphicaleffects
|
||||
] ++ lib.optionals (stdenv.isLinux) [
|
||||
qtwayland
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
substituteInPlace qflipper_common.pri \
|
||||
--replace 'GIT_VERSION = unknown' 'GIT_VERSION = "${version}"' \
|
||||
--replace 'GIT_TIMESTAMP = 0' 'GIT_TIMESTAMP = ${timestamp}' \
|
||||
--replace 'GIT_COMMIT = unknown' 'GIT_COMMIT = "${commit}"'
|
||||
cat qflipper_common.pri
|
||||
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
${lib.optionalString stdenv.isLinux ''
|
||||
install -Dm755 qFlipper $out/bin/qFlipper
|
||||
''}
|
||||
${lib.optionalString stdenv.isDarwin ''
|
||||
install -Dm755 qFlipper.app/Contents/MacOS/qFlipper $out/bin/qFlipper
|
||||
''}
|
||||
cp qFlipperTool $out/bin
|
||||
|
||||
mkdir -p $out/share/applications
|
||||
cp installer-assets/appimage/qFlipper.desktop $out/share/applications
|
||||
|
||||
mkdir -p $out/share/icons
|
||||
cp application/assets/icons/qFlipper.png $out/share/icons
|
||||
|
||||
mkdir -p $out/etc/udev/rules.d
|
||||
tee $out/etc/udev/rules.d/42-flipperzero.rules << EOF
|
||||
${udev_rules}
|
||||
EOF
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cross-platform desktop tool to manage your flipper device";
|
||||
homepage = "https://flipperzero.one/";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ wolfangaukang ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ cab404 ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; # qtbase doesn't build yet on aarch64-darwin
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -35,7 +35,7 @@ in appimageTools.wrapType2 {
|
||||
description = "Yet another keyboard configurator";
|
||||
homepage = "https://caniusevia.com/";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ angustrau ];
|
||||
maintainers = with maintainers; [ emilytrau ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "New test TCP program";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ angustrau ];
|
||||
maintainers = with maintainers; [ emilytrau ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Network Benchmarking Utility";
|
||||
homepage = "https://github.com/Mellanox/sockperf";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ angustrau ];
|
||||
maintainers = with maintainers; [ emilytrau ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, fetchurl, jre, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.0.32";
|
||||
version = "3.0.33";
|
||||
pname = "swagger-codegen";
|
||||
|
||||
jarfilename = "${pname}-cli-${version}.jar";
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://maven/io/swagger/codegen/v3/${pname}-cli/${version}/${jarfilename}";
|
||||
sha256 = "sha256-FPSBnM2MLmYVb0A27UhDp5D3oWJlrjZlMYDEr3qwmDY=";
|
||||
sha256 = "sha256-1oGir5F3wgwRQxz3eXI58wMIKYwvtHrRW4VJh0hIVyE=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wg-netmanager";
|
||||
version = "0.4.1";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gin66";
|
||||
repo = "wg_netmanager";
|
||||
rev = "wg_netmanager-v${version}";
|
||||
sha256 = "AAtSSBz2zGLIEpcEMbe1mfYZikiaYEI+6KeSL5n54PE=";
|
||||
sha256 = "sha256-2LO1OCGlkjdszwgNBZ+Qwp126VfDq3pxf0Gz+6kzuPI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "17k83QkQDq5uRCRADRLD2Q7pv7yES20lpms/N/UK+BM=";
|
||||
cargoSha256 = "sha256-EM0TPMyWMVpLFhan0boAQoAvMHBVgXp6mnYJLHOHiV8=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# frozen_string_literal: true
|
||||
source "https://rubygems.org"
|
||||
|
||||
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.28"
|
||||
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.29"
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
GIT
|
||||
remote: https://github.com/rapid7/metasploit-framework
|
||||
revision: b8975cbd6552cc52044250143ffc440775a8a29e
|
||||
ref: refs/tags/6.1.28
|
||||
revision: 61b21e59fe8f4f65fba27f88d49782dece0aad00
|
||||
ref: refs/tags/6.1.29
|
||||
specs:
|
||||
metasploit-framework (6.1.28)
|
||||
metasploit-framework (6.1.29)
|
||||
actionpack (~> 6.0)
|
||||
activerecord (~> 6.0)
|
||||
activesupport (~> 6.0)
|
||||
@ -31,7 +31,7 @@ GIT
|
||||
metasploit-concern
|
||||
metasploit-credential
|
||||
metasploit-model
|
||||
metasploit-payloads (= 2.0.71)
|
||||
metasploit-payloads (= 2.0.72)
|
||||
metasploit_data_models
|
||||
metasploit_payloads-mettle (= 1.0.18)
|
||||
mqtt
|
||||
@ -128,7 +128,7 @@ GEM
|
||||
arel-helpers (2.14.0)
|
||||
activerecord (>= 3.1.0, < 8)
|
||||
aws-eventstream (1.2.0)
|
||||
aws-partitions (1.552.0)
|
||||
aws-partitions (1.554.0)
|
||||
aws-sdk-core (3.126.0)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
aws-partitions (~> 1, >= 1.525.0)
|
||||
@ -251,7 +251,7 @@ GEM
|
||||
activemodel (~> 6.0)
|
||||
activesupport (~> 6.0)
|
||||
railties (~> 6.0)
|
||||
metasploit-payloads (2.0.71)
|
||||
metasploit-payloads (2.0.72)
|
||||
metasploit_data_models (5.0.4)
|
||||
activerecord (~> 6.0)
|
||||
activesupport (~> 6.0)
|
||||
@ -292,7 +292,7 @@ GEM
|
||||
pcaprub
|
||||
patch_finder (1.0.2)
|
||||
pcaprub (0.13.1)
|
||||
pdf-reader (2.9.0)
|
||||
pdf-reader (2.9.1)
|
||||
Ascii85 (~> 1.0)
|
||||
afm (~> 0.2.1)
|
||||
hashery (~> 2.0)
|
||||
@ -379,7 +379,7 @@ GEM
|
||||
ruby-macho (3.0.0)
|
||||
ruby-rc4 (0.1.5)
|
||||
ruby2_keywords (0.0.5)
|
||||
ruby_smb (3.0.1)
|
||||
ruby_smb (3.0.2)
|
||||
bindata
|
||||
openssl-ccm
|
||||
openssl-cmac
|
||||
@ -446,4 +446,4 @@ DEPENDENCIES
|
||||
metasploit-framework!
|
||||
|
||||
BUNDLED WITH
|
||||
2.2.24
|
||||
2.3.6
|
||||
|
||||
@ -15,13 +15,13 @@ let
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "metasploit-framework";
|
||||
version = "6.1.28";
|
||||
version = "6.1.29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rapid7";
|
||||
repo = "metasploit-framework";
|
||||
rev = version;
|
||||
sha256 = "sha256-3l9yBnOejCVSo/zw46mGv3uBoArtyOPbjE1l8CoVNkg=";
|
||||
sha256 = "sha256-S0R9D6Tih9+aVdYkpAodfwcRCq8WaqaJ5oYuPl7PgK8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -104,10 +104,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0wr4jkylfkd89970hw3akfy7vyj54qz11gq3aar48j8p9px0gl17";
|
||||
sha256 = "0c5dyi1hy9xawlicdfzakj279r514vmb93kpwfa92lbb9bz1plg5";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.552.0";
|
||||
version = "1.554.0";
|
||||
};
|
||||
aws-sdk-core = {
|
||||
groups = ["default"];
|
||||
@ -684,12 +684,12 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
fetchSubmodules = false;
|
||||
rev = "b8975cbd6552cc52044250143ffc440775a8a29e";
|
||||
sha256 = "0j1n2lmg0radikdy7j7d1ah82yxzhsly7w7wld92b34yfc374pyy";
|
||||
rev = "61b21e59fe8f4f65fba27f88d49782dece0aad00";
|
||||
sha256 = "1bw0rxg3wbl6ws4scshnmw5121vz3l5a896nanddz1z2lh7psi2b";
|
||||
type = "git";
|
||||
url = "https://github.com/rapid7/metasploit-framework";
|
||||
};
|
||||
version = "6.1.28";
|
||||
version = "6.1.29";
|
||||
};
|
||||
metasploit-model = {
|
||||
groups = ["default"];
|
||||
@ -706,10 +706,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "12fr3v5mjwlilnlccnbimamz6sq6kckf16vgzpfpgi8gjma3lgb9";
|
||||
sha256 = "0ybw1daczslifq684hjxmr5668w7db1fi0z6g53812yva7lf4sv6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.71";
|
||||
version = "2.0.72";
|
||||
};
|
||||
metasploit_data_models = {
|
||||
groups = ["default"];
|
||||
@ -967,10 +967,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1fh2pq3gk5fh18g71wir98k4bz4rvihhx8qmn8zi9fz6yfqx39qj";
|
||||
sha256 = "0pn5l3ayjfn4mv2079q80q0x3q39q25nxcc5l9cjqz4lf5anhlfi";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.9.0";
|
||||
version = "2.9.1";
|
||||
};
|
||||
pg = {
|
||||
groups = ["default"];
|
||||
@ -1357,10 +1357,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0mf3mzxq83y7i8nr6bcl5yacvfz6y5p3hdmvr1m6xq0l0i9a9axy";
|
||||
sha256 = "13sp6bqgj06h7jkw5qvafwawfh2akyrsj38vq8qkjfjdg79pkbxf";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.0.1";
|
||||
version = "3.0.2";
|
||||
};
|
||||
rubyntlm = {
|
||||
groups = ["default"];
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "terrascan";
|
||||
version = "1.13.0";
|
||||
version = "1.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "accurics";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-HV9WOJ8bWu8Uk1tXMZWqvo3ZvFiWLMGKmw6HzHBxSBY=";
|
||||
sha256 = "sha256-GIonoedad/ruKN8DaFfFdW4l3ZWIM1NI5DtgBYPw+38=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-MB3/iIStqNBM9YnNaRpV4hbs1gZzWm+7B+qHHm0kOmU=";
|
||||
vendorSha256 = "sha256-h/mSF4hJ3TS+4b3CCUEXVin8MRcPg8qEe90Mcxk0uVo=";
|
||||
|
||||
# Tests want to download a vulnerable Terraform project
|
||||
doCheck = false;
|
||||
|
||||
25
pkgs/tools/text/goawk/default.nix
Normal file
25
pkgs/tools/text/goawk/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ buildGoModule, fetchFromGitHub, lib }:
|
||||
buildGoModule rec {
|
||||
pname = "goawk";
|
||||
version = "1.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "benhoyt";
|
||||
repo = "goawk";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gd26j6c8ORy0qkeHvwPFLkymeRiFr8MLxJ6hIrBwAZw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
|
||||
|
||||
# checks do not pass at the moment
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A POSIX-compliant AWK interpreter written in Go";
|
||||
homepage = "https://benhoyt.com/writings/goawk/";
|
||||
license = licenses.mit;
|
||||
mainProgram = "goawk";
|
||||
maintainers = with maintainers; [ abbe ];
|
||||
};
|
||||
}
|
||||
@ -982,6 +982,7 @@ mapAliases ({
|
||||
QmidiNet = qmidinet; # Added 2016-05-22
|
||||
qca-qt5 = libsForQt5.qca-qt5; # Added 2015-12-19
|
||||
qcsxcad = libsForQt5.qcsxcad; # Added 2020-11-05
|
||||
qflipper = qFlipper; # Added 2022-02-11
|
||||
qmk_firmware = throw "qmk_firmware has been removed because it was broken"; # Added 2021-04-02
|
||||
qr-filetransfer = throw ''"qr-filetransfer" has been renamed to "qrcp"''; # Added 2020-12-02
|
||||
qt-3 = throw "qt-3 has been removed from nixpkgs, as it's unmaintained and insecure"; # Added 2021-02-15
|
||||
|
||||
@ -1055,7 +1055,7 @@ with pkgs;
|
||||
|
||||
pferd = callPackage ../tools/misc/pferd {};
|
||||
|
||||
qflipper = callPackage ../tools/misc/qflipper { };
|
||||
qFlipper = libsForQt515.callPackage ../tools/misc/qflipper { };
|
||||
|
||||
quich = callPackage ../tools/misc/quich { } ;
|
||||
|
||||
@ -1917,6 +1917,10 @@ with pkgs;
|
||||
|
||||
ipgrep = callPackage ../tools/networking/ipgrep { };
|
||||
|
||||
itch = callPackage ../games/itch {};
|
||||
|
||||
itch-setup = callPackage ../games/itch-setup {};
|
||||
|
||||
lastpass-cli = callPackage ../tools/security/lastpass-cli { };
|
||||
|
||||
leetcode-cli = callPackage ../applications/misc/leetcode-cli { };
|
||||
@ -3197,6 +3201,8 @@ with pkgs;
|
||||
|
||||
goa = callPackage ../development/tools/goa { };
|
||||
|
||||
goawk = callPackage ../tools/text/goawk { };
|
||||
|
||||
gohai = callPackage ../tools/system/gohai { };
|
||||
|
||||
gorilla-bin = callPackage ../tools/security/gorilla-bin { };
|
||||
@ -21494,6 +21500,8 @@ with pkgs;
|
||||
mariadb_104
|
||||
mariadb_105
|
||||
mariadb_106
|
||||
mariadb_107
|
||||
mariadb_108
|
||||
;
|
||||
mariadb = mariadb_106;
|
||||
|
||||
@ -27504,6 +27512,8 @@ with pkgs;
|
||||
nootka = qt5.callPackage ../applications/audio/nootka { };
|
||||
nootka-unstable = qt5.callPackage ../applications/audio/nootka/unstable.nix { };
|
||||
|
||||
novnc = callPackage ../applications/networking/novnc { };
|
||||
|
||||
nwg-drawer = callPackage ../applications/misc/nwg-drawer { };
|
||||
|
||||
nwg-launchers = callPackage ../applications/misc/nwg-launchers { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user