Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-06-17 00:09:51 +00:00 committed by GitHub
commit 538d5cc5d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
63 changed files with 484 additions and 313 deletions

View file

@ -3745,6 +3745,16 @@
githubId = 1176131;
name = "George Whewell";
};
georgyo = {
email = "george@shamm.as";
github = "georgyo";
githubId = 19374;
name = "George Shammas";
keys = [{
longkeyid = "rsa4096/0x82BB70D541AE2DB4";
fingerprint = "D0CF 440A A703 E0F9 73CB A078 82BB 70D5 41AE 2DB4";
}];
};
gerschtli = {
email = "tobias.happ@gmx.de";
github = "Gerschtli";

View file

@ -17,11 +17,13 @@
mkDerivation rec {
pname = "hqplayer-desktop";
version = "4.12.0-34";
version = "4.12.1-35";
src = fetchurl {
# FIXME: use the fc34 sources when we get glibc 2.33 in nixpkgs
# c.f. https://github.com/NixOS/nixpkgs/pull/111616
url = "https://www.signalyst.eu/bins/hqplayer/fc33/hqplayer4desktop-${version}.fc33.x86_64.rpm";
sha256 = "sha256-9kLKmi5lNtnRm9b4HnO01cO/C+Sg0DcKD64N5WBbYOE=";
sha256 = "sha256-DLnZNX+uAan9dhPLMvINeXsIn3Yv2CgsvyTcX0hbEK8=";
};
unpackPhase = ''
@ -47,6 +49,8 @@ mkDerivation rec {
dontBuild = true;
installPhase = ''
runHook preInstall
# main executable
mkdir -p $out/bin
cp ./usr/bin/* $out/bin
@ -62,16 +66,16 @@ mkDerivation rec {
# pixmaps
mkdir -p $out/share/pixmaps
cp ./usr/share/pixmaps/* $out/share/pixmaps
runHook postInstall
'';
postInstall = ''
for desktopFile in $out/share/applications/*; do
substituteInPlace "$desktopFile" \
--replace '/usr/bin/' '$out/bin/' \
--replace '/usr/share/doc/' '$out/share/doc/'
--replace /usr/bin/ $out/bin/ \
--replace /usr/share/doc/ $out/share/doc/
done
gunzip $out/share/doc/${pname}/*.gz
'';
postFixup = ''
@ -81,7 +85,6 @@ mkDerivation rec {
meta = with lib; {
homepage = "https://www.signalyst.com/custom.html";
description = "High-end upsampling multichannel software HD-audio player";
changelog = "https://www.signalyst.eu/bins/${pname}/fc33/hqplayer4desktop-${version}fc33.x86_64.changes";
license = licenses.unfree;
maintainers = with maintainers; [ lovesegfault ];
};

View file

@ -3,13 +3,13 @@
, vmopts ? null
}:
{ name, product, version, src, wmClass, jdk, meta, extraLdPath ? [] }:
{ name, product, version, src, wmClass, jdk, meta, extraLdPath ? [] }@args:
with lib;
let loName = toLower product;
hiName = toUpper product;
execName = concatStringsSep "-" (init (splitString "-" name));
mainProgram = concatStringsSep "-" (init (splitString "-" name));
vmoptsName = loName
+ ( if (with stdenv.hostPlatform; (is32bit || isDarwin))
then ""
@ -18,15 +18,17 @@ let loName = toLower product;
in
with stdenv; lib.makeOverridable mkDerivation rec {
inherit name src meta;
inherit name src;
meta = args.meta // { inherit mainProgram; };
desktopItem = makeDesktopItem {
name = execName;
exec = execName;
name = mainProgram;
exec = mainProgram;
comment = lib.replaceChars ["\n"] [" "] meta.longDescription;
desktopName = product;
genericName = meta.description;
categories = "Development;";
icon = execName;
icon = mainProgram;
extraEntries = ''
StartupWMClass=${wmClass}
'';
@ -64,13 +66,13 @@ with stdenv; lib.makeOverridable mkDerivation rec {
installPhase = ''
mkdir -p $out/{bin,$name,share/pixmaps,libexec/${name}}
cp -a . $out/$name
ln -s $out/$name/bin/${loName}.png $out/share/pixmaps/${execName}.png
ln -s $out/$name/bin/${loName}.png $out/share/pixmaps/${mainProgram}.png
mv bin/fsnotifier* $out/libexec/${name}/.
jdk=${jdk.home}
item=${desktopItem}
makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \
makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${mainProgram}" \
--prefix PATH : "$out/libexec/${name}:${lib.optionalString (stdenv.isDarwin) "${jdk}/jdk/Contents/Home/bin:"}${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath ([
# Some internals want libstdc++.so.6

View file

@ -20,7 +20,7 @@
}:
let
version = "4.1.2";
version = "4.1.3";
libsecp256k1_name =
if stdenv.isLinux then "libsecp256k1.so.0"
@ -36,7 +36,7 @@ let
owner = "spesmilo";
repo = "electrum";
rev = version;
sha256 = "0zvv8nmjzw5pchykz5p28483nby4lp4ah7iqr08pv36gy89l51v5";
sha256 = "1nkcybalkfna9zn33dxm13ic3brj50cfzwspjl349rgyar07j781";
extraPostFetch = ''
mv $out ./all
@ -51,7 +51,7 @@ python3.pkgs.buildPythonApplication {
src = fetchurl {
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
sha256 = "05m6vbd4sfjk536kwa5wa3kv21jxxqnglx0ddvnmxfhf98371bhk";
sha256 = "1mlwpmgfm3n45agx65jzsi4dr8nxf95x7nl01jnwa3qk5krrv4cf";
};
postUnpack = ''

View file

@ -2,11 +2,11 @@
buildPythonApplication rec {
pname = "gallery_dl";
version = "1.17.4";
version = "1.17.5";
src = fetchPypi {
inherit pname version;
sha256 = "4df80fd923b03b2413a3d1c50e32c3006d100ed5acc1400ace69d8dc2162d293";
sha256 = "9d64bca2bf0cdecaff1336e0656917eb9028586fee4ac342761d6cb9a0cdb4f9";
};
propagatedBuildInputs = [ requests ];

View file

@ -0,0 +1,56 @@
{ lib
, fetchFromGitHub
, buildGoModule
, unixODBC
, icu
}:
buildGoModule rec {
pname = "usql";
version = "0.9.1";
src = fetchFromGitHub {
owner = "xo";
repo = "usql";
rev = "v${version}";
sha256 = "sha256-fcKn4kHIRvMdgGFKDNQg49YxLc0Y5j/8VwKoDLiXbEU=";
};
vendorSha256 = "sha256-uAV8NLnqXjIDILfnbbkVr2BOIucQ8vX89KI5yIkVtus=";
buildInputs = [ unixODBC icu ];
# These tags and flags are copied from build-release.sh
buildFlags = [ "-tags" ];
buildFlagsArray = [
"most"
"sqlite_app_armor"
"sqlite_fts5"
"sqlite_introspect"
"sqlite_json1"
"sqlite_stat4"
"sqlite_userauth"
"sqlite_vtable"
"sqlite_icu"
"no_adodb"
];
ldflags = [
"-s"
"-w"
"-X github.com/xo/usql/text.CommandVersion=${version}"
];
# All the checks currently require docker instances to run the databases.
doCheck = false;
meta = with lib; {
description = "Universal command-line interface for SQL databases";
homepage = "https://github.com/xo/usql";
license = licenses.mit;
maintainers = with maintainers; [ georgyo ];
# usql does not build on ARM.
platforms = [ "x86_64-linux" "x86_64-darwin" ];
};
}

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "fn";
version = "0.6.6";
version = "0.6.7";
src = fetchFromGitHub {
owner = "fnproject";
repo = "cli";
rev = version;
sha256 = "12s3xgrr11n8kfwsh8xpwcza1pr6b200dmc9h8igjy3s3cgg6sh7";
sha256 = "sha256-50tPR+x3U4XJB6lthEiZjOy2pD8LprSE41ZpH2Px8JY=";
};
vendorSha256 = null;

View file

@ -7,11 +7,11 @@ let
inherit (python3Packages) python pygobject3;
in stdenv.mkDerivation rec {
pname = "gnumeric";
version = "1.12.49";
version = "1.12.50";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "kcBy7JXDLgCxVv/oAVyTsyuO3zaPkEFDYZPPoy6E7Vc=";
sha256 = "dYgZuhvWmDgp+efG1xp/ogzXWjZSonHluwA9XYvMFLg=";
};
configureFlags = [ "--disable-component" ];

View file

@ -1,86 +1,75 @@
{ mkDerivation, lib, fetchpatch, fetchFromGitHub, qmake, pkg-config
, qtbase, qtsvg, qttools, qtserialport, boost, libgit2
{ mkDerivation
, lib
, fetchFromGitHub
, qmake
, pkg-config
, qtbase
, qtsvg
, qttools
, qtserialport
, boost
, libgit2
}:
let
# build number corresponding to a release, has no further relation
# see https://github.com/fritzing/fritzing-app/releases/tag/CD-498
fritzingBuild = "498";
# fritzingBuild = "498";
# version 0.9.6 is properly tagged, hope it continues
# SHA256 of the fritzing-parts HEAD on the master branch,
# which contains the latest stable parts definitions
partsSha = "e79a69765026f3fda8aab1b3e7a4952c28047a62";
partsSha = "6f04697be286768bc9e4d64f8707e8e40cbcafcb";
in
mkDerivation rec {
pname = "fritzing";
version = "0.9.4-${fritzingBuild}";
version = "0.9.6";
src = fetchFromGitHub {
owner = "fritzing";
owner = pname;
repo = "fritzing-app";
rev = "CD-${fritzingBuild}";
sha256 = "0aljj2wbmm1vd64nhj6lh9qy856pd5avlgydsznya2vylyz20p34";
rev = version;
sha256 = "083nz7vj7a334575smjry6257535h68gglh8a381xxa36dw96aqs";
};
parts = fetchFromGitHub {
owner = "fritzing";
owner = pname;
repo = "fritzing-parts";
name = "fritzing-parts";
rev = partsSha;
sha256 = "0spka33a5qq34aq79j01arw1aly4vh0hzv7mahryhdlcdk22qqvc";
sha256 = "1f4w0hz44n4iw1rc5vhcgzvlji54rf4yr8bvzkqv99hn2xf5pjgs";
};
buildInputs = [ qtbase qtsvg qtserialport boost libgit2 ];
nativeBuildInputs = [ qmake pkg-config qttools ];
patches = [(fetchpatch {
name = "fix-libgit2-version.patch";
url = "https://github.com/fritzing/fritzing-app/commit/472951243d70eeb40a53b1f7e16e6eab0588d079.patch";
sha256 = "0v1zi609cjnqac80xgnk23n54z08g1lia37hbzfl8jcq9sn9adak";
})];
postPatch = ''
substituteInPlace phoenix.pro \
--replace 'LIBGIT_STATIC = true' 'LIBGIT_STATIC = false'
substituteInPlace tools/linux_release_script/release.sh \
--replace 'git status' 'echo >/dev/null' \
--replace 'git clean' 'echo >/dev/null' \
--replace 'git clone' 'echo >/dev/null' \
--replace 'release_folder="' 'release_folder="$out" #' \
--replace './Fritzing -db' '# run after fixup'
substituteInPlace src/fapplication.cpp \
--replace 'PartsChecker::getSha(dir.absolutePath());' '"${partsSha}";'
'';
buildPhase = ''
bash tools/linux_release_script/release.sh ${version}
'';
installPhase = ''
rm "$out/Fritzing" # remove script file
mkdir "$out/bin"
mv "$out/lib/Fritzing" "$out/bin/Fritzing"
mkdir --parents "$out/share/applications" "$out/share/metainfo"
mv --target-directory="$out/share/applications" "$out/org.fritzing.Fritzing.desktop"
mv --target-directory="$out/share/metainfo" "$out/org.fritzing.Fritzing.appdata.xml"
cp --recursive --no-target-directory "$parts" "$out/fritzing-parts"
mkdir parts
cp -a ${parts}/* parts/
'';
postFixup = ''
# generate the parts.db file
QT_QPA_PLATFORM=offscreen "$out/bin/Fritzing" -db "$out/fritzing-parts/parts.db" -pp "$out/fritzing-parts" -folder "$out"
QT_QPA_PLATFORM=offscreen "$out/bin/Fritzing" \
-db "$out/share/fritzing/parts/parts.db" \
-pp "$out/fritzing/parts" \
-folder "$out/share/fritzing"
'';
qmakeFlags = [ "phoenix.pro" ];
meta = {
meta = with lib; {
description = "An open source prototyping tool for Arduino-based projects";
homepage = "https://fritzing.org/";
license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.robberer ];
platforms = lib.platforms.linux;
license = with licenses; [ gpl3 cc-by-sa-30 ];
maintainers = with maintainers; [ robberer ];
platforms = platforms.linux;
};
}

View file

@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, gmp, mpfr, boost }:
stdenv.mkDerivation {
name = "gappa-1.3.5";
name = "gappa-1.4.0";
src = fetchurl {
url = "https://gforge.inria.fr/frs/download.php/file/38044/gappa-1.3.5.tar.gz";
sha256 = "0q1wdiwqj6fsbifaayb1zkp20bz8a1my81sqjsail577jmzwi07w";
url = "https://gforge.inria.fr/frs/download.php/file/38044/gappa-1.4.0.tar.gz";
sha256 = "sha256-/IDIf5XnFBqVllgH5GtQ6C8g7vxheaVcXNoZiXlsPGA=";
};
buildInputs = [ gmp mpfr boost.dev ];

View file

@ -78,7 +78,7 @@ stdenv.mkDerivation {
++ lib.optionals withLibsecret [ pkg-config glib libsecret ];
# required to support pthread_cancel()
NIX_LDFLAGS = lib.optionalString (!stdenv.cc.isClang) "-lgcc_s"
NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && stdenv.hostPlatform.libc == "glibc") "-lgcc_s"
+ lib.optionalString (stdenv.isFreeBSD) "-lthr";
configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [

View file

@ -1,55 +1,21 @@
{ lib, stdenv, fetchurl, fetchpatch, ed }:
{ lib, stdenv, fetchurl, fetchpatch, buildPackages, diffutils, ed }:
stdenv.mkDerivation rec {
name = "rcs-5.9.4";
pname = "rcs";
version = "5.10.0";
src = fetchurl {
url = "mirror://gnu/rcs/${name}.tar.xz";
sha256 = "1zsx7bb0rgvvvisiy4zlixf56ay8wbd9qqqcp1a1g0m1gl6mlg86";
url = "mirror://gnu/rcs/${pname}-${version}.tar.xz";
sha256 = "sha256-Og2flYx60wPkdehjRlSXTtvm3rOkVEkfOFfcGIm6xcU";
};
buildInputs = [ ed ];
ac_cv_path_ED = "${ed}/bin/ed";
DIFF = "${diffutils}/bin/diff";
DIFF3 = "${diffutils}/bin/diff3";
patches = lib.optionals stdenv.isDarwin [
# This failure appears unrelated to the subject of the test. This
# test seems to rely on a bash bug where `test $x -nt $y` ignores
# subsecond values in timetamps. This bug has been fixed in Bash
# 5, and seemingly doesn't affect Darwin.
./disable-t810.patch
(fetchpatch {
url = "https://raw.githubusercontent.com/macports/macports-ports/b76d1e48dac/editors/nano/files/secure_snprintf.patch";
extraPrefix = "";
sha256 = "1wy9pjw3vvp8fv8a7pmkqmiapgacfx54qj9fvsc5gwry0vv7vnc3";
})
# Expected to appear in the next release
(fetchpatch {
url = "https://raw.githubusercontent.com/Homebrew/formula-patches/3fff7c990b8df4174045834b9c1210e7736ff5a4/rcs/noreturn.patch";
sha256 = "10zniqrd6xagf3q03i1vksl0vd9nla3qcj0840n3m8z6jd4aypcx";
})
];
doCheck = true;
checkFlags = [ "VERBOSE=1" ];
checkPhase = ''
# If neither LOGNAME or USER are set, rcs will default to
# getlogin(), which is unreliable on macOS. It will often return
# things like `_spotlight`, or `_mbsetupuser`. macOS sets both
# environment variables in user sessions, so this is unlikely to
# affect regular usage.
export LOGNAME=$(id -un)
print_logs_and_fail() {
grep -nH -e . -r tests/*.d/{out,err}
return 1
}
make $checkFlags check || print_logs_and_fail
'';
disallowedReferences =
lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform)
[ buildPackages.diffutils buildPackages.ed ];
NIX_CFLAGS_COMPILE = "-std=c99";

View file

@ -1,10 +0,0 @@
--- rcs-5.9.4-orig/tests/Makefile.in 2015-01-22 19:40:36.000000000 +0900
+++ rcs-5.9.4/tests/Makefile.in 2019-04-16 20:04:30.557626000 +0900
@@ -1372,7 +1372,6 @@
t803 \
t804 \
t805 \
- t810 \
t900 \
t999

View file

@ -4,14 +4,14 @@
}:
stdenv.mkDerivation rec {
version = "2.13.c.3";
version = "2.13.c.4";
pname = "i3lock-color";
src = fetchFromGitHub {
owner = "PandorasFox";
repo = "i3lock-color";
rev = version;
sha256 = "0spldmis8fvnclwwi9xvnq2rq3hmpbiv3ck5p9pjf40ismvsi16k";
sha256 = "sha256-bbjkvgSKD57sdOtPYGLAKpQoIsJnF6s6ySq4dTWC3tI=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];

View file

@ -1,53 +1,59 @@
{ lib, stdenv, fetchurl, unzip
, bdftopcf, mkfontscale, fontforge
, bdftopcf, mkfontscale, fonttosfnt
}:
stdenv.mkDerivation {
pname = "dina-font";
version = "2.92";
outputs = [ "out" "bdf" ];
src = fetchurl {
url = "http://www.donationcoder.com/Software/Jibz/Dina/downloads/Dina.zip";
sha256 = "1kq86lbxxgik82aywwhawmj80vsbz3hfhdyhicnlv9km7yjvnl8z";
};
nativeBuildInputs =
[ unzip bdftopcf mkfontscale fontforge ];
[ unzip bdftopcf mkfontscale fonttosfnt ];
patchPhase = "sed -i 's/microsoft-cp1252/ISO8859-1/' *.bdf";
postPatch = ''
sed -i 's/microsoft-cp1252/ISO8859-1/' *.bdf
'';
buildPhase = ''
runHook preBuild
newName() {
test "''${1:5:1}" = i && _it=Italic || _it=
case ''${1:6:3} in
400) test -z $it && _weight=Medium ;;
700) _weight=Bold ;;
esac
_pt=''${1%.bdf}
_pt=''${_pt#*-}
echo "Dina$_weight$_it$_pt"
test "''${1:5:1}" = i && _it=Italic || _it=
case ''${1:6:3} in
400) test -z $it && _weight=Medium ;;
700) _weight=Bold ;;
esac
_pt=''${1%.bdf}
_pt=''${_pt#*-}
echo "Dina$_weight$_it$_pt"
}
# convert bdf fonts to pcf
for i in *.bdf; do
bdftopcf -t -o $(newName "$i").pcf "$i"
for f in *.bdf; do
name=$(newName "$f")
bdftopcf -t -o "$name.pcf" "$f"
fonttosfnt -v -o "$name.otb" "$f"
done
gzip -n -9 *.pcf
# convert bdf fonts to otb
for i in *.bdf; do
fontforge -lang=ff -c "Open(\"$i\"); Generate(\"$(newName $i).otb\")"
done
runHook postBuild
'';
installPhase = ''
runHook preInstall
install -D -m 644 -t "$out/share/fonts/misc" *.pcf.gz *.otb
install -D -m 644 -t "$bdf/share/fonts/misc" *.bdf
mkfontdir "$out/share/fonts/misc"
mkfontdir "$bdf/share/fonts/misc"
'';
outputs = [ "out" "bdf" ];
runHook postInstall
'';
meta = with lib; {
description = "A monospace bitmap font aimed at programmers";

View file

@ -2,7 +2,7 @@
let
pname = "spleen";
version = "1.9.0";
version = "1.9.1";
in fetchurl {
name = "${pname}-${version}";
url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz";
@ -19,7 +19,7 @@ in fetchurl {
# create fonts.dir so NixOS xorg module adds to fp
${mkfontscale}/bin/mkfontdir "$d"
'';
sha256 = "sha256-hNPbYiU+v7kCYKVyOn+uc5cSlu9bWsC4CwFvfH6StWM=";
sha256 = "sha256-6Imsa0ku8On63di0DOo0QxBa0t+tbtPRxM531EIiG94=";
meta = with lib; {
description = "Monospaced bitmap fonts";

View file

@ -24,9 +24,8 @@ openjdk11.overrideAttrs (oldAttrs: rec {
your own risk.
'';
homepage = "https://bintray.com/jetbrains/intellij-jdk/";
license = licenses.gpl2;
inherit (openjdk11.meta) license platforms mainProgram;
maintainers = with maintainers; [ edwtjo petabyteboy ];
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
};
passthru = oldAttrs.passthru // {
home = "${jetbrains.jdk}/lib/openjdk";

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "kotlin";
version = "1.5.0";
version = "1.5.10";
src = fetchurl {
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
sha256 = "1dyiis96skflhlsmc8byp5j8j3vsicmlslwyrkn1pv4gc8gzqhq3";
sha256 = "0kiwddq5b0dk63nlifb8bbaimh8inxsbk97nbw2m8qw17gby339g";
};
propagatedBuildInputs = [ jre ] ;

View file

@ -136,14 +136,7 @@ let
disallowedReferences = [ openjdk11-bootstrap ];
meta = with lib; {
homepage = "http://openjdk.java.net/";
license = licenses.gpl2;
description = "The open-source Java Development Kit";
maintainers = with maintainers; [ edwtjo asbachb ];
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
mainProgram = "java";
};
meta = import ./meta.nix lib;
passthru = {
architecture = "";

View file

@ -145,14 +145,7 @@ let
disallowedReferences = [ openjdk11 ];
meta = with lib; {
homepage = "http://openjdk.java.net/";
license = licenses.gpl2;
description = "The open-source Java Development Kit";
maintainers = with maintainers; [ edwtjo ];
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
mainProgram = "java";
};
meta = import ./meta.nix lib;
passthru = {
architecture = "";

View file

@ -145,14 +145,7 @@ let
disallowedReferences = [ openjdk13-bootstrap ];
meta = with lib; {
homepage = "http://openjdk.java.net/";
license = licenses.gpl2;
description = "The open-source Java Development Kit";
maintainers = with maintainers; [ edwtjo ];
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
mainProgram = "java";
};
meta = import ./meta.nix lib;
passthru = {
architecture = "";

View file

@ -141,14 +141,7 @@ let
disallowedReferences = [ openjdk14-bootstrap ];
meta = with lib; {
homepage = "https://openjdk.java.net/";
license = licenses.gpl2;
description = "The open-source Java Development Kit";
maintainers = with maintainers; [ edwtjo ];
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
mainProgram = "java";
};
meta = import ./meta.nix lib;
passthru = {
architecture = "";

View file

@ -141,14 +141,7 @@ let
disallowedReferences = [ openjdk15-bootstrap ];
meta = with lib; {
homepage = "https://openjdk.java.net/";
license = licenses.gpl2;
description = "The open-source Java Development Kit";
maintainers = with maintainers; [ edwtjo ];
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
mainProgram = "java";
};
meta = import ./meta.nix lib;
passthru = {
architecture = "";

View file

@ -147,14 +147,7 @@ let
disallowedReferences = [ openjdk16-bootstrap ];
meta = with lib; {
homepage = "https://openjdk.java.net/";
license = licenses.gpl2;
description = "The open-source Java Development Kit";
maintainers = with maintainers; [ edwtjo ];
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
mainProgram = "java";
};
meta = import ./meta.nix lib;
passthru = {
architecture = "";

View file

@ -69,10 +69,6 @@ let
home = jdk;
};
meta = with lib; {
license = licenses.gpl2;
platforms = platforms.darwin;
};
meta = import ./meta.nix lib;
};
in jdk

View file

@ -73,10 +73,6 @@ let
home = jdk;
};
meta = with lib; {
license = licenses.gpl2;
platforms = platforms.darwin;
};
meta = import ./meta.nix lib;
};
in jdk

View file

@ -69,10 +69,6 @@ let
home = jdk;
};
meta = with lib; {
license = licenses.gpl2;
platforms = platforms.darwin;
};
meta = import ./meta.nix lib;
};
in jdk

View file

@ -0,0 +1,4 @@
lib: (removeAttrs (import ../meta.nix lib) [ "maintainers" ]) // {
platforms = lib.platforms.darwin;
homepage = "https://www.azul.com/";
}

View file

@ -0,0 +1,8 @@
lib: with lib; {
homepage = "https://openjdk.java.net/";
license = licenses.gpl2Only;
description = "The open-source Java Development Kit";
maintainers = with maintainers; [ edwtjo asbachb ];
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
mainProgram = "java";
}

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "janet";
version = "1.16.0";
version = "1.16.1";
src = fetchFromGitHub {
owner = "janet-lang";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Wrr2zie251oB+uhsLMmkPBV0b3MwTmcPTgNJOsgCems=";
sha256 = "sha256-TzJbHmHIySlf3asQ02HOdehMR+s0KkPifBiaQ4FvFCg=";
};
nativeBuildInputs = [ meson ninja ];

View file

@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "5" "7" "";
jruby = stdenv.mkDerivation rec {
pname = "jruby";
version = "9.2.17.0";
version = "9.2.18.0";
src = fetchurl {
url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz";
sha256 = "sha256-dwHTU3s6YG0nZaxtXEDmdd2qAdPOutJqIaZuOq3VwgI=";
sha256 = "sha256-QlpclwptkYrlMSdYUGNNEhaeNVd1SyuBf7+3mHoywac=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "rakudo";
version = "2021.02.1";
version = "2021.05";
src = fetchurl {
url = "https://www.rakudo.org/dl/rakudo/rakudo-${version}.tar.gz";
sha256 = "1xwqx4357bw7h5pdmwxm5wxh8wjvrcdk4rvr3wyrhg1wzy5qvsn8";
sha256 = "0h9kdb4vvscflifmclx0zhwb5qfakiggnbvlf9cx2hmp5vnk71jk";
};
buildInputs = [ icu zlib gmp perl ];

View file

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "moarvm";
version = "2021.02";
version = "2021.05";
src = fetchurl {
url = "https://www.moarvm.org/releases/MoarVM-${version}.tar.gz";
sha256 = "08ri9mvbk97qfxcy6lj4cb7j3a789ck052m2vqfhis3vkrkw780r";
sha256 = "15x8lra3k7lpcisfxvrrz3jqp2dilfrwgqzxkknwlfsfcrw8fk5i";
};
buildInputs = [ perl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "nqp";
version = "2021.02";
version = "2021.05";
src = fetchurl {
url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz";
sha256 = "1vyl6x811f8mbdnp34yj6kfmfpxp2yfrr8cqf1w47rzmr741sjyj";
sha256 = "0gzpzzvqs3xar5657yx07hsvqn3xckdfvq9jw73qfccbbb9gjg5l";
};
buildInputs = [ perl ];

View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec
{
pname = "alembic";
version = "1.8.1";
version = "1.8.2";
src = fetchFromGitHub {
owner = "alembic";
repo = "alembic";
rev = version;
sha256 = "sha256-ObjpWreabeVzKYVgC62JaoGUf1BZCxP0STjox3akDvo=";
sha256 = "sha256-e87pnWIV8fbjEQa5iXRPXA9MkJN9NwY9PW/QI+cVSKo=";
};
outputs = [ "bin" "dev" "out" "lib" ];

View file

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "gensio";
version = "2.2.5";
version = "2.2.7";
src = fetchFromGitHub {
owner = "cminyard";
repo = pname;
rev = "v${version}";
sha256 = "sha256-QC07NGgZa++qHyGZY3fjosjJVuRFfc7HYmdGxQHAz4s=";
sha256 = "sha256-2wxsPHrQ9GgyUE4p6zYuR1mPU2OyjtgiPnMApEscR2g=";
};
passthru = {

View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "goffice";
version = "0.10.49";
version = "0.10.50";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "X/wY27OF7fuFtsYlS55bTLPS/6MEK5Ms286ON/SzB+k=";
sha256 = "LFw93HsIs0UkCMgbEhxfASpzSYHXXkRN68yxxY5cv9w=";
};
nativeBuildInputs = [ pkg-config intltool ];

View file

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "leatherman";
version = "1.12.4";
version = "1.12.5";
src = fetchFromGitHub {
sha256 = "sha256-7e9D9Q3CAm+2+0vl81djSZwKrQRXc5UxcbJVMt91/vU=";
sha256 = "sha256-1romJiOIQDlglo/nAJjn1l06dSwDRwG1b49H6js9MB4=";
rev = version;
repo = "leatherman";
owner = "puppetlabs";

View file

@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
pname = "libwpe";
version = "1.10.0";
version = "1.10.1";
src = fetchurl {
url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz";
sha256 = "sha256-JBXicNReNZXtQFK8EF9zN0TcLTZ34S/0qDHlAphBCE0=";
sha256 = "sha256-oyez/88jVtvoFIwdtLvcU1nX5xY9F39nVRqDk7FErfA=";
};
nativeBuildInputs = [

View file

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "zimlib";
version = "6.3.0";
version = "6.3.2";
src = fetchFromGitHub {
owner = "openzim";
repo = "libzim";
rev = version;
sha256 = "0iy0f1clhihq277x218ccx3mszgpr3h9l0by48b9ykr115nffw3s";
sha256 = "sha256-xlYu74akK9WFy86hcQe7zp11TImwl8llgDIZBRgmbAI=";
};
nativeBuildInputs = [

View file

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "FoxDot";
version = "0.8.11";
version = "0.8.12";
src = fetchPypi {
inherit pname version;
sha256 = "00yqpkv7cxwk301cyiwjzr9yfq8hpnhqyspw3z874ydrl3cmssdb";
sha256 = "528999da55ad630e540a39c0eaeacd19c58c36f49d65d24ea9704d0781e18c90";
};
propagatedBuildInputs = [ tkinter supercollider ];

View file

@ -14,12 +14,12 @@
}:
buildPythonPackage rec {
version = "0.13";
version = "0.13.1";
pname = "pybids";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-zVFaGAKgTP9UiUdmO4+Tut8Qc64xuGyB26cQLRHOqYw=";
sha256 = "sha256-ySDhVX4drotnFiXXDK+9woQ3uigistudpMJYenYl47o=";
};
propagatedBuildInputs = [

View file

@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "byacc";
version = "20210109";
version = "20210520";
src = fetchurl {
urls = [
"ftp://ftp.invisible-island.net/byacc/${pname}-${version}.tgz"
"https://invisible-mirror.net/archives/byacc/${pname}-${version}.tgz"
];
sha256 = "sha256-nn13aFhxQed4RJJhXf78cKjgBBAEO2OQHv7cG1DBm5c=";
sha256 = "sha256-19MdrnLLlzSC73+XVgmuQBzMEu4/sWi2emlSbGCv5D4=";
};
configureFlags = [

View file

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin
{ lib, fetchFromGitHub, rustPlatform, clang, llvmPackages_latest, rustfmt, writeScriptBin
, runtimeShell
, bash
}:
@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "0r60smhlx1992a1s1k5sxjpdqllb2xsqcimgx3ldp5fdkfphk3cw";
#for substituteAll
libclang = llvmPackages.libclang.lib;
libclang = llvmPackages_latest.libclang.lib;
inherit bash;
buildInputs = [ libclang ];

View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "dwarf-therapist";
version = "41.1.5";
version = "41.2.2";
src = fetchFromGitHub {
owner = "Dwarf-Therapist";
repo = "Dwarf-Therapist";
rev = "v${version}";
sha256 = "0w1mwwf49vdmvmdfvlkn4m0hzvlj111rpl8hv4rw6v8nv6yfb2y4";
sha256 = "sha256-zsEG68ioSw64UfmqlTLO1i5sObg8C4zxvdPxdQGMhhU=";
};
nativeBuildInputs = [ texlive cmake ninja ];

View file

@ -1,5 +1,6 @@
{ mkDerivation
, fetchFromGitHub
, fetchpatch
, SDL2
, cmake
, ffmpeg
@ -26,6 +27,15 @@ mkDerivation rec {
sha256 = "sha256-vfp/vacIItlPP5dR7jzDT7oOUNFnjvvdR46yi79EJKU=";
};
patches = [
# fix compability with ffmpeg 4.4, remove on next release after 1.11
(fetchpatch {
name = "fix_ffmpeg_4.4.patch";
url = "https://patch-diff.githubusercontent.com/raw/hrydgard/ppsspp/pull/14176.patch";
sha256 = "sha256-ecDoOydaLfL6+eFpahcO1TnRl866mZZVHlr6Qrib1mo=";
})
];
postPatch = ''
substituteInPlace git-version.cmake --replace unknown ${src.rev}
substituteInPlace UI/NativeApp.cpp --replace /usr/share $out/share

View file

@ -714,12 +714,12 @@ final: prev:
completion-nvim = buildVimPluginFrom2Nix {
pname = "completion-nvim";
version = "2021-06-01";
version = "2021-06-16";
src = fetchFromGitHub {
owner = "nvim-lua";
repo = "completion-nvim";
rev = "c8db953a8e9f4bc8183e31831297cf84d6f521b8";
sha256 = "0p35msrh7g100ayl0g8285q43v20n6hlv1grdb0rmw8sil0j881a";
rev = "d62fff879b29fa1ce915887a75305af0fff57d32";
sha256 = "0hfsz06djyja8phj099fmbg2sa9jj89rqxvizwhwdxadshmr1f20";
};
meta.homepage = "https://github.com/nvim-lua/completion-nvim/";
};
@ -3336,12 +3336,12 @@ final: prev:
nvcode-color-schemes-vim = buildVimPluginFrom2Nix {
pname = "nvcode-color-schemes-vim";
version = "2021-06-02";
version = "2021-06-16";
src = fetchFromGitHub {
owner = "ChristianChiarulli";
repo = "nvcode-color-schemes.vim";
rev = "7c85366c9d457ed0e3c3532ee312307476afbbdc";
sha256 = "02hxjwi8g07zhx6xagma5m3sa0j4ljg79377zfn2vy4snnib452p";
rev = "2afb852177a28e579c1348033dbc043a99ca6dc7";
sha256 = "1aghwwcwsh4dka8jwq254pdb9l9c193iwnax9ab8s0zzcyk0x4bq";
};
meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/";
};
@ -4512,6 +4512,18 @@ final: prev:
meta.homepage = "https://github.com/gorkunov/smartpairs.vim/";
};
snap = buildVimPluginFrom2Nix {
pname = "snap";
version = "2021-06-16";
src = fetchFromGitHub {
owner = "camspiers";
repo = "snap";
rev = "8628478288bb64ed59989910e736879054facda3";
sha256 = "0sq7wv07hckk8qfg39qv507i33vg1c6nr5gjrjl5126i1h5afa8j";
};
meta.homepage = "https://github.com/camspiers/snap/";
};
snippets-nvim = buildVimPluginFrom2Nix {
pname = "snippets-nvim";
version = "2020-09-09";

View file

@ -755,6 +755,10 @@ self: super: {
dependencies = with self; [ vim-addon-mw-utils tlib_vim ];
});
vim-speeddating = super.vim-speeddating.overrideAttrs (old: {
dependencies = with self; [ vim-repeat ];
});
vim-stylish-haskell = super.vim-stylish-haskell.overrideAttrs (old: {
postPatch = old.postPatch or "" + ''
substituteInPlace ftplugin/haskell/stylish-haskell.vim --replace \
@ -763,6 +767,14 @@ self: super: {
'';
});
vim-surround = super.vim-surround.overrideAttrs (old: {
dependencies = with self; [ vim-repeat ];
});
vim-unimpaired = super.vim-unimpaired.overrideAttrs (old: {
dependencies = with self; [ vim-repeat ];
});
vim-wakatime = super.vim-wakatime.overrideAttrs (old: {
buildInputs = [ python ];
});

View file

@ -47,6 +47,7 @@ bronson/vim-trailing-whitespace
brooth/far.vim
buoto/gotests-vim
camspiers/lens.vim
camspiers/snap@main
carlitux/deoplete-ternjs
ccarpita/rtorrent-syntax-file
cespare/vim-toml

View file

@ -192,8 +192,6 @@ in with py.pkgs; buildPythonApplication rec {
# don't try and fail to strip 6600+ python files, it takes minutes!
dontStrip = true;
inherit availableComponents;
# PyPI tarball is missing tests/ directory
src = fetchFromGitHub {
owner = "home-assistant";
@ -805,6 +803,7 @@ in with py.pkgs; buildPythonApplication rec {
'';
passthru = {
inherit availableComponents;
python = py;
tests = {
inherit (nixosTests) home-assistant;

View file

@ -16,11 +16,13 @@
stdenv.mkDerivation rec {
pname = "hqplayerd";
version = "4.24.0-61";
version = "4.24.1-62";
src = fetchurl {
# FIXME: use the fc34 sources when we get glibc 2.33 in nixpkgs
# c.f. https://github.com/NixOS/nixpkgs/pull/111616
url = "https://www.signalyst.eu/bins/${pname}/fc33/${pname}-${version}.fc33.x86_64.rpm";
sha256 = "sha256-VouqkWRu9lcbCQNmXJayrsZZnhvM5xEZlUyBEkURBOQ=";
sha256 = "sha256-lnejPkw6X3wRtjXTsdipEy6yZCEsDARhLPnySIltHXs=";
};
unpackPhase = ''
@ -45,6 +47,8 @@ stdenv.mkDerivation rec {
dontBuild = true;
installPhase = ''
runHook preInstall
# main executable
mkdir -p $out/bin
cp ./usr/bin/hqplayerd $out/bin
@ -62,12 +66,14 @@ stdenv.mkDerivation rec {
cp ./usr/lib/systemd/system/hqplayerd.service $out/lib/systemd/system
# documentation
mkdir -p $out/share/doc/${pname}
cp ./usr/share/doc/${pname}/* $out/share/doc/${pname}
mkdir -p $out/share/doc/hqplayerd
cp ./usr/share/doc/hqplayerd/* $out/share/doc/hqplayerd
# misc service support files
mkdir -p $out/var/lib/${pname}
cp -r ./var/hqplayer/web $out/var/lib/${pname}
mkdir -p $out/var/lib/hqplayerd
cp -r ./var/hqplayer/web $out/var/lib/hqplayerd
runHook postInstall
'';
postInstall = ''
@ -82,7 +88,6 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://www.signalyst.com/custom.html";
description = "High-end upsampling multichannel software embedded HD-audio player";
changelog = "https://www.signalyst.eu/bins/${pname}/fc33/${pname}-${version}.fc33.x86_64.changes";
license = licenses.unfree;
maintainers = with maintainers; [ lovesegfault ];
};

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "jackett";
version = "0.18.231";
version = "0.18.234";
src = fetchurl {
url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
sha256 = "sha256-fl0M4Emstp21CrrE4Znzwi1XvTzx6TpPnNKYM65aoN4=";
sha256 = "sha256-F01iR1BdSWCBqBI+Mh8uyzWKIbiMR2tOW6sJgFU3hG8=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -1,32 +1,107 @@
{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, doxygen, perl, pam, nspr, nss, openldap
, db, cyrus_sasl, svrcore, icu, net-snmp, libkrb5, pcre, perlPackages, libevent, openssl, python3
{ stdenv
, autoreconfHook
, fetchFromGitHub
, lib
, bzip2
, cmocka
, cracklib
, cyrus_sasl
, db
, doxygen
, icu
, libevent
, libkrb5
, lm_sensors
, net-snmp
, nspr
, nss
, openldap
, openssl
, pcre
, perl
, perlPackages
, pkg-config
, python3
, svrcore
, zlib
, enablePamPassthru ? true
, pam
, enableCockpit ? true
, rsync
, enableDna ? true
, enableLdapi ? true
, enableAutobind ? false
, enableAutoDnSuffix ? false
, enableBitwise ? true
, enableAcctPolicy ? true
, enablePosixWinsync ? true
}:
stdenv.mkDerivation rec {
pname = "389-ds-base";
version = "1.3.9.1";
version = "2.0.5";
src = fetchurl {
url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.bz2";
sha256 = "141iv1phgk1lw74sfjj3v7wy6qs0q56lvclwv2p0hqn1wg8ic4q6";
src = fetchFromGitHub {
owner = "389ds";
repo = pname;
rev = "${pname}-${version}";
sha256 = "sha256-H0G8py4sB+2CSZKyCIb2TCIXOpnPx7udWUEK4Tg5TD8=";
};
nativeBuildInputs = [ autoreconfHook pkg-config doxygen ];
buildInputs = [
perl pam nspr nss openldap db cyrus_sasl svrcore icu
net-snmp libkrb5 pcre libevent openssl python3
] ++ (with perlPackages; [ MozillaLdap NetAddrIP DBFile ]);
patches = [
(fetchpatch {
name = "389-ds-nss.patch";
url = "https://aur.archlinux.org/cgit/aur.git/plain/nss.patch?h=389-ds-base&id=b80ed52cc65ff9b1d72f8ebc54dbd462b12f6be9";
sha256 = "07z7jl9z4gzhk3k6qyfn558xl76js8041llyr5n99h20ckkbwagk";
})
];
buildInputs = [
bzip2
cracklib
cyrus_sasl
db
icu
libevent
libkrb5
lm_sensors
net-snmp
nspr
nss
openldap
openssl
pcre
perl
python3
svrcore
zlib
# tests
cmocka
libevent
# lib389
(python3.withPackages (ps: with ps; [
setuptools
ldap
six
pyasn1
pyasn1-modules
dateutil
argcomplete
libselinux
]))
# logconv.pl
perlPackages.DBFile
perlPackages.ArchiveTar
]
++ lib.optional enableCockpit rsync
++ lib.optional enablePamPassthru pam;
postPatch = ''
substituteInPlace Makefile.am \
--replace 's,@perlpath\@,$(perldir),g' 's,@perlpath\@,$(perldir) $(PERLPATH),g'
patchShebangs ./buildnum.py ./ldap/servers/slapd/mkDBErrStrs.py
'';
preConfigure = ''
@ -38,21 +113,37 @@ stdenv.mkDerivation rec {
export PERLPATH
'';
configureFlags = [
"--sysconfdir=/etc"
"--localstatedir=/var"
"--with-openldap"
"--with-db"
"--with-db-inc=${db.dev}/include"
"--with-db-lib=${db.out}/lib"
"--with-sasl=${cyrus_sasl.dev}"
"--with-netsnmp=yes"
"--with-netsnmp-inc=${lib.getDev net-snmp}/include"
"--with-netsnmp-lib=${lib.getLib net-snmp}/lib"
];
configureFlags =
let
mkEnable = cond: name: if cond then "--enable-${name}" else "--disable-${name}";
in
[
"--enable-cmocka"
"--localstatedir=/var"
"--sysconfdir=/etc"
"--with-db-inc=${db.dev}/include"
"--with-db-lib=${db.out}/lib"
"--with-db=yes"
"--with-netsnmp-inc=${lib.getDev net-snmp}/include"
"--with-netsnmp-lib=${lib.getLib net-snmp}/lib"
"--with-netsnmp=yes"
"--with-openldap"
"${mkEnable enableCockpit "cockpit"}"
"${mkEnable enablePamPassthru "pam-passthru"}"
"${mkEnable enableDna "dna"}"
"${mkEnable enableLdapi "ldapi"}"
"${mkEnable enableAutobind "autobind"}"
"${mkEnable enableAutoDnSuffix "auto-dn-suffix"}"
"${mkEnable enableBitwise "bitwise"}"
"${mkEnable enableAcctPolicy "acctpolicy"}"
"${mkEnable enablePosixWinsync "posix-winsync"}"
];
enableParallelBuilding = true;
doCheck = true;
installFlags = [
"sysconfdir=${placeholder "out"}/etc"
"localstatedir=${placeholder "TMPDIR"}"
@ -65,8 +156,5 @@ stdenv.mkDerivation rec {
description = "Enterprise-class Open Source LDAP server for Linux";
license = licenses.gpl3Plus;
platforms = platforms.linux;
knownVulnerabilities = [
"CVE-2021-3514" # https://nvd.nist.gov/vuln/detail/CVE-2021-3514
];
};
}

View file

@ -26,11 +26,11 @@ in stdenv.mkDerivation rec {
pname = "postfix";
version = "3.6.0";
version = "3.6.1";
src = fetchurl {
url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${pname}-${version}.tar.gz";
sha256 = "sha256-d0YolNdnHWPL5fwnM/lBCIUVptZxCLnxgIt9rjfoPC4=";
sha256 = "sha256-IKgFYlYB57lZiSIIMsj6FM43TwcR2gVBiPjOxqkv1xw=";
};
nativeBuildInputs = [ makeWrapper m4 ];

View file

@ -0,0 +1,32 @@
{ lib
, fetchFromGitHub
, python3
}:
python3.pkgs.buildPythonApplication rec {
pname = "mastodon-archive";
version = "1.3.1";
src = fetchFromGitHub {
owner = "kensanata";
repo = "mastodon-backup";
rev = "v${version}";
sha256 = "1dlrkygywxwm6xbn0pnfwd3f7641wnvxdyb5qihbsf62w1w08x8r";
};
propagatedBuildInputs = with python3.pkgs; [
html2text
mastodon-py
progress
];
# There is no test
doCheck = false;
meta = with lib; {
description = "Utility for backing up your Mastodon content";
homepage = "https://alexschroeder.ch/software/Mastodon_Archive";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ julm ];
};
}

View file

@ -13,13 +13,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "bluez-alsa";
version = "3.0.0";
version = "3.1.0";
src = fetchFromGitHub {
owner = "Arkq";
repo = "bluez-alsa";
rev = "v${version}";
sha256 = "1jlsgxyqfhncfhx1sy3ry0dp6p95kd4agh7g2b7g51h0c4cv74h8";
sha256 = "sha256-bohc/0hUr1mcV2JbFy71TjY8MXOU3oBBPCcupgkWsWY=";
};
nativeBuildInputs = [ pkg-config autoreconfHook ];

View file

@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "gcsfuse";
version = "0.35.0";
version = "0.35.1";
src = fetchFromGitHub {
owner = "googlecloudplatform";
repo = "gcsfuse";
rev = "v${version}";
sha256 = "sha256-GJ21Cqd/W/PocmN1p4OeeUdswhH7fSmAMiNTs0X3564=";
sha256 = "sha256-A6vhdECKMq0kcR7mUTPu9F0N7gVj7tOg7UXeJ/gmbnM=";
};
goPackagePath = "github.com/googlecloudplatform/gcsfuse";

View file

@ -0,0 +1,20 @@
{ lib
, python3
}:
with python3.pkgs; buildPythonPackage rec {
pname = "esphome-dashboard";
version = "20210615.0";
src = fetchPypi {
inherit pname version;
sha256 = "07ammr46bipfi4b7nnjkip5l7966wxqhp5n3g2wqf68m3ymx24s9";
};
meta = with lib; {
description = "ESPHome dashboard";
homepage = "https://esphome.io/";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ hexa ];
};
}

View file

@ -1,4 +1,5 @@
{ lib
, pkgs
, python3
, fetchFromGitHub
, platformio
@ -6,15 +7,18 @@
, git
}:
let
esphome-dashboard = pkgs.callPackage ./dashboard.nix {};
in
python3.pkgs.buildPythonApplication rec {
pname = "esphome";
version = "1.18.0";
version = "1.19.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "1vz3d59wfqssfv1kvd4minlxibr0id06xfyg8956w9s3b22jc5vq";
sha256 = "07brvpsy40jv30h0a0ywrw4bgwajjd37xznw34s8k53y92qs8lfi";
};
postPatch = ''
@ -44,6 +48,7 @@ python3.pkgs.buildPythonApplication rec {
click
colorama
cryptography
esphome-dashboard
ifaddr
paho-mqtt
pillow
@ -66,6 +71,7 @@ python3.pkgs.buildPythonApplication rec {
checkInputs = with python3.pkgs; [
hypothesis
mock
pytest-asyncio
pytest-mock
pytest-sugar
pytestCheckHook
@ -75,6 +81,10 @@ python3.pkgs.buildPythonApplication rec {
$out/bin/esphome --help > /dev/null
'';
passthru = {
dashboard = esphome-dashboard;
};
meta = with lib; {
description = "Make creating custom firmwares for ESP32/ESP8266 super easy";
homepage = "https://esphome.io/";

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "vivid";
version = "0.6.0";
version = "0.7.0";
src = fetchFromGitHub {
owner = "sharkdp";
repo = pname;
rev = "v${version}";
sha256 = "0m928hy2q8byfpm55nziiz86gcnhdnw3zpj78d8wx0pp318zjbla";
sha256 = "sha256-2rdNjpJrBuj6toLFzFJScNh6od5qUhkSaZF+NbPBlQA=";
};
cargoSha256 = "1sn1cq3kaswnz2z9q5h84qipp64ha7jv5kix31lm7v6nam0f5awz";
cargoSha256 = "sha256-1aox1eiF3hu5guBjRcM3qb6mHJOutI+yargW7X4cFfg=";
meta = with lib; {
description = "A generator for LS_COLORS with support for multiple color themes";

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "croc";
version = "9.1.5";
version = "9.1.6";
src = fetchFromGitHub {
owner = "schollz";
repo = pname;
rev = "v${version}";
sha256 = "sha256-NjKj1m1g3F+YLNhFLDeO5DXtHIxPRwfSpunhRnSHRFc=";
sha256 = "sha256-FMx2Siw1J7UKtuwLcSkgMhs4Dl0erQcRb5FGkq2hFv0=";
};
vendorSha256 = "sha256-cBf4UV9jBKvmcBG2XLPpPgO05GRB1SV1W3lJCuoQJQ4=";
vendorSha256 = "sha256-tPBPmZLcBR16RxqvL3UYlIAwK8IeV+DYkRrVOgBkm58=";
doCheck = false;

View file

@ -12,8 +12,7 @@ stdenv.mkDerivation {
${croc}/bin/croc --relay localhost:11111 send --code correct-horse-battery-staple --text "$MSG" &
# wait for things to settle
sleep 1
# receive, as of croc 9 --overwrite is required for noninteractive use
MSG2=$(${croc}/bin/croc --overwrite --relay localhost:11111 --yes correct-horse-battery-staple)
MSG2=$(${croc}/bin/croc --relay localhost:11111 --yes correct-horse-battery-staple)
# compare
[ "$MSG" = "$MSG2" ] && touch $out
'';

View file

@ -13680,6 +13680,8 @@ in
massif-visualizer = libsForQt5.callPackage ../development/tools/analysis/massif-visualizer { };
mastodon-archive = callPackage ../tools/backup/mastodon-archive { };
maven = maven3;
maven3 = callPackage ../development/tools/build-managers/apache-maven { };
@ -31352,6 +31354,8 @@ in
urbit = callPackage ../misc/urbit { };
usql = callPackage ../applications/misc/usql { };
utf8cpp = callPackage ../development/libraries/utf8cpp { };
utf8proc = callPackage ../development/libraries/utf8proc { };