mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-18 07:46:09 +01:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
bc094aeaee
42 changed files with 263 additions and 90 deletions
|
|
@ -14,7 +14,6 @@
|
|||
<xi:include href="../from_md/development/building-parts.chapter.xml" />
|
||||
<xi:include href="../from_md/development/what-happens-during-a-system-switch.chapter.xml" />
|
||||
<xi:include href="../from_md/development/writing-documentation.chapter.xml" />
|
||||
<xi:include href="../from_md/development/building-nixos.chapter.xml" />
|
||||
<xi:include href="../from_md/development/nixos-tests.chapter.xml" />
|
||||
<xi:include href="../from_md/development/testing-installer.chapter.xml" />
|
||||
</part>
|
||||
|
|
|
|||
|
|
@ -43,6 +43,40 @@ $ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd
|
|||
</para>
|
||||
<programlisting>
|
||||
# mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso
|
||||
</programlisting>
|
||||
</section>
|
||||
<section xml:id="sec-building-image-drivers">
|
||||
<title>Additional drivers or firmware</title>
|
||||
<para>
|
||||
If you need additional (non-distributable) drivers or firmware in
|
||||
the installer, you might want to extend these configurations.
|
||||
</para>
|
||||
<para>
|
||||
For example, to build the GNOME graphical installer ISO, but with
|
||||
support for certain WiFi adapters present in some MacBooks, you
|
||||
can create the following file at
|
||||
<literal>modules/installer/cd-dvd/installation-cd-graphical-gnome-macbook.nix</literal>:
|
||||
</para>
|
||||
<programlisting language="bash">
|
||||
{ config, ... }:
|
||||
|
||||
{
|
||||
imports = [ ./installation-cd-graphical-gnome.nix ];
|
||||
|
||||
boot.initrd.kernelModules = [ "wl" ];
|
||||
|
||||
boot.kernelModules = [ "kvm-intel" "wl" ];
|
||||
boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
|
||||
}
|
||||
</programlisting>
|
||||
<para>
|
||||
Then build it like in the example above:
|
||||
</para>
|
||||
<programlisting>
|
||||
$ git clone https://github.com/NixOS/nixpkgs.git
|
||||
$ cd nixpkgs/nixos
|
||||
$ export NIXPKGS_ALLOW_UNFREE=1
|
||||
$ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-graphical-gnome-macbook.nix default.nix
|
||||
</programlisting>
|
||||
</section>
|
||||
<section xml:id="sec-building-image-tech-notes">
|
||||
|
|
@ -30,6 +30,37 @@ To check the content of an ISO image, mount it like so:
|
|||
# mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso
|
||||
```
|
||||
|
||||
## Additional drivers or firmware {#sec-building-image-drivers}
|
||||
|
||||
If you need additional (non-distributable) drivers or firmware in the
|
||||
installer, you might want to extend these configurations.
|
||||
|
||||
For example, to build the GNOME graphical installer ISO, but with support for
|
||||
certain WiFi adapters present in some MacBooks, you can create the following
|
||||
file at `modules/installer/cd-dvd/installation-cd-graphical-gnome-macbook.nix`:
|
||||
|
||||
```nix
|
||||
{ config, ... }:
|
||||
|
||||
{
|
||||
imports = [ ./installation-cd-graphical-gnome.nix ];
|
||||
|
||||
boot.initrd.kernelModules = [ "wl" ];
|
||||
|
||||
boot.kernelModules = [ "kvm-intel" "wl" ];
|
||||
boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
|
||||
}
|
||||
```
|
||||
|
||||
Then build it like in the example above:
|
||||
|
||||
```ShellSession
|
||||
$ git clone https://github.com/NixOS/nixpkgs.git
|
||||
$ cd nixpkgs/nixos
|
||||
$ export NIXPKGS_ALLOW_UNFREE=1
|
||||
$ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-graphical-gnome-macbook.nix default.nix
|
||||
```
|
||||
|
||||
## Technical Notes {#sec-building-image-tech-notes}
|
||||
|
||||
The config value enforcement is implemented via `mkImageMediaOverride = mkOverride 60;`
|
||||
|
|
@ -14,4 +14,5 @@
|
|||
<xi:include href="../from_md/installation/installing.chapter.xml" />
|
||||
<xi:include href="../from_md/installation/changing-config.chapter.xml" />
|
||||
<xi:include href="../from_md/installation/upgrading.chapter.xml" />
|
||||
<xi:include href="../from_md/installation/building-nixos.chapter.xml" />
|
||||
</part>
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@ with lib;
|
|||
|
||||
perlPackages.buildPerlPackage rec {
|
||||
pname = "gscan2pdf";
|
||||
version = "2.12.5";
|
||||
version = "2.12.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gscan2pdf/gscan2pdf-${version}.tar.xz";
|
||||
sha256 = "sha256-MFWW9DTJ/svtgN3fbw+zeGpgg3pgIoC9jZ1HkG5p6sc=";
|
||||
sha256 = "sha256-9ntpUEM3buT3EhneXz9G8bibvzOnEK6Xt0jJcTvLKT0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
|
|
@ -111,8 +111,6 @@ perlPackages.buildPerlPackage rec {
|
|||
# # Looks like you failed 1 test of 1.
|
||||
# t/169_import_scan.t ........................... Dubious, test returned 1 (wstat 256, 0x100)
|
||||
rm t/169_import_scan.t
|
||||
# t/1604_import_multipage_DjVu.t ................ Dubious, test returned 255 (wstat 65280, 0xff00)
|
||||
rm t/1604_import_multipage_DjVu.t
|
||||
|
||||
# Disable a test which passes but reports an incorrect status
|
||||
# t/0601_Dialog_Scan.t .......................... All 14 subtests passed
|
||||
|
|
|
|||
|
|
@ -20,11 +20,11 @@ let
|
|||
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "vivaldi";
|
||||
version = "5.1.2567.73-1";
|
||||
version = "5.2.2623.39-1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
|
||||
sha256 = "04jzhipn4ip7x3zdwmfnp6w0qc2y1qdfy5w3qyy0r114jz9s9i7g";
|
||||
sha256 = "1dd44b109gdbjqcbf5rhvgyiqb6qi8vpimsh5fb359dmnqfan1hk";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "chromium-codecs-ffmpeg-extra";
|
||||
version = "97.0.4692.71";
|
||||
version = "101.0.4951.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://launchpadlibrarian.net/579085093/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb";
|
||||
sha256 = "sha256-YUv1D8U776NJBRPvYJigG7gyH9zd19FbnjAvIEhfYpA=";
|
||||
url = "https://launchpadlibrarian.net/594594495/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb";
|
||||
sha256 = "sha256-aelr/jODmgyVunSFFn6W+QHEmSWJeWzU4SaS5rjHli4=";
|
||||
};
|
||||
|
||||
buildInputs = [ dpkg ];
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gotktrix";
|
||||
version = "0.1.2";
|
||||
version = "0.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "diamondburned";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-K+q0sykdOMnAWypOXnwTU5oTokpYw61CTsAW1gIvGSQ=";
|
||||
sha256 = "sha256-/UDXqN7FnFvbiXp3pID1WbNfCuKDsMrFQvL1101xxOo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Br9KgUoN01yoGujgbj5UEoB57K87oEH/o40rrRtIZVY=";
|
||||
vendorSha256 = "sha256-xA2DW4v6aT4fEW2WSa96oRr5Yrb2HoR054V1+BiWSvk=";
|
||||
|
||||
buildInputs = [
|
||||
gtk4
|
||||
|
|
|
|||
|
|
@ -1,16 +1,24 @@
|
|||
{ stdenv, lib, fetchhg, cmake, which, python3, osi, cplex }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, python3
|
||||
, osi
|
||||
, cplex
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
version = "19.12";
|
||||
pname = "fast-downward";
|
||||
version = "21.12.0";
|
||||
|
||||
src = fetchhg {
|
||||
url = "http://hg.fast-downward.org/";
|
||||
rev = "41688a4f16b3";
|
||||
sha256 = "08m4k1mkx4sz7c2ab7xh7ip6b67zxv7kl68xrvwa83xw1yigqkna";
|
||||
src = fetchFromGitHub {
|
||||
owner = "aibasel";
|
||||
repo = "downward";
|
||||
rev = "release-21.12.0";
|
||||
sha256 = "sha256-qc+SaUpIYm7bnOZlHH2mdvUaMBB+VRyOCQM/BOoOaPE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake which ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ python3 python3.pkgs.wrapPython osi ];
|
||||
|
||||
cmakeFlags =
|
||||
|
|
|
|||
|
|
@ -16,6 +16,10 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ wxGTK30 boost lua zlib bzip2 xylib readline
|
||||
gnuplot swig3 ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
"-std=c++11"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Curve fitting and peak fitting software";
|
||||
license = lib.licenses.gpl2;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ genericUpdater
|
||||
{ lib
|
||||
, genericUpdater
|
||||
, common-updater-scripts
|
||||
}:
|
||||
|
||||
|
|
@ -9,9 +10,12 @@
|
|||
, rev-prefix ? ""
|
||||
, odd-unstable ? false
|
||||
, patchlevel-unstable ? false
|
||||
# explicit url is useful when git protocol is used only for tags listing
|
||||
# while actual release is referred by tarball
|
||||
, url ? null
|
||||
}:
|
||||
|
||||
genericUpdater {
|
||||
inherit pname version attrPath ignoredVersions rev-prefix odd-unstable patchlevel-unstable;
|
||||
versionLister = "${common-updater-scripts}/bin/list-git-tags";
|
||||
versionLister = "${common-updater-scripts}/bin/list-git-tags ${lib.optionalString (url != null) "--url=${url}"}";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yaru";
|
||||
version = "unstable-2022-04-07"; # 22.04.3.1 is broken
|
||||
version = "22.04.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ubuntu";
|
||||
repo = "yaru";
|
||||
rev = "9bdbf66bf3718c6595c7a15ef4698ba471a36526";
|
||||
sha256 = "02f6m0jxnsczw3y7v7bqdihxa33sx2z93yn3j8w4z9r9fv2pn06b";
|
||||
rev = version;
|
||||
sha256 = "sha256-EnlzjJDbiMIImn0XmiurK++JnD/kBqv4Mw6B/ps8d4Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ];
|
||||
|
|
|
|||
|
|
@ -21,6 +21,11 @@ stdenv.mkDerivation rec {
|
|||
"-DCMAKE_BUILD_TYPE=Release"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
"-Wno-error=misleading-indentation"
|
||||
"-Wno-error=stringop-overflow"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "FlatBuffers Compiler and Library in C for C ";
|
||||
homepage = "https://github.com/dvidelabs/flatcc";
|
||||
|
|
|
|||
|
|
@ -1,14 +1,17 @@
|
|||
{ lib, stdenv, fetchurl, libusb-compat-0_1, readline }:
|
||||
{ lib, stdenv, fetchFromGitHub, libusb-compat-0_1, readline, cmake, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libnfc";
|
||||
version = "1.7.1";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.bintray.com/nfc-tools/sources/libnfc-1.7.1.tar.bz2";
|
||||
sha256 = "0wj0iwwcpmpalyk61aa7yc6i4p9hgdajkrgnlswgk0vnwbc78pll";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nfc-tools";
|
||||
repo = pname;
|
||||
rev = "libnfc-${version}";
|
||||
sha256 = "5gMv/HajPrUL/vkegEqHgN2d6Yzf01dTMrx4l34KMrQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ libusb-compat-0_1 readline ];
|
||||
|
||||
configureFlags = [ "sysconfdir=/etc" ];
|
||||
|
|
@ -17,7 +20,7 @@ stdenv.mkDerivation {
|
|||
description = "Open source library libnfc for Near Field Communication";
|
||||
license = licenses.gpl3;
|
||||
homepage = "https://github.com/nfc-tools/libnfc";
|
||||
maintainers = with maintainers; [offline];
|
||||
maintainers = with maintainers; [ offline ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/openvenues/libpostal";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.Thra11 ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@ let
|
|||
}
|
||||
{ inherit self srcs patches; };
|
||||
|
||||
callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; };
|
||||
callPackage = self.newScope { inherit qtCompatVersion qtModule srcs stdenv; };
|
||||
in {
|
||||
|
||||
inherit callPackage qtCompatVersion qtModule srcs;
|
||||
|
|
|
|||
|
|
@ -144,7 +144,7 @@ let
|
|||
}
|
||||
{ inherit self srcs patches; };
|
||||
|
||||
callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; };
|
||||
callPackage = self.newScope { inherit qtCompatVersion qtModule srcs stdenv; };
|
||||
in {
|
||||
|
||||
inherit callPackage qtCompatVersion qtModule srcs;
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ let
|
|||
}
|
||||
{ inherit self srcs patches; };
|
||||
|
||||
callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; };
|
||||
callPackage = self.newScope { inherit qtCompatVersion qtModule srcs stdenv; };
|
||||
in {
|
||||
|
||||
inherit callPackage qtCompatVersion qtModule srcs;
|
||||
|
|
|
|||
|
|
@ -35,6 +35,11 @@ buildPythonPackage rec {
|
|||
"extension_helpers"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# https://github.com/astropy/extension-helpers/issues/43
|
||||
"test_write_if_different"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"extension_helpers"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "diff-cover";
|
||||
version = "6.4.5";
|
||||
version = "6.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "diff_cover";
|
||||
inherit version;
|
||||
sha256 = "sha256-qUuMHBfcJEmJF/con+ODtFfYrU7yo//KgKiSpByLWKY=";
|
||||
sha256 = "sha256-N2O0/C75EGO6crUCFGUiJLLQqfMVRNVQRZb1xKhHzXs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pg8000";
|
||||
version = "1.24.1";
|
||||
version = "1.24.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-KRIixd39ZqP8DTIXAM9ZHIsPkw0vyEh3fWz8/1VEPOY=";
|
||||
sha256 = "sha256-q3/ASKVvysTZwkeyKoNW5gjdmgPUg18ch/ui5PJihKU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ perl ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
"-std=c++11"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -1,10 +0,0 @@
|
|||
pkgs:
|
||||
|
||||
let
|
||||
callPackage = pkgs.callPackage;
|
||||
in {
|
||||
deliantra-server = callPackage ./deliantra-server.nix {};
|
||||
deliantra-arch = callPackage ./deliantra-arch.nix {};
|
||||
deliantra-maps = callPackage ./deliantra-maps.nix {};
|
||||
deliantra-data = callPackage ./deliantra-data.nix {};
|
||||
}
|
||||
|
|
@ -23,16 +23,20 @@ stdenv.mkDerivation rec {
|
|||
autoconf perl gperf optipng pngnq rsync imagemagick
|
||||
pkg-config makeWrapper
|
||||
];
|
||||
|
||||
propagatedBuildInputs = perl-deps;
|
||||
|
||||
buildInputs = [
|
||||
blitz boost glib
|
||||
];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
patches = [
|
||||
./0001-abs.patch
|
||||
./0002-datadir.patch
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/cfutil --prefix PERL5LIB : $PERL5LIB
|
||||
wrapProgram $out/bin/deliantra-server --prefix PERL5LIB : $PERL5LIB
|
||||
|
|
@ -50,14 +50,14 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "busybox";
|
||||
version = "1.34.1";
|
||||
version = "1.35.0";
|
||||
|
||||
# Note to whoever is updating busybox: please verify that:
|
||||
# nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test
|
||||
# still builds after the update.
|
||||
src = fetchurl {
|
||||
url = "https://busybox.net/downloads/${pname}-${version}.tar.bz2";
|
||||
sha256 = "0jfm9fik7nv4w21zqdg830pddgkdjmplmna9yjn9ck1lwn4vsps1";
|
||||
sha256 = "sha256-+u6yRMNaNIozT0pZ5EYm7ocPsHtohNaMEK6LwZ+DppQ=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" "pie" ]
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "haste-server";
|
||||
version = "3dcc43578b99dbafac35dece9d774ff2af39e8d0";
|
||||
version = "72863858338a57d54eb9dee55530e90ebbc22453";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "toptal";
|
||||
repo = "haste-server";
|
||||
rev = version;
|
||||
hash = "sha256-srSPRlG+gXSIwgVFLyfzRex97tCbV9FZXYpLD0KFRfw=";
|
||||
hash = "sha256-MoEqpfihI3ZqSTHOxFbGziDv8khgq2Nd44YuKYDGflc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -22,13 +22,13 @@ let
|
|||
sha512 = "JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==";
|
||||
};
|
||||
};
|
||||
"ansi-regex-3.0.0" = {
|
||||
"ansi-regex-3.0.1" = {
|
||||
name = "ansi-regex";
|
||||
packageName = "ansi-regex";
|
||||
version = "3.0.0";
|
||||
version = "3.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz";
|
||||
sha1 = "ed0317c322064f79466c02966bddb605ab37d998";
|
||||
url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz";
|
||||
sha512 = "+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==";
|
||||
};
|
||||
};
|
||||
"ansi-regex-5.0.1" = {
|
||||
|
|
@ -499,13 +499,13 @@ let
|
|||
sha512 = "AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==";
|
||||
};
|
||||
};
|
||||
"graceful-fs-4.2.9" = {
|
||||
"graceful-fs-4.2.10" = {
|
||||
name = "graceful-fs";
|
||||
packageName = "graceful-fs";
|
||||
version = "4.2.9";
|
||||
version = "4.2.10";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz";
|
||||
sha512 = "NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==";
|
||||
url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz";
|
||||
sha512 = "9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==";
|
||||
};
|
||||
};
|
||||
"growl-1.10.5" = {
|
||||
|
|
@ -1341,11 +1341,11 @@ let
|
|||
name = "haste";
|
||||
packageName = "haste";
|
||||
version = "0.1.0";
|
||||
src = ../../../../../../../../nix/store/5pfi6mmmdlqm2ixww08p7mlqj9a2dwbz-source;
|
||||
src = ../../../../../../../../../nix/store/jmii2np1kr78g0pnyf2y8wvj09nc1pr0-source;
|
||||
dependencies = [
|
||||
sources."@ungap/promise-all-settled-1.1.2"
|
||||
sources."ansi-colors-4.1.1"
|
||||
sources."ansi-regex-3.0.0"
|
||||
sources."ansi-regex-3.0.1"
|
||||
sources."ansi-styles-4.3.0"
|
||||
sources."anymatch-3.1.2"
|
||||
sources."argparse-2.0.1"
|
||||
|
|
@ -1412,7 +1412,7 @@ let
|
|||
sources."get-caller-file-2.0.5"
|
||||
sources."glob-7.1.6"
|
||||
sources."glob-parent-5.1.2"
|
||||
sources."graceful-fs-4.2.9"
|
||||
sources."graceful-fs-4.2.10"
|
||||
sources."growl-1.10.5"
|
||||
sources."has-flag-4.0.0"
|
||||
sources."he-1.2.0"
|
||||
|
|
|
|||
|
|
@ -21,13 +21,14 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
# fix build on gcc7+ and gcc11+
|
||||
NIX_CFLAGS_COMPILE = builtins.toString [
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
"-std=c++11" # c++17+ has errors
|
||||
"-Wno-error=builtin-declaration-mismatch"
|
||||
"-Wno-error=deprecated-copy"
|
||||
"-Wno-error=implicit-fallthrough"
|
||||
"-Wno-error=mismatched-new-delete"
|
||||
"-Wno-error=nonnull"
|
||||
] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [
|
||||
"-Wno-error=mismatched-new-delete"
|
||||
];
|
||||
|
||||
buildPhase = ''jam "-j$NIX_BUILD_CORES" '';
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@ let
|
|||
pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 ]);
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "sickgear";
|
||||
version = "0.25.28";
|
||||
version = "0.25.31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SickGear";
|
||||
repo = "SickGear";
|
||||
rev = "release_${version}";
|
||||
sha256 = "16d0yvsp9yp67q1clhjs77syd13bmfgbadxcc1x8yfrfvdy6v39l";
|
||||
sha256 = "11l537c7d6mrbvn24bfkzydb96mwzhr8z5rl6imiphjzr0f8qyyp";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
40
pkgs/tools/X11/xprintidle/default.nix
Normal file
40
pkgs/tools/X11/xprintidle/default.nix
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, xorg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xprintidle";
|
||||
version = "0.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "g0hl1n";
|
||||
repo = "xprintidle";
|
||||
rev = version;
|
||||
sha256 = "sha256-CgjHTvwQKR/TPQyEWKxN5j97Sh2iec0BQPhC96sfyoI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
xorg.libXScrnSaver
|
||||
xorg.libX11
|
||||
xorg.libXext
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/g0hl1n/xprintidle";
|
||||
description = "A utility that queries the X server for the user's idle time and prints it to stdout";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ fgaz ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -13,6 +13,10 @@ buildGoModule rec {
|
|||
|
||||
vendorSha256 = "sha256-BY45WirK9AVhvFGB5uqI4dLxzO2WuNNhhJbQ6nsRXao=";
|
||||
|
||||
ldflags = [
|
||||
"-X main.version=${version}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool to simplify storing secrets that should be accessible in the shell environment in your git repo.";
|
||||
homepage = "https://github.com/Shopify/ejson2env";
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "trivy";
|
||||
version = "0.25.3";
|
||||
version = "0.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TRcGUjmhV5vP3c4VeGfRtV+Fcnl/09HIQ+ojfAFWdm8=";
|
||||
sha256 = "sha256-Se42a9Q76LsMk6b04P2C2sWSZ2UgfnQrpJUC2gwdCwY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-3rJj+LDHQPYpYsU52kldFFpgS7Ry1n5Kjy0IAK6q/vU=";
|
||||
vendorSha256 = "sha256-y/7KhDx6p+n6nvFHWcvGbvOWsXvvL81jOgfjxsL/JDg=";
|
||||
|
||||
excludedPackages = "misc";
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "abcMIDI";
|
||||
version = "2022.03.20";
|
||||
version = "2022.04.06";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
|
||||
hash = "sha256-4PN4XL9Jx+vcT2QCA6GwomIqP7lRXkyBkRz641tephw=";
|
||||
hash = "sha256-s1LFiwFXQsodQdGvgNy7pgXhsWYHw7lVhRXuNYHnvNQ=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
, runCommand
|
||||
, nix-update-script
|
||||
, dsq
|
||||
, testVersion
|
||||
, diffutils
|
||||
}:
|
||||
|
||||
|
|
@ -23,10 +24,14 @@ buildGoModule rec {
|
|||
|
||||
nativeBuildInputs = [ diffutils ];
|
||||
|
||||
ldflags = [ "-X" "main.Version=${version}" ];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { attrPath = pname; };
|
||||
|
||||
tests = {
|
||||
version = testVersion { package = dsq; };
|
||||
|
||||
pretty-csv = runCommand "${pname}-test" { } ''
|
||||
mkdir "$out"
|
||||
cat <<EOF > "$out/input.csv"
|
||||
|
|
|
|||
|
|
@ -1,23 +1,27 @@
|
|||
{ lib, stdenv, fetchFromGitHub, curl, libzip, pkg-config }:
|
||||
{ lib, stdenv, fetchFromGitHub, curl, libzip, pkg-config, installShellFiles }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tldr";
|
||||
version = "1.4.2";
|
||||
version = "1.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tldr-pages";
|
||||
repo = "tldr-cpp-client";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dsEqnHIs6vamdfLrkstRcV90tt7QcKIJwrPr+ksTVlQ=";
|
||||
sha256 = "sha256-ZNUW2PebRUDLcZ2/dXClXqf8NUjgw6N73h32PJ8iwmM=";
|
||||
};
|
||||
|
||||
buildInputs = [ curl libzip ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [ pkg-config installShellFiles ];
|
||||
|
||||
makeFlags = ["CC=${stdenv.cc.targetPrefix}cc" "LD=${stdenv.cc.targetPrefix}cc" "CFLAGS="];
|
||||
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd tldr autocomplete/complete.{bash,fish,zsh}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simplified and community-driven man pages";
|
||||
longDescription = ''
|
||||
|
|
|
|||
|
|
@ -21,16 +21,16 @@
|
|||
# TODO investigate adding "api" "api-client" "vrl-cli" and various "vendor-*"
|
||||
# "disk-buffer" is using leveldb TODO: investigate how useful
|
||||
# it would be, perhaps only for massive scale?
|
||||
, features ? ([ "sinks" "sources" "transforms" ]
|
||||
, features ? ([ "sinks" "sources" "transforms" "vrl-cli" ]
|
||||
# the second feature flag is passed to the rdkafka dependency
|
||||
# building on linux fails without this feature flag (both x86_64 and AArch64)
|
||||
++ lib.optionals enableKafka [ "rdkafka-plain" "rdkafka/dynamic_linking" ]
|
||||
++ lib.optionals enableKafka [ "rdkafka/gssapi-vendored" ]
|
||||
++ lib.optional stdenv.targetPlatform.isUnix "unix")
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "vector";
|
||||
version = "0.20.1";
|
||||
version = "0.21.0";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit pname version;
|
||||
|
|
@ -39,10 +39,10 @@ rustPlatform.buildRustPackage {
|
|||
owner = "timberio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0xC6CpmSTRt7zj6RHqtjbMXWEiMUOdIymWVGI8Js+70=";
|
||||
sha256 = "sha256-ZhOtrv63ZhG3OEWLTk+VdZr6Y6f9KvyCJvAKWck7B7o=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-NLMyE9+iYFWuMmL50TeLZVvlHkIDaSZYJwXK4ykGrb8=";
|
||||
cargoSha256 = "sha256-VGB+ljojXGrQmcN0AT90hFk9h5nwjDTtzGpWmItw9x4=";
|
||||
nativeBuildInputs = [ pkg-config cmake perl ];
|
||||
buildInputs = [ oniguruma openssl protobuf rdkafka zstd ]
|
||||
++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ];
|
||||
|
|
@ -55,6 +55,9 @@ rustPlatform.buildRustPackage {
|
|||
|
||||
TZDIR = "${tzdata}/share/zoneinfo";
|
||||
|
||||
# needed to dynamically link rdkafka
|
||||
CARGO_FEATURE_DYNAMIC_LINKING=1;
|
||||
|
||||
buildNoDefaultFeatures = true;
|
||||
buildFeatures = features;
|
||||
|
||||
|
|
@ -105,5 +108,6 @@ rustPlatform.buildRustPackage {
|
|||
homepage = "https://github.com/timberio/vector";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ thoughtpolice happysalada ];
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,14 @@ stdenv.mkDerivation rec {
|
|||
# for flock
|
||||
lib.optional stdenv.isLinux util-linux;
|
||||
|
||||
CFLAGS = "-O2 -Wno-error=stringop-truncation";
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
"-O2"
|
||||
"-Wno-error=array-bounds"
|
||||
"-Wno-error=stringop-overflow"
|
||||
"-Wno-error=stringop-overread"
|
||||
"-Wno-error=stringop-truncation"
|
||||
];
|
||||
|
||||
buildPhase =
|
||||
lib.optionalString stdenv.isAarch32 "Seccomp_NO=1 "
|
||||
+ "bash do";
|
||||
|
|
|
|||
|
|
@ -19,12 +19,12 @@ in
|
|||
|
||||
openssh_hpn = common rec {
|
||||
pname = "openssh-with-hpn";
|
||||
version = "8.9p1";
|
||||
version = "9.0p1";
|
||||
extraDesc = " with high performance networking patches";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz";
|
||||
sha256 = "1ry5prcax0134v6srkgznpl9ch5snkgq7yvjqvd8c5mbnxa7cjgx";
|
||||
sha256 = "12m2f9czvgmi7akp7xah6y7mrrpi280a3ksk47iwr7hy2q1475q3";
|
||||
};
|
||||
|
||||
extraPatches = [
|
||||
|
|
|
|||
|
|
@ -11234,6 +11234,8 @@ with pkgs;
|
|||
|
||||
xfstests = callPackage ../tools/misc/xfstests { };
|
||||
|
||||
xprintidle = callPackage ../tools/X11/xprintidle {};
|
||||
|
||||
xprintidle-ng = callPackage ../tools/X11/xprintidle-ng {};
|
||||
|
||||
xscast = callPackage ../applications/video/xscast { };
|
||||
|
|
@ -19839,19 +19841,25 @@ with pkgs;
|
|||
qt512 = recurseIntoAttrs (makeOverridable
|
||||
(import ../development/libraries/qt-5/5.12) {
|
||||
inherit newScope;
|
||||
inherit lib stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper;
|
||||
inherit lib fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper;
|
||||
inherit bison cups dconf harfbuzz libGL perl gtk3;
|
||||
inherit (gst_all_1) gstreamer gst-plugins-base;
|
||||
inherit darwin;
|
||||
stdenv = if stdenv.cc.isGNU
|
||||
then (if (stdenv.targetPlatform.isx86_64) then gcc10Stdenv else gcc9Stdenv)
|
||||
else stdenv;
|
||||
});
|
||||
|
||||
qt514 = recurseIntoAttrs (makeOverridable
|
||||
(import ../development/libraries/qt-5/5.14) {
|
||||
inherit newScope;
|
||||
inherit lib stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper;
|
||||
inherit lib fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper;
|
||||
inherit bison cups dconf harfbuzz libGL perl gtk3;
|
||||
inherit (gst_all_1) gstreamer gst-plugins-base;
|
||||
inherit darwin;
|
||||
stdenv = if stdenv.cc.isGNU
|
||||
then (if (stdenv.targetPlatform.isx86_64) then gcc10Stdenv else gcc9Stdenv)
|
||||
else stdenv;
|
||||
});
|
||||
|
||||
qt515 = recurseIntoAttrs (makeOverridable
|
||||
|
|
@ -31121,8 +31129,18 @@ with pkgs;
|
|||
|
||||
cuyo = callPackage ../games/cuyo { };
|
||||
|
||||
inherit (import ../games/deliantra pkgs)
|
||||
deliantra-server deliantra-arch deliantra-maps deliantra-data;
|
||||
deliantra-server = callPackage ../games/deliantra/server.nix {
|
||||
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
|
||||
};
|
||||
deliantra-arch = callPackage ../games/deliantra/arch.nix {
|
||||
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
|
||||
};
|
||||
deliantra-maps = callPackage ../games/deliantra/maps.nix {
|
||||
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
|
||||
};
|
||||
deliantra-data = callPackage ../games/deliantra/data.nix {
|
||||
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
|
||||
};
|
||||
|
||||
ddnet = callPackage ../games/ddnet { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue