mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-11 04:02:55 +03:00
Merge branch 'master' into staging-next
This commit is contained in:
Weijia Wang
commit
9627659c22
@ -220,7 +220,7 @@ in
|
||||
"catch_workers_output" = true;
|
||||
};
|
||||
phpEnv = {
|
||||
FRESHRSS_DATA_PATH = "${cfg.dataDir}";
|
||||
DATA_PATH = "${cfg.dataDir}";
|
||||
};
|
||||
};
|
||||
};
|
||||
@ -267,7 +267,7 @@ in
|
||||
WorkingDirectory = cfg.package;
|
||||
};
|
||||
environment = {
|
||||
FRESHRSS_DATA_PATH = cfg.dataDir;
|
||||
DATA_PATH = cfg.dataDir;
|
||||
};
|
||||
|
||||
script =
|
||||
@ -302,7 +302,7 @@ in
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
startAt = "*:0/5";
|
||||
environment = {
|
||||
FRESHRSS_DATA_PATH = cfg.dataDir;
|
||||
DATA_PATH = cfg.dataDir;
|
||||
};
|
||||
serviceConfig = defaultServiceConfig //{
|
||||
ExecStart = "${cfg.package}/app/actualize_script.php";
|
||||
|
||||
@ -29,7 +29,7 @@ let
|
||||
libsForQt5 = pkgs.plasma5Packages;
|
||||
inherit (libsForQt5) kdeGear kdeFrameworks plasma5;
|
||||
inherit (lib)
|
||||
getBin optionalString literalExpression
|
||||
getBin optionalAttrs optionalString literalExpression
|
||||
mkRemovedOptionModule mkRenamedOptionModule
|
||||
mkDefault mkIf mkMerge mkOption mkPackageOptionMD types;
|
||||
|
||||
@ -178,7 +178,7 @@ in
|
||||
capabilities = "cap_sys_nice+ep";
|
||||
source = "${getBin plasma5.kwin}/bin/kwin_wayland";
|
||||
};
|
||||
} // mkIf (!cfg.runUsingSystemd) {
|
||||
} // optionalAttrs (!cfg.runUsingSystemd) {
|
||||
start_kdeinit = {
|
||||
setuid = true;
|
||||
owner = "root";
|
||||
|
||||
@ -38,13 +38,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cudatext";
|
||||
version = "1.200.0";
|
||||
version = "1.201.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alexey-T";
|
||||
repo = "CudaText";
|
||||
rev = version;
|
||||
hash = "sha256-0+bjp9JOR06wLzA3CJqtGjCK1M0qPdzoLRt6+fV8tJ0=";
|
||||
hash = "sha256-Do2JPNZtoi7zbUnJomQAZ8zR/WPB6+G051xZWmeUBP4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
10
pkgs/applications/editors/cudatext/deps.json
generated
10
pkgs/applications/editors/cudatext/deps.json
generated
@ -11,13 +11,13 @@
|
||||
},
|
||||
"ATFlatControls": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2023.10.02",
|
||||
"hash": "sha256-9oV8xqkqpCfA7rk4UMxWFBIFQQ9slClFbaENRldFb8Q="
|
||||
"rev": "2023.10.30",
|
||||
"hash": "sha256-fuTQnnuWjIsABx457y+n6luLxQf+b9TiZGLXYjNsUrw="
|
||||
},
|
||||
"ATSynEdit": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2023.10.03",
|
||||
"hash": "sha256-dJYpsvJNwQg6/NeXT23cpWFXwcfIYnWkHYoDItiUeOo="
|
||||
"rev": "2023.10.30",
|
||||
"hash": "sha256-xsJ02zGzi7ByFBXql4lLWWLiPVWwtOLXzixmv4AeC2I="
|
||||
},
|
||||
"ATSynEdit_Cmp": {
|
||||
"owner": "Alexey-T",
|
||||
@ -36,7 +36,7 @@
|
||||
},
|
||||
"Python-for-Lazarus": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2023.06.29",
|
||||
"rev": "2023.06.30",
|
||||
"hash": "sha256-mO8/RNJjy9KtFuDUmV2Y8Ff+Jjm9yRd7GSrI6mOONUc="
|
||||
},
|
||||
"Emmet-Pascal": {
|
||||
|
||||
@ -27,6 +27,12 @@ mkDerivation rec {
|
||||
url = "https://gitlab.archlinux.org/archlinux/packaging/packages/krita/-/raw/acd9a818660e86b14a66fceac295c2bab318c671/exiv2-0.28.patch";
|
||||
hash = "sha256-iD2pyid513ThJVeotUlVDrwYANofnEiZmWINNUm/saw=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "krita-opencolorio-2.3-compat.patch";
|
||||
url = "https://invent.kde.org/graphics/krita/-/commit/520c633c2c868f2236d8e56eefecdcb6e3ebd840.patch";
|
||||
hash = "sha256-eXsgBN8OnKjZOQsOxViPypts6CVh3L+IYKMB/mDUcfQ=";
|
||||
includes = [ "plugins/dockers/lut/ocio_display_filter_vfx2021.cpp" ];
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ];
|
||||
|
||||
@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config";
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "process-compose";
|
||||
version = "0.65.1";
|
||||
version = "0.69.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "F1bonacc1";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wlsZV9yE9486EBbIwVOcA4KBf9tfI0Ao1JSIPjJAcEU=";
|
||||
hash = "sha256-YVNcr8oYEOsy0KLOsPdWTZcXYTqyz4RYG9MCEngLn7c=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
@ -43,7 +43,7 @@ buildGoModule rec {
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
vendorHash = "sha256-Z5vCxzdpd2OmlZ/woHhlLN2QMgqa9mm873QGuqDToiM=";
|
||||
vendorHash = "sha256-lU21nRfIi4/eobnHhX/fCWnWtoiQBiWvTUOjBL0I4X4=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "pyrosimple";
|
||||
version = "2.11.4";
|
||||
version = "2.12.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kannibalox";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-jzLckRFdjivWcyM3NWSVBauT5/7A1jTICtK2j65Wojo=";
|
||||
hash = "sha256-6TDfNkEqtSrPpyExJ/68GAalIo9pSNiIDo7KdqwoulQ=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@ -13,11 +13,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "appflowy";
|
||||
version = "0.3.6";
|
||||
version = "0.3.7";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-${version}-linux-x86_64.tar.gz";
|
||||
hash = "sha256-MH5NLppwe/W5d0duNwyQtUBryqDzfV3u0LqWI40GqLQ=";
|
||||
hash = "sha256-Z2iNYNpf0a3kXBLaJeGVYIW5EGiBuMPdFNK2jSpnmws=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "cloudlog";
|
||||
version = "2.4.11";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "magicbug";
|
||||
repo = "Cloudlog";
|
||||
rev = version;
|
||||
hash = "sha256-w1QCEow0K8uzbHlyASCggw2U+1RXjPbmxd5XRSdp6yE=";
|
||||
hash = "sha256-4+aP+y7TNCq7zGOK3HCrl1NQOmpOHezfbL9B1vW2AUo=";
|
||||
};
|
||||
|
||||
postPath = ''
|
||||
postPatch = ''
|
||||
substituteInPlace index.php \
|
||||
--replace "define('ENVIRONMENT', 'development');" "define('ENVIRONMENT', 'production');"
|
||||
'';
|
||||
|
||||
@ -21,10 +21,10 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gwyddion";
|
||||
version = "2.63";
|
||||
version = "2.64";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gwyddion/gwyddion-${version}.tar.xz";
|
||||
sha256 = "sha256-FSs/Dbnr1shEw/W51DhUFPb61tM+0atc6wxY81EiTdM=";
|
||||
sha256 = "sha256-FDL4XDHH6WYF47OsnhxpM7s7YadutiCDjcJKCF8ZlCw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config file ];
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "UHDM";
|
||||
# When updating this package, also consider updating science/logic/surelog
|
||||
version = "1.76";
|
||||
version = "1.77";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chipsalliance";
|
||||
repo = finalAttrs.pname;
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Q/u5lvILYDT5iScES3CTPIm/B5apoOHXOQmCsZ73NlU=";
|
||||
hash = "sha256-JKhpcPG4hWlcn2C+Wlx7yNIMXXurAMxLSK4xWN2akMQ=";
|
||||
fetchSubmodules = false; # we use all dependencies from nix
|
||||
};
|
||||
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.16.1";
|
||||
version = "1.16.2";
|
||||
|
||||
# build stimuli file for PGO build and the script to generate it
|
||||
# independently of the foot's build, so we can cache the result
|
||||
@ -99,7 +99,7 @@ stdenv.mkDerivation {
|
||||
owner = "dnkl";
|
||||
repo = "foot";
|
||||
rev = version;
|
||||
hash = "sha256-laE4Ytt64ao1vvF05g4l1AkEnKPwKRYCVCybsX1Ae9U=";
|
||||
hash = "sha256-hT+btlfqfwGBDWTssYl8KN6SbR9/Y2ors4ipECliigM=";
|
||||
};
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, which
|
||||
, frei0r
|
||||
@ -34,12 +35,19 @@ stdenv.mkDerivation {
|
||||
"-DBUILD_QT6=1"
|
||||
];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Taken from https://github.com/olive-editor/olive/pull/2294.
|
||||
name = "olive-editor-openimageio-2.3-compat.patch";
|
||||
url = "https://github.com/olive-editor/olive/commit/311eeb72944f93f873d1cd1784ee2bf423e1e7c2.patch";
|
||||
hash = "sha256-lswWn4DbXGH1qPvPla0jSgUJQXuqU7LQGHIPoXAE8ag=";
|
||||
})
|
||||
];
|
||||
|
||||
# https://github.com/olive-editor/olive/issues/2200
|
||||
patchPhase = ''
|
||||
runHook prePatch
|
||||
postPatch = ''
|
||||
substituteInPlace ./app/node/project/serializer/serializer230220.cpp \
|
||||
--replace 'QStringRef' 'QStringView'
|
||||
runHook postPatch
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "containerd";
|
||||
version = "1.7.7";
|
||||
version = "1.7.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containerd";
|
||||
repo = "containerd";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5Tw7xltrsp+yGrdJ0O4MoFUvIaEiCQpMip5X1kfV/iM=";
|
||||
hash = "sha256-p16qHJD0i0ZNEFGEbfmbxiedX9/uHkZxhCeB3x/5iLM=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -11,11 +11,11 @@
|
||||
|
||||
gsmakeDerivation rec {
|
||||
pname = "gnustep-back";
|
||||
version = "0.29.0";
|
||||
version = "0.30.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "ftp://ftp.gnustep.org/pub/gnustep/core/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-4n2SC68G0dpSz9nqCL5Kz76nyoRxWcRTWDwZsnMoHSM=";
|
||||
sha256 = "sha256-HD4PLdkE573nPWqFwffUmcHw8VYIl5rLiPKWrbnwpCI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnustep-make";
|
||||
version = "2.9.0";
|
||||
version = "2.9.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-${version}.tar.gz";
|
||||
sha256 = "sha256-oLBmwRJXh5x8hTEd6mnGf23HQe8znbZRT4W2SZLEDSo=";
|
||||
sha256 = "sha256-w9bnDPFWsn59HtJQHFffP5bidIjOLzUbk+R5xYwB6uc=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@ -581,7 +581,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
|
||||
mv $out/share/doc/* $out/share/doc/python${pythonVersion}-${version}
|
||||
'';
|
||||
|
||||
nativeBuildInputs = with pkgsBuildBuild.python3.pkgs; [ sphinxHook python_docs_theme ];
|
||||
nativeBuildInputs = with pkgsBuildBuild.python3.pkgs; [ sphinxHook python-docs-theme ];
|
||||
};
|
||||
|
||||
tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
|
||||
@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freetds";
|
||||
version = "1.4.2";
|
||||
version = "1.4.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2";
|
||||
hash = "sha256-is0TOZicZHCYA+In0ggretJkvmauvU26LGmnaKy4ZxM=";
|
||||
hash = "sha256-gTgCoca8Av4WlrbqMapTUiVxl3dza1v8I6OheFiVasA=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-gmmlib";
|
||||
version = "22.3.11";
|
||||
version = "22.3.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "gmmlib";
|
||||
rev = "intel-gmmlib-${version}";
|
||||
sha256 = "sha256-pweKUf/KW64neJkEZwjePh7ft8KEBu1I9zCIx/lMQT8=";
|
||||
sha256 = "sha256-BfMH3gFInWiBCuFZC0bZzpoZCEQzv/+tMvRH9ep5rLk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mediastreamer2";
|
||||
version = "5.2.98";
|
||||
version = "5.2.109";
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||
group = "BC";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-02e1nGSwlhEHwQH6WqBSKBlWQWAYa7lKdZaZ8/0SAxs=";
|
||||
hash = "sha256-uiuT53mM/dUw5tOYKsBEqEbvYRFKEyyTDKCLYaQvMAs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -0,0 +1,17 @@
|
||||
diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in
|
||||
index c122b013..04f36bf0 100644
|
||||
--- a/src/cmake/Config.cmake.in
|
||||
+++ b/src/cmake/Config.cmake.in
|
||||
@@ -43,11 +43,7 @@ if (NOT @BUILD_SHARED_LIBS@) # NOT @BUILD_SHARED_LIBS@
|
||||
# ZLIB_VERSION_STRING is still available for backward compatibility.
|
||||
# See https://cmake.org/cmake/help/git-stage/module/FindZLIB.html
|
||||
|
||||
- if (@ZLIB_VERSION@) # @ZLIB_VERSION@
|
||||
- find_dependency(ZLIB @ZLIB_VERSION@)
|
||||
- else()
|
||||
- find_dependency(ZLIB @ZLIB_VERSION_STRING@)
|
||||
- endif()
|
||||
+ find_dependency(ZLIB)
|
||||
endif()
|
||||
|
||||
if (NOT TARGET MINIZIP::minizip-ng)
|
||||
@ -27,32 +27,25 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opencolorio";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AcademySoftwareFoundation";
|
||||
repo = "OpenColorIO";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-l5UUysHdP/gb4Mn5A64XEoHOkthl6Mlb95CuI0l4vXQ=";
|
||||
sha256 = "sha256-E4TmMEFzI3nKqiDFaAkNx44uo84sacvZqjbfWe3A8fE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "darwin-no-hidden-l.patch";
|
||||
url = "https://github.com/AcademySoftwareFoundation/OpenColorIO/commit/48bab7c643ed8d108524d718e5038d836f906682.patch";
|
||||
revert = true;
|
||||
sha256 = "sha256-0DF+lwi2nfkUFG0wYvL3HYbhZS6SqGtPWoOabrFS1Eo=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "pkg-config-absolute-path.patch";
|
||||
url = "https://github.com/AcademySoftwareFoundation/OpenColorIO/commit/332462e7f5051b7e26ee3d8c22890cd5e71e7c30.patch";
|
||||
sha256 = "sha256-7xHALhnOkKszgFBgPIbiZQaORnEJ+1M6RyoZdFgjElM=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "minizip-ng-4.patch";
|
||||
url = "https://gitlab.archlinux.org/archlinux/packaging/packages/opencolorio/-/raw/5fc40f42f5c05d905793610c37b46ca3649245f3/minizip-ng-4.patch";
|
||||
hash = "sha256-B+dbBVRn0EuGtJaWxz5ah9el0RN7cLb81hgqnKkvhew=";
|
||||
# Taken from https://github.com/AcademySoftwareFoundation/OpenColorIO/pull/1891.
|
||||
name = "opencolorio-yaml-cpp-8.0-compat.patch";
|
||||
url = "https://github.com/AcademySoftwareFoundation/OpenColorIO/commit/e99b4afcf0408d8ec56fdf2b9380327c9284db00.patch";
|
||||
sha256 = "sha256-7eIvVWKcpE0lmuYdNqFQFHkW/sSSzQ//LNIMOC28KZg=";
|
||||
})
|
||||
# Workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/25200.
|
||||
# Needed for zlib >= 1.3 && cmake < 3.27.4.
|
||||
./broken-cmake-zlib-version.patch
|
||||
];
|
||||
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
@ -81,14 +74,17 @@ stdenv.mkDerivation rec {
|
||||
|
||||
cmakeFlags = [
|
||||
"-DOCIO_INSTALL_EXT_PACKAGES=NONE"
|
||||
"-DOCIO_USE_SSE2NEON=OFF"
|
||||
# GPU test fails with: freeglut (GPU tests): failed to open display ''
|
||||
"-DOCIO_BUILD_GPU_TESTS=OFF"
|
||||
"-Dminizip-ng_INCLUDE_DIR=${minizip-ng}/include"
|
||||
"-Dminizip-ng_INCLUDE_DIR=${minizip-ng}/include/minizip-ng"
|
||||
] ++ lib.optional (!pythonBindings) "-DOCIO_BUILD_PYTHON=OFF"
|
||||
++ lib.optional (!buildApps) "-DOCIO_BUILD_APPS=OFF";
|
||||
|
||||
# precision issues on non-x86
|
||||
doCheck = stdenv.isx86_64;
|
||||
# Tends to fail otherwise.
|
||||
enableParallelChecking = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://opencolorio.org";
|
||||
|
||||
@ -25,6 +25,12 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-I2/JPmUBDb0bw7qbSZcAkYHB2q2Uo7En7ZurMwWhg/M=";
|
||||
};
|
||||
|
||||
# Workaround broken zlib version detecion in CMake < 3.37.
|
||||
postPatch = ''
|
||||
substituteInPlace ./src/cmake/Config.cmake.in \
|
||||
--replace " @ZLIB_VERSION@" ""
|
||||
'';
|
||||
|
||||
outputs = [ "bin" "out" "dev" "doc" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -25,6 +25,7 @@
|
||||
, withData ? true, poppler_data
|
||||
, qt5Support ? false, qt6Support ? false, qtbase ? null
|
||||
, introspectionSupport ? false, gobject-introspection ? null
|
||||
, gpgmeSupport ? false, gpgme ? null
|
||||
, utils ? false, nss ? null
|
||||
, minimal ? false
|
||||
, suffix ? "glib"
|
||||
@ -47,13 +48,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: rec {
|
||||
pname = "poppler-${suffix}";
|
||||
version = "23.08.0"; # beware: updates often break cups-filters build, check texlive and scribus too!
|
||||
version = "23.11.0"; # beware: updates often break cups-filters build, check scribus too!
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz";
|
||||
hash = "sha256-Skv3/JA7nxoqt9BLfF2CINubxiYcxz/bmoJtwnL0mqg=";
|
||||
hash = "sha256-+ZzKZ5nLnLbJL8Hg63hUe2EctzN1CrfLBHyw5sJGU5w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -88,6 +89,8 @@ stdenv.mkDerivation (finalAttrs: rec {
|
||||
qtbase
|
||||
] ++ lib.optionals introspectionSupport [
|
||||
gobject-introspection
|
||||
] ++ lib.optionals gpgmeSupport [
|
||||
gpgme
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
@ -95,9 +98,13 @@ stdenv.mkDerivation (finalAttrs: rec {
|
||||
(mkFlag (!minimal) "GLIB")
|
||||
(mkFlag (!minimal) "CPP")
|
||||
(mkFlag (!minimal) "LIBCURL")
|
||||
(mkFlag (!minimal) "LCMS")
|
||||
(mkFlag (!minimal) "LIBTIFF")
|
||||
(mkFlag (!minimal) "NSS3")
|
||||
(mkFlag utils "UTILS")
|
||||
(mkFlag qt5Support "QT5")
|
||||
(mkFlag qt6Support "QT6")
|
||||
(mkFlag gpgmeSupport "GPGME")
|
||||
] ++ lib.optionals finalAttrs.doCheck [
|
||||
"-DTESTDATADIR=${testData}"
|
||||
];
|
||||
@ -110,13 +117,24 @@ stdenv.mkDerivation (finalAttrs: rec {
|
||||
sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt
|
||||
'';
|
||||
|
||||
# Work around gpgme trying to write to $HOME during qt5 and qt6 tests:
|
||||
preCheck = lib.optionalString gpgmeSupport ''
|
||||
HOME_orig="$HOME"
|
||||
export HOME="$(mktemp -d)"
|
||||
'';
|
||||
|
||||
postCheck = lib.optionalString gpgmeSupport ''
|
||||
export HOME="$HOME_orig"
|
||||
unset -v HOME_orig
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru = {
|
||||
inherit testData;
|
||||
tests = {
|
||||
# These depend on internal poppler code that frequently changes.
|
||||
inherit inkscape cups-filters texlive scribus;
|
||||
inherit inkscape cups-filters scribus;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -3,36 +3,19 @@
|
||||
, fetchFromGitHub
|
||||
, gitUpdater
|
||||
, cmake
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yaml-cpp";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jbeder";
|
||||
repo = "yaml-cpp";
|
||||
rev = "yaml-cpp-${version}";
|
||||
hash = "sha256-2tFWccifn0c2lU/U1WNg2FHrBohjx8CXMllPJCevaNk=";
|
||||
rev = version;
|
||||
hash = "sha256-J87oS6Az1/vNdyXu3L7KmUGWzU0IAkGrGMUUha+xDXI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/jbeder/yaml-cpp/issues/774
|
||||
# https://github.com/jbeder/yaml-cpp/pull/1037
|
||||
(fetchpatch {
|
||||
name = "yaml-cpp-Fix-generated-cmake-config.patch";
|
||||
url = "https://github.com/jbeder/yaml-cpp/commit/4f48727b365962e31451cd91027bd797bc7d2ee7.patch";
|
||||
hash = "sha256-jarZAh7NgwL3xXzxijDiAQmC/EC2WYfNMkYHEIQBPhM=";
|
||||
})
|
||||
# TODO: Remove with the next release, when https://github.com/jbeder/yaml-cpp/pull/1058 is available
|
||||
(fetchpatch {
|
||||
name = "yaml-cpp-Fix-pc-paths-for-absolute-GNUInstallDirs.patch";
|
||||
url = "https://github.com/jbeder/yaml-cpp/commit/328d2d85e833be7cb5a0ab246cc3f5d7e16fc67a.patch";
|
||||
hash = "sha256-1M2rxfbVOrRH9kiImcwcEolXOP8DeDW9Cbu03+mB5Yk=";
|
||||
})
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -47,9 +30,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
rev-prefix = "yaml-cpp-";
|
||||
};
|
||||
passthru.updateScript = gitUpdater { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "A YAML parser and emitter for C++";
|
||||
|
||||
@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "apipkg";
|
||||
version = "3.0.1";
|
||||
version = "3.0.2";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pytest-dev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-gf84SzfuKLGYfI88IzPRJCqMZWwowUR10FgIbwXjwuY=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ANLD7fUMKN3RmAVjVkcpwUH6U9ASalXdwKtPpoC8Urs=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
@ -1,12 +1,22 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, argparse-addons, humanfriendly, pyelftools }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, argparse-addons
|
||||
, humanfriendly
|
||||
, pyelftools
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bincopy";
|
||||
version = "19.1.0";
|
||||
version = "20.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-aDVkrTBEhrTP1Oc/kiE9ZsJ+8fDGXcb2+FSMQP0X0lY=";
|
||||
hash = "sha256-FM+0z5cie/Kx9bhWI99MdnrSGa/cn+BzLdLP3/RGr98=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -15,7 +25,9 @@ buildPythonPackage rec {
|
||||
pyelftools
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "bincopy" ];
|
||||
pythonImportsCheck = [
|
||||
"bincopy"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Mangling of various file formats that conveys binary information (Motorola S-Record, Intel HEX, TI-TXT, ELF and binary files)";
|
||||
|
||||
@ -1,37 +1,32 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, ecdsa
|
||||
, coincurve
|
||||
, pynacl
|
||||
, crcmod
|
||||
, ed25519-blake2b
|
||||
, py-sr25519-bindings
|
||||
, cbor2
|
||||
, coincurve
|
||||
, crcmod
|
||||
, ecdsa
|
||||
, ed25519-blake2b
|
||||
, fetchFromGitHub
|
||||
, py-sr25519-bindings
|
||||
, pycryptodome
|
||||
, pynacl
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bip-utils";
|
||||
version = "2.7.1";
|
||||
version = "2.8.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ebellocchia";
|
||||
repo = "bip_utils";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-QrCkLiGBdZTQCnbWSTN0PeoAsQfg2CoSGdZcbhqTvOk=";
|
||||
hash = "sha256-FW3ni7kPB0VeVK/uWjDEeWgilP9dNiuvSaboUpG5DLo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "coincurve>=15.0.1,<18.0.0" "coincurve"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ecdsa
|
||||
cbor2
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
let
|
||||
pname = "boilerpy3";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
@ -18,7 +18,7 @@ buildPythonPackage {
|
||||
owner = "jmriebold";
|
||||
repo = "BoilerPy3";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-hl2+XpSvVaHpq9RGMnSzWHCA8TtBQnYwDtEOia1Rl/A=";
|
||||
hash = "sha256-dhAB0VbBGsSrgYGUlZEYaKA6sQB/f9Bb3alsRuQ8opo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bsdiff4";
|
||||
version = "1.2.3";
|
||||
version = "1.2.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-G5XOk7nzBoRvbJHJ0OPrZZCkyFrCu+crX2DZ24KtKhw=";
|
||||
hash = "sha256-HXEpqBIYYHMejM4pAdMYPhSuxwJE9k6PdFYyddw4gGc=";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "clarifai-grpc";
|
||||
version = "9.9.3";
|
||||
version = "9.10.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-9h/d1w5toxWMHMvVkQiuHySf3+IjeumD4EipgI1kaEs=";
|
||||
hash = "sha256-8jx2OP1VcQtGmen58r1k/w7srjSJC/53sNxFrRm7IXs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ical";
|
||||
version = "5.1.0";
|
||||
version = "5.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "allenporter";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ffNgYtwErt9tzfDWQnt0h7QHQL+gMvFpP8zH6FSoHEM=";
|
||||
hash = "sha256-ewKQzjtVgx9c6h67epgFNhY4MjR7kFNCr4EKZ+UF2xA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "publicsuffixlist";
|
||||
version = "0.10.0.20231030";
|
||||
version = "0.10.0.20231104";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-1yRv6zg9mKJTinR57QHvCx/0mi0b2O3CkcoH1v4QuNo=";
|
||||
hash = "sha256-p+sOaRfp2IDdXL6eotCrSHu91i+mAwavmqELa5nDB7c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -0,0 +1,42 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, flit-core
|
||||
, pythonOlder
|
||||
, sphinx
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-docs-theme";
|
||||
version = "2023.9";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "python";
|
||||
repo = "python-docs-theme";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-XVwMEfprTNdNnaW38HMCAu4CswdVjBXYtNWBgqXfbno=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
flit-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
sphinx
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"python_docs_theme"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Sphinx theme for CPython project";
|
||||
homepage = "https://github.com/python/python-docs-theme";
|
||||
changelog = "https://github.com/python/python-docs-theme/blob/${version}/CHANGELOG.rst";
|
||||
license = licenses.psfl;
|
||||
maintainers = with maintainers; [ kaction ];
|
||||
};
|
||||
}
|
||||
@ -1,27 +0,0 @@
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, flit-core, sphinx }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python_docs_theme";
|
||||
version = "2023.9";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "python";
|
||||
repo = "python-docs-theme";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-XVwMEfprTNdNnaW38HMCAu4CswdVjBXYtNWBgqXfbno=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ flit-core ];
|
||||
|
||||
propagatedBuildInputs = [ sphinx ];
|
||||
|
||||
pythonImportsCheck = [ "python_docs_theme" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/python/python-docs-theme";
|
||||
description = "Sphinx theme for CPython project";
|
||||
license = licenses.psfl;
|
||||
maintainers = with maintainers; [ kaction ];
|
||||
};
|
||||
}
|
||||
@ -12,14 +12,13 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "radio_beam";
|
||||
version = "0.3.4";
|
||||
format = "pyproject";
|
||||
pname = "radio-beam";
|
||||
version = "0.3.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "radio-beam";
|
||||
sha256 = "e032257f1501303873f251c00c74b1188180785c79677fb4443098d517852309";
|
||||
inherit pname version;
|
||||
hash = "sha256-U+IjOTt7x9uzUl7IcQRu2s+MBKF/OR+sLddvHmp9hqU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -39,12 +38,16 @@ buildPythonPackage rec {
|
||||
pytest-astropy
|
||||
];
|
||||
|
||||
meta = {
|
||||
pythonImportsCheck = [
|
||||
"radio_beam"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tools for Beam IO and Manipulation";
|
||||
homepage = "http://radio-astro-tools.github.io";
|
||||
license = lib.licenses.bsd3;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [ smaret ];
|
||||
changelog = "https://github.com/radio-astro-tools/radio-beam/releases/tag/v${version}";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ smaret ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
, pytest-astropy
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, radio_beam
|
||||
, radio-beam
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
@ -36,7 +36,7 @@ buildPythonPackage rec {
|
||||
propagatedBuildInputs = [
|
||||
astropy
|
||||
casa-formats-io
|
||||
radio_beam
|
||||
radio-beam
|
||||
joblib
|
||||
dask
|
||||
];
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "stdlibs";
|
||||
version = "2022.10.9";
|
||||
version = "2023.11.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "omnilib";
|
||||
repo = "stdlibs";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-HkGZw58gQGd8mHnCP4aF6JWXxlpIIfe7B//HJiHVwA4=";
|
||||
hash = "sha256-084px8p+pOHonSiOvi/BklaccudSlw9URtCaalWlI0o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ detekt, lib, stdenv, fetchurl, makeWrapper, jre_headless, testers }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "detekt";
|
||||
version = "1.23.1";
|
||||
version = "1.23.3";
|
||||
|
||||
jarfilename = "${pname}-${version}-executable.jar";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/detekt/detekt/releases/download/v${version}/detekt-cli-${version}-all.jar";
|
||||
sha256 = "sha256-CJwVQF7FVjrbooXQnOzP8Efrx4iLi7w6OGu8bGdE14g=";
|
||||
sha256 = "sha256-Lm9z8XB7BdB7ikiyJyuVtV8eqlPucxmMNNC90E99qpA=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jql";
|
||||
version = "7.0.4";
|
||||
version = "7.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yamafaktory";
|
||||
repo = pname;
|
||||
rev = "jql-v${version}";
|
||||
hash = "sha256-Qy4ozTRdDF8ENyk4AB2a/4AuMSLJd/3w/q9TjGgrkPE=";
|
||||
hash = "sha256-D+69R63er4OIMOdyoCuGVvVcUlM2PhLKEyUat1yEmLU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-or69dz+wMhp8CPLzip6c6S7HpilAE2DAVkv/3IJMJWQ=";
|
||||
cargoHash = "sha256-2/0gUavyrNxhc2j+ECPsvMLKCkZdSClivEcJVE1zFgA=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A JSON Query Language CLI tool built with Rust";
|
||||
|
||||
@ -29,5 +29,6 @@ stdenv.mkDerivation rec {
|
||||
changelog = "https://github.com/pinterest/ktlint/blob/master/CHANGELOG.md";
|
||||
maintainers = with maintainers; [ tadfisher SubhrajyotiSen ];
|
||||
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
||||
mainProgram = "ktlint";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,15 +1,20 @@
|
||||
{ buildGoModule, fetchFromGitHub, lib }:
|
||||
{ buildGoModule
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, testers
|
||||
, symfony-cli
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "symfony-cli";
|
||||
version = "5.6.0";
|
||||
vendorHash = "sha256-1BqgnWFMk8hWwra75a5o6Rwbj5wiCUIdSnsAcB+7Mno=";
|
||||
version = "5.7.0";
|
||||
vendorHash = "sha256-Sq3Cr/iVW3OSHLujnR2fE5ZtJhYLiobkmKXKz8hjSus=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "symfony-cli";
|
||||
repo = "symfony-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AtHRuzpKXp+WlFser0J5MR63rbO0xO4N/L3U0Q3iax8=";
|
||||
hash = "sha256-wq+4czVQXQHV2Ci0zUV66+RiRREWawjH4i1i18T8RrA=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
@ -23,11 +28,16 @@ buildGoModule rec {
|
||||
'';
|
||||
|
||||
# Tests requires network access
|
||||
checkPhase = ''
|
||||
$GOPATH/bin/symfony-cli
|
||||
'';
|
||||
doCheck = false;
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
inherit version;
|
||||
package = symfony-cli;
|
||||
command = "symfony version --no-ansi";
|
||||
};
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/symfony-cli/symfony-cli/releases/tag/v${version}";
|
||||
description = "Symfony CLI";
|
||||
homepage = "https://github.com/symfony-cli/symfony-cli";
|
||||
license = lib.licenses.agpl3Plus;
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.0.0";
|
||||
version = "3.1.0";
|
||||
pname = "tengine";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alibaba";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-nUwPT7374dfE/T6yuCUynObq6LxBHDp90Dj2JGwJ4+M=";
|
||||
hash = "sha256-cClSNBlresMHqJrqSFWvUo589TlwJ2tL5FWJG9QBuis=";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
||||
@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mautrix-discord";
|
||||
version = "0.6.2";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mautrix";
|
||||
repo = "discord";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-194AB7r63gijTyeh8mn5N/AgVBeh39YMwdmvuAi3c9k=";
|
||||
hash = "sha256-hksnD1RWK83JjVIZsKeK8bQobNmzIbm9drgU0VjiqLs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-389ewqgpdFNRGAyka+oumx0RVadCSt1BXsXxIGTQwW0=";
|
||||
vendorHash = "sha256-+dmlJZPc2Tw9G64MeLPY5Rgml3UKEqAtgGI1ImRvMBU=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
||||
@ -2,15 +2,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "systemd_exporter";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
|
||||
vendorHash = "sha256-XkwBhj2M1poirPkWzS71NbRTshc8dTKwaHoDfFxpykU=";
|
||||
vendorHash = "sha256-D5ASUP6XHNeHZqH/ui5GvxWis/NQrRpN/+wkO4fKkA8=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prometheus-community";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-q6rnD8JCtB1zTkUfZt6f2Uyo91uFi3HYI7WFlZdzpBM=";
|
||||
sha256 = "sha256-zLg4cOZUh50OFPp4mKR/FY0JfzVmXmDFcKkhB6DalGc=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "FreshRSS";
|
||||
version = "1.21.0";
|
||||
version = "1.22.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FreshRSS";
|
||||
repo = "FreshRSS";
|
||||
rev = version;
|
||||
hash = "sha256-0+fMZ5ps0CkBbS+fcxlYrrkQi28tmrKTyl3kPuofqyI=";
|
||||
hash = "sha256-e4+ZkhncgDIWE5NH2eYun2FeWxz1suM//6T6P3V4nQU=";
|
||||
};
|
||||
|
||||
passthru.tests = {
|
||||
@ -26,12 +26,6 @@ stdenvNoCC.mkDerivation rec {
|
||||
# There's nothing to build.
|
||||
dontBuild = true;
|
||||
|
||||
# the data folder is no in this package and thereby declared by an env-var
|
||||
overrideConfig = pkgs.writeText "constants.local.php" ''
|
||||
<?php
|
||||
define('DATA_PATH', getenv('FRESHRSS_DATA_PATH'));
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs cli/*.php app/actualize_script.php
|
||||
'';
|
||||
@ -39,8 +33,6 @@ stdenvNoCC.mkDerivation rec {
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp -vr * $out/
|
||||
|
||||
cp $overrideConfig $out/constants.local.php
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -5,17 +5,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "pokeget-rs";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "talwat";
|
||||
repo = "pokeget-rs";
|
||||
rev = version;
|
||||
hash = "sha256-UAkSMdHukwxDzOU/sIOuTazBbD68ORIGAWuwRxoC+EY=";
|
||||
hash = "sha256-C7pEe9nScJ/ORJJrUDo6pADKceKoagHGP/X/asR1PcM=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoHash = "sha256-A5bDZU/L3G2RWbc3Y6KEQAmLS4RuNSG+ROypxINlwLk=";
|
||||
cargoHash = "sha256-gPPtVFSaaSL0QBXxHpslVdon3XVCVx1E5cfEP1Ffa9g=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A better rust version of pokeget";
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "flannel";
|
||||
version = "0.22.3";
|
||||
version = "0.23.0";
|
||||
rev = "v${version}";
|
||||
|
||||
vendorHash = "sha256-2P9gEbItK7rCtveXIZkFMcvppjK4GLzTSoLrkMPeCig=";
|
||||
vendorHash = "sha256-U4mFFxVVLHvgY2YQN1nEsFiTpfBpmhftLoVoGEzb2Fs=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
owner = "flannel-io";
|
||||
repo = "flannel";
|
||||
sha256 = "sha256-sO3iFs6pAmnqpc9+hxx2WZQWOP37/4XS1m5U4nerVLI=";
|
||||
sha256 = "sha256-8KUfmnDShhb8eFukU/dUo/PCrFlQDBh+gAV2rqqB7mE=";
|
||||
};
|
||||
|
||||
ldflags = [ "-X github.com/flannel-io/flannel/pkg/version.Version=${rev}" ];
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dt";
|
||||
version = "1.2.5";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "so-dang-cool";
|
||||
repo = "dt";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-i8oMrsPcINVK5kXzrN+lcPqBfxIeed8W+NF7Qd0crrk=";
|
||||
hash = "sha256-qHfvHf4T0wWnzqp5FfLg7n7te24xc2aMEdTK3Iia8Q0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ zig_0_11.hook ];
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mdbook-admonish";
|
||||
version = "1.13.0";
|
||||
version = "1.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tommilligan";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jr77WC6b5PrPANivd6diAFfVqudtviIWBE7I8eFmCfs=";
|
||||
hash = "sha256-wRRBasHnTelLCiHjjrMmXv/2V3P91n4kZ1aAt1tZx/Y=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-gBkRA8QRha46y5cp5aY2R+ekdfjUX5tDuNawCwzKFi4=";
|
||||
cargoHash = "sha256-KAcZyHanmbOKK+55dkINss9uOxk6P+r38M6qftYQwpw=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
|
||||
|
||||
|
||||
@ -24589,7 +24589,6 @@ with pkgs;
|
||||
});
|
||||
|
||||
poppler_min = poppler.override { # TODO: maybe reduce even more
|
||||
# this is currently only used by texlive.bin.
|
||||
minimal = true;
|
||||
suffix = "min";
|
||||
};
|
||||
|
||||
@ -335,6 +335,7 @@ mapAliases ({
|
||||
pytestrunner = pytest-runner; # added 2021-01-04
|
||||
python-forecastio = throw "python-forecastio has been removed, as the Dark Sky service was shut down."; # added 2023-04-05
|
||||
python-igraph = igraph; # added 2021-11-11
|
||||
python_docs_theme = python-docs-theme; # added 2023-11-04
|
||||
python_keyczar = throw "python_keyczar has been removed because it's been archived upstream and deprecated"; # added 2023-05-16
|
||||
python-lz4 = lz4; # added 2018-06-01
|
||||
python_magic = python-magic; # added 2022-05-07
|
||||
@ -359,6 +360,7 @@ mapAliases ({
|
||||
Quandl = quandl; # added 2023-02-19
|
||||
qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages";
|
||||
rabbitpy = throw "rabbitpy has been removed, since it is unmaintained and broken"; # added 2023-07-01
|
||||
radio_beam = radio-beam; # added 2023-11-04
|
||||
ratelimiter = throw "ratelimiter has been removed, since it is unmaintained and broken"; # added 2023-10-21
|
||||
rdflib-jsonld = throw "rdflib-jsonld is not compatible with rdflib 6"; # added 2021-11-05
|
||||
recaptcha_client = throw "recaptcha_client has been removed since it is no longer maintained"; # added 2023-10-20
|
||||
|
||||
@ -8667,7 +8667,7 @@ self: super: with self; {
|
||||
|
||||
pallets-sphinx-themes = callPackage ../development/python-modules/pallets-sphinx-themes { };
|
||||
|
||||
python_docs_theme = callPackage ../development/python-modules/python_docs_theme { };
|
||||
python-docs-theme = callPackage ../development/python-modules/python-docs-theme { };
|
||||
|
||||
pamela = callPackage ../development/python-modules/pamela { };
|
||||
|
||||
@ -11989,7 +11989,7 @@ self: super: with self; {
|
||||
|
||||
radian = callPackage ../development/python-modules/radian { };
|
||||
|
||||
radio_beam = callPackage ../development/python-modules/radio_beam { };
|
||||
radio-beam = callPackage ../development/python-modules/radio-beam { };
|
||||
|
||||
radios = callPackage ../development/python-modules/radios { };
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user