Merge branch 'staging-next' into staging
This commit is contained in:
Jan Tojnar
commit
5af93e6908
58 changed files with 792 additions and 382 deletions
4
.github/CODEOWNERS
vendored
4
.github/CODEOWNERS
vendored
|
|
@ -192,8 +192,8 @@
|
|||
/nixos/tests/knot.nix @mweinelt
|
||||
|
||||
# Dhall
|
||||
/pkgs/development/dhall-modules @Gabriel439 @Profpatsch @ehmry
|
||||
/pkgs/development/interpreters/dhall @Gabriel439 @Profpatsch @ehmry
|
||||
/pkgs/development/dhall-modules @Gabriella439 @Profpatsch @ehmry
|
||||
/pkgs/development/interpreters/dhall @Gabriella439 @Profpatsch @ehmry
|
||||
|
||||
# Idris
|
||||
/pkgs/development/idris-modules @Infinisil
|
||||
|
|
|
|||
|
|
@ -37,13 +37,11 @@ in
|
|||
{ assertion = cfg.efi -> cfg.hvm;
|
||||
message = "EC2 instances using EFI must be HVM instances.";
|
||||
}
|
||||
{ assertion = versionOlder config.boot.kernelPackages.kernel.version "5.15";
|
||||
message = "ENA driver fails to build with kernel >= 5.15";
|
||||
{ assertion = versionOlder config.boot.kernelPackages.kernel.version "5.17";
|
||||
message = "ENA driver fails to build with kernel >= 5.17";
|
||||
}
|
||||
];
|
||||
|
||||
boot.kernelPackages = pkgs.linuxKernel.packages.linux_5_10;
|
||||
|
||||
boot.growPartition = cfg.hvm;
|
||||
|
||||
fileSystems."/" = mkIf (!cfg.zfs.enable) {
|
||||
|
|
|
|||
|
|
@ -38,13 +38,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cudatext";
|
||||
version = "1.163.0";
|
||||
version = "1.164.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alexey-T";
|
||||
repo = "CudaText";
|
||||
rev = version;
|
||||
sha256 = "sha256-4jGLyAE202GAjaypubKGW1edyKqOti/yTwstC/R94iE=";
|
||||
sha256 = "sha256-LKLWZiA3Ya8xI2QvNW2f+5akndBloj5pQ7QNaVMoYSI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
},
|
||||
"ATFlatControls": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.04.18",
|
||||
"sha256": "sha256-Bp/pkbTPLiVaDSstzTaNjKb+msPw8Tuny75n/aYBpUc="
|
||||
"rev": "2022.05.06",
|
||||
"sha256": "sha256-mYZ3mgtUpQ8sry5WmdluHca/CR7RqR9GRrxIoeZFLes="
|
||||
},
|
||||
"ATSynEdit": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.04.26",
|
||||
"sha256": "sha256-aItWkjnFqxeyEywELEBkuvMH1zfI4jJFL10CexSktxU="
|
||||
"rev": "2022.05.09",
|
||||
"sha256": "sha256-bzBO9Uf8Zkt/kFouQuiPagL7e+86ezH/mOpDCuInJlE="
|
||||
},
|
||||
"ATSynEdit_Cmp": {
|
||||
"owner": "Alexey-T",
|
||||
|
|
@ -26,13 +26,13 @@
|
|||
},
|
||||
"EControl": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.04.21",
|
||||
"sha256": "sha256-le6ulGFUNjeipYQKzVFezFb9u/0IcQcu5BMxFaIZdyw="
|
||||
"rev": "2022.05.06",
|
||||
"sha256": "sha256-ppm8Wuxhi5N3Er0f0h9d+v2spwEMr7ksf9tz4vI42+M="
|
||||
},
|
||||
"ATSynEdit_Ex": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.04.11",
|
||||
"sha256": "sha256-wzE6lNhrXsBOP+Zx+qAcj6Hhf87qqDaqKf9up7I3ZUo="
|
||||
"rev": "2022.05.08",
|
||||
"sha256": "sha256-mAxqJ3PO1BCOYNctKfw/4fKbJsI7Ckb5PVcKdALZu0Q="
|
||||
},
|
||||
"Python-for-Lazarus": {
|
||||
"owner": "Alexey-T",
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ mkDerivation {
|
|||
'';
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/kgpg/";
|
||||
description = "Encryption tool";
|
||||
description = "A KDE based interface for GnuPG, a powerful encryption utility";
|
||||
license = [ lib.licenses.gpl2 ];
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@
|
|||
(fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; })
|
||||
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.0.0"; sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.4"; sha256 = "1zm9q9yvglsn5w786c9cjdfj1a8z4sipmvn9rhg3ps23rllxwmcc"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.4"; sha256 = "0g1vw0wr88zlfpdg2gz8c0mriasci1kzvjia4nj19j7b0zaga7f0"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.4"; sha256 = "1x1g3jhd57z1w3js7f6qa72vwvvjayvxzc2xxcqyscm9xy1fb3d4"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.4"; sha256 = "08mrvb71kldzla2j7v10ifxrc6bwsrd4bms2rqfb7rmx00qs6yj0"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.4"; sha256 = "0vgjwpy55mf6x22a634cdidckyq5hi941i9p10jqyrbnc637frv2"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.4"; sha256 = "1qasm6j25lmcc4xn7f7s3jli1pypz1kfnj7j9dkjlx9mc8r356zp"; })
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib
|
||||
, mkDerivation
|
||||
, stdenv
|
||||
, nix-update-script
|
||||
, fetchFromGitHub
|
||||
, substituteAll
|
||||
|
|
@ -11,61 +11,22 @@
|
|||
, qtmultimedia
|
||||
, qtx11extras
|
||||
, qttranslations
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
let
|
||||
singleapplication = fetchFromGitHub {
|
||||
owner = "itay-grudev";
|
||||
repo = "SingleApplication";
|
||||
rev = "v3.2.0";
|
||||
sha256 = "0w3z97dcqcz3bf7w6fja4smkafmx9kvhzb9px4k2nfmmyxh4yfma";
|
||||
};
|
||||
qtaskbarcontrol = fetchFromGitHub {
|
||||
owner = "Skycoder42";
|
||||
repo = "QTaskbarControl";
|
||||
rev = "2.0.2";
|
||||
sha256 = "0iymcvq3pv07fs9l4kh6hi1igqr7957iqndhsmg9fqkalf8nqyad";
|
||||
};
|
||||
qhotkey = fetchFromGitHub {
|
||||
owner = "Skycoder42";
|
||||
repo = "QHotkey";
|
||||
rev = "1.4.2";
|
||||
sha256 = "0391fkqrxqmzpvms4rk06aq05l308k6sadp6y3czq0gx2kng8mn9";
|
||||
};
|
||||
qonlinetranslator = fetchFromGitHub {
|
||||
owner = "crow-translate";
|
||||
repo = "QOnlineTranslator";
|
||||
rev = "1.5.3";
|
||||
sha256 = "sha256-L8y4vazbWD5SC7itxQOjEcX10w0laewxTOGz+Yd+kVM=";
|
||||
};
|
||||
circleflags = fetchFromGitHub {
|
||||
owner = "HatScripts";
|
||||
repo = "circle-flags";
|
||||
rev = "v2.3.0";
|
||||
sha256 = "sha256-KabmewF1Xf/1JQuzolrlRyLJR8O5j+/iT+29/QtOQVE=";
|
||||
};
|
||||
fluent = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = "Fluent-icon-theme";
|
||||
rev = "2021-08-15";
|
||||
sha256 = "sha256-uBu0vbKfhhnPKGwrnSBjPwS9ncH1iAlmeefAcpckOm4=";
|
||||
};
|
||||
in
|
||||
mkDerivation rec {
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crow-translate";
|
||||
version = "2.9.2";
|
||||
version = "2.9.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crow-translate";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-cxfBdoqGVmtCaXyw6QzXj2V44wKyVal/uqsddwIdvjw=";
|
||||
sha256 = "sha256-AzwJJ85vxXsc0+W3QM8citN5f0AD6APQVd9628cfLgI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./dont-fetch-external-libs.patch;
|
||||
inherit singleapplication qtaskbarcontrol qhotkey qonlinetranslator circleflags fluent;
|
||||
})
|
||||
(substituteAll {
|
||||
# See https://github.com/NixOS/nixpkgs/issues/86054
|
||||
src = ./fix-qttranslations-path.patch;
|
||||
|
|
@ -73,12 +34,7 @@ mkDerivation rec {
|
|||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
cp -r ${circleflags}/flags/* data/icons
|
||||
cp -r ${fluent}/src/* data/icons
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules qttools ];
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules qttools wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [ leptonica tesseract4 qtmultimedia qtx11extras ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,65 +0,0 @@
|
|||
diff --git i/CMakeLists.txt w/CMakeLists.txt
|
||||
index 375b17c..106efa9 100644
|
||||
--- i/CMakeLists.txt
|
||||
+++ w/CMakeLists.txt
|
||||
@@ -114,13 +114,11 @@ qt5_add_translation(QM_FILES
|
||||
)
|
||||
|
||||
configure_file(src/cmake.h.in cmake.h)
|
||||
-configure_file(data/icons/flags.qrc ${CircleFlags_SOURCE_DIR}/flags/flags.qrc COPYONLY)
|
||||
-configure_file(data/icons/fluent-icon-theme.qrc ${FluentIconTheme_SOURCE_DIR}/src/fluent-icon-theme.qrc COPYONLY)
|
||||
|
||||
add_executable(${PROJECT_NAME}
|
||||
- ${CircleFlags_SOURCE_DIR}/flags/flags.qrc
|
||||
+ data/icons/flags.qrc
|
||||
${QM_FILES}
|
||||
- ${FluentIconTheme_SOURCE_DIR}/src/fluent-icon-theme.qrc
|
||||
+ data/icons/fluent-icon-theme.qrc
|
||||
data/icons/engines/engines.qrc
|
||||
src/addlanguagedialog.cpp
|
||||
src/addlanguagedialog.ui
|
||||
diff --git i/cmake/ExternalLibraries.cmake w/cmake/ExternalLibraries.cmake
|
||||
index c92e745..f265f03 100644
|
||||
--- i/cmake/ExternalLibraries.cmake
|
||||
+++ w/cmake/ExternalLibraries.cmake
|
||||
@@ -2,34 +2,28 @@ include(FetchContent)
|
||||
|
||||
set(QAPPLICATION_CLASS QApplication)
|
||||
FetchContent_Declare(SingleApplication
|
||||
- GIT_REPOSITORY https://github.com/itay-grudev/SingleApplication
|
||||
- GIT_TAG v3.2.0
|
||||
+ SOURCE_DIR @singleapplication@
|
||||
)
|
||||
|
||||
FetchContent_Declare(QTaskbarControl
|
||||
- GIT_REPOSITORY https://github.com/Skycoder42/QTaskbarControl
|
||||
- GIT_TAG 2.0.2
|
||||
+ SOURCE_DIR @qtaskbarcontrol@
|
||||
)
|
||||
|
||||
option(QHOTKEY_INSTALL OFF)
|
||||
FetchContent_Declare(QHotkey
|
||||
- GIT_REPOSITORY https://github.com/Skycoder42/QHotkey
|
||||
- GIT_TAG 1.4.2
|
||||
+ SOURCE_DIR @qhotkey@
|
||||
)
|
||||
|
||||
FetchContent_Declare(QOnlineTranslator
|
||||
- GIT_REPOSITORY https://github.com/crow-translate/QOnlineTranslator
|
||||
- GIT_TAG 1.5.3
|
||||
+ SOURCE_DIR @qonlinetranslator@
|
||||
)
|
||||
|
||||
FetchContent_Declare(CircleFlags
|
||||
- GIT_REPOSITORY https://github.com/HatScripts/circle-flags
|
||||
- GIT_TAG v2.3.0
|
||||
+ SOURCE_DIR @circleflags@
|
||||
)
|
||||
|
||||
FetchContent_Declare(FluentIconTheme
|
||||
- GIT_REPOSITORY https://github.com/vinceliuice/Fluent-icon-theme
|
||||
- GIT_TAG 2021-08-15
|
||||
+ SOURCE_DIR @fluent@
|
||||
)
|
||||
|
||||
FetchContent_MakeAvailable(SingleApplication QTaskbarControl QHotkey QOnlineTranslator CircleFlags FluentIconTheme)
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"stable": {
|
||||
"version": "101.0.4951.54",
|
||||
"sha256": "1d808a7mvg0nd0mm20c1ny5kdvb2xvrs8vz4nnk456ix8pywcv62",
|
||||
"sha256bin64": "1m6s6xf2wvz535w6jskk3pnibvsjpzmbxvd9rlxmqr08y219gp5y",
|
||||
"version": "101.0.4951.64",
|
||||
"sha256": "1xyqm32y9v1hn8ji6qfw6maynqgg3266j58dq4x4aqsm2gj9cn4w",
|
||||
"sha256bin64": "14ijrj7h2y72ppyysz6jv40c01lbnan7z69cl24asch2zjlgwv8v",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-03-14",
|
||||
|
|
|
|||
|
|
@ -1,11 +1,7 @@
|
|||
{ stdenv, lib, callPackage, fetchurl, fetchpatch, nixosTests }:
|
||||
|
||||
let
|
||||
common = opts: callPackage (import ./common.nix opts) {};
|
||||
in
|
||||
{ stdenv, lib, callPackage, fetchurl, fetchpatch, nixosTests, buildMozillaMach }:
|
||||
|
||||
rec {
|
||||
firefox = common rec {
|
||||
firefox = buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "100.0";
|
||||
src = fetchurl {
|
||||
|
|
@ -30,7 +26,7 @@ rec {
|
|||
};
|
||||
};
|
||||
|
||||
firefox-esr-91 = common rec {
|
||||
firefox-esr-91 = buildMozillaMach rec {
|
||||
pname = "firefox-esr";
|
||||
version = "91.9.0esr";
|
||||
src = fetchurl {
|
||||
|
|
@ -54,30 +50,4 @@ rec {
|
|||
versionSuffix = "esr";
|
||||
};
|
||||
};
|
||||
|
||||
librewolf =
|
||||
let
|
||||
librewolf-src = callPackage ./librewolf { };
|
||||
in
|
||||
(common rec {
|
||||
pname = "librewolf";
|
||||
binaryName = "librewolf";
|
||||
version = librewolf-src.packageVersion;
|
||||
src = librewolf-src.firefox;
|
||||
inherit (librewolf-src) extraConfigureFlags extraPostPatch extraPassthru;
|
||||
|
||||
meta = {
|
||||
description = "A fork of Firefox, focused on privacy, security and freedom";
|
||||
homepage = "https://librewolf.net/";
|
||||
maintainers = with lib.maintainers; [ squalus ];
|
||||
inherit (firefox.meta) platforms badPlatforms broken maxSilent license;
|
||||
};
|
||||
updateScript = callPackage ./librewolf/update.nix {
|
||||
attrPath = "librewolf-unwrapped";
|
||||
};
|
||||
}).override {
|
||||
crashreporterSupport = false;
|
||||
enableOfficialBranding = false;
|
||||
pgoSupport = false; # Profiling gets stuck and doesn't terminate.
|
||||
};
|
||||
}
|
||||
|
|
|
|||
31
pkgs/applications/networking/browsers/librewolf/default.nix
Normal file
31
pkgs/applications/networking/browsers/librewolf/default.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{ stdenv, lib, callPackage, buildMozillaMach }:
|
||||
|
||||
let
|
||||
librewolf-src = callPackage ./librewolf.nix { };
|
||||
in
|
||||
(buildMozillaMach rec {
|
||||
pname = "librewolf";
|
||||
binaryName = "librewolf";
|
||||
version = librewolf-src.packageVersion;
|
||||
src = librewolf-src.firefox;
|
||||
inherit (librewolf-src) extraConfigureFlags extraPostPatch extraPassthru;
|
||||
|
||||
meta = {
|
||||
description = "A fork of Firefox, focused on privacy, security and freedom";
|
||||
homepage = "https://librewolf.net/";
|
||||
maintainers = with lib.maintainers; [ squalus ];
|
||||
platforms = lib.platforms.unix;
|
||||
badPlatforms = lib.platforms.darwin;
|
||||
broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory".
|
||||
# not in `badPlatforms` because cross-compilation on 64-bit machine might work.
|
||||
maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115)
|
||||
license = lib.licenses.mpl20;
|
||||
};
|
||||
updateScript = callPackage ./update.nix {
|
||||
attrPath = "librewolf-unwrapped";
|
||||
};
|
||||
}).override {
|
||||
crashreporterSupport = false;
|
||||
enableOfficialBranding = false;
|
||||
pgoSupport = false; # Profiling gets stuck and doesn't terminate.
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ callPackage, git }:
|
||||
{ callPackage }:
|
||||
let
|
||||
src = callPackage ./src.nix { };
|
||||
in
|
||||
|
|
@ -20,7 +20,7 @@ writeScript "update-librewolf" ''
|
|||
latestTag=$(curl https://gitlab.com/api/v4/projects/librewolf-community%2Fbrowser%2Fsource/repository/tags?per_page=1 | jq -r .[0].name)
|
||||
echo "latestTag=$latestTag"
|
||||
|
||||
srcJson=pkgs/applications/networking/browsers/firefox/librewolf/src.json
|
||||
srcJson=pkgs/applications/networking/browsers/librewolf/src.json
|
||||
localRev=$(jq -r .source.rev < $srcJson)
|
||||
echo "localRev=$localRev"
|
||||
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "terragrunt";
|
||||
version = "0.36.11";
|
||||
version = "0.37.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kXa3iG94WTH6KpQksl2r0yXyr4KuLY2AZdZtZ6zWYUA=";
|
||||
sha256 = "sha256-7nil/T6q1crZh9ARTP615UzfjKcgsclpIt2N1ifABBk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-7SUf4r+6r6dkBoBZFg2AUK114QEl0+1lwRA4ymYArFs=";
|
||||
|
|
|
|||
|
|
@ -12,15 +12,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "werf";
|
||||
version = "1.2.91";
|
||||
version = "1.2.99";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "werf";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ZafIG4D5TvAbXbo07gFajt8orTsju1GfF9a1OR0t1Oo=";
|
||||
sha256 = "sha256-D9NwVZGB0UV0tRe927GpxHzdvAeqcRJOYfocbbj6BRM=";
|
||||
};
|
||||
vendorSha256 = "sha256-U4eVQR/ExAENOg2XEYM+mFXANk+basdMLEcqSHuTsh4=";
|
||||
vendorSha256 = "sha256-ZMSTl9WFTF5x+tiQZ37ihVrOuLS0W5PjyXbbzyHJNsI=";
|
||||
proxyVendor = true;
|
||||
|
||||
nativeBuildInputs = [ installShellFiles pkg-config ];
|
||||
|
|
|
|||
|
|
@ -86,8 +86,6 @@ in stdenv.mkDerivation {
|
|||
++ lib.optionals stdenv.isLinux [ inotify-tools ]
|
||||
;
|
||||
|
||||
NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework CoreFoundation";
|
||||
|
||||
postInstall = ''
|
||||
mkdir $apparmor
|
||||
cat >$apparmor/bin.transmission-daemon <<EOF
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, addOpenGLRunpath
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, libelf
|
||||
|
|
@ -8,25 +9,31 @@
|
|||
, rpcsvc-proto
|
||||
, libtirpc
|
||||
, makeWrapper
|
||||
, substituteAll
|
||||
, go
|
||||
}:
|
||||
let
|
||||
modp-ver = "450.57";
|
||||
modprobeVersion = "495.44";
|
||||
nvidia-modprobe = fetchFromGitHub {
|
||||
owner = "NVIDIA";
|
||||
repo = "nvidia-modprobe";
|
||||
rev = modp-ver;
|
||||
sha256 = "0r4f6lpbbqqs9932xd2mr7bxn6a3xdalcwq332fc1amrrkgzfyv7";
|
||||
rev = modprobeVersion;
|
||||
sha256 = "sha256-Y3ZOfge/EcmhqI19yWO7UfPqkvY1CHHvFC5l9vYyGuU=";
|
||||
};
|
||||
modprobePatch = substituteAll {
|
||||
src = ./modprobe.patch;
|
||||
inherit modprobeVersion;
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libnvidia-container";
|
||||
version = "1.5.0";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NVIDIA";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-b9yQ1mEo1EkjXMguV0t98OvFEQO4h76EVu154MsB2II=";
|
||||
sha256 = "sha256-7OTawWwjeKU8wIa8I/+aSvAJli4kEua94nJSNyCajpE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -36,11 +43,53 @@ stdenv.mkDerivation rec {
|
|||
# path.
|
||||
./libnvc-ldconfig-and-path-fixes.patch
|
||||
|
||||
# the libnvidia-container Makefile wants to build and install static
|
||||
# libtirpc libraries; this patch prevents that from happening
|
||||
./avoid-static-libtirpc-build.patch
|
||||
# fix bogus struct declaration
|
||||
./inline-c-struct.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i \
|
||||
-e 's/^REVISION ?=.*/REVISION = ${src.rev}/' \
|
||||
-e 's/^COMPILER :=.*/COMPILER = $(CC)/' \
|
||||
mk/common.mk
|
||||
|
||||
mkdir -p deps/src/nvidia-modprobe-${modprobeVersion}
|
||||
cp -r ${nvidia-modprobe}/* deps/src/nvidia-modprobe-${modprobeVersion}
|
||||
chmod -R u+w deps/src
|
||||
pushd deps/src
|
||||
|
||||
patch -p0 < ${modprobePatch}
|
||||
touch nvidia-modprobe-${modprobeVersion}/.download_stamp
|
||||
popd
|
||||
|
||||
# 1. replace DESTDIR=$(DEPS_DIR) with empty strings to prevent copying
|
||||
# things into deps/src/nix/store
|
||||
# 2. similarly, remove any paths prefixed with DEPS_DIR
|
||||
# 3. prevent building static libraries because we don't build static
|
||||
# libtirpc (for now)
|
||||
# 4. prevent installation of static libraries because of step 3
|
||||
# 5. prevent installation of libnvidia-container-go.so twice
|
||||
sed -i Makefile \
|
||||
-e 's#DESTDIR=\$(DEPS_DIR)#DESTDIR=""#g' \
|
||||
-e 's#\$(DEPS_DIR)\$#\$#g' \
|
||||
-e 's#all: shared static tools#all: shared tools#g' \
|
||||
-e '/$(INSTALL) -m 644 $(LIB_STATIC) $(DESTDIR)$(libdir)/d' \
|
||||
-e '/$(INSTALL) -m 755 $(libdir)\/$(LIBGO_SHARED) $(DESTDIR)$(libdir)/d'
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preBuild = ''
|
||||
HOME="$(mktemp -d)"
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ];
|
||||
NIX_LDFLAGS = [ "-L${libtirpc.dev}/lib" "-ltirpc" ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config go rpcsvc-proto makeWrapper ];
|
||||
|
||||
buildInputs = [ libelf libcap libseccomp libtirpc ];
|
||||
|
||||
makeFlags = [
|
||||
"WITH_LIBELF=yes"
|
||||
"prefix=$(out)"
|
||||
|
|
@ -50,32 +99,14 @@ stdenv.mkDerivation rec {
|
|||
"CFLAGS=-DWITH_TIRPC"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i \
|
||||
-e 's/^REVISION ?=.*/REVISION = ${src.rev}/' \
|
||||
-e 's/^COMPILER :=.*/COMPILER = $(CC)/' \
|
||||
mk/common.mk
|
||||
|
||||
mkdir -p deps/src/nvidia-modprobe-${modp-ver}
|
||||
cp -r ${nvidia-modprobe}/* deps/src/nvidia-modprobe-${modp-ver}
|
||||
chmod -R u+w deps/src
|
||||
pushd deps/src
|
||||
patch -p0 < ${./modprobe.patch}
|
||||
touch nvidia-modprobe-${modp-ver}/.download_stamp
|
||||
popd
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/nvidia-container-cli \
|
||||
--prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:/run/opengl-driver-32/lib
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ];
|
||||
NIX_LDFLAGS = [ "-L${libtirpc.dev}/lib" "-ltirpc" ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config rpcsvc-proto makeWrapper ];
|
||||
|
||||
buildInputs = [ libelf libcap libseccomp libtirpc ];
|
||||
postInstall =
|
||||
let
|
||||
inherit (addOpenGLRunpath) driverLink;
|
||||
libraryPath = lib.makeLibraryPath [ "$out" driverLink "${driverLink}-32" ];
|
||||
in
|
||||
''
|
||||
wrapProgram $out/bin/nvidia-container-cli --prefix LD_LIBRARY_PATH : ${libraryPath}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/NVIDIA/libnvidia-container";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,14 @@
|
|||
diff --git a/src/nvcgo.c b/src/nvcgo.c
|
||||
index 98789a3..47ad02b 100644
|
||||
--- a/src/nvcgo.c
|
||||
+++ b/src/nvcgo.c
|
||||
@@ -33,7 +33,8 @@
|
||||
void nvcgo_program_1(struct svc_req *, register SVCXPRT *);
|
||||
|
||||
static struct nvcgo_ext {
|
||||
- struct nvcgo;
|
||||
+ struct rpc rpc;
|
||||
+ struct libnvcgo api;
|
||||
bool initialized;
|
||||
void *dl_handle;
|
||||
} global_nvcgo_context;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
diff -ruN nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c
|
||||
--- nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c 2020-07-09 17:06:05.000000000 +0000
|
||||
+++ nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c 2020-08-18 12:43:03.223871514 +0000
|
||||
diff -ruN nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.c nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.c
|
||||
--- nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.c 2020-07-09 17:06:05.000000000 +0000
|
||||
+++ nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.c 2020-08-18 12:43:03.223871514 +0000
|
||||
@@ -840,10 +840,10 @@
|
||||
return mknod_helper(major, minor_num, vgpu_dev_name, NV_PROC_REGISTRY_PATH);
|
||||
}
|
||||
|
|
@ -16,9 +16,9 @@ diff -ruN nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c nvidia-m
|
|||
{
|
||||
char field[32];
|
||||
FILE *fp;
|
||||
diff -ruN nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h
|
||||
--- nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h 2020-07-09 17:06:05.000000000 +0000
|
||||
+++ nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h 2020-08-18 12:43:44.227745050 +0000
|
||||
diff -ruN nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.h nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.h
|
||||
--- nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.h 2020-07-09 17:06:05.000000000 +0000
|
||||
+++ nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.h 2020-08-18 12:43:44.227745050 +0000
|
||||
@@ -81,6 +81,7 @@
|
||||
int nvidia_nvswitch_get_file_state(int minor);
|
||||
int nvidia_cap_mknod(const char* cap_file_path, int *minor);
|
||||
|
|
|
|||
|
|
@ -103,6 +103,12 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-gTRf9XENAfbFB3asYCXnw4OV4Af6VE1W56K2xpYDhgM=";
|
||||
revert = true;
|
||||
})
|
||||
# make nixos tests that boot from USB more stable
|
||||
# https://lists.nongnu.org/archive/html/qemu-devel/2022-05/msg01484.html
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/raboof/qemu/-/commit/3fb5e8fe4434130b1167a995b2a01c077cca2cd5.patch";
|
||||
sha256 = "sha256-evzrN3i4ntc/AFG0C0rezQpQbWcnx74nXO+5DLErX8o=";
|
||||
})
|
||||
]
|
||||
++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,40 +1,25 @@
|
|||
{ lib, stdenv, fetchzip, fetchpatch, atk, cairo, ldc, gdk-pixbuf, gnome, gst_all_1, librsvg
|
||||
{ lib, stdenv, fetchzip, atk, cairo, dcompiler, gdk-pixbuf, gnome, gst_all_1, librsvg
|
||||
, glib, gtk3, gtksourceview4, libgda, libpeas, pango, pkg-config, which, vte }:
|
||||
|
||||
let
|
||||
inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "gtkd";
|
||||
version = "3.9.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
version = "3.10.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://gtkd.org/Downloads/sources/GtkD-${version}.zip";
|
||||
sha256 = "12kc4s5gp6gn456d8pzhww1ggi9qbxldmcpp6855297g2x8xxy5p";
|
||||
sha256 = "DEKVDexGyg/T3SdnnvRjaHq1LbDo8ekNslxKROpMCCE=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ldc pkg-config which ];
|
||||
nativeBuildInputs = [ dcompiler pkg-config which ];
|
||||
propagatedBuildInputs = [
|
||||
atk cairo gdk-pixbuf glib gstreamer gst-plugins-base gtk3 gtksourceview4
|
||||
libgda libpeas librsvg pango vte
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Fix makefile not installing .pc's
|
||||
(fetchpatch {
|
||||
url = "https://github.com/gtkd-developers/GtkD/commit/a9db09117ab27127ca4c3b8d2f308fae483a9199.patch";
|
||||
sha256 = "0ngyqifw1kandc1vk01kms3z65pcisfd75q7z09rml96glhfzjd6";
|
||||
})
|
||||
# Fix breakage with dmd ldc 1.26 and newer
|
||||
(fetchpatch {
|
||||
url = "https://github.com/gtkd-developers/GtkD/commit/323ff96c648882eaca2faee170bd9e90c6e1e9c3.patch";
|
||||
sha256 = "1rhyi0isl6fl5i6fgsinvgq6v72xq7c6sajrxcsnmrzpvw91il3d";
|
||||
})
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
postPatch = ''
|
||||
substituteAll ${./paths.d} generated/gtkd/gtkd/paths.d
|
||||
|
||||
substituteInPlace generated/gstreamer/gst/app/c/functions.d \
|
||||
|
|
@ -134,6 +119,10 @@ in stdenv.mkDerivation rec {
|
|||
done
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit dcompiler;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "D binding and OO wrapper for GTK";
|
||||
homepage = "https://gtkd.org";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,54 @@
|
|||
{ lib
|
||||
, attrs
|
||||
, buildPythonPackage
|
||||
, click
|
||||
, commoncode
|
||||
, dockerfile-parse
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "container-inspector";
|
||||
version = "31.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nexB";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-YwtyNZsTMb8iFXo/rojvjkKUbMNRCXVamzFykpwYCOk=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
attrs
|
||||
click
|
||||
dockerfile-parse
|
||||
commoncode
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"container_inspector"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Suite of analysis utilities and command line tools for container images";
|
||||
homepage = "https://github.com/nexB/container-inspector";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
24
pkgs/development/python-modules/crossplane/default.nix
Normal file
24
pkgs/development/python-modules/crossplane/default.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{ lib, buildPythonPackage, pytestCheckHook, fetchFromGitHub }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "crossplane";
|
||||
version = "0.5.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nginxinc";
|
||||
repo = "crossplane";
|
||||
rev = "v${version}";
|
||||
sha256 = "0lv3frfvnvz5wjxwh3mwy8nbypv4i62v4bvy5fv7vd6kmbxy1q9l";
|
||||
};
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "crossplane" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/nginxinc/crossplane";
|
||||
description = "NGINX configuration file parser and builder";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ kaction ];
|
||||
};
|
||||
}
|
||||
|
|
@ -27,8 +27,7 @@ buildPythonPackage rec {
|
|||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'jinja2 = "^2.10"' 'jinja2 = "*"' \
|
||||
--replace 'graphviz = ">=0.13.2,<0.17.0"' 'graphviz = "*"'
|
||||
--replace 'graphviz = ">=0.13.2,<0.20.0"' 'graphviz = "*"'
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
|||
|
|
@ -16,16 +16,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "graphviz";
|
||||
version = "0.19.1";
|
||||
version = "0.20";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
# patch does not apply to PyPI tarball due to different line endings
|
||||
src = fetchFromGitHub {
|
||||
owner = "xflr6";
|
||||
repo = "graphviz";
|
||||
rev = version;
|
||||
sha256 = "sha256-pE1lsx/r/BjvW5W2niDx/UeRXxx4kvCyHzAUAG3bdGc=";
|
||||
hash = "sha256-QyZwXxRbcMushxh/Ypy+v4FOTM4H1u5b7IZMSVgLyEs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -65,6 +65,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Simple Python interface for Graphviz";
|
||||
homepage = "https://github.com/xflr6/graphviz";
|
||||
changelog = "https://github.com/xflr6/graphviz/blob/${src.rev}/CHANGES.rst";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -33,6 +33,11 @@ buildPythonPackage rec {
|
|||
twisted
|
||||
];
|
||||
|
||||
# Test creates an excessive amount of temporary files (order of millions).
|
||||
# Cleaning up those files already took over 15 hours already on my zfs
|
||||
# filesystem and is not finished yet.
|
||||
doCheck = false;
|
||||
|
||||
checkPhase = ''
|
||||
trial -j$NIX_BUILD_CORES ldaptor
|
||||
'';
|
||||
|
|
@ -42,7 +47,5 @@ buildPythonPackage rec {
|
|||
homepage = "https://github.com/twisted/ldaptor";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
# tests hang or fail with "no space left on device"
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
30
pkgs/development/python-modules/pandoc-xnos/default.nix
Normal file
30
pkgs/development/python-modules/pandoc-xnos/default.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{ buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, pandocfilters
|
||||
, psutil
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pandoc-xnos";
|
||||
version = "2.5.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tomduck";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-beiGvN0DS6s8wFjcDKozDuwAM2OApX3lTRaUDRUqLeU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pandocfilters psutil ];
|
||||
|
||||
pythonImportsCheck = [ "pandocxnos" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Pandoc filter suite providing facilities for cross-referencing in markdown documents";
|
||||
homepage = "https://github.com/tomduck/pandoc-xnos";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ ppenguin ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,48 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, packaging
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pip-requirements-parser";
|
||||
version = "31.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nexB";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-i4hw3tS4i2ek2JzcDiGo5aFFJ9J2JJ9MB5vxDhOilb0=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
packaging
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pip_requirements_parser"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Module to parse pip requirements";
|
||||
homepage = "https://github.com/nexB/pip-requirements-parser";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
35
pkgs/development/python-modules/pkginfo2/default.nix
Normal file
35
pkgs/development/python-modules/pkginfo2/default.nix
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pkginfo2";
|
||||
version = "30.0.0";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nexB";
|
||||
repo = "pkginfo2";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-E9EyaN3ncf/34vvvhRe0rwV28VrjqJo79YFgXq2lKWU=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pkginfo2"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Query metadatdata from sdists, bdists or installed packages";
|
||||
homepage = "https://github.com/nexB/pkginfo2";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -37,6 +37,7 @@
|
|||
, trytond
|
||||
, urllib3
|
||||
, werkzeug
|
||||
, multidict
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -88,6 +89,7 @@ buildPythonPackage rec {
|
|||
tornado
|
||||
trytond
|
||||
werkzeug
|
||||
multidict
|
||||
];
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "simplisafe-python";
|
||||
version = "2022.05.0";
|
||||
version = "2022.05.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -28,8 +28,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-NXEhjj8L7MPAdQwjqe6u+L9vi/mIIA8TxDpM5q4uUrU=";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-tYExqOIJPJN8Lss6y0oelkrDuQCpNtFrsFRCxnbUNvU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -0,0 +1,45 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, sphinxHook }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinx-better-theme";
|
||||
version = "0.1.5";
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "irskep";
|
||||
repo = "sphinx-better-theme";
|
||||
rev = "v${version}";
|
||||
sha256 = "07lhfmsjcfzcchsjzh6kxdq5s47j2a6lb5wv3m1kmv2hcm3gvddh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ sphinxHook ];
|
||||
|
||||
pythonImportsCheck = [ "better" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/irskep/sphinx-better-theme";
|
||||
description = "Better Sphinx Theme";
|
||||
longDescription = ''
|
||||
This is a modified version of the default Sphinx theme with the following
|
||||
goals:
|
||||
|
||||
1. Remove frivolous colors, especially hard-coded ones
|
||||
2. Improve readability by limiting width and using more whitespace
|
||||
3. Encourage visual customization through CSS, not themeconf
|
||||
4. Use semantic markup
|
||||
|
||||
v0.1 meets goals one and two. Goal three is partially complete; it's simple to
|
||||
add your own CSS file without creating a whole new theme.
|
||||
you'd like something changed.
|
||||
|
||||
To use the theme, set ``html_theme_path`` to contain
|
||||
``better.better_theme_path``, and set ``html_theme`` to ``'better'``::
|
||||
|
||||
from better import better_theme_path
|
||||
html_theme_path = [better_theme_path]
|
||||
html_theme = 'better'
|
||||
'';
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ kaction ];
|
||||
};
|
||||
}
|
||||
|
|
@ -86,6 +86,8 @@ buildPythonPackage rec {
|
|||
# sensitive to sandbox environments
|
||||
"test_tab_size"
|
||||
"test_tabulation_character"
|
||||
"test_linear_gradients_5"
|
||||
"test_linear_gradients_12"
|
||||
];
|
||||
|
||||
FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf";
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "yalexs";
|
||||
version = "1.1.24";
|
||||
version = "1.1.25";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
owner = "bdraco";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6wuTY1nH7btGEktH5UmTV2rMbsap5M55tJx3fljsnlY=";
|
||||
sha256 = "sha256-O7M9Shh8jp2fTaVQPM8mgh1pkv75wn22PFpxJVenbAo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,22 +6,24 @@
|
|||
, pyflakes
|
||||
, tomli
|
||||
, setuptools
|
||||
, mock
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zimports";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sqlalchemyorg";
|
||||
repo = "zimports";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-O8MHUt9yswL9fK9pEddkvnNS2E4vWA/S1BTs1OD1VbU=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-qm5mA8pCSLbkupGBo+ppHSW6uy1j/FfV3idvGQGhjqU=";
|
||||
};
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
flake8-import-order
|
||||
pyflakes
|
||||
|
|
@ -30,14 +32,12 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
checkInputs = [
|
||||
mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preInstallCheck
|
||||
PYTHONPATH= $out/bin/zimports --help >/dev/null
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
pythonImportsCheck = [
|
||||
"zimports"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python import rewriter";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "metals";
|
||||
version = "0.11.4";
|
||||
version = "0.11.5";
|
||||
|
||||
deps = stdenv.mkDerivation {
|
||||
name = "${pname}-deps-${version}";
|
||||
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
outputHashMode = "recursive";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = "sha256-ZHl+uqYTSMEMR1CSo0btxEn/NQz7MNwh4JISm2L5B3Y=";
|
||||
outputHash = "sha256-kw+8688E1b7XjEb7AqOExSVu88NqPprKaCuINWqL2wk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper setJavaClassPath ];
|
||||
|
|
|
|||
|
|
@ -43,8 +43,8 @@ buildGoModule rec {
|
|||
go list ./... | grep -v -e e2e ${lib.optionalString stdenv.isDarwin "-e wasm"}
|
||||
}
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
# resolve "too many open files" errors during the tests on darwin
|
||||
ulimit -n 1024
|
||||
# remove tests that have "too many open files"/"no space left on device" issues on darwin in hydra
|
||||
rm server/server_test.go
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -2,56 +2,56 @@
|
|||
"x86_64-linux": {
|
||||
"alpha": {
|
||||
"experimental": {
|
||||
"name": "factorio_alpha_x64-1.1.57.tar.xz",
|
||||
"name": "factorio_alpha_x64-1.1.59.tar.xz",
|
||||
"needsAuth": true,
|
||||
"sha256": "0sazpljdkknv74dqhrv5gxi7s50bfccynqk7xhsr4awl2gdkys0v",
|
||||
"sha256": "0qwq3mjsmhb119pvbfznpncw898z4zs2if4fd7p6rqfz0wip93qk",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.57/alpha/linux64",
|
||||
"version": "1.1.57"
|
||||
"url": "https://factorio.com/get-download/1.1.59/alpha/linux64",
|
||||
"version": "1.1.59"
|
||||
},
|
||||
"stable": {
|
||||
"name": "factorio_alpha_x64-1.1.57.tar.xz",
|
||||
"name": "factorio_alpha_x64-1.1.59.tar.xz",
|
||||
"needsAuth": true,
|
||||
"sha256": "0sazpljdkknv74dqhrv5gxi7s50bfccynqk7xhsr4awl2gdkys0v",
|
||||
"sha256": "0qwq3mjsmhb119pvbfznpncw898z4zs2if4fd7p6rqfz0wip93qk",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.57/alpha/linux64",
|
||||
"version": "1.1.57"
|
||||
"url": "https://factorio.com/get-download/1.1.59/alpha/linux64",
|
||||
"version": "1.1.59"
|
||||
}
|
||||
},
|
||||
"demo": {
|
||||
"experimental": {
|
||||
"name": "factorio_demo_x64-1.1.57.tar.xz",
|
||||
"name": "factorio_demo_x64-1.1.59.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "1lwrz0ix7iycampjh87ki8vg3pkk753873vmrfiyrmh3hchvbj34",
|
||||
"sha256": "1nddk8184kgq4ni0y9j2l8sa3szvcbsq9l90b35l9jb6sqflgki0",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.57/demo/linux64",
|
||||
"version": "1.1.57"
|
||||
"url": "https://factorio.com/get-download/1.1.59/demo/linux64",
|
||||
"version": "1.1.59"
|
||||
},
|
||||
"stable": {
|
||||
"name": "factorio_demo_x64-1.1.57.tar.xz",
|
||||
"name": "factorio_demo_x64-1.1.59.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "1lwrz0ix7iycampjh87ki8vg3pkk753873vmrfiyrmh3hchvbj34",
|
||||
"sha256": "1nddk8184kgq4ni0y9j2l8sa3szvcbsq9l90b35l9jb6sqflgki0",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.57/demo/linux64",
|
||||
"version": "1.1.57"
|
||||
"url": "https://factorio.com/get-download/1.1.59/demo/linux64",
|
||||
"version": "1.1.59"
|
||||
}
|
||||
},
|
||||
"headless": {
|
||||
"experimental": {
|
||||
"name": "factorio_headless_x64-1.1.57.tar.xz",
|
||||
"name": "factorio_headless_x64-1.1.59.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "1y65wppfzfpad6g6kvdd8srd9sq71dh1dpqia5b3x6pnwk5xsqdm",
|
||||
"sha256": "1p5wyki6wxnvnp7zqjjw9yggiy0p78rx49wmq3q7kq0mxfz054dg",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.57/headless/linux64",
|
||||
"version": "1.1.57"
|
||||
"url": "https://factorio.com/get-download/1.1.59/headless/linux64",
|
||||
"version": "1.1.59"
|
||||
},
|
||||
"stable": {
|
||||
"name": "factorio_headless_x64-1.1.57.tar.xz",
|
||||
"name": "factorio_headless_x64-1.1.59.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "1y65wppfzfpad6g6kvdd8srd9sq71dh1dpqia5b3x6pnwk5xsqdm",
|
||||
"sha256": "1p5wyki6wxnvnp7zqjjw9yggiy0p78rx49wmq3q7kq0mxfz054dg",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.57/headless/linux64",
|
||||
"version": "1.1.57"
|
||||
"url": "https://factorio.com/get-download/1.1.59/headless/linux64",
|
||||
"version": "1.1.59"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, stdenv, fetchFromGitHub, kernel }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.5.0";
|
||||
version = "2.7.1";
|
||||
name = "ena-${version}-${kernel.version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "amzn";
|
||||
repo = "amzn-drivers";
|
||||
rev = "ena_linux_${version}";
|
||||
sha256 = "sha256-uOf/1624UtjaZtrk7XyQpeUGdTNVDnzZJZMgU86i+SM=";
|
||||
sha256 = "sha256-JkGzmmsAmLvL9e+bg58H79GNHgsqydK/79VoWEq5/Mc=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "pic" ];
|
||||
|
|
@ -42,6 +42,6 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.gpl2Only;
|
||||
maintainers = [ maintainers.eelco ];
|
||||
platforms = platforms.linux;
|
||||
broken = kernel.kernelAtLeast "5.15";
|
||||
broken = kernel.kernelAtLeast "5.17";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jitsi-meet";
|
||||
version = "1.0.6091";
|
||||
version = "1.0.6155";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.jitsi.org/jitsi-meet/src/jitsi-meet-${version}.tar.bz2";
|
||||
sha256 = "lYQGrH7D2xsRdwDC0yXB+tt4nOawEkq9A5tDIwl6pRk=";
|
||||
sha256 = "baCRVYe1z2uH3vSb5KbWs0y4KyQYO3JpTyoGFZIZQqo=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,20 @@
|
|||
{ stdenv, boost, fuse, openssl, cmake, attr, jdk, ant, which, file, python2
|
||||
, lib, valgrind, makeWrapper, fetchFromGitHub, fetchpatch }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, makeWrapper
|
||||
, ant
|
||||
, attr
|
||||
, boost
|
||||
, cmake
|
||||
, file
|
||||
, fuse
|
||||
, jdk
|
||||
, openssl
|
||||
, python3
|
||||
, valgrind
|
||||
, which
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -13,8 +28,8 @@ stdenv.mkDerivation {
|
|||
pname = "XtreemFS";
|
||||
version = "1.5.1.81";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ which attr python2 ];
|
||||
nativeBuildInputs = [ makeWrapper python3 ];
|
||||
buildInputs = [ which attr ];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
source 'https://rubygems.org'
|
||||
gem '3llo', '0.3.0'
|
||||
gem '3llo', '1.3.1'
|
||||
|
|
|
|||
|
|
@ -1,27 +1,27 @@
|
|||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
3llo (0.3.0)
|
||||
tty-prompt (~> 0.12.0)
|
||||
equatable (0.6.1)
|
||||
necromancer (0.4.0)
|
||||
pastel (0.7.3)
|
||||
equatable (~> 0.6)
|
||||
3llo (1.3.1)
|
||||
tty-prompt (~> 0.20)
|
||||
pastel (0.8.0)
|
||||
tty-color (~> 0.5)
|
||||
tty-color (0.5.0)
|
||||
tty-cursor (0.4.0)
|
||||
tty-prompt (0.12.0)
|
||||
necromancer (~> 0.4.0)
|
||||
pastel (~> 0.7.0)
|
||||
tty-cursor (~> 0.4.0)
|
||||
wisper (~> 1.6.1)
|
||||
wisper (1.6.1)
|
||||
tty-color (0.6.0)
|
||||
tty-cursor (0.7.1)
|
||||
tty-prompt (0.23.1)
|
||||
pastel (~> 0.8)
|
||||
tty-reader (~> 0.8)
|
||||
tty-reader (0.9.0)
|
||||
tty-cursor (~> 0.7)
|
||||
tty-screen (~> 0.8)
|
||||
wisper (~> 2.0)
|
||||
tty-screen (0.8.1)
|
||||
wisper (2.0.1)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
3llo (= 0.3.0)
|
||||
3llo (= 1.3.1)
|
||||
|
||||
BUNDLED WITH
|
||||
2.1.4
|
||||
2.2.33
|
||||
|
|
|
|||
|
|
@ -1,24 +1,10 @@
|
|||
{ lib, ruby, bundlerApp, fetchpatch }:
|
||||
{ lib, ruby_3_0, bundlerApp, fetchpatch }:
|
||||
|
||||
bundlerApp {
|
||||
pname = "3llo";
|
||||
ruby = ruby_3_0;
|
||||
|
||||
gemfile = ./Gemfile;
|
||||
lockfile = ./Gemfile.lock;
|
||||
|
||||
gemset = lib.recursiveUpdate (import ./gemset.nix) ({
|
||||
"3llo" = {
|
||||
dontBuild = false;
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/qcam/3llo/commit/7667c67fdc975bac315da027a3c69f49e7c06a2e.patch";
|
||||
sha256 = "0ahp19igj77x23b2j9zk3znlmm7q7nija7mjgsmgqkgfbz2r1y7v";
|
||||
})
|
||||
];
|
||||
};
|
||||
});
|
||||
|
||||
inherit ruby;
|
||||
gemdir = ./.;
|
||||
|
||||
exes = [ "3llo" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,81 +5,82 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "082g42lkkynnb2piz37ih696zm2ms63mz2q9rnfzjsd149ig39yy";
|
||||
sha256 = "1w327skga2lpq9rbqqxy6w1r6k9k1l8prk5wmzrycvydn1wp7jk2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.3.0";
|
||||
};
|
||||
equatable = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0fzx2ishipnp6c124ka6fiw5wk42s7c7gxid2c4c1mb55b30dglf";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.6.1";
|
||||
};
|
||||
necromancer = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0v9nhdkv6zrp7cn48xv7n2vjhsbslpvs0ha36mfkcd56cp27pavz";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.4.0";
|
||||
version = "1.3.1";
|
||||
};
|
||||
pastel = {
|
||||
dependencies = ["equatable" "tty-color"];
|
||||
dependencies = ["tty-color"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0m43wk7gswwkl6lfxwlliqc9v1qp8arfygihyz91jc9icf270xzm";
|
||||
sha256 = "0xash2gj08dfjvq4hy6l1z22s5v30fhizwgs10d6nviggpxsj7a8";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.7.3";
|
||||
version = "0.8.0";
|
||||
};
|
||||
tty-color = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1zpp6zixkkchrc2lqnabrsy24pxikz2px87ggz5ph6355fs803da";
|
||||
sha256 = "0aik4kmhwwrmkysha7qibi2nyzb4c8kp42bd5vxnf8sf7b53g73g";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
};
|
||||
tty-cursor = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "07whfm8mnp7l49s2cm2qy1snhsqq3a90sqwb71gvym4hm2kx822a";
|
||||
sha256 = "0j5zw041jgkmn605ya1zc151bxgxl6v192v2i26qhxx7ws2l2lvr";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.4.0";
|
||||
version = "0.7.1";
|
||||
};
|
||||
tty-prompt = {
|
||||
dependencies = ["necromancer" "pastel" "tty-cursor" "wisper"];
|
||||
dependencies = ["pastel" "tty-reader"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1026nyqhgmgxi2nmk8xk3hca07gy5rpisjs8y6w00wnw4f01kpv0";
|
||||
sha256 = "1j4y8ik82azjxshgd4i1v4wwhsv3g9cngpygxqkkz69qaa8cxnzw";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.12.0";
|
||||
version = "0.23.1";
|
||||
};
|
||||
tty-reader = {
|
||||
dependencies = ["tty-cursor" "tty-screen" "wisper"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1cf2k7w7d84hshg4kzrjvk9pkyc2g1m3nx2n1rpmdcf0hp4p4af6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.9.0";
|
||||
};
|
||||
tty-screen = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "18jr6s1cg8yb26wzkqa6874q0z93rq0y5aw092kdqazk71y6a235";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.8.1";
|
||||
};
|
||||
wisper = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "19bw0z1qw1dhv7gn9lad25hgbgpb1bkw8d599744xdfam158ms2s";
|
||||
sha256 = "1rpsi0ziy78cj82sbyyywby4d0aw0a5q84v65qd28vqn79fbq5yf";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.6.1";
|
||||
version = "2.0.1";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
30
pkgs/tools/misc/pandoc-eqnos/default.nix
Normal file
30
pkgs/tools/misc/pandoc-eqnos/default.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{ buildPythonApplication
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, pandoc-xnos
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "pandoc-eqnos";
|
||||
version = "2.5.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tomduck";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-7GQdfGHhtQs6LZK+ZyMmcPSkoFfBWmATTMejMiFcS7Y=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pandoc-xnos ];
|
||||
|
||||
# Different pandoc executables are not available
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Standalone pandoc filter from the pandoc-xnos suite for numbering equations and equation references";
|
||||
homepage = "https://github.com/tomduck/pandoc-eqnos";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ ppenguin ];
|
||||
};
|
||||
}
|
||||
30
pkgs/tools/misc/pandoc-fignos/default.nix
Normal file
30
pkgs/tools/misc/pandoc-fignos/default.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{ buildPythonApplication
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, pandoc-xnos
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "pandoc-fignos";
|
||||
version = "2.4.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tomduck";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-eDwAW0nLB4YqrWT3Ajt9bmX1A43wl+tOPm2St5VpCLk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pandoc-xnos ];
|
||||
|
||||
# Different pandoc executables are not available
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Standalone pandoc filter from the pandoc-xnos suite for numbering figures and figure references";
|
||||
homepage = "https://github.com/tomduck/pandoc-fignos";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ ppenguin ];
|
||||
};
|
||||
}
|
||||
34
pkgs/tools/misc/pandoc-secnos/default.nix
Normal file
34
pkgs/tools/misc/pandoc-secnos/default.nix
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
{ buildPythonApplication
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, pandoc-xnos
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "pandoc-secnos";
|
||||
version = "2.2.2";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tomduck";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-J9KLZvioYM3Pl2UXjrEgd4PuLTwCLYy9SsJIzgw5/jU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pandoc-xnos ];
|
||||
|
||||
patches = [
|
||||
./patch/fix-manifest.patch
|
||||
];
|
||||
|
||||
# Different pandoc executables are not available
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Standalone pandoc filter from the pandoc-xnos suite for numbering sections and section references";
|
||||
homepage = "https://github.com/tomduck/pandoc-secnos";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ ppenguin ];
|
||||
};
|
||||
}
|
||||
39
pkgs/tools/misc/pandoc-secnos/patch/fix-manifest.patch
Normal file
39
pkgs/tools/misc/pandoc-secnos/patch/fix-manifest.patch
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
From 165ee1f4c1208636254392335d34934dc50d273e Mon Sep 17 00:00:00 2001
|
||||
From: ppenguin <hieronymusv@gmail.com>
|
||||
Date: Tue, 15 Mar 2022 23:15:07 +0100
|
||||
Subject: [PATCH] fix setup.py to work in nixpkgs
|
||||
|
||||
---
|
||||
setup.py | 13 ++-----------
|
||||
1 file changed, 2 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index d705846..d7345a2 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -42,10 +42,10 @@
|
||||
|
||||
author='Thomas J. Duck',
|
||||
author_email='tomduck@tomduck.ca',
|
||||
- description='Equation number filter for pandoc',
|
||||
+ description='Section number filter for pandoc',
|
||||
long_description=DESCRIPTION,
|
||||
license='GPL',
|
||||
- keywords='pandoc equation numbers filter',
|
||||
+ keywords='pandoc section numbers filter',
|
||||
url='https://github.com/tomduck/pandoc-secnos',
|
||||
download_url='https://github.com/tomduck/pandoc-secnos/tarball/' + \
|
||||
__version__,
|
||||
@@ -63,12 +63,3 @@
|
||||
'Programming Language :: Python'
|
||||
]
|
||||
)
|
||||
-
|
||||
-# Check that the pandoc-secnos script is on the PATH
|
||||
-if not shutil.which('pandoc-secnos'):
|
||||
- msg = """
|
||||
- ERROR: `pandoc-secnos` script not found. This will need to
|
||||
- be corrected. If you need help, please file an Issue at
|
||||
- https://github.com/tomduck/pandoc-secnos/issues.\n"""
|
||||
- print(textwrap.dedent(msg))
|
||||
- sys.exit(-1)
|
||||
30
pkgs/tools/misc/pandoc-tablenos/default.nix
Normal file
30
pkgs/tools/misc/pandoc-tablenos/default.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{ buildPythonApplication
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, pandoc-xnos
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "pandoc-tablenos";
|
||||
version = "2.3.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tomduck";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-FwzsRziY3PoySo9hIFuLw6tOO9oQij6oQEyoY8HgnII=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pandoc-xnos ];
|
||||
|
||||
# Different pandoc executables are not available
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Standalone pandoc filter from the pandoc-xnos suite for numbering tables and table references";
|
||||
homepage = "https://github.com/tomduck/pandoc-tablenos";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ ppenguin ];
|
||||
};
|
||||
}
|
||||
38
pkgs/tools/misc/pls/default.nix
Normal file
38
pkgs/tools/misc/pls/default.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{ lib, python3, fetchFromGitHub }:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "pls";
|
||||
version = "4.0.3";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dhruvkb";
|
||||
repo = "pls";
|
||||
rev = version;
|
||||
sha256 = "sha256-cVTIWSOx3FwF3QPak3eIIIgQ1O9JF5e5ILpcHQ4qI6k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ python3.pkgs.poetry-core ];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
pyyaml
|
||||
rich
|
||||
];
|
||||
|
||||
checkInputs = with python3.pkgs; [
|
||||
freezegun
|
||||
jsonschema
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pytestFlagsArray = [ "tests/" "--ignore=tests/e2e" ];
|
||||
|
||||
pythonImportsCheck = [ "pls" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://dhruvkb.github.io/pls/";
|
||||
description = "Prettier and powerful ls";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ arjan-s ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,4 +1,13 @@
|
|||
{ stdenv, lib, fetchFromGitHub, cmake, qtbase, wrapQtAppsHook }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, qtbase
|
||||
, wrapQtAppsHook
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, qtwayland
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fwbuilder";
|
||||
|
|
@ -16,6 +25,12 @@ stdenv.mkDerivation rec {
|
|||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
wayland
|
||||
wayland-protocols
|
||||
qtwayland
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
"-Wno-error=misleading-indentation"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "shfmt";
|
||||
version = "3.4.3";
|
||||
version = "3.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mvdan";
|
||||
repo = "sh";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tE7U/hE1Z/9VZTYt2jU0IE11cS01l6wTPVFuXH36sM4=";
|
||||
sha256 = "sha256-ZhuOOZ+Lttan7R5YgpiM5okGNkSH0NRUj4hHd1ELbLI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ZYsQ+wE+G7xNrBN29npSxxPCz9+Wb/RsBzM5uwJkhO8=";
|
||||
vendorSha256 = "sha256-3eao9bORPTsyCFpafp89mcL2Y7HNBlDfUsTull7qnYs=";
|
||||
|
||||
subPackages = [ "cmd/shfmt" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "svt-av1";
|
||||
version = "0.9.1";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "AOMediaCodec";
|
||||
repo = "SVT-AV1";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PIr2bCEKj1dXKiGWloZv2v+ed6JdHK3z+p11ugWGzAk=";
|
||||
sha256 = "sha256-M5ErWB/klVijsF+GysR0b3m180h+O+10weKr1pTh8ow=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake nasm ];
|
||||
|
|
@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
|
|||
changelog = "https://gitlab.com/AOMediaCodec/SVT-AV1/-/blob/v${version}/CHANGELOG.md";
|
||||
license = with licenses; [
|
||||
aom
|
||||
bsd2
|
||||
bsd3
|
||||
];
|
||||
platforms = platforms.unix;
|
||||
|
|
|
|||
|
|
@ -3151,6 +3151,8 @@ with pkgs;
|
|||
|
||||
crosvm = callPackage ../applications/virtualization/crosvm { };
|
||||
|
||||
crossplane = with python3Packages; toPythonApplication crossplane;
|
||||
|
||||
crunch = callPackage ../tools/security/crunch { };
|
||||
|
||||
crudini = callPackage ../tools/misc/crudini { };
|
||||
|
|
@ -6734,7 +6736,7 @@ with pkgs;
|
|||
|
||||
gtdialog = callPackage ../development/libraries/gtdialog {};
|
||||
|
||||
gtkd = callPackage ../development/libraries/gtkd { };
|
||||
gtkd = callPackage ../development/libraries/gtkd { dcompiler = ldc; };
|
||||
|
||||
gtkgnutella = callPackage ../tools/networking/p2p/gtk-gnutella { };
|
||||
|
||||
|
|
@ -8692,7 +8694,11 @@ with pkgs;
|
|||
|
||||
pandoc-plantuml-filter = python3Packages.callPackage ../tools/misc/pandoc-plantuml-filter { };
|
||||
|
||||
panicparse = callPackage ../tools/misc/panicparse { };
|
||||
# pandoc-*nos is a filter suite, where pandoc-xnos has all functionality and the others are used for only specific functionality
|
||||
pandoc-eqnos = python3Packages.callPackage ../tools/misc/pandoc-eqnos { };
|
||||
pandoc-fignos = python3Packages.callPackage ../tools/misc/pandoc-fignos { };
|
||||
pandoc-secnos = python3Packages.callPackage ../tools/misc/pandoc-secnos { };
|
||||
pandoc-tablenos = python3Packages.callPackage ../tools/misc/pandoc-tablenos { };
|
||||
|
||||
patray = callPackage ../tools/audio/patray { };
|
||||
|
||||
|
|
@ -9401,6 +9407,8 @@ with pkgs;
|
|||
|
||||
plowshare = callPackage ../tools/misc/plowshare { };
|
||||
|
||||
pls = callPackage ../tools/misc/pls { };
|
||||
|
||||
pm2 = nodePackages.pm2;
|
||||
|
||||
pngcheck = callPackage ../tools/graphics/pngcheck { };
|
||||
|
|
@ -26438,11 +26446,13 @@ with pkgs;
|
|||
|
||||
filezilla = callPackage ../applications/networking/ftp/filezilla { };
|
||||
|
||||
firefoxPackages = recurseIntoAttrs (callPackage ../applications/networking/browsers/firefox/packages.nix {
|
||||
callPackage = newScope {
|
||||
buildMozillaMach =
|
||||
let callPackage = newScope {
|
||||
inherit (rustPackages) cargo rustc;
|
||||
};
|
||||
});
|
||||
in opts: callPackage (import ../applications/networking/browsers/firefox/common.nix opts) {};
|
||||
|
||||
firefoxPackages = recurseIntoAttrs (callPackage ../applications/networking/browsers/firefox/packages.nix {});
|
||||
|
||||
firefox-unwrapped = firefoxPackages.firefox;
|
||||
firefox-esr-91-unwrapped = firefoxPackages.firefox-esr-91;
|
||||
|
|
@ -26487,7 +26497,7 @@ with pkgs;
|
|||
desktopName = "Firefox DevEdition";
|
||||
};
|
||||
|
||||
librewolf-unwrapped = firefoxPackages.librewolf;
|
||||
librewolf-unwrapped = callPackage ../applications/networking/browsers/librewolf {};
|
||||
|
||||
librewolf = wrapFirefox librewolf-unwrapped {
|
||||
inherit (librewolf-unwrapped) extraPrefsFiles extraPoliciesFiles;
|
||||
|
|
|
|||
|
|
@ -1871,6 +1871,8 @@ in {
|
|||
|
||||
consul = callPackage ../development/python-modules/consul { };
|
||||
|
||||
container-inspector = callPackage ../development/python-modules/container-inspector { };
|
||||
|
||||
contexter = callPackage ../development/python-modules/contexter { };
|
||||
|
||||
contextlib2 = callPackage ../development/python-modules/contextlib2 { };
|
||||
|
|
@ -1939,6 +1941,8 @@ in {
|
|||
|
||||
croniter = callPackage ../development/python-modules/croniter { };
|
||||
|
||||
crossplane = callPackage ../development/python-modules/crossplane { };
|
||||
|
||||
crownstone-cloud = callPackage ../development/python-modules/crownstone-cloud { };
|
||||
|
||||
crownstone-core = callPackage ../development/python-modules/crownstone-core { };
|
||||
|
|
@ -6071,6 +6075,8 @@ in {
|
|||
|
||||
pandoc-attributes = callPackage ../development/python-modules/pandoc-attributes { };
|
||||
|
||||
pandoc-xnos = callPackage ../development/python-modules/pandoc-xnos { };
|
||||
|
||||
pandocfilters = callPackage ../development/python-modules/pandocfilters { };
|
||||
|
||||
panel = callPackage ../development/python-modules/panel { };
|
||||
|
|
@ -6359,6 +6365,8 @@ in {
|
|||
|
||||
pip-tools = callPackage ../development/python-modules/pip-tools { };
|
||||
|
||||
pip-requirements-parser = callPackage ../development/python-modules/pip-requirements-parser { };
|
||||
|
||||
pipx = callPackage ../development/python-modules/pipx { };
|
||||
|
||||
pivy = callPackage ../development/python-modules/pivy {
|
||||
|
|
@ -6374,6 +6382,8 @@ in {
|
|||
|
||||
pkginfo = callPackage ../development/python-modules/pkginfo { };
|
||||
|
||||
pkginfo2 = callPackage ../development/python-modules/pkginfo2 { };
|
||||
|
||||
pkuseg = callPackage ../development/python-modules/pkuseg { };
|
||||
|
||||
pmsensor = callPackage ../development/python-modules/pmsensor { };
|
||||
|
|
@ -9715,6 +9725,8 @@ in {
|
|||
|
||||
spinners = callPackage ../development/python-modules/spinners { };
|
||||
|
||||
sphinx-better-theme = callPackage ../development/python-modules/sphinx-better-theme { };
|
||||
|
||||
sphinxcontrib-actdiag = callPackage ../development/python-modules/sphinxcontrib-actdiag { };
|
||||
|
||||
sphinxcontrib-apidoc = callPackage ../development/python-modules/sphinxcontrib-apidoc { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue