MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 15:22:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2023-01-27 18:02:07 +00:00 committed by GitHub
commit 99e30309e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
44 changed files with 542 additions and 281 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
nixos/doc/manual/development/running-nixos-tests-interactively.section.md
View file

@ -24,6 +24,39 @@ back into the test driver command line upon its completion. This allows
you to inspect the state of the VMs after the test (e.g. to debug the
test script).
## Shell access in interactive mode {#sec-nixos-test-shell-access}
The function `<yourmachine>.shell_interact()` grants access to a shell running
inside a virtual machine. To use it, replace `<yourmachine>` with the name of a
virtual machine defined in the test, for example: `machine.shell_interact()`.
Keep in mind that this shell may not display everything correctly as it is
running within an interactive Python REPL, and logging output from the virtual
machine may overwrite input and output from the guest shell:
```py
>>> machine.shell_interact()
machine: Terminal is ready (there is no initial prompt):
$ hostname
machine
```
As an alternative, you can proxy the guest shell to a local TCP server by first
starting a TCP server in a terminal using the command:
```ShellSession
$ socat 'READLINE,PROMPT=$ ' tcp-listen:4444,reuseaddr`
```
In the terminal where the test driver is running, connect to this server by
using:
```py
>>> machine.shell_interact("tcp:127.0.0.1:4444")
```
Once the connection is established, you can enter commands in the socat terminal
where socat is running.
## Reuse VM state {#sec-nixos-test-reuse-vm-state}
You can re-use the VM states coming from a previous run by setting the

40
nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml
View file

@ -25,6 +25,46 @@ $ ./result/bin/nixos-test-driver
completion. This allows you to inspect the state of the VMs after
the test (e.g. to debug the test script).
</para>
<section xml:id="sec-nixos-test-shell-access">
<title>Shell access in interactive mode</title>
<para>
The function
<literal>&lt;yourmachine&gt;.shell_interact()</literal> grants
access to a shell running inside a virtual machine. To use it,
replace <literal>&lt;yourmachine&gt;</literal> with the name of a
virtual machine defined in the test, for example:
<literal>machine.shell_interact()</literal>. Keep in mind that
this shell may not display everything correctly as it is running
within an interactive Python REPL, and logging output from the
virtual machine may overwrite input and output from the guest
shell:
</para>
<programlisting language="python">
&gt;&gt;&gt; machine.shell_interact()
machine: Terminal is ready (there is no initial prompt):
$ hostname
machine
</programlisting>
<para>
As an alternative, you can proxy the guest shell to a local TCP
server by first starting a TCP server in a terminal using the
command:
</para>
<programlisting>
$ socat 'READLINE,PROMPT=$ ' tcp-listen:4444,reuseaddr`
</programlisting>
<para>
In the terminal where the test driver is running, connect to this
server by using:
</para>
<programlisting language="python">
&gt;&gt;&gt; machine.shell_interact(&quot;tcp:127.0.0.1:4444&quot;)
</programlisting>
<para>
Once the connection is established, you can enter commands in the
socat terminal where socat is running.
</para>
</section>
<section xml:id="sec-nixos-test-reuse-vm-state">
<title>Reuse VM state</title>
<para>

25
nixos/lib/test-driver/test_driver/machine.py
View file

