mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-07 13:03:06 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
acefd22683
|
|
@ -3159,6 +3159,12 @@
|
|||
githubId = 92793;
|
||||
name = "Friedrich von Never";
|
||||
};
|
||||
fortuneteller2k = {
|
||||
email = "lythe1107@gmail.com";
|
||||
github = "fortuneteller2k";
|
||||
githubId = 20619776;
|
||||
name = "fortuneteller2k";
|
||||
};
|
||||
fpletz = {
|
||||
email = "fpletz@fnordicwalking.de";
|
||||
github = "fpletz";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bluej";
|
||||
version = "4.2.2";
|
||||
version = "5.0.0";
|
||||
src = fetchurl {
|
||||
# We use the deb here. First instinct might be to go for the "generic" JAR
|
||||
# download, but that is actually a graphical installer that is much harder
|
||||
# to unpack than the deb.
|
||||
url = "https://www.bluej.org/download/files/BlueJ-linux-${builtins.replaceStrings ["."] [""] version}.deb";
|
||||
sha256 = "5c2241f2208e98fcf9aad7c7a282bcf16e6fd543faa5fdb0b99b34d1023113c3";
|
||||
sha256 = "sha256-U81FIf67Qm/86+hA9iUCHt61dxiZsTkkequlVjft6/0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -40,11 +40,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-builder";
|
||||
version = "3.38.1";
|
||||
version = "3.38.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "06wcyfrwcjyj2vcqyw0z3sy1r4qxpcdpwqq1qmpsaphpz8acycjn";
|
||||
sha256 = "jFNco64yoZC1TZbTIHGVf+wBYYQHo2JRiMZFHngzYTs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, fetchurl, runtimeShell, libsecret, gtk3, gsettings-desktop-schemas }:
|
||||
|
||||
let
|
||||
version = "3.5.11";
|
||||
version = "3.5.18";
|
||||
pname = "standardnotes";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
|
|
@ -13,7 +13,7 @@ let
|
|||
|
||||
sha256 = {
|
||||
i386-linux = "009fnnd7ysxkyykkbmhvr0vn13b21j1j5mzwdvqdkhm9v3c9rbgj";
|
||||
x86_64-linux = "1fij00d03ky57jlnhf9n2iqvfa4dgmkgawrxd773gg03hdsk7xcf";
|
||||
x86_64-linux = "1zrnvvr9x0s2gp948iajsmgn38xm6x0g2dgxrfjis39rpplsrdww";
|
||||
}.${stdenv.hostPlatform.system};
|
||||
|
||||
src = fetchurl {
|
||||
|
|
|
|||
|
|
@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Multipurpose command line tool for working with OpenStreetMap data based on the Osmium library";
|
||||
homepage = "https://osmcode.org/osmium-tool/";
|
||||
changelog = "https://github.com/osmcode/osmium-tool/blob/v${version}/CHANGELOG.md";
|
||||
license = with licenses; [ gpl3Plus mit bsd3 ];
|
||||
maintainers = with maintainers; [ das-g ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
, libGLU, libGL, perl, python2, libpulseaudio
|
||||
, unzip, xorg, wget, which, yasm, zip, zlib
|
||||
|
||||
, withGTK3 ? false, gtk3
|
||||
, withGTK3 ? true, gtk3
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -16,14 +16,14 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "palemoon";
|
||||
version = "28.17.0";
|
||||
version = "29.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
githubBase = "repo.palemoon.org";
|
||||
owner = "MoonchildProductions";
|
||||
repo = "Pale-Moon";
|
||||
rev = "${version}_Release";
|
||||
sha256 = "0478xn5skpls91hkraykc308hppdc8vj9xbgvlm5wkv0y4dp7h5x";
|
||||
sha256 = "1v870kxbl7b0kazd6krjiarvbjwmv13hgwkzpi054i9cf8z7pyiv";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
@ -119,6 +119,9 @@ in stdenv.mkDerivation rec {
|
|||
installPhase = ''
|
||||
./mach install
|
||||
|
||||
# Fix missing icon due to wrong WMClass
|
||||
substituteInPlace ./palemoon/branding/official/palemoon.desktop \
|
||||
--replace 'StartupWMClass="pale moon"' 'StartupWMClass=Pale moon'
|
||||
desktop-file-install --dir=$out/share/applications \
|
||||
./palemoon/branding/official/palemoon.desktop
|
||||
|
||||
|
|
|
|||
|
|
@ -31,12 +31,12 @@ let
|
|||
|
||||
in mkDerivationWith python3Packages.buildPythonApplication rec {
|
||||
pname = "qutebrowser";
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
|
||||
# the release tarballs are different from the git checkout!
|
||||
src = fetchurl {
|
||||
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "0hmj19bp5dihzpphxz77377yfmygj498am0h23kxg5m3y5hqv65a";
|
||||
sha256 = "0fxkazz4ykmkiww27l92yr96hq00qn5vvjmknxcy4cl97d2pxa28";
|
||||
};
|
||||
|
||||
# Needs tox
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dnscontrol";
|
||||
version = "3.5.0";
|
||||
version = "3.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StackExchange";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0bnsd1kx0ji2s3w1v7sskc3x82avaqjn2arnax55bmh1yjma6z8p";
|
||||
sha256 = "sha256-I1PaDHPocQuoSOyfnxDWwIR+7S9l/odX4SCeAae/jv8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "0ppcrp6jp23ycn70mcgi5bsa0hr20hk7044ldw304krawy2vjgz8";
|
||||
vendorSha256 = "sha256-H0i5MoVX5O0CgHOvefDEyzBWvBZvJZUrC9xBq9CHgeE=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rssguard";
|
||||
version = "3.8.3";
|
||||
version = "3.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "martinrotter";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1704nj77h6s88l4by3wxl5l770gaig90mv3ix80r00nh8mhzq44q";
|
||||
sha256 = "sha256-2NC5Y8WxVYrzpuqDzhXXJ16b04Em1HqZaE2VK9tmfYk=";
|
||||
};
|
||||
|
||||
buildInputs = [ qtwebengine qttools ];
|
||||
|
|
|
|||
|
|
@ -1,19 +1,17 @@
|
|||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "ssh-chat";
|
||||
version = "1.10";
|
||||
|
||||
goPackagePath = "github.com/shazow/ssh-chat";
|
||||
version = "1.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shazow";
|
||||
repo = "ssh-chat";
|
||||
rev = "v${version}";
|
||||
sha256 = "e4COAyheY+mE5zltR1Ms2OJ3I8iG/N1CZ6D7I9PDW5U=";
|
||||
sha256 = "LgrqIuM/tLC0JqDai2TLu6G/edZ5Q7WFXjX5bzc0Bcc=";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
vendorSha256 = "QTUBorUAsWDOpNP3E/Y6ht7ZXZViWBbrMPtLl7lHtgE=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Chat over SSH";
|
||||
|
|
|
|||
|
|
@ -1,84 +0,0 @@
|
|||
# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/alexcesaro/log";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/alexcesaro/log";
|
||||
rev = "61e686294e58";
|
||||
sha256 = "1ckd5crq9rd12wpclahg2q0wprfg0whd6k9zbfzzkr6l1qpmmfam";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/howeyc/gopass";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/howeyc/gopass";
|
||||
rev = "7cb4b85ec19c";
|
||||
sha256 = "1qyhjd6wx409g9cq3xbpbl2xl41nm00mxzcxm5gbqdlwsd0z80rv";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/jessevdk/go-flags";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/jessevdk/go-flags";
|
||||
rev = "v1.4.0";
|
||||
sha256 = "0algnnigph27spgn655zm4723yfjxjjvlf4k14z9drj3682df25a";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/shazow/rateio";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/shazow/rateio";
|
||||
rev = "4461efc8bdc4";
|
||||
sha256 = "1isy75cmm71q18mvs6xaizgdjqnn6pllkj4yvd42brfgfj84qz0w";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/crypto";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/crypto";
|
||||
rev = "884d27f42877";
|
||||
sha256 = "1ka5kqpw3wr3iawwxq4swmrwbww6v1cmds86z1nm0qb8fvhvpslk";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/net";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/net";
|
||||
rev = "eb5bcb51f2a3";
|
||||
sha256 = "17k4g8krxbl84gzcs275b7gsh66dzm15fdxivjnx9xz8q84l4kby";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/sys";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/sys";
|
||||
rev = "1957bb5e6d1f";
|
||||
sha256 = "0imqk4l9785rw7ddvywyf8zn7k3ga6f17ky8rmf8wrri7nknr03f";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/text";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/text";
|
||||
rev = "v0.3.2";
|
||||
sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/tools";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/tools";
|
||||
rev = "90fa682c2a6e";
|
||||
sha256 = "03ic2xsy51jw9749wl7gszdbz99iijbd2bckgygl6cm9w5m364ak";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
|
@ -10,7 +10,7 @@ assert withQt -> qt5 != null;
|
|||
with lib;
|
||||
|
||||
let
|
||||
version = "3.4.2";
|
||||
version = "3.4.3";
|
||||
variant = if withQt then "qt" else "cli";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
|
|
@ -20,7 +20,7 @@ in stdenv.mkDerivation {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
|
||||
sha256 = "1i548w6zv6ni5n22rs90a12aakyq811493dxmadlcsj2krr6i66y";
|
||||
sha256 = "0ar6pxzrcpxdriz437d6ziwlhb8k5wlvrkalp3hgqwzwy1vwqrzl";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
@ -45,13 +45,7 @@ in stdenv.mkDerivation {
|
|||
++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]
|
||||
++ optionals (withQt && stdenv.isDarwin) (with qt5; [ qtmacextras ]);
|
||||
|
||||
patches = [ ./wireshark-lookup-dumpcap-in-path.patch ]
|
||||
# https://code.wireshark.org/review/#/c/23728/
|
||||
++ lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
|
||||
name = "fix-timeout.patch";
|
||||
url = "https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commitdiff_plain;h=8b5b843fcbc3e03e0fc45f3caf8cf5fc477e8613;hp=94af9724d140fd132896b650d10c4d060788e4f0";
|
||||
sha256 = "1g2dm7lwsnanwp68b9xr9swspx7hfj4v3z44sz3yrfmynygk8zlv";
|
||||
});
|
||||
patches = [ ./wireshark-lookup-dumpcap-in-path.patch ];
|
||||
|
||||
postPatch = ''
|
||||
sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rofi-calc";
|
||||
version = "1.9";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "svenstaro";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "ZGY4ZtAG/ZnEnC80modZBV4RdRQElbkjeoKCEFVrncE=";
|
||||
sha256 = "NbWXMash0pK7Y9gOEBbL7zXjFytoeZBN9/wIbRTvQ8g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, makeWrapper, jre }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "13.7.0";
|
||||
version = "13.7.1";
|
||||
pname = "mediathekview";
|
||||
src = fetchurl {
|
||||
url = "https://download.mediathekview.de/stabil/MediathekView-${version}-linux.tar.gz";
|
||||
sha256 = "sha256-9SQUsxs/Zt7YaZo6FdeEF3MOUO3IbkDGwV5i72/X4bk=";
|
||||
sha256 = "sha256-yFPyj1Mbgj2eJv4DpvfOtPyTbL9gMAXC5TzSx8AV27o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -10,17 +10,18 @@
|
|||
, youtube-dl
|
||||
, glib
|
||||
, ffmpeg
|
||||
, aria
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "tartube";
|
||||
version = "2.3.042";
|
||||
version = "2.3.085";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "axcore";
|
||||
repo = "tartube";
|
||||
rev = "v${version}";
|
||||
sha256 = "117q4s2b2js3204506qv3kjcsy3amcf0mpwj6q0ixs1256ilkxwj";
|
||||
sha256 = "bkz64nj6748552ZMRcL/I1lUXGpZjaATUEqv3Kkphck=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -38,6 +39,8 @@ python3Packages.buildPythonApplication rec {
|
|||
feedparser
|
||||
playsound
|
||||
ffmpeg
|
||||
matplotlib
|
||||
aria
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -49,7 +52,7 @@ python3Packages.buildPythonApplication rec {
|
|||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i "/^\s*install_requires/s/, 'pgi'\|'pgi', \|'pgi'//" setup.py
|
||||
sed -i "/^\s*'pgi',$/d" setup.py
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib
|
||||
, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, qmake
|
||||
, qttools
|
||||
, gstreamer
|
||||
, libX11
|
||||
, pulseaudio
|
||||
, qtbase
|
||||
, qtmultimedia
|
||||
, qtx11extras
|
||||
|
|
@ -19,21 +19,19 @@
|
|||
mkDerivation rec {
|
||||
|
||||
pname = "vokoscreen-ng";
|
||||
version = "3.0.5";
|
||||
version = "3.0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vkohaupt";
|
||||
repo = "vokoscreenNG";
|
||||
rev = version;
|
||||
sha256 = "1spyqw8h8bkc1prdb9aixiw5h3hk3gp2p0nj934bnwq04kmfp660";
|
||||
sha256 = "1302663hyp2xxhaavhfky24a2p9gz23i3rykmrc6c1n23h24snri";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Better linux integration
|
||||
(fetchpatch {
|
||||
url = "https://github.com/vkohaupt/vokoscreenNG/commit/0a3784095ecca582f7eb09551ceb34c309d83637.patch";
|
||||
sha256 = "1iibimv8xfxxfk44kkbrkay37ibdndjvs9g53mxr8x8vrsp917bz";
|
||||
})
|
||||
# Adaptation of previously used https://github.com/City-busz/vokoscreenNG/commit/0a3784095ecca582f7eb09551ceb34c309d83637 patch
|
||||
# used for 3.0.5 but incompatible at least since 3.0.8. The issue is addressed here https://github.com/vkohaupt/vokoscreenNG/issues/139
|
||||
./linux-support-installation-target.patch
|
||||
];
|
||||
|
||||
qmakeFlags = [ "src/vokoscreenNG.pro" ];
|
||||
|
|
@ -42,6 +40,7 @@ mkDerivation rec {
|
|||
buildInputs = [
|
||||
gstreamer
|
||||
libX11
|
||||
pulseaudio
|
||||
qtbase
|
||||
qtmultimedia
|
||||
qtx11extras
|
||||
|
|
|
|||
|
|
@ -0,0 +1,40 @@
|
|||
Seulement dans b: patch.patch
|
||||
Seulement dans b: ..rej
|
||||
diff --color -ur a/src/vokoscreenNG.pro b/src/vokoscreenNG.pro
|
||||
--- a/src/vokoscreenNG.pro 2021-02-03 15:00:57.377401016 +0100
|
||||
+++ b/src/vokoscreenNG.pro 2021-02-03 15:09:18.141905863 +0100
|
||||
@@ -160,7 +160,32 @@
|
||||
# systrayAlternative
|
||||
include(systrayAlternative/systrayAlternative.pri)
|
||||
|
||||
+unix:!macx {
|
||||
+ isEmpty(PREFIX) {
|
||||
+ PREFIX = /usr/local
|
||||
+ }
|
||||
+ isEmpty(BINDIR) {
|
||||
+ BINDIR = $$PREFIX/bin
|
||||
+ }
|
||||
+ isEmpty(DATADIR) {
|
||||
+ DATADIR = $$PREFIX/share
|
||||
+ }
|
||||
+
|
||||
+ target.path = $$BINDIR
|
||||
+
|
||||
+ icon.files = applications/vokoscreenNG.png
|
||||
+ icon.path = $$DATADIR/icons/hicolor/256x256/apps/
|
||||
+
|
||||
+ desktop.files = applications/vokoscreenNG.desktop
|
||||
+ desktop.path = $$DATADIR/applications/
|
||||
+
|
||||
+ appdata.files = applications/vokoscreenNG.appdata.xml
|
||||
+ appdata.path = $$DATADIR/metainfo/
|
||||
+
|
||||
+ INSTALLS += target icon desktop appdata
|
||||
+}
|
||||
# ciscoOpenh264
|
||||
win32:include(ciscoOpenh264/ciscoOpenh264.pri)
|
||||
|
||||
-unix:include(wayland/wayland.pri)
|
||||
\ Pas de fin de ligne à la fin du fichier
|
||||
+unix:include(wayland/wayland.pri)
|
||||
+
|
||||
|
|
@ -38,13 +38,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "icewm";
|
||||
version = "2.0.0";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bbidulock";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-WdRAWAQEf9c66MVrLAs5VgBDK5r4JKM2GrjAV4cuGfA=";
|
||||
sha256 = "sha256-WVlp8ir7w/wv4CI11dTQZkLcnW8JYLRQ+bbz73KEcWo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config perl asciidoc ];
|
||||
|
|
|
|||
32
pkgs/data/fonts/scientifica/default.nix
Normal file
32
pkgs/data/fonts/scientifica/default.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{ lib, fetchurl }:
|
||||
|
||||
let
|
||||
version = "2.1";
|
||||
in fetchurl rec {
|
||||
name = "scientifica-${version}";
|
||||
|
||||
url = "https://github.com/NerdyPepper/scientifica/releases/download/v${version}/scientifica-v${version}.tar";
|
||||
|
||||
downloadToTemp = true;
|
||||
|
||||
recursiveHash = true;
|
||||
|
||||
sha256 = "081faa48d6g86pacmgjqa96in72rjldavnwxq6bdq2br33h3qwrz";
|
||||
|
||||
postFetch = ''
|
||||
tar xvf $downloadedFile
|
||||
mkdir -p $out/share/fonts/truetype
|
||||
mkdir -p $out/share/fonts/misc
|
||||
cp scientifica/ttf/*.ttf $out/share/fonts/truetype
|
||||
cp scientifica/otb/*.otb $out/share/fonts/misc
|
||||
cp scientifica/bdf/*.bdf $out/share/fonts/misc
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tall and condensed bitmap font for geeks";
|
||||
homepage = "https://github.com/NerdyPepper/scientifica";
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ fortuneteller2k ];
|
||||
};
|
||||
}
|
||||
|
|
@ -19,11 +19,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-sound-recorder";
|
||||
version = "3.38.0";
|
||||
version = "3.38.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "I5A/c2G+QQhw+6lHIJFnuW9JB2MGQdM8y6qOQvV0tpk=";
|
||||
sha256 = "2Z6k+WPsEInpzVl6fUQ5ihHs7xMeQUInGhyQwVuqRSE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "armadillo";
|
||||
version = "10.2.0";
|
||||
version = "10.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
|
||||
sha256 = "sha256-gvhNUmyNpyJAqwXLErPz8eZ00gzLOOAI5L9TNVsapoo=";
|
||||
sha256 = "sha256-fY500kh2mvI/yJTYu4jwXjIxeTPL5NqPPFa+j4mp/MQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cpp-utilities";
|
||||
version = "5.10.0";
|
||||
version = "5.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Martchus";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ZqpgnxI6Py+Xrf+MK852j+kE2JGFz15kWAXOqy+bjVc=";
|
||||
sha256 = "sha256-8upRrk2x2gaS+JwCmZblrRSRxy0uNfFLTW7ua2ix2wI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -1,37 +1,32 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fftw, qtbase, qmake }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, fftw, catch2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libkeyfinder";
|
||||
version = "2.1";
|
||||
version = "2.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "07kc0cl6kirgmpdgkgmp6r3yvyf7b1w569z01g8rfl1cig80qdc7";
|
||||
owner = "mixxxdj";
|
||||
repo = "libkeyfinder";
|
||||
rev = "v${version}";
|
||||
repo = "libKeyFinder";
|
||||
owner = "ibsh";
|
||||
sha256 = "005qq81xfzi1iifvpgkqpizxcrfisafq2r0cjp4fxqh1ih7bfimv";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
buildInputs = [ fftw qtbase ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace LibKeyFinder.pro \
|
||||
--replace "/usr/local" "$out" \
|
||||
--replace "-stdlib=libc++" ""
|
||||
# needed for linking libkeyfinder.so into keyfinder-tests executable
|
||||
preBuild = ''
|
||||
export LD_LIBRARY_PATH=$(pwd)
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/include/keyfinder
|
||||
install -m644 *.h $out/include/keyfinder
|
||||
mkdir -p $out/lib
|
||||
cp -a lib*.so* $out/lib
|
||||
'';
|
||||
buildInputs = [ fftw ];
|
||||
|
||||
checkInputs = [ catch2 ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Musical key detection for digital audio (C++ library)";
|
||||
homepage = "http://www.ibrahimshaath.co.uk/keyfinder/";
|
||||
homepage = "https://mixxxdj.github.io/libkeyfinder/";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qpdf";
|
||||
version = "10.0.4";
|
||||
version = "10.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qpdf";
|
||||
repo = "qpdf";
|
||||
rev = "release-qpdf-${version}";
|
||||
sha256 = "1jqijnni2pmbbdk2g3pi14178j7mls8dj2bcwf1lds5ar0ghsagc";
|
||||
sha256 = "sha256-abPT1u/ceBrE1U+omOHiU3UjLrmcpdSpe1vgar0wUGk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ perl ];
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3";
|
||||
version = "1.17.0"; # N.B: if you change this, change botocore too
|
||||
version = "1.17.1"; # N.B: if you change this, change botocore too
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Kjm9Xl8tUM6SZ9aCzJJ1D4dxOZZlAh9H6A+cjS+4EqY=";
|
||||
sha256 = "sha256-WKRA9MlqHy8HZXfHCFI3hUum20GnyR5KM/swBo+NRpI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "botocore";
|
||||
version = "1.20.0"; # N.B: if you change this, change boto3 and awscli to a matching version
|
||||
version = "1.20.1"; # N.B: if you change this, change boto3 and awscli to a matching version
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-pgjW1kS4UvPBVPxDPqrlL+u+vHxHT6j01mZ5fQkxdwo=";
|
||||
sha256 = "sha256-lIi6NeLU0XN19nuP0wDfXsL4MXopJAMpAQCcmZ1WO1k=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,6 +12,10 @@ buildPythonPackage rec {
|
|||
sha256 = "2dee9ffdd16292878336a58d04a20f0ffe95555465fee7c9bd23b3490ef2abf3";
|
||||
};
|
||||
|
||||
doCheck = false; # no tests implemented
|
||||
|
||||
pythonImportsCheck = [ "netifaces" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://alastairs-place.net/projects/netifaces/";
|
||||
description = "Portable access to network interfaces from Python";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, beautifulsoup4
|
||||
, geojson
|
||||
, lxml
|
||||
|
|
@ -13,14 +13,17 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "osmpythontools";
|
||||
version = "0.2.8";
|
||||
version = "0.2.9";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "OSMPythonTools";
|
||||
inherit version;
|
||||
sha256 = "8a33adbd266127e342d12da755075fae08f398032a6f0909b5e86bef13960a85";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mocnik-science";
|
||||
repo = "osm-python-tools";
|
||||
rev = "v${version}";
|
||||
sha256 = "1qpj03fgn8rmrg9a9vk7bw32k9hdy15g5p2q3a6q52ykpb78jdz5";
|
||||
};
|
||||
|
||||
patches = [ ./remove-test-only-dependencies.patch ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
beautifulsoup4
|
||||
geojson
|
||||
|
|
@ -32,7 +35,7 @@ buildPythonPackage rec {
|
|||
xarray
|
||||
];
|
||||
|
||||
# no tests included
|
||||
# tests touch network
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/setup.py b/setup.py
|
||||
index 801d081..6d93128 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -19,8 +19,6 @@ setup(
|
||||
'matplotlib',
|
||||
'numpy',
|
||||
'pandas',
|
||||
- 'pytest',
|
||||
- 'pytest-sugar',
|
||||
'ujson',
|
||||
'xarray',
|
||||
],
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
|
@ -8,6 +9,8 @@ buildPythonPackage rec {
|
|||
pname = "setproctitle";
|
||||
version = "1.2";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "9b4e48722dd96cbd66d5bf2eab930fff8546cd551dd8d774c8a319448bd381a6";
|
||||
|
|
|
|||
|
|
@ -4,14 +4,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sbt-extras";
|
||||
rev = "562e2f74295f9c3ba2b3c8a87f6665b171dcdf47";
|
||||
version = "2021-02-01";
|
||||
rev = "830b72140583e2790bbd3649890ac8ef5371d0c6";
|
||||
version = "2021-02-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paulp";
|
||||
repo = "sbt-extras";
|
||||
inherit rev;
|
||||
sha256 = "1787ghqc62wnhkhc6x2ly63bvkmprgifw497npx2l08d3s4q7kbk";
|
||||
sha256 = "0wq2mf8s254ns0sss5q394c1j2rnvl42x9l6kkrav505hbx0gyq6";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -38,10 +38,10 @@ let
|
|||
];
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "react-native-debugger";
|
||||
version = "0.11.5";
|
||||
version = "0.11.7";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jhen0409/react-native-debugger/releases/download/v${version}/rn-debugger-linux-x64.zip";
|
||||
sha256 = "0b917lihypx7ansy64dmwvgi943yy0n6fs8myam635bsr4l1srzb";
|
||||
sha256 = "sha256-UXKObJKk9UUgWtm8U+nXWvIJUr4NLm2f//pGTHJISYA=";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip ];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, makeDesktopItem, linkFarmFromDrvs
|
||||
, dotnet-sdk_5, dotnetPackages, dotnetCorePackages
|
||||
, dotnet-sdk_5, dotnetPackages, dotnetCorePackages, cacert
|
||||
, SDL2, libX11, ffmpeg, openal, libsoundio
|
||||
, gtk3, gobject-introspection, gdk-pixbuf, wrapGAppsHook
|
||||
}:
|
||||
|
|
@ -15,16 +15,16 @@ let
|
|||
];
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "ryujinx";
|
||||
version = "1.0.6448"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx
|
||||
version = "1.0.6498"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ryujinx";
|
||||
repo = "Ryujinx";
|
||||
rev = "9eb0ab05c6e820e113b3c61cbacd9b085b2819c4";
|
||||
sha256 = "168nm7p6lqswmsya6gf3296ligyjabqmbrdzginkcviii643yslz";
|
||||
rev = "67033ed8e05eb70860ac6af2b83deab0256c11eb";
|
||||
sha256 = "1lg0cybbrf0x3jl10jwdwcg1zyhxsqfdnwnsvdm1lah75xg15ymw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget makeWrapper wrapGAppsHook gobject-introspection gdk-pixbuf ];
|
||||
nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget cacert makeWrapper wrapGAppsHook gobject-introspection gdk-pixbuf ];
|
||||
|
||||
nugetDeps = linkFarmFromDrvs "${pname}-nuget-deps" (import ./deps.nix {
|
||||
fetchNuGet = { name, version, sha256 }: fetchurl {
|
||||
|
|
|
|||
|
|
@ -36,6 +36,3 @@ while read pkg_spec; do
|
|||
EOF
|
||||
done < <(find ./nuget_tmp.packages -name '*.nuspec' | sort)
|
||||
echo "]" >>"$deps_file"
|
||||
|
||||
popd
|
||||
rm -r "$src"
|
||||
|
|
|
|||
|
|
@ -3,24 +3,35 @@
|
|||
# Don't use this for anything important yet!
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fscryptctl-unstable";
|
||||
version = "2017-10-23";
|
||||
pname = "fscryptctl";
|
||||
version = "0.1.0";
|
||||
|
||||
goPackagePath = "github.com/google/fscrypt";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "fscryptctl";
|
||||
rev = "142326810eb19d6794793db6d24d0775a15aa8e5";
|
||||
rev = "v${version}";
|
||||
sha256 = "1853hlpklisbqnkb7a921dsf0vp2nr2im26zpmrs592cnpsvk3hb";
|
||||
};
|
||||
|
||||
makeFlags = [ "DESTDIR=$(out)/bin" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = ''
|
||||
A low-level tool that handles raw keys and manages policies for Linux
|
||||
filesystem encryption
|
||||
description = "Small C tool for Linux filesystem encryption";
|
||||
longDescription = ''
|
||||
fscryptctl is a low-level tool written in C that handles raw keys and
|
||||
manages policies for Linux filesystem encryption, specifically the
|
||||
"fscrypt" kernel interface which is supported by the ext4, f2fs, and
|
||||
UBIFS filesystems.
|
||||
fscryptctl is mainly intended for embedded systems which can't use the
|
||||
full-featured fscrypt tool, or for testing or experimenting with the
|
||||
kernel interface to Linux filesystem encryption. fscryptctl does not
|
||||
handle key generation, key stretching, key wrapping, or PAM integration.
|
||||
Most users should use the fscrypt tool instead, which supports these
|
||||
features and generally is much easier to use.
|
||||
As fscryptctl is intended for advanced users, you should read the kernel
|
||||
documentation for filesystem encryption before using fscryptctl.
|
||||
'';
|
||||
inherit (src.meta) homepage;
|
||||
license = licenses.asl20;
|
||||
|
|
|
|||
|
|
@ -1,13 +1,14 @@
|
|||
{ lib, stdenv, fetchFromGitHub, kernel, bc }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "rtl8821ce-${kernel.version}-${version}";
|
||||
version = "5.5.2_34066.20200325";
|
||||
pname = "rtl8821ce-${kernel.version}";
|
||||
version = "unstable-2020-12-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tomaspinho";
|
||||
repo = "rtl8821ce";
|
||||
rev = "8d7edbe6a78fd79cfab85d599dad9dc34138abd1";
|
||||
sha256 = "1hsf8lqjnkrkvk0gps8yb3lx72mvws6xbgkbdmgdkz7qdxmha8bp";
|
||||
rev = "14b536f0c9ad2d0abbdab8afc7ade684900ca9cf";
|
||||
sha256 = "0z7r7spsgn22gwv9pcmkdjn9ingi8jj7xkxasph8118h46fw8ip2";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "pic" ];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub
|
||||
, autoreconfHook269, util-linux, nukeReferences, coreutils
|
||||
, perl, buildPackages
|
||||
, perl, buildPackages, nixosTests
|
||||
, configFile ? "all"
|
||||
|
||||
# Userspace dependencies
|
||||
|
|
@ -157,6 +157,13 @@ let
|
|||
|
||||
outputs = [ "out" ] ++ optionals buildUser [ "lib" "dev" ];
|
||||
|
||||
passthru.tests = if isUnstable then
|
||||
[ nixosTests.zfs.unstable ]
|
||||
else [
|
||||
nixosTests.zfs.installer
|
||||
nixosTests.zfs.stable
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "ZFS Filesystem Linux Kernel module";
|
||||
longDescription = ''
|
||||
|
|
|
|||
|
|
@ -96,22 +96,43 @@ in with py.pkgs; buildPythonApplication rec {
|
|||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
# From setup.py
|
||||
aiohttp astral async-timeout attrs bcrypt certifi ciso8601 httpx jinja2
|
||||
pyjwt cryptography pip python-slugify pytz pyyaml requests ruamel_yaml
|
||||
setuptools voluptuous voluptuous-serialize yarl
|
||||
# From default_config. dhcp, frontend, http, image, mobile_app and
|
||||
# recorder components as well as the auth.mfa_modules.totp module
|
||||
aiohttp-cors aiohue defusedxml distro emoji hass-frontend pynacl pillow pyotp
|
||||
pyqrcode scapy sqlalchemy python-openzwave-mqtt
|
||||
# Only packages required in setup.py + hass-frontend
|
||||
aiohttp
|
||||
astral
|
||||
async-timeout
|
||||
attrs
|
||||
bcrypt
|
||||
certifi
|
||||
ciso8601
|
||||
cryptography
|
||||
hass-frontend
|
||||
httpx
|
||||
jinja2
|
||||
pip
|
||||
pyjwt
|
||||
python-slugify
|
||||
pytz
|
||||
pyyaml
|
||||
requests
|
||||
ruamel_yaml
|
||||
voluptuous
|
||||
voluptuous-serialize
|
||||
yarl
|
||||
] ++ componentBuildInputs ++ extraBuildInputs;
|
||||
|
||||
# upstream only tests on Linux, so do we.
|
||||
doCheck = stdenv.isLinux;
|
||||
|
||||
checkInputs = [
|
||||
asynctest pytestCheckHook pytest-aiohttp pytest_xdist requests-mock hass-nabucasa netdisco pydispatcher
|
||||
];
|
||||
# test infrastructure
|
||||
asynctest
|
||||
pytest-aiohttp
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
requests-mock
|
||||
# component dependencies
|
||||
pyotp
|
||||
] ++ lib.concatMap (component: getPackages component py.pkgs) componentTests;
|
||||
|
||||
# We cannot test all components, since they'd introduce lots of dependencies, some of which are unpackaged,
|
||||
# but we should test very common stuff, like what's in `default_config`.
|
||||
|
|
@ -131,6 +152,7 @@ in with py.pkgs; buildPythonApplication rec {
|
|||
"history"
|
||||
"homeassistant"
|
||||
"http"
|
||||
"hue"
|
||||
"input_boolean"
|
||||
"input_datetime"
|
||||
"input_text"
|
||||
|
|
@ -154,6 +176,7 @@ in with py.pkgs; buildPythonApplication rec {
|
|||
"websocket_api"
|
||||
"zeroconf"
|
||||
"zone"
|
||||
"zwave"
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "grafana";
|
||||
version = "7.3.7";
|
||||
version = "7.4.0";
|
||||
|
||||
excludedPackages = [ "release_publisher" ];
|
||||
|
||||
|
|
@ -10,25 +10,25 @@ buildGoModule rec {
|
|||
rev = "v${version}";
|
||||
owner = "grafana";
|
||||
repo = "grafana";
|
||||
sha256 = "134x2jqrczp5qfa2rmqc7jikv3w258kks532jp1qi65qk7w7jhb9";
|
||||
sha256 = "0mdk3f237gvyjw8fxppfwzs8smhrnrj5aqc2wsykclrl52h5mv2z";
|
||||
};
|
||||
|
||||
srcStatic = fetchurl {
|
||||
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
|
||||
sha256 = "052r9gajggd9jlwnl82hq0jflhlz7cbdflkjapq4nx3rpnfscqgp";
|
||||
sha256 = "1dc03d5hg7f2s9lrqycxm08ry8plkx8lkrfm4q3gjk1cvf5zjwzd";
|
||||
};
|
||||
|
||||
vendorSha256 = "0474d5y40q7i7k1gm1k7ac1dqhizvqql8w9nn44qxb7g2w2bfqiv";
|
||||
vendorSha256 = "0m39dw4raqzm7zxcbncdxf7br5j173czl62xsp94q4g2h719mc9a";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pkg/cmd/grafana-server/main.go \
|
||||
--replace 'var version = "5.0.0"' 'var version = "${version}"'
|
||||
'';
|
||||
|
||||
# fixes build failure with go 1.15:
|
||||
# main module (github.com/grafana/grafana) does not contain package github.com/grafana/grafana/scripts/go
|
||||
# main module (github.com/grafana/grafana) does not contain package github.com/grafana/grafana/dashboard-schemas
|
||||
preBuild = ''
|
||||
rm -rf scripts/go
|
||||
rm -r dashboard-schemas scripts/go
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "rtsp-simple-server";
|
||||
version = "0.12.2";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aler9";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "094brxiiapm7402q0ysaha2xk3wymc2kz8vqisjyiswz7wf4wsx0";
|
||||
sha256 = "sha256-9PjITPuCndz/EuFEt9docmWN93TwZQbnyHV161hUwS0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "007dyw825jsfma7sq5llxllhrzbkhqxr985s1nhg5cdd803gz42p";
|
||||
vendorSha256 = "sha256-6tp1hN1dRKm523IegMpsTO+/gktywqdNZflUbE4TPuU=";
|
||||
|
||||
# Tests need docker
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -28,11 +28,11 @@ let
|
|||
|
||||
in with py.pkgs; buildPythonApplication rec {
|
||||
pname = "awscli";
|
||||
version = "1.19.0"; # N.B: if you change this, change botocore to a matching version too
|
||||
version = "1.19.1"; # N.B: if you change this, change botocore to a matching version too
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-K9wu8zD5M02+77kclCBh/ralNka9VcZj4AVvjQ3Gb+0=";
|
||||
sha256 = "sha256-8T0zFxR7hLdt2ZZvkshckIO2XNGZIbQuwfeGxqQs7rs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,6 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, e2fsprogs }:
|
||||
{ lib, stdenv, fetchurl, installShellFiles, e2fsprogs }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
let
|
||||
manpage = fetchurl {
|
||||
url = "https://manpages.ubuntu.com/manpages.gz/xenial/man8/zerofree.8.gz";
|
||||
sha256 = "0y132xmjl02vw41k794psa4nmjpdyky9f6sf0h4f7rvf83z3zy4k";
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "zerofree";
|
||||
version = "1.1.1";
|
||||
|
||||
|
|
@ -9,12 +14,14 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0rrqfa5z103ws89vi8kfvbks1cfs74ix6n1wb6vs582vnmhwhswm";
|
||||
};
|
||||
|
||||
buildInputs = [ e2fsprogs ];
|
||||
buildInputs = [ e2fsprogs installShellFiles ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/bin $out/share/zerofree
|
||||
cp zerofree $out/bin
|
||||
'';
|
||||
cp COPYING $out/share/zerofree/COPYING
|
||||
installManPage ${manpage}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://frippery.org/uml/";
|
||||
|
|
|
|||
|
|
@ -11,17 +11,17 @@ let
|
|||
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
pname = "esphome";
|
||||
version = "1.15.3";
|
||||
version = "1.16.0";
|
||||
|
||||
src = python.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a75b53e76fb8b4b394eca18fe74f622ca740bc13b7cbc02e6af5f50126b7aa0b";
|
||||
sha256 = "0pvwzkdcpjqdf7lh1k3xv1la5v60lhjixzykapl7f2xh71fbm144";
|
||||
};
|
||||
|
||||
ESPHOME_USE_SUBPROCESS = "";
|
||||
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
voluptuous pyyaml paho-mqtt colorlog
|
||||
voluptuous pyyaml paho-mqtt colorlog colorama
|
||||
tornado protobuf tzlocal pyserial ifaddr
|
||||
protobuf click
|
||||
];
|
||||
|
|
@ -49,6 +49,6 @@ in python.pkgs.buildPythonApplication rec {
|
|||
description = "Make creating custom firmwares for ESP32/ESP8266 super easy";
|
||||
homepage = "https://esphome.io/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dotlambda globin ];
|
||||
maintainers = with maintainers; [ dotlambda globin elseym ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osm2pgsql";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openstreetmap";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1if76vw9jkc9jn4v0vvgwnpscjckk2cap93a8iqah8mqzx233y8s";
|
||||
sha256 = "0ld43k7xx395hd6kcn8wyacvb1cfjy670lh9w6yhfi78nxqj9mmy";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -1,22 +1,24 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, libusb1
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "uhubctl";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mvp";
|
||||
repo = "uhubctl";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "0pimhw2a2wfg7nh1ahsxmzkb0j6bbncwdqsvyp8l23zhs5kx7wm9";
|
||||
rev = "v${version}";
|
||||
sha256 = "1wxsiygw6gwv1h90yassnxylkyi2dfz7y59qkmb7rs8a8javj7nv";
|
||||
};
|
||||
|
||||
buildInputs = [ libusb1 ];
|
||||
|
||||
installFlags = [ "prefix=${placeholder "out"}" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/mvp/uhubctl";
|
||||
description = "Utility to control USB power per-port on smart USB hubs";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib, stdenv, fetchgit, python, libev, wafHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "weighttp";
|
||||
version = "0.4";
|
||||
|
|
@ -10,11 +11,13 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ wafHook ];
|
||||
|
||||
buildInputs = [ python libev ];
|
||||
|
||||
meta = {
|
||||
platforms = lib.platforms.unix;
|
||||
meta = with lib; {
|
||||
description = "Lightweight and simple webserver benchmarking tool";
|
||||
homepage = "https://redmine.lighttpd.net/projects/weighttp/wiki";
|
||||
description = "A lightweight and simple webserver benchmarking tool";
|
||||
platforms = platforms.unix;
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -70,5 +70,8 @@ stdenv.mkDerivation {
|
|||
maintainers = [ lib.maintainers.eelco ];
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.gpl2;
|
||||
knownVulnerabilities = [
|
||||
"CVE-2020-25031"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "di";
|
||||
version = "4.48";
|
||||
version = "4.48.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gentoo.com/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "0crvvfsxh8ryc0j19a2x52i9zacvggm8zi6j3kzygkcwnpz4km8r";
|
||||
sha256 = "sha256-YFCFRDGeq2h/UXKme/NnnCuFdtw2Vim6Y3SbytaItGc=";
|
||||
};
|
||||
|
||||
makeFlags = [ "INSTALL_DIR=$(out)" ];
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ let
|
|||
luarepl
|
||||
luasec
|
||||
luasocket
|
||||
luautf8
|
||||
penlight
|
||||
stdlib
|
||||
vstruct
|
||||
|
|
@ -38,11 +39,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sile";
|
||||
version = "0.10.13";
|
||||
version = "0.10.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "19k4r7wfszml4dac8cm1hx9rb1im3psigcidz8bdm9j9jzpd01yj";
|
||||
sha256 = "100f6iangpiwlv8k55d134w856r0xwsgw90s1rkkmqa5syziwni5";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
|
|
|||
|
|
@ -15140,6 +15140,8 @@ in
|
|||
|
||||
libkate = callPackage ../development/libraries/libkate { };
|
||||
|
||||
libkeyfinder = callPackage ../development/libraries/libkeyfinder { };
|
||||
|
||||
libkml = callPackage ../development/libraries/libkml { };
|
||||
|
||||
libksba = callPackage ../development/libraries/libksba { };
|
||||
|
|
@ -20762,6 +20764,8 @@ in
|
|||
inter-ui = callPackage ../data/fonts/inter-ui { };
|
||||
inter = callPackage ../data/fonts/inter { };
|
||||
|
||||
scientifica = callPackage ../data/fonts/scientifica { };
|
||||
|
||||
siji = callPackage ../data/fonts/siji
|
||||
{ inherit (buildPackages.xorg) mkfontscale fonttosfnt; };
|
||||
|
||||
|
|
@ -23061,7 +23065,7 @@ in
|
|||
|
||||
keyfinder = libsForQt5.callPackage ../applications/audio/keyfinder { };
|
||||
|
||||
keyfinder-cli = libsForQt5.callPackage ../applications/audio/keyfinder-cli { };
|
||||
keyfinder-cli = callPackage ../applications/audio/keyfinder-cli { };
|
||||
|
||||
kgraphviewer = libsForQt5.callPackage ../applications/graphics/kgraphviewer { };
|
||||
|
||||
|
|
@ -24108,8 +24112,8 @@ in
|
|||
osmo = callPackage ../applications/office/osmo { };
|
||||
|
||||
palemoon = callPackage ../applications/networking/browsers/palemoon {
|
||||
# https://www.palemoon.org/sourcecode.shtml
|
||||
stdenv = gcc7Stdenv;
|
||||
# https://developer.palemoon.org/build/linux/
|
||||
stdenv = gcc8Stdenv;
|
||||
};
|
||||
|
||||
webbrowser = callPackage ../applications/networking/browsers/webbrowser {};
|
||||
|
|
|
|||
|
|
@ -95,8 +95,6 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeApplications // qt5 //
|
|||
|
||||
libdbusmenu = callPackage ../development/libraries/libdbusmenu-qt/qt-5.5.nix { };
|
||||
|
||||
libkeyfinder = callPackage ../development/libraries/libkeyfinder { };
|
||||
|
||||
libktorrent = callPackage ../development/libraries/libktorrent { };
|
||||
|
||||
liblastfm = callPackage ../development/libraries/liblastfm { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue