mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-04-14 06:57:45 +00:00
Merge master into staging-next
This commit is contained in:
commit
76cc08f929
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "praat";
|
||||
version = "6.3.14";
|
||||
version = "6.3.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "praat";
|
||||
repo = "praat";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-HN4w7n0nh7voL/QKhGQwCcGfzn+nyFOwluESlP3B6VM=";
|
||||
hash = "sha256-Lo0aJ3BbFkZxAJZyOTzso9esYnkTkeKAFNUi7Q2d/hI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -5,11 +5,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "snd";
|
||||
version = "23.5";
|
||||
version = "23.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/snd/snd-${version}.tar.gz";
|
||||
sha256 = "sha256-ZbGrxy494BH6QIj2sYAUEiNBsbNJHXtAVRLPVFwAcQM=";
|
||||
sha256 = "sha256-3oh2kFhCYe1sl4MN336Z6pEmpluiUnlcC5aAZxn0zIE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
@ -1,18 +1,18 @@
|
||||
{ lib, stdenv, fetchurl, openjdk, glib, wrapGAppsHook }:
|
||||
{ lib, stdenv, fetchurl, openjdk, glib, wrapGAppsHook, zstd }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bluej";
|
||||
version = "5.1.0";
|
||||
version = "5.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
# We use the deb here. First instinct might be to go for the "generic" JAR
|
||||
# download, but that is actually a graphical installer that is much harder
|
||||
# to unpack than the deb.
|
||||
url = "https://www.bluej.org/download/files/BlueJ-linux-${builtins.replaceStrings ["."] [""] version}.deb";
|
||||
sha256 = "sha256-tOb15wU9OjUt0D8l/JkaGYj84L7HV4FUnQQB5cRAxG0=";
|
||||
sha256 = "sha256-sOT86opMa9ytxJlfURIsD06HiP+j+oz3lQ0DqmLV1wE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
nativeBuildInputs = [ zstd wrapGAppsHook ];
|
||||
buildInputs = [ glib ];
|
||||
|
||||
sourceRoot = ".";
|
||||
@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
|
||||
unpackCmdHooks+=(_tryDebData)
|
||||
_tryDebData() {
|
||||
if ! [[ "$1" =~ \.deb$ ]]; then return 1; fi
|
||||
ar xf "$1"
|
||||
if ! [[ -e data.tar.xz ]]; then return 1; fi
|
||||
unpackFile data.tar.xz
|
||||
ar xf $src
|
||||
if ! [[ -e data.tar.zst ]]; then return 1; fi
|
||||
unpackFile data.tar.zst
|
||||
}
|
||||
'';
|
||||
|
||||
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||
"''${gappsWrapperArgs[@]}" \
|
||||
--add-flags "-Dawt.useSystemAAFontSettings=on -Xmx512M \
|
||||
--add-opens javafx.graphics/com.sun.glass.ui=ALL-UNNAMED \
|
||||
-jar $out/share/bluej/bluej.jar"
|
||||
-cp $out/share/bluej/boot.jar bluej.Boot"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mg";
|
||||
version = "7.0";
|
||||
version = "7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ibara";
|
||||
repo = "mg";
|
||||
rev = "mg-${version}";
|
||||
sha256 = "sha256-qnb0yB/NNJV257dsLmP84brajoRG03U+Ja1ACYbBvbE=";
|
||||
sha256 = "sha256-88FrXN7h5uRLY8YMKSzUjBF4n18DEiiiDyoYr+7qXdQ=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
|
||||
|
@ -700,8 +700,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "ruff";
|
||||
publisher = "charliermarsh";
|
||||
version = "2023.32.0";
|
||||
sha256 = "sha256-phyPQqDgsYunF5FLqPevw8ZZG4Tw9qxjTOU4/kNGKU8=";
|
||||
version = "2023.34.0";
|
||||
sha256 = "sha256-KOntjiE+n1yf9047XDldGg2pT+zknI/aEg6h71LwEB8=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
|
@ -0,0 +1,105 @@
|
||||
From cd8b5c97b27a5c1dc83046498b6ca49ad20aa9b6 Mon Sep 17 00:00:00 2001
|
||||
From: Leon Bottou <leon@bottou.org>
|
||||
Date: Tue, 11 May 2021 14:44:09 -0400
|
||||
Subject: [PATCH] Reviewed Fedora patches and adopted some of them (or variants
|
||||
thereof)
|
||||
|
||||
- Patch0: djvulibre-3.5.22-cdefs.patch (forward ported)
|
||||
Does not make imuch sense. GSmartPointer.h already includes "stddef.h"
|
||||
- Patch6: djvulibre-3.5.27-export-file.patch (forward ported)
|
||||
Incorrect: inkscape command is --export-png, not --export-filename.
|
||||
- Patch8: djvulibre-3.5.27-check-image-size.patch (forward ported)
|
||||
Correct: adopted a variant of this
|
||||
- Patch9: djvulibre-3.5.27-integer-overflow.patch (forward ported)
|
||||
Correct: adopted a variant of this
|
||||
- Patch10: djvulibre-3.5.27-check-input-pool.patch (forward ported)
|
||||
Adopted: input validation never hurts
|
||||
- Patch11: djvulibre-3.5.27-djvuport-stack-overflow.patch (forward ported)
|
||||
Dubious: Instead I changed djvufile to prevent a file from including itself
|
||||
which is the only way I can imagine to create an file creation loop.
|
||||
- Patch12: djvulibre-3.5.27-unsigned-short-overflow.patch (forward ported)
|
||||
Adopted: but without including limits.h
|
||||
---
|
||||
libdjvu/DataPool.cpp | 3 ++-
|
||||
libdjvu/DjVuFile.cpp | 2 ++
|
||||
libdjvu/GBitmap.cpp | 2 ++
|
||||
libdjvu/IW44Image.cpp | 4 ++++
|
||||
tools/ddjvu.cpp | 7 +++++--
|
||||
5 files changed, 15 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/libdjvu/DataPool.cpp b/libdjvu/DataPool.cpp
|
||||
index 5fcbedf..b58fc45 100644
|
||||
--- a/libdjvu/DataPool.cpp
|
||||
+++ b/libdjvu/DataPool.cpp
|
||||
@@ -790,7 +790,8 @@ DataPool::create(const GP<DataPool> & pool, int start, int length)
|
||||
{
|
||||
DEBUG_MSG("DataPool::DataPool: pool=" << (void *)((DataPool *)pool) << " start=" << start << " length= " << length << "\n");
|
||||
DEBUG_MAKE_INDENT(3);
|
||||
-
|
||||
+ if (!pool)
|
||||
+ G_THROW( ERR_MSG("DataPool.zero_DataPool") );
|
||||
DataPool *xpool=new DataPool();
|
||||
GP<DataPool> retval=xpool;
|
||||
xpool->init();
|
||||
diff --git a/libdjvu/DjVuFile.cpp b/libdjvu/DjVuFile.cpp
|
||||
index 143346b..2587491 100644
|
||||
--- a/libdjvu/DjVuFile.cpp
|
||||
+++ b/libdjvu/DjVuFile.cpp
|
||||
@@ -576,6 +576,8 @@ DjVuFile::process_incl_chunk(ByteStream & str, int file_num)
|
||||
GURL incl_url=pcaster->id_to_url(this, incl_str);
|
||||
if (incl_url.is_empty()) // Fallback. Should never be used.
|
||||
incl_url=GURL::UTF8(incl_str,url.base());
|
||||
+ if (incl_url == url) // Infinite loop avoidance
|
||||
+ G_THROW( ERR_MSG("DjVuFile.malformed") );
|
||||
|
||||
// Now see if there is already a file with this *name* created
|
||||
{
|
||||
diff --git a/libdjvu/GBitmap.cpp b/libdjvu/GBitmap.cpp
|
||||
index c2fdbe4..8ad64b2 100644
|
||||
--- a/libdjvu/GBitmap.cpp
|
||||
+++ b/libdjvu/GBitmap.cpp
|
||||
@@ -1284,6 +1284,8 @@ GBitmap::decode(unsigned char *runs)
|
||||
// initialize pixel array
|
||||
if (nrows==0 || ncolumns==0)
|
||||
G_THROW( ERR_MSG("GBitmap.not_init") );
|
||||
+ if (ncolumns + border != (unsigned short)(ncolumns+border))
|
||||
+ G_THROW("GBitmap: image size exceeds maximum (corrupted file?)");
|
||||
bytes_per_row = ncolumns + border;
|
||||
if (runs==0)
|
||||
G_THROW( ERR_MSG("GBitmap.null_arg") );
|
||||
diff --git a/libdjvu/IW44Image.cpp b/libdjvu/IW44Image.cpp
|
||||
index e8d4b44..4a1797e 100644
|
||||
--- a/libdjvu/IW44Image.cpp
|
||||
+++ b/libdjvu/IW44Image.cpp
|
||||
@@ -676,9 +676,13 @@ IW44Image::Map::image(signed char *img8, int rowsize, int pixsep, int fast)
|
||||
// Allocate reconstruction buffer
|
||||
short *data16;
|
||||
size_t sz = bw * bh;
|
||||
+ if (sz == 0)
|
||||
+ G_THROW("IW44Image: image size is zero (corrupted file?)");
|
||||
if (sz / (size_t)bw != (size_t)bh) // multiplication overflow
|
||||
G_THROW("IW44Image: image size exceeds maximum (corrupted file?)");
|
||||
GPBuffer<short> gdata16(data16,sz);
|
||||
+ if (data16 == 0)
|
||||
+ G_THROW("IW44Image: unable to allocate image buffer");
|
||||
// Copy coefficients
|
||||
int i;
|
||||
short *p = data16;
|
||||
diff --git a/tools/ddjvu.cpp b/tools/ddjvu.cpp
|
||||
index 7109952..e7b489b 100644
|
||||
--- a/tools/ddjvu.cpp
|
||||
+++ b/tools/ddjvu.cpp
|
||||
@@ -393,8 +393,11 @@ render(ddjvu_page_t *page, int pageno)
|
||||
} else if (style == DDJVU_FORMAT_GREY8)
|
||||
rowsize = rrect.w;
|
||||
else
|
||||
- rowsize = rrect.w * 3;
|
||||
- if (! (image = (char*)malloc(rowsize * rrect.h)))
|
||||
+ rowsize = rrect.w * 3;
|
||||
+ size_t bufsize = (size_t)rowsize * rrect.h;
|
||||
+ if (bufsize / rowsize != rrect.h)
|
||||
+ die(i18n("Integer overflow when allocating image buffer for page %d"), pageno);
|
||||
+ if (! (image = (char*)malloc(bufsize)))
|
||||
die(i18n("Cannot allocate image buffer for page %d"), pageno);
|
||||
|
||||
/* Render */
|
@ -30,12 +30,16 @@ stdenv.mkDerivation rec {
|
||||
bash
|
||||
];
|
||||
|
||||
# Remove uses of the `register` storage class specifier, which was removed in C++17.
|
||||
# Fixes compilation with clang 16, which defaults to C++17.
|
||||
patches = [ ./c++17-register-class.patch ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
patches = [
|
||||
# Remove uses of the `register` storage class specifier, which was removed in C++17.
|
||||
# Fixes compilation with clang 16, which defaults to C++17.
|
||||
./c++17-register-class.patch
|
||||
|
||||
./CVE-2021-3500+CVE-2021-32490+CVE-2021-32491+CVE-2021-32492+CVE-2021-32493.patch
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "The big set of CLI tools to make/modify/optimize/show/export DJVU files";
|
||||
homepage = "https://djvu.sourceforge.net";
|
||||
|
@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nwg-dock-hyprland";
|
||||
version = "0.1.5";
|
||||
version = "0.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nwg-piotr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DDHKEGb7ghZwrMKrFtplTz7Hi1CITW6oxa/EJM4JDA8=";
|
||||
sha256 = "sha256-54ir80aSIdBnogE9a0pAq16niwXm2DFjTbb0AIijuo4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-5fN/6HASfTMb80YYAIoWRqnRGMvvX4d8C2UvOc0jQU0=";
|
||||
|
@ -1,5 +1,4 @@
|
||||
{ lib
|
||||
, mkDerivation
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
@ -8,6 +7,7 @@
|
||||
, which
|
||||
, python3
|
||||
, rsync
|
||||
, wrapQtAppsHook
|
||||
, qtbase
|
||||
, qtsvg
|
||||
, libGLU
|
||||
@ -19,15 +19,22 @@
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
let
|
||||
world_feed_integration_tests_data = fetchFromGitHub {
|
||||
owner = "organicmaps";
|
||||
repo = "world_feed_integration_tests_data";
|
||||
rev = "3b66e59eaae85ebc583ce20baa3bdf27811349c4";
|
||||
hash = "sha256-wOZKqwYxJLllyxCr44rAcropKhohLUIVCtsR5tz9TRw=";
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "organicmaps";
|
||||
version = "2023.06.04-13";
|
||||
version = "2023.08.18-8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "organicmaps";
|
||||
repo = "organicmaps";
|
||||
rev = "${version}-android";
|
||||
hash = "sha256-HoEOKN99ClR1sa8YFZcS9XomtXnTRdAXS0iQEdDrhvc=";
|
||||
hash = "sha256-vdleO4jNKibyDlqrfZsOCScpQ9zreuYSw2BSoNpmeLY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@ -40,6 +47,9 @@ mkDerivation rec {
|
||||
|
||||
# TODO use system boost instead, see https://github.com/organicmaps/organicmaps/issues/5345
|
||||
patchShebangs 3party/boost/tools/build/src/engine/build.sh
|
||||
|
||||
# Prefetch test data, or the build system will try to fetch it with git.
|
||||
ln -s ${world_feed_integration_tests_data} data/world_feed_integration_tests_data
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -49,6 +59,7 @@ mkDerivation rec {
|
||||
which
|
||||
python3
|
||||
rsync
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
# Most dependencies are vendored
|
||||
|
@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "avalanchego";
|
||||
version = "1.10.8";
|
||||
version = "1.10.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ava-labs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-1SD+0WkqFGInrFtVmXHz3FuOso7rooeCPMAq9eFOSDg=";
|
||||
hash = "sha256-ofIpTDlD8ztC5vR975GhH/yYb4LqVs17kdfbU2UN6gg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-7O1ENOZUkt0NPXk0KK+ydbeLB9ht17jBSH+/cmpOg8U=";
|
||||
vendorHash = "sha256-EjdlIfY5he1P1JMJNwPNHFSwhlczGZb2ygvxviggesM=";
|
||||
# go mod vendor has a bug, see: https://github.com/golang/go/issues/57529
|
||||
proxyVendor = true;
|
||||
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "stern";
|
||||
version = "1.25.0";
|
||||
version = "1.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stern";
|
||||
repo = "stern";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-E4Hs9FH+6iQ7kv6CmYUHw9HchtJghMq9tnERO2rpL1g=";
|
||||
sha256 = "sha256-86XoYzw1bnIWwGiFgRl9RcZSYrF4byYKnDlJ4QSqXV0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+B3cAuV+HllmB1NaPeZitNpX9udWuCKfDFv+mOVHw2Y=";
|
||||
vendorHash = "sha256-LLVd9WB8ixH78CHYe0sS4sCDCD+6SQ7PxWr2MHiAOxI=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
@ -0,0 +1,59 @@
|
||||
{ lib, fetchurl, mkDerivation, appimageTools, libsecret, makeWrapper }:
|
||||
let
|
||||
pname = "beeper";
|
||||
version = "3.71.16";
|
||||
name = "${pname}-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://download.todesktop.com/2003241lzgn20jd/beeper-${version}.AppImage";
|
||||
hash = "sha256-Ho5zFmhNzkOmzo/btV+qZfP2GGx5XvV/1JncEKlH4vc=";
|
||||
};
|
||||
appimage = appimageTools.wrapType2 {
|
||||
inherit version pname src;
|
||||
extraPkgs = pkgs: with pkgs; [ libsecret ];
|
||||
};
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
inherit version pname src;
|
||||
};
|
||||
in
|
||||
mkDerivation rec {
|
||||
inherit name pname;
|
||||
|
||||
src = appimage;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mv bin/${name} bin/${pname}
|
||||
|
||||
mkdir -p $out/
|
||||
cp -r bin $out/bin
|
||||
|
||||
mkdir -p $out/share/${pname}
|
||||
cp -a ${appimageContents}/locales $out/share/${pname}
|
||||
cp -a ${appimageContents}/resources $out/share/${pname}
|
||||
cp -a ${appimageContents}/usr/share/icons $out/share/
|
||||
install -Dm 644 ${appimageContents}/${pname}.desktop -t $out/share/applications/
|
||||
|
||||
substituteInPlace $out/share/applications/${pname}.desktop --replace "AppRun" "${pname}"
|
||||
|
||||
wrapProgram $out/bin/${pname} \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}} --no-update"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Universal chat app.";
|
||||
longDescription = ''
|
||||
Beeper is a universal chat app. With Beeper, you can send
|
||||
and receive messages to friends, family and colleagues on
|
||||
many different chat networks.
|
||||
'';
|
||||
homepage = "https://beeper.com";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ jshcmpbll ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
@ -8,12 +8,12 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.0.02";
|
||||
version = "2.0.03";
|
||||
pname = "flrig";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-3I9ucz8XtGqY9I0tO9BRt1IQiOkpAkjMy3e7302gGMg=";
|
||||
sha256 = "sha256-/5hOryoupl7MYWekx2hL3q+2GMXA6rohjvYy2XTkJBI=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
@ -25,13 +25,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freedv";
|
||||
version = "1.8.12";
|
||||
version = "1.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "drowe67";
|
||||
repo = "freedv-gui";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5qq7EDCLAiCReFS1V8R2SkFI8CesmQclimcE3USGV/U=";
|
||||
hash = "sha256-4bkT853MZL6v0/PRh0RJBhqdFBXgWFSPDtIPLgcKR8A=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
@ -69,7 +69,8 @@ stdenv.mkDerivation rec {
|
||||
"-DUSE_INTERNAL_CODEC2:BOOL=FALSE"
|
||||
"-DUSE_STATIC_DEPS:BOOL=FALSE"
|
||||
"-DUNITTEST=ON"
|
||||
] ++ lib.optionals pulseSupport [ "-DUSE_PULSEAUDIO:BOOL=TRUE" ];
|
||||
"-DUSE_PULSEAUDIO:BOOL=${if pulseSupport then "TRUE" else "FALSE"}"
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
|
||||
"-DAPPLE_OLD_XCODE"
|
||||
|
@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nvc";
|
||||
version = "1.10.1";
|
||||
version = "1.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nickg";
|
||||
repo = "nvc";
|
||||
rev = "r${version}";
|
||||
hash = "sha256-7Kw9irZltNE8VRnIvVX786/u0QQtmRhV8pzpba0h1JY=";
|
||||
hash = "sha256-sAr51+8hFnpIq0jDd8dB5uiy00N09ufkFgWkFtW7ErU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cvs-fast-export";
|
||||
version = "1.60";
|
||||
version = "1.61";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-${version}.tar.gz";
|
||||
sha256 = "sha256-QLMBYX2n27rcaa9Uisrr2VItgtTPv5ZWbOc5tK1VF8w=";
|
||||
sha256 = "sha256-4iH8VKxVliVZKwZ40rGMb3fH1nxTBdMT5IcBzdp1mjw=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
@ -5,11 +5,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "got";
|
||||
version = "0.91";
|
||||
version = "0.92";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz";
|
||||
hash = "sha256-ebFetQhgEBjy3aq3TfK9veeevbmSAEv9kaUohsnsrlU=";
|
||||
hash = "sha256-HaNCxgbl0ewvI96jr9/BgJphqoQC5P2atj5a51bj99c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config bison ]
|
||||
@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ openssl libbsd libevent libuuid libmd zlib ncurses ]
|
||||
++ lib.optionals stdenv.isDarwin [ libossp_uuid ];
|
||||
|
||||
configureFlags = [ "--enable-gotd" ];
|
||||
|
||||
preConfigure = lib.optionalString stdenv.isDarwin ''
|
||||
# The configure script assumes dependencies on Darwin are install via
|
||||
# Homebrew or MacPorts and hardcodes assumptions about the paths of
|
||||
|
@ -2,10 +2,10 @@
|
||||
|
||||
let
|
||||
options = rec {
|
||||
/* TODO: there are also FreeBSD and Windows versions */
|
||||
# TODO: there are also FreeBSD and Windows versions
|
||||
x86_64-linux = {
|
||||
arch = "linuxx86";
|
||||
sha256 = "0d5bsizgpw9hv0jfsf4bp5sf6kxh8f9hgzz9hsjzpfhs3npmmac4";
|
||||
sha256 = "0mhmm8zbk42p2b9amy702365m687k5p0xnz010yqrki6mwyxlkx9";
|
||||
runtime = "lx86cl64";
|
||||
kernel = "linuxx8664";
|
||||
};
|
||||
@ -17,13 +17,13 @@ let
|
||||
};
|
||||
armv7l-linux = {
|
||||
arch = "linuxarm";
|
||||
sha256 = throw "ccl all-in-one linuxarm archive missing upstream";
|
||||
sha256 = "1a4y07cmmn1r88b4hl4msb0bvr2fxd2vw9lf7h4j9f7a5rpq7124";
|
||||
runtime = "armcl";
|
||||
kernel = "linuxarm";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
arch = "darwinx86";
|
||||
sha256 = "1l060719k8mjd70lfdnr0hkybk7v88zxvfrsp7ww50q808cjffqk";
|
||||
sha256 = "1xclnik6pqhkmr15cbqa2n1ddzdf0rs452lyiln3c42nmkf9jjb6";
|
||||
runtime = "dx86cl64";
|
||||
kernel = "darwinx8664";
|
||||
};
|
||||
@ -31,49 +31,15 @@ let
|
||||
};
|
||||
cfg = options.${stdenv.hostPlatform.system} or (throw "missing source url for platform ${stdenv.hostPlatform.system}");
|
||||
|
||||
# The 1.12 github release of CCL seems to be missing the usual
|
||||
# ccl-1.12-linuxarm.tar.gz tarball, so we build it ourselves here
|
||||
linuxarm-src = runCommand "ccl-1.12-linuxarm.tar.gz" {
|
||||
outer = fetchurl {
|
||||
url = "https://github.com/Clozure/ccl/archive/v1.12.tar.gz";
|
||||
sha256 = "0lmxhll6zgni0l41h4kcf3khbih9r0f8xni6zcfvbi3dzfs0cjkp";
|
||||
};
|
||||
inner = fetchurl {
|
||||
url = "https://github.com/Clozure/ccl/releases/download/v1.12/linuxarm.tar.gz";
|
||||
sha256 = "0x4bjx6cxsjvxyagijhlvmc7jkyxifdvz5q5zvz37028va65243c";
|
||||
};
|
||||
} ''
|
||||
tar xf $outer
|
||||
tar xf $inner -C ccl
|
||||
tar czf $out ccl
|
||||
'';
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "ccl";
|
||||
version = "1.12";
|
||||
version = "1.12.2";
|
||||
|
||||
src = if cfg.arch == "linuxarm" then linuxarm-src else fetchurl {
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Clozure/ccl/releases/download/v${version}/ccl-${version}-${cfg.arch}.tar.gz";
|
||||
sha256 = cfg.sha256;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pull upstream fiux for -fno-common toolchains:
|
||||
# https://github.com/Clozure/ccl/pull/316
|
||||
(fetchpatch {
|
||||
name = "fno-common-p1.patch";
|
||||
url = "https://github.com/Clozure/ccl/commit/185dc1a00e7492f8be98e5f93b561758423595f1.patch";
|
||||
sha256 = "0wqfds7346qdwdsxz3bl2p601ib94rdp9nknj7igj01q8lqfpajw";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fno-common-p2.patch";
|
||||
url = "https://github.com/Clozure/ccl/commit/997de91062d1f152d0c3b322a1e3694243e4a403.patch";
|
||||
sha256 = "10w6zw8wgalkdyya4m48lgca4p9wgcp1h44hy9wqr94dzlllq0f6";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = if stdenv.isDarwin then [ bootstrap_cmds m4 ] else [ glibc m4 ];
|
||||
|
||||
CCL_RUNTIME = cfg.runtime;
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "flix";
|
||||
version = "0.39.0";
|
||||
version = "0.40.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar";
|
||||
sha256 = "sha256-kIH5vv/7pKgfAL1BaWYH6PSyEaKVONcccUczsudyfO4=";
|
||||
sha256 = "sha256-NVQY2TgIR9ROy4x8PWxCjuaOkNx0bcUA4oZHjpQbHc4=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcouchbase";
|
||||
version = "3.3.7";
|
||||
version = "3.3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "couchbase";
|
||||
repo = "libcouchbase";
|
||||
rev = version;
|
||||
sha256 = "sha256-EPVz9+qEuJe4VGXNuUnbH61EDxdyohZhxoxleO5j/Uk=";
|
||||
sha256 = "sha256-4484PH2+4uvCSSPw9vecoCeGda8ELxoOW6mtIfuUC+U=";
|
||||
};
|
||||
|
||||
cmakeFlags = [ "-DLCB_NO_MOCK=ON" ];
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ailment";
|
||||
version = "9.2.65";
|
||||
version = "9.2.66";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Bli+zrxMbRY2dzAx25ap3DhROIFTlk+TGpAfrHiMxPc=";
|
||||
hash = "sha256-5F6mSdYkeDS/n4Quu6UrBK3alfieop6Go3muGlmr/84=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioapns";
|
||||
version = "2.2";
|
||||
version = "3.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-3FMNIhIZrstPKTfHVmN+K28UR2G26HZ5S/JtXmaFk1c=";
|
||||
hash = "sha256-MiFjd9HYaTugjP66O24Tgk92bC91GQHggvy1sdQIu+0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -32,7 +32,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "angr";
|
||||
version = "9.2.65";
|
||||
version = "9.2.66";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -41,7 +41,7 @@ buildPythonPackage rec {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-atVmXsgMIRpmOXgNoatWkk9ID14f9rMJMT6+CWmvbY4=";
|
||||
hash = "sha256-l/O+7M9f2HtIcXNd49+zr2Z0Cx/3mbXgZvqOyPlvJbk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ansible-compat";
|
||||
version = "4.1.5";
|
||||
version = "4.1.8";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-WXyDahhMETH+62sOI82iNsQf7N7mRCc3Unj7aSD9LnQ=";
|
||||
hash = "sha256-9YE19dEj4I/bfhGEm4KUXhkA+MiZughZ1LQbJcdsqVU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "archinfo";
|
||||
version = "9.2.65";
|
||||
version = "9.2.66";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-g+inF8eswHNLV6bBVRpyLf6H8PjmPduv7I2svAVEG5U=";
|
||||
hash = "sha256-l9AakU68ACb02NGKWbkmUp14/lC21PJeGuzexYPTaNg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "blebox-uniapi";
|
||||
version = "2.1.4";
|
||||
version = "2.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "blebox";
|
||||
repo = "blebox_uniapi";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-hr3HD8UiI+bKiHcXGnyomJMzP+/GVXLgSUxeH2U6l/4=";
|
||||
hash = "sha256-cLSI6wa3gHE0QkSVVWMNpb5fyQy0TLDNSqOuGlDJGJc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -44,7 +44,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/blebox/blebox_uniapi/blob/${version}/HISTORY.rst";
|
||||
changelog = "https://github.com/blebox/blebox_uniapi/blob/v${version}/HISTORY.rst";
|
||||
description = "Python API for accessing BleBox smart home devices";
|
||||
homepage = "https://github.com/blebox/blebox_uniapi";
|
||||
license = licenses.asl20;
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "botocore-stubs";
|
||||
version = "1.31.36";
|
||||
version = "1.31.37";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "botocore_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-8Bjl7T7QPDDFs3+6mPm6ZFCUViVZ+SC+1nkSeC2AW5A=";
|
||||
hash = "sha256-ZeZRd4391XughIGVct/4vhf1sosHDNPl5bnyJmE/7R0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -20,12 +20,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bpycv";
|
||||
version = "0.3.6";
|
||||
version = "0.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-4N4rCVhbfJx7H7jS88QR3EcRupISIhnLuZ+cgfwIzg4=";
|
||||
hash = "sha256-qqNGemDB0aagCXjrECuh6kLksf+KujPejpnXVqFG8GY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "claripy";
|
||||
version = "9.2.65";
|
||||
version = "9.2.66";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-/Ou2Kl7Fw5QpzoibNOKJPnAwRsR3EDtYypCrOQc7yjI=";
|
||||
hash = "sha256-CDFZ6CN3pqNpwigYVHyKxwpa9iPfl4m/XDAo1YSRir8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -16,7 +16,7 @@
|
||||
|
||||
let
|
||||
# The binaries are following the argr projects release cycle
|
||||
version = "9.2.65";
|
||||
version = "9.2.66";
|
||||
|
||||
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
|
||||
binaries = fetchFromGitHub {
|
||||
@ -38,7 +38,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-reJRy2KNk4YrkPkVH7eitMVS7V9MPTZNjo9+Wmgx5vQ=";
|
||||
hash = "sha256-/LDVpw1Ej2YuzwA2qUoZv/ajQZPL9dDvvawj9r5bGbo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -74,6 +74,8 @@ buildPythonPackage rec {
|
||||
"test_plt_full_relro"
|
||||
# Test fails
|
||||
"test_tls_pe_incorrect_tls_data_start"
|
||||
"test_x86"
|
||||
"test_x86_64"
|
||||
# The required parts is not present on Nix
|
||||
"test_remote_file_map"
|
||||
];
|
||||
|
@ -14,11 +14,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "drf-yasg";
|
||||
version = "1.21.5";
|
||||
version = "1.21.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-zu8MO13EOJeBr9eG5tw2l68qL+DYck7h9jfCPXW7xbI=";
|
||||
hash = "sha256-TDuTBos9/KaWmrERFV5N1vey1oC5h3jej9Rgt4N72w0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -55,14 +55,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc";
|
||||
version = "3.16.0";
|
||||
version = "3.17.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-LbSmyNgRFejDGHurzDJvJxuhjPuRPDJ1t6T6p3f6UQk=";
|
||||
hash = "sha256-MFwmER2BmSKqisgLvnLY3aFoRuzeObE7lr5JOesJdXE=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvclive";
|
||||
version = "2.15.2";
|
||||
version = "2.16.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Z1e6CrpVjQoR/OIqqxbbC75SZtOqi4Rrbld2doenOMA=";
|
||||
hash = "sha256-VxZXZhbKtym1ow/dU3G4yu4X1GwCsXzcau/YocertzY=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastapi";
|
||||
version = "0.95.1";
|
||||
version = "0.95.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
||||
owner = "tiangolo";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-y6mP2w2d2oabM9bLtWRO/AdRA46LNhVrMB/0qxGxH7I=";
|
||||
hash = "sha256-wD39CqUZOgwpG/NEGz/pXgQsadzUoM/elxfEXthOlHo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "2023.8.12";
|
||||
version = "2023.8.13";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-sP8X6YWNPut0chIj5izdPDbSlwTWXJECbK+pGfucnek=";
|
||||
hash = "sha256-SZIxZHuw3YLGA3dU73jxCahq2pxTyeflXJxnOfJtyJg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -18,14 +18,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ledgerblue";
|
||||
version = "0.1.47";
|
||||
version = "0.1.48";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-xe8ude2JzrdmJqwzqLlxRO697IjcGuQgGG6c3nQ/drg=";
|
||||
hash = "sha256-LVRNcsTmJOR3zTBhbKV4V0zCQk0sk/Uf6kSmfbAhgfY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "losant-rest";
|
||||
version = "1.18.0";
|
||||
version = "1.19.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "Losant";
|
||||
repo = "losant-rest-python";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wl8L+ZQQgzWb7QUHWHSOT3meCn1baE7Prs1nWAOvnKo=";
|
||||
hash = "sha256-Kr+L8zHcutpxzqvwQ10iebHiwBIT+sZiiT38G6O/joY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "millheater";
|
||||
version = "0.11.0";
|
||||
version = "0.11.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "Danielhiversen";
|
||||
repo = "pymill";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-NECGUosjrhRCVGHOFV+YjY8o3heoA7qi9kKsgXpeHh0=";
|
||||
hash = "sha256-RlnZUI7F1u1rjmuPc2guqVomR25Izf5jejN6LlMZYS8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mypy-boto3-ebs";
|
||||
version = "1.28.16";
|
||||
version = "1.28.36";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-PJkVweQPGGR3NwCpg/O+Cs822XU6awMfUL6wWwT6e0w=";
|
||||
hash = "sha256-w9OLKJAn9UBnA7x+uedhplSV8plZRYlBpviU9Gv1Ny8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -2,20 +2,25 @@
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pathvalidate";
|
||||
version = "2.5.2";
|
||||
format = "setuptools";
|
||||
version = "3.1.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-X/V9D6vl7Lek8eSVe/61rYq1q0wPpx95xrvCS9m30U0=";
|
||||
hash = "sha256-QmlwIm4kGZ/ZDZOZXSI8Hii9qWfN9DcHVaFM33KiqO4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
# Requires `pytest-md-report`, causing infinite recursion.
|
||||
doCheck = false;
|
||||
|
||||
@ -24,8 +29,9 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Python library to sanitize/validate a string such as filenames/file-paths/etc";
|
||||
description = "Library to sanitize/validate a string such as filenames/file-paths/etc";
|
||||
homepage = "https://github.com/thombashi/pathvalidate";
|
||||
changelog = "https://github.com/thombashi/pathvalidate/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ oxalica ];
|
||||
};
|
||||
|
@ -6,14 +6,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "peaqevcore";
|
||||
version = "19.1.2";
|
||||
version = "19.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-pDVyFXnWHUzC1U7sSq65q1NXskz/kM/KtonqnfjEtMI=";
|
||||
hash = "sha256-1j1QQo8hTUM7CzDUiRvOUWImb+rGIQgPWl69hTvlZUo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -18,14 +18,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pip-tools";
|
||||
version = "7.2.0";
|
||||
version = "7.3.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-YWSItTnhS4qoVDbtWXozwpH0iFwdLgvsl0AKvlr/LA0=";
|
||||
hash = "sha256-jpyZEn/gJMAltGoLLRXHvUfxjzMibPczDTVJNmP8HR0=";
|
||||
};
|
||||
|
||||
patches = [ ./fix-setup-py-bad-syntax-detection.patch ];
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyiqvia";
|
||||
version = "2022.10.0";
|
||||
version = "2023.08.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-4xoK/SwpcsjIpGUertWoSlRsKIpgpV1XmuIzDJcZMZg=";
|
||||
hash = "sha256-vPcb0mwREQri9FuYhWXihWSYnZ2ywBVujPMaNThTbVI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pylitterbot";
|
||||
version = "2023.4.7";
|
||||
version = "2023.4.8";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "natekspencer";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-y5UZWId3RhOlnq9sHo7eeKOem55/e6F4ioYa+uprZtA=";
|
||||
hash = "sha256-74EKgHocrEi37bh4WBoYyLKF1XYrwxT7e2oo3igTWms=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyskyqremote";
|
||||
version = "0.3.25";
|
||||
version = "0.3.26";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "RogerSelwyn";
|
||||
repo = "skyq_remote";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-yDeGY5BFj0DKqqK+CzrIxqLa7G5C6Le+GIcFHwtJK9E=";
|
||||
hash = "sha256-aMgUwgKHgR+NQvRxiUV7GaXehjDIlJJJHwSmHDmzK08=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyswitchbot";
|
||||
version = "0.39.0";
|
||||
version = "0.39.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "Danielhiversen";
|
||||
repo = "pySwitchbot";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-CswgfEmKaQvhDXizpcu6d8JMYtJSgNQ3L4+63ee58eE=";
|
||||
hash = "sha256-wrn57mluIvUYBXOxw4NTFuq0UuOQwtC/WRWhfQpyRTA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -1,31 +1,44 @@
|
||||
{ buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, dataproperty
|
||||
, dominate
|
||||
, elasticsearch
|
||||
, fetchFromGitHub
|
||||
, loguru
|
||||
, mbstrdecoder
|
||||
, pandas
|
||||
, pathvalidate
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pyyaml
|
||||
, setuptools
|
||||
, simplejson
|
||||
, tabledata
|
||||
, tcolorpy
|
||||
, typepy
|
||||
, pytestCheckHook
|
||||
, pyyaml
|
||||
, toml
|
||||
, elasticsearch
|
||||
, dominate
|
||||
, typepy
|
||||
, xlsxwriter
|
||||
, xlwt
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytablewriter";
|
||||
version = "0.64.2";
|
||||
version = "1.0.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thombashi";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+IOHnmdd9g3SoHyITJJtbJ0/SAAmwWmwX5XeqsO34EM=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-VDx7/kKRBho4oWvUXYe5K9CC4vUCDs91G05Wlpa47OE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dataproperty
|
||||
mbstrdecoder
|
||||
@ -35,23 +48,80 @@ buildPythonPackage rec {
|
||||
typepy
|
||||
];
|
||||
|
||||
checkInputs = [ pyyaml toml elasticsearch dominate ];
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
passthru.optional-dependencies = {
|
||||
all = [
|
||||
dominate
|
||||
elasticsearch
|
||||
loguru
|
||||
pandas
|
||||
# pytablereader
|
||||
pyyaml
|
||||
simplejson
|
||||
toml
|
||||
xlsxwriter
|
||||
xlwt
|
||||
];
|
||||
es = [
|
||||
elasticsearch
|
||||
];
|
||||
es8 = [
|
||||
elasticsearch
|
||||
];
|
||||
excel = [
|
||||
xlwt
|
||||
xlsxwriter
|
||||
];
|
||||
html = [
|
||||
dominate
|
||||
];
|
||||
logging = [
|
||||
loguru
|
||||
];
|
||||
# from = [
|
||||
# pytablereader
|
||||
# ];
|
||||
pandas = [
|
||||
pandas
|
||||
];
|
||||
# sqlite = [
|
||||
# simplesqlite
|
||||
# ];
|
||||
# theme = [
|
||||
# pytablewriter-altrow-theme
|
||||
# ];
|
||||
toml = [
|
||||
toml
|
||||
];
|
||||
yaml = [
|
||||
pyyaml
|
||||
];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pathvalidate"
|
||||
];
|
||||
|
||||
# Circular dependency
|
||||
disabledTests = [
|
||||
"test_normal_from_file"
|
||||
"test_normal_from_text"
|
||||
"test_normal_clear_theme"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
"test/writer/binary/test_excel_writer.py"
|
||||
"test/writer/binary/test_sqlite_writer.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/thombashi/pytablewriter";
|
||||
description = "A library to write a table in various formats";
|
||||
maintainers = with maintainers; [ genericnerdyusername ];
|
||||
homepage = "https://github.com/thombashi/pytablewriter";
|
||||
changelog = "https://github.com/thombashi/pytablewriter/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ genericnerdyusername ];
|
||||
};
|
||||
}
|
||||
|
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvex";
|
||||
version = "9.2.65";
|
||||
version = "9.2.66";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-iZygYN3874o9miKxp2+0KDgQKFHDX73/45FzMSeSAlg=";
|
||||
hash = "sha256-NmOa/DH/EapcYCrpdcdn4CR9DiKuVnrDvKbnTiO3Ldc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -7,11 +7,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "reflink";
|
||||
version = "0.2.1";
|
||||
version = "0.2.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-ySU1gtskQTv9cDq/wbKkneePMbSQcjnyhumhkpoebjo=";
|
||||
hash = "sha256-iCN17nMZJ1rl9qahKHQGNl2sHpZDuRrRDlGH0/hCU70=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ cffi ];
|
||||
|
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rfcat";
|
||||
version = "1.9.7";
|
||||
version = "2.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "atlas0fd00m";
|
||||
repo = "rfcat";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-VOLA/ZZLazW7u0VYkAHzDh4aaHGr3u09bKVOkhYk6Fk=";
|
||||
hash = "sha256-hdRsVbDXRC1EOhBoFJ9T5ZE6hwOgDWSdN5sIpxJ0x3E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -1,15 +1,19 @@
|
||||
{ buildPythonPackage
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, git
|
||||
, riscv-isac
|
||||
, riscv-config
|
||||
, jinja2
|
||||
, pythonOlder
|
||||
, riscv-config
|
||||
, riscv-isac
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "riscof";
|
||||
version = "1.25.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "riscv-software-src";
|
||||
@ -18,18 +22,36 @@ buildPythonPackage rec {
|
||||
hash = "sha256-ToI2xI0fvnDR+hJ++T4ss5X3gc4G6Cj1uJHx0m2X7GY=";
|
||||
};
|
||||
|
||||
postPatch = "substituteInPlace riscof/requirements.txt --replace 'GitPython==3.1.17' GitPython";
|
||||
|
||||
propagatedBuildInputs = [ riscv-isac riscv-config jinja2 ];
|
||||
|
||||
patches = [
|
||||
# riscof copies a template directory from the store, but breaks because it doesn't change permissions and expects it to be writeable
|
||||
# riscof copies a template directory from the store, but breaks because it
|
||||
# doesn't change permissions and expects it to be writeable
|
||||
./make_writeable.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "import pip" ""
|
||||
substituteInPlace riscof/requirements.txt \
|
||||
--replace "GitPython==3.1.17" "GitPython"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
riscv-isac
|
||||
riscv-config
|
||||
jinja2
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"riscof"
|
||||
];
|
||||
|
||||
# No unitests available
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/riscv-software-src/riscof";
|
||||
description = "RISC-V Architectural Test Framework";
|
||||
homepage = "https://github.com/riscv-software-src/riscof";
|
||||
changelog = "https://github.com/riscv-software-src/riscof/blob/${version}/CHANGELOG.md";
|
||||
maintainers = with maintainers; [ genericnerdyusername ];
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
|
@ -20,7 +20,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "simplisafe-python";
|
||||
version = "2023.05.0";
|
||||
version = "2023.08.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
||||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-dcWDB9tpKrFbnWf35HLDmgy2zNTzKNeJQrdtRXbSMvs=";
|
||||
hash = "sha256-DExMa9z/VYAMoqUmr/gfZzYFWfTxnC+Cz4rRTaNSLBM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sqlalchemy-mixins";
|
||||
version = "2.0.4.2";
|
||||
version = "2.0.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "absent1706";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-soashrkokHveEI9YXAAPBPHydhoToJhCHx+g7bunhLE=";
|
||||
hash = "sha256-iJrRlV/M0Z1IOdrwWSblefm6wjvdk4/v0am+It8VeWI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -22,7 +22,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "starlette";
|
||||
version = "0.26.1";
|
||||
version = "0.27.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -31,7 +31,7 @@ buildPythonPackage rec {
|
||||
owner = "encode";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-/zYqYmmCcOLU8Di9b4BzDLFtB5wYEEF1bYN6u2rb8Lg=";
|
||||
hash = "sha256-qT3ZJQY5l1K88llJdKoSkwHvfcWwjH6JysMnHYGknqw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "stumpy";
|
||||
version = "1.11.1";
|
||||
version = "1.12.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "TDAmeritrade";
|
||||
repo = "stumpy";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ARpXqZpWkbvIEDVkxA1SwlWoxq+3WO6tvv/e7WZ/25c=";
|
||||
hash = "sha256-rVl3tIx8iWx2mnaix3V5YnfWWdPBTP8+K2JJKTfctDA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zha-quirks";
|
||||
version = "0.0.102";
|
||||
version = "0.0.103";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "zigpy";
|
||||
repo = "zha-device-handlers";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-TsL6JRxYf8KqmLqfN0nosxaTbzezlP4Q0Fb876WeTHI=";
|
||||
hash = "sha256-H6LkCjpyj1uk05aIvO2TNJoAEXsPZlsIHo+t5rO5ikY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -2,23 +2,23 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dagger";
|
||||
version = "0.6.4";
|
||||
version = "0.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dagger";
|
||||
repo = "dagger";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ms736KXQjqWnIU7WHQ4k1r6qwCp07N6tufCx9s9biVc=";
|
||||
hash = "sha256-iFuPbSat555QHPqqP6j/6uTid19x1+OtRHADmGxTYzs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-zssmvu1s7O2DdvjxUYkR13CKOe4EYn50RFRRIPBJ9qg=";
|
||||
vendorHash = "sha256-DWmHq8BIR00QTh3ZcbEgTtbHwTmsMFAhV7kQVRSKNdQ=";
|
||||
proxyVendor = true;
|
||||
|
||||
subPackages = [
|
||||
"cmd/dagger"
|
||||
];
|
||||
|
||||
ldflags = [ "-s" "-w" "-X=github.com/dagger/dagger/internal/engine.Version=${version}" ];
|
||||
ldflags = [ "-s" "-w" "-X github.com/dagger/dagger/engine.Version=${version}" ];
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = dagger;
|
||||
|
@ -5,15 +5,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "goa";
|
||||
version = "3.12.3";
|
||||
version = "3.12.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goadesign";
|
||||
repo = "goa";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-OWYIfzJcR0V5GogVntzu5hOe3h3JO5FYWxSqYSxRp6A=";
|
||||
sha256 = "sha256-ox4UPwotJBA8qxZpqyKmOW2bqbSWHX+yIpGvFnf2Rzo=";
|
||||
};
|
||||
vendorHash = "sha256-Zt8Nzga9xRYuUv8ofCJa3yL2Kq+xvnqs3c0g2BnrgTo=";
|
||||
vendorHash = "sha256-AIhAMgpVLMxeYoj4Jl4O92/etOtFD++ddV18R8aYRuY=";
|
||||
|
||||
subPackages = [ "cmd/goa" ];
|
||||
|
||||
|
2
pkgs/development/tools/rye/Cargo.lock
generated
2
pkgs/development/tools/rye/Cargo.lock
generated
@ -1697,7 +1697,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rye"
|
||||
version = "0.11.0"
|
||||
version = "0.13.0"
|
||||
dependencies = [
|
||||
"age",
|
||||
"anyhow",
|
||||
|
@ -10,13 +10,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rye";
|
||||
version = "0.11.0";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mitsuhiko";
|
||||
repo = pname;
|
||||
repo = "rye";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-00Q+qvK1fq9CGb6umtCiUJZZ1M5LMxiSIM3/s7eOumM=";
|
||||
hash = "sha256-B53oTAgy+y+FWk7y+unJPt7Mc7m4nwnTX+5wqL6AX+4=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ClassiCube";
|
||||
version = "1.3.5";
|
||||
version = "1.3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "UnknownShadow200";
|
||||
repo = "ClassiCube";
|
||||
rev = version;
|
||||
sha256 = "sha256-anBi9hPwX1AAIc8dXsKyX4u7UbkKqC1P+7f7wdKWAig=";
|
||||
sha256 = "sha256-7VPn5YXNoAR3ftYMDQuQRqeMCrbyB56ir1sQWBiPWAI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dos2unix makeWrapper copyDesktopItems ];
|
||||
@ -64,21 +64,17 @@ stdenv.mkDerivation rec {
|
||||
--replace '%NIXPKGS_FONT_PATH%' "${font_path}"
|
||||
# ClassiCube's Makefile hardcodes JOBS=1 for some reason,
|
||||
# even though it works perfectly well multi-threaded.
|
||||
substituteInPlace src/Makefile \
|
||||
substituteInPlace Makefile \
|
||||
--replace 'JOBS=1' "JOBS=$NIX_BUILD_CORES"
|
||||
'';
|
||||
|
||||
buildInputs = [ libX11 libXi libGL curl openal liberation_ttf ];
|
||||
|
||||
preBuild = "cd src";
|
||||
|
||||
postBuild = "cd -";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p "$out/bin"
|
||||
cp 'src/ClassiCube' "$out/bin"
|
||||
cp 'ClassiCube' "$out/bin"
|
||||
# ClassiCube puts downloaded resources
|
||||
# next to the location of the executable by default.
|
||||
# This doesn't work with Nix
|
||||
|
@ -1,7 +1,7 @@
|
||||
diff --git a/src/Makefile b/src/Makefile
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 83188ce..3439cdb 100644
|
||||
--- a/src/Makefile
|
||||
+++ b/src/Makefile
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -40,7 +40,7 @@ LIBS=-mwindows -lws2_32 -lwininet -lwinmm -limagehlp -lcrypt32 -ld3d9
|
||||
endif
|
||||
|
||||
|
@ -3,14 +3,14 @@
|
||||
let
|
||||
# These names are how they are designated in https://xanmod.org.
|
||||
ltsVariant = {
|
||||
version = "6.1.46";
|
||||
hash = "sha256-E9DEWfhl9hUAQXOvJVYJsKBFIen0xHrmiUdTUvGeKxE=";
|
||||
version = "6.1.47";
|
||||
hash = "sha256-yF05EkQ/sAvmoNW2waxNJRGGB0gnL85fFdl6pc6U8Eo=";
|
||||
variant = "lts";
|
||||
};
|
||||
|
||||
mainVariant = {
|
||||
version = "6.4.11";
|
||||
hash = "sha256-HZTLuxdlkVRBe8C95vr6Fk9YjlCXZEpK3gfbtzLqwLQ=";
|
||||
version = "6.4.12";
|
||||
hash = "sha256-rvSQJb9MIOXkGEjHOPt3x+dqp1AysvQg7n5yYsg95fk=";
|
||||
variant = "main";
|
||||
};
|
||||
|
||||
|
@ -2,12 +2,12 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "lenovo-legion-app";
|
||||
version = "2023-04-02-16-53-51";
|
||||
version = "0.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "johnfanv2";
|
||||
repo = "LenovoLegionLinux";
|
||||
rev = "main${version}";
|
||||
rev = "v${version}-prerelease";
|
||||
sha256 = "sha256-s4JFFmawokdC4qoqNvZDhuJSinhQ3YKSIfAYi79VTTA=";
|
||||
};
|
||||
|
||||
|
@ -36,13 +36,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "prl-tools";
|
||||
version = "18.3.2-53621";
|
||||
version = "19.0.0-54570";
|
||||
|
||||
# We download the full distribution to extract prl-tools-lin.iso from
|
||||
# => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso
|
||||
src = fetchurl {
|
||||
url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg";
|
||||
hash = "sha256-mPETZiCI/i6xJ3+ououDKaVwrAxK5cr6L6A16oEgIqk=";
|
||||
hash = "sha256-y7UC+E5i2cxkOJ9nVI6aQAFJ5kTXv9uaZoMO4/SCS6k=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "pic" "format" ];
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "metabase";
|
||||
version = "0.46.6.1";
|
||||
version = "0.46.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.metabase.com/v${version}/metabase.jar";
|
||||
hash = "sha256-EtJnv1FaI4lEu2X87tHvg/WuY0UcEa1bf3rb6vYS5cY=";
|
||||
hash = "sha256-LGtjzODVkoOr8yGcE+fpgMzINQG3lBchTujTsZGgARU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
@ -6,12 +6,14 @@ let
|
||||
x86_64-linux = "x64";
|
||||
aarch64-linux = "arm64";
|
||||
x86_64-darwin = "x64";
|
||||
aarch64-darwin = "arm64";
|
||||
}."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
hash = {
|
||||
x64-linux_hash = "sha256-Y08mLq/lpWqwcffPczL+ntS7CWLmOgz9irfbhIKbL5A=";
|
||||
arm64-linux_hash = "sha256-gswwyq9ZIObwrcs6PABhcN4saF8VDQHLpP2trAnVSck=";
|
||||
x64-osx_hash = "sha256-MxlUQLXiCg02AMTYsAWrM4l3IfgCRIPoU0cgwT8S98g=";
|
||||
arm64-osx_hash = "sha256-mZqP5hCJqSBY7BDooa+FGi6cdEey9DqVMV8fhp9/2IM=";
|
||||
}."${arch}-${os}_hash";
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
@ -50,6 +52,6 @@ in stdenv.mkDerivation rec {
|
||||
changelog = "https://github.com/Radarr/Radarr/releases/tag/v${version}";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ edwtjo purcell ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||
};
|
||||
}
|
||||
|
@ -40,3 +40,4 @@ updateVersion $latestVersion
|
||||
updateHash $latestVersion x64 linux
|
||||
updateHash $latestVersion arm64 linux
|
||||
updateHash $latestVersion x64 osx
|
||||
updateHash $latestVersion arm64 osx
|
||||
|
@ -1,4 +1,9 @@
|
||||
{ lib, python3, fetchFromGitHub, nixosTests }:
|
||||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "radicale";
|
||||
@ -11,6 +16,15 @@ python3.pkgs.buildPythonApplication rec {
|
||||
hash = "sha256-V0nqgxGUxcTRAYFuxpKUEVB/g/Mbvw+9OIcvAexXwuM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/Kozea/Radicale/pull/1328
|
||||
(fetchpatch {
|
||||
name = "fix-python3.11-tests.patch";
|
||||
url = "https://github.com/Kozea/Radicale/commit/110ec3a7885f523ce894a8c0e336c1a081dcd092.patch";
|
||||
hash = "sha256-WEiwzJ+Vzv8PXmZUi1X7Qzs+oE6qgmpvHqm/xiOMrt0=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/addopts/d' setup.cfg
|
||||
'';
|
||||
@ -23,6 +37,8 @@ python3.pkgs.buildPythonApplication rec {
|
||||
pytz # https://github.com/Kozea/Radicale/issues/816
|
||||
] ++ passlib.optional-dependencies.bcrypt;
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
pytestCheckHook
|
||||
waitress
|
||||
|
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "weaviate";
|
||||
version = "1.21.0";
|
||||
version = "1.21.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaviate";
|
||||
repo = "weaviate";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3FSXvo4egn3NZcHgLIOLbyi14qNMB4UHDUa+ox28gN8=";
|
||||
hash = "sha256-rWoVuWzfRJhhYDwOBcmSIJXh0WwvZFYM2GPOMvP98xM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-HUfkwmAIwTPDZsgRLte7tu/0QKT82WriTqJ14iiKKOs=";
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, fetchurl, writeText, plugins ? [ ], nixosTests }:
|
||||
|
||||
let
|
||||
version = "4.1.3";
|
||||
version = "4.1.4";
|
||||
|
||||
versionParts = lib.take 2 (lib.splitVersion version);
|
||||
# 4.2 -> 402, 3.11 -> 311
|
||||
@ -14,8 +14,8 @@ in stdenv.mkDerivation rec {
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz";
|
||||
hash = "sha256-JMK+nGgeBryC6I9cg1DD52gIGcPMAJ/xZxrC4a1R5Ps=";
|
||||
url = "https://download.moodle.org/download.php/direct/stable${stableVersion}/${pname}-${version}.tgz";
|
||||
hash = "sha256-mfJV5KHOG401N8gHFWYygsRRVnlWyn0SojD1H5KAvPQ=";
|
||||
};
|
||||
|
||||
phpConfig = writeText "config.php" ''
|
||||
|
@ -10,13 +10,13 @@
|
||||
}:
|
||||
let
|
||||
pname = "slskd";
|
||||
version = "0.18.1";
|
||||
version = "0.18.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "slskd";
|
||||
repo = "slskd";
|
||||
rev = version;
|
||||
sha256 = "sha256-RfwkMNUUt/iecf8A+OV8kyvF4LKWkYcwQ/KErERNWV4=";
|
||||
sha256 = "sha256-hWK6nbXAZTjxukx9EzkJkyEFlqXUkjanmv4VfHZxW24=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -1,27 +1,37 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mpd-mpris";
|
||||
version = "0.4.0-2";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "natsukagami";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RGuscED0RvA1+5Aj+Kcnk1h/whU4npJ6hPq8GHWwxPU=";
|
||||
sha256 = "sha256-QxPkGWpCWiyEbChH9SHeD+SiV8k0c/G7MG/azksP3xU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-GmdD/4VYp3KeblNGgltFWHdOnK5qsBa2ygIYOBrH+b0=";
|
||||
patches = [
|
||||
# Makes Exec= path not absolute, see https://github.com/natsukagami/mpd-mpris/pull/42
|
||||
(fetchpatch {
|
||||
url = "https://github.com/natsukagami/mpd-mpris/commit/8a5b53b1aa3174c3ccb1db24fb4e39f90012b98f.patch";
|
||||
hash = "sha256-LArPq+RRPJOs0je1olqg+pK7nvU7UIlrpGtHv2PhIY4=";
|
||||
})
|
||||
];
|
||||
|
||||
vendorHash = "sha256-HCDJrp9WFB1z+FnYpOI5e/AojtdnpN2ZNtgGVaH/v/Q=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
subPackages = [ "cmd/${pname}" ];
|
||||
|
||||
postInstall = ''
|
||||
substituteInPlace mpd-mpris.service \
|
||||
--replace /usr/bin $out/bin
|
||||
mkdir -p $out/lib/systemd/user
|
||||
cp mpd-mpris.service $out/lib/systemd/user
|
||||
install -Dm644 mpd-mpris.service $out/lib/systemd/user/mpd-mpris.service
|
||||
install -Dm644 mpd-mpris.desktop $out/etc/xdg/autostart/mpd-mpris.desktop
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fuse-overlayfs";
|
||||
version = "1.12";
|
||||
version = "1.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-k9ws3m0stPqzmi3WOAWH3RfQywlOa6l5SFvloanf5e0=";
|
||||
hash = "sha256-ngpC1KtUsIJOfpJ9dSqZn9XhKkJSpp2/6RBz/RlZ+A0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
@ -30,13 +30,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ueberzugpp";
|
||||
version = "2.9.0";
|
||||
version = "2.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jstkdng";
|
||||
repo = "ueberzugpp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-n1cSHHPCx6igJmBxAbny7gntZQk4cMb358zx7f2lMi8=";
|
||||
hash = "sha256-zI+ctJHxjDbAKjCFDpNgpQ6m6pPffd7TV5gmfPP/yv4=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
@ -40,7 +40,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vips";
|
||||
version = "8.14.3";
|
||||
version = "8.14.4";
|
||||
|
||||
outputs = [ "bin" "out" "man" "dev" ] ++ lib.optionals (!stdenv.isDarwin) [ "devdoc" ];
|
||||
|
||||
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "libvips";
|
||||
repo = "libvips";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2BE/cDQU/FP0Lo9/gZiG1IAskTbnhBtzbcL2dRziHmU=";
|
||||
hash = "sha256-y2Tyi8rxal3s3jLURRGPuCAUuHITRPl1+zJZDp557+I=";
|
||||
# Remove unicode file names which leads to different checksums on HFS+
|
||||
# vs. other filesystems because of unicode normalisation.
|
||||
postFetch = ''
|
||||
|
@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ibus-m17n";
|
||||
version = "1.4.19";
|
||||
version = "1.4.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ibus";
|
||||
repo = "ibus-m17n";
|
||||
rev = version;
|
||||
sha256 = "sha256-e/nw6UGaxWpDCKwI5r8MuSZjrE6u/S5njZYilFa4zJI=";
|
||||
sha256 = "sha256-wjWDqhhLqj77IxVpelChOEdUtneaGmL+IK2Sp3eObkA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -1,17 +1,17 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, python3, xmlbird,
|
||||
cairo, gdk-pixbuf, libgee, glib, gtk3, webkitgtk, libnotify, sqlite, vala,
|
||||
gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }:
|
||||
gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook, autoPatchelfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "birdfont";
|
||||
version = "2.32.3";
|
||||
version = "2.33.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://birdfont.org/releases/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-ZsYwDS7pgs635P3wPX/PCTuHLX3/Iu97HgVe+qFyjZw=";
|
||||
sha256 = "sha256-vFXpZNvsXpz7saRp6ruhvsP50rmJ2Prr2M78+8oxQ9M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ python3 pkg-config vala gobject-introspection wrapGAppsHook ];
|
||||
nativeBuildInputs = [ python3 pkg-config vala gobject-introspection wrapGAppsHook autoPatchelfHook ];
|
||||
buildInputs = [ xmlbird libgee cairo gdk-pixbuf glib gtk3 webkitgtk libnotify sqlite gsettings-desktop-schemas ];
|
||||
|
||||
postPatch = ''
|
||||
|
@ -1,32 +1,52 @@
|
||||
{ lib, fetchFromGitHub, python3Packages, help2man, installShellFiles }:
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, python3Packages
|
||||
, help2man
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "crudini";
|
||||
version = "0.9.3";
|
||||
version = "0.9.4";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pixelb";
|
||||
repo = "crudini";
|
||||
rev = version;
|
||||
sha256 = "0298hvg0fpk0m0bjpwryj3icksbckwqqsr9w1ain55wf5s0v24k3";
|
||||
hash = "sha256-jbTOaCF/ZqRpM0scDBBAcV5bSYg/QhBPbM9R5cONZ2o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ help2man installShellFiles ];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [ iniparse ];
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "add-missing-install-file.patch";
|
||||
url = "https://github.com/pixelb/crudini/commit/d433e4d9c4106ae26985e3f4b2efa593bdd5c274.patch";
|
||||
hash = "sha256-aDGzoG4i2tvYeL8m1WoqwNFNHe4xR1dGk+XDt3f3i5E=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace crudini-help \
|
||||
--replace ./crudini $out/bin/crudini
|
||||
substituteInPlace tests/test.sh \
|
||||
--replace ..: $out/bin:
|
||||
patchShebangs crudini.py crudini-help tests/test.sh
|
||||
'';
|
||||
|
||||
env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
help2man
|
||||
installShellFiles
|
||||
python3Packages.setuptools
|
||||
python3Packages.setuptools-scm
|
||||
python3Packages.wheel
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [ iniparse ];
|
||||
|
||||
postInstall = ''
|
||||
# this just creates the man page
|
||||
make all
|
||||
|
||||
install -Dm444 -t $out/share/doc/${pname} README EXAMPLES
|
||||
install -Dm444 -t $out/share/doc/${pname} README.md EXAMPLES
|
||||
installManPage *.1
|
||||
'';
|
||||
|
||||
@ -34,7 +54,7 @@ python3Packages.buildPythonApplication rec {
|
||||
runHook preCheck
|
||||
|
||||
pushd tests >/dev/null
|
||||
bash ./test.sh
|
||||
./test.sh
|
||||
popd >/dev/null
|
||||
|
||||
runHook postCheck
|
||||
@ -45,5 +65,6 @@ python3Packages.buildPythonApplication rec {
|
||||
homepage = "https://www.pixelbeat.org/programs/crudini/";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
mainProgram = "crudini";
|
||||
};
|
||||
}
|
||||
|
@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ddccontrol";
|
||||
version = "0.6.1";
|
||||
version = "0.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ddccontrol";
|
||||
repo = "ddccontrol";
|
||||
rev = version;
|
||||
sha256 = "sha256-En2e0FDKLpMjuxa2aXuvI6h7d+D1D5x1dDg96924/qM=";
|
||||
sha256 = "sha256-Me7E5dUo3tnuXInWF19AmrcyKMtBlugVmvQHULMMMoA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -46,10 +46,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
substituteInPlace src/ddcpci/Makefile.am \
|
||||
--replace "chmod 4711" "chmod 0711"
|
||||
'' + lib.optionalString (lib.versionAtLeast "0.6.1" version) ''
|
||||
# Upstream PR: https://github.com/ddccontrol/ddccontrol/pull/115
|
||||
substituteInPlace src/lib/Makefile.am \
|
||||
--replace "/etc/" "\$""{sysconfdir}/"
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pgmetrics";
|
||||
version = "1.15.1";
|
||||
version = "1.15.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rapidloop";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6JqlAJHFJAvJjLqOwXLmW7sRwQCmYFfLGrSw5lTY8Sc=";
|
||||
sha256 = "sha256-WzyTLOJo/wTZA9glxO0ovcaADlHV+AKLChWSLJ+uvaQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-KIMnvGMIipuIFPTSeERtCfvlPuvHvEHdjBJ1TbT2d1s=";
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "viddy";
|
||||
version = "0.3.6";
|
||||
version = "0.3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sachaos";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-AcRfKu6P7b/HsuC6DTezbYLI9rQZwjklH/bs7mKITUk=";
|
||||
hash = "sha256-82q73L0641d5qNmB+WLkUmDP5OHMoj2SNFc+FhknhwU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-QxYM4N3E/BqmeNaofLR1crwFLVaF3IigDXKlKA2Bkuw=";
|
||||
vendorHash = "sha256-FMSgLI1W5keRnSYVyY0XuarMzLWvm9D1ufUYmZttfxk=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
@ -2,19 +2,19 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "xcp";
|
||||
version = "0.10.2";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tarka";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XFLkz6beTSto+iFjqKCLyXssXL+OccM3MNI4ldgbsqI=";
|
||||
sha256 = "sha256-QCoH8N6HDpXQXWchccGIG/pbDx9qZ8YKM6VP6lxoYzU=";
|
||||
};
|
||||
|
||||
# no such file or directory errors
|
||||
doCheck = false;
|
||||
|
||||
cargoHash = "sha256-Bf9OjViNuE6keCmDQDlqSVterKdcgWaH031CyzviApA=";
|
||||
cargoHash = "sha256-F51BHBUaQx1xg0Y2eVnXGRCMykbzk3q5IyJ528JyA5o=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "An extended cp(1)";
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nix-doc";
|
||||
version = "0.5.10";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "lf-";
|
||||
repo = "nix-doc";
|
||||
sha256 = "sha256-+T4Bz26roTFiXTM8P8FnJLSdFY2hP26X4nChWWUACN8=";
|
||||
sha256 = "sha256-1y4BSdKgsV4WLcaNICVh5rac1ZAtZxFM3BlhL2g/AcI=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
|
||||
RUSTFLAGS = "-Z relro-level=partial";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-GylSWo4LIsjKnJE9H6iJHZ99UI6UPhAOnAGXk+v8bko=";
|
||||
cargoSha256 = "sha256-nP03WnXBcwazAi6nVe17CpDSeUxmG84BFFMA5ueey3M=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "An interactive Nix documentation tool";
|
||||
|
@ -12,16 +12,16 @@ let
|
||||
buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_18; };
|
||||
in buildNpmPackage' rec {
|
||||
pname = "bitwarden-cli";
|
||||
version = "2023.7.0";
|
||||
version = "2023.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitwarden";
|
||||
repo = "clients";
|
||||
rev = "cli-v${version}";
|
||||
hash = "sha256-Xnfjp+qRJWvxvgSODbajLxYsP2DtOYK9CXBMfIn+qwA=";
|
||||
hash = "sha256-v9ql01dwWf9kBxw75n9svQousrnbUi8NY1wkJx06teg=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-vz7erDhh3BpHNadPwIXkD2PRCnbxM7e7lE0rvBEXGyc=";
|
||||
npmDepsHash = "sha256-RvkauNvt6MZxWMssEtaCjXP1z/3NsReywUgCefV/jjM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3
|
||||
|
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2023-08-25";
|
||||
version = "2023-08-30";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "exploit-database";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-kDwhmkx+nxqtpyKp9mmnTbu6pzGL/J4/NP2mojljgws=";
|
||||
hash = "sha256-EWxZvr0VbSN8aysDQmqA/d/V5bxy4z1wx2PtC5RVAuI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -2,32 +2,10 @@
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
let
|
||||
py = python3.override {
|
||||
packageOverrides = final: prev: {
|
||||
# required for networkx 2.5.1
|
||||
decorator = prev.decorator.overridePythonAttrs (o: o // rec {
|
||||
version = "4.4.2";
|
||||
src = o.src.override {
|
||||
inherit version;
|
||||
hash = "sha256-46YvBSAXJEDKDcyCN0kxk4Ljd/N/FAoLme9F/suEv+c=";
|
||||
};
|
||||
});
|
||||
|
||||
# flare-floss requires this exact version (newer versions are incompatible)
|
||||
networkx = prev.networkx.overridePythonAttrs (o: o // rec {
|
||||
version = "2.5.1";
|
||||
src = o.src.override {
|
||||
inherit version;
|
||||
hash = "sha256-EJzVhcrEEpf3EQPDxCrG73N58peI61TLdRvlpmO7I1o=";
|
||||
};
|
||||
});
|
||||
};
|
||||
};
|
||||
in
|
||||
py.pkgs.buildPythonPackage rec {
|
||||
python3.pkgs.buildPythonPackage rec {
|
||||
pname = "flare-floss";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@ -35,7 +13,7 @@ py.pkgs.buildPythonPackage rec {
|
||||
repo = "flare-floss";
|
||||
rev = "refs/tags/v${version}";
|
||||
fetchSubmodules = true; # for tests
|
||||
hash = "sha256-Oa0DMl7RKNfA00shcc4y1sNd2OiKCf0sA0EUC5gByBI=";
|
||||
hash = "sha256-tOLnve5XBc3TtSgucPIddBHD0YJhsRpRduXsKrtJ/eQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -46,17 +24,19 @@ py.pkgs.buildPythonPackage rec {
|
||||
--replace 'sigs_path = os.path.join(get_default_root(), "sigs")' 'sigs_path = "'"$out"'/share/flare-floss/sigs"'
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with py.pkgs; [
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
halo
|
||||
networkx
|
||||
pefile
|
||||
pydantic
|
||||
rich
|
||||
tabulate
|
||||
tqdm
|
||||
viv-utils
|
||||
vivisect
|
||||
] ++ viv-utils.optional-dependencies.flirt;
|
||||
|
||||
nativeCheckInputs = with py.pkgs; [
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
pytest-sugar
|
||||
pytestCheckHook
|
||||
pyyaml
|
||||
|
@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "trufflehog";
|
||||
version = "3.53.0";
|
||||
version = "3.54.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trufflesecurity";
|
||||
repo = "trufflehog";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-O1MCl9chqiOGxOUYxaQNs0gXHgVkT8ZgSSTQXj63f90=";
|
||||
hash = "sha256-JPXzo6f1meLIoRdbKN58Hhl502UjgxPrC8MDoizzUvs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-RHNt9GxqWb4EDKg5of5s88iUmJPI2w7i5hPoCFMmnew=";
|
||||
vendorHash = "sha256-zYvKhhwN5TtJQxkkcY5U9LtTdMb97ucfksxpTMKH/Zc=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
@ -336,7 +336,9 @@ with pkgs;
|
||||
|
||||
banana-accounting = callPackage ../applications/office/banana-accounting { };
|
||||
|
||||
beebeep = libsForQt5.callPackage ../applications/office/beebeep {};
|
||||
beebeep = libsForQt5.callPackage ../applications/office/beebeep { };
|
||||
|
||||
beeper = qt5.callPackage ../applications/networking/instant-messengers/beeper { };
|
||||
|
||||
bakelite = callPackage ../tools/backup/bakelite { };
|
||||
|
||||
@ -34666,7 +34668,7 @@ with pkgs;
|
||||
|
||||
orca-c = callPackage ../applications/audio/orca-c { };
|
||||
|
||||
organicmaps = libsForQt5.callPackage ../applications/misc/organicmaps { };
|
||||
organicmaps = qt6Packages.callPackage ../applications/misc/organicmaps { };
|
||||
|
||||
osm2xmap = callPackage ../applications/misc/osm2xmap { };
|
||||
|
||||
|
@ -12708,11 +12708,11 @@ with self; {
|
||||
|
||||
ImageExifTool = buildPerlPackage rec {
|
||||
pname = "Image-ExifTool";
|
||||
version = "12.62";
|
||||
version = "12.65";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://exiftool.org/Image-ExifTool-${version}.tar.gz";
|
||||
hash = "sha256-SZCkbGm2VoiNfVcyuvQDnalkaI7d33ocLutRQEmZ7B0=";
|
||||
hash = "sha256-YWynZES+4/MkYueeN8Y3IC7vKGb0wkANUfIKgScDJDI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;
|
||||
|
Loading…
Reference in New Issue
Block a user