Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-07-23 18:01:46 +00:00 committed by GitHub
commit cb1426e30a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
60 changed files with 1005 additions and 610 deletions

View file

@ -5791,6 +5791,12 @@
githubId = 278013;
name = "Tomasz Kontusz";
};
kurnevsky = {
email = "kurnevsky@gmail.com";
github = "kurnevsky";
githubId = 2943605;
name = "Evgeny Kurnevsky";
};
kuznero = {
email = "roman@kuznero.com";
github = "kuznero";
@ -5918,6 +5924,12 @@
githubId = 1104419;
name = "Lucas Hoffmann";
};
lde = {
email = "lilian.deloche@puck.fr";
github = "lde";
githubId = 1447020;
name = "Lilian Deloche";
};
ldelelis = {
email = "ldelelis@est.frba.utn.edu.ar";
github = "ldelelis";
@ -10128,6 +10140,12 @@
githubId = 1829294;
name = "Steve Chávez";
};
stevebob = {
email = "stephen@sherra.tt";
github = "stevebob";
githubId = 417118;
name = "Stephen Sherratt";
};
steveej = {
email = "mail@stefanjunker.de";
github = "steveej";

View file

@ -2,7 +2,13 @@
with lib;
let
cfg = config.services.klipper;
format = pkgs.formats.ini { mkKeyValue = generators.mkKeyValueDefault {} ":"; };
format = pkgs.formats.ini {
# https://github.com/NixOS/nixpkgs/pull/121613#issuecomment-885241996
listToValue = l:
if builtins.length l == 1 then generators.mkValueStringDefault {} (head l)
else lib.concatMapStrings (s: "\n ${generators.mkValueStringDefault {} s}") l;
mkKeyValue = generators.mkKeyValueDefault {} ":";
};
in
{
##### interface

View file

@ -441,6 +441,7 @@ in
txredisapi = handleTest ./txredisapi.nix {};
tuptime = handleTest ./tuptime.nix {};
turbovnc-headless-server = handleTest ./turbovnc-headless-server.nix {};
tuxguitar = handleTest ./tuxguitar.nix {};
ucarp = handleTest ./ucarp.nix {};
ucg = handleTest ./ucg.nix {};
udisks2 = handleTest ./udisks2.nix {};

View file

@ -40,7 +40,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
assert task_name == "Test Task"
machine.succeed("curl -sSfI http://localhost/api/tasks 2>&1 | grep '401 Unauthorized'")
machine.succeed("curl -sSI http://localhost/api/tasks 2>&1 | grep '401 Unauthorized'")
machine.shutdown()
'';

24
nixos/tests/tuxguitar.nix Normal file
View file

@ -0,0 +1,24 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "tuxguitar";
meta = with pkgs.lib.maintainers; {
maintainers = [ asbachb ];
};
machine = { config, pkgs, ... }: {
imports = [
./common/x11.nix
];
services.xserver.enable = true;
environment.systemPackages = [ pkgs.tuxguitar ];
};
testScript = ''
machine.wait_for_x()
machine.succeed("tuxguitar &")
machine.wait_for_window("TuxGuitar - Untitled.tg")
machine.sleep(1)
machine.screenshot("tuxguitar")
'';
})

View file

@ -0,0 +1,39 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, deadbeef, gtk3, perl
, libdbusmenu-glib }:
stdenv.mkDerivation rec {
pname = "deadbeef-statusnotifier-plugin";
version = "1.6";
src = fetchFromGitHub {
owner = "vovochka404";
repo = "deadbeef-statusnotifier-plugin";
rev = "v${version}";
sha256 = "sha256-6WEbY59vPNrL3W5GUwFQJimmSS+td8Ob+G46fPAxfV4=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ deadbeef gtk3 libdbusmenu-glib ];
buildFlags = [ "gtk3" ];
postPatch = ''
substituteInPlace tools/glib-mkenums \
--replace /usr/bin/perl "${perl}/bin/perl"
'';
installPhase = ''
runHook preInstall
mkdir -p $out/lib/deadbeef
cp build/sni_gtk3.so $out/lib/deadbeef
runHook postInstall
'';
meta = with lib; {
description = "DeaDBeeF StatusNotifier Plugin";
homepage = "https://github.com/vovochka404/deadbeef-statusnotifier-plugin";
license = licenses.gpl3Plus;
maintainers = [ maintainers.kurnevsky ];
platforms = platforms.linux;
};
}

View file

@ -9,17 +9,17 @@ let
in buildGoModule rec {
pname = "go-ethereum";
version = "1.10.5";
version = "1.10.6";
src = fetchFromGitHub {
owner = "ethereum";
repo = pname;
rev = "v${version}";
sha256 = "sha256:1226picbgnph71fk2y0n1hyfrh6m8sh54kgn3pmikydnw176k9j1";
sha256 = "sha256-4lapkoxSKdXlD6rmUxnlSKrfH+DeV6/wV05CqJjuzjA=";
};
runVend = true;
vendorSha256 = "sha256:1nf2gamamlgr2sl5ibib5wai1pipj66xhbhnb4s4480j5pbv9a76";
vendorSha256 = "sha256-5qi01y0SIEI0WRYu2I2RN94QFS8rrlioFvnRqqp6wtk=";
doCheck = false;

View file

@ -1,16 +1,16 @@
{ lib, stdenv, fetchurl, swt, jdk, makeWrapper, alsa-lib, jack2, fluidsynth, libpulseaudio }:
{ lib, stdenv, fetchurl, swt, jre, makeWrapper, alsa-lib, jack2, fluidsynth, libpulseaudio }:
let metadata = assert stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux";
if stdenv.hostPlatform.system == "i686-linux" then
{ arch = "x86"; sha256 = "27675c358db237df74d20e8676000c25a87b9de0bb0a6d1c325e8d6db807d296"; }
{ arch = "x86"; sha256 = "afa4b1116aee18e3ddd93132467809d0bcf03715cf9ad55b895f021a13e1cb8a"; }
else
{ arch = "x86_64"; sha256 = "298555a249adb3ad72f3aef72a124e30bfa01cd069c7b5d152a738140e7903a2"; };
{ arch = "x86_64"; sha256 = "55ab653c601727a2077080e7ea4d76fe7a897379934ed9a5b544e20d490f53f9"; };
in stdenv.mkDerivation rec {
version = "1.5.2";
version = "1.5.4";
pname = "tuxguitar";
src = fetchurl {
url = "mirror://sourceforge/tuxguitar/${pname}-${version}-linux-${metadata.arch}.tar.gz";
url = "mirror://sourceforge/${pname}/${pname}-${version}-linux-${metadata.arch}.tar.gz";
sha256 = metadata.sha256;
};
@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
ln -s $out/share $out/bin/share
wrapProgram $out/bin/tuxguitar \
--set JAVA "${jdk}/bin/java" \
--set JAVA "${jre}/bin/java" \
--prefix LD_LIBRARY_PATH : "$out/lib/:${lib.makeLibraryPath [ swt alsa-lib jack2 fluidsynth libpulseaudio ]}" \
--prefix CLASSPATH : "${swt}/jars/swt.jar:$out/lib/tuxguitar.jar:$out/lib/itext.jar"
'';

View file

@ -8,13 +8,13 @@
python3Packages.buildPythonApplication rec {
pname = "bottles";
version = "3.1.6";
version = "2021.7.14-treviso";
src = fetchFromGitHub {
owner = "bottlesdevs";
repo = pname;
rev = version;
sha256 = "1izks01010akjf83xvi70dr4yzgk6yr84kd0slzz22yq204pdh5m";
sha256 = "0xhfk1ll8vacgrr0kkhynq4bryjhfjs29j824bark5mj9b6lkbix";
};
postPatch = ''
@ -44,6 +44,8 @@ python3Packages.buildPythonApplication rec {
];
propagatedBuildInputs = with python3Packages; [
pyyaml
requests
pycairo
pygobject3
lxml

View file

@ -0,0 +1,45 @@
{ lib, stdenv, fetchFromGitHub, addOpenGLRunpath, cudatoolkit }:
stdenv.mkDerivation rec {
pname = "gpu-burn";
version = "unstable-2021-04-29";
src = fetchFromGitHub {
owner = "wilicc";
repo = "gpu-burn";
rev = "1e9a84f4bec3b0835c00daace45d79ed6c488edb";
sha256 = "sha256-x+kta81Z08PsBgbf+fzRTXhNXUPBd5w8bST/T5nNiQA=";
};
postPatch = ''
substituteInPlace gpu_burn-drv.cpp \
--replace "const char *kernelFile = \"compare.ptx\";" \
"const char *kernelFile = \"$out/share/compare.ptx\";"
'';
buildInputs = [ cudatoolkit ];
nativeBuildInputs = [ addOpenGLRunpath ];
makeFlags = [ "CUDAPATH=${cudatoolkit}" ];
LDFLAGS = "-L${cudatoolkit}/lib/stubs";
installPhase = ''
mkdir -p $out/{bin,share}
cp gpu_burn $out/bin/
cp compare.ptx $out/share/
'';
postFixup = ''
addOpenGLRunpath $out/bin/gpu_burn
'';
meta = with lib; {
homepage = "http://wili.cc/blog/gpu-burn.html";
description = "Multi-GPU CUDA stress test";
platforms = platforms.linux;
maintainers = with maintainers; [ elohmeier ];
license = licenses.bsd2;
};
}

View file

@ -12,18 +12,27 @@ let
sha256 = "ebbb777cbf9312359b897bf81ba00dae0f5cb69fba2a18265dcc18a6f5ef7519";
};
});
flask_migrate = super.flask_migrate.overridePythonAttrs (oldAttrs: rec {
version = "2.7.0";
src = oldAttrs.src.override {
inherit version;
sha256 = "ae2f05671588762dd83a21d8b18c51fe355e86783e24594995ff8d7380dffe38";
};
});
werkzeug = self.callPackage ../../../development/python-modules/werkzeug/1.nix { };
flask = self.callPackage ../../../development/python-modules/flask/1.nix { };
};
};
in
python3'.pkgs.buildPythonPackage rec {
pname = "privacyIDEA";
version = "3.6";
version = "3.6.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-yywkQ3TdBzRMbJGY0Seaprztgt0JrCAbgqosMQ5fcQM=";
sha256 = "sha256-NRfTEZ/6K6xLP+wcT6o54wqk/EyWTiiC9W1KDgaAEbg=";
fetchSubmodules = true;
};

