Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
2c0cce7290
1
.mailmap
Normal file
1
.mailmap
Normal file
|
|
@ -0,0 +1 @@
|
|||
Daniel Løvbrøtte Olsen <me@dandellion.xyz> <daniel.olsen99@gmail.com>
|
||||
|
|
@ -123,7 +123,11 @@ in {
|
|||
host = cfg.address;
|
||||
port = cfg.port;
|
||||
klippy_uds_address = cfg.klipperSocket;
|
||||
};
|
||||
file_manager = {
|
||||
config_path = cfg.configDir;
|
||||
};
|
||||
database = {
|
||||
database_path = "${cfg.stateDir}/database";
|
||||
};
|
||||
};
|
||||
|
|
@ -153,6 +157,7 @@ in {
|
|||
|
||||
serviceConfig = {
|
||||
WorkingDirectory = cfg.stateDir;
|
||||
PrivateTmp = true;
|
||||
Group = cfg.group;
|
||||
User = cfg.user;
|
||||
};
|
||||
|
|
@ -175,4 +180,9 @@ in {
|
|||
});
|
||||
'';
|
||||
};
|
||||
|
||||
meta.maintainers = with maintainers; [
|
||||
cab404
|
||||
vtuan10
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,19 +1,30 @@
|
|||
{ lib, stdenv, fetchurl, cmake
|
||||
, alsa-lib, fftwSinglePrec, libjack2, libpulseaudio, libvorbis, soundtouch, qtbase
|
||||
, alsa-lib, fftwSinglePrec, libjack2, libpulseaudio, libvorbis, soundtouch
|
||||
, qtbase, qtdeclarative, qtgraphicaleffects, qtquickcontrols2, qttools, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nootka";
|
||||
version = "1.4.7";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/nootka/${pname}-${version}-source.tar.bz2";
|
||||
sha256 = "1y9wlwri74v2z9dwbcfjs7xri54yra24vpwq19xi2lfv1nbs518x";
|
||||
sha256 = "sha256-ZHdyLZ3+TCpQ77tcNuDlN2124qLDZu9DdH5x7RI1HIs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
nativeBuildInputs = [ cmake wrapQtAppsHook ];
|
||||
buildInputs = [
|
||||
alsa-lib fftwSinglePrec libjack2 libpulseaudio libvorbis soundtouch qtbase
|
||||
alsa-lib
|
||||
fftwSinglePrec
|
||||
libjack2
|
||||
libpulseaudio
|
||||
libvorbis
|
||||
soundtouch
|
||||
qtbase
|
||||
qtdeclarative
|
||||
qtgraphicaleffects
|
||||
qtquickcontrols2
|
||||
qttools
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
@ -22,13 +33,11 @@ stdenv.mkDerivation rec {
|
|||
"-DENABLE_PULSEAUDIO=ON"
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Application for practicing playing musical scores and ear training";
|
||||
homepage = "https://nootka.sourceforge.io/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ orivej ];
|
||||
maintainers = with maintainers; [ mmlb orivej ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,54 +0,0 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, cmake
|
||||
, alsa-lib
|
||||
, fftwSinglePrec
|
||||
, libjack2
|
||||
, libpulseaudio
|
||||
, libvorbis
|
||||
, soundtouch
|
||||
, qtbase
|
||||
, qtdeclarative
|
||||
, qtquickcontrols2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nootka";
|
||||
version = "1.7.0-beta1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/nootka/nootka-${version}-source.tar.bz2";
|
||||
sha256 = "13b50vnpr1zx2mrgkc8fmhsyfa19rqq1rksvn31145dy6fk1f3gc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
fftwSinglePrec
|
||||
libjack2
|
||||
libpulseaudio
|
||||
libvorbis
|
||||
soundtouch
|
||||
qtbase
|
||||
qtdeclarative
|
||||
qtquickcontrols2
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_INCLUDE_PATH=${libjack2}/include/jack;${libpulseaudio.dev}/include/pulse"
|
||||
"-DENABLE_JACK=ON"
|
||||
"-DENABLE_PULSEAUDIO=ON"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64);
|
||||
description = "Application for practicing playing musical scores and ear training";
|
||||
homepage = "https://nootka.sourceforge.io/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ orivej ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocenaudio";
|
||||
version = "3.11.14";
|
||||
version = "3.11.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}";
|
||||
sha256 = "sha256-5HQ64jCM8kyWLqxFqsFN3lJgM/JlWf1/RYKSpAFYTYE=";
|
||||
sha256 = "sha256-l3Fv0gKKGYrbxpGHH6MXflK5fCrGoq3Qu+XkqFqMJJk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1203,8 +1203,8 @@ let
|
|||
mktplcRef = {
|
||||
publisher = "github";
|
||||
name = "copilot";
|
||||
version = "1.7.4812";
|
||||
sha256 = "1yl7m90m38pv8nz4dwcszjsa1sf253459xln17mngmc8z9wd3d3a";
|
||||
version = "1.46.6822";
|
||||
sha256 = "sha256-L71mC0190ZubqNVliu7es4SDsBTGVokePpcNupABI8Q=";
|
||||
};
|
||||
meta = { license = lib.licenses.unfree; };
|
||||
};
|
||||
|
|
|
|||
|
|
@ -14,17 +14,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "pizarra";
|
||||
version = "1.7.3";
|
||||
version = "1.7.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "categulario";
|
||||
repo = "pizarra-gtk";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-XP+P2w6s47JQV4spKeMKe/Ktxid7uokGYH4IEJ5VHSc=";
|
||||
sha256 = "sha256-fWwAmzF3ppCvJZ0K4EDrmP8SVPVRayEQTtbhNscZIF0=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-JQZ/95tRlmsrb0EJaPlE8G0fMSeEgLnDi3pkLjcJz/o=";
|
||||
cargoSha256 = "sha256-pxRJXUeFGdVj6iCFZ4Y8b9z5hw83g8YywpKztTZ0g+4=";
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook pkg-config gdk-pixbuf ];
|
||||
|
||||
|
|
@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec {
|
|||
- Text
|
||||
- Grids
|
||||
'';
|
||||
homepage = "https://pizarra.categulario.tk/en/";
|
||||
homepage = "https://pizarra.categulario.xyz/en/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ mglolenstine ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@ stdenv.mkDerivation rec{
|
|||
version = "2.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://m12-assets.unigine.com/d/Unigine_Sanctuary-${version}.run";
|
||||
sha256 = "1m9r79q33hx213zg3c2kknnc7hi8jp2h88s9qynny4k4rg8vpa18";
|
||||
url = "https://assets.unigine.com/d/Unigine_Sanctuary-${version}.run";
|
||||
sha256 = "sha256-KKi70ctkEm+tx0kjBMWVKMLDrJ1TsPH+CKLDMXA6OdU=";
|
||||
};
|
||||
|
||||
libPath = lib.makeLibraryPath [
|
||||
|
|
@ -94,5 +94,6 @@ stdenv.mkDerivation rec{
|
|||
license = lib.licenses.unfree;
|
||||
maintainers = [ lib.maintainers.BarinovMaxim ];
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
mainProgram = "Sanctuary";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,8 +22,8 @@ stdenv.mkDerivation {
|
|||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://m12-assets.unigine.com/d/Unigine_Tropics-${version}.run";
|
||||
sha256 = "0icasdp46fjnic7gk83pknjx0gpap9j202dm0llcfg5zin5kbq7x";
|
||||
url = "https://assets.unigine.com/d/Unigine_Tropics-${version}.run";
|
||||
sha256 = "sha256-/eA1i42/PMcoBbUJIGS66j7QpZ13oPkOi1Y6Q27TikU=";
|
||||
};
|
||||
|
||||
libPath = lib.makeLibraryPath [
|
||||
|
|
@ -92,5 +92,6 @@ stdenv.mkDerivation {
|
|||
license = lib.licenses.unfree;
|
||||
maintainers = [ lib.maintainers.BarinovMaxim ];
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
mainProgram = "Tropics";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,8 +38,8 @@ stdenv.mkDerivation rec {
|
|||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://m11-assets.unigine.com/d/Unigine_Valley-${version}.run";
|
||||
sha256 = "5f0c8bd2431118551182babbf5f1c20fb14e7a40789697240dcaf546443660f4";
|
||||
url = "https://assets.unigine.com/d/Unigine_Valley-${version}.run";
|
||||
sha256 = "sha256-XwyL0kMRGFURgrq79fHCD7FOekB4lpckDcr1RkQ2YPQ=";
|
||||
};
|
||||
|
||||
sourceRoot = "Unigine_Valley-${version}";
|
||||
|
|
@ -132,6 +132,7 @@ stdenv.mkDerivation rec {
|
|||
license = lib.licenses.unfree; # see also: $out/$instPath/documentation/License.pdf
|
||||
maintainers = [ lib.maintainers.kierdavis ];
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
mainProgram = "valley";
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -26,13 +26,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: rec {
|
||||
pname = "SwayNotificationCenter";
|
||||
version = "0.7.1";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ErikReider";
|
||||
repo = "SwayNotificationCenter";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-s4yacSK5ajuq+BeGcPX+/o9wuDOcTOdZu4p8nPS8wk4=";
|
||||
hash = "sha256-Z8CFSaH4RsZ/Qgj+l+36p7smbiGV5RRQhZBBcA3iyK8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -3,10 +3,10 @@
|
|||
rec {
|
||||
firefox = buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "105.0";
|
||||
version = "105.0.1";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "a48f323f874b538402630a9094daa83189b3ca319feddc80fd66d087eca13f21c8b2d85be9c29e948c18cb7c524adac44e135adcde4d4592738e104ae9c1a734";
|
||||
sha512 = "66ef7cd5028953e7da9d55e127135739c9d85be68ec633b71c52d6c9427edb0bd8a38504148484cd322adcefb57bfefe6e57cb15855f195508fe438864f4322b";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
, gnupg
|
||||
, attrPath
|
||||
, runtimeShell
|
||||
, baseUrl ? "http://archive.mozilla.org/pub/firefox/releases/"
|
||||
, baseUrl ? "https://archive.mozilla.org/pub/firefox/releases/"
|
||||
, versionPrefix ? ""
|
||||
, versionSuffix ? ""
|
||||
, versionKey ? "version"
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "k9s";
|
||||
version = "0.26.3";
|
||||
version = "0.26.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "derailed";
|
||||
repo = "k9s";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Czjx6YTyFKAP8ZuwBpTpRfjDdRdd8GQ0ggbe5LMb8uA=";
|
||||
sha256 = "sha256-IARb8MGFIg2X5rOipQyM2qL3fXa6xRS58cavR4ytH+k=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
|
@ -20,7 +20,7 @@ buildGoModule rec {
|
|||
|
||||
tags = [ "netgo" ];
|
||||
|
||||
vendorSha256 = "sha256-rnROcJA4f0YjDGKEncrMmf/43VKrbgpmM3TvV1MMiWU=";
|
||||
vendorSha256 = "sha256-gNZBq1fdNYmcRe5MmLrrGtff2cEf/YFxJ9I2rkH+umE=";
|
||||
|
||||
# TODO investigate why some config tests are failing
|
||||
doCheck = !(stdenv.isDarwin && stdenv.isAarch64);
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "waypoint";
|
||||
version = "0.10.0";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vyPYKEmAc2kmcCGF28wMq7oZa4ZcSKp5SyCMounspQA=";
|
||||
sha256 = "sha256-9iqHO+idW6Rxe0osD4fjkhvO5TF122r1J8QlV/haaNw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-/WyqxK+FFSfR/Gyxy7K65KZDVfBM5Pp7WnoafF0AeQY=";
|
||||
vendorSha256 = "sha256-fBsRmUE72lot9Ju/hUqpdSSXvMktRGP+H4WQ0GOCxrY=";
|
||||
|
||||
nativeBuildInputs = [ go-bindata installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "flexget";
|
||||
version = "3.3.27";
|
||||
version = "3.3.29";
|
||||
|
||||
# Fetch from GitHub in order to use `requirements.in`
|
||||
src = fetchFromGitHub {
|
||||
owner = "flexget";
|
||||
repo = "flexget";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-0FHhYsm2Uwag0e2i7ip32EWjS4Fx6vA9eW1ojSBB5Hc=";
|
||||
hash = "sha256-BUOjcde6/9IzkEBR1TsDBPr4rArRs83X/vwYQr+72ww=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cinny-desktop";
|
||||
version = "2.1.3";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/cinnyapp/cinny-desktop/releases/download/v${version}/Cinny_desktop-x86_64.deb";
|
||||
sha256 = "sha256-fUnWGnulj/515aEdd+rCy/LGLLAs2yAOOBUn9K1LhNs=";
|
||||
sha256 = "sha256-UvNvfgOaqG2P3pl7cHwP0E7f8JLMo1EDiDAy05pJVE4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -103,5 +103,6 @@ python3Packages.buildPythonApplication rec {
|
|||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ doronbehar ];
|
||||
broken = true; # at 2022-09-23
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,18 +8,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "shellhub-agent";
|
||||
version = "0.10.1";
|
||||
version = "0.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shellhub-io";
|
||||
repo = "shellhub";
|
||||
rev = "v${version}";
|
||||
sha256 = "jeZh1vPXUN/jcf306S6KdIeHygci+4+uky4MXQgRlpA=";
|
||||
sha256 = "F0kDrucPjjzlSiYDuZBO7xT0hTT0BNpHDCKbzWFQCzo=";
|
||||
};
|
||||
|
||||
modRoot = "./agent";
|
||||
|
||||
vendorSha256 = "sha256-AqtDI1GFw4cduFdWRSh9lYe/OwvEdu5iB0+ud8QPgXM=";
|
||||
vendorSha256 = "sha256-IYDy3teo+hm+yEfZa9V9MFNGmO2tqeh3lAq+Eh4Ek+A=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -28,5 +28,6 @@ stdenv.mkDerivation rec {
|
|||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [viric];
|
||||
platforms = with lib.platforms; linux;
|
||||
broken = true; # at 2022-11-23
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@
|
|||
, libpthreadstubs
|
||||
, libXdmcp
|
||||
, lndir
|
||||
, unixODBC
|
||||
|
||||
, util-linux
|
||||
, libselinux
|
||||
|
|
@ -32,7 +33,7 @@
|
|||
, at-spi2-core
|
||||
, libXtst
|
||||
|
||||
, swig
|
||||
, swig4
|
||||
, python
|
||||
, wxPython
|
||||
, opencascade-occt
|
||||
|
|
@ -68,16 +69,18 @@ stdenv.mkDerivation rec {
|
|||
# tagged releases don't have "unknown"
|
||||
# kicad nightlies use git describe --dirty
|
||||
# nix removes .git, so its approximated here
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeModules/KiCadVersion.cmake \
|
||||
--replace "unknown" "${builtins.substring 0 10 src.rev}" \
|
||||
'';
|
||||
postPatch = if (!stable) then ''
|
||||
substituteInPlace cmake/KiCadVersion.cmake \
|
||||
--replace "unknown" "${builtins.substring 0 10 src.rev}"
|
||||
''
|
||||
else "";
|
||||
|
||||
makeFlags = optionals (debug) [ "CFLAGS+=-Og" "CFLAGS+=-ggdb" ];
|
||||
|
||||
cmakeFlags = [
|
||||
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
||||
"-DKICAD_USE_EGL=ON"
|
||||
]
|
||||
++ optionals (withScripting) [
|
||||
"-DKICAD_SCRIPTING_WXPYTHON=ON"
|
||||
|
|
@ -151,15 +154,19 @@ stdenv.mkDerivation rec {
|
|||
curl
|
||||
openssl
|
||||
boost
|
||||
swig
|
||||
swig4
|
||||
python
|
||||
]
|
||||
++ optional (!stable) unixODBC
|
||||
++ optional (withScripting) wxPython
|
||||
++ optional (withNgspice) libngspice
|
||||
++ optional (withOCC) opencascade-occt
|
||||
++ optional (debug) valgrind
|
||||
;
|
||||
|
||||
# started becoming necessary halfway into 2022, not sure what changed to break a test...
|
||||
preInstallCheck = optionals (withNgspice) [ "export LD_LIBRARY_PATH=${libngspice}/lib" ];
|
||||
|
||||
# debug builds fail all but the python test
|
||||
# stable release doesn't have the fix for upstream issue 9888 yet
|
||||
doInstallCheck = !debug && !stable;
|
||||
|
|
|
|||
|
|
@ -65,7 +65,11 @@ tmp="${here}/,versions.nix.${RANDOM}"
|
|||
libs=( symbols templates footprints packages3d )
|
||||
|
||||
get_rev() {
|
||||
git ls-remote --tags "$@"
|
||||
if [[ ${version} == "master" ]]; then
|
||||
git ls-remote --heads "$@"
|
||||
else
|
||||
git ls-remote --tags "$@"
|
||||
fi
|
||||
}
|
||||
|
||||
gitlab="https://gitlab.com/kicad"
|
||||
|
|
|
|||
|
|
@ -25,23 +25,23 @@
|
|||
};
|
||||
"kicad-unstable" = {
|
||||
kicadVersion = {
|
||||
version = "2022-06-21";
|
||||
version = "2022-09-18";
|
||||
src = {
|
||||
rev = "b54bb909755d39dcce38ef277c715d7f31ab8e00";
|
||||
sha256 = "0nzgrkkvc66hgqdrwfmh5fjw4ffr8gc3bw3n44sa6zjkkz5s6p48";
|
||||
rev = "0efc1149afed2af5b81e4555de4623217ece650f";
|
||||
sha256 = "19fqy8yvvl45izg5ynhch9r4gl4ncx0bz9s6n1x98bgzxkdyc14q";
|
||||
};
|
||||
};
|
||||
libVersion = {
|
||||
version = "2022-06-21";
|
||||
version = "2022-09-18";
|
||||
libSources = {
|
||||
symbols.rev = "a003b00f6f1056d726e32e911cd65b32946f5503";
|
||||
symbols.sha256 = "02z3vqhz1rlf57zi8vyrlxvvdl1hpsh447p41qdgcpn5dyjycb9d";
|
||||
symbols.rev = "879023fba005d23f285b6d052d9e6bcba1d754aa";
|
||||
symbols.sha256 = "1nxz8r3h3j62fs3s77lj27333fsj5c4i01n05lv0gqx36h28hqxk";
|
||||
templates.rev = "ae2b46f8756d79379b90fec01d4fdde1ccfd73c1";
|
||||
templates.sha256 = "08zxh83fbygh1x2jhca8nrp3f9kihf7kmg65qmyp95wvps4p5h8v";
|
||||
footprints.rev = "5df530ec44892407d6382d933ff9ad42dd19df0e";
|
||||
footprints.sha256 = "1phynxisha2pq2knbx5l1hkdz1bmjm0qxl3lcb4ab82h8d35r37c";
|
||||
packages3d.rev = "6bfd8dfa3adc6ac316b9857977c87f22282c6e24";
|
||||
packages3d.sha256 = "0ci9gxbpfnfqwah95ki4qcwlca78s1z6s7hckisnp58a1cm9siya";
|
||||
footprints.rev = "b1dfe894de90b0063befc02b914dc9e2b47e3a62";
|
||||
footprints.sha256 = "06kn6c00wlnr33mks582xhadvkbbgmqhb4qc1wjfw264pavz7v7y";
|
||||
packages3d.rev = "45df600c5e3dd5113d62e6445115e7c37bdf362f";
|
||||
packages3d.sha256 = "0cnrg7mr3khpglviid1adk2ihs1qwj0r7l32z2vqsl8aidzbg9kr";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ mkDerivation, lib, fetchurl, fetchpatch, pkg-config, cmake, glib, boost, libsigrok
|
||||
, libsigrokdecode, libserialport, libzip, udev, libusb1, libftdi1, glibmm
|
||||
, pcre, librevisa, python3, qtbase, qtsvg, qttools
|
||||
, pcre, python3, qtbase, qtsvg, qttools
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
|
|
@ -16,7 +16,7 @@ mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
glib boost libsigrok libsigrokdecode libserialport libzip udev libusb1 libftdi1 glibmm
|
||||
pcre librevisa python3
|
||||
pcre python3
|
||||
qtbase qtsvg qttools
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -30,12 +30,12 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "streamlit";
|
||||
version = "1.12.2";
|
||||
version = "1.13.0";
|
||||
format = "wheel"; # source currently requires pipenv
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version format;
|
||||
hash = "sha256-xW0Hdf6zkRb/kKiwHuFb4nIS7lCruIlDYHIF0m0dmSM=";
|
||||
hash = "sha256-MjGm9CT4p/Nl3J5G1Pu2ajY0/VcMdHabimn3ktkoXTo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -120,13 +120,14 @@ in stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
# Newer cub is included with cudatoolkit now and it breaks the build.
|
||||
# https://github.com/Microsoft/CNTK/issues/3191
|
||||
broken = cudaSupport;
|
||||
homepage = "https://github.com/Microsoft/CNTK";
|
||||
description = "An open source deep-learning toolkit";
|
||||
license = if onebitSGDSupport then licenses.unfreeRedistributable else licenses.mit;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
# Newer cub is included with cudatoolkit now and it breaks the build.
|
||||
# https://github.com/Microsoft/CNTK/issues/3191
|
||||
# broken = cudaSupport;
|
||||
broken = true; # at 2022-11-23
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -83,5 +83,6 @@ stdenv.mkDerivation rec {
|
|||
platforms = platforms.linux;
|
||||
license = licenses.gpl3Plus;
|
||||
mainProgram = "com.github.parnold_x.nasc";
|
||||
broken = true; # at 2022-09-23
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,10 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
|
|||
sha256 = "1wdla4ryif1ss37aqi61lcvzddvf568wyh5s3xv1lrryh4al9vpd";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "attrs" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3Packages.pythonRelaxDepsHook
|
||||
wrapQtAppsHook
|
||||
] ++ (with python3Packages; [
|
||||
poetry-core
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "v2ray-geoip";
|
||||
version = "202209170841";
|
||||
version = "202209220104";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2fly";
|
||||
repo = "geoip";
|
||||
rev = "9487b31412243e602ee3332ff3cce63a15906733";
|
||||
sha256 = "sha256-gKzrPBiifC2Lg050tFJynFd6DZ4vzSoPB6wbR4OzMFQ=";
|
||||
rev = "4eaa41ebcfc2aafaa5b363b8efdd867c53e3435b";
|
||||
sha256 = "sha256-B0a6Zqd9WmlwBY6Kj0ZKNjZXzZWaNhRL0tLT0PM+gGA=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
kdeclarative, kdelibs4support, kpeople, kconfig, krunner, kinit, kwayland, kwin,
|
||||
plasma-framework, telepathy, libphonenumber, protobuf, libqofono, modemmanager-qt,
|
||||
networkmanager-qt, plasma-workspace,
|
||||
maliit-framework, maliit-keyboard,
|
||||
maliit-framework, maliit-keyboard, qtfeedback,
|
||||
|
||||
qtwayland, qttools
|
||||
}:
|
||||
|
|
@ -23,7 +23,7 @@ mkDerivation {
|
|||
appstream libdbusmenu pam wayland
|
||||
kdeclarative kdelibs4support kpeople kconfig krunner kinit kwayland kwin
|
||||
plasma-framework telepathy libphonenumber protobuf libqofono modemmanager-qt
|
||||
networkmanager-qt maliit-framework maliit-keyboard plasma-workspace
|
||||
networkmanager-qt maliit-framework maliit-keyboard plasma-workspace qtfeedback
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
{ stdenv, fetchurl, lib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = "python27-docs-html";
|
||||
version = "2.7.16";
|
||||
version = "2.7.18";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://docs.python.org/ftp/python/doc/${version}/python-${version}-docs-html.tar.bz2";
|
||||
sha256 = "1razs1grzhai65ihaiyph8kz6ncjkgp1gsn3c8v7kanf13lqim02";
|
||||
url = http://www.python.org/ftp/python/doc/2.7.18/python-2.7.18-docs-html.tar.bz2;
|
||||
sha256 = "03igxwpqc2lvzspnj78zz1prnmfwwj00jbvh1wsxvb0wayd5wi10";
|
||||
};
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/doc/python27
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
{ stdenv, fetchurl, lib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = "python27-docs-pdf-a4";
|
||||
version = "2.7.16";
|
||||
version = "2.7.18";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://docs.python.org/ftp/python/doc/${version}/python-${version}-docs-pdf-a4.tar.bz2";
|
||||
sha256 = "14ml1ynrlbhg43737bdsb8k5y39wsffqj4iwhylhb8n8l5dplfdq";
|
||||
url = http://www.python.org/ftp/python/doc/2.7.18/python-2.7.18-docs-pdf-a4.tar.bz2;
|
||||
sha256 = "0rxb2fpxwivjpk5wi2pl1fqibr4khf9s0yq6a49k9b4awi9nkb6v";
|
||||
};
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/doc/python27
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
{ stdenv, fetchurl, lib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = "python27-docs-pdf-letter";
|
||||
version = "2.7.16";
|
||||
version = "2.7.18";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://docs.python.org/ftp/python/doc/${version}/python-${version}-docs-pdf-letter.tar.bz2";
|
||||
sha256 = "019i8n48m71mn31v8d85kkwyqfgcgqnqh506y4a7fcgf656bajs0";
|
||||
url = http://www.python.org/ftp/python/doc/2.7.18/python-2.7.18-docs-pdf-letter.tar.bz2;
|
||||
sha256 = "07hbqvrdlq01cb95r1574bxqqhiqbkj4f92wzlq4d6dq1l272nan";
|
||||
};
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/doc/python27
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
{ stdenv, fetchurl, lib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = "python27-docs-text";
|
||||
version = "2.7.16";
|
||||
version = "2.7.18";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://docs.python.org/ftp/python/doc/${version}/python-${version}-docs-text.tar.bz2";
|
||||
sha256 = "1da7swlykvc013684nywycinfz3v8dqkcmv0zj8p7l5lyi5mq03r";
|
||||
url = http://www.python.org/ftp/python/doc/2.7.18/python-2.7.18-docs-text.tar.bz2;
|
||||
sha256 = "1wj7mxs52kp5lmn5mvv574sygkfnk00kbz9ya9c03yfq5dd5nvy8";
|
||||
};
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/doc/python27
|
||||
|
|
|
|||
|
|
@ -0,0 +1,20 @@
|
|||
# This file was generated and will be overwritten by ./generate.sh
|
||||
|
||||
{ stdenv, fetchurl, lib }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "python310-docs-html";
|
||||
version = "3.10.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.python.org/ftp/python/doc/3.10.7/python-3.10.7-docs-html.tar.bz2;
|
||||
sha256 = "0j86z1vmaghzj5i4frvzyfb9qwsmm09g4f4ssx5w27cm30b8k0v1";
|
||||
};
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/doc/python310
|
||||
cp -R ./ $out/share/doc/python310/html
|
||||
'';
|
||||
meta = {
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
# This file was generated and will be overwritten by ./generate.sh
|
||||
|
||||
{ stdenv, fetchurl, lib }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "python310-docs-pdf-a4";
|
||||
version = "3.10.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.python.org/ftp/python/doc/3.10.7/python-3.10.7-docs-pdf-a4.tar.bz2;
|
||||
sha256 = "1gvi457dsj3ywwvxysp7idkk9ndngnby1dnfh1q8f5gv3kg4093r";
|
||||
};
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/doc/python310
|
||||
cp -R ./ $out/share/doc/python310/pdf-a4
|
||||
'';
|
||||
meta = {
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
# This file was generated and will be overwritten by ./generate.sh
|
||||
|
||||
{ stdenv, fetchurl, lib }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "python310-docs-pdf-letter";
|
||||
version = "3.10.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.python.org/ftp/python/doc/3.10.7/python-3.10.7-docs-pdf-letter.tar.bz2;
|
||||
sha256 = "0hzq5n6absqsh21jp6j5iaim9a1wq69d8lc2assldzb2zg4i75hr";
|
||||
};
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/doc/python310
|
||||
cp -R ./ $out/share/doc/python310/pdf-letter
|
||||
'';
|
||||
meta = {
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
# This file was generated and will be overwritten by ./generate.sh
|
||||
|
||||
{ stdenv, fetchurl, lib }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "python310-docs-texinfo";
|
||||
version = "3.10.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.python.org/ftp/python/doc/3.10.7/python-3.10.7-docs-texinfo.tar.bz2;
|
||||
sha256 = "0p0fifi84ijz4ng6krw7c1x965jhgysprkijblmlnax7x9rmqrdf";
|
||||
};
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/info
|
||||
cp ./python.info $out/share/info
|
||||
'';
|
||||
meta = {
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
# This file was generated and will be overwritten by ./generate.sh
|
||||
|
||||
{ stdenv, fetchurl, lib }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "python310-docs-text";
|
||||
version = "3.10.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.python.org/ftp/python/doc/3.10.7/python-3.10.7-docs-text.tar.bz2;
|
||||
sha256 = "1zbmm2fvdjnl214y41yffyqw3ywfai5r5npc00n1wkfxsdp7gcc3";
|
||||
};
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/doc/python310
|
||||
cp -R ./ $out/share/doc/python310/text
|
||||
'';
|
||||
meta = {
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
@ -7,7 +7,7 @@ pythonDocs = {
|
|||
python27 = import ./2.7-html.nix {
|
||||
inherit stdenv fetchurl lib;
|
||||
};
|
||||
python37 = import ./3.7-html.nix {
|
||||
python310 = import ./3.10-html.nix {
|
||||
inherit stdenv fetchurl lib;
|
||||
};
|
||||
};
|
||||
|
|
@ -16,7 +16,7 @@ pythonDocs = {
|
|||
python27 = import ./2.7-pdf-a4.nix {
|
||||
inherit stdenv fetchurl lib;
|
||||
};
|
||||
python37 = import ./3.7-pdf-a4.nix {
|
||||
python310 = import ./3.10-pdf-a4.nix {
|
||||
inherit stdenv fetchurl lib;
|
||||
};
|
||||
};
|
||||
|
|
@ -25,7 +25,7 @@ pythonDocs = {
|
|||
python27 = import ./2.7-pdf-letter.nix {
|
||||
inherit stdenv fetchurl lib;
|
||||
};
|
||||
python37 = import ./3.7-pdf-letter.nix {
|
||||
python310 = import ./3.10-pdf-letter.nix {
|
||||
inherit stdenv fetchurl lib;
|
||||
};
|
||||
};
|
||||
|
|
@ -34,7 +34,13 @@ pythonDocs = {
|
|||
python27 = import ./2.7-text.nix {
|
||||
inherit stdenv fetchurl lib;
|
||||
};
|
||||
python37 = import ./3.7-text.nix {
|
||||
python310 = import ./3.10-text.nix {
|
||||
inherit stdenv fetchurl lib;
|
||||
};
|
||||
};
|
||||
texinfo = {
|
||||
recurseForDerivations = true;
|
||||
python310 = import ./3.10-texinfo.nix {
|
||||
inherit stdenv fetchurl lib;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,8 +1,10 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
TYPES="html pdf-a4 pdf-letter text"
|
||||
URL=http://docs.python.org/ftp/python/doc/VERSION/python-VERSION-docs-TYPE.tar.bz2
|
||||
VERSIONS=$(for major in 2 3; do curl https://docs.python.org/$major/archives/ 2>/dev/null | perl -l -n -e'/<a href="python-([23].[0-9].[0-9]+)-docs-html.tar.bz2/ && print $1' | tail -n 1; done)
|
||||
cd -- "$(dirname -- "${BASH_SOURCE[0]}")"
|
||||
|
||||
TYPES="html pdf-a4 pdf-letter text texinfo"
|
||||
URL=http://www.python.org/ftp/python/doc/VERSION/python-VERSION-docs-TYPE.tar.bz2
|
||||
VERSIONS=$(for major in 2 3; do curl https://docs.python.org/$major/archives/ 2>/dev/null | perl -l -n -e'/<a href="python-([23].[0-9]+.[0-9]+)-docs-html.tar.bz2/ && print $1' | tail -n 1; done)
|
||||
echo "Generating expressions for:
|
||||
${VERSIONS}
|
||||
"
|
||||
|
|
@ -24,6 +26,15 @@ EOF
|
|||
for version in $VERSIONS; do
|
||||
major=$(echo -n ${version}| cut -d. -f1)
|
||||
minor=$(echo -n ${version}| cut -d. -f2)
|
||||
if [ "${type}" = "texinfo" ]; then
|
||||
if [ "${major}" = "2" ]; then
|
||||
# Python 2 doesn't have pregenerated texinfos available
|
||||
continue
|
||||
fi
|
||||
template=template-info.nix
|
||||
else
|
||||
template=template.nix
|
||||
fi
|
||||
outfile=${major}.${minor}-${type}.nix
|
||||
hash=
|
||||
if [ -e ${outfile} ]; then
|
||||
|
|
@ -36,12 +47,13 @@ EOF
|
|||
url=$(echo -n $URL |sed -e "s,VERSION,${version},g" -e "s,TYPE,${type},")
|
||||
sha=$(nix-prefetch-url ${url} ${hash})
|
||||
|
||||
|
||||
sed -e "s,VERSION,${version}," \
|
||||
-e "s,MAJOR,${major}," \
|
||||
-e "s,MINOR,${minor}," \
|
||||
-e "s,TYPE,${type}," \
|
||||
-e "s,URL,${url}," \
|
||||
-e "s,SHA,${sha}," < template.nix > ${outfile}
|
||||
-e "s,SHA,${sha}," < ${template} > ${outfile}
|
||||
|
||||
attrname=python${major}${minor}
|
||||
cat >>default.nix <<EOF
|
||||
|
|
|
|||
|
|
@ -0,0 +1,20 @@
|
|||
# This file was generated and will be overwritten by ./generate.sh
|
||||
|
||||
{ stdenv, fetchurl, lib }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "pythonMAJORMINOR-docs-TYPE";
|
||||
version = "VERSION";
|
||||
|
||||
src = fetchurl {
|
||||
url = URL;
|
||||
sha256 = "SHA";
|
||||
};
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/info
|
||||
cp ./python.info $out/share/info
|
||||
'';
|
||||
meta = {
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
@ -3,7 +3,9 @@
|
|||
{ stdenv, fetchurl, lib }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "pythonMAJORMINOR-docs-TYPE-VERSION";
|
||||
pname = "pythonMAJORMINOR-docs-TYPE";
|
||||
version = "VERSION";
|
||||
|
||||
src = fetchurl {
|
||||
url = URL;
|
||||
sha256 = "SHA";
|
||||
|
|
|
|||
|
|
@ -4,9 +4,6 @@
|
|||
, makeSetupHook
|
||||
, disabledIf
|
||||
, isPy3k
|
||||
, ensureNewerSourcesForZipFilesHook
|
||||
, findutils
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -107,7 +104,7 @@ in rec {
|
|||
};
|
||||
} ./python-imports-check-hook.sh) {};
|
||||
|
||||
pythonNamespacesHook = callPackage ({}:
|
||||
pythonNamespacesHook = callPackage ({ findutils }:
|
||||
makeSetupHook {
|
||||
name = "python-namespaces-hook.sh";
|
||||
substitutions = {
|
||||
|
|
@ -173,7 +170,7 @@ in rec {
|
|||
};
|
||||
} ./unittest-check-hook.sh) {};
|
||||
|
||||
venvShellHook = disabledIf (!isPy3k) (callPackage ({ }:
|
||||
venvShellHook = disabledIf (!isPy3k) (callPackage ({ ensureNewerSourcesForZipFilesHook }:
|
||||
makeSetupHook {
|
||||
name = "venv-shell-hook";
|
||||
deps = [ ensureNewerSourcesForZipFilesHook ];
|
||||
|
|
@ -188,7 +185,7 @@ in rec {
|
|||
deps = [ wheel ];
|
||||
} ./wheel-unpack-hook.sh) {};
|
||||
|
||||
sphinxHook = callPackage ({ sphinx }:
|
||||
sphinxHook = callPackage ({ sphinx, installShellFiles }:
|
||||
makeSetupHook {
|
||||
name = "python${python.pythonVersion}-sphinx-hook";
|
||||
deps = [ sphinx installShellFiles ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "argparse";
|
||||
version = "2.6";
|
||||
version = "2.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "p-ranav";
|
||||
repo = "argparse";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-imLDuVbzkiE5hcQVarZGeNzNZE0/8LHMQqAiUYzPVks=";
|
||||
sha256 = "sha256-vbf4kePi5gfg9ub4aP1cCK1jtiA65bUS9+5Ghgvxt/E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,31 +0,0 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, libusb1 }:
|
||||
|
||||
# TODO: add VXI development files, for VXI-11 (TCPIP) support
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "librevisa";
|
||||
version = "0.0.20130412";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.librevisa.org/download/${pname}-${version}.tar.gz";
|
||||
sha256 = "0bjzq23s3xzw0l9qx4l8achrx5id8xdd6r52lvdl4a28dxzbcfhq";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libusb1 ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Implementation of the VISA standard (for instrument control)";
|
||||
longDescription = ''
|
||||
LibreVISA aims to be a compliant implementation of the VISA standard in a
|
||||
free software library.
|
||||
|
||||
We currently support targets connected via USB, exposing the USBTMC
|
||||
interface, and VXI-11 devices.
|
||||
'';
|
||||
homepage = "http://www.librevisa.org/";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = [ maintainers.bjornfor ];
|
||||
};
|
||||
}
|
||||
|
|
@ -45,5 +45,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/Tencent/ncnn";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ tilcreator ];
|
||||
broken = true; # at 2022-11-23
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,20 +40,20 @@ assert blas.implementation == "openblas" && lapack.implementation == "openblas";
|
|||
assert enablePython -> pythonPackages != null;
|
||||
|
||||
let
|
||||
version = "3.4.15";
|
||||
version = "3.4.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opencv";
|
||||
repo = "opencv";
|
||||
rev = version;
|
||||
hash = "sha256-dLwQM2VhVlBV4xazS2rItTscKYeeNlNT0G8G1A1mOmc=";
|
||||
hash = "sha256-PgwAZNoPknFT0jCLt3TCzend6OYFY3iUIzDf/FptAYA=";
|
||||
};
|
||||
|
||||
contribSrc = fetchFromGitHub {
|
||||
owner = "opencv";
|
||||
repo = "opencv_contrib";
|
||||
rev = version;
|
||||
hash = "sha256-FJDRMmSOT5jA+n2Ke0gEH7n5rgGvB1UzYpYZ1vmucjg=";
|
||||
hash = "sha256-TEF/GHglOmsshlC6q4iw14ZMpvA0SaKwlidomAN+sRc=";
|
||||
};
|
||||
|
||||
# Contrib must be built in order to enable Tesseract support:
|
||||
|
|
@ -155,11 +155,6 @@ stdenv.mkDerivation {
|
|||
# Ensures that we use the system OpenEXR rather than the vendored copy of the source included with OpenCV.
|
||||
patches = [
|
||||
./cmake-don-t-use-OpenCVFindOpenEXR.patch
|
||||
# Fix usage of deprecated version of protobuf' SetTotalBytesLimit. Remove with the next release.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/opencv/opencv/commit/384875f4fcf1782b10699a379aa245a03cb27a04.patch";
|
||||
sha256 = "1agwd0pm07m2dy8a62vmfl4n73dsmsdll2a73q6kara9wm3jlp41";
|
||||
})
|
||||
];
|
||||
|
||||
# This prevents cmake from using libraries in impure paths (which
|
||||
|
|
|
|||
|
|
@ -76,20 +76,20 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "4.5.4";
|
||||
version = "4.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opencv";
|
||||
repo = "opencv";
|
||||
rev = version;
|
||||
sha256 = "sha256-eIESkc/yYiZZ5iY4t/rAPd+jfjuMYR3srCBC4fO3g70=";
|
||||
sha256 = "sha256-zPkMc6xEDZU5TlBH3LAzvB17XgocSPeHVMG/U6kfpxg=";
|
||||
};
|
||||
|
||||
contribSrc = fetchFromGitHub {
|
||||
owner = "opencv";
|
||||
repo = "opencv_contrib";
|
||||
rev = version;
|
||||
sha256 = "sha256-RkCIGukZ8KJkmVZQAZTWdVcVKD2I3NcfGShcqzKhQD0=";
|
||||
sha256 = "sha256-hjRqT7V4Sz7t4IEy89F5M+b0x2ObBbqF8GWLKhWFXtE=";
|
||||
};
|
||||
|
||||
# Contrib must be built in order to enable Tesseract support:
|
||||
|
|
@ -177,7 +177,7 @@ let
|
|||
dst = ".cache/ade";
|
||||
};
|
||||
|
||||
# See opencv/modules/wechat_qrcode/CMakeLists.txt
|
||||
# See opencv_contrib/modules/wechat_qrcode/CMakeLists.txt
|
||||
wechat_qrcode = {
|
||||
src = fetchFromGitHub {
|
||||
owner = "opencv";
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake
|
||||
index 23a6ca6959..27e121943a 100644
|
||||
index 00886cc131..e412771322 100644
|
||||
--- a/cmake/OpenCVFindLibsGrfmt.cmake
|
||||
+++ b/cmake/OpenCVFindLibsGrfmt.cmake
|
||||
@@ -255,21 +255,12 @@ endif()
|
||||
@@ -257,23 +257,12 @@ endif()
|
||||
# --- OpenEXR (optional) ---
|
||||
if(WITH_OPENEXR)
|
||||
ocv_clear_vars(HAVE_OPENEXR)
|
||||
|
|
@ -20,7 +20,9 @@ index 23a6ca6959..27e121943a 100644
|
|||
- set(OPENEXR_LIBRARIES IlmImf)
|
||||
- add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/openexr")
|
||||
- if(OPENEXR_VERSION) # check via TARGET doesn't work
|
||||
- set(BUILD_OPENEXR ON)
|
||||
- set(HAVE_OPENEXR YES)
|
||||
- set(BUILD_OPENEXR ON)
|
||||
- endif()
|
||||
+ set(OPENEXR_INCLUDE_PATHS ${OPENEXR_INCLUDE_DIRS})
|
||||
+ set(OPENEXR_LIBRARIES ${OPENEXR_LIBRARIES})
|
||||
|
|
|
|||
|
|
@ -130,7 +130,8 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://docs.openvinotoolkit.org/";
|
||||
license = with licenses; [ asl20 ];
|
||||
platforms = platforms.all;
|
||||
broken = stdenv.isDarwin; # Cannot find macos sdk
|
||||
broken = (stdenv.isLinux && stdenv.isx86_64) # at 2022-09-23
|
||||
|| stdenv.isDarwin; # Cannot find macos sdk
|
||||
maintainers = with maintainers; [ tfmoraes ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
buildPecl {
|
||||
pname = "apcu";
|
||||
|
||||
version = "5.1.21";
|
||||
sha256 = "sha256-EDNTBEhpbufK3shQUPbfUTX7EzAHLvKnRWk5Ks/s+8E=";
|
||||
version = "5.1.22";
|
||||
sha256 = "sha256-AQoNj9ES4e16UqNWGR2jaWprdjGUI/ew396u6vy0Gh4=";
|
||||
|
||||
buildInputs = [ pcre2 ];
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ mkDerivation, fetchurl, makeWrapper, unzip, lib, php }:
|
||||
let
|
||||
pname = "composer";
|
||||
version = "2.4.1";
|
||||
version = "2.4.2";
|
||||
in
|
||||
mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://getcomposer.org/download/${version}/composer.phar";
|
||||
sha256 = "sha256-6oz2MI7Hb/lkXDgYhBp1iAlrncJ2c0X71L1JLdim3KY=";
|
||||
sha256 = "sha256-j+mKAQUMksxoErjq071bbgvNxXXOepOyQr3kl6MddzI=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
buildPecl {
|
||||
pname = "mailparse";
|
||||
|
||||
version = "3.1.3";
|
||||
sha256 = "sha256-hlnKYtyaTX0V8H+XoOIULLWCUcjncs02Zp7HQNIpJHE=";
|
||||
version = "3.1.4";
|
||||
sha256 = "sha256-FHSSGzLH7vglFE4r4ZsenUdQWtQJcpgz/VDCXqzflXc=";
|
||||
|
||||
internalDeps = [ php.extensions.mbstring ];
|
||||
postConfigure = ''
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@
|
|||
buildPecl {
|
||||
pname = "mongodb";
|
||||
|
||||
version = "1.14.0";
|
||||
sha256 = "sha256-VXdeaSB6f5xDxiiDIg87xgDT4/Zjr1AAC+cK0+5RgY4=";
|
||||
version = "1.14.1";
|
||||
sha256 = "sha256-uuKodv3ME9bNATn7Wyrv1RydXISmpPxTvr2+PxYtg14=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ mkDerivation, fetchurl, makeWrapper, lib, php }:
|
||||
let
|
||||
pname = "phpstan";
|
||||
version = "1.8.3";
|
||||
version = "1.8.5";
|
||||
in
|
||||
mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar";
|
||||
sha256 = "sha256-hKpwTpeEYKDvkkmwU7olW+a1pWiQTPDlN7Wy1IDk4UY=";
|
||||
sha256 = "sha256-4OScF/hdzWA4kT7YZ/ltZdkmUO42YaTTtTfbl9iRr1I=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
buildPecl {
|
||||
pname = "protobuf";
|
||||
|
||||
version = "3.21.5";
|
||||
sha256 = "sha256-B8ytFyUJ8fLBwHmaKXxfOy0h6tRELjqc5IxUUl/YU5w=";
|
||||
version = "3.21.6";
|
||||
sha256 = "sha256-vyJbWsY/adrMK2PLdu+Zm1paopY+5qct2Y2AS2a70gg=";
|
||||
|
||||
buildInputs = [ pcre2 ];
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioairq";
|
||||
version = "0.1.1";
|
||||
version = "0.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -16,8 +16,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "CorantGmbH";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-BvesFiXiVlgfaffWfNcP1K9XUOL2qU8F/sdvRKNcuS4=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-qPpa6eo33IPCHSv3LFQXpRzomfrbAMqHlRi+IdoxHEc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioaladdinconnect";
|
||||
version = "0.1.45";
|
||||
version = "0.1.46";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "AIOAladdinConnect";
|
||||
inherit version;
|
||||
hash = "sha256-Fc34DPhN27wzEGSkRSpynqi9EGw1r3Iwp5rtT4eMMBI=";
|
||||
hash = "sha256-tSPoumEWdlzyxHhyXd7jD58pdJzfw1CCJM1MYBAdxOk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bibtexparser";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "sciunto-org";
|
||||
repo = "python-${pname}";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Z+opmknmgyFwvKJyvrv3MMpo23etZCn4bxGTpG5d/dY=";
|
||||
hash = "sha256-dP3ETzgVPI4NsxFI6Hv+nUInrjF+I1FwdqmeAetzL38=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@
|
|||
, uvloop
|
||||
}:
|
||||
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "black";
|
||||
version = "22.8.0";
|
||||
|
|
@ -37,7 +36,7 @@ buildPythonPackage rec {
|
|||
# Black starts a local server and needs to bind a local address.
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
checkInputs = [ pytestCheckHook parameterized ];
|
||||
checkInputs = [ pytestCheckHook parameterized aiohttp ];
|
||||
|
||||
preCheck = ''
|
||||
export PATH="$PATH:$out/bin"
|
||||
|
|
@ -64,18 +63,20 @@ buildPythonPackage rec {
|
|||
doCheck = !(stdenv.isLinux && stdenv.isAarch64);
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
aiohttp-cors
|
||||
click
|
||||
colorama
|
||||
mypy-extensions
|
||||
pathspec
|
||||
platformdirs
|
||||
tomli
|
||||
uvloop
|
||||
] ++ lib.optional (pythonOlder "3.8") typed-ast
|
||||
++ lib.optional (pythonOlder "3.10") typing-extensions;
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
d = [ aiohttp aiohttp-cors ];
|
||||
colorama = [ colorama ];
|
||||
uvloop = [ uvloop ];
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "The uncompromising Python code formatter";
|
||||
homepage = "https://github.com/psf/black";
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "coinmetrics-api-client";
|
||||
version = "2022.8.29.6";
|
||||
version = "2022.9.22.15";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-EPPRKOdFbLLYw0K5C4nojR8GueekoFW7xIlwKeSV1EY=";
|
||||
hash = "sha256-37tuZDsGQAmbWSEGc7rjrXtCoSxuBN3MDMmjWHr0eS4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dash";
|
||||
version = "2.6.1";
|
||||
version = "2.6.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
|||
owner = "plotly";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-7RFRaGtgNULcPr9YYZsiVV3jSjyAamo8B2fwyqFKpis=";
|
||||
hash = "sha256-d2p3ahOqBA4n8XhMR6juluEGNM5EyT+GQFlDcuHZMqs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, python, numpy, matplotlib, nose }:
|
||||
{ lib, buildPythonPackage, fetchPypi, numpy, matplotlib, nose }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "deap";
|
||||
|
|
@ -9,16 +9,8 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-h3LxsP/wQtXlFrCuusLHBiQwRap9DejguGWPOAGBzzE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/use_2to3=True/d' setup.py
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ numpy matplotlib ];
|
||||
|
||||
preBuild = ''
|
||||
2to3 -wn deap
|
||||
'';
|
||||
|
||||
checkInputs = [ nose ];
|
||||
checkPhase = ''
|
||||
nosetests --verbosity=3
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "flake8-bugbear";
|
||||
version = "22.9.11";
|
||||
version = "22.9.23";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "PyCQA";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-f95mwHjWoCRjAc8djrHm57q32hyp8Ukg7d2hSNlLvXs=";
|
||||
hash = "sha256-LI8NnAB87Iel5aTVb2BIwHUB6KVtHzLvu+pJnFI3nw0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -21,11 +21,11 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [
|
||||
pygobject3
|
||||
gtk3
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
gtk3
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-pubsub";
|
||||
version = "2.13.6";
|
||||
version = "2.13.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-1ksbqghjKwh0IvL3SsNcwVrQtJJ82ZHJDp/u35sorSg=";
|
||||
hash = "sha256-ZQofVdFmK0Rs9w7tdX7op1IFglK0BH2vhjjdvnUE0yY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "govee-ble";
|
||||
version = "0.17.2";
|
||||
version = "0.17.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -20,8 +20,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Kj1RCDQiDAt01yjoRVPdpi2dlF8V1rwnx+n7WGTRdQ0=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-0tUTqSxpOYhdrXbe0/Rqr9HkQ8kJKJFK6GHLX6740hc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -18,13 +18,13 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.5.26";
|
||||
version = "1.5.27";
|
||||
pname = "pyglet";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-7oxeC1uH34QYjiDlUpguuo2gCUS0xVYPHP3VyXFNGbA=";
|
||||
sha256 = "sha256-TQDgZ0UfOxD9UbaXZP3atlRENyoto0TuKzXwqObr8AU=";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-kfhoOLnKbA9jH4DUtQw0nATjK21pMNxyAOzYDLQkR4U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gobject-introspection gtk3 ];
|
||||
propagatedBuildInputs = [ pyenchant pygobject3 ];
|
||||
nativeBuildInputs = [ gobject-introspection ];
|
||||
propagatedBuildInputs = [ pyenchant pygobject3 gtk3 ];
|
||||
|
||||
doCheck = false; # there are no tests
|
||||
pythonImportsCheck = [ "gtkspellcheck" ];
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pykeyatome";
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "jugla";
|
||||
repo = "pyKeyAtome";
|
||||
rev = "refs/tags/V${version}";
|
||||
sha256 = "sha256-rmiZ687h8imJXxyepDZor9JyjT2jbg1Lsd5oUtsQtro=";
|
||||
sha256 = "sha256-DUnER/Vom5Yc3syx4kPP1WbI7FpC+XGK9X4c1RrJJFk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, flit-core
|
||||
, matplotlib
|
||||
, pytestCheckHook
|
||||
, numpy
|
||||
|
|
@ -12,16 +13,20 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "seaborn";
|
||||
version = "0.11.2";
|
||||
format = "setuptools";
|
||||
version = "0.12.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "cf45e9286d40826864be0e3c066f98536982baf701a7caa386511792d61ff4f6";
|
||||
src = fetchFromGitHub {
|
||||
repo = "seaborn";
|
||||
owner = "mwaskom";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rJQRsUYFF0LoksE+q+CbxAxdI/Pi9k1qWR2G3PD1MkI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ flit-core ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
matplotlib
|
||||
numpy
|
||||
|
|
@ -51,7 +56,7 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Statisitical data visualization";
|
||||
description = "Statistical data visualization";
|
||||
homepage = "https://seaborn.pydata.org/";
|
||||
license = with licenses; [ bsd3 ];
|
||||
maintainers = with maintainers; [ fridh ];
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinx-jupyterbook-latex";
|
||||
version = "0.4.6";
|
||||
version = "0.5.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "sphinx_jupyterbook_latex";
|
||||
sha256 = "8ff3775b11ab4798e6e8ec983601d7aea4c3b8e8b5d28ca758578ede3a791334";
|
||||
sha256 = "sha256-XEYsrMcg85loIYvD3ikfgGXGeox0q03H/0wRgTaz+SI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "vt-py";
|
||||
version = "0.15.0";
|
||||
version = "0.16.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -18,8 +18,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "VirusTotal";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-T0QvYVh5VRxpRdFWsnYpYdAypRc3yYwsXdsOiykRj0s=";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-Z2rTZCPquyNA+81FCJV1f8p2YvOdSLZFGzPGplzmESc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "actionlint";
|
||||
version = "1.6.18";
|
||||
version = "1.6.19";
|
||||
|
||||
subPackages = [ "cmd/actionlint" ];
|
||||
|
||||
|
|
@ -18,10 +18,10 @@ buildGoModule rec {
|
|||
owner = "rhysd";
|
||||
repo = "actionlint";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tRR7Pjxo4UdKklTMFDRW6Xi81IhH+NV3BbgWpgFd1zY=";
|
||||
sha256 = "sha256-sWsn5jX4kQbK9rOW5FC94mdBwXNAR2a48XFHe37eK6U=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-icl6z41Y5H47U3EgFHL9/xJrfdk43ZfAPbWkKM73sa0=";
|
||||
vendorSha256 = "sha256-vWU3tEC+ZlrrTnX3fbuEuZRoSg1KtfpgpXmK4+HWrNY=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ronn installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gokart";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "praetorian-inc";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-oxYlwc3FatYyaICQFZJtkH9/7zYfT2gI+R5BU7CQVkg=";
|
||||
sha256 = "sha256-G1IjlJ/rmviFWy6RFfLtP+bhfYcDuB97leimU39YCoQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-lgKYVgJlmUJ/msdIqG7EKAZuISie1lG7+VeCF/rcSlE=";
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@
|
|||
, libftdi1
|
||||
, check
|
||||
, libserialport
|
||||
, librevisa
|
||||
, doxygen
|
||||
, glibmm
|
||||
, python
|
||||
|
|
@ -31,7 +30,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ doxygen pkg-config python ];
|
||||
buildInputs = [
|
||||
libzip glib libusb1 libftdi1 check libserialport librevisa glibmm hidapi
|
||||
libzip glib libusb1 libftdi1 check libserialport glibmm hidapi
|
||||
] ++ lib.optionals stdenv.isLinux [ libieee1284 bluez ];
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "terraformer";
|
||||
version = "0.8.21";
|
||||
version = "0.8.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleCloudPlatform";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-IcxXR+EQItfUtUfBOlRi8VvxZ3y4OE8mdbch5KqG+wg=";
|
||||
sha256 = "sha256-TuzQ9qIpioKK4tc1J9Spxt52716Z3yTEufyaRDL57gI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-zek9c5y6HEvY0eFdv78RDS8+Q2/++34VHRJsIONse6c=";
|
||||
vendorSha256 = "sha256-fcCvwjqSTeFo0AwTVwWTdygvIPf0EUnZkWqNrQ6eugI=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
, patchelf
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, makeWrapper
|
||||
, makeBinaryWrapper
|
||||
, pkg-config
|
||||
, openssl
|
||||
, curl
|
||||
|
|
@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoSha256 = "sha256-FDVZn2PjqxovQmmandJICkidurhoXCAxo3bibuxQSMY=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper pkg-config ];
|
||||
nativeBuildInputs = [ makeBinaryWrapper pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
(curl.override { inherit openssl; })
|
||||
|
|
|
|||
|
|
@ -1,40 +1,21 @@
|
|||
{ stdenvNoCC, callPackage, fetchurl, autoPatchelfHook, unzip, openssl, lib }:
|
||||
let
|
||||
dists = {
|
||||
aarch64-darwin = {
|
||||
arch = "aarch64";
|
||||
shortName = "darwin";
|
||||
sha256 = "sha256-R17Ga4C6PSxfL1bz6IBjx0dYFmX93i0y8uqxG1eZKd4=";
|
||||
};
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, callPackage
|
||||
, fetchurl
|
||||
, autoPatchelfHook
|
||||
, unzip
|
||||
, openssl
|
||||
, writeShellScript
|
||||
, curl
|
||||
, jq
|
||||
, common-updater-scripts
|
||||
}:
|
||||
|
||||
aarch64-linux = {
|
||||
arch = "aarch64";
|
||||
shortName = "linux";
|
||||
sha256 = "sha256-KSC4gdsJZJoPjMEs+VigVuqlUDhg4sL054WRlAbB+eA=";
|
||||
};
|
||||
|
||||
x86_64-darwin = {
|
||||
arch = "x64";
|
||||
shortName = "darwin";
|
||||
sha256 = "sha256-CVqFPvZScNTudE2wgUctwGDgTyaMeN8dUNmLatcKo5M=";
|
||||
};
|
||||
|
||||
x86_64-linux = {
|
||||
arch = "x64";
|
||||
shortName = "linux";
|
||||
sha256 = "sha256-N3hGPyp9wvb7jjpaFLJcdNIRyLvegjAe+MiV2aMS1nE=";
|
||||
};
|
||||
};
|
||||
dist = dists.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
|
||||
in
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
version = "0.1.11";
|
||||
version = "0.1.13";
|
||||
pname = "bun";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Jarred-Sumner/bun-releases-for-updater/releases/download/bun-v${version}/bun-${dist.shortName}-${dist.arch}.zip";
|
||||
sha256 = dist.sha256;
|
||||
};
|
||||
src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ unzip ] ++ lib.optionals stdenvNoCC.isLinux [ autoPatchelfHook ];
|
||||
|
|
@ -48,7 +29,39 @@ stdenvNoCC.mkDerivation rec {
|
|||
install -Dm 755 ./bun $out/bin/bun
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
sources = {
|
||||
"aarch64-darwin" = fetchurl {
|
||||
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip";
|
||||
sha256 = "RYTRcc8xccRmxuKOXwX3bBWJSXLI2/XfH4/7ZdcUBdE=";
|
||||
};
|
||||
"aarch64-linux" = fetchurl {
|
||||
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip";
|
||||
sha256 = "LixLrzSsgbXyfpFKiksM4zNS5iDU3tXOrr7fP8yJknM=";
|
||||
};
|
||||
"x86_64-darwin" = fetchurl {
|
||||
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip";
|
||||
sha256 = "SGZcT2uVy6egr99FzyaykUWLuZBqDsvbCM/lsgy//g0=";
|
||||
};
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip";
|
||||
sha256 = "ssZtJi+CEVn7MjPMqFkwv1lnwE7a7ttkmiuoT0Y6wao=";
|
||||
};
|
||||
};
|
||||
updateScript = writeShellScript "update-bun" ''
|
||||
set -o errexit
|
||||
export PATH="${lib.makeBinPath [ curl jq common-updater-scripts ]}"
|
||||
NEW_VERSION=$(curl --silent https://api.github.com/repos/oven-sh/bun/releases/latest | jq '.tag_name | ltrimstr("bun-v")' --raw-output)
|
||||
if [[ "${version}" = "$NEW_VERSION" ]]; then
|
||||
echo "The new version same as the old version."
|
||||
exit 0
|
||||
fi
|
||||
for platform in ${lib.escapeShellArgs meta.platforms}; do
|
||||
update-source-version "bun" "0" "${lib.fakeSha256}" --source-key="sources.$platform"
|
||||
update-source-version "bun" "$NEW_VERSION" --source-key="sources.$platform"
|
||||
done
|
||||
'';
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://bun.sh";
|
||||
changelog = "https://github.com/Jarred-Sumner/bun/releases/tag/bun-v${version}";
|
||||
|
|
@ -62,6 +75,6 @@ stdenvNoCC.mkDerivation rec {
|
|||
lgpl21Only # javascriptcore and webkit
|
||||
];
|
||||
maintainers = with maintainers; [ DAlperin jk ];
|
||||
platforms = builtins.attrNames dists;
|
||||
platforms = builtins.attrNames passthru.sources;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,15 +17,15 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "deno";
|
||||
version = "1.25.3";
|
||||
version = "1.25.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "denoland";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-bKZ9/3f9YN24hV+U3d4PDKHMvNyD72qJpfqfAmgO0dk=";
|
||||
sha256 = "sha256-vApSmYP9s8AD9WQVPmillXkFbl8WNJNGmfJcK4Cf3vE=";
|
||||
};
|
||||
cargoSha256 = "sha256-Y/19wrY26rDuA6Pwlr2gjl1JupaJwaOhY0msq6nIyYc=";
|
||||
cargoSha256 = "sha256-d0x11/YJUzfig8aJH7Ax4Gl6nzcSO9oV84J1nw6GIRE=";
|
||||
|
||||
postPatch = ''
|
||||
# upstream uses lld on aarch64-darwin for faster builds
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@ let
|
|||
};
|
||||
in
|
||||
fetch_librusty_v8 {
|
||||
version = "0.49.0";
|
||||
version = "0.51.0";
|
||||
shas = {
|
||||
x86_64-linux = "sha256-l6+NdMzYI9r2aHU7/OUhbgmc/LmAZjEFL8y8GrJ+EX8=";
|
||||
aarch64-linux = "sha256-uo+/Wsrlkm+xotoIr8xlQWoiWzMz02TKFW+olfXtpz8=";
|
||||
x86_64-darwin = "sha256-gWxljTgt6aXUzwex2zu46B9YzTvhN0Pi9C1Ll1eiohg=";
|
||||
aarch64-darwin = "sha256-/UnBIQ/wA/0biIG9vIDKylhqFJ8QCoqjKH7xiePZ/eg=";
|
||||
x86_64-linux = "sha256-M6GrAHidz9OPVrNgqxoEmvRgbNMyWKV8xpSTMGvW6kI=";
|
||||
aarch64-linux = "sha256-gDC03Lku+biQGxa4vCOqhrGs7Js6BPbJFtqPDNxrpsQ=";
|
||||
x86_64-darwin = "sha256-uK6ytoRu1lHtqMiertICcaS3KN11iHhQmmIMhD2tCc0=";
|
||||
aarch64-darwin = "sha256-rNuQg78GsyErmcDOMn4PLIR1AzSQ6CbfqL7I67MlQQc=";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
100
pkgs/games/ldmud/default.nix
Normal file
100
pkgs/games/ldmud/default.nix
Normal file
|
|
@ -0,0 +1,100 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, bison
|
||||
, libiconv
|
||||
, pcre
|
||||
, libgcrypt
|
||||
, json_c
|
||||
, libxml2
|
||||
, ipv6Support ? false
|
||||
, mccpSupport ? false
|
||||
, zlib
|
||||
, mysqlSupport ? false
|
||||
, libmysqlclient
|
||||
, postgresSupport ? false
|
||||
, postgresql
|
||||
, sqliteSupport ? false
|
||||
, sqlite
|
||||
, tlsSupport ? false
|
||||
, openssl
|
||||
, pythonSupport ? false
|
||||
, python310
|
||||
, ...
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ldmud";
|
||||
version = "3.6.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-2TaFt+T9B5Df6KWRQcbhY1E1D6NISb0oqLgyX47f5lI=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/src";
|
||||
|
||||
nativeBuildInputs =
|
||||
[ autoreconfHook pkg-config bison libgcrypt pcre json_c libxml2 ]
|
||||
++ lib.optional mccpSupport zlib ++ lib.optional mysqlSupport libmysqlclient
|
||||
++ lib.optional postgresSupport postgresql
|
||||
++ lib.optional sqliteSupport sqlite ++ lib.optional tlsSupport openssl
|
||||
++ lib.optional pythonSupport python310;
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
|
||||
|
||||
# To support systems without autoconf LD puts its configure.ac in a non-default
|
||||
# location and uses a helper script. We skip that script and symlink the .ac
|
||||
# file to where the autoreconfHook find it.
|
||||
preAutoreconf = ''
|
||||
ln -fs ./autoconf/configure.ac ./
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--enable-erq=xerq"
|
||||
"--enable-filename-spaces"
|
||||
"--enable-use-json"
|
||||
"--enable-use-xml=xml2"
|
||||
(lib.enableFeature ipv6Support "use-ipv6")
|
||||
(lib.enableFeature mccpSupport "use-mccp")
|
||||
(lib.enableFeature mysqlSupport "use-mysql")
|
||||
(lib.enableFeature postgresSupport "use-pgsql")
|
||||
(lib.enableFeature sqliteSupport "use-sqlite")
|
||||
(lib.enableFeatureAs tlsSupport "use-tls" "ssl")
|
||||
(lib.enableFeature pythonSupport "use-python")
|
||||
];
|
||||
|
||||
preConfigure = lib.optionalString mysqlSupport ''
|
||||
export CPPFLAGS="-I${lib.getDev libmysqlclient}/include/mysql"
|
||||
export LDFLAGS="-L${libmysqlclient}/lib/mysql"
|
||||
'';
|
||||
|
||||
installTargets = [ "install-driver" "install-utils" "install-headers" ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p "$out/share/"
|
||||
cp -v ../COPYRIGHT $out/share/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A gamedriver for LPMuds including a LPC compiler, interpreter and runtime";
|
||||
homepage = "https://ldmud.eu";
|
||||
changelog = "https://github.com/ldmud/ldmud/blob/${version}/HISTORY";
|
||||
longDescription = ''
|
||||
LDMud started as a project to clean up and modernize Amylaar's LPMud
|
||||
gamedriver. Primary goals are full documentation, a commented source body
|
||||
and out-of-the-box support for the major mudlibs, of which the commented
|
||||
source body has been pretty much completed. During the course of work
|
||||
a lot of bug fixes and improvements found their way into the driver - much
|
||||
more than originally expected, and definitely enough to make LDMud
|
||||
a driver in its own right.
|
||||
'';
|
||||
# See https://github.com/ldmud/ldmud/blob/master/COPYRIGHT
|
||||
license = licenses.unfreeRedistributable;
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
maintainers = with maintainers; [ cpu ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
and out-of-tree mod packages (mod.nix).
|
||||
*/
|
||||
{ lib, makeSetupHook, curl, unzip, dos2unix, pkg-config, makeWrapper
|
||||
, lua, mono, dotnetPackages, python2
|
||||
, lua, mono, dotnetPackages, python3
|
||||
, libGL, freetype, openal, SDL2
|
||||
, zenity
|
||||
}:
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
with lib;
|
||||
|
||||
let
|
||||
path = makeBinPath ([ mono python2 ] ++ optional (zenity != null) zenity);
|
||||
path = makeBinPath ([ mono python3 ] ++ optional (zenity != null) zenity);
|
||||
rpath = makeLibraryPath [ lua freetype openal SDL2 ];
|
||||
mkdirp = makeSetupHook { } ./mkdirp.sh;
|
||||
|
||||
|
|
@ -66,7 +66,7 @@ in {
|
|||
makeWrapper
|
||||
mkdirp
|
||||
mono
|
||||
python2
|
||||
python3
|
||||
];
|
||||
|
||||
makeFlags = [ "prefix=$(out)" ];
|
||||
|
|
|
|||
|
|
@ -1,66 +1,21 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitLab
|
||||
, regex
|
||||
, service-identity
|
||||
, itsdangerous
|
||||
, requests
|
||||
, redis
|
||||
, channels
|
||||
, channels-redis
|
||||
, psycopg2
|
||||
, gunicorn
|
||||
, django-cors-headers
|
||||
, django-celery-email
|
||||
, advocate
|
||||
, django-storages
|
||||
, pillow
|
||||
, faker
|
||||
, uvicorn
|
||||
, twisted
|
||||
, django
|
||||
, drf-jwt
|
||||
, cryptography
|
||||
, tqdm
|
||||
, celery-redbeat
|
||||
, drf-spectacular
|
||||
, websockets
|
||||
, asgiref
|
||||
, antlr4-python3-runtime
|
||||
, psutil
|
||||
, dj-database-url
|
||||
, django-health-check
|
||||
, celery
|
||||
, unicodecsv
|
||||
, django-celery-beat
|
||||
, django-redis
|
||||
, zipp
|
||||
, boto3
|
||||
, cached-property
|
||||
, importlib-resources
|
||||
, zope_interface
|
||||
, freezegun
|
||||
, pyinstrument
|
||||
, responses
|
||||
, pytestCheckHook
|
||||
, setuptools
|
||||
, pytest-django
|
||||
, python
|
||||
, httpretty
|
||||
, pytest-unordered
|
||||
, openapi-spec-validator }:
|
||||
, makeWrapper
|
||||
, python3
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
baserow_premium = with python.pkgs; ( buildPythonPackage rec {
|
||||
baserow_premium = with python3.pkgs; ( buildPythonPackage rec {
|
||||
pname = "baserow_premium";
|
||||
version = "1.10.2";
|
||||
foramt = "setuptools";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "bramw";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-4BrhTwAxHboXz8sMZL0V68skgNw2D2/YJuiWVNe0p4w=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-4BrhTwAxHboXz8sMZL0V68skgNw2D2/YJuiWVNe0p4w=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/premium/backend";
|
||||
|
|
@ -70,15 +25,16 @@ let
|
|||
|
||||
in
|
||||
|
||||
buildPythonPackage rec {
|
||||
with python3.pkgs; buildPythonPackage rec {
|
||||
pname = "baserow";
|
||||
version = "1.10.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "bramw";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-4BrhTwAxHboXz8sMZL0V68skgNw2D2/YJuiWVNe0p4w=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-4BrhTwAxHboXz8sMZL0V68skgNw2D2/YJuiWVNe0p4w=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/backend";
|
||||
|
|
@ -87,8 +43,11 @@ buildPythonPackage rec {
|
|||
# remove dependency constraints
|
||||
sed 's/[~<>=].*//' -i requirements/base.in requirements/base.txt
|
||||
sed 's/zope-interface/zope.interface/' -i requirements/base.in requirements/base.txt
|
||||
sed 's/\[standard\]//' -i requirements/base.in requirements/base.txt
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
advocate
|
||||
antlr4-python3-runtime
|
||||
|
|
@ -122,8 +81,15 @@ buildPythonPackage rec {
|
|||
twisted
|
||||
unicodecsv
|
||||
uvicorn
|
||||
watchgod
|
||||
zipp
|
||||
];
|
||||
] ++ uvicorn.optional-dependencies.standard;
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/baserow \
|
||||
--prefix PYTHONPATH : "$PYTHONPATH" \
|
||||
--prefix DJANGO_SETTINGS_MODULE : "baserow.config.settings.base"
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
baserow_premium
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "tile38";
|
||||
version = "1.29.0";
|
||||
version = "1.29.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tidwall";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-sb/DKfQ9dmItxKqICVjG5cslpf8lHzLcs5gd6ue/Zn8=";
|
||||
sha256 = "sha256-/C4gCFLeI12ZrNG8ZY0H7mvojm9ekxqs2x0fKl4dgPU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-/7dDPUXutyzkWq6EVVINFKzhuaiBCv5GrAF5pWG3ikc=";
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "metabase";
|
||||
version = "0.44.2";
|
||||
version = "0.44.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.metabase.com/v${version}/metabase.jar";
|
||||
hash = "sha256-I0cShK9/29kIjLtPDGlyysypofFV9Ai4Dbqt4IwTSA8=";
|
||||
hash = "sha256-74/G0SJRvyBiIIsCgh9LlINF6MS5UrCKmnfTKPLIpr0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -3,14 +3,14 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.0.69";
|
||||
version = "2.0.70";
|
||||
pname = "munin";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "munin-monitoring";
|
||||
repo = "munin";
|
||||
rev = version;
|
||||
sha256 = "sha256-p273O5JLFX1dA2caV3lVVL9YNTcGMSrC7DWieUfUmqI=";
|
||||
sha256 = "sha256-fczrCulKs7c9e0vKQ12bEJODr74/uBj77llqCqcPMps=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nfs-ganesha";
|
||||
version = "4.0.7";
|
||||
version = "4.0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nfs-ganesha";
|
||||
repo = "nfs-ganesha";
|
||||
rev = "V${version}";
|
||||
sha256 = "sha256-SI8n3QdjI72QXQsK+LOj4wmmKQGPU+Y1Ysmfo+N+fY0=";
|
||||
sha256 = "sha256-03zrEWwPQi7ED6Yr3HgzQyOtqJjjnUj5nChgGV6v0zk=";
|
||||
};
|
||||
|
||||
preConfigure = "cd src";
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "neo4j";
|
||||
version = "4.4.10";
|
||||
version = "4.4.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz";
|
||||
sha256 = "sha256-hp7Lic42/kV7TUxPyqSP3y8tc5xFMjvSyMzfCaoRq78=";
|
||||
sha256 = "sha256-KIENqsXeSl1bd84tp9fD2kxczxMoi62IW4M8NblhAMg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pgroonga";
|
||||
version = "2.3.8";
|
||||
version = "2.3.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-/xlnwnUMW7JuUcSnZUV4nqCFcrfGDvXToz7IJykHCGI=";
|
||||
sha256 = "sha256-qCS0ndupiRUSI0+BX+o56dgDN9/jPLPdAD16N+gGHqo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "plpgsql_check";
|
||||
version = "2.1.9";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okbob";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-O24iXHNIjtkGs1GfZbEBlIc1bGTbKICdhz8Q/gqS33s=";
|
||||
sha256 = "sha256-0x7alz0EySMcqi4yZm5z6pZeL6glf8AYHG+dVBBtnIU=";
|
||||
};
|
||||
|
||||
buildInputs = [ postgresql ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rum";
|
||||
version = "1.3.12";
|
||||
version = "1.3.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "postgrespro";
|
||||
repo = "rum";
|
||||
rev = version;
|
||||
hash = "sha256-dI3R1L3dXvEt6Ell7HuGc6XqK8YDf0RmN+JLDtv+uYI=";
|
||||
hash = "sha256-yy2xeDnk3fENN+En0st4mv60nZlqPafIzwf68jwJ5fE=";
|
||||
};
|
||||
|
||||
buildInputs = [ postgresql ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "aws-lambda-runtime-interface-emulator";
|
||||
version = "1.3";
|
||||
version = "1.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "aws-lambda-runtime-interface-emulator";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-h4T4Go5gzKF1g1jSNZkx5U0icFxEZMYyS4L6cZMTFEY=";
|
||||
sha256 = "sha256-KpMfgPcBih4pRKwTBExy080HIkx3i0M1EujU4yqj6p8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ncUtJKJnWiut0ZVKm3MLWKq8eyHrTgv6Nva8xcvvqSI=";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cf-terraforming";
|
||||
version = "0.8.6";
|
||||
version = "0.8.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = "cf-terraforming";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mKpNKD5+vJ2rf/TjyZ09Hn/F+xTSFL6wsmOx554oA2c=";
|
||||
sha256 = "sha256-sayhtJxpO03lXEYBf5zNCH0o6DYW2L+hgvCfxgHk2z0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-g8Om1LZEDSpe4L94AjHAuawx9jtWm//rO27jXhvhrQY=";
|
||||
|
|
|
|||
|
|
@ -1,23 +1,25 @@
|
|||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "claws";
|
||||
version = "0.3.2";
|
||||
|
||||
goPackagePath = "github.com/thehowl/${pname}";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = version;
|
||||
owner = "thehowl";
|
||||
repo = pname;
|
||||
sha256 = "0nl7xvdivnabqr98mh3m1pwqznprsaqpagny6zcwwmz480x4pmfz";
|
||||
sha256 = "sha256-3zzUBeYfu9x3vRGX1DionLnAs1e44tFj8Z1dpVwjdCg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-FP+3Rw5IdCahhx9giQrpepMMtF1pWcyjNglrlu9ju0Q=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/thehowl/claws";
|
||||
description = "Interactive command line client for testing websocket servers";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ aaronjheng ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "diffoscope";
|
||||
version = "221";
|
||||
version = "222";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
|
||||
sha256 = "sha256-E4p8uBICWIbplszgP8zdghO7qEI46WCk3eeP71jas9o=";
|
||||
sha256 = "sha256-2TiDHWPwkAXBHnfQ+1h98F+YvqpxcEmmHXt0EWL3MKY=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue