Merge master into staging-next
This commit is contained in:
commit
9819563ca9
36 changed files with 205 additions and 120 deletions
|
@ -11718,6 +11718,12 @@
|
|||
githubId = 1780588;
|
||||
name = "Malte Poll";
|
||||
};
|
||||
maltejanz = {
|
||||
email = "service.malte.j@protonmail.com";
|
||||
github = "MalteJanz";
|
||||
githubId = 18661391;
|
||||
name = "Malte Janz";
|
||||
};
|
||||
malte-v = {
|
||||
email = "nixpkgs@mal.tc";
|
||||
github = "malte-v";
|
||||
|
|
|
@ -14,6 +14,25 @@ let
|
|||
types
|
||||
;
|
||||
|
||||
inherit (hostPkgs) hostPlatform;
|
||||
|
||||
guestSystem =
|
||||
if hostPlatform.isLinux
|
||||
then hostPlatform.system
|
||||
else
|
||||
let
|
||||
hostToGuest = {
|
||||
"x86_64-darwin" = "x86_64-linux";
|
||||
"aarch64-darwin" = "aarch64-linux";
|
||||
};
|
||||
|
||||
supportedHosts = lib.concatStringsSep ", " (lib.attrNames hostToGuest);
|
||||
|
||||
message =
|
||||
"NixOS Test: don't know which VM guest system to pair with VM host system: ${hostPlatform.system}. Perhaps you intended to run the tests on a Linux host, or one of the following systems that may run NixOS tests: ${supportedHosts}";
|
||||
in
|
||||
hostToGuest.${hostPlatform.system} or (throw message);
|
||||
|
||||
baseOS =
|
||||
import ../eval-config.nix {
|
||||
inherit lib;
|
||||
|
@ -27,13 +46,14 @@ let
|
|||
({ config, ... }:
|
||||
{
|
||||
virtualisation.qemu.package = testModuleArgs.config.qemu.package;
|
||||
virtualisation.host.pkgs = hostPkgs;
|
||||
})
|
||||
({ options, ... }: {
|
||||
key = "nodes.nix-pkgs";
|
||||
config = optionalAttrs (!config.node.pkgsReadOnly) (
|
||||
mkIf (!options.nixpkgs.pkgs.isDefined) {
|
||||
# TODO: switch to nixpkgs.hostPlatform and make sure containers-imperative test still evaluates.
|
||||
nixpkgs.system = hostPkgs.stdenv.hostPlatform.system;
|
||||
nixpkgs.system = guestSystem;
|
||||
}
|
||||
);
|
||||
})
|
||||
|
|
|
@ -2,7 +2,11 @@
|
|||
{
|
||||
config = {
|
||||
# default pkgs for use in VMs
|
||||
_module.args.pkgs = hostPkgs;
|
||||
_module.args.pkgs =
|
||||
# TODO: deprecate it everywhere; not just on darwin. Throw on darwin?
|
||||
lib.warnIf hostPkgs.stdenv.hostPlatform.isDarwin
|
||||
"Do not use the `pkgs` module argument in tests you want to run on darwin. It is ambiguous, and many tests are broken because of it. If you need to use a package on the VM host, use `hostPkgs`. Otherwise, use `config.node.pkgs`, or `config.nodes.<name>.nixpkgs.pkgs`."
|
||||
hostPkgs;
|
||||
|
||||
defaults = {
|
||||
# TODO: a module to set a shared pkgs, if options.nixpkgs.* is untouched by user (highestPrio) */
|
||||
|
|
|
@ -41,7 +41,9 @@ in
|
|||
rawTestDerivation = hostPkgs.stdenv.mkDerivation {
|
||||
name = "vm-test-run-${config.name}";
|
||||
|
||||
requiredSystemFeatures = [ "kvm" "nixos-test" ];
|
||||
requiredSystemFeatures = [ "nixos-test" ]
|
||||
++ lib.optionals hostPkgs.stdenv.hostPlatform.isLinux [ "kvm" ]
|
||||
++ lib.optionals hostPkgs.stdenv.hostPlatform.isDarwin [ "apple-virt" ];
|
||||
|
||||
buildCommand = ''
|
||||
mkdir -p $out
|
||||
|
|
|
@ -1,4 +1,7 @@
|
|||
{ pkgs, lib, ... }: let
|
||||
{ config, lib, ... }: let
|
||||
|
||||
pkgs = config.node.pkgs;
|
||||
|
||||
commonConfig = ./common/acme/client;
|
||||
|
||||
dnsServerIP = nodes: nodes.dnsserver.networking.primaryIPAddress;
|
||||
|
|
|
@ -78,8 +78,9 @@ let
|
|||
# it with `allowAliases = false`?
|
||||
# warnIf pkgs.config.allowAliases "nixosTests: pkgs includes aliases."
|
||||
{
|
||||
_file = "${__curPos.file} readOnlyPkgs";
|
||||
_class = "nixosTest";
|
||||
node.pkgs = pkgs;
|
||||
node.pkgs = pkgs.pkgsLinux;
|
||||
};
|
||||
|
||||
in {
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, gitMinimal
|
||||
, pkg-config
|
||||
, alsa-lib
|
||||
, freetype
|
||||
|
@ -14,41 +15,23 @@
|
|||
, libXrandr
|
||||
}:
|
||||
|
||||
let
|
||||
juce-lv2 = stdenv.mkDerivation {
|
||||
pname = "juce-lv2";
|
||||
version = "unstable-2023-03-04";
|
||||
|
||||
# lv2 branch
|
||||
src = fetchFromGitHub {
|
||||
owner = "lv2-porting-project";
|
||||
repo = "JUCE";
|
||||
rev = "e825ad977cf4499a7bfa05b97b208236f8fd253b";
|
||||
sha256 = "sha256-Fqp1y9BN0E9p/12ukG1oh3COhXNRWBAlFRSl0LPyiFc=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
cp -r . $out
|
||||
'';
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "surge-XT";
|
||||
version = "1.2.3";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "surge-synthesizer";
|
||||
repo = "surge";
|
||||
rev = "release_xt_${version}";
|
||||
branchName = "release-xt/${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-DGzdzoCjMGEDltEwlPvLk2tyMVRH1Ql2Iq1ypogw/m0=";
|
||||
leaveDotGit = true;
|
||||
sha256 = "sha256-q6qs/OhIakF+Gc8Da3pnfkUGYDUoJbvee0o8dfrRI2U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
gitMinimal
|
||||
pkg-config
|
||||
];
|
||||
|
||||
|
@ -67,8 +50,7 @@ stdenv.mkDerivation rec {
|
|||
enableParallelBuilding = true;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DJUCE_SUPPORTS_LV2=ON"
|
||||
"-DSURGE_JUCE_PATH=${juce-lv2}"
|
||||
"-DSURGE_BUILD_LV2=TRUE"
|
||||
];
|
||||
|
||||
CXXFLAGS = [
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
, automake
|
||||
, bison
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, flex
|
||||
, git
|
||||
, lib
|
||||
|
@ -25,6 +26,23 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix gcc-13 build failure due to missing <stdexcept> include
|
||||
# https://github.com/stellar/medida/pull/34
|
||||
(fetchpatch {
|
||||
name = "gcc-13-p1.patch";
|
||||
url = "https://github.com/stellar/medida/commit/f91354b0055de939779d392999975d611b1b1ad5.patch";
|
||||
stripLen = 1;
|
||||
extraPrefix = "lib/libmedida/";
|
||||
hash = "sha256-iVeSUY5Rcy62apIKJdbcHGgxAxpQCkygf85oSjbTTXU=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "gcc-13-p2.patch";
|
||||
url = "https://github.com/stellar/stellar-core/commit/477b3135281b629554cabaeacfcdbcdc170aa335.patch";
|
||||
hash = "sha256-UVRcAIA5LEaCn16lWfhg19UU7b/apigzTsfPROLZtYg=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
automake
|
||||
autoconf
|
||||
|
|
|
@ -1,20 +1,33 @@
|
|||
{ mkDerivation, lib, qtbase, cmake, fetchFromGitHub }:
|
||||
{ mkDerivation, lib, qtbase, cmake, fetchFromGitHub, fetchpatch, unstableGitUpdater }:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "evtest-qt";
|
||||
version = "0.2.0";
|
||||
version = "0.2.0-unstable-2023-09-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Grumbel";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1wfzkgq81764qzxgk0y5vvpxcrb3icvrr4dd4mj8njrqgbwmn0mw";
|
||||
rev = "fb087f4d3d51377790f1ff30681c48031bf23145";
|
||||
hash = "sha256-gE47x1J13YZUVyB0b4VRyESIVCm3GbOXp2bX0TP97UU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build against gcc-13:
|
||||
# https://github.com/Grumbel/evtest-qt/pull/14
|
||||
(fetchpatch {
|
||||
name = "gcc-13.patch";
|
||||
url = "https://github.com/Grumbel/evtest-qt/commit/975dedcfd60853bd329f34d48ce4740add8866eb.patch";
|
||||
hash = "sha256-gR/9oVhO4G9i7dn+CjvDAQN0KLXoX/fatpE0W3gXDc0=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ qtbase ];
|
||||
|
||||
passthru.updateScript = unstableGitUpdater {};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple input device tester for linux with Qt GUI";
|
||||
homepage = "https://github.com/Grumbel/evtest-qt";
|
||||
|
|
|
@ -29,16 +29,20 @@ mkDerivation rec {
|
|||
|
||||
qmakeFlags = [ "INSTALLROOT=$(out)" ];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
sed -i -e '/unix:!macx:INSTALLROOT += \/usr/d' \
|
||||
-e "s@\$\$LIBSDIR/qt4/plugins@''${qtPluginPrefix}@" \
|
||||
-e "s@/etc/udev/rules.d@''${out}/lib/udev/rules.d@" \
|
||||
variables.pri
|
||||
|
||||
# Fix gcc-13 build failure by removing blanket -Werror.
|
||||
fgrep Werror variables.pri
|
||||
substituteInPlace variables.pri --replace-fail "QMAKE_CXXFLAGS += -Werror" ""
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postInstall = ''
|
||||
ln -sf $out/lib/*/libqlcplus* $out/lib
|
||||
'';
|
||||
|
|
|
@ -14,6 +14,14 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ scdoc ];
|
||||
buildInputs = [ bearssl ];
|
||||
|
||||
# Fix build on `gcc-13`:
|
||||
# inlined from 'xt_end_chain' at src/tofu.c:82:3,
|
||||
# ...-glibc-2.38-27-dev/include/bits/stdio2.h:54:10: error: '__builtin___snprintf_chk' specified bound 4 exceeds destination size 3 [-Werror=stringop-overflow]
|
||||
#
|
||||
# The overflow will not happen in practice, but `snprintf()` gets
|
||||
# passed one more byte than available.
|
||||
hardeningDisable = [ "fortify3" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Gemini client";
|
||||
homepage = "https://git.sr.ht/~sircmpwn/gmni";
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "acorn";
|
||||
version = "0.10.0";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "acorn-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-U4VQ8PsmJxeMYj7TlsQQOEPckECDK+ENBQLjq5VFyJ4=";
|
||||
hash = "sha256-Zw/OqN4d5iukh9oUXjczMvNKYkcGSUoDEwfti7uzZXQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-FZJqE7BWGvXsFsfxnnaKUFLInBzz+bUwURq4KvSMrus=";
|
||||
vendorHash = "sha256-d/1Rqh00THUwcMBWloevfKbScaWhVG5r/32Q4zYUaJg=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "clusterctl";
|
||||
version = "1.6.1";
|
||||
version = "1.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = "cluster-api";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-v87QxDx+DA5pJHmu6jNwLcs4dNEsa5fUoRcVAhMnh24=";
|
||||
hash = "sha256-OTOM83dsf6Fk+CYkACQOmguDTYfZvN9qes3S/cFEq/8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1W+nkhbJRHd4AaOzO01ZUu6wFvFIG0SOCzc4dg0Zopk=";
|
||||
vendorHash = "sha256-SwJx3KPdOugDYLLymPyrPam0uMyRWIDpQn79Sd9fhJ4=";
|
||||
|
||||
subPackages = [ "cmd/clusterctl" ];
|
||||
|
||||
|
|
|
@ -12,16 +12,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubebuilder";
|
||||
version = "3.13.0";
|
||||
version = "3.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = "kubebuilder";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JXI3hQVChM7czCwan1yswsrUSse/IbMzwXw0tnaBiek=";
|
||||
hash = "sha256-em+I2YICcqljaaNQ+zOAnOZ552elmV6Ywbfla8buwaY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-yiRxSJIIYJbkV3QAFclrDDnsBoX1t4cSRvGmwVgz/w8=";
|
||||
vendorHash = "sha256-iBwhpVs9u5AQAvmzb69SaewdYHmmaV19Bstd0Tux9CA=";
|
||||
|
||||
subPackages = ["cmd"];
|
||||
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubectl-gadget";
|
||||
version = "0.24.0";
|
||||
version = "0.25.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "inspektor-gadget";
|
||||
repo = "inspektor-gadget";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JC6+6PADTfxpVRowh09fXC8EO/qIsUTTba2uYxxxJ/A=";
|
||||
hash = "sha256-RbLc8c2F2Jy9jHwcd1FgqxhC5cl82oOauo/hsZ5zaG0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-7pwEQ1O3i4SmVSTTmOX9KPR0ePdDpf2dQgD4e6fDyzQ=";
|
||||
vendorHash = "sha256-/1dDAcICf7+g8hxaIAUsUwR9FNqatMhgAsvXrOuvGyk=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
|
|
|
@ -1,47 +1,47 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, cmake
|
||||
, git
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, wrapQtAppsHook
|
||||
, qtbase
|
||||
, qtquickcontrols2
|
||||
, qtgraphicaleffects
|
||||
, qtdeclarative
|
||||
, qtsvg
|
||||
, qtwebengine
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "graphia";
|
||||
version = "3.2";
|
||||
version = "4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "graphia-app";
|
||||
repo = "graphia";
|
||||
rev = version;
|
||||
sha256 = "sha256-9kohXLXF4F/qoHm8qmvPM1y9ak0Thb4xvgKJlVuOPTg=";
|
||||
sha256 = "sha256-8+tlQbTr6BGx+/gjviuNrQQWcxC/j6dJ+PxwB4fYmqQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix for a breakpad incompatibility with glibc>2.33
|
||||
# https://github.com/pytorch/pytorch/issues/70297
|
||||
# https://github.com/google/breakpad/commit/605c51ed96ad44b34c457bbca320e74e194c317e
|
||||
./breakpad-sigstksz.patch
|
||||
|
||||
# FIXME: backport patch fixing build with Qt 5.15, remove for next release
|
||||
# Fix gcc-13 build:
|
||||
(fetchpatch {
|
||||
url = "https://github.com/graphia-app/graphia/commit/4b51bb8d465afa7ed0b2b30cb1c5e1c6af95976f.patch";
|
||||
hash = "sha256-GDJAFLxQlRWKvcOgqqPYV/aVTRM7+KDjW7Zp9l7SuyM=";
|
||||
name = "gcc-13.patch";
|
||||
url = "https://github.com/graphia-app/graphia/commit/78fb55a4d73f96e9a182de433c7da60330bd5b5e.patch";
|
||||
hash = "sha256-waI2ur3gOKMQvqB2Qnyz7oMOMConl3jLMVKKmOmTpJs=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
git # needs to define some hash as a version
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtquickcontrols2
|
||||
qtgraphicaleffects
|
||||
qtdeclarative
|
||||
qtsvg
|
||||
qtwebengine
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -50,6 +50,7 @@ stdenv.mkDerivation rec {
|
|||
description = "A visualisation tool for the creation and analysis of graphs.";
|
||||
homepage = "https://graphia.app";
|
||||
license = licenses.gpl3Only;
|
||||
mainProgram = "Graphia";
|
||||
maintainers = [ maintainers.bgamari ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "git-lfs";
|
||||
version = "3.4.1";
|
||||
version = "3.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "git-lfs";
|
||||
repo = "git-lfs";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-XqxkNCC2yzUTVOi/1iDsnxtLkw4jfQuBh9UsjtZ1zVc=";
|
||||
hash = "sha256-iBv9kUaoyH9yEoCZYGYm+gmdjb797hWftzwkRNDNu3k=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-VmPeQYWOHFqFLHKcKH3WHz50yx7GMHVIDPzqiVwwjSg=";
|
||||
vendorHash = "sha256-N8HB2qwBxjzfNucftHxmX2W9srCx62pjmkCWzwiCj/I=";
|
||||
|
||||
nativeBuildInputs = [ asciidoctor installShellFiles ];
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, buildPackages, lib, callPackage, runCommand, stdenv, substituteAll, testers }:
|
||||
{ pkgs, pkgsLinux, buildPackages, lib, callPackage, runCommand, stdenv, substituteAll, testers }:
|
||||
# Documentation is in doc/builders/testers.chapter.md
|
||||
{
|
||||
# See https://nixos.org/manual/nixpkgs/unstable/#tester-testBuildFailure
|
||||
|
@ -107,7 +107,7 @@
|
|||
(lib.setDefaultModuleLocation "the argument that was passed to pkgs.runNixOSTest" testModule)
|
||||
];
|
||||
hostPkgs = pkgs;
|
||||
node.pkgs = pkgs;
|
||||
node.pkgs = pkgsLinux;
|
||||
};
|
||||
|
||||
# See doc/builders/testers.chapter.md or
|
||||
|
@ -123,7 +123,7 @@
|
|||
inherit pkgs;
|
||||
extraConfigurations = [(
|
||||
{ lib, ... }: {
|
||||
config.nixpkgs.pkgs = lib.mkDefault pkgs;
|
||||
config.nixpkgs.pkgs = lib.mkDefault pkgsLinux;
|
||||
}
|
||||
)];
|
||||
});
|
||||
|
|
|
@ -27,11 +27,11 @@ lib.recurseIntoAttrs {
|
|||
|
||||
# Check that the wiring of nixosTest is correct.
|
||||
# Correct operation of the NixOS test driver should be asserted elsewhere.
|
||||
nixosTest-example = pkgs-with-overlay.testers.nixosTest ({ lib, pkgs, figlet, ... }: {
|
||||
nixosTest-example = pkgs-with-overlay.testers.nixosTest ({ lib, ... }: {
|
||||
name = "nixosTest-test";
|
||||
nodes.machine = { pkgs, ... }: {
|
||||
system.nixos = dummyVersioning;
|
||||
environment.systemPackages = [ pkgs.proof-of-overlay-hello figlet ];
|
||||
environment.systemPackages = [ pkgs.proof-of-overlay-hello pkgs.figlet ];
|
||||
};
|
||||
testScript = ''
|
||||
machine.succeed("hello | figlet >/dev/console")
|
||||
|
|
|
@ -8,10 +8,10 @@ rustPlatform.buildRustPackage rec {
|
|||
owner = "RazrFalcon";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-lCA7C1G2xu65jn3/wzj6prWSrjQz3EqqJyMlPR/HRFs=";
|
||||
hash = "sha256-lCA7C1G2xu65jn3/wzj6prWSrjQz3EqqJyMlPR/HRFs=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-fOenXn5gagFss9DRDXXsGxQlDqVXZ5LZcdM4WsXAyUU=";
|
||||
cargoHash = "sha256-fOenXn5gagFss9DRDXXsGxQlDqVXZ5LZcdM4WsXAyUU=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool and Cargo subcommand that helps you find out what takes most of the space in your executable";
|
||||
|
@ -19,6 +19,6 @@ rustPlatform.buildRustPackage rec {
|
|||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ xrelkd matthiasbeyer ];
|
||||
mainProgram = "cargo-bloat";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cairo
|
||||
, fetchFromGitHub
|
||||
, gettext
|
||||
, glib
|
||||
, libdrm
|
||||
|
@ -16,6 +15,7 @@
|
|||
, pango
|
||||
, pkg-config
|
||||
, scdoc
|
||||
, stdenv
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, wayland-scanner
|
||||
|
@ -26,15 +26,17 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "labwc";
|
||||
version = "0.7.0";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "labwc";
|
||||
repo = "labwc";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-/z2Wo9zhuEVIpk8jHYwg2JbBqkX7tfDP2KTZ9yzj454=";
|
||||
hash = "sha256-6l+pYEMFQT8P0j40IcujSzlKgXzR5GIyuxkAJi65RiY=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
meson
|
||||
|
@ -62,8 +64,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
xwayland
|
||||
];
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
mesonFlags = [
|
||||
|
@ -77,8 +77,9 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
meta = {
|
||||
homepage = "https://github.com/labwc/labwc";
|
||||
description = "A Wayland stacking compositor, inspired by Openbox";
|
||||
changelog = "https://raw.githubusercontent.com/labwc/labwc/${finalAttrs.version}/NEWS.md";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
changelog = "https://github.com/labwc/labwc/blob/${finalAttrs.src.rev}/NEWS.md";
|
||||
license = with lib.licenses; [ gpl2Plus ];
|
||||
mainProgram = "labwc";
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
inherit (wayland.meta) platforms;
|
||||
};
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "live555";
|
||||
version = "2024.02.23";
|
||||
version = "2024.02.28";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
|
@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
"https://download.videolan.org/contrib/live555/live.${finalAttrs.version}.tar.gz"
|
||||
"mirror://sourceforge/slackbuildsdirectlinks/live.${finalAttrs.version}.tar.gz"
|
||||
];
|
||||
hash = "sha256-85JWXfsPAvocX5PiKXw9Xkd4zm2akzxMeETsZ3xm2wg=";
|
||||
hash = "sha256-5WjtkdqoofZIijunfomcEeWj6l4CUK9HRoYAle2jSx8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -2,23 +2,24 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ludtwig";
|
||||
version = "0.8.0";
|
||||
version = "0.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MalteJanz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-WF3tEf3SuXiH35Ny4RGLzvEW7yMsFcnVTX52e5qvK5g=";
|
||||
hash = "sha256-nNr0iis+wBd+xKJYQL7OWlQnU1DhKztsPHCq3+tX79w=";
|
||||
};
|
||||
|
||||
checkType = "debug";
|
||||
|
||||
cargoHash = "sha256-AbT8Jv6v7EVPX5mIplKaBkGrVonA8YWlMvo46coFMzk=";
|
||||
cargoHash = "sha256-Utho/foZOPz5K3WrOZjAkxvw7+J0RtbW0xvw/Txu/xk=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Linter / Formatter for Twig template files which respects HTML and your time.";
|
||||
description = "Linter / Formatter for Twig template files which respects HTML and your time";
|
||||
homepage = "https://github.com/MalteJanz/ludtwig";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ shyim ];
|
||||
maintainers = with maintainers; [ shyim maltejanz ];
|
||||
mainProgram = "ludtwig";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "virtio-win";
|
||||
version = "0.1.240-1";
|
||||
version = "0.1.248-1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-${version}/virtio-win.iso";
|
||||
hash = "sha256-69SCWGaPf3jgJu0nbCip0Z2D4CD/oICtaZENyGu8vMY=";
|
||||
hash = "sha256-1bVznPKX8FONJj4wZ41aCbukcKfGvL2N/3TkQVPxZUk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -43,13 +43,13 @@
|
|||
|
||||
mariadb = stdenv.mkDerivation rec {
|
||||
pname = "mariadb-connector-odbc";
|
||||
version = "3.1.14";
|
||||
version = "3.1.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mariadb-corporation";
|
||||
repo = "mariadb-connector-odbc";
|
||||
rev = version;
|
||||
sha256 = "0wvy6m9qfvjii3kanf2d1rhfaww32kg0d7m57643f79qb05gd6vg";
|
||||
hash = "sha256-l+HlS7/A0shwsEXYKDhi+QCmwHaMTeKrtcvo9yYpYws=";
|
||||
# this driver only seems to build correctly when built against the mariadb-connect-c subrepo
|
||||
# (see https://github.com/NixOS/nixpkgs/issues/73258)
|
||||
fetchSubmodules = true;
|
||||
|
|
|
@ -23,13 +23,13 @@
|
|||
|
||||
let
|
||||
pname = "devpod";
|
||||
version = "0.5.2";
|
||||
version = "0.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "loft-sh";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xvZ9I8VL50yS6tEQizp7bebyZVTCW6y2VOSyVZDJy6M=";
|
||||
sha256 = "sha256-BXr+2uia5skNRpdo8T+0uOVdh6WmWeC42PGNSURJhas=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gauge";
|
||||
version = "1.6.2";
|
||||
version = "1.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getgauge";
|
||||
repo = "gauge";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dCRuF1AYTcF2fKD7w7Gze2lE1hZYzpRz9u5p9uxqML0=";
|
||||
hash = "sha256-ymnyoQRMr3s74PnDSmXCoWGSMBhxy/CRDpRvEZHOrFU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-j3FpQ48LjIVteN80zvz88FF3z+pYD2aHJW4VxT0z0vI=";
|
||||
vendorHash = "sha256-5kBjxhmBrC5ZzD7CSzRvIzQrJYRRU/X+n9L9JPvyJkY=";
|
||||
|
||||
excludedPackages = [ "build" "man" ];
|
||||
|
||||
|
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rsonpath";
|
||||
version = "0.8.6";
|
||||
version = "0.8.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "v0ldek";
|
||||
repo = "rsonpath";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-p1cbxEvnV5vR1fznNbglHfKa53DboIFJqEWAXBLoQ+s=";
|
||||
hash = "sha256-AMnUErmufHc05MxHru/b4mFHH+HF9jfhoNi8yIejc64=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-rVJbrHsbSF8ZF44gmCUFxlGGhloC/kLBT5vSJjglxHE=";
|
||||
cargoHash = "sha256-flMzNxA1NWGy4ea7/dmPiEKspBmVuy82VPe5r8jaEGg=";
|
||||
|
||||
cargoBuildFlags = [ "-p=rsonpath" ];
|
||||
cargoTestFlags = cargoBuildFlags;
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tuxedo-keyboard-${kernel.version}";
|
||||
version = "3.2.7";
|
||||
version = "3.2.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tuxedocomputers";
|
||||
repo = "tuxedo-keyboard";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Q0wnejeLGLSDS0GPxQuYUKCAdzbYA66KT0DuWsEKIRs=";
|
||||
hash = "sha256-L3NsUUKA/snUcRWwlZidsBiTznhfulNldidEDDmNOkw=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchgit, fetchurl, git, cmake, pkg-config
|
||||
{ lib, stdenv, fetchgit, fetchurl, fetchpatch, git, cmake, pkg-config
|
||||
, openssl, boost, grpc, protobuf, libnsl, rocksdb_6_23, snappy }:
|
||||
|
||||
let
|
||||
|
@ -100,6 +100,17 @@ in stdenv.mkDerivation rec {
|
|||
hash = "sha256-VW/VmnhtF2xyHfEud3D6b3n8uTE0a/nDW1GISs5QfwM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix gcc-13 build due to missing <cstdint> includes:
|
||||
# https://github.com/XRPLF/rippled/pull/4555
|
||||
(fetchpatch {
|
||||
name = "gcc-13.patch";
|
||||
url = "https://github.com/XRPLF/rippled/commit/c9a586c2437bc8ffd22e946c82e1cbe906e1fc40.patch";
|
||||
hash = "sha256-+4BDTMFoQWUHljgwGB1gtczVPQH/U5MA0ojbnBykceg=";
|
||||
excludes = [ "src/ripple/basics/StringUtilities.h" ];
|
||||
})
|
||||
];
|
||||
|
||||
hardeningDisable = ["format"];
|
||||
cmakeFlags = ["-Dstatic=OFF" "-DBoost_NO_BOOST_CMAKE=ON" "-DSNAPPY_INCLUDE_DIR=${snappy}/include" ];
|
||||
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "syft";
|
||||
version = "0.105.1";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anchore";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-laseVMbgzKuVyF6PWpthtt3Wgv+WW5ccTjp0jj15nB0=";
|
||||
hash = "sha256-JDPHAFLs1o2dH72CRSglRbpmF+/xcSjvBqyYJUU3Ta8=";
|
||||
# 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;
|
||||
|
@ -22,7 +22,7 @@ buildGoModule rec {
|
|||
};
|
||||
# hash mismatch with darwin
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-u5leq9K9c31No6saMO5cK9futt4Wl4f/d6V2djC8T1w=";
|
||||
vendorHash = "sha256-tgptjaW9yu8Vk98YY+nX/lZU+ys/VuFKrwS8QIG8mXE=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
@ -14,12 +14,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "moreutils";
|
||||
version = "0.68";
|
||||
version = "0.69";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.joeyh.name/moreutils";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-kOY12oejH0xKaaPrKem+l0PACqyPqD4P1jEjOYfNntM=";
|
||||
hash = "sha256-hVvRAIXlG8+pAD2v/Ma9Z6EUL/1xIRz7Gx1fOxoQyi0=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "vale";
|
||||
version = "3.2.0";
|
||||
version = "3.2.1";
|
||||
|
||||
subPackages = [ "cmd/vale" ];
|
||||
outputs = [ "out" "data" ];
|
||||
|
@ -11,10 +11,10 @@ buildGoModule rec {
|
|||
owner = "errata-ai";
|
||||
repo = "vale";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-emAwoOFjB/zXkCLL8txs1OiMZ9DKm58eeenYFKctpzQ=";
|
||||
hash = "sha256-e3cxUO05OU1RYINX24E8XXkxPADWpaIYTUgbcQIys7w=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-cGWWjfkwgM1dAVKCl/Ao2ILyLyk0oPvqjLEZL0Clvyw=";
|
||||
vendorHash = "sha256-KxIQZViUYT4cgRlOuKBwen6pqQjGiAofkeBztmjnKdQ=";
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $data/share/vale
|
||||
|
|
|
@ -8722,7 +8722,7 @@ with pkgs;
|
|||
|
||||
google-guest-oslogin = callPackage ../tools/virtualization/google-guest-oslogin { };
|
||||
|
||||
google-cloud-cpp = disable-warnings-if-gcc13 (callPackage ../development/libraries/google-cloud-cpp { });
|
||||
google-cloud-cpp = callPackage ../development/libraries/google-cloud-cpp { };
|
||||
|
||||
google-java-format = callPackage ../development/tools/google-java-format { };
|
||||
|
||||
|
@ -16912,7 +16912,6 @@ with pkgs;
|
|||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
cargo-binutils = callPackage ../development/tools/rust/cargo-binutils { };
|
||||
cargo-bloat = callPackage ../development/tools/rust/cargo-bloat { };
|
||||
cargo-bolero = callPackage ../development/tools/rust/cargo-bolero { };
|
||||
cargo-bundle = callPackage ../development/tools/rust/cargo-bundle { };
|
||||
cargo-bundle-licenses = callPackage ../development/tools/rust/cargo-bundle-licenses { };
|
||||
|
@ -21328,7 +21327,7 @@ with pkgs;
|
|||
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
|
||||
};
|
||||
|
||||
graphia = libsForQt5.callPackage ../applications/science/misc/graphia { };
|
||||
graphia = qt6Packages.callPackage ../applications/science/misc/graphia { };
|
||||
|
||||
graphinder = callPackage ../tools/security/graphinder { };
|
||||
|
||||
|
@ -24290,9 +24289,9 @@ with pkgs;
|
|||
|
||||
primesieve = callPackage ../applications/science/math/primesieve { };
|
||||
|
||||
proj = disable-warnings-if-gcc13 (callPackage ../development/libraries/proj {
|
||||
proj = callPackage ../development/libraries/proj {
|
||||
stdenv = if stdenv.cc.isClang then overrideLibcxx llvmPackages_13.stdenv else stdenv;
|
||||
});
|
||||
};
|
||||
|
||||
proj_7 = callPackage ../development/libraries/proj/7.nix { };
|
||||
|
||||
|
@ -27623,7 +27622,7 @@ with pkgs;
|
|||
inherit (darwin.apple_sdk.frameworks) AppKit;
|
||||
};
|
||||
|
||||
btop = disable-warnings-if-gcc13 (darwin.apple_sdk_11_0.callPackage ../tools/system/btop { });
|
||||
btop = darwin.apple_sdk_11_0.callPackage ../tools/system/btop { };
|
||||
|
||||
nmon = callPackage ../os-specific/linux/nmon { };
|
||||
|
||||
|
@ -33902,7 +33901,7 @@ with pkgs;
|
|||
|
||||
rep-gtk = callPackage ../development/libraries/rep-gtk { };
|
||||
|
||||
reproc = disable-warnings-if-gcc13 (callPackage ../development/libraries/reproc { });
|
||||
reproc = callPackage ../development/libraries/reproc { };
|
||||
|
||||
sawfish = callPackage ../applications/window-managers/sawfish { };
|
||||
|
||||
|
@ -36848,9 +36847,9 @@ with pkgs;
|
|||
vertcoin = libsForQt5.callPackage ../applications/blockchains/vertcoin {
|
||||
withGui = true;
|
||||
};
|
||||
vertcoind = disable-warnings-if-gcc13 (callPackage ../applications/blockchains/vertcoin {
|
||||
vertcoind = callPackage ../applications/blockchains/vertcoin {
|
||||
withGui = false;
|
||||
});
|
||||
};
|
||||
|
||||
wasabiwallet = callPackage ../applications/blockchains/wasabiwallet { };
|
||||
|
||||
|
|
|
@ -53,6 +53,7 @@ let
|
|||
pkgsStatic = true;
|
||||
pkgsCross = true;
|
||||
pkgsi686Linux = true;
|
||||
pkgsLinux = true;
|
||||
pkgsExtraHardening = true;
|
||||
};
|
||||
|
||||
|
|
|
@ -243,6 +243,16 @@ let
|
|||
};
|
||||
} else throw "x86_64 Darwin package set can only be used on Darwin systems.";
|
||||
|
||||
# If already linux: the same package set unaltered
|
||||
# Otherwise, return a natively built linux package set for the current cpu architecture string.
|
||||
# (ABI and other details will be set to the default for the cpu/os pair)
|
||||
pkgsLinux =
|
||||
if stdenv.hostPlatform.isLinux
|
||||
then self
|
||||
else nixpkgsFun {
|
||||
localSystem = lib.systems.elaborate "${stdenv.hostPlatform.parsed.cpu.name}-linux";
|
||||
};
|
||||
|
||||
# Extend the package set with zero or more overlays. This preserves
|
||||
# preexisting overlays. Prefer to initialize with the right overlays
|
||||
# in one go when calling Nixpkgs, for performance and simplicity.
|
||||
|
|
Loading…
Reference in a new issue