public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nixpkgs-unstable' into PR #111431

Browse Source 
I'm not really sure about the conflicts in:
	pkgs/development/python-modules/psutil/default.nix

Hydra nixpkgs: ?compare=1666054
This commit is contained in:
Vladimír Čunát
2021-04-28 17:13:34 +02:00
parent 16d7d40b8a 267761cf44
commit 82bccc2d62
8971 changed files with 264990 additions and 108348 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/misc/act/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "act";
version = "0.2.19";
version = "0.2.21";
src = fetchFromGitHub {
owner = "nektos";
repo = pname;
rev = "v${version}";
sha256 = "sha256-vlE0tN6m/PZtDZiIs/glTWYP+E4qzD0MAeQjX+OAcHY=";
sha256 = "sha256-XDxG7F+oBatlb4ROBryt2Fop402riKmYoqZLJrUzBUQ=";
};
vendorSha256 = "sha256-9LEyxIBe4c938RQbLOQOsAb9MGNtjngm48P3P83BTNw=";
vendorSha256 = "sha256-PwVDMSl36m+6ISJQvyrkCjaL3xp5VkaZtfxyMpNn+KI=";
doCheck = false;
pkgs/development/tools/misc/autobuild/default.nix
+2 -1
View File
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "0gv7g61ja9q9zg1m30k4snqwwy1kq7b4df6sb7d2qra7kbdq8af1";
};
buildInputs = [ makeWrapper perl openssh rsync ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ perl openssh rsync ];
doCheck = true;
pkgs/development/tools/misc/autoconf-archive/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "autoconf-archive";
version = "2019.01.06";
version = "2021.02.19";
src = fetchurl {
url = "mirror://gnu/autoconf-archive/autoconf-archive-${version}.tar.xz";
sha256 = "0gqya7nf4j5k98dkky0c3bnr0paciya91vkqazg7knlq621mq68p";
sha256 = "sha256-6KbrnSjdy6j/7z+iEWUyOem/I5q6agGmt8/Hzq7GnL0=";
};
buildInputs = [ xz ];
pkgs/development/tools/misc/autoconf/2.13.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{lib, stdenv, fetchurl, m4, perl, lzma}:
{lib, stdenv, fetchurl, m4, perl, xz}:
stdenv.mkDerivation rec {
name = "autoconf-2.13";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "07krzl4czczdsgzrrw9fiqx35xcf32naf751khg821g5pqv12qgh";
};
nativebuildInputs = [ lzma ];
nativebuildInputs = [ xz ];
buildInputs = [ m4 perl ];
doCheck = true;
pkgs/development/tools/misc/automaticcomponenttoolkit/default.nix
+33
View File
@@ -0,0 +1,33 @@
{ stdenv, lib, fetchFromGitHub, go }:
stdenv.mkDerivation rec {
pname = "AutomaticComponentToolkit";
version = "1.6.0";
src = fetchFromGitHub {
owner = "Autodesk";
repo = pname;
rev = "v${version}";
sha256 = "1r0sbw82cf9dbcj3vgnbd4sc1lklzvijic2z5wgkvs21azcm0yzh";
};
nativeBuildInputs = [ go ];
buildPhase = ''
cd Source
export HOME=/tmp
go build -o act *.go
'';
installPhase = ''
install -Dm0755 act $out/bin/act
'';
meta = with lib; {
description = "Toolkit to automatically generate software components: abstract API, implementation stubs and language bindings";
homepage = "https://github.com/Autodesk/AutomaticComponentToolkit";
license = licenses.bsd2;
maintainers = with maintainers; [ gebner ];
platforms = platforms.all;
};
}
pkgs/development/tools/misc/avrdude/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, yacc, flex, libusb-compat-0_1, libelf, libftdi1, readline
{ lib, stdenv, fetchurl, bison, flex, libusb-compat-0_1, libelf, libftdi1, readline
# docSupport is a big dependency, disabled by default
, docSupport ? false, texLive ? null, texinfo ? null, texi2html ? null
}:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
configureFlags = lib.optionals docSupport "--enable-doc";
buildInputs = [ yacc flex libusb-compat-0_1 libelf libftdi1 readline ]
buildInputs = [ bison flex libusb-compat-0_1 libelf libftdi1 readline ]
++ lib.optionals docSupport [ texLive texinfo texi2html ];
meta = with lib; {
pkgs/development/tools/misc/binutils/CVE-2020-35448.patch
+77
View File
@@ -0,0 +1,77 @@
From 8642dafaef21aa6747cec01df1977e9c52eb4679 Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
Date: Fri, 4 Sep 2020 19:19:18 +0930
Subject: [PATCH] PR26574, heap buffer overflow in
_bfd_elf_slurp_secondary_reloc_section
A horribly fuzzed object with section headers inside the ELF header.
Disallow that, and crazy reloc sizes.
PR 26574
* elfcode.h (elf_object_p): Sanity check section header offset.
* elf.c (_bfd_elf_slurp_secondary_reloc_section): Sanity check
sh_entsize.
---
bfd/elf.c | 4 +++-
bfd/elfcode.h | 8 ++++----
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/bfd/elf.c b/bfd/elf.c
index ac2095f787d..5a02f8dc309 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -12576,7 +12576,9 @@ _bfd_elf_slurp_secondary_reloc_section (bfd * abfd,
Elf_Internal_Shdr * hdr = & elf_section_data (relsec)->this_hdr;
if (hdr->sh_type == SHT_SECONDARY_RELOC
- && hdr->sh_info == (unsigned) elf_section_data (sec)->this_idx)
+ && hdr->sh_info == (unsigned) elf_section_data (sec)->this_idx
+ && (hdr->sh_entsize == ebd->s->sizeof_rel
+ || hdr->sh_entsize == ebd->s->sizeof_rela))
{
bfd_byte * native_relocs;
bfd_byte * native_reloc;
diff --git a/bfd/elfcode.h b/bfd/elfcode.h
index 2ed2f135c34..606ff64fd4d 100644
--- a/bfd/elfcode.h
+++ b/bfd/elfcode.h
@@ -571,7 +571,7 @@ elf_object_p (bfd *abfd)
/* If this is a relocatable file and there is no section header
table, then we're hosed. */
- if (i_ehdrp->e_shoff == 0 && i_ehdrp->e_type == ET_REL)
+ if (i_ehdrp->e_shoff < sizeof (x_ehdr) && i_ehdrp->e_type == ET_REL)
goto got_wrong_format_error;
/* As a simple sanity check, verify that what BFD thinks is the
@@ -581,7 +581,7 @@ elf_object_p (bfd *abfd)
goto got_wrong_format_error;
/* Further sanity check. */
- if (i_ehdrp->e_shoff == 0 && i_ehdrp->e_shnum != 0)
+ if (i_ehdrp->e_shoff < sizeof (x_ehdr) && i_ehdrp->e_shnum != 0)
goto got_wrong_format_error;
ebd = get_elf_backend_data (abfd);
@@ -618,7 +618,7 @@ elf_object_p (bfd *abfd)
&& ebd->elf_osabi != ELFOSABI_NONE)
goto got_wrong_format_error;
- if (i_ehdrp->e_shoff != 0)
+ if (i_ehdrp->e_shoff >= sizeof (x_ehdr))
{
file_ptr where = (file_ptr) i_ehdrp->e_shoff;
@@ -819,7 +819,7 @@ elf_object_p (bfd *abfd)
}
}
- if (i_ehdrp->e_shstrndx != 0 && i_ehdrp->e_shoff != 0)
+ if (i_ehdrp->e_shstrndx != 0 && i_ehdrp->e_shoff >= sizeof (x_ehdr))
{
unsigned int num_sec;
--
2.27.0
pkgs/development/tools/misc/binutils/default.nix
+2
View File
@@ -61,6 +61,7 @@ stdenv.mkDerivation {
# cross-compiling.
./always-search-rpath.patch
./CVE-2020-35448.patch
] ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch
++ # This patch was suggested by Nick Clifton to fix
# https://sourceware.org/bugzilla/show_bug.cgi?id=16177
@@ -142,6 +143,7 @@ stdenv.mkDerivation {
passthru = {
inherit targetPrefix;
isGNU = true;
};
meta = with lib; {
pkgs/development/tools/misc/blackfire/default.nix
+2 -2
View File
@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "blackfire-agent";
version = "1.44.2";
version = "1.46.0";
src = fetchurl {
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-agent_${version}_amd64.deb";
sha256 = "1bam4sb0yhxciykph7wn41zs8fa7c9iwnbihd5kza0cylbb7fbkb";
sha256 = "0cxgc18xpwyb5wp08km7aj8asn5biqnwq9fkgkk6wv1r1ihqlhf2";
};
nativeBuildInputs = [
pkgs/development/tools/misc/blackfire/php-probe.nix
+2 -2
View File
@@ -18,11 +18,11 @@ let
}.${lib.versions.majorMinor php.version} or (throw "Unsupported PHP version.");
in stdenv.mkDerivation rec {
pname = "php-blackfire";
version = "1.46.4";
version = "1.53.0";
src = fetchurl {
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-php_${version}_amd64.deb";
sha256 = "1p46zi1hh9calkcfgqz60c6rdi9i7i16ylj84iibi6k0pc690fjy";
sha256 = "ApKj5gulTCzWh7oSAM+JWQnWviHCnHV3OJHegpXJL54=";
};
nativeBuildInputs = [
pkgs/development/tools/misc/blackmagic/default.nix
+14 -5
View File
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub
{ stdenv, lib, fetchFromGitHub, fetchpatch
, gcc-arm-embedded, libftdi1, libusb-compat-0_1, pkg-config
, python, pythonPackages
, python3
}:
with lib;
@@ -19,17 +19,26 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
patches = [
# Fix deprecation warning with libftdi 1.5
(fetchpatch {
url = "https://github.com/blacksphere/blackmagic/commit/dea4be2539c5ea63836ec78dca08b52fa8b26ab5.patch";
sha256 = "0f81simij1wdhifsxaavalc6yxzagfbgwry969dbjmxqzvrsrds5";
})
];
nativeBuildInputs = [
gcc-arm-embedded pkg-config
python3
];
buildInputs = [
libftdi1
libusb-compat-0_1
python
pythonPackages.intelhex
];
strictDeps = true;
postPatch = ''
# Prevent calling out to `git' to generate a version number:
substituteInPlace src/Makefile \
@@ -42,7 +51,7 @@ stdenv.mkDerivation rec {
'';
buildPhase = "${stdenv.shell} ${./helper.sh}";
installPhase = ":"; # buildPhase does this.
dontInstall = true;
enableParallelBuilding = true;
pkgs/development/tools/misc/bonnmotion/default.nix
+50
View File
@@ -0,0 +1,50 @@
{ stdenv, lib, fetchzip, substituteAll, bash, jre }:
stdenv.mkDerivation rec {
pname = "bonnmotion";
version = "3.0.1";
src = fetchzip {
url = "https://sys.cs.uos.de/bonnmotion/src/bonnmotion-${version}.zip";
sha256 = "16bjgr0hy6an892m5r3x9yq6rqrl11n91f9rambq5ik1cxjqarxw";
};
patches = [
# The software has a non-standard install bash script which kind of works.
# However, to make it fully functional, the automatically detection of the
# program paths must be substituted with full paths.
(substituteAll {
src = ./install.patch;
inherit bash jre;
})
];
installPhase = ''
runHook preInstall
./install
mkdir -p $out/bin $out/share/bonnmotion
cp -r ./classes ./lib $out/share/bonnmotion/
cp ./bin/bm $out/bin/
substituteInPlace $out/bin/bm \
--replace /build/source $out/share/bonnmotion
runHook postInstall
'';
meta = with lib; {
description = "A mobility scenario generation and analysis tool";
longDescription = ''
BonnMotion is a Java software which creates and analyzes mobility
scenarios and is most commonly used as a tool for the investigation of
mobile ad hoc network characteristics. The scenarios can also be exported
for several network simulators, such as ns-2, ns-3, GloMoSim/QualNet,
COOJA, MiXiM, and ONE.
'';
homepage = "https://sys.cs.uos.de/bonnmotion/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ oxzi ];
};
}
pkgs/development/tools/misc/bonnmotion/install.patch
+75
View File
@@ -0,0 +1,75 @@
diff --git a/install b/install
index 95afa2c..70c5fca 100755
--- a/install
+++ b/install
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@bash@/bin/bash
echo "BonnMotion - a mobility scenario generation and analysis tool"
echo "Copyright (C) 2002-2012 University of Bonn"
@@ -19,28 +19,11 @@ echo "along with this program; if not, write to the Free Software"
echo "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA"
echo
-OS=`uname -s | tr A-Z a-z | sed -e s/_.\*//`
-
PACKAGE=edu.bonn.cs.iv.bonnmotion
-JAVAPATH=`which java 2> /dev/null`
-if [ ! "$JAVAPATH" = "" ]
-then
- JAVAPATH=`dirname ${JAVAPATH}`
-fi
-echo -n Please enter your Java binary path \[$JAVAPATH\]:\
-read KBDENTRY
-if [ ! "$KBDENTRY" = "" ]
-then
- JAVAPATH=$KBDENTRY
-fi
+JAVAPATH="@jre@/bin"
if [ -x "${JAVAPATH}/java" ]
then
- cd `dirname $0`
- BONNMOTION=`pwd`
-
- cd "${JAVAPATH}"
- JAVAPATH=`pwd`
- cd "${BONNMOTION}"
+ BONNMOTION="$(realpath .)"
CLASSPATH="${BONNMOTION}/classes"
DOCPATH="${BONNMOTION}/javadoc"
@@ -52,14 +35,7 @@ then
then
mkdir "${DOCPATH}"
fi
- if [ $OS = "cygwin" ]
- then
- cd "${CLASSPATH}"
- CLASSPATH=`cmd.exe /c cd`
- cd "${DOCPATH}"
- DOCPATH=`cmd.exe /c cd`
- fi
-
+
for l in $BONNMOTION/lib/*.jar
do
LIBRARYPATH=$LIBRARYPATH:$l
@@ -69,7 +45,7 @@ then
APPS=`ls`
cd "${BONNMOTION}/bin"
- echo \#\!/bin/bash > .head
+ echo \#\!@bash@/bin/bash > .head
echo >> .head
echo BONNMOTION=\"$BONNMOTION\" >> .head
echo PACKAGE=\"$PACKAGE\" >> .head
@@ -103,8 +79,6 @@ then
fi
echo "done."
echo
- echo "$ ./bin/bm -h"
- ./bm
else
echo No executable \"$JAVAPATH/java\", aborting.
fi
pkgs/development/tools/misc/cbrowser/default.nix
+2 -1
View File
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
patches = [ ./backslashes-quotes.diff ];
buildInputs = [ tk makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ tk ];
installPhase = ''
mkdir -p $out/bin $out/share/${name}
pkgs/development/tools/misc/ccache/default.nix
+17 -7
View File
@@ -13,19 +13,29 @@
let ccache = stdenv.mkDerivation rec {
pname = "ccache";
version = "4.1";
version = "4.2.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "1az11q3wmr8wc7alx9l70wq9am41cm0y17g5gsaqmahws3dxfi8m";
hash = "sha256-AmgJpW7AGCSggbHp1fLO5yhXS9LIm7O77nQdDERJYAA=";
};
patches = lib.optional stdenv.isDarwin (substituteAll {
src = ./force-objdump-on-darwin.patch;
objdump = "${binutils.bintools}/bin/objdump";
});
patches = [
# test/run use compgen to get environment variable names, but
# compgen isn't available in non-interactive bash.
./env-instead-of-compgen.patch
# When building for Darwin, test/run uses dwarfdump, whereas on
# Linux it uses objdump. We don't have dwarfdump packaged for
# Darwin, so this patch updates the test to also use objdump on
# Darwin.
(substituteAll {
src = ./force-objdump-on-darwin.patch;
objdump = "${binutils.bintools}/bin/objdump";
})
];
nativeBuildInputs = [ asciidoc cmake perl ];
@@ -38,7 +48,7 @@ let ccache = stdenv.mkDerivation rec {
checkPhase = ''
export HOME=$(mktemp -d)
ctest --output-on-failure ${lib.optionalString stdenv.isDarwin ''
-E '^(test.nocpp2|test.modules)$'
-E '^(test.nocpp2|test.basedir|test.multi_arch)$'
''}
'';
pkgs/development/tools/misc/ccache/env-instead-of-compgen.patch
+18
View File
@@ -0,0 +1,18 @@
diff --git a/test/run b/test/run
index cbdd98f0..bc930200 100755
--- a/test/run
+++ b/test/run
@@ -346,11 +346,11 @@ expect_perm() {
}
reset_environment() {
- while IFS= read -r name; do
+ while IFS='=' read -r name value; do
if [[ $name =~ ^CCACHE_[A-Z0-9_]*$ ]]; then
unset $name
fi
- done < <(compgen -e)
+ done < <(env)
unset GCC_COLORS
unset TERM
pkgs/development/tools/misc/ccls/default.nix
+2 -2
View File
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "ccls";
version = "0.20201025";
version = "0.20210330";
src = fetchFromGitHub {
owner = "MaskRay";
repo = "ccls";
rev = version;
sha256 = "13v00q1bz8g0ckw1sv0zyicbc44irc00vhwxdv3vvwlvylm7s21p";
sha256 = "sha256-jipSipgD0avd7XODlpxnqjHK3s6nacaxbIQIddix7X8=";
};
nativeBuildInputs = [ cmake ];
pkgs/development/tools/misc/checkbashisms/default.nix
+21 -8
View File
@@ -1,26 +1,39 @@
{ lib, stdenv, fetchurl, perl }:
{ lib, stdenv, fetchurl, perl, installShellFiles }:
stdenv.mkDerivation rec {
version = "2.0.0.2";
version = "2.21.1";
pname = "checkbashisms";
src = fetchurl {
url = "mirror://sourceforge/project/checkbaskisms/${version}/checkbashisms";
sha256 = "1vm0yykkg58ja9ianfpm3mgrpah109gj33b41kl0jmmm11zip9jd";
url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz";
hash = "sha256-1ZbIiUrFd38uMVLy7YayLLm5RrmcovsA++JTb8PbTFI=";
};
nativeBuildInputs = [ installShellFiles ];
buildInputs = [ perl ];
# The link returns directly the script. No need for unpacking
dontUnpack = true;
buildPhase = ''
runHook preBuild
substituteInPlace ./scripts/checkbashisms.pl \
--replace '###VERSION###' "$version"
runHook postBuild
'';
installPhase = ''
install -D -m755 $src $out/bin/checkbashisms
runHook preInstall
installManPage scripts/$pname.1
installShellCompletion --bash --name $pname scripts/$pname.bash_completion
install -D -m755 scripts/$pname.pl $out/bin/$pname
runHook postInstall
'';
meta = {
homepage = "https://sourceforge.net/projects/checkbaskisms/";
description = "Check shell scripts for non-portable syntax";
license = lib.licenses.gpl2;
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ kaction ];
platforms = lib.platforms.unix;
};
}
pkgs/development/tools/misc/circleci-cli/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "circleci-cli";
version = "0.1.11924";
version = "0.1.15149";
src = fetchFromGitHub {
owner = "CircleCI-Public";
repo = pname;
rev = "v${version}";
sha256 = "sha256-KY1kqqRRpwNt0ovllfFcWSsJAH2J1NrlQAueqQrw354=";
sha256 = "sha256-pmLDCNgCQv4fetl/q6ZokH1qF6pSqsR0DUWbzGeEtaw=";
};
vendorSha256 = "sha256-6FBMLwoLM2BtnMHQfpY7f7NiQt5evsL4CfYTZvr3gAs=";
vendorSha256 = "sha256-j7VP/QKKMdmWQ60BYpChG4syDlll7CY4rb4wfb4+Z1s=";
doCheck = false;
pkgs/development/tools/misc/cli11/default.nix
+2 -2
View File
@@ -3,7 +3,7 @@
fetchFromGitHub,
cmake,
gtest,
python,
python3,
boost
}:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
checkInputs = [ boost python ];
checkInputs = [ boost python3 ];
doCheck = true;
pkgs/development/tools/misc/clojure-lsp/default.nix
+39 -14
View File
@@ -1,31 +1,56 @@
{ lib, stdenv, fetchurl, jre, makeWrapper }:
{ lib, stdenv, graalvm11-ce, babashka, fetchurl, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "clojure-lsp";
version = "2021.01.28-03.03.16";
version = "2021.04.13-12.47.33";
src = fetchurl {
url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/${pname}.jar";
sha256 = "sha256-7Mj0yZD8WKpeekEkLZfQhHaPDRzcKO9arOCo0pwUflY=";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "1la0d28pvp1fqnxp3scb2vawcblilwyx42djxn379vag403p1i2d";
};
dontUnpack = true;
jar = fetchurl {
url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp.jar";
sha256 = "059gz7y2rzwdxpyqy80w4lghzgxi5lb4rxmks1721yq6k7ljjyqy";
};
buildInputs = [ makeWrapper ];
GRAALVM_HOME = graalvm11-ce;
CLOJURE_LSP_JAR = jar;
buildInputs = [ graalvm11-ce ];
buildPhase = with lib; ''
runHook preBuild
bash ./graalvm/native-unix-compile.sh
runHook postBuild
'';
installPhase = ''
install -Dm644 $src $out/share/java/${pname}.jar
makeWrapper ${jre}/bin/java $out/bin/${pname} \
--add-flags "-Xmx2g" \
--add-flags "-server" \
--add-flags "-jar $out/share/java/${pname}.jar"
runHook preInstall
install -Dm755 ./clojure-lsp $out/bin/clojure-lsp
runHook postInstall
'';
doCheck = true;
checkPhase = ''
runHook preCheck
${babashka}/bin/bb integration-test/run-all.clj ./clojure-lsp
runHook postCheck
'';
meta = with lib; {
description = "Language Server Protocol (LSP) for Clojure";
homepage = "https://github.com/snoe/clojure-lsp";
homepage = "https://github.com/clojure-lsp/clojure-lsp";
license = licenses.mit;
maintainers = [ maintainers.ericdallo ];
platforms = jre.meta.platforms;
platforms = graalvm11-ce.meta.platforms;
};
}
pkgs/development/tools/misc/cproto/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "cproto";
version = "4.7q";
version = "4.7r";
src = fetchurl {
urls = [
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
# No version listings and apparently no versioned tarball over http(s).
"ftp://ftp.invisible-island.net/cproto/cproto-${version}.tgz"
];
sha256 = "138n5j6lkanbbdcs63irzxny4nfgp0zk66z621xjbnybf920svpk";
sha256 = "sha256-bgRg2yVZXHobUz8AUaV4ZKBkp2KjP+2oXbDXmPTUX8U=";
};
# patch made by Joe Khoobyar copied from gentoo bugs
pkgs/development/tools/misc/cvise/default.nix
+46
View File
@@ -0,0 +1,46 @@
{ lib, buildPythonApplication, fetchFromGitHub, cmake, flex
, clang-unwrapped, llvm, unifdef
, pebble, psutil, pytestCheckHook, pytest-flake8
}:
buildPythonApplication rec {
pname = "cvise";
version = "2.3.0";
src = fetchFromGitHub {
owner = "marxin";
repo = "cvise";
rev = "v${version}";
sha256 = "1x2i8nv0nncgvr07znhh2slngbrg8qcsz2zqx76bcyq9hssn6yal";
};
patches = [
# Refer to unifdef by absolute path.
./unifdef.patch
];
nativeBuildInputs = [ cmake flex ];
buildInputs = [ clang-unwrapped llvm unifdef ];
propagatedBuildInputs = [ pebble psutil ];
checkInputs = [ pytestCheckHook pytest-flake8 unifdef ];
preCheck = ''
patchShebangs cvise.py
'';
disabledTests = [
# Needs gcc, fails when run noninteractively (without tty).
"test_simple_reduction"
];
dontUsePipInstall = true;
dontUseSetuptoolsBuild = true;
dontUseSetuptoolsCheck = true;
meta = with lib; {
homepage = "https://github.com/marxin/cvise";
description = "Super-parallel Python port of C-Reduce";
license = licenses.ncsa;
maintainers = with maintainers; [ orivej ];
platforms = platforms.linux;
};
}
pkgs/development/tools/misc/cvise/unifdef.patch
+8
View File
@@ -0,0 +1,8 @@
--- a/cvise.py
+++ b/cvise.py
@@ -93,4 +93,5 @@ def find_external_programs():
# Special case for clang-format
programs['clang-format'] = '@CLANG_FORMAT_PATH@'
+ programs['unifdef'] = '@UNIFDEF@'
return programs
pkgs/development/tools/misc/cwebbin/default.nix
+10 -2
View File
@@ -16,7 +16,15 @@ stdenv.mkDerivation rec {
sha256 = "1hdzxfzaibnjxjzgp6d2zay8nsarnfy9hfq55hz1bxzzl23n35aj";
};
buildInputs = [ tie ];
# Remove references to __DATE__ and __TIME__
postPatch = ''
substituteInPlace wmerg-patch.ch --replace ' ("__DATE__", "__TIME__")' ""
substituteInPlace ctang-patch.ch --replace ' ("__DATE__", "__TIME__")' ""
substituteInPlace ctangle.cxx --replace ' ("__DATE__", "__TIME__")' ""
substituteInPlace cweav-patch.ch --replace ' ("__DATE__", "__TIME__")' ""
'';
nativeBuildInputs = [ tie ];
makeFlags = [
"MACROSDIR=$(out)/share/texmf/tex/generic/cweb"
@@ -27,7 +35,7 @@ stdenv.mkDerivation rec {
"CP=cp"
"RM=rm"
"PDFTEX=echo"
"CC=c++"
"CC=${stdenv.cc.targetPrefix}c++"
];
buildPhase = ''
pkgs/development/tools/misc/dejagnu/default.nix
+2 -1
View File
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "0qfj2wd4qk1yn9yzam6g8nmyxfazcc0knjyyibycb2ainkhp21hd";
};
buildInputs = [ expect makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ expect ];
doCheck = true;
pkgs/development/tools/misc/dialog/default.nix
-41
View File
@@ -1,41 +0,0 @@
{ lib, stdenv, fetchurl
, ncurses
, withLibrary ? false, libtool
, unicodeSupport ? true
, enableShared ? !stdenv.isDarwin
}:
assert withLibrary -> libtool != null;
assert unicodeSupport -> ncurses.unicode && ncurses != null;
stdenv.mkDerivation rec {
pname = "dialog";
version = "1.3-20201126";
src = fetchurl {
urls = [
"ftp://ftp.invisible-island.net/dialog/${pname}-${version}.tgz"
"https://invisible-mirror.net/archives/dialog/${pname}-${version}.tgz"
];
sha256 = "sha256-ySM6bI6jOlniN45RRq4r0TtRl0TP22R690IK2sWtOGY=";
};
buildInputs = [ ncurses ];
configureFlags = [
"--disable-rpath-hacks"
(lib.withFeature withLibrary "libtool")
"--with-ncurses${lib.optionalString unicodeSupport "w"}"
"--with-libtool-opts=${lib.optionalString enableShared "-shared"}"
];
installTargets = [ "install${lib.optionalString withLibrary "-full"}" ];
meta = with lib; {
homepage = "https://invisible-island.net/dialog/dialog.html";
description = "Display dialog boxes from shell";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ AndersonTorres spacefrogg ];
platforms = ncurses.meta.platforms;
};
}
pkgs/development/tools/misc/direvent/default.nix
+1 -1
View File
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
description = "Directory event monitoring daemon";
homepage = "https://www.gnu.org.ua/software/direvent/";
license = licenses.gpl3Plus;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = with maintainers; [ puffnfresh ];
};
}
pkgs/development/tools/misc/distcc/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, popt, avahi, pkg-config, python, gtk2, runCommand
{ lib, stdenv, fetchFromGitHub, popt, avahi, pkg-config, python3, gtk2, runCommand
, gcc, autoconf, automake, which, procps, libiberty_static
, runtimeShell
, sysconfDir ? "" # set this parameter to override the default value $out/etc
@@ -18,7 +18,7 @@ let
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [popt avahi pkg-config python gtk2 autoconf automake which procps libiberty_static];
buildInputs = [popt avahi pkg-config python3 gtk2 autoconf automake which procps libiberty_static];
preConfigure =
''
export CPATH=$(ls -d ${gcc.cc}/lib/gcc/*/${gcc.cc.version}/plugin/include)
pkgs/development/tools/misc/doclifter/default.nix
+4 -2
View File
@@ -1,4 +1,4 @@
{lib, stdenv, fetchurl, python}:
{lib, stdenv, fetchurl, python3}:
stdenv.mkDerivation {
name = "doclifter-2.19";
@@ -6,7 +6,9 @@ stdenv.mkDerivation {
url = "http://www.catb.org/~esr/doclifter/doclifter-2.19.tar.gz";
sha256 = "1as6z7mdjrrkw2kism41q5ybvyzvwcmj9qzla2fz98v9f4jbj2s2";
};
buildInputs = [ python ];
buildInputs = [ python3 ];
strictDeps = true;
makeFlags = [ "PREFIX=$(out)" ];
pkgs/development/tools/misc/edb/default.nix
+42
View File
@@ -0,0 +1,42 @@
{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config, boost, capstone
, double-conversion, graphviz, qtxmlpatterns }:
mkDerivation rec {
pname = "edb";
version = "1.3.0";
src = fetchFromGitHub {
owner = "eteran";
repo = "edb-debugger";
rev = "1.3.0";
fetchSubmodules = true;
sha256 = "fFUau8XnsRFjC83HEsqyhrwCCBOfDmV6oACf3txm7O8=";
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ boost.dev capstone double-conversion graphviz qtxmlpatterns ];
postPatch = ''
# Remove CMAKE_INSTALL_PREFIX from DEFAULT_PLUGIN_PATH otherwise the nix store path will appear twice.
substituteInPlace ./src/CMakeLists.txt --replace \
'-DDEFAULT_PLUGIN_PATH=\"''${CMAKE_INSTALL_PREFIX}/''${CMAKE_INSTALL_LIBDIR}/edb\"' \
'-DDEFAULT_PLUGIN_PATH=\"''${CMAKE_INSTALL_LIBDIR}/edb\"'
# The build script checks for the presence of .git to determine whether
# submodules were fetched and will throw an error if it's not there.
# Avoid using leaveDotGit in the fetchFromGitHub options as it is non-deterministic.
mkdir -p src/qhexview/.git
# Change default optional terminal program path to one that is more likely to work on NixOS.
substituteInPlace ./src/Configuration.cpp --replace "/usr/bin/xterm" "xterm";
'';
meta = with lib; {
description = "Cross platform AArch32/x86/x86-64 debugger";
homepage = "https://github.com/eteran/edb-debugger";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ lihop maxxk ];
platforms = [ "x86_64-linux" ];
};
}
pkgs/development/tools/misc/editorconfig-checker/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "editorconfig-checker";
version = "2.3.1";
version = "2.3.5";
src = fetchFromGitHub {
owner = "editorconfig-checker";
repo = "editorconfig-checker";
rev = version;
sha256 = "0c7mainlwn3pd9q6i1f82m5znv8m6fs15zq7nrbm04fy554h0pzz";
sha256 = "sha256-t1qvmTs6hOrAnq5hjU2Qjt33vdW9MuSOvWCCY82db+g=";
};
vendorSha256 = "1z4j8vm9mnhjhhmhlj0ycs8b1wpm7lhsfqjnk7w8gfapvj3yfk6h";
vendorSha256 = "sha256-Rs7u/ZepnMNg5EZ/HWqSdO428KOkxpSbo7rl0treqUY=";
doCheck = false;
pkgs/development/tools/misc/elfkickers/default.nix
+1 -1
View File
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "02354yn1lh1dxny35ky2d0b44iq302krsqpwk5grr4glma00hhq6";
};
makeFlags = [ "CC=cc prefix=$(out)" ];
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc prefix=$(out)" ];
enableParallelBuilding = true;
pkgs/development/tools/misc/elfutils/default.nix
+75 -16
View File
@@ -1,47 +1,106 @@
{ lib, stdenv, fetchurl, m4, zlib, bzip2, bison, flex, gettext, xz, setupDebugInfoDirs, argp-standalone }:
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, autoreconfHook, musl-fts
, musl-obstack, m4, zlib, bzip2, bison, flex, gettext, xz, setupDebugInfoDirs
, argp-standalone
, enableDebuginfod ? false, sqlite, curl, libmicrohttpd_0_9_70, libarchive
}:
# TODO: Look at the hardcoded paths to kernel, modules etc.
stdenv.mkDerivation rec {
pname = "elfutils";
version = "0.180";
version = "0.182";
src = fetchurl {
url = "https://sourceware.org/elfutils/ftp/${version}/${pname}-${version}.tar.bz2";
sha256 = "17an1f67bfzxin482nbcxdl5qvywm27i9kypjyx8ilarbkivc9xq";
sha256 = "7MQGkU7fM18Lf8CE6+bEYMTW1Rdb/dZojBx42RRriFg=";
};
patches = [ ./debug-info-from-env.patch ];
patches = [
./debug-info-from-env.patch
./musl-cdefs_h.patch
(fetchpatch {
name = "fix-aarch64_fregs.patch";
url = "https://git.alpinelinux.org/aports/plain/main/elfutils/fix-aarch64_fregs.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";
sha256 = "zvncoRkQx3AwPx52ehjA2vcFroF+yDC2MQR5uS6DATs=";
})
(fetchpatch {
name = "musl-asm-ptrace-h.patch";
url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-asm-ptrace-h.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";
sha256 = "8D1wPcdgAkE/TNBOgsHaeTZYhd9l+9TrZg8d5C7kG6k=";
})
(fetchpatch {
name = "musl-fts-obstack.patch";
url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-fts-obstack.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";
sha256 = "3lbC0UtscTIJgT7kOXnnjWrpPAVt2PYMbW+uJK6K350=";
})
(fetchpatch {
name = "musl-macros.patch";
url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-macros.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";
sha256 = "tp6O1TRsTAMsFe8vw3LMENT/vAu6OmyA8+pzgThHeA8=";
})
(fetchpatch {
name = "musl-qsort_r.patch";
url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-qsort_r.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";
sha256 = "FPWCkdtFT3zw8aNnz0Jz5Vmu8B/mRfNgfhbM/ej7d8M=";
})
(fetchpatch {
name = "musl-strerror_r.patch";
url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-strerror_r.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";
sha256 = "QF6YwWkcT12dZHKzfqFgxy/1fkIllo0AAosbV0sM5PU=";
})
(fetchpatch {
name = "musl-strndupa.patch";
url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-strndupa.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";
sha256 = "sha256-7daehJj1t0wPtQzTv+/Rpuqqs5Ng/EYnZzrcf2o/Lb0=";
})
] ++ lib.optional stdenv.hostPlatform.isMusl [ ./musl-error_h.patch ];
outputs = [ "bin" "dev" "out" "man" ];
hardeningDisable = [ "format" ];
# We need bzip2 in NativeInputs because otherwise we can't unpack the src,
# as the host-bzip2 will be in the path.
nativeBuildInputs = [ m4 bison flex gettext bzip2 ];
nativeBuildInputs = [ m4 bison flex gettext bzip2 ]
++ lib.optional stdenv.hostPlatform.isMusl autoreconfHook
++ lib.optional (enableDebuginfod || stdenv.hostPlatform.isMusl) pkg-config;
buildInputs = [ zlib bzip2 xz ]
++ lib.optional stdenv.hostPlatform.isMusl argp-standalone;
++ lib.optionals stdenv.hostPlatform.isMusl [
argp-standalone
musl-fts
musl-obstack
] ++ lib.optionals enableDebuginfod [
sqlite
curl
libmicrohttpd_0_9_70
libarchive
];
propagatedNativeBuildInputs = [ setupDebugInfoDirs ];
preConfigure = lib.optionalString stdenv.hostPlatform.isMusl ''
NIX_CFLAGS_COMPILE+=" -fgnu89-inline"
NIX_CFLAGS_COMPILE+=" -Wno-null-dereference"
'';
configureFlags =
[ "--program-prefix=eu-" # prevent collisions with binutils
"--enable-deterministic-archives"
"--disable-debuginfod"
];
configureFlags = [
"--program-prefix=eu-" # prevent collisions with binutils
"--enable-deterministic-archives"
] ++ lib.optionals (!enableDebuginfod) [
"--disable-libdebuginfod"
"--disable-debuginfod"
];
enableParallelBuilding = true;
doCheck = false; # fails 3 out of 174 tests
doInstallCheck = false; # fails 70 out of 174 tests
meta = {
meta = with lib; {
homepage = "https://sourceware.org/elfutils/";
description = "A set of utilities to handle ELF objects";
platforms = lib.platforms.linux;
license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.eelco ];
platforms = platforms.linux;
# licenses are GPL2 or LGPL3+ for libraries, GPL3+ for bins,
# but since this package isn't split that way, all three are listed.
license = with licenses; [ gpl2Only lgpl3Plus gpl3Plus ];
maintainers = [ maintainers.eelco ];
};
}
pkgs/development/tools/misc/elfutils/musl-cdefs_h.patch
+15
View File
@@ -0,0 +1,15 @@
# avoids a warning about including an internal header when
# compiling with musl-libc
diff -crb --new-file a/lib/fixedsizehash.h b/lib/fixedsizehash.h
*** a/lib/fixedsizehash.h 2020-06-11 11:37:46.000000000 -0400
--- b/lib/fixedsizehash.h 2021-01-21 05:52:59.000000000 -0500
***************
*** 30,36 ****
#include <errno.h>
#include <stdlib.h>
#include <string.h>
- #include <sys/cdefs.h>
#include <system.h>
--- 30,35 ----
pkgs/development/tools/misc/elfutils/musl-error_h.patch
+66
View File
@@ -0,0 +1,66 @@
diff -crb --new-file a/lib/error.h b/lib/error.h
*** a/lib/error.h 1969-12-31 19:00:00.000000000 -0500
--- b/lib/error.h 2021-01-21 04:38:25.000000000 -0500
***************
*** 0 ****
--- 1,27 ----
+ #ifndef _ERROR_H_
+ #define _ERROR_H_
+
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <errno.h>
+
+ static unsigned int error_message_count = 0;
+
+ static inline void error(int status, int errnum, const char* format, ...)
+ {
+ va_list ap;
+ fprintf(stderr, "%s: ", program_invocation_name);
+ va_start(ap, format);
+ vfprintf(stderr, format, ap);
+ va_end(ap);
+ if (errnum)
+ fprintf(stderr, ": %s", strerror(errnum));
+ fprintf(stderr, "\n");
+ error_message_count++;
+ if (status)
+ exit(status);
+ }
+
+ #endif /* _ERROR_H_ */
diff -crb --new-file a/src/error.h b/src/error.h
*** a/src/error.h 1969-12-31 19:00:00.000000000 -0500
--- b/src/error.h 2021-01-21 04:38:29.000000000 -0500
***************
*** 0 ****
--- 1,27 ----
+ #ifndef _ERROR_H_
+ #define _ERROR_H_
+
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <errno.h>
+
+ static unsigned int error_message_count = 0;
+
+ static inline void error(int status, int errnum, const char* format, ...)
+ {
+ va_list ap;
+ fprintf(stderr, "%s: ", program_invocation_name);
+ va_start(ap, format);
+ vfprintf(stderr, format, ap);
+ va_end(ap);
+ if (errnum)
+ fprintf(stderr, ": %s", strerror(errnum));
+ fprintf(stderr, "\n");
+ error_message_count++;
+ if (status)
+ exit(status);
+ }
+
+ #endif /* _ERROR_H_ */
pkgs/development/tools/misc/fswatch/default.nix
+2 -2
View File
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
sha256 = "11479ac436g8bwk0lfnmdms0cirv9k11pdvfrrg9jwkki1j1abkk";
};
nativeBuildInputs = [ autoreconfHook ] ++ lib.optionals stdenv.isDarwin [ CoreServices ];
buildInputs = [ gettext libtool makeWrapper texinfo ];
nativeBuildInputs = [ autoreconfHook makeWrapper ] ++ lib.optionals stdenv.isDarwin [ CoreServices ];
buildInputs = [ gettext libtool texinfo ];
enableParallelBuilding = true;
pkgs/development/tools/misc/gdb/default.nix
+2 -1
View File
@@ -82,7 +82,8 @@ stdenv.mkDerivation rec {
"--with-mpfr=${mpfr.dev}"
"--with-expat" "--with-libexpat-prefix=${expat.dev}"
"--with-auto-load-safe-path=${builtins.concatStringsSep ":" safePaths}"
] ++ lib.optional (!pythonSupport) "--without-python";
] ++ lib.optional (!pythonSupport) "--without-python"
++ lib.optional stdenv.hostPlatform.isMusl "--disable-nls";
postInstall =
'' # Remove Info files already provided by Binutils and other packages.
pkgs/development/tools/misc/gede/default.nix
+4 -2
View File
@@ -1,4 +1,4 @@
{ mkDerivation, lib, fetchurl, makeWrapper, python, qmake, ctags, gdb }:
{ mkDerivation, lib, fetchurl, makeWrapper, python3, qmake, ctags, gdb }:
mkDerivation rec {
pname = "gede";
@@ -9,10 +9,12 @@ mkDerivation rec {
sha256 = "0hbsy2ymzgl8xd9mnh43gxdfncy7g6czxfvfyh7zp3ij8yiwf8x3";
};
nativeBuildInputs = [ qmake makeWrapper python ];
nativeBuildInputs = [ qmake makeWrapper python3 ];
buildInputs = [ ctags ];
strictDeps = true;
dontUseQmakeConfigure = true;
buildPhase = ":";
pkgs/development/tools/misc/global/default.nix
+7 -5
View File
@@ -1,8 +1,10 @@
{ fetchurl, lib, stdenv, libtool, makeWrapper
, coreutils, ctags, ncurses, pythonPackages, sqlite, universal-ctags
, coreutils, ctags, ncurses, python3Packages, sqlite, universal-ctags
}:
stdenv.mkDerivation rec {
let
pygments = python3Packages.pygments;
in stdenv.mkDerivation rec {
pname = "global";
version = "6.6.5";
@@ -15,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [ ncurses ];
propagatedBuildInputs = [ pythonPackages.pygments ];
propagatedBuildInputs = [ pygments ];
configureFlags = [
"--with-ltdl-include=${libtool}/include"
@@ -34,9 +36,9 @@ stdenv.mkDerivation rec {
cp -v *.el "$out/share/emacs/site-lisp"
wrapProgram $out/bin/gtags \
--prefix PYTHONPATH : "$(toPythonPath ${pythonPackages.pygments})"
--prefix PYTHONPATH : "$(toPythonPath ${pygments})"
wrapProgram $out/bin/global \
--prefix PYTHONPATH : "$(toPythonPath ${pythonPackages.pygments})"
--prefix PYTHONPATH : "$(toPythonPath ${pygments})"
'';
meta = with lib; {
pkgs/development/tools/misc/md2man/default.nix → pkgs/development/tools/misc/go-md2man/default.nix
+3 -3
View File
@@ -1,10 +1,10 @@
{ lib, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoPackage rec {
buildGoModule rec {
pname = "go-md2man";
version = "2.0.0";
goPackagePath = "github.com/cpuguy83/go-md2man";
vendorSha256 = null;
src = fetchFromGitHub {
rev = "v${version}";
pkgs/development/tools/misc/gpshell/default.nix
+2 -2
View File
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "19a77zvyf2vazbv17185s4pynhylk2ky8vhl4i8pg9zww29sicqi";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ globalplatform pcsclite makeWrapper ];
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [ globalplatform pcsclite ];
postFixup = ''
wrapProgram "$out/bin/gpshell" --prefix LD_LIBRARY_PATH : "${gppcscconnectionplugin}/lib"
pkgs/development/tools/misc/gpuvis/default.nix
+42
View File
@@ -0,0 +1,42 @@
{ fetchFromGitHub
, freetype
, gtk3
, lib
, meson
, ninja
, pkg-config
, SDL2
, stdenv
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "gpuvis";
version = "20210220";
src = fetchFromGitHub {
owner = "mikesart";
repo = pname;
rev = "216f7d810e182a89fd96ab9fad2a5c2b1e425ea9";
sha256 = "15pj7gy0irlp849a85z68n184jksjri0xhihgh56rs15kq333mwz";
};
# patch dlopen path for gtk3
# python2 is wrongly added in the meson file, upstream PR: https://github.com/mikesart/gpuvis/pull/62
postPatch = ''
substituteInPlace src/hook_gtk3.h \
--replace "libgtk-3.so" "${lib.getLib gtk3}/lib/libgtk-3.so"
'';
nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook ];
buildInputs = [ SDL2 gtk3 freetype ];
meta = with lib; {
description = "GPU Trace Visualizer";
homepage = "https://github.com/mikesart/gpuvis";
license = licenses.mit;
maintainers = with maintainers; [ emantor ];
platforms = with platforms; linux;
};
}
pkgs/development/tools/misc/help2man/default.nix
+2 -2
View File
@@ -6,11 +6,11 @@
# files.
stdenv.mkDerivation rec {
name = "help2man-1.47.16";
name = "help2man-1.48.1";
src = fetchurl {
url = "mirror://gnu/help2man/${name}.tar.xz";
sha256 = "1x586h7wvripcay35kdh2kvydx84y8yy93ffjah2rqw6bc65iy1y";
sha256 = "sha256-3op0dAvQWGRlZ7kqtOzeudqfGgfMfE9gejwU3TjRB5k=";
};
nativeBuildInputs = [ gettext perlPackages.LocaleGettext ];
pkgs/development/tools/misc/hound/default.nix
+22 -23
View File
@@ -1,39 +1,38 @@
{ lib, stdenv
, buildGoPackage
{ lib
, buildGoModule
, fetchFromGitHub
, makeWrapper
, mercurial
, git
}:
buildGoPackage rec {
pname = "hound-unstable";
version = "2018-11-02";
rev = "74ec7448a234d8d09e800b92e52c92e378c07742";
buildGoModule rec {
pname = "hound";
version = "0.4.0";
src = fetchFromGitHub {
owner = "hound-search";
repo = "hound";
rev = "v${version}";
sha256 = "0p5w54fr5xz19ff8k5xkyq3iqhjki8wc0hj2x1pnmk6hzrz6hf65";
};
vendorSha256 = "0x1nhhhvqmz3qssd2d44zaxbahj8lh9r4m5jxdvzqk6m3ly7y0b6";
nativeBuildInputs = [ makeWrapper ];
goPackagePath = "github.com/etsy/hound";
# requires network access
doCheck = false;
src = fetchFromGitHub {
inherit rev;
owner = "etsy";
repo = "hound";
sha256 = "0g6nvgqjabprcl9z5ci5frhbam1dzq978h1d6aanf8vvzslfgdpq";
};
postInstall = with stdenv; let
binPath = lib.makeBinPath [ mercurial git ];
in ''
wrapProgram $out/bin/houndd --prefix PATH : ${binPath}
postInstall = ''
wrapProgram $out/bin/houndd --prefix PATH : ${lib.makeBinPath [ mercurial git ]}
'';
meta = {
meta = with lib; {
inherit (src.meta) homepage;
description = "Lightning fast code searching made easy";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ grahamc ];
platforms = lib.platforms.unix;
license = licenses.mit;
maintainers = with maintainers; [ grahamc SuperSandro2000 ];
platforms = platforms.unix;
};
}
pkgs/development/tools/misc/hydra/common.nix
+6 -6
View File
@@ -1,11 +1,11 @@
{ stdenv, nix, perlPackages, buildEnv, fetchFromGitHub
{ stdenv, nix, perlPackages, buildEnv
, makeWrapper, autoconf, automake, libtool, unzip, pkg-config, sqlite, libpqxx
, top-git, mercurial, darcs, subversion, breezy, openssl, bzip2, libxslt
, guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json
, docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar
, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json
, docbook_xsl, openssh, gnused, coreutils, findutils, gzip, xz, gnutar
, rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null
, migration ? false, patches ? []
, tests ? {}
, tests ? {}, mdbook
}:
with stdenv;
@@ -89,10 +89,10 @@ in stdenv.mkDerivation rec {
hydraPath = lib.makeBinPath (
[ sqlite subversion openssh nix coreutils findutils pixz
gzip bzip2 lzma gnutar unzip git top-git mercurial /*darcs*/ gnused breezy
gzip bzip2 xz gnutar unzip git top-git mercurial /*darcs*/ gnused breezy
] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] );
nativeBuildInputs = [ autoreconfHook pkg-config ];
nativeBuildInputs = [ autoreconfHook pkg-config mdbook ];
configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];
pkgs/development/tools/misc/hydra/default.nix
+3 -6
View File
@@ -2,16 +2,13 @@
{
hydra-unstable = callPackage ./common.nix {
version = "2020-10-20";
version = "2021-03-29";
src = fetchFromGitHub {
owner = "NixOS";
repo = "hydra";
rev = "79d34ed7c93af2daf32cf44ee0e3e0768f13f97c";
sha256 = "1lql899430137l6ghnhyz0ivkayy83fdr087ck2wq3gf1jv8pccj";
rev = "9bb04ed97af047968196bad1728f927f7a6d905f";
sha256 = "sha256-gN/zNI2hGDMnYUjeGnU7SAuXP4KCmNqG+AYOVfINaQE=";
};
patches = [
./hydra-nix-receiveContents.patch
];
nix = nixFlakes;
tests = {
pkgs/development/tools/misc/hydra/hydra-nix-receiveContents.patch
-18
View File
@@ -1,18 +0,0 @@
Update for https://github.com/NixOS/nix/commit/faa31f40
--- a/src/hydra-queue-runner/nar-extractor.cc
+++ b/src/hydra-queue-runner/nar-extractor.cc
@@ -48,9 +48,9 @@
- void receiveContents(unsigned char * data, size_t len) override
+ void receiveContents(std::string_view data) override
{
assert(expectedSize);
assert(curMember);
assert(hashSink);
- *curMember->fileSize += len;
- (*hashSink)(data, len);
+ *curMember->fileSize += data.size();
+ (*hashSink)(data);
if (curMember->contents) {
- curMember->contents->append((char *) data, len);
+ curMember->contents->append(data);
pkgs/development/tools/misc/icon-naming-utils/default.nix
+2 -9
View File
@@ -1,4 +1,4 @@
{lib, stdenv, fetchurl, perlPackages, librsvg}:
{lib, stdenv, fetchurl, perl, librsvg}:
stdenv.mkDerivation rec {
name = "icon-naming-utils-0.8.90";
@@ -8,14 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "071fj2jm5kydlz02ic5sylhmw6h2p3cgrm3gwdfabinqkqcv4jh4";
};
buildInputs = [ librsvg ] ++ (with perlPackages; [ perl XMLSimple ]);
postInstall =
''
# Add XML::Simple to the runtime search path.
substituteInPlace $out/libexec/icon-name-mapping \
--replace '/bin/perl' '/bin/perl -I${perlPackages.XMLSimple}/${perlPackages.perl.libPrefix}'
'';
buildInputs = [ librsvg (perl.withPackages (p: [ p.XMLSimple ])) ];
meta = with lib; {
homepage = "http://tango.freedesktop.org/Standard_Icon_Naming_Specification";
pkgs/development/tools/misc/inotify-tools/default.nix
+5 -12
View File
@@ -1,29 +1,22 @@
{ lib, stdenv, autoreconfHook, fetchFromGitHub, fetchpatch }:
{ lib, stdenv, autoreconfHook, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "inotify-tools";
version = "3.20.2.2";
version = "3.20.11.0";
src = fetchFromGitHub {
repo = "inotify-tools";
owner = "rvoicilas";
rev = version;
sha256 = "1r12bglkb0bkqff6kgxjm81hk6z20nrxq3m7iv15d4nrqf9pm7s0";
sha256 = "1m8avqccrhm38krlhp88a7v949f3hrzx060bbrr5dp5qw2nmw9j2";
};
patches = [
(fetchpatch {
url = "https://github.com/inotify-tools/inotify-tools/commit/7ddf45158af0c1e93b02181a45c5b65a0e5bed25.patch";
sha256 = "08imqancx8l0bg9q7xaiql1xlalmbfnpjfjshp495sjais0r6gy7";
})
];
nativeBuildInputs = [ autoreconfHook ];
meta = with lib; {
homepage = "https://github.com/rvoicilas/inotify-tools/wiki";
license = licenses.gpl2;
maintainers = with maintainers; [ marcweber pSub ];
license = licenses.gpl2Plus;
maintainers = with maintainers; [ marcweber pSub shamilton ];
platforms = platforms.linux;
};
}
pkgs/development/tools/misc/intltool/default.nix
+1 -1
View File
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
# fix "unescaped left brace" errors when using intltool in some cases
patches = [(fetchpatch {
name = "perl5.26-regex-fixes.patch";
url = [
urls = [
"https://sources.debian.org/data/main/i/intltool/0.51.0-5/debian/patches/perl5.26-regex-fixes.patch"
"https://src.fedoraproject.org/rpms/intltool/raw/d8d2ef29fb122a42a6b6678eb1ec97ae56902af2/f/intltool-perl5.26-regex-fixes.patch"
];
pkgs/development/tools/misc/jscoverage/default.nix
+4 -2
View File
@@ -1,4 +1,4 @@
{ autoconf, fetchurl, makedepend, perl, python, lib, stdenv, unzip, zip }:
{ autoconf, fetchurl, makedepend, perl, python3, lib, stdenv, unzip, zip }:
stdenv.mkDerivation rec {
name = "jscoverage-0.5.1";
@@ -12,7 +12,9 @@ stdenv.mkDerivation rec {
./jsfalse_to_null.patch
];
buildInputs = [ autoconf makedepend perl python unzip zip ];
nativeBuildInputs = [ unzip perl python3 zip ];
strictDeps = true;
# It works without MOZ_FIX_LINK_PATHS, circumventing an impurity
# issue. Maybe we could kick js/ (spidermonkey) completely and
pkgs/development/tools/misc/k2tf/default.nix
+24
View File
@@ -0,0 +1,24 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "k2tf";
version = "0.5.0";
src = fetchFromGitHub {
owner = "sl1pm4t";
repo = pname;
rev = "v${version}";
sha256 = "0i1bhn0sccvnqbd4kv2xgng5r68adhcc61im2mn8hxmds5nf6in2";
};
vendorSha256 = "1c2mwhrj0xapc661z1nb6am4qq3rd1pvbvjaxikjyx95n0gs8gjk";
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=v${version}" ];
meta = with lib; {
description = "Kubernetes YAML to Terraform HCL converter";
homepage = "https://github.com/sl1pm4t/k2tf";
license = licenses.mpl20;
maintainers = [ maintainers.flokli ];
};
}
pkgs/development/tools/misc/kconfig-frontends/default.nix
+5 -7
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, bison, flex, gperf, ncurses, pythonPackages }:
{ lib, stdenv, fetchurl, pkg-config, bison, flex, gperf, ncurses, python3, bash }:
stdenv.mkDerivation rec {
basename = "kconfig-frontends";
@@ -10,17 +10,15 @@ stdenv.mkDerivation rec {
url = "http://ymorin.is-a-geek.org/download/${basename}/${name}.tar.xz";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ bison flex gperf ncurses pythonPackages.python pythonPackages.wrapPython ];
nativeBuildInputs = [ bison flex gperf pkg-config ];
buildInputs = [ bash ncurses python3 ];
strictDeps = true;
configureFlags = [
"--enable-frontends=conf,mconf,nconf"
];
postInstall = ''
wrapPythonPrograms
'';
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=format-security";
meta = with lib; {
pkgs/development/tools/misc/kibana/6.x.nix
+1 -1
View File
@@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
./disable-nodejs-version-check.patch
];
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/libexec/kibana $out/bin
pkgs/development/tools/misc/kibana/7.x.nix
+1 -1
View File
@@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
./disable-nodejs-version-check-7.patch
];
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/libexec/kibana $out/bin
pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch
+1 -1
View File
@@ -7,7 +7,7 @@ index c5af5a2..1949fdc 100644
defaults.arch = "macosx-"..target_cpu
defaults.variables.LIBFLAG = "-bundle -undefined dynamic_lookup -all_load"
- local version = util.popen_read("sw_vers -productVersion")
+ local version = os.getenv("MACOSX_DEPLOYMENT_TARGET") or "10.12"
+ local version = os.getenv("MACOSX_DEPLOYMENT_TARGET") or "@darwinMinVersion@"
version = tonumber(version and version:match("^[^.]+%.([^.]+)")) or 3
if version >= 10 then
version = 8
pkgs/development/tools/misc/luarocks/default.nix
+5
View File
@@ -19,6 +19,11 @@ stdenv.mkDerivation rec {
};
patches = [ ./darwin-3.1.3.patch ];
postPatch = lib.optionalString stdenv.targetPlatform.isDarwin ''
substituteInPlace src/luarocks/core/cfg.lua --subst-var-by 'darwinMinVersion' '${stdenv.targetPlatform.darwinMinVersion}'
'';
preConfigure = ''
lua -e "" || {
luajit -e "" && {
pkgs/development/tools/misc/macdylibbundler/default.nix
+1 -1
View File
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "149p3dcnap4hs3nhq5rfvr3m70rrb5hbr5xkj1h0gsfp0d7gvxnj";
};
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
makeFlags = [ "PREFIX=$(out)" ];
pkgs/development/tools/misc/micronucleus/default.nix
+24 -27
View File
@@ -1,38 +1,35 @@
{
pkgs
, stdenv
{ stdenv
, libusb-compat-0_1
, fetchFromGitHub
, lib
}:
stdenv.mkDerivation rec {
pname = "micronucleus";
version = "2.04";
pname = "micronucleus";
version = "2.04";
sourceRoot = "source/commandline";
sourceRoot = "source/commandline";
src = fetchFromGitHub {
owner = "micronucleus";
repo = "micronucleus";
rev = version;
sha256 = "14msy9amlbflw5mqrbs57b7bby3nsgx43srr7215zyhfdgsla0in";
};
src = fetchFromGitHub {
owner = "micronucleus";
repo = "micronucleus";
rev = version;
sha256 = "14msy9amlbflw5mqrbs57b7bby3nsgx43srr7215zyhfdgsla0in";
};
buildInputs = [ libusb-compat-0_1 ];
makeFlags = lib.optionals stdenv.isDarwin [ "CC=cc" ];
buildInputs = [ libusb-compat-0_1 ];
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
installPhase = ''
mkdir -p $out/bin
mkdir -p $out/lib/udev
cp micronucleus $out/bin
cp 49-micronucleus.rules $out/lib/udev
'';
meta = with lib; {
description = "Upload tool for micronucleus";
homepage = "https://github.com/micronucleus/micronucleus";
license = licenses.gpl3;
maintainers = [ maintainers.cab404 ];
};
installPhase = ''
mkdir -p $out/bin
mkdir -p $out/lib/udev
cp micronucleus $out/bin
cp 49-micronucleus.rules $out/lib/udev
'';
meta = with lib; {
description = "Upload tool for micronucleus";
homepage = "https://github.com/micronucleus/micronucleus";
license = licenses.gpl3;
maintainers = [ maintainers.cab404 ];
};
}
pkgs/development/tools/misc/msitools/default.nix
+66 -6
View File
@@ -1,27 +1,87 @@
{ lib, stdenv, fetchurl, intltool, glib, pkg-config, libgsf, libuuid, gcab, bzip2, gnome3 }:
{ lib
, stdenv
, fetchurl
, fetchpatch
, meson
, ninja
, vala
, gobject-introspection
, perl
, bison
, gettext
, glib
, pkg-config
, libgsf
, gcab
, bzip2
, gnome3
}:
stdenv.mkDerivation rec {
pname = "msitools";
version = "0.98";
version = "0.101";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "19wb3n3nwkpc6bjr0q3f1znaxsfaqgjbdxxnbx8ic8bb5b49hwac";
sha256 = "DMTS4NEI+m8rQIW5qX3VvG2fyt7N2TPyCU+Guv2+hf4=";
};
nativeBuildInputs = [ intltool pkg-config ];
buildInputs = [ glib libgsf libuuid gcab bzip2 ];
patches = [
# Fix executable bit on tools (regression in Meson migration).
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/msitools/commit/25c4353cf173cddeb76c0a2dd6621bcb753cabf8.patch";
sha256 = "VknfZCCn4jxwn9l9noXdGczv2kV+IbOsw9cNBE67P1U=";
})
# Fix failure on big-endian platforms.
# https://gitlab.gnome.org/GNOME/msitools/issues/31
(fetchpatch {
url = "https://gitlab.gnome.org/skitt/msitools/commit/3668c8288085d5beefae7c1387330ce9599b8365.patch";
sha256 = "x3Mp+9TRqBAJIdzVn68HyYt0lujyMk5h5xSBUQHe9Oo=";
})
];
nativeBuildInputs = [
meson
ninja
vala
gobject-introspection
perl
bison
gettext
pkg-config
];
buildInputs = [
glib
libgsf
gcab
bzip2
];
doCheck = true;
postPatch = ''
patchShebangs subprojects/bats-core/{bin,libexec}
'';
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "none";
};
};
meta = with lib; {
description = "Set of programs to inspect and build Windows Installer (.MSI) files";
homepage = "https://wiki.gnome.org/msitools";
license = [ licenses.gpl2 licenses.lgpl21 ];
license = with licenses; [
# Library
lgpl21Plus
# Tools
gpl2Plus
];
maintainers = with maintainers; [ PlushBeaver ];
platforms = platforms.unix;
};
}
pkgs/development/tools/misc/nimlsp/default.nix
+1 -1
View File
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
export HOME=$TMPDIR
nim -d:release -p:${astpatternmatching}/src -p:${jsonschema}/src \
c --threads:on -d:nimcore -d:nimsuggest -d:debugCommunication \
-d:debugLogging -d:explicitSourcePath=${srcOnly nim.unwrapped} -d:tempDir=/tmp src/nimlsp
-d:debugLogging -d:explicitSourcePath=${srcOnly nim.passthru.nim} -d:tempDir=/tmp src/nimlsp
'';
installPhase = ''
pkgs/development/tools/misc/nrfutil/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ lib, python37Packages, fetchFromGitHub }:
{ lib, python3Packages, fetchFromGitHub }:
with python37Packages; buildPythonApplication rec {
with python3Packages; buildPythonApplication rec {
pname = "nrfutil";
version = "6.1";
pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix
+10 -2
View File
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "nxpmicro-mfgtools";
version = "1.4.43";
version = "1.4.72";
src = fetchFromGitHub {
owner = "NXPmicro";
repo = "mfgtools";
rev = "uuu_${version}";
sha256 = "1i1mvr6j0mc33axf6cmmsi83apr5rgq0z0sn23qav9r0izpnnh0w";
sha256 = "1s3wlz4yb2p8by5p66vr0z72n84mxkrmda63x9yr6pinqinsyrvv";
};
nativeBuildInputs = [ cmake pkg-config ];
@@ -25,6 +25,14 @@ stdenv.mkDerivation rec {
preConfigure = "echo ${version} > .tarball-version";
postInstall = ''
# rules printed by the following invocation are static,
# they come from hardcoded configs in libuuu/config.cpp:48
$out/bin/uuu -udev > udev-rules 2>stderr.txt
rules_file="$(cat stderr.txt|grep '1: put above udev run into'|sed 's|^.*/||')"
install -D udev-rules "$out/lib/udev/rules.d/$rules_file"
'';
meta = with lib; {
description = "Freescale/NXP I.MX chip image deploy tools";
longDescription = ''
pkgs/development/tools/misc/openfpgaloader/default.nix
+36
View File
@@ -0,0 +1,36 @@
{ stdenv
, lib
, fetchFromGitHub
, cmake
, pkg-config
, libftdi1
, libusb1
, udev
}:
stdenv.mkDerivation rec {
pname = "openfpgaloader";
version = "0.2.6";
src = fetchFromGitHub {
owner = "trabucayre";
repo = "openFPGALoader";
rev = "v${version}";
sha256 = "sha256-OWRMWNOPm6flgeTKYWYE+LcG3HW6i8s2NQ1dr/oeOEw=";
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [
libftdi1
libusb1
udev
];
meta = with lib; {
description = "Universal utility for programming FPGAs";
homepage = "https://github.com/trabucayre/openFPGALoader";
license = licenses.agpl3Only;
maintainers = with maintainers; [ danderson ];
};
}
pkgs/development/tools/misc/openocd/default.nix
+7 -11
View File
@@ -1,7 +1,6 @@
{ stdenv
, lib
, fetchgit
, autoreconfHook
, fetchurl
, pkg-config
, hidapi
, libftdi1
@@ -10,16 +9,13 @@
stdenv.mkDerivation rec {
pname = "openocd";
version = "0.11.0-rc1";
src = fetchgit {
url = "https://git.code.sf.net/p/openocd/code";
rev = "v${version}";
sha256 = "15g8qalyxhdp0imfrg8mxwnp0nimd836fc5laaavajw49gcm65m4";
fetchSubmodules = true;
version = "0.11.0";
src = fetchurl {
url = "mirror://sourceforge/project/${pname}/${pname}/${version}/${pname}-${version}.tar.bz2";
sha256 = "0z8y7mmv0mhn2l5gs3vz6l7cnwak7agklyc7ml33f7gz99rwx8s3";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ hidapi libftdi1 libusb1 ];
@@ -64,7 +60,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://openocd.sourceforge.net/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ bjornfor ];
maintainers = with maintainers; [ bjornfor prusnak ];
platforms = platforms.unix;
};
}
pkgs/development/tools/misc/pahole/default.nix
+4 -3
View File
@@ -2,11 +2,12 @@
stdenv.mkDerivation rec {
pname = "pahole";
version = "1.17";
version = "1.20";
src = fetchgit {
url = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git";
rev = "v${version}";
sha256 = "13dxsmhpf9n2wqggf4gd6f12rm0vhv0q96jd50gkvaxzzvgpzzbc";
sha256 = "11q9dpfi4qj2v8z0nlf8c0079mlv10ljhh0d1yr0j4ds3saacd15";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake ];
@@ -18,7 +19,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://git.kernel.org/cgit/devel/pahole/pahole.git/";
description = "Pahole and other DWARF utils";
license = licenses.gpl2;
license = licenses.gpl2Only;
platforms = platforms.linux;
maintainers = [ maintainers.bosu ];
pkgs/development/tools/misc/pkgconf/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "pkgconf";
version = "1.7.3";
version = "1.7.4";
nativeBuildInputs = [ removeReferencesTo ];
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://distfiles.dereferenced.org/${pname}/${pname}-${version}.tar.xz";
sha256 = "1h7rf5cch0cbxp8nmjkkf272zrz2jgpqpr8a58ww75pn3jjswimq";
sha256 = "sha256-1z8ywkikWRE5prF3d8gNTeq2tBTsKz0h0KJL40jEdqs=";
};
# Debian has outputs like these too:
pkgs/development/tools/misc/premake/3.nix
+1 -1
View File
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
sha256 = "b59841a519e75d5b6566848a2c5be2f91455bf0cc6ae4d688fcbd4c40db934d5";
};
buildInputs = [unzip];
nativeBuildInputs = [ unzip ];
installPhase = ''
install -Dm755 bin/premake $out/bin/premake
pkgs/development/tools/misc/pwndbg/default.nix
+1 -1
View File
@@ -46,7 +46,7 @@ in stdenv.mkDerivation rec {
description = "Exploit Development and Reverse Engineering with GDB Made Easy";
homepage = "https://github.com/pwndbg/pwndbg";
license = licenses.mit;
platforms = platforms.linux;
platforms = platforms.all;
maintainers = with maintainers; [ mic92 ];
};
}
pkgs/development/tools/misc/rman/default.nix
+3 -2
View File
@@ -10,7 +10,8 @@ stdenv.mkDerivation {
postPatch = ''
substituteInPlace Makefile \
--replace ginstall install
--replace ginstall install \
--replace gcc '${stdenv.cc.targetPrefix}cc'
'';
makeFlags = [ "BINDIR=$(out)/bin" "MANDIR=$(out)/share/man" ];
@@ -27,6 +28,6 @@ stdenv.mkDerivation {
meta = {
description = "Parse formatted man pages and man page source from most flavors of UNIX and converts them to HTML, ASCII, TkMan, DocBook, and other formats";
license = "artistic";
platforms = lib.platforms.linux;
platforms = lib.platforms.all;
};
}
pkgs/development/tools/misc/rolespec/default.nix
+1 -1
View File
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
inherit name;
};
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
# The default build phase (`make`) runs the test code. It's difficult to do
# the test in the build environment because it depends on the system package
pkgs/development/tools/misc/saleae-logic/default.nix
+1 -1
View File
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
categories = "Development";
};
buildInputs = [ unzip ];
nativeBuildInputs = [ unzip ];
installPhase = ''
# Copy prebuilt app to $out
pkgs/development/tools/misc/scc/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "scc";
version = "2.13.0";
version = "3.0.0";
src = fetchFromGitHub {
owner = "boyter";
repo = "scc";
rev = "v${version}";
sha256 = "16p5g20n5jsbisbgikk9xny94xx6c0dxf19saa686ghh31jr2hh3";
sha256 = "sha256-G5LYOtAUnu82cgDdtYzcfVx/WFg9/HvFQAlQtd6GaDE=";
};
vendorSha256 = null;
pkgs/development/tools/misc/sccache/default.nix
+12 -24
View File
@@ -1,43 +1,31 @@
{ stdenv
, lib
, fetchFromGitHub
, cargo
, rustc
, rustPlatform
, pkg-config
, glib
, openssl
, darwin
}:
{ stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, Security }:
rustPlatform.buildRustPackage rec {
version = "0.2.14";
version = "0.2.15";
pname = "sccache";
src = fetchFromGitHub {
owner = "mozilla";
repo = "sccache";
rev = version;
sha256 = "1ahg3cpb9pbgpdjglnfxm5c8r8qrgwaxwz5s394478ix7f9dxind";
rev = "v${version}";
sha256 = "1kygk7ilv7la36kv4jdn1ird7f3896wgr88kyqf0iagfqkzb2vsb";
};
cargoSha256 = "0jphs0frr399iywi9ch8g271igayzv1vi3wa4v3yx19xdxawlgda";
cargoBuildFlags = [ "--features=all" ];
nativeBuildInputs = [
pkg-config cargo rustc
];
buildInputs = [
openssl
] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
cargoSha256 = "1cfdwf00jgwsv0f72427asid1xr57s56jk5xj489dgppvgy7wdbj";
cargoBuildFlags = lib.optionals (!stdenv.isDarwin) [ "--features=dist-client,dist-server" ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
# Tests fail because of client server setup which is not possible inside the pure environment,
# see https://github.com/mozilla/sccache/issues/460
checkPhase = null;
doCheck = false;
meta = with lib; {
description = "Ccache with Cloud Storage";
homepage = "https://github.com/mozilla/sccache";
maintainers = with maintainers; [ doronbehar ];
license = licenses.asl20;
platforms = platforms.unix;
};
}
pkgs/development/tools/misc/segger-ozone/default.nix
+84
View File
@@ -0,0 +1,84 @@
{ stdenv
, fetchurl
, fontconfig
, freetype
, lib
, libICE
, libSM
, udev
, libX11
, libXcursor
, libXext
, libXfixes
, libXrandr
, libXrender
}:
stdenv.mkDerivation rec {
pname = "segger-ozone";
version = "3.22a";
src = fetchurl {
url = "https://www.segger.com/downloads/jlink/Ozone_Linux_V${(lib.replaceChars ["."] [""] version)}_x86_64.tgz";
sha256 = "0v1r8qvp1w2f3yip9fys004pa0smlmq69p7w77lfvghs1rmg1649";
};
rpath = lib.makeLibraryPath [
fontconfig
freetype
libICE
libSM
udev
libX11
libXcursor
libXext
libXfixes
libXrandr
libXrender
]
+ ":${stdenv.cc.cc.lib}/lib64";
installPhase = ''
mkdir -p $out/bin
mv Lib lib
mv * $out
ln -s $out/Ozone $out/bin
'';
postFixup = ''
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/Ozone" \
--set-rpath ${rpath}:$out/lib "$out/Ozone"
for file in $(find $out/lib -maxdepth 1 -type f -and -name \*.so\*); do
patchelf --set-rpath ${rpath}:$out/lib $file
done
'';
meta = with lib; {
description = "J-Link Debugger and Performance Analyzer";
longDescription = ''
Ozone is a cross-platform debugger and performance analyzer for J-Link
and J-Trace.
- Stand-alone graphical debugger
- Debug output of any tool chain and IDE 1
- C/C++ source level debugging and assembly instruction debugging
- Debug information windows for any purpose: disassembly, memory,
globals and locals, (live) watches, CPU and peripheral registers
- Source editor to fix bugs immediately
- High-speed programming of the application into the target
- Direct use of J-Link built-in features (Unlimited Flash
Breakpoints, Flash Download, Real Time Terminal, Instruction Trace)
- Scriptable project files to set up everything automatically
- New project wizard to ease the basic configuration of new projects
1 Ozone has been tested with the output of the following compilers:
GCC, Clang, ARM, IAR. Output of other compilers may be supported but is
not guaranteed to be.
'';
homepage = "https://www.segger.com/products/development-tools/ozone-j-link-debugger";
license = licenses.unfree;
maintainers = [ maintainers.bmilanov ];
platforms = [ "x86_64-linux" ];
};
}
pkgs/development/tools/misc/semver-tool/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "semver-tool";
version = "2.1.0";
version = "3.2.0";
src = fetchFromGitHub {
owner = "fsaintjacques";
repo = pname;
rev = version;
sha256 = "0lpwsa86qb5w6vbnsn892nb3qpxxx9ifxch8pw3ahzx2dqhdgnrr";
sha256 = "sha256-coy/g4nEvSN+0/aqK2r3EEIaoUcnsZhzX66H1qsK9ac=";
};
dontBuild = true; # otherwise we try to 'make' which fails.
pkgs/development/tools/misc/sloccount/default.nix
+1 -1
View File
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
done
'';
makeFlags = [ "PREFIX=$(out)" "CC=cc" ];
makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ];
doCheck = true;
checkPhase = ''HOME="$TMPDIR" PATH="$PWD:$PATH" make test'';
pkgs/development/tools/misc/stlink/default.nix
+8 -11
View File
@@ -9,25 +9,22 @@ let
in stdenv.mkDerivation rec {
pname = "stlink";
version = "1.6.0";
version = "1.7.0";
src = fetchFromGitHub {
owner = "texane";
owner = "stlink-org";
repo = "stlink";
rev = "v${version}";
sha256 = "1mlkrxjxg538335g59hjb0zc739dx4mhbspb26z5gz3lf7d4xv6x";
sha256 = "03xypffpbp4imrczbxmq69vgkr7mbp0ps9dk815br5wwlz6vgygl";
};
buildInputs = [ libusb1' ];
nativeBuildInputs = [ cmake ];
patchPhase = ''
sed -i 's@/etc/udev/rules.d@$ENV{out}/etc/udev/rules.d@' CMakeLists.txt
sed -i 's@/etc/modprobe.d@$ENV{out}/etc/modprobe.d@' CMakeLists.txt
'';
preInstall = ''
mkdir -p $out/etc/udev/rules.d
mkdir -p $out/etc/modprobe.d
'';
cmakeFlags = [
"-DSTLINK_MODPROBED_DIR=${placeholder "out"}/etc/modprobe.d"
"-DSTLINK_UDEV_RULES_DIR=${placeholder "out"}/lib/udev/rules.d"
];
meta = with lib; {
description = "In-circuit debug and programming for ST-Link devices";
pkgs/development/tools/misc/stm32flash/default.nix
+1 -1
View File
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "01p396daqw3zh6nijffbfbwyqza33bi2k4q3m5yjzs02xwi99alp";
};
buildFlags = [ "CC=cc" ];
buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
installPhase = ''
# Manually copy, make install copies to /usr/local/bin
pkgs/development/tools/misc/strace/default.nix
+6 -2
View File
@@ -1,12 +1,16 @@
{ lib, stdenv, fetchurl, perl, libunwind, buildPackages }:
# libunwind does not have the supportsHost attribute on darwin, thus
# when this package is evaluated it causes an evaluation error
assert stdenv.isLinux;
stdenv.mkDerivation rec {
pname = "strace";
version = "5.10";
version = "5.12";
src = fetchurl {
url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-/jmC6kzZrrO0ujX2J58LV3o3F10ygr4kuaVTe1a48Bw=";
sha256 = "sha256-KRce350lL4nJiKTDQN/exmL0WMuMY9hUMdZLq1kR58Q=";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];
pkgs/development/tools/misc/svls/default.nix
+3 -3
View File
@@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "svls";
version = "0.1.18";
version = "0.1.27";
src = fetchFromGitHub {
owner = "dalance";
repo = "svls";
rev = "v${version}";
sha256 = "08n2sp0yj7ql5aagxw94dn8bx2jkigs9zlylf5zkg673bh54829x";
sha256 = "sha256-+/4D0pRZs1Gy6DJnsDZA8wWi1FKhr7gRS0oq1TyWpuE=";
};
cargoSha256 = "0k8x6kgxc2w7ldi456s4kg4v80b064drfa26zg5chcmcrr5zgmyv";
cargoSha256 = "sha256-o6/L/4QcIei4X1pHYjV72hcEmTMp+pvJkwbb+niqWP8=";
meta = with lib; {
description = "SystemVerilog language server";
pkgs/development/tools/misc/terracognita/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "terracognita";
version = "0.6.0";
version = "0.6.3";
src = fetchFromGitHub {
owner = "cycloidio";
repo = pname;
rev = "v${version}";
sha256 = "1f0wi5mlb9r7ncvyvgmcdfngxrzgbdv7hm2ckb8bwmzcki2h2255";
sha256 = "sha256-rRSBPnvv4941IUGN/6+8/hzgYDqgPErNkd7tFrslPiQ=";
};
vendorSha256 = "015r7zvah7lk5rbkaqhh2abbv19ky1in3ngzzrdvhbcqfns25iqr";
vendorSha256 = "sha256-sN9GTcG5cZxvMaLqNjY2jfLkf8a3lugM2aV3bBdT5Ww=";
doCheck = false;
pkgs/development/tools/misc/terraform-ls/default.nix
+3 -3
View File
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "terraform-ls";
version = "0.12.0";
version = "0.15.0";
src = fetchFromGitHub {
owner = "hashicorp";
repo = pname;
rev = "v${version}";
sha256 = "w9PLKLFjKehtub1LbVX9TbvKkj/S1t0MwZIZurF2x18=";
sha256 = "sha256-/g62LSlaIK67oY6dI8S3Lni85eBBI6piqP2Fsq3HXWQ=";
};
vendorSha256 = "J8ovcUeQsb58Bq/EM9mvYqtuDY1bXTEVCC9/AH+UttU=";
vendorSha256 = "sha256-U0jVdyY4SifPWkOkq3ohY/LvfGcYm4rI+tW1QEm39oo=";
# tests fail in sandbox mode because of trying to download stuff from releases.hashicorp.com
doCheck = false;
pkgs/development/tools/misc/terraformer/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "terraformer";
version = "0.8.10";
version = "0.8.11";
src = fetchFromGitHub {
owner = "GoogleCloudPlatform";
repo = pname;
rev = version;
sha256 = "005i66d2gkyixqh9sk452la7z86d5x9q3njngjf4z9slcbpgk7bl";
sha256 = "sha256-y6cgBYiqy+M8dfcNS6iDohqyip6xAs222MJHJFhloiI=";
};
vendorSha256 = "02i1q11nivdlkhf9chpi03p8jpa0fx9wbf79j834qv4fqy7jqf6l";
vendorSha256 = "sha256-PQj3+qcmN/raDrAbufAcVT+vSumGuOY47i7ZYfvx3yk=";
subPackages = [ "." ];
pkgs/development/tools/misc/texinfo/4.13a.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, texinfo, ncurses, lzma }:
{ stdenv, fetchurl, texinfo, ncurses, xz }:
stdenv.mkDerivation rec {
pname = "texinfo";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ ncurses ];
nativeBuildInputs = [ lzma ];
nativeBuildInputs = [ xz ];
# Disabled because we don't have zdiff in the stdenv bootstrap.
#doCheck = true;
pkgs/development/tools/misc/tie/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
buildPhase = ''
cc tie.c -o tie
${stdenv.cc.targetPrefix}cc tie.c -o tie
'';
installPhase = ''
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://www.ctan.org/tex-archive/web/tie";
description = "Allow multiple web change files";
platforms = with platforms; unix;
platforms = platforms.all;
maintainers = with maintainers; [ vrthra ];
license = licenses.abstyles;
};
pkgs/development/tools/misc/tockloader/default.nix
+15 -5
View File
@@ -1,27 +1,37 @@
{ lib, python3Packages }:
{ lib
, python3Packages
}:
python3Packages.buildPythonApplication rec {
pname = "tockloader";
version = "1.5.0";
version = "1.6.0";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "11k4ppwq845lnj265ydfr0cn1rrym5amx2i19x1h3ccbxc3gsy3x";
sha256 = "1aqkj1nplcw3gmklrhq6vxy6v9ad5mqiw4y1svasak2zkqdk1wyc";
};
propagatedBuildInputs = with python3Packages; [
argcomplete
colorama
crcmod
pytoml
pyserial
pytoml
tqdm
];
# has no test suite
checkPhase = ''
runHook preCheck
$out/bin/tockloader --version | grep -q ${version}
runHook postCheck
'';
meta = with lib; {
homepage = "https://github.com/tock/tockloader";
license = licenses.mit;
description = "Tool for programming Tock onto hardware boards";
maintainers = with maintainers; [ hexa ];
maintainers = with maintainers; [ ];
};
}
pkgs/development/tools/misc/tokei/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, darwin }:
{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }:
rustPlatform.buildRustPackage rec {
pname = "tokei";
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-iUDc54E8AiLMJw9h99kg/3VmaSi8GqfQyrPwa9nJ994=";
buildInputs = lib.optionals stdenv.isDarwin [
libiconv darwin.apple_sdk.frameworks.Security
libiconv Security
];
# enable all output formats
pkgs/development/tools/misc/uncrustify/default.nix
+2 -2
View File
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${product}-${version}";
product = "uncrustify";
version = "0.71.0";
version = "0.72.0";
src = fetchFromGitHub {
owner = product;
repo = product;
rev = name;
sha256 = "1wyhkhn000yad94fnjj61h7lyvan6hig8wh7jxlnyp5wxdwki0pj";
sha256 = "sha256-ZVC5tsn2m1uB7EPNJFPLWLZpLSk4WrFOgJvy1KFYqBY=";
};
nativeBuildInputs = [ cmake python ];
pkgs/development/tools/misc/unifdef/default.nix
+11 -18
View File
@@ -1,31 +1,24 @@
{ fetchurl, lib, stdenv }:
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "unifdef-2.6";
pname = "unifdef";
version = "2.12";
src = fetchurl {
url = "https://github.com/fanf2/unifdef/archive/${name}.tar.gz";
sha256 = "1p5wr5ms9w8kijy9h7qs1mz36dlavdj6ngz2bks588w7a20kcqxj";
url = "https://dotat.at/prog/unifdef/unifdef-${version}.tar.xz";
sha256 = "00647bp3m9n01ck6ilw6r24fk4mivmimamvm4hxp5p6wxh10zkj3";
};
postUnpack = ''
substituteInPlace $sourceRoot/unifdef.c \
--replace '#include "version.h"' ""
substituteInPlace $sourceRoot/Makefile \
--replace "unifdef.c: version.h" "unifdef.c:"
'';
preBuild = ''
unset HOME
export DESTDIR=$out
'';
makeFlags = [
"prefix=$(out)"
"DESTDIR="
];
meta = with lib; {
homepage = "http://dotat.at/prog/unifdef/";
homepage = "https://dotat.at/prog/unifdef/";
description = "Selectively remove C preprocessor conditionals";
license = licenses.bsd2;
platforms = platforms.unix;
maintainers = [ maintainers.vrthra ];
maintainers = with maintainers; [ orivej vrthra ];
};
}
pkgs/development/tools/misc/universal-ctags/default.nix
+9 -6
View File
@@ -1,17 +1,17 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, perl, pythonPackages, libiconv, jansson }:
{ lib, stdenv, fetchFromGitHub, autoreconfHook, coreutils, pkg-config, perl, python3Packages, libiconv, jansson }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "universal-ctags";
version = "unstable-2019-07-30";
version = "5.9.20210411.0";
src = fetchFromGitHub {
owner = "universal-ctags";
repo = "ctags";
rev = "920e7910146915e5cae367bc9f135ffd8b042042";
sha256 = "14n3ix77rkhq6vq6kspmgjrmm0kg0f8cxikyqdq281sbnfq8bajn";
rev = "p${version}";
sha256 = "0c031y0dl2b70pd0mqfbylplf8f27x11b0ch7ljka3rqav0zb1zr";
};
nativeBuildInputs = [ autoreconfHook pkg-config pythonPackages.docutils ];
nativeBuildInputs = [ autoreconfHook coreutils pkg-config python3Packages.docutils ];
buildInputs = [ jansson ] ++ lib.optional stdenv.isDarwin libiconv;
# to generate makefile.in
@@ -25,6 +25,9 @@ stdenv.mkDerivation {
# Remove source of non-determinism
substituteInPlace main/options.c \
--replace "printf (\" Compiled: %s, %s\n\", __DATE__, __TIME__);" ""
substituteInPlace Tmain/utils.sh \
--replace /bin/echo ${coreutils}/bin/echo
'';
postConfigure = ''
pkgs/development/tools/misc/usbsdmux/default.nix
+5 -2
View File
@@ -2,13 +2,16 @@
python3Packages.buildPythonApplication rec {
pname = "usbsdmux";
version = "0.1.8";
version = "0.2.0";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "0m3d0rs9s5v5hnsjkfybmd8v54gn7rc1dbg5vc48rryhc969pr9f";
sha256 = "sha256-ydDUSqBTY62iOtWdgrFh2qrO9LMi+OCYIw5reh6uoIA=";
};
# usbsdmux is not meant to be used as an importable module and has no tests
doCheck = false;
meta = with lib; {
description = "Control software for the LXA USB-SD-Mux";
homepage = "https://github.com/linux-automation/usbsdmux";
pkgs/development/tools/misc/yodl/default.nix
+2 -2
View File
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "yodl";
version = "4.02.02";
version = "4.03.02";
nativeBuildInputs = [ icmake ];
buildInputs = [ perl ];
src = fetchFromGitLab {
sha256 = "1kf4h99p9i35fgas8z5wdy2qpd7gqfd645b5z7mfssjzsfdrv745";
sha256 = "sha256-ZxiF9He0JgqhbnQS2pE7Y85sED8avbdwGuVmFN8/XgE=";
rev = version;
repo = "yodl";
owner = "fbb-git";