mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-30 17:49:58 +03:00
Merge master into staging-next
This commit is contained in:
commit
949c5dc1a1
@ -8,13 +8,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "pt2-clone";
|
pname = "pt2-clone";
|
||||||
version = "1.50";
|
version = "1.51";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "8bitbubsy";
|
owner = "8bitbubsy";
|
||||||
repo = "pt2-clone";
|
repo = "pt2-clone";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-IZakhYVtVXmcKwUMl/v1w6Huu5XWQfaBCatTN4hQAbM=";
|
sha256 = "sha256-kTYtn68gPwEHZjJl/Vmr5lTtxyEB6r3EGQlVSlBpCZg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
@ -6,13 +6,13 @@
|
|||||||
|
|
||||||
buildDotnetModule rec {
|
buildDotnetModule rec {
|
||||||
pname = "btcpayserver";
|
pname = "btcpayserver";
|
||||||
version = "1.6.6";
|
version = "1.6.9";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = pname;
|
owner = pname;
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-790/XBeFS1iM73WuBMXcEoB3gjBlU1dMPRwtQNB7taE=";
|
sha256 = "sha256-kN+/TQCc35iI8gr9pYlW4B3B6WasGyKQffkJ8rMffVk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
projectFile = "BTCPayServer/BTCPayServer.csproj";
|
projectFile = "BTCPayServer/BTCPayServer.csproj";
|
||||||
|
12
pkgs/applications/blockchains/btcpayserver/deps.nix
generated
12
pkgs/applications/blockchains/btcpayserver/deps.nix
generated
@ -31,8 +31,8 @@
|
|||||||
})
|
})
|
||||||
(fetchNuGet {
|
(fetchNuGet {
|
||||||
pname = "BTCPayServer.Lightning.All";
|
pname = "BTCPayServer.Lightning.All";
|
||||||
version = "1.3.12";
|
version = "1.3.13";
|
||||||
sha256 = "005nl3sl3awdpwnvdsww8kg4ysj804459a5yip283fy7a29xagyh";
|
sha256 = "103isdymijx4bdpjs968dmfc26kdxjzvqlca2p7vxxzp8ww7yjcz";
|
||||||
})
|
})
|
||||||
(fetchNuGet {
|
(fetchNuGet {
|
||||||
pname = "BTCPayServer.Lightning.Charge";
|
pname = "BTCPayServer.Lightning.Charge";
|
||||||
@ -71,8 +71,8 @@
|
|||||||
})
|
})
|
||||||
(fetchNuGet {
|
(fetchNuGet {
|
||||||
pname = "BTCPayServer.Lightning.LNDhub";
|
pname = "BTCPayServer.Lightning.LNDhub";
|
||||||
version = "1.0.2";
|
version = "1.0.3";
|
||||||
sha256 = "1jyn0r9qm9r8szmzx0g0ja2k93r8adi1vn100c8d9wpnr83xwj03";
|
sha256 = "185b9b7h00w92mg5cgwfr94b8lz2xbg8wyhjbzkmb0588crv3y8k";
|
||||||
})
|
})
|
||||||
(fetchNuGet {
|
(fetchNuGet {
|
||||||
pname = "BuildBundlerMinifier";
|
pname = "BuildBundlerMinifier";
|
||||||
@ -1091,8 +1091,8 @@
|
|||||||
})
|
})
|
||||||
(fetchNuGet {
|
(fetchNuGet {
|
||||||
pname = "Selenium.WebDriver.ChromeDriver";
|
pname = "Selenium.WebDriver.ChromeDriver";
|
||||||
version = "103.0.5060.5300";
|
version = "104.0.5112.7900";
|
||||||
sha256 = "1dr1d4nx2qb6is29p3rsmp254v1v6c24pdsx7kyj1yamh89sqd5k";
|
sha256 = "0mq6m5qmlxaq37nh1pzm13s1s4abdgamwwazdc53gf5ll0qwcyxb";
|
||||||
})
|
})
|
||||||
(fetchNuGet {
|
(fetchNuGet {
|
||||||
pname = "Selenium.WebDriver";
|
pname = "Selenium.WebDriver";
|
||||||
|
@ -3,13 +3,13 @@
|
|||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "AusweisApp2";
|
pname = "AusweisApp2";
|
||||||
version = "1.22.7";
|
version = "1.24.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Governikus";
|
owner = "Governikus";
|
||||||
repo = "AusweisApp2";
|
repo = "AusweisApp2";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-A6nWH/WqFxTEIfOQcTRluAX0ORMNiyxfC/XLC8fmbdI=";
|
sha256 = "sha256-2yEUMD3FQ9JrecCnWSr0Fej4ngk7HVCZUgbRqmGbCK8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake pkg-config ];
|
nativeBuildInputs = [ cmake pkg-config ];
|
||||||
|
27
pkgs/applications/misc/tasktimer/default.nix
Normal file
27
pkgs/applications/misc/tasktimer/default.nix
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
{ lib, buildGoModule, fetchFromGitHub }:
|
||||||
|
|
||||||
|
buildGoModule rec {
|
||||||
|
pname = "tasktimer";
|
||||||
|
version = "1.9.4";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "caarlos0";
|
||||||
|
repo = pname;
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "sha256-M88JzcK9HwHeWbQ0McbCF1rIEiKnwh08oEoRck4A/Ho=";
|
||||||
|
};
|
||||||
|
|
||||||
|
vendorSha256 = "sha256-5OSAa7tGPtGyx0bet82FRoIozhhlFtakbPt6PtCTHd0=";
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
mv $out/bin/tasktimer $out/bin/tt
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Task Timer (tt) is a dead simple TUI task timer";
|
||||||
|
homepage = "https://github.com/caarlos0/tasktimer";
|
||||||
|
license = licenses.mit;
|
||||||
|
maintainers = with maintainers; [ abbe ];
|
||||||
|
mainProgram = "tt";
|
||||||
|
};
|
||||||
|
}
|
@ -3,7 +3,7 @@
|
|||||||
, glib, gtk3, gnome, gsettings-desktop-schemas, gn, fetchgit
|
, glib, gtk3, gnome, gsettings-desktop-schemas, gn, fetchgit
|
||||||
, libva, pipewire, wayland
|
, libva, pipewire, wayland
|
||||||
, gcc, nspr, nss, runCommand
|
, gcc, nspr, nss, runCommand
|
||||||
, lib
|
, lib, libkrb5
|
||||||
|
|
||||||
# package customization
|
# package customization
|
||||||
# Note: enable* flags should not require full rebuilds (i.e. only affect the wrapper)
|
# Note: enable* flags should not require full rebuilds (i.e. only affect the wrapper)
|
||||||
@ -169,13 +169,16 @@ in stdenv.mkDerivation {
|
|||||||
|
|
||||||
# needed for XDG_ICON_DIRS
|
# needed for XDG_ICON_DIRS
|
||||||
gnome.adwaita-icon-theme
|
gnome.adwaita-icon-theme
|
||||||
|
|
||||||
|
# Needed for kerberos at runtime
|
||||||
|
libkrb5
|
||||||
];
|
];
|
||||||
|
|
||||||
outputs = ["out" "sandbox"];
|
outputs = ["out" "sandbox"];
|
||||||
|
|
||||||
buildCommand = let
|
buildCommand = let
|
||||||
browserBinary = "${chromiumWV}/libexec/chromium/chromium";
|
browserBinary = "${chromiumWV}/libexec/chromium/chromium";
|
||||||
libPath = lib.makeLibraryPath [ libva pipewire wayland gtk3 ];
|
libPath = lib.makeLibraryPath [ libva pipewire wayland gtk3 libkrb5 ];
|
||||||
|
|
||||||
in with lib; ''
|
in with lib; ''
|
||||||
mkdir -p "$out/bin"
|
mkdir -p "$out/bin"
|
||||||
|
@ -7,13 +7,13 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "arkade";
|
pname = "arkade";
|
||||||
version = "0.8.32";
|
version = "0.8.34";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "alexellis";
|
owner = "alexellis";
|
||||||
repo = "arkade";
|
repo = "arkade";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-Yat9RIsbMCGVwu7xqC2xNUPZACpMG+ATsQN7d2n0eFU=";
|
sha256 = "sha256-nGAR+CYVE2acXRRJCl6nWTrjpbX6HArsys9Df8D/hEE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
CGO_ENABLED = 0;
|
CGO_ENABLED = 0;
|
||||||
|
@ -2,13 +2,13 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "glooctl";
|
pname = "glooctl";
|
||||||
version = "1.12.6";
|
version = "1.12.7";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "solo-io";
|
owner = "solo-io";
|
||||||
repo = "gloo";
|
repo = "gloo";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-g2cKT3ZTLYFBCw3xlcuB2qZ6MTV7qBfN7sieenFUeMM=";
|
hash = "sha256-GFexXy/vH8rbtoxGo0Sy6cO+FxLTGaO67BkBPgaHuws=";
|
||||||
};
|
};
|
||||||
|
|
||||||
subPackages = [ "projects/gloo/cli/cmd" ];
|
subPackages = [ "projects/gloo/cli/cmd" ];
|
||||||
|
@ -17,13 +17,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "freedv";
|
pname = "freedv";
|
||||||
version = "1.8.3";
|
version = "1.8.3.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "drowe67";
|
owner = "drowe67";
|
||||||
repo = "freedv-gui";
|
repo = "freedv-gui";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-hZcaA8ZAkNigWwcaU8K6R6atNi8pqIUUEwkje+3sW8A=";
|
hash = "sha256-LPCY5gPinxJkfPfumKggI/JQorcW+Qw/ZAP6XQmPkeA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
@ -2,13 +2,13 @@
|
|||||||
|
|
||||||
python3Packages.buildPythonApplication rec {
|
python3Packages.buildPythonApplication rec {
|
||||||
pname = "git-delete-merged-branches";
|
pname = "git-delete-merged-branches";
|
||||||
version = "7.0.0";
|
version = "7.2.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "hartwork";
|
owner = "hartwork";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
sha256 = "sha256-CPJhd3QXXNm4RGBEDnNOohVOYKVI6I8uc3cDiTrXKvc=";
|
sha256 = "sha256-pdP+DDJOSqr/fUQPtb84l/8J4EA81nlk/U8h24X8n+I=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = with python3Packages; [
|
propagatedBuildInputs = with python3Packages; [
|
||||||
|
@ -2,16 +2,16 @@
|
|||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "nixpacks";
|
pname = "nixpacks";
|
||||||
version = "0.2.13";
|
version = "0.3.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "railwayapp";
|
owner = "railwayapp";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-ZI29kcGteyJWUfCC/DR92YqzfuVYqDx7FtedehVp+vs=";
|
sha256 = "sha256-WLT9dkaoPHusPBD6oZQSR1KGR1/Lt1jB4+BLhuAXo50=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "sha256-Njvf5+i54TLbcWtWiNefEWudtGsSjw+DJh+FP6OuLek=";
|
cargoSha256 = "sha256-aV0Cg4hbcGylQjx09rHvwHbre/OSALvekEifRYr89D8=";
|
||||||
|
|
||||||
# skip test due FHS dependency
|
# skip test due FHS dependency
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"commit": "7a6596613e0d6549f329cb3c2862b035667e0fc3",
|
"commit": "eb862a59277fd86ad3138e9f25e793f0fe0364ba",
|
||||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/7a6596613e0d6549f329cb3c2862b035667e0fc3.tar.gz",
|
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/eb862a59277fd86ad3138e9f25e793f0fe0364ba.tar.gz",
|
||||||
"sha256": "07sm18dn6lsi8xjhfhm7dyw62lpln9wyhafkigc6f3xaqblz3ap4",
|
"sha256": "10agwlxzp76lnp4d6zncvjgv78hr3rss3j3i3bfpsn3i7af1qcw8",
|
||||||
"msg": "Update from Hackage at 2022-08-07T14:05:30Z"
|
"msg": "Update from Hackage at 2022-08-09T06:14:32Z"
|
||||||
}
|
}
|
||||||
|
@ -147,6 +147,7 @@ stdenv.mkDerivation rec {
|
|||||||
intltool
|
intltool
|
||||||
gtk-doc
|
gtk-doc
|
||||||
perl
|
perl
|
||||||
|
python3.pkgs.wrapPython
|
||||||
];
|
];
|
||||||
|
|
||||||
# use locales from cinnamon-translations (not using --localedir because datadir is used)
|
# use locales from cinnamon-translations (not using --localedir because datadir is used)
|
||||||
@ -184,6 +185,17 @@ stdenv.mkDerivation rec {
|
|||||||
patchShebangs src/data-to-c.pl
|
patchShebangs src/data-to-c.pl
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
preFixup = ''
|
||||||
|
# https://github.com/NixOS/nixpkgs/issues/101881
|
||||||
|
gappsWrapperArgs+=(
|
||||||
|
--prefix XDG_DATA_DIRS : "${gnome.caribou}/share"
|
||||||
|
)
|
||||||
|
|
||||||
|
# https://github.com/NixOS/nixpkgs/issues/129946
|
||||||
|
buildPythonPath "${python3.pkgs.xapp}"
|
||||||
|
patchPythonScript $out/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py
|
||||||
|
'';
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
providedSessions = [ "cinnamon" "cinnamon2d" ];
|
providedSessions = [ "cinnamon" "cinnamon2d" ];
|
||||||
};
|
};
|
||||||
|
@ -177,32 +177,27 @@ assert buildTargetLlvmPackages.llvm == llvmPackages.llvm;
|
|||||||
assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang;
|
assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang;
|
||||||
|
|
||||||
stdenv.mkDerivation (rec {
|
stdenv.mkDerivation (rec {
|
||||||
version = "9.4.0.20220721";
|
version = "9.4.1";
|
||||||
pname = "${targetPrefix}ghc${variantSuffix}";
|
pname = "${targetPrefix}ghc${variantSuffix}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://downloads.haskell.org/ghc/9.4.1-rc1/ghc-${version}-src.tar.xz";
|
url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
|
||||||
sha256 = "bca8c52f76d8747a66291181de2de7bdf9ff80093808fe39bf5cbff0f116c426";
|
sha256 = "sha256-y/7UZAvfAl4zulVDPa+M32mPTgSZrnqADd5EqC5zluM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
outputs = [ "out" "doc" ];
|
outputs = [ "out" "doc" ];
|
||||||
|
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482
|
# add missing profiling targets in make build system
|
||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch";
|
name = "ghc-9.4.1-fix-bootstrapping-with-profiling-1.patch";
|
||||||
sha256 = "sha256-8w8QUCsODaTvknCDGgTfFNZa8ZmvIKaKS+2ZJZ9foYk=";
|
url = "https://gitlab.haskell.org/ghc/ghc/-/commit/47b4fea08bd0ef1476b8d134c7baf06157fe5fa5.diff";
|
||||||
extraPrefix = "utils/haddock/";
|
sha256 = "sha256-oYQWg9cK0RNL9I+kap8KER+iiKim73zG6URQs8BeAXU=";
|
||||||
stripLen = 1;
|
|
||||||
})
|
|
||||||
# fix race condition in make build system
|
|
||||||
(fetchpatch {
|
|
||||||
name = "ghc-hs-boot-copying-fix.patch";
|
|
||||||
url = "https://gitlab.haskell.org/ghc/ghc/-/commit/4f17eff0cbd125eca55b68f4927befdd45008eb6.diff";
|
|
||||||
sha256 = "0anq3w9z9mhxb0wx6rvxac3n7rl3apcma9zk3r9zz9hj9v7vkqzx";
|
|
||||||
})
|
})
|
||||||
|
./ghc-9.4.1-fix-bootstrapping-with-profiling-2.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
postPatch = "patchShebangs .";
|
postPatch = "patchShebangs .";
|
||||||
@ -240,14 +235,6 @@ stdenv.mkDerivation (rec {
|
|||||||
'' + ''
|
'' + ''
|
||||||
|
|
||||||
echo -n "${buildMK}" > mk/build.mk
|
echo -n "${buildMK}" > mk/build.mk
|
||||||
# GHC 9.4.1-rc1 tarball is not properly prepared, also the boot script has been renamed
|
|
||||||
# https://gitlab.haskell.org/ghc/ghc/-/issues/21626#note_444654
|
|
||||||
# TODO(@sternenseemann): make source-dist rules include all boot-generated files
|
|
||||||
./boot.source
|
|
||||||
|
|
||||||
# Too restrictive upper bound on Cabal the make build system chokes on
|
|
||||||
# XXX(@sternenseemann): this should be upstreamed
|
|
||||||
substituteInPlace utils/ghc-cabal/ghc-cabal.cabal --replace "3.8" "3.9"
|
|
||||||
|
|
||||||
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
|
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
|
||||||
'' + lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") ''
|
'' + lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") ''
|
||||||
@ -277,6 +264,13 @@ stdenv.mkDerivation (rec {
|
|||||||
--replace '*-android*|*-gnueabi*)' \
|
--replace '*-android*|*-gnueabi*)' \
|
||||||
'*-android*|*-gnueabi*|*-musleabi*)'
|
'*-android*|*-gnueabi*|*-musleabi*)'
|
||||||
done
|
done
|
||||||
|
''
|
||||||
|
# HACK: allow bootstrapping with GHC 8.10 which works fine, as we don't have
|
||||||
|
# binary 9.0 packaged. Bootstrapping with 9.2 is broken without hadrian.
|
||||||
|
+ ''
|
||||||
|
substituteInPlace configure --replace \
|
||||||
|
'MinBootGhcVersion="9.0"' \
|
||||||
|
'MinBootGhcVersion="8.10"'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# TODO(@Ericson2314): Always pass "--target" and always prefix.
|
# TODO(@Ericson2314): Always pass "--target" and always prefix.
|
||||||
|
@ -0,0 +1,18 @@
|
|||||||
|
diff --git a/ghc.mk b/ghc.mk
|
||||||
|
index dd65e7adfe..b91af56078 100644
|
||||||
|
--- a/ghc.mk
|
||||||
|
+++ b/ghc.mk
|
||||||
|
@@ -509,11 +509,13 @@ libraries/containers/containers/dist-install/build/Data/IntMap/Internal.o: libra
|
||||||
|
libraries/containers/containers/dist-install/build/Data/Graph.o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.hi
|
||||||
|
libraries/containers/containers/dist-install/build/Data/Set/Internal.o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.hi
|
||||||
|
libraries/containers/containers/dist-install/build/Data/IntSet/Internal.o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.hi
|
||||||
|
+libraries/containers/containers/dist-install/build/Data/Sequence/Internal.o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.hi
|
||||||
|
|
||||||
|
libraries/containers/containers/dist-install/build/Data/IntMap/Internal.p_o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.p_hi
|
||||||
|
libraries/containers/containers/dist-install/build/Data/Graph.p_o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.p_hi
|
||||||
|
libraries/containers/containers/dist-install/build/Data/Set/Internal.p_o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.p_hi
|
||||||
|
libraries/containers/containers/dist-install/build/Data/IntSet/Internal.p_o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.p_hi
|
||||||
|
+libraries/containers/containers/dist-install/build/Data/Sequence/Internal.p_o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.p_hi
|
||||||
|
|
||||||
|
ifeq "$(BIGNUM_BACKEND)" "gmp"
|
||||||
|
GMP_ENABLED = YES
|
88
pkgs/development/compilers/p4c/default.nix
Normal file
88
pkgs/development/compilers/p4c/default.nix
Normal file
@ -0,0 +1,88 @@
|
|||||||
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, fetchFromGitHub
|
||||||
|
, cmake
|
||||||
|
, boehmgc
|
||||||
|
, bison
|
||||||
|
, flex
|
||||||
|
, protobuf
|
||||||
|
, gmp
|
||||||
|
, boost
|
||||||
|
, python3
|
||||||
|
, doxygen
|
||||||
|
, graphviz
|
||||||
|
, libbpf
|
||||||
|
, libllvm
|
||||||
|
, enableDocumentation ? true
|
||||||
|
, enableBPF ? true
|
||||||
|
, enableDPDK ? true
|
||||||
|
, enableBMV2 ? true
|
||||||
|
, enableGraphBackend ? true
|
||||||
|
, enableP4Tests ? true
|
||||||
|
, enableGTests ? true
|
||||||
|
, enableMultithreading ? false
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
toCMakeBoolean = v: if v then "ON" else "OFF";
|
||||||
|
in
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "p4c";
|
||||||
|
version = "1.2.2.1";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "p4lang";
|
||||||
|
repo = "p4c";
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "sha256-XIZ7Cm5zfr5XA+s0aSG1WwWHCPjAYv/YoBWTRaXi9rQ=";
|
||||||
|
fetchSubmodules = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
postFetch = ''
|
||||||
|
rm -rf backends/ebpf/runtime/contrib/libbpf
|
||||||
|
rm -rf control-plane/p4runtime
|
||||||
|
'';
|
||||||
|
|
||||||
|
cmakeFlags = [
|
||||||
|
"-DENABLE_BMV2=${toCMakeBoolean enableBMV2}"
|
||||||
|
"-DENABLE_EBPF=${toCMakeBoolean enableBPF}"
|
||||||
|
"-DENABLE_UBPF=${toCMakeBoolean enableBPF}"
|
||||||
|
"-DENABLE_DPDK=${toCMakeBoolean enableDPDK}"
|
||||||
|
"-DENABLE_P4C_GRAPHS=${toCMakeBoolean enableGraphBackend}"
|
||||||
|
"-DENABLE_P4TEST=${toCMakeBoolean enableP4Tests}"
|
||||||
|
"-DENABLE_DOCS=${toCMakeBoolean enableDocumentation}"
|
||||||
|
"-DENABLE_GC=ON"
|
||||||
|
"-DENABLE_GTESTS=${toCMakeBoolean enableGTests}"
|
||||||
|
"-DENABLE_PROTOBUF_STATIC=ON"
|
||||||
|
"-DENABLE_MULTITHREAD=${toCMakeBoolean enableMultithreading}"
|
||||||
|
"-DENABLE_GMP=ON"
|
||||||
|
];
|
||||||
|
|
||||||
|
checkTarget = "check";
|
||||||
|
|
||||||
|
strictDeps = true;
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
bison
|
||||||
|
flex
|
||||||
|
cmake
|
||||||
|
python3
|
||||||
|
]
|
||||||
|
++ lib.optional enableDocumentation [ doxygen graphviz ]
|
||||||
|
++ lib.optional enableBPF [ libllvm libbpf ];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
protobuf
|
||||||
|
boost
|
||||||
|
boehmgc
|
||||||
|
gmp
|
||||||
|
flex
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
homepage = "https://github.com/p4lang/p4c";
|
||||||
|
description = "Reference compiler for the P4 programming language";
|
||||||
|
platforms = platforms.linux;
|
||||||
|
maintainers = with maintainers; [ raitobezarius ];
|
||||||
|
license = licenses.asl20;
|
||||||
|
};
|
||||||
|
}
|
@ -237,6 +237,11 @@ self: super: {
|
|||||||
# base bound
|
# base bound
|
||||||
digit = doJailbreak super.digit;
|
digit = doJailbreak super.digit;
|
||||||
|
|
||||||
|
# matterhorn-50200.17.0 won't work with brick >= 0.71
|
||||||
|
matterhorn = doJailbreak (super.matterhorn.overrideScope (self: super: {
|
||||||
|
brick = self.brick_0_70_1;
|
||||||
|
}));
|
||||||
|
|
||||||
# 2020-06-05: HACK: does not pass own build suite - `dontCheck`
|
# 2020-06-05: HACK: does not pass own build suite - `dontCheck`
|
||||||
# 2022-06-17: Use hnix-store 0.5 until hnix 0.17
|
# 2022-06-17: Use hnix-store 0.5 until hnix 0.17
|
||||||
hnix = generateOptparseApplicativeCompletion "hnix" (dontCheck (
|
hnix = generateOptparseApplicativeCompletion "hnix" (dontCheck (
|
||||||
@ -351,24 +356,6 @@ self: super: {
|
|||||||
lensref = dontCheck super.lensref;
|
lensref = dontCheck super.lensref;
|
||||||
lvmrun = disableHardening ["format"] (dontCheck super.lvmrun);
|
lvmrun = disableHardening ["format"] (dontCheck super.lvmrun);
|
||||||
matplotlib = dontCheck super.matplotlib;
|
matplotlib = dontCheck super.matplotlib;
|
||||||
|
|
||||||
brick_0_73 = doDistribute (super.brick_0_73.overrideScope (self: super: {
|
|
||||||
vty = self.vty_5_36;
|
|
||||||
text-zipper = self.text-zipper_0_12;
|
|
||||||
}));
|
|
||||||
|
|
||||||
# https://github.com/matterhorn-chat/matterhorn/issues/679 they do not want to be on stackage
|
|
||||||
matterhorn = doJailbreak (appendPatches [
|
|
||||||
# Fix build with brick 0.73
|
|
||||||
(fetchpatch {
|
|
||||||
name = "matterhorn-brick-0.72.patch";
|
|
||||||
url = "https://github.com/matterhorn-chat/matterhorn/commit/d52df3342b8420e219095aad477205e47fbef11b.patch";
|
|
||||||
sha256 = "1ifvv926g9m8niyc9nl1hy9bkx4kf12ciyv2v8vnrzz3njp4fsrz";
|
|
||||||
})
|
|
||||||
] (super.matterhorn.overrideScope (self: super: {
|
|
||||||
brick = self.brick_0_73;
|
|
||||||
})));
|
|
||||||
|
|
||||||
memcache = dontCheck super.memcache;
|
memcache = dontCheck super.memcache;
|
||||||
metrics = dontCheck super.metrics;
|
metrics = dontCheck super.metrics;
|
||||||
milena = dontCheck super.milena;
|
milena = dontCheck super.milena;
|
||||||
|
@ -92,13 +92,15 @@ self: super: {
|
|||||||
mime-string = disableOptimization super.mime-string;
|
mime-string = disableOptimization super.mime-string;
|
||||||
|
|
||||||
# Older compilers need the latest ghc-lib to build this package.
|
# Older compilers need the latest ghc-lib to build this package.
|
||||||
hls-hlint-plugin = addBuildDepend self.ghc-lib (overrideCabal (drv: {
|
# Fix build with ghc-lib >= 9.0 and ghc <= 8.10.7
|
||||||
# Workaround for https://github.com/haskell/haskell-language-server/issues/2728
|
# https://github.com/haskell/haskell-language-server/issues/2728
|
||||||
postPatch = ''
|
hls-hlint-plugin = addBuildDepend self.ghc-lib (appendPatch (pkgs.fetchpatch {
|
||||||
sed -i 's/(GHC.RealSrcSpan x,/(GHC.RealSrcSpan x Nothing,/' src/Ide/Plugin/Hlint.hs
|
name = "hls-hlint-plugin-workaround.patch";
|
||||||
'';
|
url = "https://github.com/haskell/haskell-language-server/pull/2854.patch";
|
||||||
})
|
hash = "sha256-bLGu0OQtXsmMF3rZM+R6k7bsZm4Vgf2r0ert5Wunong=";
|
||||||
super.hls-hlint-plugin);
|
stripLen = 2;
|
||||||
|
includes = ["src/Ide/Plugin/Hlint.hs"];
|
||||||
|
}) super.hls-hlint-plugin);
|
||||||
|
|
||||||
haskell-language-server = appendConfigureFlags [
|
haskell-language-server = appendConfigureFlags [
|
||||||
"-f-stylishhaskell"
|
"-f-stylishhaskell"
|
||||||
|
@ -269,6 +269,7 @@ broken-packages:
|
|||||||
- awesomium-raw
|
- awesomium-raw
|
||||||
- aws-cloudfront-signer
|
- aws-cloudfront-signer
|
||||||
- aws-ec2
|
- aws-ec2
|
||||||
|
- aws-ec2-knownhosts
|
||||||
- aws-general
|
- aws-general
|
||||||
- aws-lambda-haskell-runtime
|
- aws-lambda-haskell-runtime
|
||||||
- aws-lambda-runtime
|
- aws-lambda-runtime
|
||||||
@ -550,6 +551,7 @@ broken-packages:
|
|||||||
- cabal-upload
|
- cabal-upload
|
||||||
- cabalvchk
|
- cabalvchk
|
||||||
- cabin
|
- cabin
|
||||||
|
- cabocha
|
||||||
- cached
|
- cached
|
||||||
- cache-polysemy
|
- cache-polysemy
|
||||||
- caching
|
- caching
|
||||||
@ -557,6 +559,7 @@ broken-packages:
|
|||||||
- cafeteria-prelude
|
- cafeteria-prelude
|
||||||
- caffegraph
|
- caffegraph
|
||||||
- cairo-core
|
- cairo-core
|
||||||
|
- cake3
|
||||||
- cal3d
|
- cal3d
|
||||||
- calamity
|
- calamity
|
||||||
- caledon
|
- caledon
|
||||||
@ -1203,6 +1206,7 @@ broken-packages:
|
|||||||
- dump-core
|
- dump-core
|
||||||
- dunai-core
|
- dunai-core
|
||||||
- Dung
|
- Dung
|
||||||
|
- duplo
|
||||||
- dura
|
- dura
|
||||||
- dvault
|
- dvault
|
||||||
- dvdread
|
- dvdread
|
||||||
@ -1957,6 +1961,7 @@ broken-packages:
|
|||||||
- hashtables-plus
|
- hashtables-plus
|
||||||
- hasim
|
- hasim
|
||||||
- hask
|
- hask
|
||||||
|
- haskades
|
||||||
- haskanoid
|
- haskanoid
|
||||||
- haskarrow
|
- haskarrow
|
||||||
- haskbot-core
|
- haskbot-core
|
||||||
@ -2138,6 +2143,7 @@ broken-packages:
|
|||||||
- heterogeneous-list-literals
|
- heterogeneous-list-literals
|
||||||
- hetris
|
- hetris
|
||||||
- heukarya
|
- heukarya
|
||||||
|
- hevm
|
||||||
- HExcel
|
- HExcel
|
||||||
- hexchat
|
- hexchat
|
||||||
- hexif
|
- hexif
|
||||||
@ -2206,6 +2212,7 @@ broken-packages:
|
|||||||
- hinter
|
- hinter
|
||||||
- hinterface
|
- hinterface
|
||||||
- hipchat-hs
|
- hipchat-hs
|
||||||
|
- hipe
|
||||||
- Hipmunk
|
- Hipmunk
|
||||||
- hipsql-api
|
- hipsql-api
|
||||||
- hircules
|
- hircules
|
||||||
@ -2551,6 +2558,7 @@ broken-packages:
|
|||||||
- hylolib
|
- hylolib
|
||||||
- hyperdrive
|
- hyperdrive
|
||||||
- hyperfunctions
|
- hyperfunctions
|
||||||
|
- hypergeomatrix
|
||||||
- hyper-haskell-server
|
- hyper-haskell-server
|
||||||
- hyperion
|
- hyperion
|
||||||
- hyperloglogplus
|
- hyperloglogplus
|
||||||
@ -2677,6 +2685,7 @@ broken-packages:
|
|||||||
- ireal
|
- ireal
|
||||||
- iri
|
- iri
|
||||||
- iridium
|
- iridium
|
||||||
|
- iris
|
||||||
- iron-mq
|
- iron-mq
|
||||||
- irt
|
- irt
|
||||||
- isdicom
|
- isdicom
|
||||||
@ -2720,6 +2729,7 @@ broken-packages:
|
|||||||
- jinquantities
|
- jinquantities
|
||||||
- jml-web-service
|
- jml-web-service
|
||||||
- jni
|
- jni
|
||||||
|
- jobqueue
|
||||||
- join-api
|
- join-api
|
||||||
- joinlist
|
- joinlist
|
||||||
- joint
|
- joint
|
||||||
@ -2780,6 +2790,7 @@ broken-packages:
|
|||||||
- Kalman
|
- Kalman
|
||||||
- kangaroo
|
- kangaroo
|
||||||
- karabiner-config
|
- karabiner-config
|
||||||
|
- karps
|
||||||
- katip-datadog
|
- katip-datadog
|
||||||
- katip-elasticsearch
|
- katip-elasticsearch
|
||||||
- katip-kafka
|
- katip-kafka
|
||||||
@ -2824,6 +2835,7 @@ broken-packages:
|
|||||||
- korea-holidays
|
- korea-holidays
|
||||||
- kraken
|
- kraken
|
||||||
- krank
|
- krank
|
||||||
|
- krapsh
|
||||||
- Kriens
|
- Kriens
|
||||||
- krpc
|
- krpc
|
||||||
- KSP
|
- KSP
|
||||||
@ -2887,6 +2899,7 @@ broken-packages:
|
|||||||
- language-webidl
|
- language-webidl
|
||||||
- LargeCardinalHierarchy
|
- LargeCardinalHierarchy
|
||||||
- Lastik
|
- Lastik
|
||||||
|
- latest-npm-version
|
||||||
- latex-formulae-image
|
- latex-formulae-image
|
||||||
- latex-svg-image
|
- latex-svg-image
|
||||||
- LATS
|
- LATS
|
||||||
@ -3042,6 +3055,7 @@ broken-packages:
|
|||||||
- lojbanParser
|
- lojbanParser
|
||||||
- lojbanXiragan
|
- lojbanXiragan
|
||||||
- lol
|
- lol
|
||||||
|
- lol-calculus
|
||||||
- longboi
|
- longboi
|
||||||
- longshot
|
- longshot
|
||||||
- lookup-tables
|
- lookup-tables
|
||||||
@ -3201,6 +3215,7 @@ broken-packages:
|
|||||||
- miconix-test
|
- miconix-test
|
||||||
- microgroove
|
- microgroove
|
||||||
- microlens-each
|
- microlens-each
|
||||||
|
- micrologger
|
||||||
- micro-recursion-schemes
|
- micro-recursion-schemes
|
||||||
- microsoft-translator
|
- microsoft-translator
|
||||||
- mida
|
- mida
|
||||||
@ -3477,6 +3492,7 @@ broken-packages:
|
|||||||
- niagra
|
- niagra
|
||||||
- nibblestring
|
- nibblestring
|
||||||
- nice-html
|
- nice-html
|
||||||
|
- nicovideo-translator
|
||||||
- nitro
|
- nitro
|
||||||
- nix-delegate
|
- nix-delegate
|
||||||
- nix-eval
|
- nix-eval
|
||||||
@ -3525,7 +3541,7 @@ broken-packages:
|
|||||||
- numhask-histogram
|
- numhask-histogram
|
||||||
- numhask-prelude
|
- numhask-prelude
|
||||||
- Nutri
|
- Nutri
|
||||||
- nvim-hs-contrib
|
- nvim-hs-ghcid
|
||||||
- NXTDSL
|
- NXTDSL
|
||||||
- nyan-interpolation-core
|
- nyan-interpolation-core
|
||||||
- nylas
|
- nylas
|
||||||
@ -3808,6 +3824,7 @@ broken-packages:
|
|||||||
- phraskell
|
- phraskell
|
||||||
- Phsu
|
- Phsu
|
||||||
- phybin
|
- phybin
|
||||||
|
- pia-forward
|
||||||
- pi-calculus
|
- pi-calculus
|
||||||
- picedit
|
- picedit
|
||||||
- pickle
|
- pickle
|
||||||
@ -4065,6 +4082,7 @@ broken-packages:
|
|||||||
- pushbullet-types
|
- pushbullet-types
|
||||||
- pusher-haskell
|
- pusher-haskell
|
||||||
- pusher-ws
|
- pusher-ws
|
||||||
|
- pushme
|
||||||
- push-notifications
|
- push-notifications
|
||||||
- putlenses
|
- putlenses
|
||||||
- puzzle-draw
|
- puzzle-draw
|
||||||
@ -4496,6 +4514,7 @@ broken-packages:
|
|||||||
- servant-static-th
|
- servant-static-th
|
||||||
- servant-streaming
|
- servant-streaming
|
||||||
- servant-streamly
|
- servant-streamly
|
||||||
|
- servant-util
|
||||||
- servant-wasm
|
- servant-wasm
|
||||||
- servant-yaml
|
- servant-yaml
|
||||||
- servant-zeppelin
|
- servant-zeppelin
|
||||||
@ -5037,6 +5056,7 @@ broken-packages:
|
|||||||
- tex2txt
|
- tex2txt
|
||||||
- texbuilder
|
- texbuilder
|
||||||
- text1
|
- text1
|
||||||
|
- text-all
|
||||||
- text-and-plots
|
- text-and-plots
|
||||||
- text-ascii
|
- text-ascii
|
||||||
- text-builder-linear
|
- text-builder-linear
|
||||||
@ -5134,6 +5154,10 @@ broken-packages:
|
|||||||
- tkhs
|
- tkhs
|
||||||
- tkyprof
|
- tkyprof
|
||||||
- tmp-proc-example
|
- tmp-proc-example
|
||||||
|
- tmp-proc-postgres
|
||||||
|
- tmp-proc-rabbitmq
|
||||||
|
- tmp-proc-redis
|
||||||
|
- tmp-proc-zipkin
|
||||||
- todo
|
- todo
|
||||||
- tofromxml
|
- tofromxml
|
||||||
- to-haskell
|
- to-haskell
|
||||||
|
@ -91,58 +91,64 @@ default-package-overrides:
|
|||||||
- reflex-dom-core < 0.7.0.2
|
- reflex-dom-core < 0.7.0.2
|
||||||
# Downgrade hasql-dynamic-statements until hasql 1.6 is in Stackage
|
# Downgrade hasql-dynamic-statements until hasql 1.6 is in Stackage
|
||||||
- hasql-dynamic-statements < 0.3.1.2
|
- hasql-dynamic-statements < 0.3.1.2
|
||||||
|
# Its dependency brick >= 1.0 is not yet in stackage
|
||||||
|
- brick-skylighting < 1.0
|
||||||
|
|
||||||
extra-packages:
|
extra-packages:
|
||||||
- aeson < 2 # required by pantry-0.5.2
|
|
||||||
- base16-bytestring < 1 # required for cabal-install etc.
|
|
||||||
- Cabal == 2.2.* # required for jailbreak-cabal etc.
|
- Cabal == 2.2.* # required for jailbreak-cabal etc.
|
||||||
- Cabal == 2.4.* # required for cabal-install etc.
|
- Cabal == 2.4.* # required for cabal-install etc.
|
||||||
- Cabal == 3.2.* # required for cabal-install etc.
|
- Cabal == 3.2.* # required for cabal-install etc.
|
||||||
- Cabal == 3.4.* # required for cabal-install etc.
|
- Cabal == 3.4.* # required for cabal-install etc.
|
||||||
|
- Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729
|
||||||
|
- ShellCheck == 0.7.2 # 2022-02-20: haskell-ci 0.14 needs this
|
||||||
|
- aeson < 2 # required by pantry-0.5.2
|
||||||
|
- attoparsec == 0.13.* # 2022-02-23: Needed to compile elm for now
|
||||||
|
- base16-bytestring < 1 # required for cabal-install etc.
|
||||||
|
- bower-json == 1.0.0.1 # 2022-05-21: Needed for spago 0.20.9
|
||||||
|
- clay < 0.14 # 2022-03-20: Needed for neuron 1.0.0.0
|
||||||
|
- crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses
|
||||||
- dependent-map == 0.2.4.0 # required by Hasura 1.3.1, 2020-08-20
|
- dependent-map == 0.2.4.0 # required by Hasura 1.3.1, 2020-08-20
|
||||||
- dependent-sum == 0.4 # required by Hasura 1.3.1, 2020-08-20
|
- dependent-sum == 0.4 # required by Hasura 1.3.1, 2020-08-20
|
||||||
- dhall == 1.29.0 # required for ats-pkg
|
- dhall == 1.29.0 # required for ats-pkg
|
||||||
- dhall == 1.38.1 # required for spago
|
- dhall == 1.38.1 # required for spago
|
||||||
- Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729
|
- doctest == 0.18.* # 2021-11-19: closest to stackage version for GHC 9.*
|
||||||
|
- fourmolu == 0.6.0.0 # 2022-06-05: Last fourmolu version compatible with hls 1.7/ hls-fourmolu-plugin 1.0.3.0
|
||||||
|
- ghc-api-compat == 8.10.7 # 2022-02-17: preserve for GHC 8.10.7
|
||||||
|
- ghc-api-compat == 8.6 # 2021-09-07: preserve for GHC 8.8.4
|
||||||
|
- ghc-lib == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7
|
||||||
|
- ghc-lib == 9.2.* # 2022-02-17: preserve for GHC 9.2
|
||||||
|
- ghc-lib-parser == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7
|
||||||
|
- ghc-lib-parser == 9.2.* # 2022-02-17: preserve for GHC 9.2
|
||||||
|
- ghc-lib-parser-ex == 8.10.* # 2022-02-17: preserve for GHC 8.10.7
|
||||||
|
- ghc-lib-parser-ex == 9.2.* # 2022-07-13: preserve for GHC 9.2
|
||||||
|
- ghc-lib-parser-ex >= 9.2.0.3 && < 9.2.1 # 2022-07-13: needed by hlint 3.4.1
|
||||||
- haddock == 2.23.* # required on GHC < 8.10.x
|
- haddock == 2.23.* # required on GHC < 8.10.x
|
||||||
- haddock-api == 2.23.* # required on GHC < 8.10.x
|
- haddock-api == 2.23.* # required on GHC < 8.10.x
|
||||||
- haddock-library ==1.7.* # required by stylish-cabal-0.5.0.0
|
- haddock-library ==1.7.* # required by stylish-cabal-0.5.0.0
|
||||||
- happy == 1.19.12 # for ghcjs
|
- happy == 1.19.12 # for ghcjs
|
||||||
- hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29
|
- hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29
|
||||||
|
- hnix-store-core == 0.5.0.0 # 2022-06-17: Until hnix 0.17
|
||||||
|
- hnix-store-remote == 0.5.0.0 # 2022-06-17: Until hnix 0.17
|
||||||
|
- hspec < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6
|
||||||
|
- hspec-core < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6
|
||||||
|
- hspec-discover < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6
|
||||||
|
- hspec-golden == 0.1.* # 2022-04-07: Needed for elm-format
|
||||||
- immortal == 0.2.2.1 # required by Hasura 1.3.1, 2020-08-20
|
- immortal == 0.2.2.1 # required by Hasura 1.3.1, 2020-08-20
|
||||||
- language-javascript == 0.7.0.0 # required by purescript
|
- language-javascript == 0.7.0.0 # required by purescript
|
||||||
- mmorph == 1.1.3 # Newest working version of mmorph on ghc 8.6.5. needed for hls
|
- mmorph == 1.1.3 # Newest working version of mmorph on ghc 8.6.5. needed for hls
|
||||||
- network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15
|
- network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15
|
||||||
- optparse-applicative < 0.16 # needed for niv-0.2.19
|
- optparse-applicative < 0.16 # needed for niv-0.2.19
|
||||||
|
- ormolu == 0.2.* # 2022-02-21: For ghc 8.8 and 8.10
|
||||||
- pantry == 0.5.2.1 # needed for stack-2.7.3
|
- pantry == 0.5.2.1 # needed for stack-2.7.3
|
||||||
|
- path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2
|
||||||
|
- relude == 0.7.0.0 # 2022-02-25: Needed for ema 0.6
|
||||||
- resolv == 0.1.1.2 # required to build cabal-install-3.0.0.0 with pre ghc-8.8.x
|
- resolv == 0.1.1.2 # required to build cabal-install-3.0.0.0 with pre ghc-8.8.x
|
||||||
- sbv == 7.13 # required for pkgs.petrinizer
|
- sbv == 7.13 # required for pkgs.petrinizer
|
||||||
- crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses
|
- tasty-hspec == 1.1.6 # 2022-04-07: Needed for elm-format
|
||||||
- ghc-api-compat == 8.6 # 2021-09-07: preserve for GHC 8.8.4
|
- vty == 5.35.1 # 2022-07-08: needed for glirc-2.39.0.1
|
||||||
- ghc-api-compat == 8.10.7 # 2022-02-17: preserve for GHC 8.10.7
|
|
||||||
- ghc-lib == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7
|
|
||||||
- ghc-lib-parser == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7
|
|
||||||
- ghc-lib-parser-ex == 8.10.* # 2022-02-17: preserve for GHC 8.10.7
|
|
||||||
- ghc-lib-parser-ex >= 9.2.0.3 && < 9.2.1 # 2022-07-13: needed by hlint 3.4.1
|
|
||||||
- doctest == 0.18.* # 2021-11-19: closest to stackage version for GHC 9.*
|
|
||||||
- path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2
|
|
||||||
- ormolu == 0.2.* # 2022-02-21: For ghc 8.8 and 8.10
|
|
||||||
- ShellCheck == 0.7.2 # 2022-02-20: haskell-ci 0.14 needs this
|
|
||||||
- weeder == 2.2.* # 2022-02-21: preserve for GHC 8.10.7
|
- weeder == 2.2.* # 2022-02-21: preserve for GHC 8.10.7
|
||||||
- weeder == 2.3.* # 2022-05-31: preserve for GHC 9.0.2
|
- weeder == 2.3.* # 2022-05-31: preserve for GHC 9.0.2
|
||||||
- attoparsec == 0.13.* # 2022-02-23: Needed to compile elm for now
|
- brick == 0.70.* # 2022-08-13: needed by matterhorn-50200.17.0
|
||||||
- relude == 0.7.0.0 # 2022-02-25: Needed for ema 0.6
|
|
||||||
- clay < 0.14 # 2022-03-20: Needed for neuron 1.0.0.0
|
|
||||||
- hspec-golden == 0.1.* # 2022-04-07: Needed for elm-format
|
|
||||||
- tasty-hspec == 1.1.6 # 2022-04-07: Needed for elm-format
|
|
||||||
- hspec < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6
|
|
||||||
- hspec-core < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6
|
|
||||||
- hspec-discover < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6
|
|
||||||
- bower-json == 1.0.0.1 # 2022-05-21: Needed for spago 0.20.9
|
|
||||||
- fourmolu == 0.6.0.0 # 2022-06-05: Last fourmolu version compatible with hls 1.7/ hls-fourmolu-plugin 1.0.3.0
|
|
||||||
- hnix-store-core == 0.5.0.0 # 2022-06-17: Until hnix 0.17
|
|
||||||
- hnix-store-remote == 0.5.0.0 # 2022-06-17: Until hnix 0.17
|
|
||||||
- vty == 5.35.1 # 2022-07-08: needed for glirc-2.39.0.1
|
|
||||||
|
|
||||||
package-maintainers:
|
package-maintainers:
|
||||||
abbradar:
|
abbradar:
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Stackage LTS 19.17
|
# Stackage LTS 19.18
|
||||||
# This file is auto-generated by
|
# This file is auto-generated by
|
||||||
# maintainers/scripts/haskell/update-stackage.sh
|
# maintainers/scripts/haskell/update-stackage.sh
|
||||||
default-package-overrides:
|
default-package-overrides:
|
||||||
@ -258,7 +258,7 @@ default-package-overrides:
|
|||||||
- bytestring-mmap ==0.2.2
|
- bytestring-mmap ==0.2.2
|
||||||
- bytestring-strict-builder ==0.4.5.6
|
- bytestring-strict-builder ==0.4.5.6
|
||||||
- bytestring-to-vector ==0.3.0.1
|
- bytestring-to-vector ==0.3.0.1
|
||||||
- bytestring-tree-builder ==0.2.7.9
|
- bytestring-tree-builder ==0.2.7.10
|
||||||
- bytestring-trie ==0.2.7
|
- bytestring-trie ==0.2.7
|
||||||
- bz2 ==1.0.1.0
|
- bz2 ==1.0.1.0
|
||||||
- bzlib ==0.5.1.0
|
- bzlib ==0.5.1.0
|
||||||
@ -397,7 +397,7 @@ default-package-overrides:
|
|||||||
- conduino ==0.2.2.0
|
- conduino ==0.2.2.0
|
||||||
- conduit ==1.3.4.2
|
- conduit ==1.3.4.2
|
||||||
- conduit-aeson ==0.1.0.1
|
- conduit-aeson ==0.1.0.1
|
||||||
- conduit-algorithms ==0.0.12.0
|
- conduit-algorithms ==0.0.13.0
|
||||||
- conduit-combinators ==1.3.0
|
- conduit-combinators ==1.3.0
|
||||||
- conduit-concurrent-map ==0.1.3
|
- conduit-concurrent-map ==0.1.3
|
||||||
- conduit-connection ==0.1.0.5
|
- conduit-connection ==0.1.0.5
|
||||||
@ -442,7 +442,7 @@ default-package-overrides:
|
|||||||
- crc32c ==0.0.0
|
- crc32c ==0.0.0
|
||||||
- credential-store ==0.1.2
|
- credential-store ==0.1.2
|
||||||
- criterion ==1.5.13.0
|
- criterion ==1.5.13.0
|
||||||
- criterion-measurement ==0.1.3.0
|
- criterion-measurement ==0.1.4.0
|
||||||
- cron ==0.7.0
|
- cron ==0.7.0
|
||||||
- crypto-api ==0.13.3
|
- crypto-api ==0.13.3
|
||||||
- crypto-api-tests ==0.3
|
- crypto-api-tests ==0.3
|
||||||
@ -604,7 +604,7 @@ default-package-overrides:
|
|||||||
- doctest-exitcode-stdio ==0.0
|
- doctest-exitcode-stdio ==0.0
|
||||||
- doctest-extract ==0.1
|
- doctest-extract ==0.1
|
||||||
- doctest-lib ==0.1
|
- doctest-lib ==0.1
|
||||||
- doctest-parallel ==0.2.3
|
- doctest-parallel ==0.2.4
|
||||||
- doldol ==0.4.1.2
|
- doldol ==0.4.1.2
|
||||||
- do-list ==1.0.1
|
- do-list ==1.0.1
|
||||||
- domain ==0.1.1.3
|
- domain ==0.1.1.3
|
||||||
@ -683,7 +683,7 @@ default-package-overrides:
|
|||||||
- errors ==2.3.0
|
- errors ==2.3.0
|
||||||
- errors-ext ==0.4.2
|
- errors-ext ==0.4.2
|
||||||
- ersatz ==0.4.11
|
- ersatz ==0.4.11
|
||||||
- esqueleto ==3.5.5.0
|
- esqueleto ==3.5.6.1
|
||||||
- essence-of-live-coding ==0.2.6
|
- essence-of-live-coding ==0.2.6
|
||||||
- essence-of-live-coding-gloss ==0.2.6
|
- essence-of-live-coding-gloss ==0.2.6
|
||||||
- essence-of-live-coding-pulse ==0.2.6
|
- essence-of-live-coding-pulse ==0.2.6
|
||||||
@ -992,8 +992,8 @@ default-package-overrides:
|
|||||||
- hashtables ==1.2.4.2
|
- hashtables ==1.2.4.2
|
||||||
- haskeline ==0.8.2
|
- haskeline ==0.8.2
|
||||||
- haskell-awk ==1.2.0.1
|
- haskell-awk ==1.2.0.1
|
||||||
- haskell-gi ==0.26.0
|
- haskell-gi ==0.26.1
|
||||||
- haskell-gi-base ==0.26.0
|
- haskell-gi-base ==0.26.1
|
||||||
- haskell-gi-overloading ==1.0
|
- haskell-gi-overloading ==1.0
|
||||||
- haskell-lexer ==1.1
|
- haskell-lexer ==1.1
|
||||||
- haskell-lsp-types ==0.24.0.0
|
- haskell-lsp-types ==0.24.0.0
|
||||||
@ -1007,7 +1007,7 @@ default-package-overrides:
|
|||||||
- hasktags ==0.72.0
|
- hasktags ==0.72.0
|
||||||
- hasql ==1.5.1
|
- hasql ==1.5.1
|
||||||
- hasql-migration ==0.3.0
|
- hasql-migration ==0.3.0
|
||||||
- hasql-notifications ==0.2.0.1
|
- hasql-notifications ==0.2.0.2
|
||||||
- hasql-optparse-applicative ==0.3.0.9
|
- hasql-optparse-applicative ==0.3.0.9
|
||||||
- hasql-pool ==0.5.2.2
|
- hasql-pool ==0.5.2.2
|
||||||
- hasql-queue ==1.2.0.2
|
- hasql-queue ==1.2.0.2
|
||||||
@ -1176,7 +1176,7 @@ default-package-overrides:
|
|||||||
- HTTP ==4000.3.16
|
- HTTP ==4000.3.16
|
||||||
- http-api-data ==0.4.3
|
- http-api-data ==0.4.3
|
||||||
- http-api-data-qq ==0.1.0.0
|
- http-api-data-qq ==0.1.0.0
|
||||||
- http-client ==0.7.12
|
- http-client ==0.7.13.1
|
||||||
- http-client-openssl ==0.3.3
|
- http-client-openssl ==0.3.3
|
||||||
- http-client-overrides ==0.1.1.0
|
- http-client-overrides ==0.1.1.0
|
||||||
- http-client-tls ==0.3.6.1
|
- http-client-tls ==0.3.6.1
|
||||||
@ -2229,7 +2229,7 @@ default-package-overrides:
|
|||||||
- simple-affine-space ==0.1.1
|
- simple-affine-space ==0.1.1
|
||||||
- simple-cabal ==0.1.3
|
- simple-cabal ==0.1.3
|
||||||
- simple-cmd ==0.2.7
|
- simple-cmd ==0.2.7
|
||||||
- simple-cmd-args ==0.1.7
|
- simple-cmd-args ==0.1.8
|
||||||
- simple-log ==0.9.12
|
- simple-log ==0.9.12
|
||||||
- simple-media-timestamp ==0.2.0.0
|
- simple-media-timestamp ==0.2.0.0
|
||||||
- simple-media-timestamp-attoparsec ==0.1.0.0
|
- simple-media-timestamp-attoparsec ==0.1.0.0
|
||||||
@ -2337,7 +2337,7 @@ default-package-overrides:
|
|||||||
- storable-record ==0.0.6
|
- storable-record ==0.0.6
|
||||||
- storable-tuple ==0.0.3.3
|
- storable-tuple ==0.0.3.3
|
||||||
- storablevector ==0.2.13.1
|
- storablevector ==0.2.13.1
|
||||||
- store ==0.7.15
|
- store ==0.7.16
|
||||||
- store-core ==0.4.4.4
|
- store-core ==0.4.4.4
|
||||||
- store-streaming ==0.2.0.3
|
- store-streaming ==0.2.0.3
|
||||||
- Stream ==0.4.7.2
|
- Stream ==0.4.7.2
|
||||||
|
@ -1502,6 +1502,7 @@ dont-distribute-packages:
|
|||||||
- gbu
|
- gbu
|
||||||
- gdax
|
- gdax
|
||||||
- gdiff-ig
|
- gdiff-ig
|
||||||
|
- gedcom
|
||||||
- geek
|
- geek
|
||||||
- geek-server
|
- geek-server
|
||||||
- gelatin-freetype2
|
- gelatin-freetype2
|
||||||
@ -2544,6 +2545,7 @@ dont-distribute-packages:
|
|||||||
- lol-cpp
|
- lol-cpp
|
||||||
- lol-repa
|
- lol-repa
|
||||||
- lol-tests
|
- lol-tests
|
||||||
|
- lol-typing
|
||||||
- loli
|
- loli
|
||||||
- loop-effin
|
- loop-effin
|
||||||
- looper
|
- looper
|
||||||
@ -2827,7 +2829,6 @@ dont-distribute-packages:
|
|||||||
- numhask-hedgehog
|
- numhask-hedgehog
|
||||||
- numhask-range
|
- numhask-range
|
||||||
- numhask-test
|
- numhask-test
|
||||||
- nvim-hs-ghcid
|
|
||||||
- nyan
|
- nyan
|
||||||
- nyan-interpolation
|
- nyan-interpolation
|
||||||
- nyan-interpolation-simple
|
- nyan-interpolation-simple
|
||||||
@ -3395,6 +3396,7 @@ dont-distribute-packages:
|
|||||||
- servant-streaming-server
|
- servant-streaming-server
|
||||||
- servant-swagger-tags
|
- servant-swagger-tags
|
||||||
- servant-to-elm
|
- servant-to-elm
|
||||||
|
- servant-util-beam-pg
|
||||||
- servant-waargonaut
|
- servant-waargonaut
|
||||||
- servant-zeppelin-client
|
- servant-zeppelin-client
|
||||||
- servant-zeppelin-server
|
- servant-zeppelin-server
|
||||||
@ -3634,6 +3636,7 @@ dont-distribute-packages:
|
|||||||
- syntaxnet-haskell
|
- syntaxnet-haskell
|
||||||
- synthesizer-llvm
|
- synthesizer-llvm
|
||||||
- sys-process
|
- sys-process
|
||||||
|
- systemstats
|
||||||
- t3-client
|
- t3-client
|
||||||
- ta
|
- ta
|
||||||
- tag-stream
|
- tag-stream
|
||||||
@ -3841,6 +3844,7 @@ dont-distribute-packages:
|
|||||||
- urbit-airlock
|
- urbit-airlock
|
||||||
- urbit-api
|
- urbit-api
|
||||||
- ureader
|
- ureader
|
||||||
|
- urembed
|
||||||
- uri-enumerator
|
- uri-enumerator
|
||||||
- uri-enumerator-file
|
- uri-enumerator-file
|
||||||
- usb
|
- usb
|
||||||
|
739
pkgs/development/haskell-modules/hackage-packages.nix
generated
739
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -1,4 +1,4 @@
|
|||||||
{ lib, stdenv, cmake, fetchFromGitHub }:
|
{ lib, stdenv, cmake, fetchFromGitHub, fetchpatch }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "1.1.5";
|
version = "1.1.5";
|
||||||
@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "01ddfzjlkf2dgijrmm3j3j8irccsnbgfvjcnwslsfaxnrmrq5s64";
|
sha256 = "01ddfzjlkf2dgijrmm3j3j8irccsnbgfvjcnwslsfaxnrmrq5s64";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# Add pkgconfig fix from https://github.com/nanomsg/nanomsg/pull/1085
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/nanomsg/nanomsg/commit/e3323f19579529d272cb1d55bd6b653c4f34c064.patch";
|
||||||
|
sha256 = "URz7TAqqpKxqjgvQqNX4WNSShwiEzAvO2h0hCZ2NhVY=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
33
pkgs/development/python-modules/amarna/default.nix
Normal file
33
pkgs/development/python-modules/amarna/default.nix
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
{ lib
|
||||||
|
, buildPythonPackage
|
||||||
|
, fetchFromGitHub
|
||||||
|
, lark
|
||||||
|
, pydot
|
||||||
|
, pytestCheckHook
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "amarna";
|
||||||
|
version = "0.1.2";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "crytic";
|
||||||
|
repo = "amarna";
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "sha256-ohR6VJFIvUCMkppqdCV/kJwEmh1fP0QhfQfNu3RoMeU=";
|
||||||
|
};
|
||||||
|
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
lark
|
||||||
|
pydot
|
||||||
|
];
|
||||||
|
checkInputs = [ pytestCheckHook ];
|
||||||
|
pythonImportsCheck = [ "amarna" ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Amarna is a static-analyzer and linter for the Cairo programming language.";
|
||||||
|
homepage = "https://github.com/crytic/amarna";
|
||||||
|
license = licenses.agpl3;
|
||||||
|
maintainers = with maintainers; [ raitobezarius ];
|
||||||
|
};
|
||||||
|
}
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "bimmer-connected";
|
pname = "bimmer-connected";
|
||||||
version = "0.10.1";
|
version = "0.10.2";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||||||
owner = "bimmerconnected";
|
owner = "bimmerconnected";
|
||||||
repo = "bimmer_connected";
|
repo = "bimmer_connected";
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-RgF9uQREFOLvAUtoXixywSfQExu6W3qw0JCqVw9Nl9w=";
|
hash = "sha256-DcjkS0tbNZkmU787c+ECW3UntEHeKzOThvbFS4ketzA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "bleak-retry-connector";
|
pname = "bleak-retry-connector";
|
||||||
version = "1.8.0";
|
version = "1.10.1";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||||||
owner = "Bluetooth-Devices";
|
owner = "Bluetooth-Devices";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-wtzZ94nHfVtX8YakMLGxhqvn95v93qL2Qz9OeBRB520=";
|
hash = "sha256-cdPFyuDRdZJZ/HQq9xO3TojnNS34F+2JiwTIcxQWONM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
55
pkgs/development/python-modules/bthome-ble/default.nix
Normal file
55
pkgs/development/python-modules/bthome-ble/default.nix
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
{ lib
|
||||||
|
, bluetooth-sensor-state-data
|
||||||
|
, buildPythonPackage
|
||||||
|
, fetchFromGitHub
|
||||||
|
, poetry-core
|
||||||
|
, pycryptodomex
|
||||||
|
, pytestCheckHook
|
||||||
|
, pythonOlder
|
||||||
|
, sensor-state-data
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "bthome-ble";
|
||||||
|
version = "0.2.2";
|
||||||
|
format = "pyproject";
|
||||||
|
|
||||||
|
disabled = pythonOlder "3.9";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "Bluetooth-Devices";
|
||||||
|
repo = pname;
|
||||||
|
rev = "v${version}";
|
||||||
|
hash = "sha256-p1ySTp+/gMUo8XWox2s+M7ees6GlxpGCZxNNEJpQbj8=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
poetry-core
|
||||||
|
];
|
||||||
|
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
bluetooth-sensor-state-data
|
||||||
|
sensor-state-data
|
||||||
|
pycryptodomex
|
||||||
|
];
|
||||||
|
|
||||||
|
checkInputs = [
|
||||||
|
pytestCheckHook
|
||||||
|
];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace pyproject.toml \
|
||||||
|
--replace " --cov=bthome_ble --cov-report=term-missing:skip-covered" ""
|
||||||
|
'';
|
||||||
|
|
||||||
|
pythonImportsCheck = [
|
||||||
|
"bthome_ble"
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Library for BThome BLE devices";
|
||||||
|
homepage = "https://github.com/Bluetooth-Devices/bthome-ble";
|
||||||
|
license = with licenses; [ mit ];
|
||||||
|
maintainers = with maintainers; [ fab ];
|
||||||
|
};
|
||||||
|
}
|
@ -58,6 +58,10 @@ buildPythonPackage rec {
|
|||||||
hash = "sha256-QE7QnfYAK74wvK8gDJ15FtQ+BCIWRQKAVvM7v1FzwlE=";
|
hash = "sha256-QE7QnfYAK74wvK8gDJ15FtQ+BCIWRQKAVvM7v1FzwlE=";
|
||||||
excludes = [ "docs/releases/4.1.1.txt" ];
|
excludes = [ "docs/releases/4.1.1.txt" ];
|
||||||
})
|
})
|
||||||
|
(substituteAll {
|
||||||
|
src = ./django_4_set_zoneinfo_dir.patch;
|
||||||
|
zoneinfo = tzdata + "/share/zoneinfo";
|
||||||
|
})
|
||||||
] ++ lib.optionals withGdal [
|
] ++ lib.optionals withGdal [
|
||||||
(substituteAll {
|
(substituteAll {
|
||||||
src = ./django_4_set_geos_gdal_lib.patch;
|
src = ./django_4_set_geos_gdal_lib.patch;
|
||||||
|
@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/django/conf/__init__.py b/django/conf/__init__.py
|
||||||
|
index cb70a71791..5156f7dd73 100644
|
||||||
|
--- a/django/conf/__init__.py
|
||||||
|
+++ b/django/conf/__init__.py
|
||||||
|
@@ -227,7 +227,7 @@ class Settings:
|
||||||
|
if hasattr(time, "tzset") and self.TIME_ZONE:
|
||||||
|
# When we can, attempt to validate the timezone. If we can't find
|
||||||
|
# this file, no check happens and it's harmless.
|
||||||
|
- zoneinfo_root = Path("/usr/share/zoneinfo")
|
||||||
|
+ zoneinfo_root = Path("@zoneinfo@")
|
||||||
|
zone_info_file = zoneinfo_root.joinpath(*self.TIME_ZONE.split("/"))
|
||||||
|
if zoneinfo_root.exists() and not zone_info_file.exists():
|
||||||
|
raise ValueError("Incorrect timezone setting: %s" % self.TIME_ZONE)
|
@ -6,14 +6,14 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "peaqevcore";
|
pname = "peaqevcore";
|
||||||
version = "5.4.3";
|
version = "5.10.3";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-WeAYa1Iggog5VX1oiANZCeVpuEF5JdabdUjQ+fkAwxE=";
|
hash = "sha256-Ua3yDPxZEa4F66knhSfu4hxCNVJTUy/4BO/+a8GqOB0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pyhaversion";
|
pname = "pyhaversion";
|
||||||
version = "22.4.1";
|
version = "22.8.0";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||||||
owner = "ludeeus";
|
owner = "ludeeus";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
sha256 = "sha256-adM6LUo8ycD/3G19JIl4DcuVK/f0/9V8AG82qgYO0uM=";
|
sha256 = "sha256-30UHbxs0WZyIVyq0ai2PsoPTkvoYawS1OBhVbV0JVN8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pymicrobot";
|
pname = "pymicrobot";
|
||||||
version = "0.0.3";
|
version = "0.0.4";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.9";
|
disabled = pythonOlder "3.9";
|
||||||
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
pname = "PyMicroBot";
|
pname = "PyMicroBot";
|
||||||
inherit version;
|
inherit version;
|
||||||
hash = "sha256-lXBL1G/rZrQah/zcVH1dFyKXO5jGB9XhmXmiKKIAbT4=";
|
hash = "sha256-lNrohVQruFAtrzTxJ6qEZ8tVM5fgrCRAG7WXJSKMRFs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "teslajsonpy";
|
pname = "teslajsonpy";
|
||||||
version = "2.4.1";
|
version = "2.4.2";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||||||
owner = "zabuldon";
|
owner = "zabuldon";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
sha256 = "sha256-YkutsaxPxspIclRlcr5dzk7JKvlX6IXbccca3NLFtSo=";
|
sha256 = "sha256-WVyMYmuezTS3GNcIY9Uh+/0+lcgdmoLL6o5d1SFMfvE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -5,12 +5,12 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "types-pytz";
|
pname = "types-pytz";
|
||||||
version = "2022.1.2";
|
version = "2022.2.1.0";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "sha256-GoslwiXF5r2EaKqetF3dOzN/ZxbUByrQqk7x5BR47rw=";
|
sha256 = "sha256-R8+xnFK591iWRAVB2zkv0xKjWyecYwelMdtxFS6mPis=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Modules doesn't have tests
|
# Modules doesn't have tests
|
||||||
|
@ -6,12 +6,12 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "types-requests";
|
pname = "types-requests";
|
||||||
version = "2.28.8";
|
version = "2.28.9";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "sha256-ep97FS1ZShwY3UkyzdJZa4777t/XPKpOSrs3VYBbRoU=";
|
sha256 = "sha256-/q9YG9WASXpH/oRdUG+juRtITPcG/yd3TodlmDfemWI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -5,12 +5,12 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "types-setuptools";
|
pname = "types-setuptools";
|
||||||
version = "64.0.1";
|
version = "65.1.0";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "sha256-gpC2vx2RbmsAd4TVy80RKhr5otdjQyMfzOClUYU0NwI=";
|
sha256 = "sha256-V/fYnqpSpAzLl/LL5heMatkPhDr7Z2gJM/jvFHLaU/g=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Module doesn't have tests
|
# Module doesn't have tests
|
||||||
|
@ -5,12 +5,12 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "types-urllib3";
|
pname = "types-urllib3";
|
||||||
version = "1.26.22";
|
version = "1.26.23";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-sFr5DnOInmiAlACKl8qVeI24vzc24ndv1D+2sXFIXZQ=";
|
hash = "sha256-t46Bnw41AiHQaJpWZhYuRnujkQc3uv2hS1wshem7HlY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Module doesn't have tests
|
# Module doesn't have tests
|
||||||
|
@ -2,16 +2,16 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "bazelisk";
|
pname = "bazelisk";
|
||||||
version = "1.12.0";
|
version = "1.12.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "bazelbuild";
|
owner = "bazelbuild";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-RWVD6tngFE3i8JDB9b0JZz8Bd+u97b4ilmEF0N8Pm4Y=";
|
sha256 = "sha256-VgAhZZ5ZIkdAYIs/UqOkogROMIR2UToE4+xPXGR1erE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-6rJa/c5uCnBQh0VVlzefXXPuJNFi+R8X2r+o7GBLIiE=";
|
vendorSha256 = "sha256-JPNcHEd56ypI4OgGmBnIasE7xxW+8pHMXk7t8w1M40A=";
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
@ -3,13 +3,13 @@
|
|||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "qbs";
|
pname = "qbs";
|
||||||
|
|
||||||
version = "1.23.0";
|
version = "1.23.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "qbs";
|
owner = "qbs";
|
||||||
repo = "qbs";
|
repo = "qbs";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-F8dfSMim4OVGjBEGtIA4bGTNSLwZSwpHWI0J2e7pKCw=";
|
sha256 = "sha256-ZAMWPvTzramhIuafYw+lV7Tm3fQKm+nbRdAFdjYDMhs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ qmake ];
|
nativeBuildInputs = [ qmake ];
|
||||||
|
@ -5,16 +5,16 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "gosec";
|
pname = "gosec";
|
||||||
version = "2.12.0";
|
version = "2.13.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "securego";
|
owner = "securego";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-Y4QL6vYCTZUCh+HF86QI+ENel/pK16XpLd6CF4RWcK0=";
|
sha256 = "sha256-U4nP812du71wcU/OPSDpZePHO9/vSdTL5s58VdA4UvY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-5rA2C3nyvSUiBQ/Nk5OJ9e9tf8CKHQB+6rLUJXESK/0=";
|
vendorSha256 = "sha256-D4wWofYz63c0yXIg4xnolXzWudG17dRqdjUHYhMrtt4=";
|
||||||
|
|
||||||
subPackages = [
|
subPackages = [
|
||||||
"cmd/gosec"
|
"cmd/gosec"
|
||||||
|
@ -24,4 +24,9 @@ buildEnv {
|
|||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
'';
|
'';
|
||||||
|
meta = {
|
||||||
|
# ihaskell has an indirect dependency on the Python package mistune, which
|
||||||
|
# is marked insecure.
|
||||||
|
hydraPlatforms = lib.platforms.none;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
@ -12,13 +12,13 @@
|
|||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "kdash";
|
pname = "kdash";
|
||||||
version = "0.3.3";
|
version = "0.3.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "kdash-rs";
|
owner = "kdash-rs";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-u5Qa1rStWeFku3VA2ljg+RQxh12byfyBHXC+NQJTr0w=";
|
sha256 = "sha256-xKrgRUU0ENJ8CIQUaU/6dMbmxN9RX4jksQnBfgcsRYE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ perl python3 pkg-config ];
|
nativeBuildInputs = [ perl python3 pkg-config ];
|
||||||
@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
|
|||||||
buildInputs = [ openssl xorg.xcbutil ]
|
buildInputs = [ openssl xorg.xcbutil ]
|
||||||
++ lib.optional stdenv.isDarwin AppKit;
|
++ lib.optional stdenv.isDarwin AppKit;
|
||||||
|
|
||||||
cargoSha256 = "sha256-rSPe7kkeHEYDqF80oO+Z+bGkWewtjnKut13EP6tmUIc=";
|
cargoSha256 = "sha256-7RQvd9zx6iXKmgYLp8N8hGDfq9IX0LoNf2jXwv+iOkM=";
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A simple and fast dashboard for Kubernetes";
|
description = "A simple and fast dashboard for Kubernetes";
|
||||||
|
@ -8,14 +8,14 @@
|
|||||||
|
|
||||||
python3.pkgs.buildPythonApplication rec {
|
python3.pkgs.buildPythonApplication rec {
|
||||||
pname = "memray";
|
pname = "memray";
|
||||||
version = "1.2.0";
|
version = "1.3.0";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "bloomberg";
|
owner = "bloomberg";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-MZOKo0VaCJM/YyvCByM5Yg7H/8onDKNSufBzr+GsFlo=";
|
hash = "sha256-8uFAWcf9ookmFAnCdA97+oade+fECt58DuDSk1uTMQI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
@ -33,6 +33,8 @@ python3.pkgs.buildPythonApplication rec {
|
|||||||
|
|
||||||
checkInputs = with python3.pkgs; [
|
checkInputs = with python3.pkgs; [
|
||||||
pytestCheckHook
|
pytestCheckHook
|
||||||
|
] ++ lib.optionals (pythonOlder "3.11") [
|
||||||
|
greenlet
|
||||||
];
|
];
|
||||||
|
|
||||||
pythonImportsCheck = [
|
pythonImportsCheck = [
|
||||||
|
@ -1,5 +1,14 @@
|
|||||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
|
{ lib
|
||||||
, libmysqlclient, libaio
|
, stdenv
|
||||||
|
, fetchFromGitHub
|
||||||
|
, autoreconfHook
|
||||||
|
, pkg-config
|
||||||
|
, libmysqlclient
|
||||||
|
, libaio
|
||||||
|
, luajit
|
||||||
|
# For testing:
|
||||||
|
, testers
|
||||||
|
, sysbench
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
@ -7,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||||||
version = "1.0.20";
|
version = "1.0.20";
|
||||||
|
|
||||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||||
buildInputs = [ libmysqlclient libaio ];
|
buildInputs = [ libmysqlclient luajit ] ++ lib.optionals stdenv.isLinux [ libaio ];
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "akopytov";
|
owner = "akopytov";
|
||||||
@ -18,10 +27,30 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
configureFlags = [
|
||||||
|
# The bundled version does not build on aarch64-darwin:
|
||||||
|
# https://github.com/akopytov/sysbench/issues/416
|
||||||
|
"--with-system-luajit"
|
||||||
|
];
|
||||||
|
|
||||||
|
passthru.tests = {
|
||||||
|
versionTest = testers.testVersion {
|
||||||
|
package = sysbench;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Modular, cross-platform and multi-threaded benchmark tool";
|
description = "Modular, cross-platform and multi-threaded benchmark tool";
|
||||||
|
longDescription = ''
|
||||||
|
sysbench is a scriptable multi-threaded benchmark tool based on LuaJIT.
|
||||||
|
It is most frequently used for database benchmarks, but can also be used
|
||||||
|
to create arbitrarily complex workloads that do not involve a database
|
||||||
|
server.
|
||||||
|
'';
|
||||||
homepage = "https://github.com/akopytov/sysbench";
|
homepage = "https://github.com/akopytov/sysbench";
|
||||||
|
downloadPage = "https://github.com/akopytov/sysbench/releases/tag/${version}";
|
||||||
|
changelog = "https://github.com/akopytov/sysbench/blob/${version}/ChangeLog";
|
||||||
license = lib.licenses.gpl2;
|
license = lib.licenses.gpl2;
|
||||||
platforms = lib.platforms.linux;
|
platforms = lib.platforms.unix;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -2,13 +2,13 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "okteto";
|
pname = "okteto";
|
||||||
version = "2.5.2";
|
version = "2.5.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "okteto";
|
owner = "okteto";
|
||||||
repo = "okteto";
|
repo = "okteto";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-VNtlH8Syj3myVEE4WAZpBnP10rl0e73cFg7TgCFh0EY=";
|
sha256 = "sha256-6Iqgj5KPE6oy2mSdTdnlAgVuFafh/INbDsNs+Y4XAcs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-W1/QBMnMdZWokWSFmHhPqmOu827bpGXS8+GFp5Iu9Ig=";
|
vendorSha256 = "sha256-W1/QBMnMdZWokWSFmHhPqmOu827bpGXS8+GFp5Iu9Ig=";
|
||||||
|
38
pkgs/development/tools/rust/cargo-tauri/default.nix
Normal file
38
pkgs/development/tools/rust/cargo-tauri/default.nix
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
{ lib
|
||||||
|
, rustPlatform
|
||||||
|
, fetchFromGitHub
|
||||||
|
, pkg-config
|
||||||
|
, glibc
|
||||||
|
, libsoup
|
||||||
|
, cairo
|
||||||
|
, gtk3
|
||||||
|
, webkitgtk
|
||||||
|
}:
|
||||||
|
|
||||||
|
rustPlatform.buildRustPackage rec {
|
||||||
|
pname = "tauri";
|
||||||
|
version = "1.0.5";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "tauri-apps";
|
||||||
|
repo = pname;
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "sha256-mp9U46H03NTMumUkx5kjsh9LnbPBrvlhh3yCH6FYdbE=";
|
||||||
|
};
|
||||||
|
|
||||||
|
# Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at
|
||||||
|
# https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202
|
||||||
|
sourceRoot = "source/tooling/cli";
|
||||||
|
|
||||||
|
cargoSha256 = "sha256-iFXuVrxE/QmM+TAZmN8Ivt6Le19NWYIfVn1PNPvmhZo=";
|
||||||
|
|
||||||
|
buildInputs = [ glibc libsoup cairo gtk3 webkitgtk ];
|
||||||
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Build smaller, faster, and more secure desktop applications with a web frontend";
|
||||||
|
homepage = "https://tauri.app/";
|
||||||
|
license = with licenses; [ asl20 /* or */ mit ];
|
||||||
|
maintainers = with maintainers; [ dit7ya ];
|
||||||
|
};
|
||||||
|
}
|
@ -107,5 +107,8 @@ stdenv.mkDerivation rec {
|
|||||||
all movement on the battlefield has ceased).'';
|
all movement on the battlefield has ceased).'';
|
||||||
maintainers = with maintainers; [ kragniz fpletz ];
|
maintainers = with maintainers; [ kragniz fpletz ];
|
||||||
inherit (fpc.meta) platforms;
|
inherit (fpc.meta) platforms;
|
||||||
|
# https://github.com/NixOS/nixpkgs/pull/185755#issuecomment-1219024584
|
||||||
|
broken = true;
|
||||||
|
hydraPlatforms = platforms.none;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -2,13 +2,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "kitty-themes";
|
pname = "kitty-themes";
|
||||||
version = "unstable-2022-05-04";
|
version = "unstable-2022-08-11";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "kovidgoyal";
|
owner = "kovidgoyal";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "fb48041b0ff5ce60e8f10e7067a407ad99a4862e";
|
rev = "72cf0dc4338ab1ad85f5ed93fdb13318916cae14";
|
||||||
sha256 = "/JCLty73YHsTkNxZP6EwhhoiHi2HjtyMZphAPhHe5h0=";
|
sha256 = "d9mO2YqA7WD2dTPsmNeQg2dUR/iv2T/l7yxrt6WKX60=";
|
||||||
};
|
};
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
@ -5,20 +5,23 @@ let
|
|||||||
ltsVariant = {
|
ltsVariant = {
|
||||||
version = "5.15.60";
|
version = "5.15.60";
|
||||||
hash = "sha256-XSOYgrJ/uvPpEG+P3Zy1geFeF/HMZ4LejsKWtTxMUTs=";
|
hash = "sha256-XSOYgrJ/uvPpEG+P3Zy1geFeF/HMZ4LejsKWtTxMUTs=";
|
||||||
|
variant = "lts";
|
||||||
};
|
};
|
||||||
|
|
||||||
edgeVariant = {
|
edgeVariant = {
|
||||||
version = "5.19.1";
|
version = "5.19.1";
|
||||||
hash = "sha256-Fw+XW2YDAGKEzZ4AO88Y8GcypfOb6AjKp3XOlkT8ZTQ=";
|
hash = "sha256-Fw+XW2YDAGKEzZ4AO88Y8GcypfOb6AjKp3XOlkT8ZTQ=";
|
||||||
|
variant = "edge";
|
||||||
};
|
};
|
||||||
|
|
||||||
ttVariant = {
|
ttVariant = {
|
||||||
version = "5.15.54";
|
version = "5.15.54";
|
||||||
suffix = "xanmod1-tt";
|
suffix = "xanmod1-tt";
|
||||||
hash = "sha256-4ck9PAFuIt/TxA/U+moGlVfCudJnzSuAw7ooFG3OJis=";
|
hash = "sha256-4ck9PAFuIt/TxA/U+moGlVfCudJnzSuAw7ooFG3OJis=";
|
||||||
|
variant = "tt";
|
||||||
};
|
};
|
||||||
|
|
||||||
xanmodKernelFor = { version, suffix ? "xanmod1", hash }: buildLinux (args // rec {
|
xanmodKernelFor = { version, suffix ? "xanmod1", hash, variant }: buildLinux (args // rec {
|
||||||
inherit version;
|
inherit version;
|
||||||
modDirVersion = "${version}-${suffix}";
|
modDirVersion = "${version}-${suffix}";
|
||||||
|
|
||||||
@ -30,11 +33,6 @@ let
|
|||||||
};
|
};
|
||||||
|
|
||||||
structuredExtraConfig = with lib.kernel; {
|
structuredExtraConfig = with lib.kernel; {
|
||||||
# removed options
|
|
||||||
CFS_BANDWIDTH = lib.mkForce (option no);
|
|
||||||
RT_GROUP_SCHED = lib.mkForce (option no);
|
|
||||||
SCHED_AUTOGROUP = lib.mkForce (option no);
|
|
||||||
|
|
||||||
# AMD P-state driver
|
# AMD P-state driver
|
||||||
X86_AMD_PSTATE = yes;
|
X86_AMD_PSTATE = yes;
|
||||||
|
|
||||||
@ -43,13 +41,6 @@ let
|
|||||||
NTFS3_LZX_XPRESS = yes;
|
NTFS3_LZX_XPRESS = yes;
|
||||||
NTFS3_FS_POSIX_ACL = yes;
|
NTFS3_FS_POSIX_ACL = yes;
|
||||||
|
|
||||||
# Preemptive Full Tickless Kernel at 500Hz
|
|
||||||
SCHED_CORE = lib.mkForce (option no);
|
|
||||||
PREEMPT_VOLUNTARY = lib.mkForce no;
|
|
||||||
PREEMPT = lib.mkForce yes;
|
|
||||||
NO_HZ_FULL = yes;
|
|
||||||
HZ_500 = yes;
|
|
||||||
|
|
||||||
# Google's BBRv2 TCP congestion Control
|
# Google's BBRv2 TCP congestion Control
|
||||||
TCP_CONG_BBR2 = yes;
|
TCP_CONG_BBR2 = yes;
|
||||||
DEFAULT_BBR2 = yes;
|
DEFAULT_BBR2 = yes;
|
||||||
@ -67,6 +58,12 @@ let
|
|||||||
|
|
||||||
# WineSync driver for fast kernel-backed Wine
|
# WineSync driver for fast kernel-backed Wine
|
||||||
WINESYNC = module;
|
WINESYNC = module;
|
||||||
|
} // lib.optionalAttrs (variant == "tt") {
|
||||||
|
# removed options
|
||||||
|
CFS_BANDWIDTH = lib.mkForce (option no);
|
||||||
|
RT_GROUP_SCHED = lib.mkForce (option no);
|
||||||
|
SCHED_AUTOGROUP = lib.mkForce (option no);
|
||||||
|
SCHED_CORE = lib.mkForce (option no);
|
||||||
};
|
};
|
||||||
|
|
||||||
extraMeta = {
|
extraMeta = {
|
||||||
|
@ -5,13 +5,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "rdma-core";
|
pname = "rdma-core";
|
||||||
version = "41.0";
|
version = "42.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "linux-rdma";
|
owner = "linux-rdma";
|
||||||
repo = "rdma-core";
|
repo = "rdma-core";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-D6pgWdJKA6ZL+atFChqSW7hI6/dYfDBRzvb6hu1wxPg=";
|
sha256 = "sha256-MtvrKdo6Lkt064ol7+hlU7b1r+Dt5236bmE21wM5aDo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
@ -2,13 +2,13 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "headscale";
|
pname = "headscale";
|
||||||
version = "0.16.2";
|
version = "0.16.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "juanfont";
|
owner = "juanfont";
|
||||||
repo = "headscale";
|
repo = "headscale";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-RgRRBz9i12mavzCBtZN8QLlIjMjG7GfkGMRJGKMJosw=";
|
sha256 = "sha256-J6OO52AT7YHW5e5LxT8c+Id/+0VZ+/ISI9wkfcBrLWk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-RzmnAh81BN4tbzAGzJbb6CMuws8kuPJDw7aPkRRnSS8=";
|
vendorSha256 = "sha256-RzmnAh81BN4tbzAGzJbb6CMuws8kuPJDw7aPkRRnSS8=";
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# Do not edit!
|
# Do not edit!
|
||||||
|
|
||||||
{
|
{
|
||||||
version = "2022.8.5";
|
version = "2022.8.6";
|
||||||
components = {
|
components = {
|
||||||
"abode" = ps: with ps; [
|
"abode" = ps: with ps; [
|
||||||
abodepy
|
abodepy
|
||||||
|
@ -307,7 +307,7 @@ let
|
|||||||
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
|
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
|
||||||
|
|
||||||
# Don't forget to run parse-requirements.py after updating
|
# Don't forget to run parse-requirements.py after updating
|
||||||
hassVersion = "2022.8.5";
|
hassVersion = "2022.8.6";
|
||||||
|
|
||||||
in python.pkgs.buildPythonApplication rec {
|
in python.pkgs.buildPythonApplication rec {
|
||||||
pname = "homeassistant";
|
pname = "homeassistant";
|
||||||
@ -325,7 +325,7 @@ in python.pkgs.buildPythonApplication rec {
|
|||||||
owner = "home-assistant";
|
owner = "home-assistant";
|
||||||
repo = "core";
|
repo = "core";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-cPoXL9YQolU5o/R9XhxfTDAwutzgksrsonitwjvxGM0=";
|
hash = "sha256-SRvdBHVGFlbRWiaZJ1gN0C4uOdHmWaAmwGAgihpkUL0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# leave this in, so users don't have to constantly update their downstream patch handling
|
# leave this in, so users don't have to constantly update their downstream patch handling
|
||||||
|
@ -5,13 +5,13 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "portunus";
|
pname = "portunus";
|
||||||
version = "1.1.0-beta.2";
|
version = "1.1.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "majewsky";
|
owner = "majewsky";
|
||||||
repo = "portunus";
|
repo = "portunus";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-hGOMbaEWecgQvpk/2E8mcJZ9QMjllIhS3RBr7PKnbjQ=";
|
sha256 = "sha256-+sq5Wja0tVkPZ0Z++K2A6my9LfLJ4twxtoEAS6LHqzE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = null;
|
vendorSha256 = null;
|
||||||
|
@ -16,14 +16,14 @@ let
|
|||||||
}."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
}."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||||
|
|
||||||
hash = {
|
hash = {
|
||||||
x64-linux_hash = "sha256-NTkb6E0GRofd63TozLPxyNZ6GxO4pAc+MWsUDKWLZDY=";
|
x64-linux_hash = "sha256-VUJgf0gxOJH6RKUN5pODxoT6MM4fX43CSApRCDvPjjU=";
|
||||||
arm64-linux_hash = "sha256-eB1Izvf/E0iOGkWt6fSc4oAt1sJ7XTxn/iwDNYz7WkA=";
|
arm64-linux_hash = "sha256-rZM9r9CCcB0Q468w4Q5CuTeQS6hmFPCSv/DJ/SPm4Tw=";
|
||||||
x64-osx_hash = "sha256-TAphdcbzbNUZpWYVaHBkhI+RsgxWmI8n8Z6VwYxHXWg=";
|
x64-osx_hash = "sha256-RjeuINFgtqKcKF6I8K+l9CbYTRKagepZGT3fOLXDtJE=";
|
||||||
}."${arch}-${os}_hash";
|
}."${arch}-${os}_hash";
|
||||||
|
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
pname = "prowlarr";
|
pname = "prowlarr";
|
||||||
version = "0.2.0.1448";
|
version = "0.4.4.1947";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.develop.${version}.${os}-core-${arch}.tar.gz";
|
url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.develop.${version}.${os}-core-${arch}.tar.gz";
|
||||||
|
@ -14,6 +14,7 @@ in
|
|||||||
discourse-ldap-auth = callPackage ./discourse-ldap-auth {};
|
discourse-ldap-auth = callPackage ./discourse-ldap-auth {};
|
||||||
discourse-math = callPackage ./discourse-math {};
|
discourse-math = callPackage ./discourse-math {};
|
||||||
discourse-migratepassword = callPackage ./discourse-migratepassword {};
|
discourse-migratepassword = callPackage ./discourse-migratepassword {};
|
||||||
|
discourse-oauth2-basic = callPackage ./discourse-oauth2-basic {};
|
||||||
discourse-openid-connect = callPackage ./discourse-openid-connect {};
|
discourse-openid-connect = callPackage ./discourse-openid-connect {};
|
||||||
discourse-prometheus = callPackage ./discourse-prometheus {};
|
discourse-prometheus = callPackage ./discourse-prometheus {};
|
||||||
discourse-saved-searches = callPackage ./discourse-saved-searches {};
|
discourse-saved-searches = callPackage ./discourse-saved-searches {};
|
||||||
|
@ -0,0 +1,7 @@
|
|||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
source 'https://rubygems.org'
|
||||||
|
|
||||||
|
group :development do
|
||||||
|
gem 'rubocop-discourse'
|
||||||
|
end
|
@ -0,0 +1,37 @@
|
|||||||
|
GEM
|
||||||
|
remote: https://rubygems.org/
|
||||||
|
specs:
|
||||||
|
ast (2.4.2)
|
||||||
|
parallel (1.22.1)
|
||||||
|
parser (3.1.1.0)
|
||||||
|
ast (~> 2.4.1)
|
||||||
|
rainbow (3.1.1)
|
||||||
|
regexp_parser (2.2.1)
|
||||||
|
rexml (3.2.5)
|
||||||
|
rubocop (1.26.1)
|
||||||
|
parallel (~> 1.10)
|
||||||
|
parser (>= 3.1.0.0)
|
||||||
|
rainbow (>= 2.2.2, < 4.0)
|
||||||
|
regexp_parser (>= 1.8, < 3.0)
|
||||||
|
rexml
|
||||||
|
rubocop-ast (>= 1.16.0, < 2.0)
|
||||||
|
ruby-progressbar (~> 1.7)
|
||||||
|
unicode-display_width (>= 1.4.0, < 3.0)
|
||||||
|
rubocop-ast (1.16.0)
|
||||||
|
parser (>= 3.1.1.0)
|
||||||
|
rubocop-discourse (2.5.0)
|
||||||
|
rubocop (>= 1.1.0)
|
||||||
|
rubocop-rspec (>= 2.0.0)
|
||||||
|
rubocop-rspec (2.9.0)
|
||||||
|
rubocop (~> 1.19)
|
||||||
|
ruby-progressbar (1.11.0)
|
||||||
|
unicode-display_width (2.1.0)
|
||||||
|
|
||||||
|
PLATFORMS
|
||||||
|
ruby
|
||||||
|
|
||||||
|
DEPENDENCIES
|
||||||
|
rubocop-discourse
|
||||||
|
|
||||||
|
BUNDLED WITH
|
||||||
|
2.1.4
|
@ -0,0 +1,18 @@
|
|||||||
|
{ lib, mkDiscoursePlugin, fetchFromGitHub }:
|
||||||
|
|
||||||
|
mkDiscoursePlugin rec {
|
||||||
|
name = "discourse-oauth2-basic";
|
||||||
|
bundlerEnvArgs.gemdir = ./.;
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "discourse";
|
||||||
|
repo = name;
|
||||||
|
rev = "06ba5daa9aabd0487f2f30b944b6500f1f481308";
|
||||||
|
sha256 = "sha256-T08Q36k2hb9wVimKIa4O5mWcrr6VBTfHvhRJiLBiRPY=";
|
||||||
|
};
|
||||||
|
meta = with lib; {
|
||||||
|
homepage = "https://github.com/discourse/${name}";
|
||||||
|
maintainers = with maintainers; [ ehmry ];
|
||||||
|
license = licenses.mit;
|
||||||
|
description = "A basic OAuth2 plugin for use with Discourse";
|
||||||
|
};
|
||||||
|
}
|
@ -0,0 +1,127 @@
|
|||||||
|
{
|
||||||
|
ast = {
|
||||||
|
groups = ["default" "development"];
|
||||||
|
platforms = [];
|
||||||
|
source = {
|
||||||
|
remotes = ["https://rubygems.org"];
|
||||||
|
sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y";
|
||||||
|
type = "gem";
|
||||||
|
};
|
||||||
|
version = "2.4.2";
|
||||||
|
};
|
||||||
|
parallel = {
|
||||||
|
groups = ["default" "development"];
|
||||||
|
platforms = [];
|
||||||
|
source = {
|
||||||
|
remotes = ["https://rubygems.org"];
|
||||||
|
sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb";
|
||||||
|
type = "gem";
|
||||||
|
};
|
||||||
|
version = "1.22.1";
|
||||||
|
};
|
||||||
|
parser = {
|
||||||
|
dependencies = ["ast"];
|
||||||
|
groups = ["default" "development"];
|
||||||
|
platforms = [];
|
||||||
|
source = {
|
||||||
|
remotes = ["https://rubygems.org"];
|
||||||
|
sha256 = "0zaghgvva2q4jqbachg8jvpwgbg3w1jqr0d00m8rqciqznjgsw3c";
|
||||||
|
type = "gem";
|
||||||
|
};
|
||||||
|
version = "3.1.1.0";
|
||||||
|
};
|
||||||
|
rainbow = {
|
||||||
|
groups = ["default" "development"];
|
||||||
|
platforms = [];
|
||||||
|
source = {
|
||||||
|
remotes = ["https://rubygems.org"];
|
||||||
|
sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503";
|
||||||
|
type = "gem";
|
||||||
|
};
|
||||||
|
version = "3.1.1";
|
||||||
|
};
|
||||||
|
regexp_parser = {
|
||||||
|
groups = ["default" "development"];
|
||||||
|
platforms = [];
|
||||||
|
source = {
|
||||||
|
remotes = ["https://rubygems.org"];
|
||||||
|
sha256 = "155f6cr4rrfw5bs5xd3m5kfw32qhc5fsi4nk82rhif56rc6cs0wm";
|
||||||
|
type = "gem";
|
||||||
|
};
|
||||||
|
version = "2.2.1";
|
||||||
|
};
|
||||||
|
rexml = {
|
||||||
|
groups = ["default" "development"];
|
||||||
|
platforms = [];
|
||||||
|
source = {
|
||||||
|
remotes = ["https://rubygems.org"];
|
||||||
|
sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
|
||||||
|
type = "gem";
|
||||||
|
};
|
||||||
|
version = "3.2.5";
|
||||||
|
};
|
||||||
|
rubocop = {
|
||||||
|
dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"];
|
||||||
|
groups = ["default" "development"];
|
||||||
|
platforms = [];
|
||||||
|
source = {
|
||||||
|
remotes = ["https://rubygems.org"];
|
||||||
|
sha256 = "06105yrqajpm5l07fng1nbk55y9490hny542zclnan8hg841pjgl";
|
||||||
|
type = "gem";
|
||||||
|
};
|
||||||
|
version = "1.26.1";
|
||||||
|
};
|
||||||
|
rubocop-ast = {
|
||||||
|
dependencies = ["parser"];
|
||||||
|
groups = ["default" "development"];
|
||||||
|
platforms = [];
|
||||||
|
source = {
|
||||||
|
remotes = ["https://rubygems.org"];
|
||||||
|
sha256 = "1bd2z82ly7fix8415gvfiwzb6bjialz5rs3sr72kv1lk68rd23wv";
|
||||||
|
type = "gem";
|
||||||
|
};
|
||||||
|
version = "1.16.0";
|
||||||
|
};
|
||||||
|
rubocop-discourse = {
|
||||||
|
dependencies = ["rubocop" "rubocop-rspec"];
|
||||||
|
groups = ["development"];
|
||||||
|
platforms = [];
|
||||||
|
source = {
|
||||||
|
remotes = ["https://rubygems.org"];
|
||||||
|
sha256 = "01f4y7am9cq276zl8vsgv64w8wfmhpbzg7vzsifhgnnh92g6s04g";
|
||||||
|
type = "gem";
|
||||||
|
};
|
||||||
|
version = "2.5.0";
|
||||||
|
};
|
||||||
|
rubocop-rspec = {
|
||||||
|
dependencies = ["rubocop"];
|
||||||
|
groups = ["default" "development"];
|
||||||
|
platforms = [];
|
||||||
|
source = {
|
||||||
|
remotes = ["https://rubygems.org"];
|
||||||
|
sha256 = "051gq9pz49iv4gq34d3n089iaa6cb418n2fhin6gd6fpysbi3nf6";
|
||||||
|
type = "gem";
|
||||||
|
};
|
||||||
|
version = "2.9.0";
|
||||||
|
};
|
||||||
|
ruby-progressbar = {
|
||||||
|
groups = ["default" "development"];
|
||||||
|
platforms = [];
|
||||||
|
source = {
|
||||||
|
remotes = ["https://rubygems.org"];
|
||||||
|
sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc";
|
||||||
|
type = "gem";
|
||||||
|
};
|
||||||
|
version = "1.11.0";
|
||||||
|
};
|
||||||
|
unicode-display_width = {
|
||||||
|
groups = ["default" "development"];
|
||||||
|
platforms = [];
|
||||||
|
source = {
|
||||||
|
remotes = ["https://rubygems.org"];
|
||||||
|
sha256 = "0csjm9shhfik0ci9mgimb7hf3xgh7nx45rkd9rzgdz6vkwr8rzxn";
|
||||||
|
type = "gem";
|
||||||
|
};
|
||||||
|
version = "2.1.0";
|
||||||
|
};
|
||||||
|
}
|
@ -3,16 +3,16 @@
|
|||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "colmena";
|
pname = "colmena";
|
||||||
version = "0.3.0";
|
version = "0.3.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "zhaofengli";
|
owner = "zhaofengli";
|
||||||
repo = "colmena";
|
repo = "colmena";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-aGpMiY9pS2616AfAVWA87tULKatDYF2kCKxwYstK8V0=";
|
sha256 = "sha256-kXc5YD3u+4lLWnih6s5ZjOYT+p0TvC2I7GT9eBAK2Jk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "sha256-ckCArDFjVwVWWK0Ffj0AYe411b9xU33CBc1zeCh2kns=";
|
cargoSha256 = "sha256-B8gO2m+i3BOsMyB/KHlA4MO+a5UT+ZAN1XJ92X1suec=";
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
|
|
||||||
|
@ -2,13 +2,13 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "exoscale-cli";
|
pname = "exoscale-cli";
|
||||||
version = "1.58.0";
|
version = "1.59.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "exoscale";
|
owner = "exoscale";
|
||||||
repo = "cli";
|
repo = "cli";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-+sofCsjx1PDuol9MjyRS2Bmppkv/1yrAo8Hzl+3ackc=";
|
sha256 = "sha256-QLIxoCV+QL+uXmT0IdeztzefiOpW9xNVf0XuZPVpp/Y=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = null;
|
vendorSha256 = null;
|
||||||
|
@ -1,20 +1,19 @@
|
|||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
|
||||||
, buildGoModule
|
, buildGoModule
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "trivy";
|
pname = "trivy";
|
||||||
version = "0.30.4";
|
version = "0.31.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "aquasecurity";
|
owner = "aquasecurity";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-sdGRZ0ljNnb5esXKqtheHbsEimCbN9JPaY8nNNdQhg4=";
|
sha256 = "sha256-4QNnZHFPyAAQOGRKse4cCc34FgMpelHj+MFTuHLUodE=";
|
||||||
};
|
};
|
||||||
vendorSha256 = "sha256-GJobvLi73Ucpi8iO8vJxiRBFB3/OouZUKhmY/VkQjNY=";
|
vendorSha256 = "sha256-IO8QOUKTHXeinOW1Wrg2gl2z0u1/TCcPOHmX0G3ONrc=";
|
||||||
|
|
||||||
excludedPackages = "misc";
|
excludedPackages = "misc";
|
||||||
|
|
||||||
|
@ -4,6 +4,7 @@
|
|||||||
, acl, attr, e2fsprogs, libuuid, lzo, udev, zlib
|
, acl, attr, e2fsprogs, libuuid, lzo, udev, zlib
|
||||||
, runCommand, btrfs-progs
|
, runCommand, btrfs-progs
|
||||||
, gitUpdater
|
, gitUpdater
|
||||||
|
, udevSupport ? true
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
@ -31,7 +32,8 @@ stdenv.mkDerivation rec {
|
|||||||
install -v -m 444 -D btrfs-completion $out/share/bash-completion/completions/btrfs
|
install -v -m 444 -D btrfs-completion $out/share/bash-completion/completions/btrfs
|
||||||
'';
|
'';
|
||||||
|
|
||||||
configureFlags = lib.optional stdenv.hostPlatform.isMusl "--disable-backtrace";
|
configureFlags = lib.optional stdenv.hostPlatform.isMusl "--disable-backtrace"
|
||||||
|
++ lib.optional (!udevSupport) "--disable-libudev";
|
||||||
|
|
||||||
makeFlags = [ "udevruledir=$(out)/lib/udev/rules.d" ];
|
makeFlags = [ "udevruledir=$(out)/lib/udev/rules.d" ];
|
||||||
|
|
||||||
|
@ -1,16 +1,25 @@
|
|||||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, git, testers, git-town, makeWrapper }:
|
{ lib, buildGoModule, fetchFromGitHub, fetchpatch, installShellFiles, git, testers, git-town, makeWrapper }:
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "git-town";
|
pname = "git-town";
|
||||||
version = "7.7.0";
|
version = "7.8.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "git-town";
|
owner = "git-town";
|
||||||
repo = "git-town";
|
repo = "git-town";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-FpBEBx2gb33fGDndvZmvG1A61NoJ4Qy4V3YQSb+Ugsc=";
|
sha256 = "sha256-g9ooMIMN8DN2FcWYkDC1hICCleQYdHf30PYMCit/NMI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# Fix "go vet" when building using Go 1.18.
|
||||||
|
(fetchpatch {
|
||||||
|
name = "fix-go-vet-in-go-1.18.patch";
|
||||||
|
url = "https://github.com/git-town/git-town/commit/23eb0aca7b28c6a0afc21db553aa0e35d35891aa.patch";
|
||||||
|
sha256 = "sha256-EyfhKVrQxRJNrYqaZI04dJogaXs1J+bbOIu7p8g2Clc=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
vendorSha256 = null;
|
vendorSha256 = null;
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||||
|
34
pkgs/tools/networking/rathole/default.nix
Normal file
34
pkgs/tools/networking/rathole/default.nix
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, fetchFromGitHub
|
||||||
|
, rustPlatform
|
||||||
|
, pkg-config
|
||||||
|
, openssl
|
||||||
|
, CoreServices
|
||||||
|
}:
|
||||||
|
rustPlatform.buildRustPackage rec {
|
||||||
|
pname = "rathole";
|
||||||
|
version = "0.4.3";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "rapiz1";
|
||||||
|
repo = pname;
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "sha256-gqWgx03mUk6+9K4Yw5PHEBwFxsOR+48wvngT+wQnN1k=";
|
||||||
|
};
|
||||||
|
|
||||||
|
cargoSha256 = "sha256-dafOgZtiszkoi97PpAVMtdvJd5O3EK9hDVNLJ32FYzE=";
|
||||||
|
|
||||||
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
||||||
|
buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin [ CoreServices ];
|
||||||
|
|
||||||
|
__darwinAllowLocalNetworking = true;
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "A lightweight and high-performance reverse proxy for NAT traversal, written in Rust";
|
||||||
|
homepage = "https://github.com/rapiz1/rathole";
|
||||||
|
license = licenses.asl20;
|
||||||
|
maintainers = with maintainers; [ dit7ya ];
|
||||||
|
};
|
||||||
|
}
|
25
pkgs/tools/networking/sockdump/default.nix
Normal file
25
pkgs/tools/networking/sockdump/default.nix
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
{ lib, fetchFromGitHub, python3, bcc }:
|
||||||
|
|
||||||
|
python3.pkgs.buildPythonApplication rec {
|
||||||
|
pname = "sockdump";
|
||||||
|
version = "unstable-2022-05-27";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "mechpen";
|
||||||
|
repo = pname;
|
||||||
|
rev = "4bb689933f253d4f58c8bb81b992cc883068e873";
|
||||||
|
hash = "sha256-B2ob4k29kgPA4JMtwr0Ma7vQeDRHL/vTFAJxhdS8ShA=";
|
||||||
|
};
|
||||||
|
|
||||||
|
propagatedBuildInputs = [ bcc ];
|
||||||
|
|
||||||
|
format = "other"; # none
|
||||||
|
|
||||||
|
installPhase = "install -D ${pname}.py $out/bin/${pname}";
|
||||||
|
|
||||||
|
meta = src.meta // {
|
||||||
|
description = "Dump unix domain socket traffic with bpf";
|
||||||
|
license = lib.licenses.unlicense;
|
||||||
|
maintainers = with lib.maintainers; [ ehmry ];
|
||||||
|
};
|
||||||
|
}
|
41
pkgs/tools/system/gopsuinfo/default.nix
Normal file
41
pkgs/tools/system/gopsuinfo/default.nix
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
{ lib
|
||||||
|
, buildGoModule
|
||||||
|
, fetchFromGitHub
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildGoModule rec {
|
||||||
|
pname = "gopsuinfo";
|
||||||
|
version = "0.1.1";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "nwg-piotr";
|
||||||
|
repo = "gopsuinfo";
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "sha256-lEc5k89L0ViihcbYh6I5m+Z6Q/rhLFGwftc3WD2EJ/M=";
|
||||||
|
};
|
||||||
|
|
||||||
|
vendorSha256 = "sha256-RsplFwUL4KjWaXE6xvURX+4wkNG+i+1oyBXwLyVcb2Q=";
|
||||||
|
|
||||||
|
# Remove installing of binary from the Makefile (already taken care of by
|
||||||
|
# `buildGoModule`)
|
||||||
|
patches = [
|
||||||
|
./no_bin_install.patch
|
||||||
|
];
|
||||||
|
|
||||||
|
# Fix absolute path of icons in the code
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace gopsuinfo.go \
|
||||||
|
--replace "/usr/share/gopsuinfo" "$out/usr/share/gopsuinfo"
|
||||||
|
'';
|
||||||
|
|
||||||
|
# Install icons
|
||||||
|
postInstall = '' make install DESTDIR=$out '';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "A gopsutil-based command to display system usage info";
|
||||||
|
homepage = "https://github.com/nwg-piotr/gopsuinfo";
|
||||||
|
license = licenses.bsd2;
|
||||||
|
maintainers = with maintainers; [ otini ];
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
}
|
12
pkgs/tools/system/gopsuinfo/no_bin_install.patch
Normal file
12
pkgs/tools/system/gopsuinfo/no_bin_install.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff --git a/Makefile b/Makefile
|
||||||
|
index d33866c..e0aafb4 100644
|
||||||
|
--- a/Makefile
|
||||||
|
+++ b/Makefile
|
||||||
|
@@ -8,7 +8,6 @@ install:
|
||||||
|
mkdir -p "${DESTDIR}/usr/share/gopsuinfo" "${DESTDIR}/usr/bin"
|
||||||
|
cp -R icons_light "${DESTDIR}/usr/share/gopsuinfo"
|
||||||
|
cp -R icons_dark "${DESTDIR}/usr/share/gopsuinfo"
|
||||||
|
- cp bin/gopsuinfo "${DESTDIR}/usr/bin/"
|
||||||
|
|
||||||
|
uninstall:
|
||||||
|
rm -r "${DESTDIR}/usr/share/gopsuinfo"
|
39
pkgs/tools/text/sgrep/default.nix
Normal file
39
pkgs/tools/text/sgrep/default.nix
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
{ stdenv, sgrep, fetchurl, runCommand, lib, m4, makeWrapper }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "sgrep";
|
||||||
|
version = "1.94a";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://www.cs.helsinki.fi/pub/Software/Local/Sgrep/sgrep-${version}.tar.gz";
|
||||||
|
sha256 = "sha256-1bFkeOOrRHNeJCg9LYldLJyAE5yVIo3zvbKsRGOV+vk=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
wrapProgram $out/bin/sgrep \
|
||||||
|
--prefix PATH : ${lib.makeBinPath [ m4 ]}
|
||||||
|
'';
|
||||||
|
|
||||||
|
passthru.tests.smokeTest = runCommand "test-sgrep" { } ''
|
||||||
|
expr='"<foo>" __ "</foo>"'
|
||||||
|
data="<foo>1</foo><bar>2</bar>"
|
||||||
|
${sgrep}/bin/sgrep "$expr" <<<$data >$out
|
||||||
|
read result <$out
|
||||||
|
[[ $result = 1 ]]
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
homepage = "https://www.cs.helsinki.fi/u/jjaakkol/sgrep.html";
|
||||||
|
description = "A grep for structured text formats such as XML";
|
||||||
|
longDescription = ''
|
||||||
|
sgrep (structured grep) is a tool for searching and indexing text,
|
||||||
|
SGML, XML and HTML files and filtering text streams using
|
||||||
|
structural criteria.
|
||||||
|
'';
|
||||||
|
platforms = platforms.unix;
|
||||||
|
license = licenses.gpl2Plus;
|
||||||
|
maintainers = with maintainers; [ eigengrau ];
|
||||||
|
};
|
||||||
|
}
|
@ -1300,6 +1300,8 @@ with pkgs;
|
|||||||
|
|
||||||
sdlookup = callPackage ../tools/security/sdlookup { };
|
sdlookup = callPackage ../tools/security/sdlookup { };
|
||||||
|
|
||||||
|
sgrep = callPackage ../tools/text/sgrep { };
|
||||||
|
|
||||||
smbscan = callPackage ../tools/security/smbscan { };
|
smbscan = callPackage ../tools/security/smbscan { };
|
||||||
|
|
||||||
spectre-cli = callPackage ../tools/security/spectre-cli { };
|
spectre-cli = callPackage ../tools/security/spectre-cli { };
|
||||||
@ -1449,6 +1451,8 @@ with pkgs;
|
|||||||
|
|
||||||
goldberg-emu = callPackage ../applications/emulators/goldberg-emu { };
|
goldberg-emu = callPackage ../applications/emulators/goldberg-emu { };
|
||||||
|
|
||||||
|
gopsuinfo = callPackage ../tools/system/gopsuinfo { };
|
||||||
|
|
||||||
gxemul = callPackage ../applications/emulators/gxemul { };
|
gxemul = callPackage ../applications/emulators/gxemul { };
|
||||||
|
|
||||||
hatari = callPackage ../applications/emulators/hatari { };
|
hatari = callPackage ../applications/emulators/hatari { };
|
||||||
@ -9555,6 +9559,8 @@ with pkgs;
|
|||||||
|
|
||||||
p3x-onenote = callPackage ../applications/office/p3x-onenote { };
|
p3x-onenote = callPackage ../applications/office/p3x-onenote { };
|
||||||
|
|
||||||
|
p4c = callPackage ../development/compilers/p4c { };
|
||||||
|
|
||||||
p7zip = callPackage ../tools/archivers/p7zip { };
|
p7zip = callPackage ../tools/archivers/p7zip { };
|
||||||
|
|
||||||
packagekit = callPackage ../tools/package-management/packagekit { nix = nixVersions.nix_2_8; };
|
packagekit = callPackage ../tools/package-management/packagekit { nix = nixVersions.nix_2_8; };
|
||||||
@ -10865,6 +10871,8 @@ with pkgs;
|
|||||||
jdk = jdk11;
|
jdk = jdk11;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
sockdump = callPackage ../tools/networking/sockdump { };
|
||||||
|
|
||||||
spglib = callPackage ../development/libraries/spglib {
|
spglib = callPackage ../development/libraries/spglib {
|
||||||
inherit (llvmPackages) openmp;
|
inherit (llvmPackages) openmp;
|
||||||
};
|
};
|
||||||
@ -14379,6 +14387,9 @@ with pkgs;
|
|||||||
cargo-udeps = callPackage ../development/tools/rust/cargo-udeps {
|
cargo-udeps = callPackage ../development/tools/rust/cargo-udeps {
|
||||||
inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration;
|
inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
cargo-tauri = callPackage ../development/tools/rust/cargo-tauri { };
|
||||||
|
|
||||||
cargo-valgrind = callPackage ../development/tools/rust/cargo-valgrind { };
|
cargo-valgrind = callPackage ../development/tools/rust/cargo-valgrind { };
|
||||||
cargo-wasi = callPackage ../development/tools/rust/cargo-wasi {
|
cargo-wasi = callPackage ../development/tools/rust/cargo-wasi {
|
||||||
inherit (darwin.apple_sdk.frameworks) Security;
|
inherit (darwin.apple_sdk.frameworks) Security;
|
||||||
@ -16663,6 +16674,10 @@ with pkgs;
|
|||||||
|
|
||||||
ran = callPackage ../servers/http/ran { };
|
ran = callPackage ../servers/http/ran { };
|
||||||
|
|
||||||
|
rathole = callPackage ../tools/networking/rathole {
|
||||||
|
inherit (darwin.apple_sdk.frameworks) CoreServices;
|
||||||
|
};
|
||||||
|
|
||||||
retry = callPackage ../tools/system/retry { };
|
retry = callPackage ../tools/system/retry { };
|
||||||
|
|
||||||
rizin = pkgs.callPackage ../development/tools/analysis/rizin { };
|
rizin = pkgs.callPackage ../development/tools/analysis/rizin { };
|
||||||
@ -30859,6 +30874,8 @@ with pkgs;
|
|||||||
|
|
||||||
tasknc = callPackage ../applications/misc/tasknc { };
|
tasknc = callPackage ../applications/misc/tasknc { };
|
||||||
|
|
||||||
|
tasktimer = callPackage ../applications/misc/tasktimer { };
|
||||||
|
|
||||||
taskwarrior = callPackage ../applications/misc/taskwarrior { };
|
taskwarrior = callPackage ../applications/misc/taskwarrior { };
|
||||||
|
|
||||||
taskwarrior-tui = callPackage ../applications/misc/taskwarrior-tui { };
|
taskwarrior-tui = callPackage ../applications/misc/taskwarrior-tui { };
|
||||||
|
@ -157,10 +157,19 @@ in {
|
|||||||
};
|
};
|
||||||
ghc941 = callPackage ../development/compilers/ghc/9.4.1.nix {
|
ghc941 = callPackage ../development/compilers/ghc/9.4.1.nix {
|
||||||
bootPkgs =
|
bootPkgs =
|
||||||
# TODO(@sternenseemann): Package 9.0.2 bindist or wait for upstream fix
|
# Building with 9.2 is broken due to
|
||||||
# Need to use 902 due to
|
|
||||||
# https://gitlab.haskell.org/ghc/ghc/-/issues/21914
|
# https://gitlab.haskell.org/ghc/ghc/-/issues/21914
|
||||||
packages.ghc902;
|
# Use 8.10 as a workaround where possible to keep bootstrap path short.
|
||||||
|
|
||||||
|
# On ARM text won't build with GHC 8.10.*
|
||||||
|
if stdenv.hostPlatform.isAarch then
|
||||||
|
# TODO(@sternenseemann): package bindist
|
||||||
|
packages.ghc902
|
||||||
|
# No suitable bindists for powerpc64le
|
||||||
|
else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then
|
||||||
|
packages.ghc902
|
||||||
|
else
|
||||||
|
packages.ghc8107Binary;
|
||||||
inherit (buildPackages.python3Packages) sphinx;
|
inherit (buildPackages.python3Packages) sphinx;
|
||||||
# Need to use apple's patched xattr until
|
# Need to use apple's patched xattr until
|
||||||
# https://github.com/xattr/xattr/issues/44 and
|
# https://github.com/xattr/xattr/issues/44 and
|
||||||
|
@ -522,6 +522,8 @@ in {
|
|||||||
|
|
||||||
altair = callPackage ../development/python-modules/altair { };
|
altair = callPackage ../development/python-modules/altair { };
|
||||||
|
|
||||||
|
amarna = callPackage ../development/python-modules/amarna { };
|
||||||
|
|
||||||
amazon-ion = callPackage ../development/python-modules/amazon-ion { };
|
amazon-ion = callPackage ../development/python-modules/amazon-ion { };
|
||||||
|
|
||||||
amazon_kclpy = callPackage ../development/python-modules/amazon_kclpy { };
|
amazon_kclpy = callPackage ../development/python-modules/amazon_kclpy { };
|
||||||
@ -1501,6 +1503,8 @@ in {
|
|||||||
|
|
||||||
btchip = callPackage ../development/python-modules/btchip { };
|
btchip = callPackage ../development/python-modules/btchip { };
|
||||||
|
|
||||||
|
bthome-ble = callPackage ../development/python-modules/bthome-ble { };
|
||||||
|
|
||||||
bt-proximity = callPackage ../development/python-modules/bt-proximity { };
|
bt-proximity = callPackage ../development/python-modules/bt-proximity { };
|
||||||
|
|
||||||
BTrees = callPackage ../development/python-modules/btrees { };
|
BTrees = callPackage ../development/python-modules/btrees { };
|
||||||
|
Loading…
Reference in New Issue
Block a user