Merge master into staging-next
This commit is contained in:
@@ -78,7 +78,7 @@ in
|
||||
s3.wait_for_unit("minio.service")
|
||||
s3.wait_for_open_port(9000)
|
||||
s3.succeed(
|
||||
"mc config host add minio "
|
||||
"mc alias set minio "
|
||||
+ "http://localhost:9000 "
|
||||
+ "${accessKey} ${secretKey} --api s3v4",
|
||||
"mc mb minio/attic",
|
||||
|
||||
@@ -126,7 +126,7 @@ runTest (
|
||||
|
||||
with subtest("Check if file is in S3"):
|
||||
nextcloud.succeed(
|
||||
"mc config host add minio https://acme.test ${accessKey} ${secretKey} --api s3v4"
|
||||
"mc alias set minio https://acme.test ${accessKey} ${secretKey} --api s3v4"
|
||||
)
|
||||
files = nextcloud.succeed('mc ls minio/nextcloud|sort').strip().split('\n')
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@ in
|
||||
|
||||
# Create a test bucket on the server
|
||||
machine.succeed(
|
||||
"mc config host add minio http://localhost:9000 ${accessKey} ${secretKey} --api s3v4"
|
||||
"mc alias set minio http://localhost:9000 ${accessKey} ${secretKey} --api s3v4"
|
||||
)
|
||||
machine.succeed("mc mb minio/outline")
|
||||
|
||||
|
||||
@@ -234,7 +234,7 @@ import ./make-test-python.nix {
|
||||
s3.wait_for_unit("minio.service")
|
||||
s3.wait_for_open_port(${toString minioPort})
|
||||
s3.succeed(
|
||||
"mc config host add minio "
|
||||
"mc alias set minio "
|
||||
+ "http://localhost:${toString minioPort} "
|
||||
+ "${s3.accessKey} ${s3.secretKey} --api s3v4",
|
||||
"mc mb minio/thanos-bucket",
|
||||
|
||||
@@ -141,7 +141,7 @@ in
|
||||
machine.wait_for_unit("lasuite-docs-collaboration-server.service")
|
||||
|
||||
with subtest("Create S3 bucket"):
|
||||
machine.succeed("mc config host add minio http://${s3Domain} ${minioAccessKey} ${minioSecretKey} --api s3v4")
|
||||
machine.succeed("mc alias set minio http://${s3Domain} ${minioAccessKey} ${minioSecretKey} --api s3v4")
|
||||
machine.succeed("mc mb lasuite-docs")
|
||||
|
||||
with subtest("Wait for web servers to start"):
|
||||
|
||||
@@ -2566,22 +2566,7 @@ let
|
||||
|
||||
jackmacwindows.craftos-pc = callPackage ./jackmacwindows.craftos-pc { };
|
||||
|
||||
james-yu.latex-workshop = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "latex-workshop";
|
||||
publisher = "James-Yu";
|
||||
version = "10.9.1";
|
||||
sha256 = "sha256-R+tJ3k71rlzfxtz4Dib6JiU7Sipq/UTP38ERAhojY7c=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog";
|
||||
description = "LaTeX Workshop Extension";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=James-Yu.latex-workshop";
|
||||
homepage = "https://github.com/James-Yu/LaTeX-Workshop";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
};
|
||||
};
|
||||
james-yu.latex-workshop = callPackage ./james-yu.latex-workshop { };
|
||||
|
||||
jamesyang999.vscode-emacs-minimum = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
{
|
||||
lib,
|
||||
vscode-utils,
|
||||
}:
|
||||
|
||||
vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "latex-workshop";
|
||||
publisher = "James-Yu";
|
||||
version = "10.10.0";
|
||||
hash = "sha256-3Rdoer5n2jf8PLRGgg/nqGRoRwQLCdcOXkmKay5uDWE=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog";
|
||||
description = "LaTeX Workshop Extension";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=James-Yu.latex-workshop";
|
||||
homepage = "https://github.com/James-Yu/LaTeX-Workshop";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.therobot2105 ];
|
||||
};
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
libsForQt5,
|
||||
file,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "dfilemanager";
|
||||
version = "unstable-2021-02-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "probonopd";
|
||||
repo = "dfilemanager";
|
||||
rev = "61179500a92575e05cf9a71d401c388726bfd73d";
|
||||
hash = "sha256-BHd2dZDVxy82vR6PyXIS5M6zBGJ4bQfOhdBCdOww4kc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qttools
|
||||
libsForQt5.solid
|
||||
file
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DQT5BUILD=true" ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/probonopd/dfilemanager";
|
||||
description = "File manager written in Qt/C++";
|
||||
mainProgram = "dfm";
|
||||
license = lib.licenses.gpl2;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
@@ -4,6 +4,7 @@
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
installShellFiles,
|
||||
btrfs-progs,
|
||||
gpgme,
|
||||
lvm2,
|
||||
@@ -21,7 +22,10 @@ buildGoModule rec {
|
||||
|
||||
vendorHash = "sha256-egsFnnHZMPRTJeFw6uByE9OJH06zqKRTvQi9XhegbDI=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
btrfs-progs
|
||||
@@ -35,6 +39,13 @@ buildGoModule rec {
|
||||
"-X main.version=${version}"
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd dive \
|
||||
--bash <($out/bin/dive completion bash) \
|
||||
--fish <($out/bin/dive completion fish) \
|
||||
--zsh <($out/bin/dive completion zsh)
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Tool for exploring each layer in a docker image";
|
||||
mainProgram = "dive";
|
||||
|
||||
@@ -6,27 +6,42 @@
|
||||
cmake,
|
||||
nasm,
|
||||
libpng,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "efficient-compression-tool";
|
||||
version = "0.9.1";
|
||||
version = "0.9.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fhanau";
|
||||
repo = "Efficient-Compression-Tool";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-TSV5QXf6GuHAwQrde3Zo9MA1rtpAhtRg0UTzMkBnHB8=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-mlqRDYwgLiB/mRaXkkPTCLiDGxTXqEgu5Nz5jhr1Hsg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# devendor libpng
|
||||
postPatch = ''
|
||||
substituteInPlace src/CMakeLists.txt \
|
||||
--replace-fail 'if(EXISTS "''${CMAKE_SOURCE_DIR}/../.git" AND NOT EXISTS "''${CMAKE_SOURCE_DIR}/../src/libpng/README")' 'if(False)' \
|
||||
--replace-fail 'file(COPY ''${CMAKE_SOURCE_DIR}/pngusr.h DESTINATION ''${CMAKE_SOURCE_DIR}/libpng/)' ""
|
||||
substituteInPlace src/optipng/CMakeLists.txt \
|
||||
--replace-fail 'set(PNG_BUILD_ZLIB ON CACHE BOOL "use custom zlib within libpng" FORCE)' "" \
|
||||
--replace-fail 'add_subdirectory(../libpng libpng EXCLUDE_FROM_ALL)' "" \
|
||||
--replace-fail 'png_static)' 'png)'
|
||||
substituteInPlace src/optipng/image.h src/optipng/trans.h \
|
||||
--replace-fail '#include "../libpng/png.h"' '#include <png.h>'
|
||||
substituteInPlace src/optipng/opngreduc/opngreduc.h \
|
||||
--replace-fail '#include "../../libpng/png.h"' '#include <png.h>'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
nasm
|
||||
];
|
||||
|
||||
patches = [ ./use-nixpkgs-libpng.patch ];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
libpng
|
||||
@@ -36,17 +51,25 @@ stdenv.mkDerivation rec {
|
||||
|
||||
cmakeFlags = [ "-DECT_FOLDER_SUPPORT=ON" ];
|
||||
|
||||
CXXFLAGS = [
|
||||
# GCC 13: error: 'uint32_t' does not name a type
|
||||
"-include cstdint"
|
||||
];
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}";
|
||||
versionCheckProgramArg = "-help";
|
||||
|
||||
meta = with lib; {
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Fast and effective C++ file optimizer";
|
||||
homepage = "https://github.com/fhanau/Efficient-Compression-Tool";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.lunik1 ];
|
||||
platforms = platforms.linux;
|
||||
changelog = "https://github.com/fhanau/Efficient-Compression-Tool/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
jwillikers
|
||||
lunik1
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
mainProgram = "ect";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,108 +0,0 @@
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index d18843c..a9df1fb 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -8,11 +8,6 @@ if(NOT CMAKE_BUILD_TYPE)
|
||||
set(CMAKE_BUILD_TYPE Release)
|
||||
endif()
|
||||
|
||||
-# Check that submodules are present only if source was downloaded with git
|
||||
-if(EXISTS "${CMAKE_SOURCE_DIR}/../.git" AND NOT EXISTS "${CMAKE_SOURCE_DIR}/../src/libpng/README")
|
||||
- message (FATAL_ERROR "Submodules are not initialized. Run \n\tgit submodule update --init --recursive\n within the repository")
|
||||
-endif()
|
||||
-
|
||||
add_executable(ect
|
||||
main.cpp
|
||||
gztools.cpp
|
||||
@@ -56,7 +51,6 @@ add_subdirectory(lodepng EXCLUDE_FROM_ALL)
|
||||
add_subdirectory(miniz EXCLUDE_FROM_ALL)
|
||||
add_subdirectory(zlib EXCLUDE_FROM_ALL)
|
||||
add_subdirectory(zopfli EXCLUDE_FROM_ALL)
|
||||
-file(COPY ${CMAKE_SOURCE_DIR}/pngusr.h DESTINATION ${CMAKE_SOURCE_DIR}/libpng/)
|
||||
add_subdirectory(optipng EXCLUDE_FROM_ALL)
|
||||
# Mozjpeg changes the install prefix if it thinks the current is defaulted
|
||||
set(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT FALSE)
|
||||
diff --git a/src/Makefile b/src/Makefile
|
||||
index cc24367..7aa9f0a 100755
|
||||
--- a/src/Makefile
|
||||
+++ b/src/Makefile
|
||||
@@ -18,7 +18,7 @@ CXXSRC = support.cpp zopflipng.cpp zopfli/deflate.cpp zopfli/zopfli_gzip.cpp zop
|
||||
lodepng/lodepng.cpp lodepng/lodepng_util.cpp optipng/codec.cpp optipng/optipng.cpp jpegtran.cpp gztools.cpp \
|
||||
leanify/zip.cpp leanify/leanify.cpp
|
||||
|
||||
-.PHONY: libpng mozjpeg deps bin all install
|
||||
+.PHONY: mozjpeg deps bin all install
|
||||
all: deps bin
|
||||
|
||||
bin: deps
|
||||
@@ -33,9 +33,6 @@ libz.a:
|
||||
cd zlib/; \
|
||||
$(CC) $(UCFLAGS) -c adler32.c crc32.c deflate.c inffast.c inflate.c inftrees.c trees.c zutil.c gzlib.c gzread.c; \
|
||||
ar rcs ../libz.a adler32.o crc32.o deflate.o inffast.o inflate.o inftrees.o trees.o zutil.o gzlib.o gzread.o
|
||||
-libpng:
|
||||
- cp pngusr.h libpng/pngusr.h
|
||||
- make -C libpng/ -f scripts/makefile.linux-opt CC="$(CC)" CFLAGS="$(UCFLAGS) -DPNG_USER_CONFIG -Wno-macro-redefined" libpng.a
|
||||
mozjpeg:
|
||||
cd mozjpeg/; \
|
||||
export CC="$(CC)"; \
|
||||
diff --git a/src/optipng/CMakeLists.txt b/src/optipng/CMakeLists.txt
|
||||
index 1037a20..3c751e9 100644
|
||||
--- a/src/optipng/CMakeLists.txt
|
||||
+++ b/src/optipng/CMakeLists.txt
|
||||
@@ -16,16 +16,14 @@ add_library(optipng
|
||||
add_library(optipng::optipng ALIAS optipng)
|
||||
|
||||
#make sure that we are using custom zlib and custom libpng options
|
||||
-set(PNG_BUILD_ZLIB ON CACHE BOOL "use custom zlib within libpng" FORCE)
|
||||
set(ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../zlib/ CACHE FILEPATH "custom zlib directory" FORCE)
|
||||
if(NOT WIN32)
|
||||
add_compile_options(-Wno-macro-redefined)
|
||||
endif()
|
||||
add_compile_definitions(PNG_USER_CONFIG)
|
||||
|
||||
-add_subdirectory(../libpng libpng EXCLUDE_FROM_ALL)
|
||||
target_link_libraries(optipng
|
||||
- png_static)
|
||||
+ png)
|
||||
|
||||
# libpng generates some header files that we need to be able to include
|
||||
target_include_directories(optipng
|
||||
diff --git a/src/optipng/image.h b/src/optipng/image.h
|
||||
index c439f84..8255fa0 100755
|
||||
--- a/src/optipng/image.h
|
||||
+++ b/src/optipng/image.h
|
||||
@@ -13,7 +13,7 @@
|
||||
#ifndef OPNGCORE_IMAGE_H
|
||||
#define OPNGCORE_IMAGE_H
|
||||
|
||||
-#include "../libpng/png.h"
|
||||
+#include <png.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
diff --git a/src/optipng/opngreduc/opngreduc.h b/src/optipng/opngreduc/opngreduc.h
|
||||
index a7e6553..06ef956 100755
|
||||
--- a/src/optipng/opngreduc/opngreduc.h
|
||||
+++ b/src/optipng/opngreduc/opngreduc.h
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
#include <stdbool.h>
|
||||
|
||||
-#include "../../libpng/png.h"
|
||||
+#include <png.h>
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
diff --git a/src/optipng/trans.h b/src/optipng/trans.h
|
||||
index a2f7f3e..c0e8dc4 100755
|
||||
--- a/src/optipng/trans.h
|
||||
+++ b/src/optipng/trans.h
|
||||
@@ -13,7 +13,7 @@
|
||||
#ifndef OPNGTRANS_TRANS_H
|
||||
#define OPNGTRANS_TRANS_H
|
||||
|
||||
-#include "../libpng/png.h"
|
||||
+#include <png.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
@@ -33,11 +33,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "knot-dns";
|
||||
version = "3.4.6";
|
||||
version = "3.4.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
|
||||
sha256 = "sha256-0ZxaH/lLTyYCfWNd4Qjb/Ij1ZSvobMs7qaRO6b4OWDk=";
|
||||
sha256 = "sha256-3TRspvOvq83F6boJ3WZ7AQWQu2akL0VBAh+51vBz2sw=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -41,7 +41,7 @@ rustPlatform.buildRustPackage {
|
||||
meta = {
|
||||
description = "Tui-based PDF viewer";
|
||||
homepage = "https://github.com/itsjunetime/tdf";
|
||||
license = lib.licenses.mpl20;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
luftmensch-luftmensch
|
||||
DieracDelta
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
Disable dprint on dstBundler
|
||||
|
||||
dprint fails on sandbox, because it requires internet access to install its
|
||||
plugins.
|
||||
|
||||
--- a/scripts/dtsBundler.mjs
|
||||
+++ b/scripts/dtsBundler.mjs
|
||||
@@ -430,5 +430,5 @@
|
||||
return result.replace(/\r\n/g, "\n");
|
||||
}
|
||||
|
||||
-fs.writeFileSync(output, dprint(publicContents));
|
||||
-fs.writeFileSync(internalOutput, dprint(internalContents));
|
||||
+fs.writeFileSync(output, publicContents);
|
||||
+fs.writeFileSync(internalOutput, internalContents);
|
||||
+5445
File diff suppressed because it is too large
Load Diff
@@ -1,40 +1,72 @@
|
||||
{
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
testers,
|
||||
typescript,
|
||||
fetchurl,
|
||||
versionCheckHook,
|
||||
writeShellApplication,
|
||||
nodejs,
|
||||
gnutar,
|
||||
nix-update,
|
||||
prefetch-npm-deps,
|
||||
gnused,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "typescript";
|
||||
version = "5.8.2";
|
||||
version = "5.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "TypeScript";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-fOA5IblxUd+C9ST3oI8IUmTTRL3exC63MPqW5hoWN0M=";
|
||||
# Prefer npmjs over the GitHub repository for source code.
|
||||
# The TypeScript project typically publishes stable, versioned code to npmjs,
|
||||
# whereas GitHub tags may sometimes include development versions.
|
||||
# For example:
|
||||
# - https://github.com/microsoft/TypeScript/pull/61218#issuecomment-2911264050
|
||||
# - https://github.com/microsoft/TypeScript/pull/60150#issuecomment-2648791588, 5.8.3 includes this 5.9 breaking change
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/typescript/-/typescript-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-cuddvrksLm65o0y1nXT6tcLubzKgMkqJQF9hZdWgg3Q=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./disable-dprint-dstBundler.patch
|
||||
postPatch = ''
|
||||
ln -s '${./package-lock.json}' package-lock.json
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-Y/+QPAVOQWKxrHBNEejC3UZrYKQNm7CleR0whFm2sLw=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
doInstallCheck = true;
|
||||
versionCheckProgram = "${placeholder "out"}/bin/tsc";
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
npmDepsHash = "sha256-ytdkxIjAd3UsU90o9IFZa5lGEv39zblBmgTTseVRGKQ=";
|
||||
|
||||
passthru.tests = {
|
||||
version = testers.testVersion {
|
||||
package = typescript;
|
||||
};
|
||||
passthru = {
|
||||
updateScript = lib.getExe (writeShellApplication {
|
||||
name = "${finalAttrs.pname}-updater";
|
||||
runtimeInputs = [
|
||||
nodejs
|
||||
gnutar
|
||||
nix-update
|
||||
prefetch-npm-deps
|
||||
gnused
|
||||
];
|
||||
runtimeEnv = {
|
||||
PNAME = finalAttrs.pname;
|
||||
PKG_DIR = builtins.toString ./.;
|
||||
};
|
||||
text = builtins.readFile ./update.bash;
|
||||
});
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Superset of JavaScript that compiles to clean JavaScript output";
|
||||
homepage = "https://www.typescriptlang.org/";
|
||||
changelog = "https://github.com/microsoft/TypeScript/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ ];
|
||||
changelog = "https://github.com/microsoft/TypeScript/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
kachick
|
||||
];
|
||||
mainProgram = "tsc";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
cd "$PKG_DIR"
|
||||
|
||||
# Update lockfile
|
||||
version="$(npm view typescript version)"
|
||||
npm pack typescript
|
||||
tar xvf "typescript-${version}.tgz"
|
||||
mv package/package.json ./
|
||||
npm install --package-lock-only
|
||||
npmDepsHash=$(prefetch-npm-deps ./package-lock.json)
|
||||
rm -rf ./package ./package.json ./"typescript-${version}.tgz"
|
||||
|
||||
cd -
|
||||
|
||||
# Update version and hashes
|
||||
nix-update "$PNAME" --version "$version"
|
||||
sed -E 's#\bnpmDepsHash = ".*?"#npmDepsHash = "'"$npmDepsHash"'"#' -i "$PKG_DIR/package.nix"
|
||||
@@ -28,13 +28,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "uwsm";
|
||||
version = "0.21.4";
|
||||
version = "0.21.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Vladimir-csp";
|
||||
repo = "uwsm";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/URa5/NK4AowYx933HwKE01191HMRSvuxtDKFKiMQr8=";
|
||||
hash = "sha256-Pav86kNCIe1cqkkPyAt8yGCR1M7wGHPSGibkeLCE4E4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
{
|
||||
"darwin": {
|
||||
"hash": "sha256-II8VDM6qBkep+v017+hhOfx+wfHoMo5lR22IvvXmiy8=",
|
||||
"version": "0.2025.05.28.08.11.stable_02"
|
||||
"hash": "sha256-oPBB3tCxLMogV3SEr7QHjFgOw8n7bfuwFSRdgWwSb9Y=",
|
||||
"version": "0.2025.05.28.08.11.stable_03"
|
||||
},
|
||||
"linux_x86_64": {
|
||||
"hash": "sha256-7/U/ZPJLNbBpk0fNAh0OHr68+x5zhYsbJn+vc09/h4w=",
|
||||
"version": "0.2025.05.28.08.11.stable_02"
|
||||
"hash": "sha256-pVXmosjXXnSyOrLEUzZtLWs1KWkyDRXSjHV6rdvuK6U=",
|
||||
"version": "0.2025.05.28.08.11.stable_03"
|
||||
},
|
||||
"linux_aarch64": {
|
||||
"hash": "sha256-TX1OYadvUdOp9R3eDdw1ONtN/wn7K8m1IH1IwIdSuJQ=",
|
||||
"version": "0.2025.05.28.08.11.stable_02"
|
||||
"hash": "sha256-LKFkJg5NEgtjvjK1gzo4ZQqQQbxmzRgP+CNznlgUfJo=",
|
||||
"version": "0.2025.05.28.08.11.stable_03"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ngtcp2";
|
||||
version = "1.12.0";
|
||||
version = "1.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ngtcp2";
|
||||
repo = "ngtcp2";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-WAZKlIGwSn/U3MPF2RDOscZ5EVqQyViViy9beQeroNs=";
|
||||
hash = "sha256-SvxGZoV4N9wNAsI5pOjjGECgk2vV0FifzHi1gbGjqnc=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django";
|
||||
version = "5.2.1";
|
||||
version = "5.2.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@@ -53,7 +53,7 @@ buildPythonPackage rec {
|
||||
owner = "django";
|
||||
repo = "django";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-JmO2IEWrpA7/FXOwESLvIIuHmi2HQgvg28LVNmBXgLA=";
|
||||
hash = "sha256-x5PTE8oYA1VzErYXfuRzT4xNiMRnfEd6H9lEtB+HBkc=";
|
||||
};
|
||||
|
||||
patches =
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
click,
|
||||
fetchFromGitHub,
|
||||
justbackoff,
|
||||
pyserial-asyncio,
|
||||
pyserial-asyncio-fast,
|
||||
pythonOlder,
|
||||
pytest-asyncio,
|
||||
pytestCheckHook,
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nessclient";
|
||||
version = "1.1.2";
|
||||
version = "1.2.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "nickw444";
|
||||
repo = "nessclient";
|
||||
tag = version;
|
||||
hash = "sha256-STDEIY7D02MlH+R6uLAKl6ghSQjhG1OEQWj71DrZP30=";
|
||||
hash = "sha256-AKZwKEwICuwKyCjIFxx4Zb2r9EriC0+3evBsBE9Btak=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -34,7 +34,7 @@ buildPythonPackage rec {
|
||||
|
||||
dependencies = [
|
||||
justbackoff
|
||||
pyserial-asyncio
|
||||
pyserial-asyncio-fast
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tencentcloud-sdk-python";
|
||||
version = "3.0.1391";
|
||||
version = "3.0.1393";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "TencentCloud";
|
||||
repo = "tencentcloud-sdk-python";
|
||||
tag = version;
|
||||
hash = "sha256-bzxaCN2fXoZT2W8zpTg7DrBTmRfyUi2aVhrg+/Y1YkU=";
|
||||
hash = "sha256-cw+H8CvyCWbhYvNkGFesSqqhHwlUg3oHCKn9Vtll3JA=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -531,6 +531,7 @@ mapAliases {
|
||||
|
||||
demjson = with python3Packages; toPythonApplication demjson; # Added 2022-01-18
|
||||
devdash = throw "'devdash' has been removed as the upstream project was archived"; # Added 2025-03-27
|
||||
dfilemanager = throw "'dfilemanager' has been dropped as it was unmaintained"; # Added 2025-06-03
|
||||
dgsh = throw "'dgsh' has been removed, as it was broken and unmaintained"; # added 2024-05-09
|
||||
dibbler = throw "dibbler was removed because it is not maintained anymore"; # Added 2024-05-14
|
||||
dillong = throw "'dillong' has been removed, as upstream is abandoned since 2021-12-13. Use either 'dillo' or 'dillo-plus'. The latter integrates features from dillong."; # Added 2024-10-07
|
||||
|
||||
Reference in New Issue
Block a user