@ -549,18 +549,27 @@ class Machine:
return (rc, output.decode())
def shell_interact(self) -> None:
"""Allows you to interact with the guest shell
def shell_interact(self, address: Optional[str] = None) -> None:
"""Allows you to interact with the guest shell for debugging purposes.
Should only be used during test development, not in the production test."""
@address string passed to socat that will be connected to the guest shell.
Check the `Running Tests interactivly` chapter of NixOS manual for an example.
"""
self.connect()
self.log("Terminal is ready (there is no initial prompt):")
if address is None:
address = "READLINE,prompt=$ "
self.log("Terminal is ready (there is no initial prompt):")
assert self.shell
subprocess.run(
["socat", "READLINE,prompt=$ ", f"FD:{self.shell.fileno()}"],
pass_fds=[self.shell.fileno()],
)
try:
subprocess.run(
["socat", address, f"FD:{self.shell.fileno()}"],
pass_fds=[self.shell.fileno()],
)
# allow users to cancel this command without breaking the test
except KeyboardInterrupt:
pass
def console_interact(self) -> None:
"""Allows you to interact with QEMU's stdin

10
pkgs/applications/audio/musikcube/default.nix
View file

@ -2,14 +2,15 @@
, stdenv
, cmake
, pkg-config
, boost
, curl
, asio
, fetchFromGitHub
, fetchpatch
, ffmpeg
, gnutls
, lame
, libev
, libgme
, libmicrohttpd
, libopenmpt
, mpg123
@ -27,13 +28,13 @@
stdenv.mkDerivation rec {
pname = "musikcube";
version = "0.98.1";
version = "0.99.4";
src = fetchFromGitHub {
owner = "clangen";
repo = pname;
rev = version;
sha256 = "sha256-pnAdlCCqWzR0W8dF9CE48K8yHMVIx3egZlXvibxU18A=";
sha256 = "sha256-GAO3CKtlZF8Ol4K+40lD8n2RtewiHj3f59d5RIatNws=";
};
outputs = [ "out" "dev" ];
@ -44,12 +45,13 @@ stdenv.mkDerivation rec {
];
buildInputs = [
boost
asio
curl
ffmpeg
gnutls
lame
libev
libgme
libmicrohttpd
libopenmpt
mpg123

16
pkgs/applications/audio/transcribe/default.nix
View file

@ -2,6 +2,8 @@
, fetchzip
, lib
, wrapGAppsHook
, xdg-utils
, which
, alsa-lib
, atk
, cairo
@ -31,7 +33,11 @@ stdenv.mkDerivation rec {
}
else throw "Platform not supported";
nativeBuildInputs = [ wrapGAppsHook ];
nativeBuildInputs = [
which
xdg-utils
wrapGAppsHook
];
buildInputs = with gst_all_1; [
gst-plugins-base
@ -65,8 +71,13 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin $out/libexec $out/share/doc
cp transcribe $out/libexec
cp xschelp.htb readme_gtk.html $out/share/doc
cp -r gtkicons $out/share/icons
ln -s $out/share/doc/xschelp.htb $out/libexec
# The script normally installs to the home dir
sed -i -E 's!BIN_DST=.*!BIN_DST=$out!' install-linux.sh
sed -i -e 's!Exec=''${BIN_DST}/transcribe/transcribe!Exec=transcribe!' install-linux.sh
sed -i -e 's!''${BIN_DST}/transcribe!''${BIN_DST}/libexec!' install-linux.sh
rm -f xschelp.htb readme_gtk.html *.so
XDG_DATA_HOME=$out/share bash install-linux.sh -i
patchelf \
--set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \
$out/libexec/transcribe
@ -97,6 +108,7 @@ stdenv.mkDerivation rec {
homepage = "https://www.seventhstring.com/xscribe/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
maintainers = with maintainers; [ iwanb ];
platforms = platforms.linux;
};
}

4
pkgs/applications/editors/vim/plugins/overrides.nix
View file

@ -506,6 +506,10 @@ self: super: {
};
});
jellybeans-nvim = super.jellybeans-nvim.overrideAttrs (old: {
dependencies = with self; [ lush-nvim ];
});
LanguageClient-neovim =
let
version = "0.1.161";

33
pkgs/applications/networking/qv2ray/default.nix
View file

@ -2,7 +2,7 @@
, stdenv
, mkDerivation
, fetchFromGitHub
, qmake
, symlinkJoin
, qttools
, cmake
, clang_8
@ -14,29 +14,40 @@
, libGL
, zlib
, curl
, v2ray
, v2ray-geoip, v2ray-domain-list-community
, assets ? [ v2ray-geoip v2ray-domain-list-community ]
}:
mkDerivation rec {
pname = "qv2ray";
version = "2.7.0";
version = "unstable-2022-09-25";
src = fetchFromGitHub {
owner = "Qv2ray";
repo = "Qv2ray";
rev = "v${version}";
sha256 = "sha256-afFTGX/zrnwq/p5p1kj+ANU4WeN7jNq3ieeW+c+GO5M=";
rev = "fb44fb1421941ab192229ff133bc28feeb4a8ce5";
sha256 = "sha256-TngDgLXKyAoQFnXpBNaz4QjfkVwfZyuQwatdhEiI57U=";
fetchSubmodules = true;
};
patchPhase = lib.optionals stdenv.isDarwin ''
postPatch = lib.optionals stdenv.isDarwin ''
substituteInPlace cmake/platforms/macos.cmake \
--replace \''${QV2RAY_QtX_DIR}/../../../bin/macdeployqt macdeployqt
'';
assetsDrv = symlinkJoin {
name = "v2ray-assets";
paths = assets;
};
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DQV2RAY_DISABLE_AUTO_UPDATE=on"
"-DQV2RAY_USE_V5_CORE=on"
"-DQV2RAY_TRANSLATION_PATH=${placeholder "out"}/share/qv2ray/lang"
"-DQV2RAY_DEFAULT_VASSETS_PATH='${assetsDrv}/share/v2ray'"
"-DQV2RAY_DEFAULT_VCORE_PATH='${v2ray}/bin/v2ray'"
];
preConfigure = ''
@ -55,21 +66,17 @@ mkDerivation rec {
nativeBuildInputs = [
cmake
# The default clang_7 will result in reproducible ICE.
clang_8
pkg-config
qmake
qttools
curl
];
# The default clang_7 will result in reproducible ICE.
] ++ lib.optional (stdenv.isDarwin) clang_8;
meta = with lib; {
description = "An GUI frontend to v2ray";
homepage = "https://qv2ray.github.io/en/";
homepage = "https://qv2ray.net";
license = licenses.gpl3;
maintainers = with maintainers; [ poscat ];
maintainers = with maintainers; [ poscat rewine ];
platforms = platforms.all;
};
}

7
pkgs/applications/office/karlender/default.nix
View file

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "karlender";
version = "0.8.0";
version = "0.9.0";
src = fetchFromGitLab {
owner = "floers";
repo = pname;
rev = "v${version}";
hash = "sha256-WuTxsnYXudciTBH1RFHsIYNIHeoeZ+rI2JhYBYPUziw=";
hash = "sha256-lmNG9B2uO/zitOY/cNjnLRjCn6mSJ3CIpXIXpChDi9A=";
};
cargoHash = "sha256-eHEISCHh1jWCy3LwVuCx4LXfNLe1A4drHusyayoS+Ho=";
cargoHash = "sha256-foxl8pqRqEbVwUWUGHmaTGazrwLQxcDJ/RvJE9wIszg=";
nativeBuildInputs = [
pkg-config
@ -35,6 +35,7 @@ rustPlatform.buildRustPackage rec {
postPatch = ''
substituteInPlace src/domain/time.rs --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
substituteInPlace build.rs --replace "// gra::build" "gra::build"
'';
postInstall = ''

4
pkgs/applications/radio/flex-ncat/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "flex-ncat";
version = "0.1-20221007.1";
version = "0.1-20221109.1";
src = fetchFromGitHub {
owner = "kc2g-flex-tools";
repo = "nCAT";
rev = "v${version}";
hash = "sha256-9rxI3wsqjhaH7DD1Go/8s0r6jXaE15Z9PPtbsnsfrM0=";
hash = "sha256-MlbzPZuEOhb3wJMXWkrt6DK8z0MPgznSm0N9Y6vJVWY=";
};
vendorSha256 = "sha256-lnJtFixgv4ke4Knavb+XKFPzHCiAPhNtfZS3SRVvY2g=";

2
pkgs/applications/video/obs-studio/plugins/default.nix
View file

@ -22,7 +22,7 @@
obs-multi-rtmp = qt6Packages.callPackage ./obs-multi-rtmp { };
obs-ndi = qt6Packages.callPackage ./obs-ndi.nix { };
obs-ndi = qt6Packages.callPackage ./obs-ndi { };
obs-nvfbc = callPackage ./obs-nvfbc.nix { };

0
pkgs/applications/video/obs-studio/plugins/obs-ndi.nix → pkgs/applications/video/obs-studio/plugins/obs-ndi/default.nix
View file

0
pkgs/applications/video/obs-studio/plugins/hardcode-ndi-path.patch → pkgs/applications/video/obs-studio/plugins/obs-ndi/hardcode-ndi-path.patch
View file

4
pkgs/data/icons/numix-icon-theme-circle/default.nix
View file

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "numix-icon-theme-circle";
version = "23.01.12";
version = "23.01.25";
src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
sha256 = "sha256-WqCQxZcr19tKcEwULoW9O3rhq3fFs4xRl37p7VJYodY=";
sha256 = "sha256-bejoClo31C2gO7Ni1cIxaumwDrhumRZgAPpxS1Jt/Fw=";
};
nativeBuildInputs = [ gtk3 ];

2
pkgs/development/embedded/platformio/chrootenv.nix
View file

@ -38,7 +38,7 @@ buildFHSUserEnv {
mkdir -p $out/lib/udev/rules.d
ln -s $out/bin/platformio $out/bin/pio
ln -s ${src}/scripts/99-platformio-udev.rules $out/lib/udev/rules.d/99-platformio-udev.rules
ln -s ${src}/platformio/assets/system/99-platformio-udev.rules $out/lib/udev/rules.d/99-platformio-udev.rules
'';
runScript = "platformio";

4
pkgs/development/libraries/libayatana-indicator/default.nix
View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "libayatana-indicator";
version = "0.9.2";
version = "0.9.3";
src = fetchFromGitHub {
owner = "AyatanaIndicators";
repo = "libayatana-indicator";
rev = version;
sha256 = "sha256-Bi+whbODdJMSQ6iiIrHAwht1Efi83icerT7ubQvE5n0=";
sha256 = "sha256-tOZcrcuZowqDg/LRYTY6PCxKnpEd67k4xAHrIKupunI=";
};
nativeBuildInputs = [ pkg-config cmake ];

30
pkgs/development/libraries/science/biology/edlib/default.nix Normal file
View file

@ -0,0 +1,30 @@
{ lib, stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "edlib";
version = "unstable-2021-08-20";
src = fetchFromGitHub {
owner = "Martinsos";
repo = pname;
rev = "f8afceb49ab0095c852e0b8b488ae2c88e566afd";
hash = "sha256-P/tFbvPBtA0MYCNDabW+Ypo3ltwP4S+6lRDxwAZ1JFo=";
};
nativeBuildInputs = [ cmake ];
doCheck = true;
checkPhase = ''
runHook preCheck
bin/runTests
runHook postCheck
'';
meta = with lib; {
homepage = "https://martinsos.github.io/edlib";
description = "Lightweight, fast C/C++ library for sequence alignment using edit distance";
maintainers = with maintainers; [ bcdarwin ];
license = licenses.mit;
platforms = platforms.unix;
};
}

4
pkgs/development/python-modules/aws-lambda-builders/default.nix
View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "aws-lambda-builders";
version = "1.24.0";
version = "1.25.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "awslabs";
repo = "aws-lambda-builders";
rev = "refs/tags/v${version}";
hash = "sha256-Qr1E6MNBAKyNr0XbCIP0yJUFRvBpLhTZzTG06tdg31I=";
hash = "sha256-XdWrEJL/u+B15jAzxS7UZBhFBCVfSlnBtUcKcA0iUOw=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/ducc0/default.nix
View file

@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "ducc0";
version = "0.27.0";
version = "0.28.0";
disabled = pythonOlder "3.7";
@ -11,7 +11,7 @@ buildPythonPackage rec {
owner = "mtr";
repo = "ducc";
rev = "ducc0_${lib.replaceStrings ["."] ["_"] version}";
sha256 = "sha256-Z3eWuLuuA264z1ccdVp1YwAjDrLIXFxvTt/gC/zBE6o=";
sha256 = "sha256-yh7L87s3STL2usGBXgIhCS7GKQuau/PV6US3T06bb0M=";
};
buildInputs = [ pybind11 ];

36
pkgs/development/python-modules/edlib/default.nix Normal file
View file

@ -0,0 +1,36 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, edlib
, cython
, python
}:
buildPythonPackage {
inherit (edlib) pname src meta;
version = "1.3.9";
disabled = pythonOlder "3.6";
sourceRoot = "source/bindings/python";
preBuild = ''
ln -s ${edlib.src}/edlib .
'';
EDLIB_OMIT_README_RST = 1;
EDLIB_USE_CYTHON = 1;
nativeBuildInputs = [ cython ];
buildInputs = [ edlib ];
checkPhase = ''
runHook preCheck
${python.interpreter} test.py
runHook postCheck
'';
pythonImportsCheck = [ "edlib" ];
}

4
pkgs/development/python-modules/google-cloud-language/default.nix
View file

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "google-cloud-language";
version = "2.8.0";
version = "2.8.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-LEExcED6vlv2Lhto+KyLiz8uyDTa+rHLySUNDZpHGe4=";
hash = "sha256-o4o9x7r7HpwzByUijDegzos35FILro0Esr2ugN2nyws=";
};
propagatedBuildInputs = [

2
pkgs/development/python-modules/opytimark/default.nix
View file

@ -8,7 +8,7 @@
}:
buildPythonPackage rec {
pname = "opytimizer";
pname = "opytimark";
version = "1.0.8";
format = "setuptools";

40
pkgs/development/python-modules/pymedio/default.nix Normal file
View file

@ -0,0 +1,40 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, pytestCheckHook
, numpy
}:
buildPythonPackage rec {
pname = "pymedio";
version = "0.2.13";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "jcreinhold";
repo = "pymedio";
rev = "refs/tags/v${version}";
hash = "sha256-iHbClOrtYkHT1Nar+5j/ig4Krya8LdQdFB4Mmm5B9bg=";
};
# relax Python dep to work with 3.10.x
postPatch = ''
substituteInPlace setup.cfg --replace "!=3.10.*," ""
'';
propagatedBuildInputs = [ numpy ];
doCheck = false; # requires SimpleITK python package (not in Nixpkgs)
pythonImportsCheck = [
"pymedio"
];
meta = with lib; {
description = "Read medical image files into Numpy arrays";
homepage = "https://github.com/jcreinhold/pymedio";
license = licenses.mit;
maintainers = with maintainers; [ bcdarwin ];
};
}

4
pkgs/development/python-modules/sphinxcontrib-openapi/default.nix
View file

@ -14,12 +14,12 @@
buildPythonPackage rec {
pname = "sphinxcontrib-openapi";
version = "0.8.0";
version = "0.8.1";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
hash = "sha256-rO1qloTOgU5qVHURMyA6Ug7rC3UOjICqPUiFJ9RsLzA=";
hash = "sha256-BPz4fCWTRRYqUEzj3+4PcTifUHw3l3mNxTHHdImVtOs=";
};
nativeBuildInputs = [ setuptools-scm ];

33
pkgs/development/python-modules/ttach/default.nix Normal file
View file

@ -0,0 +1,33 @@
{ fetchFromGitHub
, pythonOlder
, pytestCheckHook
, torch
, buildPythonPackage
, lib
}:
buildPythonPackage rec {
pname = "ttach";
version = "0.0.3";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "qubvel";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-R6QO+9hv0eI7dZW5iJf096+LU1q+vnmOpveurgZemPc=";
};
propagatedBuildInputs = [ torch ];
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "ttach" ];
meta = with lib; {
description = "Image Test Time Augmentation with PyTorch";
homepage = "https://github.com/qubvel/ttach";
license = with licenses; [ mit ];
maintainers = with maintainers; [ cfhammill ];
};
}

8
pkgs/games/hexgui/default.nix
View file

@ -7,13 +7,13 @@
}:
stdenv.mkDerivation {
pname = "hexgui";
version = "unstable-2022-5-30";
version = "unstable-2023-1-7";
src = fetchFromGitHub {
owner = "selinger";
repo = "hexgui";
rev = "d94ce1d35a22dad28d3e7def4d28e6bebd54da9d";
hash = "sha256-1MroFH2JSEZHFigcsw1+xyHJWEnHTvHmRPVirUgwM6I=";
rev = "62f07ff51db0d4a945ad42f86167cc2f2ce65d90";
hash = "sha256-yEdZs9HUt3lcrdNO1OH8M8g71+2Ltf+v1RR1fKRDV0o=";
};
nativeBuildInputs = [ ant jdk makeWrapper ];
@ -28,7 +28,7 @@ stdenv.mkDerivation {
'';
meta = {
description = "GUI for the board game Hex (and Y)";
description = "GUI for the board game Hex";
homepage = "https://github.com/selinger/hexgui";
license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.ursi ];

41
pkgs/games/sm64ex/coop.nix Normal file
View file

@ -0,0 +1,41 @@
{ callPackage
, fetchFromGitHub
, autoPatchelfHook
, zlib
, stdenvNoCC
}:
callPackage ./generic.nix {
pname = "sm64ex-coop";
version = "0.pre+date=2022-08-05";
src = fetchFromGitHub {
owner = "djoslin0";
repo = "sm64ex-coop";
rev = "68634493de4cdd9db263e0f4f0b9b6772a60d30a";
sha256 = "sha256-3Ve93WGyBd8SAA0TBrpIrhj+ernjn1q7qXSi9mp36cQ=";
};
extraNativeBuildInputs = [
autoPatchelfHook
];
extraBuildInputs = [
zlib
];
postInstall =
let
sharedLib = stdenvNoCC.hostPlatform.extensions.sharedLibrary;
in
''
mkdir -p $out/lib
cp $src/lib/bass/libbass{,_fx}${sharedLib} $out/lib
cp $src/lib/discordsdk/libdiscord_game_sdk${sharedLib} $out/lib
'';
extraMeta = {
homepage = "https://github.com/djoslin0/sm64ex-coop";
description = "Super Mario 64 online co-op mod, forked from sm64ex";
};
}

52
pkgs/games/sm64ex/default.nix
View file

@ -1,55 +1,9 @@
{ lib
, stdenv
, fetchFromGitHub
, callPackage
, autoPatchelfHook
{ callPackage
, branch
}:
{
sm64ex = callPackage ./generic.nix {
pname = "sm64ex";
version = "0.pre+date=2021-11-30";
sm64ex = callPackage ./sm64ex.nix { };
src = fetchFromGitHub {
owner = "sm64pc";
repo = "sm64ex";
rev = "db9a6345baa5acb41f9d77c480510442cab26025";
sha256 = "sha256-q7JWDvNeNrDpcKVtIGqB1k7I0FveYwrfqu7ZZK7T8F8=";
};
extraMeta = {
homepage = "https://github.com/sm64pc/sm64ex";
description = "Super Mario 64 port based off of decompilation";
};
};
sm64ex-coop = callPackage ./generic.nix {
pname = "sm64ex-coop";
version = "0.pre+date=2022-05-14";
src = fetchFromGitHub {
owner = "djoslin0";
repo = "sm64ex-coop";
rev = "8200b175607fe2939f067d496627c202a15fe24c";
sha256 = "sha256-c1ZmMBtvYYcaJ/WxkZBVvNGVCeSXfm8NKe/BiAIJtks=";
};
extraNativeBuildInputs = [
autoPatchelfHook
];
postInstall = let
sharedLib = stdenv.hostPlatform.extensions.sharedLibrary;
in ''
mkdir -p $out/lib
cp $src/lib/bass/libbass{,_fx}${sharedLib} $out/lib
cp $src/lib/discordsdk/libdiscord_game_sdk${sharedLib} $out/lib
'';
extraMeta = {
homepage = "https://github.com/djoslin0/sm64ex-coop";
description = "Super Mario 64 online co-op mod, forked from sm64ex";
};
};
sm64ex-coop = callPackage ./coop.nix { };
}.${branch}

5
pkgs/games/sm64ex/generic.nix
View file

@ -2,7 +2,8 @@
, version
, src
, extraNativeBuildInputs ? [ ]
, extraMeta ? {}
, extraBuildInputs ? [ ]
, extraMeta ? { }
, compileFlags ? [ ]
, postInstall ? ""
, region ? "us"
@ -44,7 +45,7 @@ stdenv.mkDerivation rec {
buildInputs = [
audiofile
SDL2
];
] ++ extraBuildInputs;
enableParallelBuilding = true;

21
pkgs/games/sm64ex/sm64ex.nix Normal file
View file

@ -0,0 +1,21 @@
{ callPackage
, fetchFromGitHub
}:
callPackage ./generic.nix {
pname = "sm64ex";
version = "0.pre+date=2021-11-30";
src = fetchFromGitHub {
owner = "sm64pc";
repo = "sm64ex";
rev = "db9a6345baa5acb41f9d77c480510442cab26025";
sha256 = "sha256-q7JWDvNeNrDpcKVtIGqB1k7I0FveYwrfqu7ZZK7T8F8=";
};
extraMeta = {
homepage = "https://github.com/sm64pc/sm64ex";
description = "Super Mario 64 port based off of decompilation";
};
}

23
pkgs/os-specific/linux/fanctl/default.nix Normal file
View file

@ -0,0 +1,23 @@
{ lib, fetchFromGitLab, rustPlatform }:
rustPlatform.buildRustPackage rec {
version = "0.6.4";
pname = "fanctl";
src = fetchFromGitLab {
owner = "mcoffin";
repo = pname;
rev = "v${version}";
sha256 = "sha256-XmawybmqRJ9Lj6ii8TZBFwqdQZVp0pOLN4xiSLkU/bw=";
};
cargoSha256 = "sha256-tj00DXQEqC/8+3uzTMWcph+1fNTTVZLSJbV/5lLFkFs=";
meta = with lib; {
description = "Replacement for fancontrol with more fine-grained control interface in its config file";
homepage = "https://gitlab.com/mcoffin/fanctl";
license = licenses.gpl3Only;
maintainers = with maintainers; [ icewind1991 ];
platforms = platforms.linux;
};
}

4
pkgs/servers/haste-server/default.nix
View file

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "haste-server";
version = "20919c946602b8151157f647e475e30687a43727";
version = "ccc5049b07e9f90ec19fc2a88e5056367c53e202";
src = fetchFromGitHub {
owner = "toptal";
repo = "haste-server";
rev = version;
hash = "sha256-IPGsddPRu4/jT1NsUNOwUjSL3+ikGzMR3X3ohY66uAk=";
hash = "sha256-ODFHB2QwfLPxfjFsHrblSeiqLc9nPo7EOPGQ3AoqzSQ=";
};
nativeBuildInputs = [

42
pkgs/servers/haste-server/node-deps.nix
View file

@ -49,13 +49,13 @@ let
sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==";
};
};
"anymatch-3.1.2" = {
"anymatch-3.1.3" = {
name = "anymatch";
packageName = "anymatch";
version = "3.1.2";
version = "3.1.3";
src = fetchurl {
url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz";
sha512 = "P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==";
url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz";
sha512 = "KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==";
};
};
"argparse-2.0.1" = {
@ -67,13 +67,13 @@ let
sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==";
};
};
"async-3.2.4" = {
"async-2.6.4" = {
name = "async";
packageName = "async";
version = "3.2.4";
version = "2.6.4";
src = fetchurl {
url = "https://registry.npmjs.org/async/-/async-3.2.4.tgz";
sha512 = "iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==";
url = "https://registry.npmjs.org/async/-/async-2.6.4.tgz";
sha512 = "mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==";
};
};
"async-cache-1.1.0" = {
@ -670,6 +670,15 @@ let
sha512 = "iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==";
};
};
"lodash-4.17.21" = {
name = "lodash";
packageName = "lodash";
version = "4.17.21";
src = fetchurl {
url = "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz";
sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==";
};
};
"log-symbols-4.0.0" = {
name = "log-symbols";
packageName = "log-symbols";
@ -1237,13 +1246,13 @@ let
sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==";
};
};
"winston-2.4.6" = {
"winston-2.4.7" = {
name = "winston";
packageName = "winston";
version = "2.4.6";
version = "2.4.7";
src = fetchurl {
url = "https://registry.npmjs.org/winston/-/winston-2.4.6.tgz";
sha512 = "J5Zu4p0tojLde8mIOyDSsmLmcP8I3Z6wtwpTDHx1+hGcdhxcJaAmG4CFtagkb+NiN1M9Ek4b42pzMWqfc9jm8w==";
url = "https://registry.npmjs.org/winston/-/winston-2.4.7.tgz";
sha512 = "vLB4BqzCKDnnZH9PHGoS2ycawueX4HLqENXQitvFHczhgW2vFpSOn31LZtVr1KU8YTw7DS4tM+cqyovxo8taVg==";
};
};
"workerpool-6.1.0" = {
@ -1341,15 +1350,15 @@ let
name = "haste";
packageName = "haste";
version = "0.1.0";
src = ../../../../../../../../../nix/store/ksl6h7h03ks119z1skfipjh4irc8x80c-source;
src = ../../../../../../../../../nix/store/zmi5rwpy1kmyj52ymv3yc8ziiypjgrxd-source;
dependencies = [
sources."@ungap/promise-all-settled-1.1.2"
sources."ansi-colors-4.1.1"
sources."ansi-regex-3.0.1"
sources."ansi-styles-4.3.0"
sources."anymatch-3.1.2"
sources."anymatch-3.1.3"
sources."argparse-2.0.1"
sources."async-3.2.4"
sources."async-2.6.4"
sources."async-cache-1.1.0"
sources."balanced-match-1.0.2"
sources."base64-js-1.5.1"
@ -1430,6 +1439,7 @@ let
sources."isstream-0.1.2"
sources."js-yaml-4.0.0"
sources."locate-path-6.0.0"
sources."lodash-4.17.21"
sources."log-symbols-4.0.0"
sources."lru-cache-4.1.5"
sources."mime-2.6.0"
@ -1495,7 +1505,7 @@ let
sources."utils-merge-1.0.1"
sources."which-2.0.2"
sources."wide-align-1.1.3"
sources."winston-2.4.6"
sources."winston-2.4.7"
sources."workerpool-6.1.0"
(sources."wrap-ansi-7.0.0" // {
dependencies = [

4
pkgs/servers/headphones/default.nix
View file

@ -2,14 +2,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "headphones";
version = "0.6.0-beta.5";
version = "0.6.0";
format = "other";
src = fetchFromGitHub {
owner = "rembo10";
repo = "headphones";
rev = "v${version}";
sha256 = "1ddqk5ch1dlh895cm99li4gb4a596mvq3d0gah9vrbn6fyhp3b4v";
sha256 = "0wx0kj9brcd4i9fdc4hmp39cgr27qybya6bp108cfgfv9x7150iw";
};
dontBuild = true;

30
pkgs/servers/mastodon/default.nix
View file

@ -1,6 +1,7 @@
{ lib, stdenv, nodejs-slim, mkYarnPackage, fetchFromGitHub, bundlerEnv, nixosTests
, yarn, callPackage, imagemagick, ffmpeg, file, ruby_3_0, writeShellScript
, fetchYarnDeps, fixup_yarn_lock
, brotli
# Allow building a fork or custom version of Mastodon:
, pname ? "mastodon"
@ -45,7 +46,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-fuU92fydoazSXBHwA+DG//gRgWVYQ1M3m2oNS2iwv4I=";
};
nativeBuildInputs = [ fixup_yarn_lock nodejs-slim yarn mastodonGems mastodonGems.wrappedRuby ];
nativeBuildInputs = [ fixup_yarn_lock nodejs-slim yarn mastodonGems mastodonGems.wrappedRuby brotli ];
RAILS_ENV = "production";
NODE_ENV = "production";
@ -69,6 +70,17 @@ stdenv.mkDerivation rec {
rails assets:precompile
yarn cache clean --offline
rm -rf ~/node_modules/.cache
# Create missing static gzip and brotli files
gzip -9 -n -c ~/public/assets/500.html > ~/public/assets/500.html.gz
gzip -9 -n -c ~/public/packs/report.html > ~/public/packs/report.html.gz
find ~/public/assets -maxdepth 1 -type f -name ".*.json" | while read file; do
gzip -9 -n -c $file > $file.gz
done
brotli --best -f ~/public/packs/report.html -o ~/public/packs/report.html.br
find ~/public/assets -type f -regextype posix-extended -iregex '.*\.(css|js|json|html)' | while read file; do
brotli --best -f $file -o $file.br
done
'';
installPhase = ''
@ -95,6 +107,22 @@ stdenv.mkDerivation rec {
fi
done
# Create missing static gzip and brotli files
find public -maxdepth 1 -type f -regextype posix-extended -iregex '.*\.(css|js|svg|txt|xml)' | while read file; do
gzip -9 -n -c $file > $file.gz
brotli --best -f $file -o $file.br
done
find public/emoji -type f -name "*.svg" | while read file; do
gzip -9 -n -c $file > $file.gz
brotli --best -f $file -o $file.br
done
ln -s assets/500.html.gz public/500.html.gz
ln -s assets/500.html.br public/500.html.br
ln -s packs/sw.js.gz public/sw.js.gz
ln -s packs/sw.js.br public/sw.js.br
ln -s packs/sw.js.map.gz public/sw.js.map.gz
ln -s packs/sw.js.map.br public/sw.js.map.br
rm -rf log
ln -s /var/log/mastodon log
ln -s /tmp tmp

32
pkgs/servers/skydns/default.nix
View file

@ -1,22 +1,34 @@
{ lib, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:
buildGoPackage rec {
buildGoModule rec {
pname = "skydns";
version = "2.5.3a";
rev = version;
goPackagePath = "github.com/skynetservices/skydns";
version = "unstable-2019-10-15";
src = fetchFromGitHub {
inherit rev;
owner = "skynetservices";
repo = "skydns";
sha256 = "0i1iaif79cwnwm7pc8nxfa261cgl4zhm3p2a5a3smhy1ibgccpq7";
rev = "94b2ea0d8bfa43395656ea94d4a6235bdda47129";
hash = "sha256-OWLJmGx21UoWwrm6YNbPYdj3OgEZz7C+xccnkMOZ71g=";
};
goDeps = ./deps.nix;
vendorHash = "sha256-J3+DACU9JuazGCZZrfKxHukG5M+nb+WbV3eTG8EaT/w=";
meta = {
patches = [
# Add Go Modules support
(fetchpatch {
url = "https://github.com/skynetservices/skydns/commit/37be34cd64a3037a6d5a3b3dbb673f391e9d7eb1.patch";
hash = "sha256-JziYREg3vw8NMIPd8Zv8An7XUj+U6dvgRcaZph0DLPg=";
})
];
subPackages = [ "." ];
ldflags = [ "-s" "-w" ];
meta = with lib; {
description = "A distributed service for announcement and discovery of services";
homepage = "https://github.com/skynetservices/skydns";
license = lib.licenses.mit;
maintainers = with maintainers; [ aaronjheng ];
};
}

128
pkgs/servers/skydns/deps.nix generated
View file

@ -1,128 +0,0 @@
[
{
goPackagePath = "github.com/golang/protobuf";
fetch = {
type = "git";
url = "https://github.com/golang/protobuf";
rev = "59b73b37c1e45995477aae817e4a653c89a858db";
sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa";
};
}
{
goPackagePath = "github.com/coreos/go-systemd";
fetch = {
type = "git";
url = "https://github.com/coreos/go-systemd";
rev = "a606a1e936df81b70d85448221c7b1c6d8a74ef1";
sha256 = "0fhan564swp982dnzzspb6jzfdl453489c0qavh65g3shy5x8x28";
};
}
{
goPackagePath = "github.com/rcrowley/go-metrics";
fetch = {
type = "git";
url = "https://github.com/rcrowley/go-metrics";
rev = "1ce93efbc8f9c568886b2ef85ce305b2217b3de3";
sha256 = "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa";
};
}
{
goPackagePath = "github.com/prometheus/client_model";
fetch = {
type = "git";
url = "https://github.com/prometheus/client_model";
rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6";
sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9";
};
}
{
goPackagePath = "github.com/prometheus/common";
fetch = {
type = "git";
url = "https://github.com/prometheus/common";
rev = "40456948a47496dc22168e6af39297a2f8fbf38c";
sha256 = "15700w18pifng0l2isa6v25y91r5rb7yfgljqw2g2gqrvac6sr5l";
};
}
{
goPackagePath = "github.com/beorn7/perks";
fetch = {
type = "git";
url = "https://github.com/beorn7/perks";
rev = "b965b613227fddccbfffe13eae360ed3fa822f8d";
sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk";
};
}
{
goPackagePath = "github.com/coreos/go-etcd";
fetch = {
type = "git";
url = "https://github.com/coreos/go-etcd";
rev = "9847b93751a5fbaf227b893d172cee0104ac6427";
sha256 = "1ihq01ayqzxvn6hca5j00vl189vi5lm78f0fy2wpk5mrm3xi01l4";
};
}
{
goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
fetch = {
type = "git";
url = "https://github.com/matttproud/golang_protobuf_extensions";
rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a";
sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj";
};
}
{
goPackagePath = "github.com/prometheus/client_golang";
fetch = {
type = "git";
url = "https://github.com/prometheus/client_golang";
rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864";
sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna";
};
}
{
goPackagePath = "github.com/stathat/go";
fetch = {
type = "git";
url = "https://github.com/stathat/go";
rev = "91dfa3a59c5b233fef9a346a1460f6e2bc889d93";
sha256 = "105ql5v8r4hqcsq0ag7asdxqg9n7rvf83y1q1dj2nfjyn4manv6r";
};
}
{
goPackagePath = "github.com/ugorji/go";
fetch = {
type = "git";
url = "https://github.com/ugorji/go";
rev = "03e33114d4d60a1f37150325e15f51b0fa6fc4f6";
sha256 = "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v";
};
}
{
goPackagePath = "github.com/miekg/dns";
fetch = {
type = "git";
url = "https://github.com/miekg/dns";
rev = "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa";
sha256 = "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl";
};
}
{
goPackagePath = "github.com/prometheus/procfs";
fetch = {
type = "git";
url = "https://github.com/prometheus/procfs";
rev = "c91d8eefde16bd047416409eb56353ea84a186e4";
sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r";
};
}
{
goPackagePath = "bitbucket.org/ww/goautoneg";
fetch = {
type = "hg";
url = "bitbucket.org/ww/goautoneg";
rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675";
sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi";
};
}
]

6
pkgs/tools/admin/clair/default.nix
View file

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "clair";
version = "4.5.1";
version = "4.6.0";
src = fetchFromGitHub {
owner = "quay";
repo = pname;
rev = "v${version}";
hash = "sha256-4S9r8ez67bmhjEMp3w2xJVgkFN12B+pcyYVLc5P2Il0=";
hash = "sha256-Dl1wwK4OSv/nvhT7bH6qOdX4/qL3xFdmz5qiYaEm59Y=";
};
vendorSha256 = "sha256-Ly0U13C3WaGHRlu5Lj5MtdnTStTAJb4NUQpCY+7PeT0=";
vendorHash = "sha256-NqEpJHBZfzUQJ+H8CQBDdb37nlwA+JuXhZzfCAyO0Co=";
nativeBuildInputs = [
makeWrapper

35
pkgs/tools/audio/pw-volume/default.nix Normal file
View file

@ -0,0 +1,35 @@
{ lib
, fetchFromGitHub
, fetchurl
, rustPlatform
}:
rustPlatform.buildRustPackage rec {
pname = "pw-volume";
version = "0.4.0";
src = fetchFromGitHub {
owner = "smasher164";
repo = pname;
rev = "v${version}";
sha256 = "sha256-u7Ct9Kfwld/h3b6hUZdfHNuDGE4NA3MwrmgUj4g64lw=";
};
cargoPatches = [
(fetchurl {
# update Cargo.lock
url = "https://github.com/smasher164/pw-volume/commit/be104eaaeb84def26b392cc44bb1e7b880bef0fc.patch";
sha256 = "sha256-gssRcKpqxSAvW+2kJzIAR/soIQ3xg6LDZ7OeXds4ulY=";
})
];
cargoSha256 = "sha256-Vzd5ZbbzJh2QqiOrBOszsNqLwxM+mm2lbGd5JtKZzEM=";
meta = with lib; {
description = "Basic interface to PipeWire volume controls";
homepage = "https://github.com/smasher164/pw-volume";
license = licenses.mit;
maintainers = with maintainers; [ astro ];
platforms = platforms.linux;
};
}

9
pkgs/tools/filesystems/eiciel/default.nix
View file

@ -15,7 +15,7 @@
stdenv.mkDerivation rec {
pname = "eiciel";
version = "0.10.0-rc2";
version = "0.10.0";
outputs = [ "out" "nautilusExtension" ];
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
owner = "rofirrim";
repo = "eiciel";
rev = version;
sha256 = "+MXoT6J4tKuFaSvUTcM15cKWLUnS0kYgBfqH+5lz6KY=";
sha256 = "0lhnrxhbg80pqjy9f8yiqi7x48rb6m2cmkffv25ssjynsmdnar0s";
};
nativeBuildInputs = [
@ -46,11 +46,6 @@ stdenv.mkDerivation rec {
"-Dnautilus-extension-dir=${placeholder "nautilusExtension"}/lib/nautilus/extensions-4"
];
postPatch = ''
# https://github.com/rofirrim/eiciel/pull/9
substituteInPlace meson.build --replace "compiler.find_library('libacl')" "compiler.find_library('acl')"
'';
meta = with lib; {
description = "Graphical editor for ACLs and extended attributes";
homepage = "https://rofi.roger-ferrer.org/eiciel/";

4
pkgs/tools/networking/httplab/default.nix
View file

@ -5,7 +5,7 @@ buildGoModule rec {
version = "0.4.0";
src = fetchFromGitHub {
owner = "gchaincl";
owner = "qustavo";
repo = "httplab";
rev = "v${version}";
hash = "sha256-+qcECfQo9Wa4JQ09ujhKjQndmcFn03hTfII636+1ghA=";
@ -24,7 +24,7 @@ buildGoModule rec {
ldflags = [ "-s" "-w" ];
meta = with lib; {
homepage = "https://github.com/gchaincl/httplab";
homepage = "https://github.com/qustavo/httplab";
description = "Interactive WebServer";
license = licenses.mit;
maintainers = with maintainers; [ pradeepchhetri ];

16
pkgs/tools/security/fulcio/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "fulcio";
version = "0.6.0";
version = "1.0.0";
src = fetchFromGitHub {
owner = "sigstore";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ZWDvFSx+zH/P0ZfdqxAe+c4jFUH8mfY1vpUXlIxw1sI=";
sha256 = "sha256-djnDHRD/vHfsem03896qcEb6uzgW3OCMBLqMDHca9vY=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@ -20,7 +20,7 @@ buildGoModule rec {
find "$out" -name .git -print0 | xargs -0 rm -rf
'';
};
vendorSha256 = "sha256-LLvaaOZzp9b99eYOsfvbPRwZqSNfoinVUfYDmPiw5Mk=";
vendorSha256 = "sha256-X+M/E1kWhgS408PHwMg5jnDn2ad1NW6xvlLucuOLAeg=";
nativeBuildInputs = [ installShellFiles ];
@ -29,14 +29,14 @@ buildGoModule rec {
ldflags = [
"-s"
"-w"
"-X github.com/sigstore/fulcio/pkg/server.gitVersion=v${version}"
"-X github.com/sigstore/fulcio/pkg/server.gitTreeState=clean"
"-X sigs.k8s.io/release-utils/version.gitVersion=v${version}"
"-X sigs.k8s.io/release-utils/version.gitTreeState=clean"
];
# ldflags based on metadata from git and source
preBuild = ''
ldflags+=" -X github.com/sigstore/fulcio/pkg/server.gitCommit=$(cat COMMIT)"
ldflags+=" -X github.com/sigstore/fulcio/pkg/server.buildDate=$(cat SOURCE_DATE_EPOCH)"
ldflags+=" -X sigs.k8s.io/release-utils/version.gitCommit=$(cat COMMIT)"
ldflags+=" -X sigs.k8s.io/release-utils/version.buildDate=$(cat SOURCE_DATE_EPOCH)"
'';
preCheck = ''
@ -59,7 +59,7 @@ buildGoModule rec {
installCheckPhase = ''
runHook preInstallCheck
$out/bin/fulcio --help
$out/bin/fulcio version | grep "v${version}"
$out/bin/fulcio version 2>&1 | grep "v${version}"
runHook postInstallCheck
'';

8
pkgs/tools/video/tsduck/default.nix
View file

@ -49,6 +49,14 @@ stdenv.mkDerivation rec {
sed -i"" \
-e '/TSUNIT_TEST(testHomeDirectory);/ d' \
src/utest/utestSysUtils.cpp
sed -i"" \
-e '/TSUNIT_TEST(testIPv4Address);/ d' \
-e '/TSUNIT_TEST(testIPv4AddressConstructors);/ d' \
-e '/TSUNIT_TEST(testIPv4SocketAddressConstructors);/ d' \
-e '/TSUNIT_TEST(testTCPSocket);/ d' \
-e '/TSUNIT_TEST(testUDPSocket);/ d' \
src/utest/utestNetworking.cpp
'';
enableParallelBuilding = true;

6
pkgs/top-level/all-packages.nix
View file

@ -6707,6 +6707,8 @@ with pkgs;
edk2-uefi-shell = callPackage ../tools/misc/edk2-uefi-shell { };
edlib = callPackage ../development/libraries/science/biology/edlib { };
eff = callPackage ../development/interpreters/eff { };
eflite = callPackage ../applications/audio/eflite {};
@ -16557,6 +16559,8 @@ with pkgs;
pipewire_0_2 = callPackage ../development/libraries/pipewire/0.2.nix {};
wireplumber = callPackage ../development/libraries/pipewire/wireplumber.nix {};
pw-volume = callPackage ../tools/audio/pw-volume {};
pyradio = callPackage ../applications/audio/pyradio {};
racket = callPackage ../development/interpreters/racket {
@ -25618,6 +25622,8 @@ with pkgs;
fan2go = callPackage ../os-specific/linux/fan2go { };
fanctl = callPackage ../os-specific/linux/fanctl { };
fatrace = callPackage ../os-specific/linux/fatrace { };
ffado = libsForQt5.callPackage ../os-specific/linux/ffado {

8
pkgs/top-level/python-packages.nix
View file

@ -2937,6 +2937,10 @@ self: super: with self; {
editorconfig = callPackage ../development/python-modules/editorconfig { };
edlib = callPackage ../development/python-modules/edlib {
inherit (pkgs) edlib;
};
edward = callPackage ../development/python-modules/edward { };
effect = callPackage ../development/python-modules/effect { };
@ -8314,6 +8318,8 @@ self: super: with self; {
pymediaroom = callPackage ../development/python-modules/pymediaroom { };
pymedio = callPackage ../development/python-modules/pymedio { };
pymeeus = callPackage ../development/python-modules/pymeeus { };
pymelcloud = callPackage ../development/python-modules/pymelcloud { };
@ -11615,6 +11621,8 @@ self: super: with self; {
trytond = callPackage ../development/python-modules/trytond { };
ttach = callPackage ../development/python-modules/ttach { };
ttls = callPackage ../development/python-modules/ttls { };
ttp = callPackage ../development/python-modules/ttp { };