View file

@ -84,7 +84,7 @@ mkChromiumDerivation (base: rec {
else "https://www.chromium.org/";
maintainers = with maintainers; if ungoogled
then [ squalus primeos ]
else [ primeos thefloweringash bendlas ];
else [ primeos thefloweringash ];
license = if enableWideVine then licenses.unfree else licenses.bsd3;
platforms = platforms.linux;
mainProgram = "chromium";

View file

@ -7,10 +7,10 @@ in
rec {
firefox = common rec {
pname = "firefox";
ffversion = "90.0.1";
ffversion = "90.0.2";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "9f87c3f3dad33e42a7a9d2161d7f23ff2e7184b2274f9081511c7982957ae9954784bd844a2348ff4744231415aac195d1f12971392db90be0375b4738acb590";
sha512 = "4fda0b1e666fb0b1d846708fad2b48a5b53d48e7fc2a5da1f234b5b839c55265b41f6509e6b506d5e8a7455f816dfa5ab538589bc9e83b7e3846f0f72210513e";
};
meta = {

View file

@ -2,18 +2,18 @@
buildGoModule rec {
pname = "argocd";
version = "2.0.4";
commit = "0842d448107eb1397b251e63ec4d4bc1b4efdd6e";
version = "2.0.5";
commit = "4c94d886f56bcb2f9d5b3251fdc049c2d1354b88";
tag = "v${version}";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo-cd";
rev = tag;
sha256 = "sha256-SKSAJtp20f6A+CvrsBEmbcNJAKI5b4Wm4K0cr/lGo64=";
sha256 = "sha256-8YymSR15e+6gGGqr5CH4ERHN8RO3wd9NJkM9K7InlFU=";
};
vendorSha256 = "sha256-RbEqivzTpXVQp4zl0zZWAh6qCr2KZSJ6Bj2pZaClQaQ=";
vendorSha256 = "sha256-9dVkGl0gjjMehG2nt1eNpNT5fD9GbJ1mNMzYS8FTm08=";
nativeBuildInputs = [ packr makeWrapper installShellFiles ];

View file

@ -44,12 +44,21 @@ with lib;
# Those pieces of software we entirely ignore upstream's handling of, and just
# make sure they're in the path if desired.
let
k3sVersion = "1.21.2+k3s1"; # k3s git tag
k3sCommit = "5a67e8dc473f8945e8e181f6f0b0dbbc387f6fca"; # k3s git commit at the above version
k3sVersion = "1.21.3+k3s1"; # k3s git tag
k3sCommit = "1d1f220fbee9cdeb5416b76b707dde8c231121f2"; # k3s git commit at the above version
traefikChartVersion = "9.18.2"; # taken from ./scripts/download at TRAEFIK_VERSION
k3sRootVersion = "0.8.1"; # taken from ./scripts/download at ROOT_VERSION
k3sRootVersion = "0.9.1"; # taken from ./scripts/download at ROOT_VERSION
k3sCNIVersion = "0.8.6-k3s1"; # taken from ./scripts/version.sh at VERSION_CNIPLUGINS
baseMeta = {
description = "A lightweight Kubernetes distribution";
license = licenses.asl20;
homepage = "https://k3s.io";
maintainers = with maintainers; [ euank superherointj ];
platforms = platforms.linux;
};
# bundled into the k3s binary
traefikChart = fetchurl {
url = "https://helm.traefik.io/traefik/traefik-${traefikChartVersion}.tgz";
@ -67,7 +76,7 @@ let
k3sRoot = fetchzip {
# Note: marked as apache 2.0 license
url = "https://github.com/k3s-io/k3s-root/releases/download/v${k3sRootVersion}/k3s-root-amd64.tar";
sha256 = "sha256-r3Nkzl9ccry7cgD3YWlHvEWOsWnnFGIkyRH9sx12gks=";
sha256 = "sha256-qI84KYJKY/T6pqWZW9lOTq5NzZiu//v1zrMzUCiRTGQ=";
stripRoot = false;
};
k3sPlugins = buildGoPackage rec {
@ -84,12 +93,8 @@ let
sha256 = "sha256-uAy17eRRAXPCcnh481KxFMvFQecnnBs24jn5YnVNfY4=";
};
meta = {
meta = baseMeta // {
description = "CNI plugins, as patched by rancher for k3s";
license = licenses.asl20;
homepage = "https://k3s.io";
maintainers = [ maintainers.euank ];
platforms = platforms.linux;
};
};
# Grab this separately from a build because it's used by both stages of the
@ -97,7 +102,7 @@ let
k3sRepo = fetchgit {
url = "https://github.com/k3s-io/k3s";
rev = "v${k3sVersion}";
sha256 = "sha256-ZRkdHQ4RJ6XqE+DKE6wwpxetuKDG3k/4HaHyFxHev1U=";
sha256 = "sha256-K4HVXFp5cpByEO4dUwmpzOuhsGh1k7X6k5aShCorTjg=";
};
# Stage 1 of the k3s build:
# Let's talk about how k3s is structured.
@ -161,12 +166,8 @@ let
popd
'';
meta = {
meta = baseMeta // {
description = "The various binaries that get packaged into the final k3s binary";
license = licenses.asl20;
homepage = "https://k3s.io";
maintainers = [ maintainers.euank ];
platforms = platforms.linux;
};
};
k3sBin = buildGoPackage rec {
@ -228,12 +229,8 @@ let
popd
'';
meta = {
meta = baseMeta // {
description = "The k3s go binary which is used by the final wrapped output below";
license = licenses.asl20;
homepage = "https://k3s.io";
maintainers = [ maintainers.euank ];
platforms = platforms.linux;
};
};
in
@ -241,7 +238,7 @@ stdenv.mkDerivation rec {
pname = "k3s";
version = k3sVersion;
# Important utilities used by the kubelet, see
# Important utilities used by the kubelet, see
# https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-237202494
# Note the list in that issue is stale and some aren't relevant for k3s.
k3sRuntimeDeps = [
@ -279,11 +276,10 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
meta = {
description = "A lightweight Kubernetes distribution";
license = licenses.asl20;
homepage = "https://k3s.io";
maintainers = [ maintainers.euank ];
platforms = platforms.linux;
};
doInstallCheck = true;
installCheckPhase = ''
$out/bin/k3s --version | grep v${k3sVersion} > /dev/null
'';
meta = baseMeta;
}

View file

@ -161,11 +161,11 @@
md5name = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a-libetonyek-0.1.9.tar.xz";
}
{
name = "expat-2.2.8.tar.bz2";
url = "https://dev-www.libreoffice.org/src/expat-2.2.8.tar.bz2";
sha256 = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102";
name = "expat-2.4.1.tar.bz2";
url = "https://dev-www.libreoffice.org/src/expat-2.4.1.tar.bz2";
sha256 = "2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40";
md5 = "";
md5name = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102-expat-2.2.8.tar.bz2";
md5name = "2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40-expat-2.4.1.tar.bz2";
}
{
name = "Firebird-3.0.0.32483-0.tar.bz2";
@ -567,11 +567,11 @@
md5name = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8-xmlsec1-1.2.30.tar.gz";
}
{
name = "libxml2-2.9.10.tar.gz";
url = "https://dev-www.libreoffice.org/src/libxml2-2.9.10.tar.gz";
sha256 = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f";
name = "libxml2-2.9.12.tar.gz";
url = "https://dev-www.libreoffice.org/src/libxml2-2.9.12.tar.gz";
sha256 = "c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92";
md5 = "";
md5name = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f-libxml2-2.9.10.tar.gz";
md5name = "c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92-libxml2-2.9.12.tar.gz";
}
{
name = "libxslt-1.1.34.tar.gz";

View file

@ -8,7 +8,7 @@ rec {
major = "7";
minor = "1";
patch = "4";
patch = "5";
tweak = "2";
subdir = "${major}.${minor}.${patch}";
@ -17,13 +17,13 @@ rec {
src = fetchurl {
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
sha256 = "1jsskhnlyra7q6d12kkc8dxq5fgrnd8grl32bdck7j9hkwv6d13m";
sha256 = "1kl54ddpvmrcs4r1vd4dfzg5a8im0kijhaqdg37zvgb5fqv31bxf";
};
# FIXME rename
translations = fetchSrc {
name = "translations";
sha256 = "0cslzhp5ic1w7hnl6wbyxrxhczdmap1g1hh1nj9sgpw9iqdryqj7";
sha256 = "0nf5s012l7mkpd1srvijl9q6x8f7svm6i84bj75dwyvipkg40rxq";
};
# the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from
@ -31,6 +31,6 @@ rec {
help = fetchSrc {
name = "help";
sha256 = "091yhm1qkxgvv130a1yzmmikchvxvp8109mcdrlpybp4gc276l8q";
sha256 = "1m1hxbhrkaynpcps77rym1d0kwl380jv1p7b6ibfl4by0ii2j16a";
};
}

View file

@ -0,0 +1,26 @@
{ lib, fetchFromGitHub, python3Packages }:
python3Packages.buildPythonPackage rec {
pname = "nengo-gui";
version = "0.4.8";
src = fetchFromGitHub {
owner = "nengo";
repo = "nengo-gui";
rev = "v${version}";
sha256 = "1awb0h2l6yifb77zah7a4qzxqvkk4ac5fynangalidr10sk9rzk3";
};
propagatedBuildInputs = with python3Packages; [ nengo ];
# checks req missing:
# pyimgur
doCheck = false;
meta = with lib; {
description = "Nengo interactive visualizer";
homepage = "https://nengo.ai/";
license = licenses.unfreeRedistributable;
maintainers = with maintainers; [ arjix ];
};
}

View file

@ -18,10 +18,7 @@ stdenv.mkDerivation rec {
version = "2.15.1";
src = fetchurl {
urls =
[
"https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz"
];
url = "https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz";
name = "${pname}-${version}.tar.gz";
sha256 = "sha256-gNJ5I8ZjsqLHEPiujNVJhi4E+MBChXBidMNK48jKF9E=";
};

View file

@ -1,6 +1,9 @@
{ lib, buildPythonApplication, fetchPypi
, installShellFiles, pbr
, flake8, mock, pycodestyle, pylint, tox }:
, flake8, mock, pycodestyle, pylint, tox
, nix-update-script
, testVersion, git-machete
}:
buildPythonApplication rec {
pname = "git-machete";
@ -23,6 +26,18 @@ buildPythonApplication rec {
installShellCompletion --zsh --name _git-machete completion/git-machete.completion.zsh
'';
passthru = {
updateScript = nix-update-script {
attrPath = pname;
};
tests = {
version = testVersion {
package = git-machete;
};
};
};
meta = with lib; {
homepage = "https://github.com/VirtusLab/git-machete";
description = "Git repository organizer and rebase/merge workflow automation tool";

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "matcha-gtk-theme";
version = "2021-07-08";
version = "2021-07-20";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
sha256 = "sha256-iTwPN31JvpFlCBWikOeSTda2wBEtg6ygy8o6ovqHPCw=";
sha256 = "0shdkwpqj3fw5qr99ww4z5dyrpa2pq79s0i02p9j3v6w6aca2gic";
};
buildInputs = [ gdk-pixbuf librsvg ];

View file

@ -1,16 +1,14 @@
{ lib, mkDerivation, fetchFromGitHub, ghc, glibcLocales }:
mkDerivation rec {
# Version 0.2 is meant to be used with the Agda 2.6.1 compiler.
pname = "cubical";
version = "0.2";
version = "0.3pred5030a9";
src = fetchFromGitHub {
repo = pname;
owner = "agda";
rev = "v${version}";
sha256 = "07qlp2f189jvzbn3aqvpqk2zxpkmkxhhkjsn62iq436kxqj3z6c2";
rev = "d5030a9c89070255fc575add4e9f37b97e6a0c0c";
sha256 = "18achbxap4ikydigmz3m3xjfn3i9dw4rn8yih82vrlc01j02nqpi";
};
LC_ALL = "en_US.UTF-8";

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "armadillo";
version = "10.5.3";
version = "10.6.1";
src = fetchurl {
url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
sha256 = "sha256-5sUdjVKm94ucZFn2mGE1CT4O5wWmdDBxEPYXXyzV7jc=";
sha256 = "sha256-HQbDI31lx7xGHqEvT9/YtaabapZbSQCucJYM6SCIF58=";
};
nativeBuildInputs = [ cmake ];

View file

@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "fcft";
version = "2.4.3";
version = "2.4.4";
src = fetchzip {
url = "https://codeberg.org/dnkl/fcft/archive/${version}.tar.gz";
sha256 = "0hxvd6xbvgq1rk8851gswffmvh3fv41lyvz4fhwzln7m12759yw8";
sha256 = "0ycc2xy9jhxcxwbfk9d4jdxgf2zsc664phbf859kshb822m3jf57";
};
depsBuildBuild = [ pkg-config ];

View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "intel-media-driver";
version = "21.2.3";
version = "21.3.0";
src = fetchFromGitHub {
owner = "intel";
repo = "media-driver";
rev = "intel-media-${version}";
sha256 = "0nldd1yfyvwnpkh0v3ni09z2zwmj84px0pcd1w50brvny36r814c";
sha256 = "1byliq1c80xfklm3d2d910j1i7s7pfi3i3c6baigag1kzgc0apd0";
};
cmakeFlags = [

View file

@ -21,6 +21,7 @@ stdenv.mkDerivation {
src = fetchurl {
inherit (s) url sha256;
};
enableParallelBuilding = true;
meta = {
inherit (s) version;
description = "Import library for some old mac text documents";

View file

@ -48,7 +48,7 @@ let
self = stdenv.mkDerivation rec {
pname = "pipewire";
version = "0.3.31";
version = "0.3.32";
outputs = [
"out"
@ -66,7 +66,7 @@ let
owner = "pipewire";
repo = "pipewire";
rev = version;
sha256 = "1dirz69ami7bcgy6hhh0ffi9gzwcy9idg94nvknwvwkjw4zm8m79";
sha256 = "0f5hkypiy1qjqj3frzz128668hzbi0fqmj0j21z7rp51y62dapnp";
};
patches = [

View file

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "aiorecollect";
version = "1.0.5";
version = "1.0.6";
format = "pyproject";
src = fetchFromGitHub {
owner = "bachya";
repo = pname;
rev = version;
sha256 = "0h76l0pahnmls0radknzm8dw79qx9dv0xhxqnn6011j9fwyviyqm";
sha256 = "0vm19rcy14fdsfddjskxh0nlph10jrj3qh6xqwv73wgcmbdpr91i";
};
nativeBuildInputs = [

View file

@ -1,16 +1,36 @@
{ lib, fetchPypi, buildPythonPackage, astunparse }:
{ lib
, fetchFromGitHub
, fetchpatch
, buildPythonPackage
, astunparse
}:
buildPythonPackage rec {
pname = "gast";
version = "0.5.0";
src = fetchPypi {
inherit pname version;
sha256 = "8109cbe7aa0f7bf7e4348379da05b8137ea1f059f073332c3c1cedd57db8541f";
version = "0.5.0";
# TODO: remove this patch on the next release, this fixes a bug with parsing
# assignment expressions e.g., `x := 1`.
patches = [
(fetchpatch {
url = "https://github.com/serge-sans-paille/gast/commit/3cc9b4d05a80e4bb42882de00df314aaa1e6e591.patch";
sha256 = "0ylpn0x0a4y6139vd048blsh77yd08npjcn4b5ydf89xnji5mlm1";
})
];
src = fetchFromGitHub {
owner = "serge-sans-paille";
repo = "gast";
rev = version;
sha256 = "0qsg36knv0k2ppzbr5m4w6spxxw7a77lw88y8vjx7m176bajnsbw";
};
checkInputs = [ astunparse ] ;
checkInputs = [ astunparse ];
meta = with lib; {
description = "GAST provides a compatibility layer between the AST of various Python versions, as produced by ast.parse from the standard ast module.";
homepage = "https://github.com/serge-sans-paille/gast/";
license = licenses.bsd3;
maintainers = with maintainers; [ jyp ];
maintainers = with maintainers; [ jyp cpcloud ];
};
}

View file

@ -0,0 +1,31 @@
{ lib
, buildPythonPackage
, fetchPypi
, six
}:
buildPythonPackage rec {
pname = "graphqlclient";
version = "0.2.4";
src = fetchPypi {
inherit pname version;
sha256 = "0b6r3ng78qsn7c9zksx4rgdkmp5296d40kbmjn8q614cz0ymyc5k";
};
propagatedBuildInputs = [
six
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "graphqlclient" ];
meta = with lib; {
description = "Simple GraphQL client for Python";
homepage = "https://github.com/prisma-labs/python-graphql-client";
license = licenses.mit;
maintainers = with maintainers; [ lde ];
};
}

View file

@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "holidays";
version = "0.11.1";
version = "0.11.2";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-f6/YRvZ/Drfh+cGcOPSnlnvweu1d7S3XqKovk3sOoBs=";
sha256 = "0nqxan6nr3jp63i3sbb9s1v5dlig22bl927a6pl1ahks8cnr7rkn";
};
propagatedBuildInputs = [

View file

@ -0,0 +1,24 @@
{ buildPythonPackage, fetchFromGitHub, pytestCheckHook, lib }:
buildPythonPackage rec {
pname = "leb128";
version = "1.0.4";
# fetchPypi doesn't include files required for tests
src = fetchFromGitHub {
owner = "mohanson";
repo = "leb128";
rev = "v${version}";
sha256 = "040l6fxyzqal841kirf783kk1840gcy1gjd374jfr46v96qc8scm";
};
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "leb128" ];
meta = with lib; {
description = "A utility to encode and decode Little Endian Base 128";
homepage = "https://github.com/mohanson/leb128";
license = licenses.mit;
maintainers = with maintainers; [ urlordjames ];
};
}

View file

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "nexia";
version = "0.9.9";
version = "0.9.10";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "bdraco";
repo = pname;
rev = version;
sha256 = "sha256-OamQ6p8o23lVeOB/KyNQI7G8xZaAaVNYacoRfbNKJtk=";
sha256 = "0k97i243ap1sap5smvfmpsjqzkx5adjvi14awv82pcp52ckzkbi9";
};
propagatedBuildInputs = [

View file

@ -1,9 +1,7 @@
{ stdenv
, lib
{ lib
, buildPythonPackage
, isPy3k
, fetchPypi
, pythonPackages
, sip
, qtbase
, qmake
@ -42,11 +40,8 @@ buildPythonPackage rec {
postPatch = ''
cat <<EOF >> pyproject.toml
sip-include-dirs = ["${pyqt5}/share/sip/PyQt5"]
[tool.sip.bindings.Poppler-Qt5]
include-dirs = ["${poppler.dev}/include/poppler"]
tags = ["${sip.platform_tag}"]
EOF
'';

View file

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "pylitterbot";
version = "2021.5.0";
version = "2021.7.2";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "natekspencer";
repo = pname;
rev = version;
sha256 = "sha256-EiHdyjGYddtvciiwu2kpIBfUGvIJr38/8oJLFVzoRKE=";
sha256 = "0hnjqj9n2sq1jhiwdrw2aayhyz94cwjxniiak2h1nxh2q0nzigh3";
};
propagatedBuildInputs = [

View file

@ -16,6 +16,8 @@ buildPythonPackage rec {
# no tests
doCheck = false;
pythonImportsCheck = [ "pyls_isort" ];
propagatedBuildInputs = [
isort python-lsp-server
];

View file

@ -17,7 +17,29 @@ buildPythonPackage rec {
propagatedBuildInputs = [ itsdangerous ];
checkInputs = [ pytestCheckHook requests hypothesis pytest-timeout ];
disabledTests = lib.optionals stdenv.isDarwin [
disabledTests = [
"test_save_to_pathlib_dst"
"test_cookie_maxsize"
"test_cookie_samesite_attribute"
"test_cookie_samesite_invalid"
"test_range_parsing"
"test_content_range_parsing"
"test_http_date_lt_1000"
"test_best_match_works"
"test_date_to_unix"
"test_easteregg"
# Seems to be a problematic test-case:
#
# > warnings.warn(pytest.PytestUnraisableExceptionWarning(msg))
# E pytest.PytestUnraisableExceptionWarning: Exception ignored in: <_io.FileIO [closed]>
# E
# E Traceback (most recent call last):
# E File "/nix/store/cwv8aj4vsqvimzljw5dxsxy663vjgibj-python3.9-Werkzeug-1.0.1/lib/python3.9/site-packages/werkzeug/formparser.py", line 318, in parse_multipart_headers
# E return Headers(result)
# E ResourceWarning: unclosed file <_io.FileIO name=11 mode='rb+' closefd=True>
"TestMultiPart"
] ++ lib.optionals stdenv.isDarwin [
"test_get_machine_id"
];

View file

@ -5,13 +5,13 @@
buildGoPackage rec {
pname = "tfsec";
version = "0.50.7";
version = "0.51.2";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
sha256 = "0rklv9wj8gf95ar345k3ghpg9hxjpbsi693239wdfarzbsjrlcla";
sha256 = "18qblimn78w17gydy7h9sjl9ri1wkvzi5phsqz1dkk43i3ryjg3s";
};
goPackagePath = "github.com/aquasecurity/tfsec";

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "efm-langserver";
version = "0.0.32";
version = "0.0.36";
src = fetchFromGitHub {
owner = "mattn";
repo = "efm-langserver";
rev = "v${version}";
sha256 = "sha256-zjjzdHlWEDDmPaDPuyk1ZoXwEFBogf51KjOmRmhFAdc=";
sha256 = "sha256-X2z49KmJiKh1QtcDBZcqNiMhq5deVamS47w6gyVq7Oo=";
};
vendorSha256 = "sha256-tca+1SRrFyvU8ttHmfMFiGXd1A8rQSEWm1Mc2qp0EfI=";

View file

@ -16,7 +16,6 @@ python.pkgs.buildPythonApplication rec {
postPatch = ''
substituteInPlace fdroidserver/common.py --replace "FDROID_PATH = os.path.realpath(os.path.join(os.path.dirname(__file__), '..'))" "FDROID_PATH = '$out/bin'"
substituteInPlace setup.py --replace "pyasn1-modules >= 0.2.1, < 0.3" "pyasn1-modules"
'';
preConfigure = ''
@ -33,8 +32,6 @@ python.pkgs.buildPythonApplication rec {
androguard
clint
defusedxml
docker
docker-py
GitPython
libcloud
mwclient
@ -59,7 +56,7 @@ python.pkgs.buildPythonApplication rec {
homepage = "https://f-droid.org";
description = "Server and tools for F-Droid, the Free Software repository system for Android";
license = licenses.agpl3;
maintainers = [ lib.maintainers.pmiddend ];
maintainers = [ lib.maintainers.obfusk ];
};
}

View file

@ -0,0 +1,64 @@
{ lib
, stdenv
, fetchFromGitHub
, vala
, meson
, ninja
, pkg-config
, desktop-file-utils
, appstream
, python3
, shared-mime-info
, wrapGAppsHook
, gtk3
, pantheon
, libgee
}:
stdenv.mkDerivation rec {
pname = "gnonograms";
version = "1.4.5";
src = fetchFromGitHub {
owner = "jeremypw";
repo = "gnonograms";
rev = "v${version}";
sha256 = "1ly3inp6dvjrixdysz5hdfwlhbs49ks0lf8062z2iq6gaf8ivkb2";
};
postPatch = ''
patchShebangs meson/post_install.py
'';
nativeBuildInputs = [
vala
meson
ninja
pkg-config
desktop-file-utils
appstream
python3
shared-mime-info
wrapGAppsHook
];
buildInputs = [
gtk3
pantheon.granite
libgee
];
meta = with lib; {
description = "Nonograms puzzle game";
longDescription = ''
An implementation of the Japanese logic puzzle "Nonograms" written in
Vala, allowing the user to:
* Draw puzzles
* Generate random puzzles of chosen difficulty
'';
license = licenses.gpl3Plus;
maintainers = with maintainers; [ fgaz ];
homepage = "https://github.com/jeremypw/gnonograms";
platforms = platforms.all;
};
}

View file

@ -0,0 +1,55 @@
{ lib, stdenv, fetchFromGitHub
, pkg-config
, libX11, libXv
, udev
, SDL2
, gtk2, gtksourceview
, alsa-lib, libao, openal, libpulseaudio
, libicns, Cocoa, OpenAL
}:
stdenv.mkDerivation {
pname = "bsnes-hd";
version = "10.6-beta";
src = fetchFromGitHub {
owner = "DerKoun";
repo = "bsnes-hd";
rev = "beta_10_6";
sha256 = "0f3cd89fd0lqskzj98cc1pzmdbscq0psdjckp86w94rbchx7iw4h";
};
patches = [
# Replace invocation of `sips` with an equivalent invocation of `png2icns`
# while assembling the .app directory hierarchy in the macos build. The
# `sips` executable isn't in our environment during the build, but
# `png2icns` is available by way of the dependency on libicns.
./macos-replace-sips-with-png2icns.patch
# During `make install` on macos the Makefile wants to move the .app into
# the current user's home directory. This patches the Makefile such that
# the .app ends up in $(prefix)/Applications. The $(prefix) variable will
# be set to $out, so this will result in the .app ending up in the
# Applications directory in the current nix profile.
./macos-copy-app-to-prefix.patch
];
nativeBuildInputs = [ pkg-config ]
++ lib.optionals stdenv.isDarwin [ libicns ];
buildInputs = [ SDL2 libao ]
++ lib.optionals stdenv.isLinux [ libX11 libXv udev gtk2 gtksourceview alsa-lib openal libpulseaudio ]
++ lib.optionals stdenv.isDarwin [ Cocoa OpenAL ];
enableParallelBuilding = true;
makeFlags = [ "-C" "bsnes" "prefix=$(out)" ];
meta = with lib; {
description = "A fork of bsnes that adds HD video features";
homepage = "https://github.com/DerKoun/bsnes-hd";
license = licenses.gpl3Only;
maintainers = with maintainers; [ stevebob ];
platforms = platforms.unix;
};
}

View file

@ -0,0 +1,18 @@
diff --git a/bsnes/target-bsnes/GNUmakefile b/bsnes/target-bsnes/GNUmakefile
index 7a3ab9f..ec8a1a4 100644
--- a/bsnes/target-bsnes/GNUmakefile
+++ b/bsnes/target-bsnes/GNUmakefile
@@ -43,11 +43,8 @@ ifeq ($(platform),windows)
else ifeq ($(shell id -un),root)
$(error "make install should not be run as root")
else ifeq ($(platform),macos)
- mkdir -p ~/Library/Application\ Support/$(name)/
- mkdir -p ~/Library/Application\ Support/$(name)/Database/
- mkdir -p ~/Library/Application\ Support/$(name)/Firmware/
- mkdir -p ~/Library/Application\ Support/$(name)/Shaders/
- cp -R out/$(name).app /Applications/$(name).app
+ mkdir -p $(prefix)/Applications
+ cp -R out/$(name).app $(prefix)/Applications
else ifneq ($(filter $(platform),linux bsd),)
mkdir -p $(prefix)/bin/
mkdir -p $(prefix)/share/applications/

View file

@ -0,0 +1,13 @@
diff --git a/bsnes/target-bsnes/GNUmakefile b/bsnes/target-bsnes/GNUmakefile
index 4c67bde..7a3ab9f 100644
--- a/bsnes/target-bsnes/GNUmakefile
+++ b/bsnes/target-bsnes/GNUmakefile
@@ -33,7 +33,7 @@ ifeq ($(platform),macos)
cp Database/* out/$(name).app/Contents/MacOS/Database/
cp -r ../shaders/* out/$(name).app/Contents/macOS/Shaders/
cp $(ui)/resource/$(name).plist out/$(name).app/Contents/Info.plist
- sips -s format icns $(ui)/resource/$(name).png --out out/$(name).app/Contents/Resources/$(name).icns
+ png2icns out/$(name).app/Contents/Resources/$(name).icns $(ui)/resource/$(name).png
endif
verbose: hiro.verbose ruby.verbose nall.verbose all;

View file

@ -16,13 +16,13 @@ in {
};
early-access = libsForQt5.callPackage ./base.nix rec {
pname = "yuzu-ea";
version = "1855";
version = "1874";
branchName = branch;
src = fetchFromGitHub {
owner = "pineappleEA";
repo = "pineapple-src";
rev = "EA-${version}";
sha256 = "0civ63zi23cym3kii4v3aiqrsg2zzj0w6sp6sa14ixysagqxsd4a";
sha256 = "0ryrz7dl1sg30vvd7wrf05pjj8swah86055fn7qm6mr2bfslww0h";
};
};
}.${branch}

View file

@ -1,41 +0,0 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook
, openssl, libpcap, odp-dpdk, dpdk
}:
stdenv.mkDerivation rec {
pname = "ofp";
version = "2.0.0";
src = fetchFromGitHub {
owner = "OpenFastPath";
repo = "ofp";
rev = version;
sha256 = "05902593fycgkwzk5g7wzgk0k40nrrgybplkdka3rqnlj6aydhqf";
};
nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = [ openssl libpcap odp-dpdk dpdk ];
dontDisableStatic = true;
postPatch = ''
substituteInPlace configure.ac --replace m4_esyscmd m4_esyscmd_s
substituteInPlace scripts/git_hash.sh --replace /bin/bash ${stdenv.shell}
echo ${version} > .scmversion
'';
configureFlags = [
"--with-odp=${odp-dpdk}"
"--with-odp-lib=odp-dpdk"
"--disable-shared"
];
meta = with lib; {
description = "High performance TCP/IP stack";
homepage = "http://www.openfastpath.org";
license = licenses.bsd3;
platforms = [ "x86_64-linux" ];
maintainers = [ maintainers.abuibrahim ];
broken = true;
};
}

View file

@ -1,7 +1,7 @@
From 7ed6c641cc501246931721700b73f40dce7e8f4b Mon Sep 17 00:00:00 2001
From 035709eeac697945a26276cc17b996c1a0678ddc Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 22 Dec 2020 15:38:56 +0100
Subject: [PATCH 1/2] Define configs with env vars
Subject: [PATCH] Define configs with env vars
---
app.php | 4 ++--
@ -11,32 +11,32 @@ Subject: [PATCH 1/2] Define configs with env vars
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/app.php b/app.php
index 8176ebe..04432ba 100644
index 17ba6a99..89f48089 100644
--- a/app.php
+++ b/app.php
@@ -10,7 +10,7 @@ use Slim\Factory\AppFactory;
@@ -11,7 +11,7 @@ use Slim\Views\Blade;
require_once __DIR__ . '/vendor/autoload.php';
// Load config files
-require_once GROCY_DATAPATH . '/config.php';
+require_once getenv('GROCY_CONFIG_FILE');
require_once __DIR__ . '/config-dist.php'; // For not in own config defined values we use the default ones
require_once __DIR__ . '/helpers/ConfigurationValidator.php';
// Definitions for dev/demo/prerelease mode
@@ -37,7 +37,7 @@ $app = AppFactory::create();
@@ -62,7 +62,7 @@ $app = AppFactory::create();
$container = $app->getContainer();
$container->set('view', function (Container $container) {
- return new Slim\Views\Blade(__DIR__ . '/views', GROCY_DATAPATH . '/viewcache');
+ return new Slim\Views\Blade(__DIR__ . '/views', getenv('GROCY_CACHE_DIR'));
- return new Blade(__DIR__ . '/views', GROCY_DATAPATH . '/viewcache');
+ return new Blade(__DIR__ . '/views', getenv('GROCY_CACHE_DIR'));
});
$container->set('UrlManager', function (Container $container) {
return new UrlManager(GROCY_BASE_URL);
diff --git a/services/DatabaseService.php b/services/DatabaseService.php
index d1080b0..8bc4ee1 100644
index dfcd5d4b..bc8d1a1d 100644
--- a/services/DatabaseService.php
+++ b/services/DatabaseService.php
@@ -105,6 +105,6 @@ class DatabaseService
@@ -107,6 +107,6 @@ class DatabaseService
return GROCY_DATAPATH . '/grocy_' . $dbSuffix . '.db';
}
@ -45,23 +45,23 @@ index d1080b0..8bc4ee1 100644
}
}
diff --git a/services/FilesService.php b/services/FilesService.php
index 8c1483e..8f74b4b 100644
index 7d070350..fba2e923 100644
--- a/services/FilesService.php
+++ b/services/FilesService.php
@@ -70,7 +70,7 @@ class FilesService extends BaseService
{
parent::__construct();
@@ -103,7 +103,7 @@ class FilesService extends BaseService
- $this->StoragePath = GROCY_DATAPATH . '/storage';
public function GetFilePath($group, $fileName)
{
- $groupFolderPath = $this->StoragePath . '/' . $group;
+ $this->StoragePath = getenv('GROCY_STORAGE_DIR');
if (!file_exists($this->StoragePath))
if (!file_exists($groupFolderPath))
{
diff --git a/services/StockService.php b/services/StockService.php
index 4741b4b..6d4e748 100644
index f73ac5bd..6b6e693a 100644
--- a/services/StockService.php
+++ b/services/StockService.php
@@ -1374,8 +1374,7 @@ class StockService extends BaseService
@@ -1589,8 +1589,7 @@ class StockService extends BaseService
throw new \Exception('No barcode lookup plugin defined');
}
@ -72,5 +72,5 @@ index 4741b4b..6d4e748 100644
{
require_once $path;
--
2.29.2
2.31.1

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "grocy";
version = "3.0.1";
version = "3.1.0";
src = fetchurl {
url = "https://github.com/grocy/grocy/releases/download/v${version}/grocy_${version}.zip";
sha256 = "sha256-Yjxv0LcLNtpYs4ntBano9NUxwdWgF5etA/M6hUVzOa8=";
sha256 = "sha256-ohviTI2np6z+SjV2CDScouI8Lh2Ru4+CE00KlgT40i8=";
};
nativeBuildInputs = [ unzip ];

View file

@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "openldap_exporter";
version = "2.1";
version = "2.1.4";
src = fetchFromGitHub {
owner = "tomcz";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Di1GiyVp/hGCFhqxhlqJSucGZK7f/FDDUFtJRaiAZu4=";
sha256 = "sha256-G4bTYFm1Zh+7gfSIZnfrPyQ15967ebEzl33pgZu23D4=";
};
buildFlagsArray = ''

View file

@ -1,4 +1,4 @@
# frozen_string_literal: true
source "https://rubygems.org"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.53"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.54"

View file

@ -1,9 +1,9 @@
GIT
remote: https://github.com/rapid7/metasploit-framework
revision: b7cef30d11f0509b7e27334030dae6b8cb34e7f2
ref: refs/tags/6.0.53
revision: 0d6c0cfe63f494a04b46700a4317d52484f3a398
ref: refs/tags/6.0.54
specs:
metasploit-framework (6.0.53)
metasploit-framework (6.0.54)
actionpack (~> 5.2.2)
activerecord (~> 5.2.2)
activesupport (~> 5.2.2)
@ -31,7 +31,7 @@ GIT
metasploit-concern (~> 3.0.0)
metasploit-credential (~> 4.0.0)
metasploit-model (~> 3.1.0)
metasploit-payloads (= 2.0.47)
metasploit-payloads (= 2.0.48)
metasploit_data_models (~> 4.1.0)
metasploit_payloads-mettle (= 1.0.10)
mqtt
@ -127,22 +127,22 @@ GEM
arel-helpers (2.12.0)
activerecord (>= 3.1.0, < 7)
aws-eventstream (1.1.1)
aws-partitions (1.478.0)
aws-partitions (1.479.0)
aws-sdk-core (3.117.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-ec2 (1.249.0)
aws-sdk-ec2 (1.251.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-iam (1.56.0)
aws-sdk-iam (1.57.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-kms (1.44.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.96.1)
aws-sdk-s3 (1.96.2)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
@ -232,7 +232,7 @@ GEM
activemodel (~> 5.2.2)
activesupport (~> 5.2.2)
railties (~> 5.2.2)
metasploit-payloads (2.0.47)
metasploit-payloads (2.0.48)
metasploit_data_models (4.1.4)
activerecord (~> 5.2.2)
activesupport (~> 5.2.2)
@ -332,11 +332,11 @@ GEM
rex-arch
rex-ole (0.1.7)
rex-text
rex-powershell (0.1.91)
rex-powershell (0.1.92)
rex-random_identifier
rex-text
ruby-rc4
rex-random_identifier (0.1.5)
rex-random_identifier (0.1.7)
rex-text
rex-registry (0.1.4)
rex-rop_builder (0.1.4)

View file

@ -8,13 +8,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "metasploit-framework";
version = "6.0.53";
version = "6.0.54";
src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = version;
sha256 = "sha256-0tg2FSRtwo1LRxA5jNQ1Pxx54TPs3ZwErXim8uj24VI=";
sha256 = "sha256-Aoj0KTp8WiY5a5YxssGjvFlVkVHb6ERVFGhyHS7GZ7o=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -114,10 +114,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0vsxqayzh04gxxan5i8vvfxh0n238dc9305bc89xs2mx2x1pw167";
sha256 = "090s6b7lz9wz6rclklshxbksgvdf4wji7yy2vha6cz8vg6lbz1xh";
type = "gem";
};
version = "1.478.0";
version = "1.479.0";
};
aws-sdk-core = {
groups = ["default"];
@ -134,20 +134,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1n6yl7qbzmjlxp3rzm3a62vinzdg9a8rqspq7xdaa9sxrf4zsamf";
sha256 = "0vs4k390h8sqv6zcmrgixsc8z1smpglrxvnzl1ci522w9jcn6az7";
type = "gem";
};
version = "1.249.0";
version = "1.251.0";
};
aws-sdk-iam = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0d30abab908434nmfi5j97vmv63466bmcvhvaknma27qc04s53ph";
sha256 = "0nmd4g0cdvb38z9mpx13z6mwgbyyn84vj8wn0yf5y4kfzmi47q4y";
type = "gem";
};
version = "1.56.0";
version = "1.57.0";
};
aws-sdk-kms = {
groups = ["default"];
@ -164,10 +164,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0q28bdmpm2c2fw9wh00zhqxnb8p2nzdfi5l6wwa6bl63fm28816h";
sha256 = "1qgr1x2ykkbbfh6krv4wb97ihjq6w785gh21qrk77s9xjq4lcfqw";
type = "gem";
};
version = "1.96.1";
version = "1.96.2";
};
aws-sigv4 = {
groups = ["default"];
@ -594,12 +594,12 @@
platforms = [];
source = {
fetchSubmodules = false;
rev = "b7cef30d11f0509b7e27334030dae6b8cb34e7f2";
sha256 = "0lp1yvlg59kqml29rpgc6ghpj71z6pa8qf8h8x5qvhkd4hakdn6j";
rev = "0d6c0cfe63f494a04b46700a4317d52484f3a398";
sha256 = "1fk7qqp1swk82ial9s6va68mandwlg0v4ccndcwjcnkw78lz9202";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
version = "6.0.53";
version = "6.0.54";
};
metasploit-model = {
groups = ["default"];
@ -616,10 +616,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0jxa9q8jzfy91i4khnzmd36p3g2sq7df34csgwbmv6caarzs7732";
sha256 = "0jg96v1a7q3ypq33jaflnfvpqm6cz0ihaiilag2y6qvd0ypv297d";
type = "gem";
};
version = "2.0.47";
version = "2.0.48";
};
metasploit_data_models = {
groups = ["default"];
@ -1106,20 +1106,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zrc0pr1pla0amw6hagllj82hyq8pyy6wb38xry2cxg7q70ghfq7";
sha256 = "02gpfw43r0pkzp7jj3n0lwn4lgbgkgadrn4p33x7b0xh1dalzgj1";
type = "gem";
};
version = "0.1.91";
version = "0.1.92";
};
rex-random_identifier = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0pqd8pfcxqd44ql8dawk59k9s5jnhx7inc8wnpjhkbx0y0sldq8q";
sha256 = "1zaqndyy04c4fn021ibh05xim3wr7l2i71713amz6pvhgs2939r3";
type = "gem";
};
version = "0.1.5";
version = "0.1.7";
};
rex-registry = {
groups = ["default"];

View file

@ -5,7 +5,7 @@
buildGoModule rec {
pname = "terrascan";
version = "1.8.0";
version = "1.8.1";
src = fetchFromGitHub {
owner = "accurics";
@ -14,7 +14,7 @@ buildGoModule rec {
sha256 = "sha256-eCkinYJtZNf5Fo+LXu01cHRInA9CfDONvt1OIs3XJSk=";
};
vendorSha256 = "sha256-eez/g0Np/vnSO6uvUA8vtqR3DEaKlBo6lyd9t25LE7s=";
vendorSha256 = "1fqk9dpbfz97jwx1m54a8q67g95n5w7m1bxb7g9gkzk98f1zzv3r";
# Tests want to download a vulnerable Terraform project
doCheck = false;

View file

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "natscli";
version = "0.0.24";
version = "0.0.25";
src = fetchFromGitHub {
owner = "nats-io";
repo = pname;
rev = version;
sha256 = "11rpgvcnd2m4g0jnv6g0zdvnhs37jwn1c4hc86xgnk2vipvy0nw2";
sha256 = "180511x3sciqs0njz80qc1a785m84ks9l338qi3liv7bcd541xcr";
};
vendorSha256 = "0nrgbwc10pp7adj0w1jjj6677y2dpqq969ij7i0pmvr08ni95sxw";
vendorSha256 = "1j2a6wmyb9akndiwq79jqy5lz84bz2k01xp505j60ynsflim7shq";
meta = with lib; {
description = "NATS Command Line Interface";

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "mdbook-mermaid";
version = "0.8.1";
version = "0.8.3";
src = fetchFromGitHub {
owner = "badboy";
repo = pname;
rev = "v${version}";
sha256 = "sha256-UMYWRQeSQwWVJla/+RPlAXPMuFVnxqDtYDxLKmbMw4g=";
sha256 = "sha256-maYFOlWNqKFmyDM2nDF25rzYnUXMlV9Ry9TMoXReUUg=";
};
cargoSha256 = "sha256-nhJS2QZUyGeNRMS9D+P+QPMDHK2PqVK/H2AKaP7EECw=";
cargoSha256 = "sha256-GL5Z4KfRu0zQAzVCWRIhaYtG5FrDdQabsbyFX7SjZvg=";
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];

View file

@ -529,6 +529,7 @@ mapAliases ({
oauth2_proxy = oauth2-proxy; # added 2021-04-18
opencascade_oce = opencascade; # added 2018-04-25
oblogout = throw "oblogout has been removed from nixpkgs, as it's archived upstream."; # added 2019-12-10
ofp = throw "ofp is not compatible with odp-dpdk";
opencl-icd = ocl-icd; # added 2017-01-20
openconnect_pa = throw "openconnect_pa fork has been discontinued, support for GlobalProtect is now available in openconnect"; # added 2021-05-21
openexr_ctl = ctl; # added 2018-04-25

View file

@ -2851,6 +2851,8 @@ in
gping = callPackage ../tools/networking/gping { };
gpu-burn = callPackage ../applications/misc/gpu-burn { };
greg = callPackage ../applications/audio/greg {
pythonPackages = python3Packages;
};
@ -21625,8 +21627,6 @@ in
odroid-xu3-bootloader = callPackage ../tools/misc/odroid-xu3-bootloader { };
ofp = callPackage ../os-specific/linux/ofp { };
ofono = callPackage ../tools/networking/ofono { };
openpam = callPackage ../development/libraries/openpam { };
@ -23589,6 +23589,7 @@ in
infobar = callPackage ../applications/audio/deadbeef/plugins/infobar.nix { };
lyricbar = callPackage ../applications/audio/deadbeef/plugins/lyricbar.nix { };
mpris2 = callPackage ../applications/audio/deadbeef/plugins/mpris2.nix { };
statusnotifier = callPackage ../applications/audio/deadbeef/plugins/statusnotifier.nix { };
};
deadbeef-with-plugins = callPackage ../applications/audio/deadbeef/wrapper.nix {
@ -27530,7 +27531,10 @@ in
tut = callPackage ../applications/misc/tut { };
tuxguitar = callPackage ../applications/editors/music/tuxguitar { };
tuxguitar = callPackage ../applications/editors/music/tuxguitar {
jre = jre8;
swt = swt_jdk8;
};
twister = callPackage ../applications/networking/p2p/twister { };
@ -29005,6 +29009,8 @@ in
gmad = callPackage ../games/gmad { };
gnonograms = callPackage ../games/gnonograms { };
gnubg = callPackage ../games/gnubg { };
gnuchess = callPackage ../games/gnuchess { };
@ -30084,6 +30090,8 @@ in
### SCIENCE/MACHINE LEARNING
nengo-gui = callPackage ../applications/science/machine-learning/nengo-gui { };
sc2-headless = callPackage ../applications/science/machine-learning/sc2-headless { };
### SCIENCE/MATH
@ -32131,6 +32139,11 @@ in
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL OpenAL;
};
bsnes-hd = callPackage ../misc/emulators/bsnes-hd {
inherit (gnome2) gtksourceview;
inherit (darwin.apple_sdk.frameworks) Cocoa OpenAL;
};
yapesdl = callPackage ../misc/emulators/yapesdl { };
x16-emulator = callPackage ../misc/emulators/commanderx16/emulator.nix { };

View file

@ -3102,6 +3102,8 @@ in {
graphene = callPackage ../development/python-modules/graphene { };
graphqlclient= callPackage ../development/python-modules/graphqlclient { };
graphql-core = callPackage ../development/python-modules/graphql-core { };
graphql-relay = callPackage ../development/python-modules/graphql-relay { };
@ -3979,6 +3981,8 @@ in {
leather = callPackage ../development/python-modules/leather { };
leb128 = callPackage ../development/python-modules/leb128 { };
ledger_agent = callPackage ../development/python-modules/ledger_agent { };
ledgerblue = callPackage ../development/python-modules/ledgerblue { };