Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
f5558d8fda
72 changed files with 1449 additions and 1197 deletions
|
|
@ -1 +1 @@
|
|||
WGET_ARGS=( https://download.kde.org/stable/release-service/22.04.0/src -A '*.tar.xz' )
|
||||
WGET_ARGS=( https://download.kde.org/stable/release-service/22.04.1/src -A '*.tar.xz' )
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -30,18 +30,23 @@ mkDerivation rec {
|
|||
sha256 = "11dzrp9q05dmvnwp4vk4ihcibqcf4xyr0ijscpi716cyy730flma";
|
||||
excludes = [ "CMakeLists.txt" ];
|
||||
})
|
||||
# Fixes for building calligra with modern poppler[-qt5]
|
||||
(fetchpatch {
|
||||
name = "poppler-22.03.0.patch";
|
||||
url = "https://github.com/archlinux/svntogit-packages/raw/8f328bef497a9e3bc628e4e294c1a70b0c8b0eab/trunk/poppler-22.03.0.patch";
|
||||
sha256 = "sha256-bOTnQcavXF49LIshNgzhXhyoEjzLmQJC/U7hO5P0bfY=";
|
||||
})
|
||||
# Fixes for building calligra with gcc11/c++17
|
||||
(fetchpatch {
|
||||
name = "build_c++17_poppler.patch";
|
||||
url = "https://github.com/archlinux/svntogit-packages/raw/bbbe35f97eb1033798f1cf95d427890168598199/trunk/068cd9ae.patch";
|
||||
sha256 = "sha256-d9/ILwSeW+ov11DF191hzIaUafO/rjQrAeONwqDSKbA=";
|
||||
})
|
||||
# Fixes for building calligra with modern poppler[-qt5]
|
||||
(fetchpatch {
|
||||
name = "calligra-poppler-22.03.patch";
|
||||
url = "https://invent.kde.org/office/calligra/-/commit/236bacbe13739414e919de868283b0caf2df5d8a.patch";
|
||||
sha256 = "sha256-9DmKPCvEFy2Cs3g7350iOCF5Vrx1HL+/8jr+Tb44CyE=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "calligra-poppler-22.04.patch";
|
||||
url = "https://invent.kde.org/office/calligra/-/commit/6b75bec784c9835c78993349845d8c2ef22ec3de.patch";
|
||||
sha256 = "sha256-z9/4he4x0WN2K/ZGrDAAtHF/W5X1PAtpeO6s7fgL/fA=";
|
||||
})
|
||||
];
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch
|
||||
, libusb1, systemd }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -12,6 +12,15 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1qwix75z749628w583fwp7m7kxbj0k3g159sxb7vgqxbadqqz1ab";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pull upstream fix for -fno-common toolchains.
|
||||
(fetchpatch {
|
||||
name = "fno-common.patch";
|
||||
url = "https://github.com/OpenRTX/dmrconfig/commit/1a6901488db26262a6b69f80b0e795864e9e8d0a.patch";
|
||||
sha256 = "03px1y95a8aspd251i1jj8ggqfjvkqby4lhn5pb7l5c1lzh6h762";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libusb1 systemd
|
||||
];
|
||||
|
|
|
|||
|
|
@ -74,6 +74,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
gst-plugins-good
|
||||
gst-plugins-bad
|
||||
gst-plugins-ugly
|
||||
gst-libav
|
||||
]);
|
||||
|
||||
pythonPath = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -21,13 +21,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "switchboard-plug-security-privacy";
|
||||
version = "2.3.0";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-pkpS7BR/eXA0rWV1C5AR+FdF5OkDnV8YDBAt1ZkaVPo=";
|
||||
sha256 = "sha256-jT8aYE36ZAeB9ng3RojVqxzmLtzpbsNRHPuDQ03XKcI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
57
pkgs/development/compilers/tinygo/0001-Makefile.patch
Normal file
57
pkgs/development/compilers/tinygo/0001-Makefile.patch
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
From fcae473c4b6ac2120ec75c321d6db850d8ecd6a9 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= <muscaln@protonmail.com>
|
||||
Date: Sat, 30 Apr 2022 16:37:44 +0300
|
||||
Subject: [PATCH 1/3] Makefile
|
||||
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index dc388c21..7efc9901 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -14,11 +14,6 @@ LLVM_VERSIONS = 14 13 12 11
|
||||
errifempty = $(if $(1),$(1),$(error $(2)))
|
||||
detect = $(shell which $(call errifempty,$(firstword $(foreach p,$(2),$(shell command -v $(p) 2> /dev/null && echo $(p)))),failed to locate $(1) at any of: $(2)))
|
||||
toolSearchPathsVersion = $(1)-$(2)
|
||||
-ifeq ($(shell uname -s),Darwin)
|
||||
- # Also explicitly search Brew's copy, which is not in PATH by default.
|
||||
- BREW_PREFIX := $(shell brew --prefix)
|
||||
- toolSearchPathsVersion += $(BREW_PREFIX)/opt/llvm@$(2)/bin/$(1)-$(2) $(BREW_PREFIX)/opt/llvm@$(2)/bin/$(1)
|
||||
-endif
|
||||
# First search for a custom built copy, then move on to explicitly version-tagged binaries, then just see if the tool is in path with its normal name.
|
||||
findLLVMTool = $(call detect,$(1),$(abspath llvm-build/bin/$(1)) $(foreach ver,$(LLVM_VERSIONS),$(call toolSearchPathsVersion,$(1),$(ver))) $(1))
|
||||
CLANG ?= $(call findLLVMTool,clang)
|
||||
@@ -644,9 +639,8 @@ endif
|
||||
wasmtest:
|
||||
$(GO) test ./tests/wasm
|
||||
|
||||
-build/release: tinygo gen-device wasi-libc $(if $(filter 1,$(USE_SYSTEM_BINARYEN)),,binaryen)
|
||||
+build/release:
|
||||
@mkdir -p build/release/tinygo/bin
|
||||
- @mkdir -p build/release/tinygo/lib/clang/include
|
||||
@mkdir -p build/release/tinygo/lib/CMSIS/CMSIS
|
||||
@mkdir -p build/release/tinygo/lib/macos-minimal-sdk
|
||||
@mkdir -p build/release/tinygo/lib/mingw-w64/mingw-w64-crt/lib-common
|
||||
@@ -663,10 +657,6 @@ build/release: tinygo gen-device wasi-libc $(if $(filter 1,$(USE_SYSTEM_BINARYEN
|
||||
@mkdir -p build/release/tinygo/pkg/thumbv7em-unknown-unknown-eabi-cortex-m4
|
||||
@echo copying source files
|
||||
@cp -p build/tinygo$(EXE) build/release/tinygo/bin
|
||||
-ifneq ($(USE_SYSTEM_BINARYEN),1)
|
||||
- @cp -p build/wasm-opt$(EXE) build/release/tinygo/bin
|
||||
-endif
|
||||
- @cp -p $(abspath $(CLANG_SRC))/lib/Headers/*.h build/release/tinygo/lib/clang/include
|
||||
@cp -rp lib/CMSIS/CMSIS/Include build/release/tinygo/lib/CMSIS/CMSIS
|
||||
@cp -rp lib/CMSIS/README.md build/release/tinygo/lib/CMSIS
|
||||
@cp -rp lib/macos-minimal-sdk/* build/release/tinygo/lib/macos-minimal-sdk
|
||||
@@ -705,8 +695,7 @@ endif
|
||||
@cp -rp lib/picolibc/newlib/libm/common build/release/tinygo/lib/picolibc/newlib/libm
|
||||
@cp -rp lib/picolibc-stdio.c build/release/tinygo/lib
|
||||
@cp -rp lib/wasi-libc/sysroot build/release/tinygo/lib/wasi-libc/sysroot
|
||||
- @cp -rp llvm-project/compiler-rt/lib/builtins build/release/tinygo/lib/compiler-rt-builtins
|
||||
- @cp -rp llvm-project/compiler-rt/LICENSE.TXT build/release/tinygo/lib/compiler-rt-builtins
|
||||
+ @cp -rp lib/compiler-rt-builtins build/release/tinygo/lib/compiler-rt-builtins
|
||||
@cp -rp src build/release/tinygo/src
|
||||
@cp -rp targets build/release/tinygo/targets
|
||||
./build/tinygo build-library -target=cortex-m0 -o build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0/compiler-rt compiler-rt
|
||||
--
|
||||
2.36.0
|
||||
|
||||
|
|
@ -0,0 +1,55 @@
|
|||
From 4ee942ccc7cdb06ee51490e9cb44ecb36b25378a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= <muscaln@protonmail.com>
|
||||
Date: Sat, 30 Apr 2022 16:18:31 +0300
|
||||
Subject: [PATCH 2/3] Add clang header path
|
||||
|
||||
|
||||
diff --git a/builder/builtins.go b/builder/builtins.go
|
||||
index 479b541d..b35283c6 100644
|
||||
--- a/builder/builtins.go
|
||||
+++ b/builder/builtins.go
|
||||
@@ -164,7 +164,7 @@ var aeabiBuiltins = []string{
|
||||
var CompilerRT = Library{
|
||||
name: "compiler-rt",
|
||||
cflags: func(target, headerPath string) []string {
|
||||
- return []string{"-Werror", "-Wall", "-std=c11", "-nostdlibinc"}
|
||||
+ return []string{"-Werror", "-Wall", "-std=c11", "-isystem", "@clang_include@"}
|
||||
},
|
||||
sourceDir: func() string {
|
||||
llvmDir := filepath.Join(goenv.Get("TINYGOROOT"), "llvm-project/compiler-rt/lib/builtins")
|
||||
diff --git a/builder/picolibc.go b/builder/picolibc.go
|
||||
index f1b061ae..159f90cf 100644
|
||||
--- a/builder/picolibc.go
|
||||
+++ b/builder/picolibc.go
|
||||
@@ -27,7 +27,7 @@ var Picolibc = Library{
|
||||
"-D_COMPILING_NEWLIB",
|
||||
"-DHAVE_ALIAS_ATTRIBUTE",
|
||||
"-DTINY_STDIO",
|
||||
- "-nostdlibinc",
|
||||
+ "-isystem", "@clang_include@",
|
||||
"-isystem", picolibcDir + "/include",
|
||||
"-I" + picolibcDir + "/tinystdio",
|
||||
"-I" + headerPath,
|
||||
diff --git a/compileopts/config.go b/compileopts/config.go
|
||||
index b30e653e..7561b3f2 100644
|
||||
--- a/compileopts/config.go
|
||||
+++ b/compileopts/config.go
|
||||
@@ -288,6 +288,7 @@ func (c *Config) CFlags() []string {
|
||||
path, _ := c.LibcPath("picolibc")
|
||||
cflags = append(cflags,
|
||||
"--sysroot="+path,
|
||||
+ "-isystem", "@clang_include@",
|
||||
"-isystem", filepath.Join(path, "include"), // necessary for Xtensa
|
||||
"-isystem", filepath.Join(picolibcDir, "include"),
|
||||
"-isystem", filepath.Join(picolibcDir, "tinystdio"),
|
||||
@@ -297,7 +298,6 @@ func (c *Config) CFlags() []string {
|
||||
path, _ := c.LibcPath("musl")
|
||||
arch := MuslArchitecture(c.Triple())
|
||||
cflags = append(cflags,
|
||||
- "-nostdlibinc",
|
||||
"-isystem", filepath.Join(path, "include"),
|
||||
"-isystem", filepath.Join(root, "lib", "musl", "arch", arch),
|
||||
"-isystem", filepath.Join(root, "lib", "musl", "include"),
|
||||
--
|
||||
2.36.0
|
||||
|
||||
|
|
@ -1,64 +1,147 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, llvm, clang-unwrapped, lld, avrgcc
|
||||
, avrdude, openocd, gcc-arm-embedded, makeWrapper, fetchurl }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, buildPackages
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, substituteAll
|
||||
, llvmPackages
|
||||
, go
|
||||
, libffi
|
||||
, zlib
|
||||
, ncurses
|
||||
, libxml2
|
||||
, xar
|
||||
, wasi-libc
|
||||
, avrgcc
|
||||
, binaryen
|
||||
, avrdude
|
||||
, gdb
|
||||
, openocd
|
||||
}:
|
||||
|
||||
let main = ./main.go;
|
||||
gomod = ./go.mod;
|
||||
let
|
||||
llvmMajor = lib.versions.major llvm.version;
|
||||
inherit (llvmPackages) llvm clang compiler-rt lld;
|
||||
in
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tinygo";
|
||||
version = "0.16.0";
|
||||
version = "0.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tinygo-org";
|
||||
repo = "tinygo";
|
||||
rev = "v${version}";
|
||||
sha256 = "063aszbsnr0myq56kms1slmrfs7m4nmg0zgh2p66lxdsifrfly7j";
|
||||
sha256 = "sha256-YgQGAQJw9Xyw5BF2d9uZTQHfjHsu2evZGo4RV9DtStE=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
overrideModAttrs = (_: {
|
||||
patches = [];
|
||||
preBuild = ''
|
||||
rm -rf *
|
||||
cp ${main} main.go
|
||||
cp ${gomod} go.mod
|
||||
chmod +w go.mod
|
||||
'';
|
||||
});
|
||||
vendorSha256 = "sha256-fK8BlCh+1NtHW6MwW68iSIB+Sw6AK+g3y4lMyMYrXkk=";
|
||||
|
||||
preBuild = "cp ${gomod} go.mod";
|
||||
patches = [
|
||||
./0001-Makefile.patch
|
||||
|
||||
postBuild = "make gen-device";
|
||||
(substituteAll {
|
||||
src = ./0002-Add-clang-header-path.patch;
|
||||
clang_include = "${clang.cc.lib}/lib/clang/${clang.cc.version}/include";
|
||||
})
|
||||
];
|
||||
|
||||
vendorSha256 = "12k2gin0v7aqz5543m12yhifc0xsz26qyqra5l4c68xizvzcvkxb";
|
||||
checkInputs = [ avrgcc binaryen ];
|
||||
nativeBuildInputs = [ go makeWrapper ];
|
||||
buildInputs = [ llvm clang.cc ]
|
||||
++ lib.optionals stdenv.isDarwin [ zlib ncurses libffi libxml2 xar ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
prePatch = ''
|
||||
sed -i s/', "-nostdlibinc"'// builder/builtins.go
|
||||
sed -i s/'"-nostdlibinc", '// compileopts/config.go builder/picolibc.go
|
||||
'';
|
||||
doCheck = stdenv.buildPlatform == stdenv.hostPlatform;
|
||||
|
||||
allowGoReference = true;
|
||||
tags = [ "llvm${llvmMajor}" ];
|
||||
subPackages = [ "." ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ llvm clang-unwrapped ];
|
||||
propagatedBuildInputs = [ lld avrgcc avrdude openocd gcc-arm-embedded ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/tinygo
|
||||
cp -a lib src targets $out/share/tinygo
|
||||
wrapProgram $out/bin/tinygo --prefix "TINYGOROOT" : "$out/share/tinygo" \
|
||||
--prefix "PATH" : "$out/libexec/tinygo"
|
||||
mkdir -p $out/libexec/tinygo
|
||||
ln -s ${clang-unwrapped}/bin/clang $out/libexec/tinygo/clang-10
|
||||
ln -s ${lld}/bin/lld $out/libexec/tinygo/ld.lld-10
|
||||
ln -sf $out/bin $out/share/tinygo
|
||||
# Output contains static libraries for different arm cpus
|
||||
# and stripping could mess up these so only strip the compiler
|
||||
stripDebugList = [ "bin" ];
|
||||
|
||||
postConfigure = lib.optionalString stdenv.isDarwin ''
|
||||
for i in vendor/tinygo.org/x/go-llvm/llvm_config_darwin*; do
|
||||
substituteInPlace $i --replace "curses" "ncurses"
|
||||
done
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
# Copy wasi-libc, symlink seems not working
|
||||
rm -rf lib/wasi-libc/*
|
||||
mkdir -p lib/wasi-libc/sysroot/lib/wasm32-wasi lib/wasi-libc/sysroot/include
|
||||
cp -a ${wasi-libc}/lib/* lib/wasi-libc/sysroot/lib/wasm32-wasi/
|
||||
cp -a ${wasi-libc.dev}/include/* lib/wasi-libc/sysroot/include/
|
||||
|
||||
# Borrow compiler-rt builtins from our source
|
||||
# See https://github.com/tinygo-org/tinygo/pull/2471
|
||||
mkdir -p lib/compiler-rt-builtins
|
||||
cp -a ${compiler-rt.src}/compiler-rt/lib/builtins/* lib/compiler-rt-builtins/
|
||||
|
||||
substituteInPlace Makefile \
|
||||
--replace "\$(TINYGO)" "$(pwd)/build/tinygo" \
|
||||
--replace "build/release/tinygo/bin" "$out/bin" \
|
||||
--replace "build/release/" "$out/share/"
|
||||
|
||||
# TODO: Fix mingw and darwin
|
||||
# Disable windows and darwin cross-compile tests
|
||||
sed -i "/GOOS=windows/d" Makefile
|
||||
sed -i "/GOOS=darwin/d" Makefile
|
||||
|
||||
# tinygo needs versioned binaries
|
||||
mkdir -p $out/libexec/tinygo
|
||||
ln -s ${lib.getBin clang.cc}/bin/clang $out/libexec/tinygo/clang-${llvmMajor}
|
||||
ln -s ${lib.getBin lld}/bin/ld.lld $out/libexec/tinygo/ld.lld-${llvmMajor}
|
||||
ln -s ${lib.getBin lld}/bin/wasm-ld $out/libexec/tinygo/wasm-ld-${llvmMajor}
|
||||
ln -s ${gdb}/bin/gdb $out/libexec/tinygo/gdb-multiarch
|
||||
'' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
|
||||
substituteInPlace Makefile \
|
||||
--replace "./build/tinygo" "${buildPackages.tinygo}/bin/tinygo"
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
export HOME=$TMPDIR
|
||||
export GOCACHE=$TMPDIR/go-cache
|
||||
export GOPATH=$TMPDIR/go
|
||||
export PATH=$out/libexec/tinygo:$PATH
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
# Move binary
|
||||
mkdir -p build
|
||||
mv $GOPATH/bin/tinygo build/tinygo
|
||||
|
||||
make gen-device
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
make smoketest XTENSA=0
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
make build/release
|
||||
|
||||
wrapProgram $out/bin/tinygo \
|
||||
--set TINYGOROOT $out/share/tinygo \
|
||||
--prefix PATH : ${lib.makeBinPath [ go avrdude openocd avrgcc binaryen ]}:$out/libexec/tinygo
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
disallowedReferences = [ wasi-libc ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://tinygo.org/";
|
||||
description = "Go compiler for small places";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ Madouura ];
|
||||
maintainers = with maintainers; [ Madouura muscaln ];
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
module github.com/tinygo-org/tinygo
|
||||
|
||||
go 1.11
|
||||
|
||||
require (
|
||||
github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2
|
||||
github.com/chromedp/cdproto v0.0.0-20200709115526-d1f6fc58448b
|
||||
github.com/chromedp/chromedp v0.5.4-0.20200303084119-2bb39134ab9e
|
||||
github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf
|
||||
github.com/marcinbor85/gohex v0.0.0-20200531091804-343a4b548892
|
||||
go.bug.st/serial v1.0.0
|
||||
golang.org/x/tools v0.0.0-20200216192241-b320d3a0f5a2
|
||||
tinygo.org/x/go-llvm v0.0.0-20201104183921-570e7a6841d9
|
||||
)
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
_ "github.com/blakesmith/ar"
|
||||
_ "github.com/google/shlex"
|
||||
_ "github.com/marcinbor85/gohex"
|
||||
_ "go.bug.st/serial"
|
||||
_ "golang.org/x/tools/go/ast/astutil"
|
||||
_ "golang.org/x/tools/go/ssa"
|
||||
_ "google.golang.org/appengine"
|
||||
_ "tinygo.org/x/go-llvm"
|
||||
)
|
||||
|
||||
func main() {
|
||||
fmt.Println("vim-go")
|
||||
}
|
||||
8
pkgs/development/interpreters/erlang/R25.nix
Normal file
8
pkgs/development/interpreters/erlang/R25.nix
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
{ mkDerivation }:
|
||||
|
||||
# How to obtain `sha256`:
|
||||
# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
|
||||
mkDerivation {
|
||||
version = "25.0-rc3";
|
||||
sha256 = "1ir42hz81bzxn1shqq0gn824hxd6j774889vjy68psi95psfs8r2";
|
||||
}
|
||||
|
|
@ -11,6 +11,12 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-eEUhOrKqb2hHWanY+knpY9FBEnjkkFTB+x6BZgMBpbo=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace Makefile \
|
||||
--replace '-soname' '-install_name' \
|
||||
--replace 'lib$(NAME).so' 'lib$(NAME).dylib'
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
# disable static builds
|
||||
|
|
@ -21,11 +27,18 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postInstall = lib.optionalString stdenv.isDarwin ''
|
||||
install_name_tool -change libfreeaptx.dylib.0 $out/lib/libfreeaptx.dylib.0 $out/bin/freeaptxdec
|
||||
install_name_tool -change libfreeaptx.dylib.0 $out/lib/libfreeaptx.dylib.0 $out/bin/freeaptxenc
|
||||
install_name_tool -id $out/lib/libfreeaptx.dylib $out/lib/libfreeaptx.dylib
|
||||
install_name_tool -id $out/lib/libfreeaptx.dylib.0 $out/lib/libfreeaptx.dylib.0
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Free Implementation of Audio Processing Technology codec (aptX)";
|
||||
license = licenses.lgpl21Plus;
|
||||
homepage = "https://github.com/iamthehorker/libfreeaptx";
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ kranzes ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,19 +1,21 @@
|
|||
{ lib, stdenv, fetchFromGitHub
|
||||
, autoreconfHook, pkg-config
|
||||
, cunit, file, ncurses
|
||||
, autoreconfHook, pkg-config, file
|
||||
, cunit, ncurses
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nghttp3";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ngtcp2";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-toGTkgJLdSLNWCPJFpT63IxF3xANbvtkhJo5NUg/ZBg=";
|
||||
sha256 = "sha256-1+0ln0J8dqHqmE+fsawhbfbbMNlCkDpJx4xomUuoHdE=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config file ];
|
||||
checkInputs = [ cunit ncurses ];
|
||||
|
||||
|
|
@ -21,8 +23,6 @@ stdenv.mkDerivation rec {
|
|||
substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file
|
||||
'';
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
doCheck = true;
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,21 +1,23 @@
|
|||
{ lib, stdenv, fetchFromGitHub
|
||||
, autoreconfHook, pkg-config
|
||||
, cunit, file, ncurses
|
||||
, autoreconfHook, pkg-config, file
|
||||
, libev, nghttp3, quictls
|
||||
, cunit, ncurses
|
||||
, withJemalloc ? false, jemalloc
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ngtcp2";
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ngtcp2";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nmVVK2lpz01hgSxPAMmBfF+nNVZu9PWRGzCWh/5yhj8=";
|
||||
sha256 = "sha256-hpIGsQBJCOyaEqopdES/hRXc2makIERonUju9D/HvgE=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config file ];
|
||||
buildInputs = [ libev nghttp3 quictls ] ++ lib.optional withJemalloc jemalloc;
|
||||
checkInputs = [ cunit ncurses ];
|
||||
|
|
@ -24,8 +26,6 @@ stdenv.mkDerivation rec {
|
|||
substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file
|
||||
'';
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
doCheck = true;
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "quictls";
|
||||
version = "3.0.2+quick_unstable-2022-03.15";
|
||||
version = "3.0.3+quick_unstable-2022-05.04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "quictls";
|
||||
repo = "openssl";
|
||||
rev = "7f2ab56a2b842b8e6fefc7b9d20eb5ff9c6ef151";
|
||||
sha256 = "sha256-We4ow0mGJFXqYM4PqbGn8qY5IYH/MtNaefrSaJreoRA=";
|
||||
rev = "368c9d581b17f0bbe425f8dedeaa7b864a7b29ce";
|
||||
sha256 = "sha256-W3bILxhyeziWQNZUHUg/D9eV8LnmHJqEFwyzWjJrRuc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -156,7 +156,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://quictls.github.io/openssl/";
|
||||
homepage = "https://quictls.github.io";
|
||||
description = "TLS/SSL and crypto library with QUIC APIs";
|
||||
license = licenses.openssl;
|
||||
platforms = platforms.all;
|
||||
|
|
|
|||
|
|
@ -80,7 +80,11 @@ stdenv.mkDerivation rec {
|
|||
totem-pl-parser
|
||||
tracker
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-plugins-good
|
||||
gst_all_1.gst-plugins-bad
|
||||
gst_all_1.gst-plugins-ugly
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-libav
|
||||
icu
|
||||
json-glib
|
||||
libcue
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ buildDunePackage {
|
|||
doCheck = true;
|
||||
checkInputs = [ alcotest atdgen-codec-runtime ];
|
||||
|
||||
meta = atd.meta // {
|
||||
meta = (builtins.removeAttrs atd.meta [ "mainProgram" ]) // {
|
||||
description = "Generates efficient JSON serializers, deserializers and validators";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,6 +36,5 @@ buildDunePackage rec {
|
|||
changelog = "https://github.com/mirage/awa-ssh/raw/v${version}/CHANGES.md";
|
||||
license = licenses.isc;
|
||||
maintainers = [ maintainers.sternenseemann ];
|
||||
mainProgram = "awa_lwt_server";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,5 +11,5 @@ buildDunePackage {
|
|||
awa cstruct mtime lwt cstruct-unix mirage-crypto-rng
|
||||
];
|
||||
|
||||
inherit (awa) meta;
|
||||
meta = awa.meta // { mainProgram = "awa_lwt_server"; };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -75,7 +75,8 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Platform for binary analysis. It is written in OCaml, but can be used from other languages.";
|
||||
homepage = "https://github.com/BinaryAnalysisPlatform/bap/";
|
||||
maintainers = [ maintainers.maurer ];
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.maurer ];
|
||||
mainProgram = "bap";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,5 +44,6 @@ buildDunePackage {
|
|||
|
||||
meta = dns.meta // {
|
||||
description = "Unix command line utilities using uDNS";
|
||||
mainProgram = "odns";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,8 +21,9 @@ buildDunePackage rec {
|
|||
|
||||
meta = {
|
||||
description = "Parser combinators based on Earley Algorithm";
|
||||
homepage = "https://github.com/rlepigre/ocaml-earley";
|
||||
license = lib.licenses.cecill-b;
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
homepage = "https://github.com/rlepigre/ocaml-earley";
|
||||
mainProgram = "pa_ocaml";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,5 +35,6 @@ buildDunePackage rec {
|
|||
homepage = "https://github.com/dinosaure/hxd";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.sternenseemann ];
|
||||
mainProgram = "hxd.xxd";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,8 +21,9 @@ buildDunePackage rec {
|
|||
|
||||
meta = {
|
||||
description = "Image formats such as PNG and PPM in OCaml";
|
||||
homepage = "https://github.com/rlepigre/ocaml-imagelib";
|
||||
license = lib.licenses.lgpl3;
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
homepage = "https://github.com/rlepigre/ocaml-imagelib";
|
||||
mainProgram = "imagetool";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,12 +37,11 @@ stdenv.mkDerivation {
|
|||
dontStrip = true;
|
||||
|
||||
meta = with lib; {
|
||||
inherit (ocaml.meta) platforms;
|
||||
maintainers = with maintainers; [
|
||||
maggesi roconnor vbgl
|
||||
];
|
||||
homepage = "http://lablgtk.forge.ocamlcore.org/";
|
||||
description = "An OCaml interface to GTK";
|
||||
homepage = "http://lablgtk.forge.ocamlcore.org/";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ maggesi roconnor vbgl ];
|
||||
mainProgram = "lablgtk2";
|
||||
inherit (ocaml.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,10 +31,11 @@ buildDunePackage rec {
|
|||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/realworldocaml/mdx";
|
||||
description = "Executable OCaml code blocks inside markdown files";
|
||||
homepage = "https://github.com/realworldocaml/mdx";
|
||||
changelog = "https://github.com/realworldocaml/mdx/raw/${version}/CHANGES.md";
|
||||
license = lib.licenses.isc;
|
||||
maintainers = [ lib.maintainers.romildo ];
|
||||
mainProgram = "ocaml-mdx";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ buildDunePackage {
|
|||
doCheck = true;
|
||||
checkInputs = [ ounit fileutils ];
|
||||
|
||||
meta = ocaml_gettext.meta // {
|
||||
meta = (builtins.removeAttrs ocaml_gettext.meta [ "mainProgram" ]) // {
|
||||
description = "Internationalization library using camomile (i18n)";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -28,5 +28,6 @@ buildDunePackage rec {
|
|||
homepage = "https://github.com/gildor478/ocaml-gettext";
|
||||
license = licenses.lgpl21;
|
||||
maintainers = [ maintainers.volth ];
|
||||
mainProgram = "ocaml-gettext";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ buildDunePackage rec {
|
|||
|
||||
pname = "gettext-stub";
|
||||
|
||||
inherit (ocaml_gettext) src version useDune2 meta;
|
||||
inherit (ocaml_gettext) src version useDune2;
|
||||
|
||||
buildInputs = [ dune-configurator ];
|
||||
|
||||
|
|
@ -13,4 +13,6 @@ buildDunePackage rec {
|
|||
doCheck = true;
|
||||
|
||||
checkInputs = [ ounit ];
|
||||
|
||||
meta = builtins.removeAttrs ocaml_gettext.meta [ "mainProgram" ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,9 +26,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = {
|
||||
description = "A simple tool and library to embed files and directories inside OCaml executables";
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
homepage = "https://www.typerex.org/ocp-ocamlres.html";
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
mainProgram = "ocp-ocamlres";
|
||||
inherit (ocaml.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,9 +15,10 @@ buildOasisPackage rec {
|
|||
propagatedBuildInputs = [ tcslib ocaml-sat-solvers ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/tcsprojects/pgsolver";
|
||||
description = "A collection of tools for generating, manipulating and - most of all - solving parity games";
|
||||
homepage = "https://github.com/tcsprojects/pgsolver";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ mgttlinger ];
|
||||
mainProgram = "pgsolver-bin";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,8 @@ buildDunePackage rec {
|
|||
meta = with lib; {
|
||||
description = "Cubic bezier implementation in Reason / OCaml";
|
||||
homepage = "https://github.com/jchavarri/rebez/";
|
||||
maintainers = with maintainers; [ superherointj ];
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ superherointj ];
|
||||
mainProgram = "RebezApp.exe";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,10 +27,11 @@ stdenv.mkDerivation rec {
|
|||
dontStrip = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://people.csail.mit.edu/mikelin/ocaml+twt/";
|
||||
description = "“The Whitespace Thing” for OCaml";
|
||||
homepage = "http://people.csail.mit.edu/mikelin/ocaml+twt/";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.vbgl ];
|
||||
platforms = ocaml.meta.platforms or [ ];
|
||||
mainProgram = "ocaml+twt";
|
||||
inherit (ocaml.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bond-api";
|
||||
version = "0.1.17";
|
||||
version = "0.1.18";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "prystupa";
|
||||
repo = "bond-api";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-fuVYyDy3fG+XobFe2GCzMWRWPk8VDPLU4RHJzcF5MLg=";
|
||||
hash = "sha256-+87/j94eHyW3EMMBK+aXaNTVoNxsixeLusyBsPWa9yM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,13 +8,15 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "calmjs-parse";
|
||||
version = "1.2.5";
|
||||
version = "1.3.0";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "calmjs";
|
||||
repo = "calmjs.parse";
|
||||
rev = version;
|
||||
sha256 = "0ypfbas33k1706p6w1bf9gnrv38z8fa4qci1iaks80dp58g8sv4r";
|
||||
hash = "sha256-QhHNp9g88RhGHqRRjg4nk7aXjAgGCOauOagWJoJ3fqc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -0,0 +1,38 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, djangorestframework
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "djangorestframework-dataclasses";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oxan";
|
||||
repo = "djangorestframework-dataclasses";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wXgA/4Dik6yG0nKl9GbrHgb2lhrPsgS23+cEyaD9MRY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs manage.py
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
djangorestframework
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
./manage.py test
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "rest_framework_dataclasses" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = " Dataclasses serializer for Django REST framework";
|
||||
homepage = "https://github.com/oxan/djangorestframework-dataclasses";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-datastore";
|
||||
version = "2.5.1";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-1fpWovsg60uyAGps9QKXTdqV4WqZOOyeDFxX8YfgAMc=";
|
||||
sha256 = "sha256-6DHp8kz+CiZkzXDxPfT7KB4Yh11CwcEj3MTn5yd404Q=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-dlp";
|
||||
version = "3.6.2";
|
||||
version = "3.7.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-MMTeoyC30MW9NdrXLAqelIeeIdsdNi7u5zwVhLeeTyk=";
|
||||
hash = "sha256-aUabWEz+ou12Lgys7PZnldjHnifPWPPqO8iJqkDgx9U=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-speech";
|
||||
version = "2.13.1";
|
||||
version = "2.14.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-JxhIC4OMsXjdJYNDomEhmHPUCzveFS0oeDWsX/wd5zA=";
|
||||
hash = "sha256-D8t8+rscImUvpHCEFGTzLU5FpAMZ62iHhRfLzUXqGV8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "habanero";
|
||||
version = "1.2.0";
|
||||
version = "1.2.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -19,8 +19,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "sckott";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jxaO8nCR5jhXCPjhjVLKaGeQp9JF3ECQ1+j3TOJKawg=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-i6tgMEiaDcaBR8XfGvEMXQfTaDp1RJRosj/EfF1dQU4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "identify";
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "pre-commit";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gbR2z4mo5EFHS2N3pg5mwFQAfL9ysqYaC+tSSYBK7YI=";
|
||||
sha256 = "sha256-D66bw014FWGf26rG0e65wg6F/N1bl0z/Uemq+jUxJ74=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "peaqevcore";
|
||||
version = "0.0.24";
|
||||
version = "0.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-rAC0NXkK18DmPiZJbqSZh5O0i6KvMpWvaANWyK3zMXQ=";
|
||||
hash = "sha256-jGKB2LYp2RGy+E76ZvRdOzPdT+7fL4ZTEilHDiXbAMw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,22 +1,41 @@
|
|||
{lib, fetchPypi, buildPythonPackage, numpy, pyparsing, pytest-cov, pytestCheckHook }:
|
||||
{ lib
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, numpy
|
||||
, pyparsing
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "periodictable";
|
||||
version = "1.6.0";
|
||||
version = "1.6.1";
|
||||
format = "setuptools";
|
||||
|
||||
propagatedBuildInputs = [numpy pyparsing];
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "52e925220005c20e97601e7b04ad6cebc271680947ab9adcbb1a796ddbaa0f23";
|
||||
hash = "sha256-fFAcn3PXex+yjLUehbKEKcLESpnOPRJ0iUVkxy1xJgM=";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest-cov pytestCheckHook ];
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
pyparsing
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.reflectometry.org/danse/software.html";
|
||||
description = "an extensible periodic table of the elements prepopulated with data important to neutron and x-ray scattering experiments";
|
||||
license = lib.licenses.publicDomain;
|
||||
maintainers = with lib.maintainers; [ rprospero ];
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"periodictable"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Extensible periodic table of the elements";
|
||||
homepage = "https://github.com/pkienzle/periodictable";
|
||||
license = licenses.publicDomain;
|
||||
maintainers = with maintainers; [ rprospero ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "plaid-python";
|
||||
version = "9.3.0";
|
||||
version = "9.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-7H6fpJl192L8MEWrQW89Fa/BTZ2GZXjDRcy0yc17hDI=";
|
||||
hash = "sha256-Md4vzAirCm5fjcTAeiLIQwH0MAP47r2AT8O5yigGqv8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pycfmodel";
|
||||
version = "0.19.1";
|
||||
version = "0.20.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "Skyscanner";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-k059AfI3dTPMLAOColmTG4kz0z2bLO1oi8Bg0QeLork=";
|
||||
hash = "sha256-c6RbglmG/A1fVOLmJLRsyMy9EgEIzpXnIe9Co/OLMSg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pynetgear";
|
||||
version = "0.10.0";
|
||||
version = "0.10.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = "MatMaul";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-l+hfE1YdSoMWLonSWKX0809M0OCYxpcvPd4gV9mS4DI=";
|
||||
sha256 = "sha256-XGD1kA64rUC6WvG7VGX+f3g7fBvWqfA4ujiWAQzKeEA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -30,14 +30,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "thinc";
|
||||
version = "8.0.15";
|
||||
version = "8.0.16";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-LjFQINqFw3keGR+/N8SiQz9XzzIuJzgNoM1N6Z2WBTs=";
|
||||
sha256 = "sha256-S8eBpRqHiaxAKzbvLgfRdjbRKniQACdU+NcPBbto31E=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "trimesh";
|
||||
version = "3.12.0";
|
||||
version = "3.12.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-RcRFF5vIMOQsPXbd2g8DSnOrWnpLLNe3Sa8PqAdwFvU=";
|
||||
sha256 = "sha256-MrvfSC6Uz/EJXQ3F5jAbWR0YJYRjqjwO7SIe0AUSOfA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy ];
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-python-dateutil";
|
||||
version = "2.8.15";
|
||||
version = "2.8.16";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-fbHk7UkWvRKMvuPuze4OBsxWhNoqHN/Vf5hUHN++CGE=";
|
||||
sha256 = "sha256-OqrEwTjra47LwlUJluwl1uRbXTKIfR5pPQhC7i+mWdI=";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "dateutil-stubs" ];
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-requests";
|
||||
version = "2.27.26";
|
||||
version = "2.27.27";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-pqBMAnTAlJ/QUl812LU6w053r+y+s8STLdxs5nWsAJw=";
|
||||
sha256 = "sha256-1hjZgJ+jL1FM8XzqhGCBTaZxxWNm+xyQiszKi/GDESs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ buildDunePackage rec {
|
|||
sha256 = "1v2hfq0ra9j07yz6pj6m03hrvgys4vmx0gclchv94yywpb2wc7ik";
|
||||
};
|
||||
|
||||
inherit (js_of_ocaml-compiler) meta;
|
||||
|
||||
buildInputs = [ camlp4 ocsigen_deriving ];
|
||||
|
||||
meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,8 +21,9 @@ buildDunePackage rec {
|
|||
|
||||
meta = {
|
||||
description = "Compiler from OCaml bytecode to Javascript";
|
||||
homepage = "https://ocsigen.org/js_of_ocaml/";
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
homepage = "https://ocsigen.org/js_of_ocaml/";
|
||||
mainProgram = "js_of_ocaml";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,9 +5,11 @@
|
|||
buildDunePackage {
|
||||
pname = "js_of_ocaml";
|
||||
|
||||
inherit (js_of_ocaml-compiler) version src meta useDune2;
|
||||
inherit (js_of_ocaml-compiler) version src useDune2;
|
||||
|
||||
buildInputs = [ ppxlib ];
|
||||
|
||||
propagatedBuildInputs = [ js_of_ocaml-compiler uchar ];
|
||||
|
||||
meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,9 +5,11 @@
|
|||
buildDunePackage {
|
||||
pname = "js_of_ocaml-lwt";
|
||||
|
||||
inherit (js_of_ocaml-compiler) version src meta useDune2;
|
||||
inherit (js_of_ocaml-compiler) version src useDune2;
|
||||
|
||||
buildInputs = [ js_of_ocaml-ppx ];
|
||||
|
||||
propagatedBuildInputs = [ js_of_ocaml ocaml_lwt lwt_log ];
|
||||
|
||||
meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,8 +6,10 @@
|
|||
buildDunePackage {
|
||||
pname = "js_of_ocaml-ppx";
|
||||
|
||||
inherit (js_of_ocaml-compiler) version src meta useDune2;
|
||||
inherit (js_of_ocaml-compiler) version src useDune2;
|
||||
|
||||
buildInputs = [ js_of_ocaml ];
|
||||
propagatedBuildInputs = [ ppxlib ];
|
||||
|
||||
meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,9 @@
|
|||
buildDunePackage {
|
||||
pname = "js_of_ocaml-ppx_deriving_json";
|
||||
|
||||
inherit (js_of_ocaml-compiler) version src meta useDune2;
|
||||
inherit (js_of_ocaml-compiler) version src useDune2;
|
||||
|
||||
propagatedBuildInputs = [ js_of_ocaml ppxlib ];
|
||||
|
||||
meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,9 +6,11 @@
|
|||
buildDunePackage {
|
||||
pname = "js_of_ocaml-tyxml";
|
||||
|
||||
inherit (js_of_ocaml-compiler) version src meta useDune2;
|
||||
inherit (js_of_ocaml-compiler) version src useDune2;
|
||||
|
||||
buildInputs = [ js_of_ocaml-ppx ];
|
||||
|
||||
propagatedBuildInputs = [ js_of_ocaml reactivedata tyxml ];
|
||||
|
||||
meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,10 +31,11 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/ocaml/ocamlbuild/";
|
||||
description = "A build system with builtin rules to easily build most OCaml projects";
|
||||
homepage = "https://github.com/ocaml/ocamlbuild/";
|
||||
license = licenses.lgpl2;
|
||||
inherit (ocaml.meta) platforms;
|
||||
maintainers = with maintainers; [ vbgl ];
|
||||
mainProgram = "ocamlbuild";
|
||||
inherit (ocaml.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
|
|||
preInstall = "mkdir -p $out/bin";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.typerex.org/ocp-build.html";
|
||||
description = "A build tool for OCaml";
|
||||
longDescription = ''
|
||||
ocp-build is a build system for OCaml application, based on simple
|
||||
|
|
@ -33,8 +32,10 @@ stdenv.mkDerivation rec {
|
|||
the number of cores and the automatically-inferred dependencies
|
||||
between source files.
|
||||
'';
|
||||
homepage = "https://www.typerex.org/ocp-build.html";
|
||||
license = licenses.gpl3;
|
||||
platforms = ocaml.meta.platforms or [];
|
||||
maintainers = [ maintainers.jirkamarsik ];
|
||||
mainProgram = "ocp-build";
|
||||
inherit (ocaml.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,26 +1,32 @@
|
|||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "toxiproxy";
|
||||
version = "2.1.4";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Shopify";
|
||||
repo = "toxiproxy";
|
||||
rev = "v${version}";
|
||||
sha256 = "07yhsvscdv1qjfc2fyyh9qsrrdwrrw04wadk5gaq4qddcway7vig";
|
||||
sha256 = "sha256-vFf1yLpAa+yO1PCE+pLTnvvtROtpVxlEgACDNNUWBEM=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/Shopify/toxiproxy";
|
||||
subPackages = ["cmd" "cli"];
|
||||
ldflags = [ "-X github.com/Shopify/toxiproxy.Version=v${version}" ];
|
||||
vendorSha256 = "sha256-mrRMyIU6zeyAT/fXbBmtMlZzpyeB45FQmYJ4FDwTRTo=";
|
||||
|
||||
excludedPackages = [ "test/e2e" ];
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/Shopify/toxiproxy/v2.Version=${version}" ];
|
||||
|
||||
checkFlags = [ "-short" ];
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/cli $out/bin/toxiproxy-cli
|
||||
mv $out/bin/cmd $out/bin/toxiproxy-cmd
|
||||
mv $out/bin/server $out/bin/toxiproxy-server
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Proxy for for simulating network conditions";
|
||||
homepage = "https://github.com/Shopify/toxiproxy";
|
||||
maintainers = with lib.maintainers; [ avnik ];
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git;
|
||||
homepage = "https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git";
|
||||
description = "Suite of real-time tests - cyclictest, hwlatdetect, pip_stress, pi_stress, pmqtest, ptsematest, rt-migrate-test, sendme, signaltest, sigwaittest, svsematest";
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ poelzi ];
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, fetchFromGitHub, fetchpatch, python3 }:
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "heisenbridge";
|
||||
version = "1.12.0";
|
||||
version = "1.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hifi";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-10y0sWpOLbjbGBpOjr1/tJrhcOsCwcm2sSO5kHfmJZA=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-3YCYLhJqZAWIwpwOd8J1+uYsxw0q6jQy35Vp+ttVKhI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,23 +1,19 @@
|
|||
{ lib, buildGoPackage, fetchFromGitHub, nixosTests }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "nginx_exporter";
|
||||
version = "0.9.0";
|
||||
|
||||
goPackagePath = "github.com/nginxinc/nginx-prometheus-exporter";
|
||||
|
||||
ldflags = [
|
||||
"-X main.version=${version}"
|
||||
];
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "nginxinc";
|
||||
repo = "nginx-prometheus-exporter";
|
||||
sha256 = "04y5vpj2kv2ygdzxy3crpnx4mhpkm1ns2995kxgvjlhnyck7a5rf";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-k9sbMIn5N3EJ7ZlfmD9pRV6lfywnKyFvpxC/pGGgNTA=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
vendorSha256 = "sha256-SaaHbn97cb/d8symyrBYLzK+5ukVLfGrFiRIz+tKPhw=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
|
||||
|
||||
passthru.tests = { inherit (nixosTests.prometheus-exporters) nginx; };
|
||||
|
||||
|
|
|
|||
|
|
@ -16,6 +16,12 @@ stdenv.mkDerivation rec {
|
|||
})
|
||||
];
|
||||
|
||||
# Workaround build failure on -fno-common toolchains like upstream
|
||||
# gcc-10. Otherwise build fails as:
|
||||
# ld: listindex.o:/build/btar-1.1.1/loadindex.h:12: multiple definition of
|
||||
# `ptr'; main.o:/build/btar-1.1.1/loadindex.h:12: first defined here
|
||||
NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
|
||||
buildInputs = [ librsync ];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "txr";
|
||||
version = "274";
|
||||
version = "275";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.kylheku.com/cgit/txr/snapshot/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-bWgz0kmPLN0V0rkFRiCqxkBjhN8FV9fL+Vu8GSw9Ja4=";
|
||||
sha256 = "sha256-HmykTyh5F49CBa1w7o/HV6Q5Lsx1Qkxe0JBHQdGxVB4=";
|
||||
};
|
||||
|
||||
buildInputs = [ libffi ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "croc";
|
||||
version = "9.5.5";
|
||||
version = "9.5.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "schollz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YBg7mY8po7yVrSX1GaoI9/E3zFbdWWQEVCuR0H0DgJ4=";
|
||||
sha256 = "sha256-VXbrwUf43qvXd+/GXNA+Wkt4E5EM4+1V0wPj3JONzlU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-kaqTJMRbLSF1zy6qXqdOSzmbcV35rzrou4X0WzoQoGc=";
|
||||
vendorSha256 = "sha256-45rQHG5Std7m7Xu8OEFfjdG6RyriM4yAPzJl7M2lPW8=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,26 +1,23 @@
|
|||
{ lib, buildGoPackage, fetchFromGitHub
|
||||
, pkg-config
|
||||
, glib, libxml2
|
||||
}:
|
||||
{ lib, buildGoModule, fetchFromGitHub, pkg-config, glib, libxml2 }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "ua";
|
||||
version = "unstable-2017-02-24";
|
||||
|
||||
goPackagePath = "github.com/sloonz/ua";
|
||||
version = "unstable-2021-12-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sloonz";
|
||||
repo = "ua";
|
||||
rev = "325dab92c60e0f028e55060f0c288aa70905fb17";
|
||||
sha256 = "sha256-LlpxWwKO+gZltkmpQyWaG+qhZFnmETFKIqlOxOzEohA=";
|
||||
rev = "b6d75970bb4f6f340887e1eadad5aa8ce78f30e3";
|
||||
sha256 = "sha256-rCp8jyqQfq5eVdvKZz3vKuDfcR+gQOEAfBZx2It/rb0=";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
vendorSha256 = "sha256-0O80uhxSVsV9N7Z/FgaLwcjZqeb4MqSCE1YW5Zd32ns=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ glib libxml2 ];
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/sloonz/ua";
|
||||
license = licenses.isc;
|
||||
|
|
|
|||
57
pkgs/tools/networking/ua/deps.nix
generated
57
pkgs/tools/networking/ua/deps.nix
generated
|
|
@ -1,57 +0,0 @@
|
|||
# This file was generated by https://github.com/kamilchm/go2nix v1.2.0
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/sloonz/cfeedparser";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/sloonz/cfeedparser";
|
||||
rev = "a220b181f09fa7fba347c7fa72168ed8a010907a";
|
||||
sha256 = "1dsdzflwbb0cw39bs37shggmswggb326sfdb5x25f4bpd19z6qp0";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/sloonz/go-maildir";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/sloonz/go-maildir";
|
||||
rev = "4629e76d952bb24730bbe1b4c7bc628cd54babb6";
|
||||
sha256 = "0i9r7hhk0ih47pmc9ixhv17fa6gba3j7vk9g8j0di0pr0siha65f";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/sloonz/go-mime-message";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/sloonz/go-mime-message";
|
||||
rev = "cf50e17d2410fee25cdb89485ab0d5996f2d3bfc";
|
||||
sha256 = "09r45w2qfl0rx785xpgcjv9bvdnwkz7fyr272rdi3krwr900fwxs";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/sloonz/go-qprintable";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/sloonz/go-qprintable";
|
||||
rev = "775b3a4592d5bfc47b0ba398ec0d4dba018e5926";
|
||||
sha256 = "19r8ica7kd946brdh1zn4hkzgbciqsz42a2p1h7hgzpmld51kg43";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "gopkg.in/redis.v3";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/go-redis/redis";
|
||||
rev = "b5e368500d0a508ef8f16e9c2d4025a8a46bcc29";
|
||||
sha256 = "1syhnm1csrlfh1jgd1v9bzf2pp9ljyg4ks3z6xx0nqd83xmyhdzh";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "gopkg.in/bsm/ratelimit.v1";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/bsm/ratelimit";
|
||||
rev = "db14e161995a5177acef654cb0dd785e8ee8bc22";
|
||||
sha256 = "1ph6dsvgwrsli9akh6arwkvz78hkdb42lyqmgfckjcsar1a2fcsh";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
|
@ -13974,8 +13974,9 @@ with pkgs;
|
|||
tinycc = callPackage ../development/compilers/tinycc { };
|
||||
|
||||
tinygo = callPackage ../development/compilers/tinygo {
|
||||
inherit (llvmPackages_10) llvm clang-unwrapped lld;
|
||||
llvmPackages = llvmPackages_14;
|
||||
avrgcc = pkgsCross.avr.buildPackages.gcc;
|
||||
wasi-libc = pkgsCross.wasi32.wasilibc;
|
||||
};
|
||||
|
||||
tinyscheme = callPackage ../development/interpreters/tinyscheme {
|
||||
|
|
@ -14202,7 +14203,7 @@ with pkgs;
|
|||
};
|
||||
|
||||
inherit (beam.interpreters)
|
||||
erlang erlangR24 erlangR23 erlangR22 erlangR21
|
||||
erlang erlangR25 erlangR24 erlangR23 erlangR22 erlangR21
|
||||
erlang_odbc erlang_javac erlang_odbc_javac erlang_basho_R16B02
|
||||
elixir elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 elixir_1_9
|
||||
elixir_ls;
|
||||
|
|
|
|||
|
|
@ -20,6 +20,20 @@ with beam; {
|
|||
|
||||
# Standard Erlang versions, using the generic builder.
|
||||
|
||||
# R25
|
||||
erlangR25 = lib.callErlang ../development/interpreters/erlang/R25.nix {
|
||||
wxGTK = wxGTK30;
|
||||
parallelBuild = true;
|
||||
autoconf = buildPackages.autoconf269;
|
||||
inherit wxSupport systemdSupport;
|
||||
};
|
||||
erlangR25_odbc = erlangR25.override { odbcSupport = true; };
|
||||
erlangR25_javac = erlangR25.override { javacSupport = true; };
|
||||
erlangR25_odbc_javac = erlangR25.override {
|
||||
javacSupport = true;
|
||||
odbcSupport = true;
|
||||
};
|
||||
|
||||
# R24
|
||||
erlangR24 = lib.callErlang ../development/interpreters/erlang/R24.nix {
|
||||
wxGTK = wxGTK30;
|
||||
|
|
@ -106,6 +120,7 @@ with beam; {
|
|||
# Packages built with default Erlang version.
|
||||
erlang = packages.${defaultVersion};
|
||||
|
||||
erlangR25 = packagesWith interpreters.erlangR25;
|
||||
erlangR24 = packagesWith interpreters.erlangR24;
|
||||
erlangR23 = packagesWith interpreters.erlangR23;
|
||||
erlangR22 = packagesWith interpreters.erlangR22;
|
||||
|
|
|
|||
|
|
@ -2380,6 +2380,8 @@ in {
|
|||
|
||||
djangorestframework = callPackage ../development/python-modules/djangorestframework { };
|
||||
|
||||
djangorestframework-dataclasses = callPackage ../development/python-modules/djangorestframework-dataclasses { };
|
||||
|
||||
djangorestframework-simplejwt = callPackage ../development/python-modules/djangorestframework-simplejwt { };
|
||||
|
||||
django_reversion = callPackage ../development/python-modules/django_reversion { };
|
||||
|
|
@ -11320,9 +11322,9 @@ in {
|
|||
|
||||
zdaemon = callPackage ../development/python-modules/zdaemon { };
|
||||
|
||||
zeek = toPythonModule (pkgs.zeek.override {
|
||||
zeek = (toPythonModule (pkgs.zeek.override {
|
||||
python3 = python;
|
||||
}).py;
|
||||
})).py;
|
||||
|
||||
zeep = callPackage ../development/python-modules/zeep { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue