Merge master into staging-next

Changed files
+167 -68
maintainers
nixos
tests
pkgs
applications
networking
instant-messengers
chatterino2
radio
sdrangel
science
biology
build-support
trivial-builders
data
themes
orchis-theme
development
embedded
bossa
libraries
aptdec
cm256cc
dab_lib
dsdcc
opencv
qt-5
serialdv
sgp4
python-modules
peaqevcore
pyobihai
python-lsp-server
tools
analysis
codeql
buf
esbuild
golangci-lint
games
itchiodl
servers
tools
X11
misc
ramfetch
top-level
+6 -1
maintainers/maintainer-list.nix
···
name = "Claudius Holeksa";
};
ken-matsui = {
-
email = "nix@kmatsui.me";
github = "ken-matsui";
githubId = 26405363;
name = "Ken Matsui";
···
name = "Marius David";
github = "marius851000";
githubId = 22586596;
};
markus1189 = {
email = "markus1189@gmail.com";
···
name = "Claudius Holeksa";
};
ken-matsui = {
github = "ken-matsui";
githubId = 26405363;
name = "Ken Matsui";
···
name = "Marius David";
github = "marius851000";
githubId = 22586596;
+
};
+
markbeep = {
+
email = "mrkswrn@gmail.com";
+
github = "markbeep";
+
githubId = 20665331;
+
name = "Mark";
};
markus1189 = {
email = "markus1189@gmail.com";
+7
nixos/tests/pomerium.nix
···
}; in {
pomerium = { pkgs, lib, ... }: {
imports = [ (base "192.168.1.1") ];
services.pomerium = {
enable = true;
settings = {
···
)
pomerium.succeed(
"curl -L --resolve login.required:80:127.0.0.1 http://login.required | grep 'hello I am login page'"
)
'';
})
···
}; in {
pomerium = { pkgs, lib, ... }: {
imports = [ (base "192.168.1.1") ];
+
environment.systemPackages = with pkgs; [ chromium ];
services.pomerium = {
enable = true;
settings = {
···
)
pomerium.succeed(
"curl -L --resolve login.required:80:127.0.0.1 http://login.required | grep 'hello I am login page'"
+
)
+
+
with subtest("ui"):
+
pomerium.succeed(
+
# check for a string that only appears if the UI is displayed correctly
+
"chromium --no-sandbox --headless --disable-gpu --dump-dom --host-resolver-rules='MAP login.required 127.0.0.1:80' http://login.required/.pomerium | grep 'contact your administrator'"
)
'';
})
+4 -4
pkgs/applications/networking/instant-messengers/chatterino2/default.nix
···
-
{ stdenv, lib, cmake, pkg-config, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qtimageformats, qttools, boost, openssl, wrapQtAppsHook }:
stdenv.mkDerivation rec {
pname = "chatterino2";
-
version = "2.4.0";
src = fetchFromGitHub {
owner = "Chatterino";
repo = pname;
rev = "v${version}";
-
sha256 = "sha256-6t7Or2heyV0B5zdWZpN80iADe52faNVlIEZYtcixpZo=";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
-
buildInputs = [ qtbase qtsvg qtmultimedia qtimageformats qttools boost openssl ];
postInstall = lib.optionalString stdenv.isDarwin ''
mkdir -p "$out/Applications"
mv bin/chatterino.app "$out/Applications/"
···
+
{ stdenv, lib, cmake, pkg-config, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qtimageformats, qttools, boost, openssl, wrapQtAppsHook, libsecret }:
stdenv.mkDerivation rec {
pname = "chatterino2";
+
version = "2.4.2";
src = fetchFromGitHub {
owner = "Chatterino";
repo = pname;
rev = "v${version}";
+
sha256 = "sha256-d/rsY4pgPpA4JcMmoD6AG1DzHovfSERaeuYkMY603kA=";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
+
buildInputs = [ qtbase qtsvg qtmultimedia qtimageformats qttools boost openssl libsecret ];
postInstall = lib.optionalString stdenv.isDarwin ''
mkdir -p "$out/Applications"
mv bin/chatterino.app "$out/Applications/"
+5 -4
pkgs/applications/radio/sdrangel/default.nix
···
-
{ airspy
, airspyhf
, aptdec
, boost
···
, glew
, hackrf
, hidapi
-
, lib
, ffmpeg
, libiio
, libopus
···
"-DDAB_LIB=${dab_lib}"
"-DLIBSERIALDV_INCLUDE_DIR:PATH=${serialdv}/include/serialdv"
"-DLIMESUITE_INCLUDE_DIR:PATH=${limesuite}/include"
-
"-DLIMESUITE_LIBRARY:FILEPATH=${limesuite}/lib/libLimeSuite.so"
"-DSGP4_DIR=${sgp4}"
"-DSOAPYSDR_DIR=${soapysdr-with-plugins}"
];
···
homepage = "https://github.com/f4exb/sdrangel";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ alkeryn ];
-
platforms = platforms.linux;
};
}
···
+
{ lib
+
, stdenv
+
, airspy
, airspyhf
, aptdec
, boost
···
, glew
, hackrf
, hidapi
, ffmpeg
, libiio
, libopus
···
"-DDAB_LIB=${dab_lib}"
"-DLIBSERIALDV_INCLUDE_DIR:PATH=${serialdv}/include/serialdv"
"-DLIMESUITE_INCLUDE_DIR:PATH=${limesuite}/include"
+
"-DLIMESUITE_LIBRARY:FILEPATH=${limesuite}/lib/libLimeSuite${stdenv.hostPlatform.extensions.sharedLibrary}"
"-DSGP4_DIR=${sgp4}"
"-DSOAPYSDR_DIR=${soapysdr-with-plugins}"
];
···
homepage = "https://github.com/f4exb/sdrangel";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ alkeryn ];
+
platforms = platforms.unix;
};
}
+5 -4
pkgs/applications/science/biology/nest/default.nix
···
stdenv.mkDerivation rec {
pname = "nest";
-
version = "3.3";
src = fetchFromGitHub {
owner = "nest";
repo = "nest-simulator";
rev = "v${version}";
-
sha256 = "sha256-wmn5LOOHlSuyPdV6O6v7j10dxdcvqpym6MfveZdL+dU=";
};
postPatch = ''
···
postInstall = ''
# Alternative to autoPatchElf, moves libraries where
# Nest expects them to be
-
find $out/lib/nest -type f -exec ln -s {} $out/lib \;
'';
passthru.tests.version = testers.testVersion {
···
meta = with lib; {
description = "NEST is a command line tool for simulating neural networks";
homepage = "https://www.nest-simulator.org/";
-
license = licenses.gpl2;
maintainers = with maintainers; [ jiegec davidcromp ];
platforms = platforms.unix;
};
···
stdenv.mkDerivation rec {
pname = "nest";
+
version = "3.4";
src = fetchFromGitHub {
owner = "nest";
repo = "nest-simulator";
rev = "v${version}";
+
hash = "sha256-+wjsZxW2l0WGyGTm/6vyzPEeqCfyxJml9oP/zn6W1L0=";
};
postPatch = ''
···
postInstall = ''
# Alternative to autoPatchElf, moves libraries where
# Nest expects them to be
+
find $out/lib/nest -exec ln -s {} $out/lib \;
'';
passthru.tests.version = testers.testVersion {
···
meta = with lib; {
description = "NEST is a command line tool for simulating neural networks";
homepage = "https://www.nest-simulator.org/";
+
changelog = "https://github.com/nest/nest-simulator/releases/tag/v${version}";
+
license = licenses.gpl2Plus;
maintainers = with maintainers; [ jiegec davidcromp ];
platforms = platforms.unix;
};
-2
pkgs/build-support/trivial-builders/test/references.nix
···
""")
'';
meta = {
-
license = lib.licenses.mit; # nixpkgs license
maintainers = with lib.maintainers; [
roberth
];
-
description = "Run the Nixpkgs trivial builders tests";
};
}
···
""")
'';
meta = {
maintainers = with lib.maintainers; [
roberth
];
};
}
+2 -2
pkgs/data/themes/orchis-theme/default.nix
···
stdenvNoCC.mkDerivation
rec {
inherit pname;
-
version = "2023-02-26";
src = fetchFromGitHub {
repo = "Orchis-theme";
owner = "vinceliuice";
rev = version;
-
sha256 = "sha256-Qk5MK8S8rIcwO7Kmze6eAl5qcwnrGsiWbn0WNIPjRnA=";
};
nativeBuildInputs = [ gtk3 sassc ];
···
stdenvNoCC.mkDerivation
rec {
inherit pname;
+
version = "2023-03-18";
src = fetchFromGitHub {
repo = "Orchis-theme";
owner = "vinceliuice";
rev = version;
+
hash = "sha256-ixVHQRJXoXuPEsrbWOVMC/qdF3szpxYzC/8kKe47Bs8=";
};
nativeBuildInputs = [ gtk3 sassc ];
+28 -5
pkgs/development/embedded/bossa/default.nix
···
-
{ lib, stdenv, fetchFromGitHub, wxGTK, libX11, readline }:
let
# BOSSA needs a "bin2c" program to embed images.
···
sha256 = "sha256-8M3MU/+Y1L6SaQ1yoC9Z27A/gGruZdopLnL1z7h7YJw=";
};
nativeBuildInputs = [ bin2c ];
-
buildInputs = [ wxGTK libX11 readline ];
-
# Explicitly specify targets so they don't get stripped.
-
makeFlags = [ "bin/bossac" "bin/bossash" "bin/bossa" ];
env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
installPhase = ''
···
'';
homepage = "http://www.shumatech.com/web/products/bossa";
license = licenses.bsd3;
-
platforms = platforms.linux;
};
}
···
+
{ lib
+
, stdenv
+
, fetchFromGitHub
+
, wxGTK32
+
, libX11
+
, readline
+
, darwin
+
}:
let
# BOSSA needs a "bin2c" program to embed images.
···
sha256 = "sha256-8M3MU/+Y1L6SaQ1yoC9Z27A/gGruZdopLnL1z7h7YJw=";
};
+
postPatch = ''
+
substituteInPlace Makefile \
+
--replace "-arch x86_64" ""
+
'';
+
nativeBuildInputs = [ bin2c ];
+
buildInputs = [
+
wxGTK32
+
libX11
+
readline
+
] ++ lib.optionals stdenv.isDarwin [
+
darwin.apple_sdk.frameworks.Cocoa
+
];
+
makeFlags = [
+
"WXVERSION=3.2"
+
# Explicitly specify targets so they don't get stripped.
+
"bin/bossac"
+
"bin/bossash"
+
"bin/bossa"
+
];
env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
installPhase = ''
···
'';
homepage = "http://www.shumatech.com/web/products/bossa";
license = licenses.bsd3;
+
platforms = platforms.unix;
};
}
+1 -1
pkgs/development/libraries/aptdec/default.nix
···
homepage = "https://github.com/Xerbo/aptdec";
license = licenses.gpl2;
maintainers = with maintainers; [ alexwinter ];
-
platforms = platforms.linux;
};
}
···
homepage = "https://github.com/Xerbo/aptdec";
license = licenses.gpl2;
maintainers = with maintainers; [ alexwinter ];
+
platforms = platforms.unix;
};
}
+1 -1
pkgs/development/libraries/cm256cc/default.nix
···
meta = with lib; {
description = "Fast GF(256) Cauchy MDS Block Erasure Codec in C++";
homepage = "https://github.com/f4exb/cm256cc";
-
platforms = platforms.linux;
maintainers = with maintainers; [ alkeryn ];
license = licenses.gpl3;
};
···
meta = with lib; {
description = "Fast GF(256) Cauchy MDS Block Erasure Codec in C++";
homepage = "https://github.com/f4exb/cm256cc";
+
platforms = platforms.unix;
maintainers = with maintainers; [ alkeryn ];
license = licenses.gpl3;
};
+1 -1
pkgs/development/libraries/dab_lib/default.nix
···
homepage = "https://github.com/JvanKatwijk/dab-cmdline";
license = licenses.gpl2;
maintainers = with maintainers; [ alexwinter ];
-
platforms = platforms.linux;
};
}
···
homepage = "https://github.com/JvanKatwijk/dab-cmdline";
license = licenses.gpl2;
maintainers = with maintainers; [ alexwinter ];
+
platforms = platforms.unix;
};
}
+1 -1
pkgs/development/libraries/dsdcc/default.nix
···
homepage = "https://github.com/f4exb/dsdcc";
license = licenses.gpl3;
maintainers = with maintainers; [ alexwinter ];
-
platforms = platforms.linux;
};
}
···
homepage = "https://github.com/f4exb/dsdcc";
license = licenses.gpl3;
maintainers = with maintainers; [ alexwinter ];
+
platforms = platforms.unix;
};
}
+2 -3
pkgs/development/libraries/opencv/3.x.nix
···
, enableDC1394 ? false, libdc1394
, enableDocs ? false, doxygen, graphviz-nox
-
, AVFoundation, Cocoa, VideoDecodeAcceleration, bzip2
}:
assert blas.implementation == "openblas" && lapack.implementation == "openblas";
···
# tesseract & leptonica.
++ lib.optionals enableTesseract [ tesseract leptonica ]
++ lib.optional enableTbb tbb
-
++ lib.optionals stdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration ]
++ lib.optionals enableDocs [ doxygen graphviz-nox ];
propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy
···
] ++ lib.optionals stdenv.isDarwin [
"-DWITH_OPENCL=OFF"
"-DWITH_LAPACK=OFF"
-
"-DBUILD_opencv_videoio=OFF"
] ++ lib.optionals enablePython [
"-DOPENCV_SKIP_PYTHON_LOADER=ON"
] ++ lib.optionals enableEigen [
···
, enableDC1394 ? false, libdc1394
, enableDocs ? false, doxygen, graphviz-nox
+
, AVFoundation, Cocoa, VideoDecodeAcceleration, bzip2, CoreMedia, MediaToolbox
}:
assert blas.implementation == "openblas" && lapack.implementation == "openblas";
···
# tesseract & leptonica.
++ lib.optionals enableTesseract [ tesseract leptonica ]
++ lib.optional enableTbb tbb
+
++ lib.optionals stdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox ]
++ lib.optionals enableDocs [ doxygen graphviz-nox ];
propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy
···
] ++ lib.optionals stdenv.isDarwin [
"-DWITH_OPENCL=OFF"
"-DWITH_LAPACK=OFF"
] ++ lib.optionals enablePython [
"-DOPENCV_SKIP_PYTHON_LOADER=ON"
] ++ lib.optionals enableEigen [
+2 -2
pkgs/development/libraries/qt-5/modules/qtspeech.nix
···
-
{ qtModule, speechd, pkg-config }:
qtModule {
pname = "qtspeech";
qtInputs = [ ];
-
buildInputs = [ speechd ];
nativeBuildInputs = [ pkg-config ];
outputs = [ "out" "dev" ];
}
···
+
{ lib, qtModule, stdenv, speechd, pkg-config }:
qtModule {
pname = "qtspeech";
qtInputs = [ ];
+
buildInputs = lib.optionals stdenv.isLinux [ speechd ];
nativeBuildInputs = [ pkg-config ];
outputs = [ "out" "dev" ];
}
+1
pkgs/development/libraries/qt-5/modules/qtwebengine.nix
···
Prefix = ..
EOF
# Fix for out-of-sync QtWebEngine and Qt releases (since 5.15.3)
sed 's/${lib.head (lib.splitString "-" version)} /${qtCompatVersion} /' -i "$out"/lib/cmake/*/*Config.cmake
'';
···
Prefix = ..
EOF
+
'' + ''
# Fix for out-of-sync QtWebEngine and Qt releases (since 5.15.3)
sed 's/${lib.head (lib.splitString "-" version)} /${qtCompatVersion} /' -i "$out"/lib/cmake/*/*Config.cmake
'';
+1 -1
pkgs/development/libraries/serialdv/default.nix
···
meta = with lib; {
description = "C++ Minimal interface to encode and decode audio with AMBE3000 based devices in packet mode over a serial link";
homepage = "https://github.com/f4exb/serialdv";
-
platforms = platforms.linux;
maintainers = with maintainers; [ alkeryn ];
license = licenses.gpl3;
};
···
meta = with lib; {
description = "C++ Minimal interface to encode and decode audio with AMBE3000 based devices in packet mode over a serial link";
homepage = "https://github.com/f4exb/serialdv";
+
platforms = platforms.unix;
maintainers = with maintainers; [ alkeryn ];
license = licenses.gpl3;
};
+1 -1
pkgs/development/libraries/sgp4/default.nix
···
homepage = "https://github.com/dnwrnr/sgp4";
license = licenses.asl20;
maintainers = with maintainers; [ alexwinter ];
-
platforms = platforms.linux;
};
}
···
homepage = "https://github.com/dnwrnr/sgp4";
license = licenses.asl20;
maintainers = with maintainers; [ alexwinter ];
+
platforms = platforms.unix;
};
}
+2 -2
pkgs/development/python-modules/peaqevcore/default.nix
···
buildPythonPackage rec {
pname = "peaqevcore";
-
version = "13.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
-
hash = "sha256-fu4NL5m8+eae2+sTyi1yNA1J2qQfjfSlbIQyorlXZ6Y=";
};
postPatch = ''
···
buildPythonPackage rec {
pname = "peaqevcore";
+
version = "13.2.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
+
hash = "sha256-N/tLoZNiMY1rzzToVvE9U4buUsmsDEcnKPOuifh7qg0=";
};
postPatch = ''
+2 -2
pkgs/development/python-modules/pyobihai/default.nix
···
buildPythonPackage rec {
pname = "pyobihai";
-
version = "1.4.0";
format = "setuptools";
disabled = pythonOlder "3.7";
···
# GitHub release, https://github.com/dshokouhi/pyobihai/issues/10
src = fetchPypi {
inherit pname version;
-
hash = "sha256-P6tKpssey59SdjS/QWpuv1UUagjR7RVAl6rse/O79mg=";
};
propagatedBuildInputs = [
···
buildPythonPackage rec {
pname = "pyobihai";
+
version = "1.4.1";
format = "setuptools";
disabled = pythonOlder "3.7";
···
# GitHub release, https://github.com/dshokouhi/pyobihai/issues/10
src = fetchPypi {
inherit pname version;
+
hash = "sha256-L/AQy9IxsBDeSlu+45j+/86jjMFzTjAkPGwZoa1QYho=";
};
propagatedBuildInputs = [
+1
pkgs/development/python-modules/python-lsp-server/default.nix
···
changelog = "https://github.com/python-lsp/python-lsp-server/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}
···
changelog = "https://github.com/python-lsp/python-lsp-server/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
+
mainProgram = "pylsp";
};
}
+5 -5
pkgs/development/tools/analysis/codeql/default.nix
···
-
{ lib, stdenv, fetchzip, zlib, xorg, freetype, jdk11, curl }:
stdenv.mkDerivation rec {
pname = "codeql";
-
version = "2.12.3";
dontConfigure = true;
dontBuild = true;
···
src = fetchzip {
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
-
sha256 = "sha256-xBTL3atnLsw7HWhkWq32LdQmSBtsQ2ydK+8On8l+OcA=";
};
nativeBuildInputs = [
···
xorg.libXtst
xorg.libXrender
freetype
-
jdk11
stdenv.cc.cc.lib
curl
];
···
ln -sf $out/codeql/tools/linux64/lib64trace.so $out/codeql/tools/linux64/libtrace.so
-
sed -i 's%\$CODEQL_DIST/tools/\$CODEQL_PLATFORM/java%\${jdk11}%g' $out/codeql/codeql
ln -s $out/codeql/codeql $out/bin/
'';
···
+
{ lib, stdenv, fetchzip, zlib, xorg, freetype, jdk17, curl }:
stdenv.mkDerivation rec {
pname = "codeql";
+
version = "2.12.4";
dontConfigure = true;
dontBuild = true;
···
src = fetchzip {
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
+
sha256 = "sha256-Rmz35iyLXmNePHFVN8QmjeoKbR3eRy7nrY1FJpTfL7o=";
};
nativeBuildInputs = [
···
xorg.libXtst
xorg.libXrender
freetype
+
jdk17
stdenv.cc.cc.lib
curl
];
···
ln -sf $out/codeql/tools/linux64/lib64trace.so $out/codeql/tools/linux64/libtrace.so
+
sed -i 's%\$CODEQL_DIST/tools/\$CODEQL_PLATFORM/java%\${jdk17}%g' $out/codeql/codeql
ln -s $out/codeql/codeql $out/bin/
'';
+3
pkgs/development/tools/buf/default.nix
···
export CI=true
'';
installPhase = ''
runHook preInstall
···
export CI=true
'';
+
# Allow tests that bind or connect to localhost on macOS.
+
__darwinAllowLocalNetworking = true;
+
installPhase = ''
runHook preInstall
+2 -2
pkgs/development/tools/esbuild/default.nix
···
buildGoModule rec {
pname = "esbuild";
-
version = "0.17.11";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
-
hash = "sha256-k7bXEDAmxyn2u/cniqKtr9zbrWnzwbhTZkL35/igctM=";
};
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
···
buildGoModule rec {
pname = "esbuild";
+
version = "0.17.12";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
+
hash = "sha256-75qDQWAp6cmuXtq90oIIQCj5IKUoQxNARxhFo2Sm5mk=";
};
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
+3 -5
pkgs/development/tools/golangci-lint/default.nix
···
buildGoModule rec {
pname = "golangci-lint";
-
version = "1.51.2";
src = fetchFromGitHub {
owner = "golangci";
repo = "golangci-lint";
rev = "v${version}";
-
hash = "sha256-F2rkVZ5ia9/wyTw1WIeizFnuaHoS2A8VzVOGDcshy64=";
};
-
vendorHash = "sha256-JO/mRJB3gRTtBj6pW1267/xXUtalTJo0p3q5e34vqTs=";
-
-
doCheck = false;
subPackages = [ "cmd/golangci-lint" ];
···
buildGoModule rec {
pname = "golangci-lint";
+
version = "1.52.0";
src = fetchFromGitHub {
owner = "golangci";
repo = "golangci-lint";
rev = "v${version}";
+
hash = "sha256-XcrWBHmxsDwsP/+H0OTmGKVG9NgBwR5dBY9sJZWo+K8=";
};
+
vendorHash = "sha256-N20AJaREqmvCey5P0YuUd3l/5xRzrIG+mPOiVHOUFWc=";
subPackages = [ "cmd/golangci-lint" ];
+2 -2
pkgs/games/itchiodl/default.nix
···
python3Packages.buildPythonApplication rec {
pname = "itchiodl";
-
version = "2.2.0";
src = fetchFromGitHub {
owner = "Emersont1";
repo = "itchio";
rev = "v${version}";
-
hash = "sha256-tylMEsUdeMUuLcxRMkkJE7vPAVuqc/cVJ4DB3xmV+iA=";
};
format = "pyproject";
···
python3Packages.buildPythonApplication rec {
pname = "itchiodl";
+
version = "2.3.0";
src = fetchFromGitHub {
owner = "Emersont1";
repo = "itchio";
rev = "v${version}";
+
hash = "sha256-XuNkqTAT9LlSwruchGQbombAKHZvKhpnqLfvJdDcrj0=";
};
format = "pyproject";
+11 -9
pkgs/servers/http/pomerium/default.nix
···
in
buildGoModule rec {
pname = "pomerium";
-
version = "0.20.0";
src = fetchFromGitHub {
owner = "pomerium";
repo = "pomerium";
rev = "v${version}";
-
sha256 = "sha256-J8ediRreV80lzPcKIOSl1CNHp04ZW9ePyNyejlN50cE=";
};
-
vendorSha256 = "sha256-V8asyi1Nm+h3KK/loBRZQN6atfEGUEdRydeZsp9wyQY=";
ui = mkYarnPackage {
inherit version;
src = "${src}/ui";
-
# update pomerium-ui-package.json when updating package, sourced from ui/package.json
-
packageJSON = ./pomerium-ui-package.json;
offlineCache = fetchYarnDeps {
yarnLock = "${src}/ui/yarn.lock";
-
sha256 = "sha256:1n6swanrds9hbd4yyfjzpnfhsb8fzj1pwvvcg3w7b1cgnihclrmv";
};
buildPhase = ''
···
install -Dm0755 $GOPATH/bin/pomerium $out/bin/pomerium
'';
-
passthru.tests = {
-
inherit (nixosTests) pomerium;
-
inherit pomerium-cli;
};
meta = with lib; {
···
in
buildGoModule rec {
pname = "pomerium";
+
version = "0.21.2";
src = fetchFromGitHub {
owner = "pomerium";
repo = "pomerium";
rev = "v${version}";
+
sha256 = "sha256-wsfbG4VAS3U3voDdry35QlWknlWIfThZQalf9S/9GO0=";
};
+
vendorSha256 = "sha256-8g3jhxKIT0EGUXh0hrvDbw3i04khqlAfGzM6k4q3O8g=";
ui = mkYarnPackage {
inherit version;
src = "${src}/ui";
+
packageJSON = ./package.json;
offlineCache = fetchYarnDeps {
yarnLock = "${src}/ui/yarn.lock";
+
sha256 = lib.fileContents ./yarn-hash;
};
buildPhase = ''
···
install -Dm0755 $GOPATH/bin/pomerium $out/bin/pomerium
'';
+
passthru = {
+
tests = {
+
inherit (nixosTests) pomerium;
+
inherit pomerium-cli;
+
};
+
updateScript = ./updater.sh;
};
meta = with lib; {
+1 -1
pkgs/servers/http/pomerium/pomerium-ui-package.json pkgs/servers/http/pomerium/package.json
···
"@fontsource/dm-sans": "^4.5.1",
"@mui/icons-material": "^5.3.1",
"@mui/material": "^5.4.0",
-
"luxon": "^2.3.0",
"markdown-to-jsx": "^7.1.7",
"react": "^17.0.2",
"react-dom": "^17.0.2",
···
"@fontsource/dm-sans": "^4.5.1",
"@mui/icons-material": "^5.3.1",
"@mui/material": "^5.4.0",
+
"luxon": "^2.5.2",
"markdown-to-jsx": "^7.1.7",
"react": "^17.0.2",
"react-dom": "^17.0.2",
+23
pkgs/servers/http/pomerium/updater.sh
···
···
+
#! /usr/bin/env nix-shell
+
#! nix-shell -i bash -p gnugrep coreutils curl wget jq nix-update prefetch-yarn-deps
+
+
set -euo pipefail
+
pushd "$(dirname "${BASH_SOURCE[0]}")"
+
+
owner="pomerium"
+
repo="pomerium"
+
version=`curl -s "https://api.github.com/repos/$owner/$repo/tags" | jq -r .[0].name | grep -oP "^v\K.*"`
+
url="https://raw.githubusercontent.com/$owner/$repo/v$version/"
+
+
if [[ "$UPDATE_NIX_OLD_VERSION" == "$version" ]]; then
+
echo "Already up to date!"
+
exit 0
+
fi
+
+
rm -f package.json yarn.lock
+
wget "$url/ui/yarn.lock" "$url/ui/package.json"
+
echo $(prefetch-yarn-deps) > yarn-hash
+
rm -f yarn.lock
+
+
popd
+
nix-update pomerium --version $version
+1
pkgs/servers/http/pomerium/yarn-hash
···
···
+
085nghha82q30b3vgzs76xsa85kbxqk7mjrknxxc5z7awrjhdmkb
+3 -2
pkgs/servers/klipper/klipper-firmware.nix
···
, bintools-unwrapped
, libffi
, libusb1
-
, wxGTK30
, python3
, gcc-arm-embedded
, klipper
···
avrdude
stm32flash
pkg-config
-
wxGTK30 # Required for bossac
];
preBuild = "cp ${firmwareConfig} ./.config";
···
makeFlags = [
"V=1"
"KCONFIG_CONFIG=${firmwareConfig}"
];
installPhase = ''
···
, bintools-unwrapped
, libffi
, libusb1
+
, wxGTK32
, python3
, gcc-arm-embedded
, klipper
···
avrdude
stm32flash
pkg-config
+
wxGTK32 # Required for bossac
];
preBuild = "cp ${firmwareConfig} ./.config";
···
makeFlags = [
"V=1"
"KCONFIG_CONFIG=${firmwareConfig}"
+
"WXVERSION=3.2"
];
installPhase = ''
+1
pkgs/tools/X11/xpra/default.nix
···
postInstall = ''
# append module paths to xorg.conf
cat ${xorgModulePaths} >> $out/etc/xpra/xorg.conf
# make application icon visible to desktop environemnts
icon_dir="$out/share/icons/hicolor/64x64/apps"
···
postInstall = ''
# append module paths to xorg.conf
cat ${xorgModulePaths} >> $out/etc/xpra/xorg.conf
+
cat ${xorgModulePaths} >> $out/etc/xpra/xorg-uinput.conf
# make application icon visible to desktop environemnts
icon_dir="$out/share/icons/hicolor/64x64/apps"
+33
pkgs/tools/misc/ramfetch/default.nix
···
···
+
{ lib
+
, stdenv
+
, fetchgit
+
}:
+
+
stdenv.mkDerivation rec {
+
name = "ramfetch";
+
version = "1.1.0";
+
+
src = fetchgit {
+
url = "https://codeberg.org/o69mar/ramfetch.git";
+
rev = "v${version}";
+
hash = "sha256-XUph+rTbw5LXWRq+OSKl0EjFac+MQAx3NBu4rWdWR3w=";
+
};
+
+
dontBuild = true;
+
+
installPhase = ''
+
runHook preInstall
+
+
install -D ramfetch $out/bin/ramfetch
+
+
runHook postInstall
+
'';
+
+
meta = {
+
description = "A tool which displays memory information";
+
homepage = "https://codeberg.org/o69mar/ramfetch";
+
platforms = lib.platforms.linux;
+
license = lib.licenses.mit;
+
maintainers = [ lib.maintainers.markbeep ];
+
};
+
}
+4 -4
pkgs/top-level/all-packages.nix
···
rambox = callPackage ../applications/networking/instant-messengers/rambox { };
rar = callPackage ../tools/archivers/rar { };
rarcrack = callPackage ../tools/security/rarcrack { };
···
bloop = callPackage ../development/tools/build-managers/bloop { };
-
bossa = callPackage ../development/embedded/bossa {
-
wxGTK = wxGTK30;
-
};
bossa-arduino = callPackage ../development/embedded/bossa/arduino.nix { };
···
};
opencv3 = callPackage ../development/libraries/opencv/3.x.nix {
-
inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration;
ffmpeg = ffmpeg_4;
};
···
rambox = callPackage ../applications/networking/instant-messengers/rambox { };
+
ramfetch = callPackage ../tools/misc/ramfetch { };
+
rar = callPackage ../tools/archivers/rar { };
rarcrack = callPackage ../tools/security/rarcrack { };
···
bloop = callPackage ../development/tools/build-managers/bloop { };
+
bossa = callPackage ../development/embedded/bossa { };
bossa-arduino = callPackage ../development/embedded/bossa/arduino.nix { };
···
};
opencv3 = callPackage ../development/libraries/opencv/3.x.nix {
+
inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox;
ffmpeg = ffmpeg_4;
};
+2 -1
pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix
···
let
inherit (lib.strings) escapeNixIdentifier;
-
allTests = lib.mapAttrs (k: v: if v == null then null else makePkgConfigTestMaybe k v) defaultPkgConfigPackages;
# nix-build rejects attribute names with periods
# This will build those regardless.
···
let
inherit (lib.strings) escapeNixIdentifier;
+
allTests = lib.mapAttrs (k: v: if v == null then null else makePkgConfigTestMaybe k v)
+
(builtins.removeAttrs defaultPkgConfigPackages ["recurseForDerivations"]);
# nix-build rejects attribute names with periods
# This will build those regardless.