Merge master into staging-next

Changed files
+214 -192
nixos
modules
installer
pkgs
applications
misc
1password
science
logic
abella
version-management
pijul
data
fonts
cascadia-code
desktops
gnome
core
gnome-backgrounds
development
libraries
libvmaf
python-modules
coconut
cpyparsing
tools
analysis
actionlint
brakeman
ocaml
ocp-build
web
games
scummvm
misc
vscode-extensions
os-specific
servers
monitoring
prometheus
tools
filesystems
bcachefs-tools
misc
networking
security
top-level
+1 -1
nixos/modules/installer/tools/nixos-enter.sh
···
fi
# Run the activation script. Set $LOCALE_ARCHIVE to supress some Perl locale warnings.
-
LOCALE_ARCHIVE="$system/sw/lib/locale/locale-archive" chroot "$mountPoint" "$system/activate" 1>&2 || true
+
LOCALE_ARCHIVE="$system/sw/lib/locale/locale-archive" IN_NIXOS_ENTER=1 chroot "$mountPoint" "$system/activate" 1>&2 || true
# Create /tmp
chroot "$mountPoint" systemd-tmpfiles --create --remove --exclude-prefix=/dev 1>&2 || true
+25 -22
pkgs/applications/misc/1password/default.nix
···
stdenv.mkDerivation rec {
pname = "1password";
-
version = "1.11.2";
+
version = "1.12.2";
src =
-
if stdenv.isLinux then fetchzip {
-
url = {
-
"i686-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip";
-
"x86_64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip";
-
"aarch64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_arm_v${version}.zip";
-
}.${stdenv.hostPlatform.system};
-
sha256 = {
-
"i686-linux" = "0rh5bakj9qd43cf6wj5v46a3h98kcwqyc0f1yw72wvcacvjycyjz";
-
"x86_64-linux" = "00nf0cb8cxk1pvzr1wq778wvikzrlzy38r3rzkq44whdpdj50jzx";
-
"aarch64-linux" = "1gv282z49bj3ln5na4wb1z5455a64cyd54fp5i96k8shaxd0apxf";
-
}.${stdenv.hostPlatform.system};
-
stripRoot = false;
-
} else fetchurl {
-
url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_apple_universal_v${version}.pkg";
-
sha256 = "1pqdjr6d23j9fpwgahb0s1ni1bpjv9jajs1hapgq5kdrww2w7nhm";
-
};
+
if stdenv.isLinux then
+
fetchzip
+
{
+
url = {
+
"i686-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip";
+
"x86_64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip";
+
"aarch64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_arm_v${version}.zip";
+
}.${stdenv.hostPlatform.system};
+
sha256 = {
+
"i686-linux" = "tCm/vDBASPN9FBSVRJ6BrFc7hdtZWPEAgvokJhjazPg=";
+
"x86_64-linux" = "3VkVMuTAfeEowkguJi2fd1kG7GwO1VN5GBPgNaH3Zv4=";
+
"aarch64-linux" = "vWoA/0ZfdwVniHmxC4nH1QIc6bjdb00+SwlkIWc9BPs=";
+
}.${stdenv.hostPlatform.system};
+
stripRoot = false;
+
} else
+
fetchurl {
+
url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_apple_universal_v${version}.pkg";
+
sha256 = "xG/6YZdkJxr5Py90rkIyG4mK40yFTmNSfih9jO2uF+4=";
+
};
buildInputs = lib.optionals stdenv.isDarwin [ xar cpio ];
···
'';
meta = with lib; {
-
description = "1Password command-line tool";
-
homepage = "https://support.1password.com/command-line/";
+
description = "1Password command-line tool";
+
homepage = "https://support.1password.com/command-line/";
downloadPage = "https://app-updates.agilebits.com/product_history/CLI";
-
maintainers = with maintainers; [ joelburget marsam ];
-
license = licenses.unfree;
-
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ];
+
maintainers = with maintainers; [ joelburget marsam ];
+
license = licenses.unfree;
+
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ];
};
}
+2 -2
pkgs/applications/science/logic/abella/default.nix
···
stdenv.mkDerivation rec {
pname = "abella";
-
version = "2.0.6";
+
version = "2.0.7";
src = fetchurl {
url = "http://abella-prover.org/distributions/${pname}-${version}.tar.gz";
-
sha256 = "164q9gngckg6q69k13lwx2pq3cnc9ckw1qi8dnpxqfjgwfqr7xyi";
+
sha256 = "sha256-/eOiebMFHgrurtrSHPlgZO3xmmxBOUmyAzswXZLd3Yc=";
};
buildInputs = [ rsync ] ++ (with ocamlPackages; [ ocaml ocamlbuild findlib ]);
+3 -3
pkgs/applications/version-management/pijul/default.nix
···
rustPlatform.buildRustPackage rec {
pname = "pijul";
-
version = "1.0.0-alpha.54";
+
version = "1.0.0-alpha.55";
src = fetchCrate {
inherit version pname;
-
sha256 = "0b9494kwchfds8hk566k3fkwdvcskpgw0ajlrdry9lmmvx3vj7dc";
+
sha256 = "sha256-1nnn0cdDe+WOetGtRe7dMEyuCcbfRHdJWFxQ4bTXebQ=";
};
-
cargoSha256 = "0rgd6mfxbxgzpj2nj2y315kgvxiayr9xbma4j014bc61ms7cnys7";
+
cargoSha256 = "sha256-j9xf97qPdhtakIwhAql0/Go5fPxlyWKAVLk5CMBfAbs=";
cargoBuildFlags = lib.optional gitImportSupport "--features=git";
+2 -2
pkgs/data/fonts/cascadia-code/default.nix
···
{ lib, fetchzip }:
let
-
version = "2106.17";
+
version = "2108.26";
in
fetchzip {
name = "cascadia-code-${version}";
url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaCode-${version}.zip";
-
sha256 = "sha256-EsXD6gY3q3KIk37vYPz731lLz5989cd+s5fz5rKIn2k=";
+
sha256 = "1dvwn5rs4ss4rwd64namy8ccz8dagkk84qjg13sxxqizyd5y08h1";
postFetch = ''
mkdir -p $out/share/fonts/
+7
pkgs/desktops/gnome/core/gnome-backgrounds/default.nix
···
updateScript = gnome.updateScript { packageName = "gnome-backgrounds"; attrPath = "gnome.gnome-backgrounds"; };
};
+
patches = [
+
# Makes the database point to stable paths in /run/current-system/sw/share, which don't decay whenever this package's hash changes.
+
# This assumes a nixos + gnome system, where this package is installed in environment.systemPackages,
+
# and /share outputs are included in environment.pathsToLink.
+
./stable-dir.patch
+
];
+
nativeBuildInputs = [ meson ninja pkg-config gettext ];
meta = with lib; {
+9
pkgs/desktops/gnome/core/gnome-backgrounds/stable-dir.patch
···
+
diff --git a/backgrounds/meson.build b/backgrounds/meson.build
+
index 2175a16..cf521df 100644
+
--- a/backgrounds/meson.build
+
+++ b/backgrounds/meson.build
+
@@ -1,5 +1,5 @@
+
dataconf = configuration_data()
+
-dataconf.set('BACKGROUNDDIR', backgrounddir)
+
+dataconf.set('BACKGROUNDDIR', '/run/current-system/sw/share/backgrounds/gnome')
+
dataconf.set('datadir', datadir)
+3 -3
pkgs/development/libraries/libvmaf/default.nix
···
stdenv.mkDerivation rec {
pname = "libvmaf";
-
version = "2.2.1";
+
version = "2.3.0";
src = fetchFromGitHub {
owner = "netflix";
repo = "vmaf";
rev = "v${version}";
-
sha256 = "sha256-t1dK4UnperX9YtvmTwIo/03Dxq/Pl+K6kZIL0uX1OcE=";
+
sha256 = "12mwl7vxc3xi0qar386mkhkpah9zzgjb74mzc2qqsgz9zzxp16dm";
};
sourceRoot = "source/libvmaf";
···
meta = with lib; {
homepage = "https://github.com/Netflix/vmaf";
description = "Perceptual video quality assessment based on multi-method fusion (VMAF)";
-
changelog = "https://github.com/Netflix/vmaf/blob/v${version}/CHANGELOG.md";
+
changelog = "https://github.com/Netflix/vmaf/raw/v${version}/CHANGELOG.md";
platforms = platforms.unix;
license = licenses.bsd2Patent;
maintainers = [ maintainers.cfsmp3 maintainers.marsam ];
+10 -19
pkgs/development/python-modules/coconut/default.nix
···
, cpyparsing
, ipykernel
, mypy
+
, pexpect
, pygments
, pytestCheckHook
, prompt-toolkit
···
buildPythonApplication rec {
pname = "coconut";
-
version = "1.4.3";
+
version = "1.5.0";
src = fetchFromGitHub {
owner = "evhub";
repo = "coconut";
rev = "v${version}";
-
sha256 = "1pz13vza3yy95dbylnq89fzc3mwgcqr7ds096wy25k6vxd9dp9c3";
+
sha256 = "1gc0fwqwzn1j6mcg1f6fw832w66pbaaq9mmi0r4kw3xn5f877icz";
};
-
propagatedBuildInputs = [ cpyparsing pygments prompt-toolkit ipykernel mypy watchdog ];
+
propagatedBuildInputs = [ cpyparsing ipykernel mypy pygments prompt-toolkit watchdog ];
-
patches = [
-
(fetchpatch {
-
name = "fix-setuptools-version-check.patch";
-
url = "https://github.com/LibreCybernetics/coconut/commit/2916a087da1e063cc4438b68d4077347fd1ea4a2.patch";
-
sha256 = "136jbd2rvnifw30y73vv667002nf7sbkm5qyihshj4db7ngysr6q";
-
})
-
(fetchpatch {
-
name = "support-python-3.9.patch";
-
url = "https://github.com/evhub/coconut/commit/5c724b4dd92fb62c614d8192e3cac3dd1d475790.patch";
-
sha256 = "04xmzyfmyv6gr2l2z6pdxlllwzcmwxvahxzqyxglr36hfl33ad71";
-
})
-
];
+
postPatch = ''
+
substituteInPlace coconut/kernel_installer.py \
+
--replace "fixpath(os.path.join(sys.exec_prefix, icoconut_custom_kernel_install_loc))" \
+
"fixpath(icoconut_custom_kernel_install_loc)"
+
'';
-
checkInputs = [
-
pytestCheckHook
-
tkinter
-
];
+
checkInputs = [ pexpect pytestCheckHook tkinter ];
# Currently most tests do not work on Hydra due to external fetches.
pytestFlagsArray = [
+6 -4
pkgs/development/python-modules/cpyparsing/default.nix
···
-
{ lib, buildPythonPackage, fetchFromGitHub, cython, python }:
+
{ lib, buildPythonPackage, fetchFromGitHub, cython, pexpect, python }:
buildPythonPackage rec {
pname = "cpyparsing";
-
version = "2.4.5.0.1.1";
+
version = "2.4.5.0.1.2";
src = fetchFromGitHub {
owner = "evhub";
repo = pname;
-
rev = "aa8ee45daec5c55328446bad7202ab8f799ab0ce"; # No tags on repo
-
sha256 = "1mxa5q41cb0k4lkibs0d4lzh1w6kmhhdrsm0w0r1m3s80m05ffmw";
+
rev = "38f2b323b99cee9a080106ae9951ffc5752599f0"; # No tags on repo
+
sha256 = "0wrm6vzwp968z7s0qhr23v39ivyxzvav3mv9i2n0iv9zl041kypv";
};
nativeBuildInputs = [ cython ];
+
+
checkInputs = [ pexpect ];
checkPhase = "${python.interpreter} tests/cPyparsing_test.py";
+2 -2
pkgs/development/tools/analysis/actionlint/default.nix
···
buildGoModule rec {
pname = "actionlint";
-
version = "1.6.5";
+
version = "1.6.6";
subPackages = [ "cmd/actionlint" ];
···
owner = "rhysd";
repo = "actionlint";
rev = "v${version}";
-
sha256 = "12s9ijfvnmfbcvf5lxi2jm3j7vrn7rfkas2lib5jdih77hf9270k";
+
sha256 = "17c6952cjdpbl70lnn34pl3njrvpqmdbgnrm1q69kx94bni1slnz";
};
vendorSha256 = "1i7442n621jmc974b73pfz1gyqw74ilpg1zz16yxqpfh5c958m7n";
+2 -2
pkgs/development/tools/analysis/brakeman/Gemfile.lock
···
GEM
remote: https://rubygems.org/
specs:
-
brakeman (5.0.4)
+
brakeman (5.1.1)
PLATFORMS
ruby
···
brakeman
BUNDLED WITH
-
2.1.4
+
2.2.24
+2 -2
pkgs/development/tools/analysis/brakeman/gemset.nix
···
platforms = [];
source = {
remotes = ["https://rubygems.org"];
-
sha256 = "1czqmrqbli2cnw4vv4pzz8bk78c7lpcnnyba74cj632swv1za6jd";
+
sha256 = "0y71fqqd0azy5rn78fwiz9px0mql23zrl0ij0dzdkx22l4cscpb0";
type = "gem";
};
-
version = "5.0.4";
+
version = "5.1.1";
};
}
+1 -4
pkgs/development/tools/ocaml/ocp-build/default.nix
···
in
stdenv.mkDerivation {
-
name = "ocaml${ocaml.version}-ocp-build-${version}-beta";
+
name = "ocaml${ocaml.version}-ocp-build-${version}";
src = fetchFromGitHub {
owner = "OCamlPro";
···
buildInputs = [ ocaml findlib cmdliner re ];
propagatedBuildInputs = [ ncurses ];
preInstall = "mkdir -p $out/bin";
-
preConfigure = ''
-
export configureFlags="$configureFlags --with-metadir=$OCAMLFIND_DESTDIR"
-
'';
meta = with lib; {
homepage = "https://www.typerex.org/ocp-build.html";
+1 -1
pkgs/development/web/nodejs/nodejs.nix
···
meta = {
description = "Event-driven I/O framework for the V8 JavaScript engine";
homepage = "https://nodejs.org";
-
changelog = "https://github.com/nodejs/node/blob/v${version}/doc/changelogs/CHANGELOG_V${majorVersion}.md#${version}";
+
changelog = "https://github.com/nodejs/node/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ goibhniu gilligan cko marsam ];
platforms = platforms.linux ++ platforms.darwin;
+2 -2
pkgs/development/web/nodejs/v16.nix
···
in
buildNodejs {
inherit enableNpm;
-
version = "16.11.1";
-
sha256 = "0y32mdv8zs35la2bny8d9rxjvj1vr8z079ji1g6ajc2yw96pyn37";
+
version = "16.12.0";
+
sha256 = "1b3bschfa7946jwyqp3nmbdv7ap3rl4p7h50b9bac08981m0lqjz";
patches = [ ./disable-darwin-v8-system-instrumentation.patch ];
}
+13
pkgs/development/web/nodejs/v17.nix
···
+
{ callPackage, python3, enableNpm ? true }:
+
+
let
+
buildNodejs = callPackage ./nodejs.nix {
+
python = python3;
+
};
+
in
+
buildNodejs {
+
inherit enableNpm;
+
version = "17.0.1";
+
sha256 = "071lhqbn103rnn8avqmqwnn2k4yqgcymx624f23k8z6bfbw81i3f";
+
patches = [ ./disable-darwin-v8-system-instrumentation.patch ];
+
}
+2 -2
pkgs/games/scummvm/default.nix
···
stdenv.mkDerivation rec {
pname = "scummvm";
-
version = "2.2.0";
+
version = "2.5.0";
src = fetchurl {
url = "http://scummvm.org/frs/scummvm/${version}/${pname}-${version}.tar.xz";
-
sha256 = "FGllflk72Ky8+sC4ObCG9kDr8SBjPpPxFsq2UrWyc4c=";
+
sha256 = "sha256:08ynw1cmld41p4bwrw84gb1nv229va70i91qiqsjr3c2jnqy8zml";
};
nativeBuildInputs = [ nasm ];
+2 -2
pkgs/misc/vscode-extensions/default.nix
···
mktplcRef = {
name = "todo-tree";
publisher = "Gruntfuggly";
-
version = "0.0.213";
-
sha256 = "0fj7vvaqdldhbzm9dqh2plqlhg34jv5khd690xd87h418sv8rk95";
+
version = "0.0.214";
+
sha256 = "0rwxjnrl44rnhx3183037k6435xs4772p58a37azl5cahsyav1hk";
};
meta = with lib; {
license = licenses.mit;
+8 -5
pkgs/os-specific/linux/i2c-tools/default.nix
···
stdenv.mkDerivation rec {
pname = "i2c-tools";
-
version = "4.2";
+
version = "4.3";
src = fetchgit {
url = "https://git.kernel.org/pub/scm/utils/i2c-tools/i2c-tools.git";
rev = "v${version}";
-
sha256 = "0vqrbp10klr7ylarr6cy1q7nafiqaky4iq5my5dqy101h93vg4pg";
+
sha256 = "sha256-HlmIocum+HZEKNiS5BUwEIswRfTMUhD1vCPibAuAK0Q=";
};
buildInputs = [ perl ];
postPatch = ''
-
substituteInPlace eeprom/decode-edid --replace "/usr/sbin/parse-edid" "${read-edid}/bin/parse-edid"
-
substituteInPlace stub/i2c-stub-from-dump --replace "/sbin/" ""
+
substituteInPlace eeprom/decode-edid \
+
--replace "/usr/sbin/parse-edid" "${read-edid}/bin/parse-edid"
+
+
substituteInPlace stub/i2c-stub-from-dump \
+
--replace "/sbin/" ""
'';
makeFlags = [ "PREFIX=${placeholder "out"}" ];
···
outputs = [ "out" "man" ];
postInstall = ''
-
rm -rf $out/include # Installs include/linux/i2c-dev.h that conflics with kernel headers
+
rm -rf $out/include/linux/i2c-dev.h # conflics with kernel headers
'';
meta = with lib; {
+30 -21
pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
···
-
{ lib, buildPackages, fetchFromGitHub, fetchpatch, perl, buildLinux, ... } @ args:
+
{ lib
+
, fetchpatch
+
, kernel
+
, date ? "2021-07-08"
+
, commit ? "3693b2ca83ff9eda49660b31299d2bebe3a1075f"
+
, diffHash ? "1sfq3vwc2kxa761s292f2cqrm0vvqvkdx6drpyn5yaxwnapwidcw"
+
, kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage
+
, argsOverride ? {}
+
, ...
+
} @ args:
-
buildLinux (args // {
-
# NOTE: bcachefs-tools should be updated simultaneously to preserve compatibility
-
version = "5.13.0-2021.10.01";
-
modDirVersion = "5.13.0";
+
# NOTE: bcachefs-tools should be updated simultaneously to preserve compatibility
+
(kernel.override ( args // {
+
argsOverride = {
+
version = "${kernel.version}-bcachefs-unstable-${date}";
+
extraMeta = {
+
branch = "master";
+
maintainers = with lib.maintainers; [ davidak chiiruno ];
+
platforms = [ "x86_64-linux" ];
+
};
+
} // argsOverride;
-
src = fetchFromGitHub {
-
owner = "koverstreet";
-
repo = "bcachefs";
-
rev = "4114ced1db465b8f4e7f4d6a78aa11416a9ab5d9";
-
sha256 = "sha256-viFC3HHIcjUTDPvloSKKsz9PuSLyvxfYnrtkVUB79mQ=";
-
};
+
kernelPatches = [ {
+
name = "bcachefs-${commit}";
+
patch = fetchpatch {
+
name = "bcachefs-${commit}.diff";
+
url = "https://evilpiepirate.org/git/bcachefs.git/rawdiff/?id=${commit}&id2=v${lib.versions.majorMinor kernel.version}";
+
sha256 = diffHash;
+
};
+
extraConfig = "BCACHEFS_FS m";
+
} ] ++ kernelPatches;
-
extraConfig = "BCACHEFS_FS m";
-
-
extraMeta = {
-
branch = "master";
-
hydraPlatforms = []; # Should the testing kernels ever be built on Hydra?
-
maintainers = with lib.maintainers; [ davidak chiiruno ];
-
platforms = [ "x86_64-linux" ];
-
};
-
-
} // (args.argsOverride or {}))
+
})).overrideAttrs ({ meta ? {}, ... }: { meta = meta // { broken = true; }; })
+2 -2
pkgs/os-specific/linux/kernel/linux-xanmod.nix
···
{ lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:
let
-
version = "5.14.12";
+
version = "5.14.14";
release = "1";
suffix = "xanmod${release}-cacule";
in
···
owner = "xanmod";
repo = "linux";
rev = modDirVersion;
-
sha256 = "sha256-JVTi319BLHM4CgF7KaN3C/92N4uwh59po1AcOinNpww=";
+
sha256 = "sha256-/cbTByyV+hYjn9PHSIb6FeKcl6ejbaVG6hj0VXgaHDg=";
};
structuredExtraConfig = with lib.kernel; {
+2 -2
pkgs/servers/monitoring/prometheus/promscale.nix
···
buildGoModule rec {
pname = "promscale";
-
version = "0.6.0";
+
version = "0.6.2";
src = fetchFromGitHub {
owner = "timescale";
repo = pname;
rev = version;
-
sha256 = "sha256-2zbvibnmYAUyl7zkwcRgJKP24mid8/IUIUwfy7yaCzM=";
+
sha256 = "sha256-YGT+VaHX6dqYdJz002fGZxRYE3gFqY8Q7VdhtSTPpjU=";
};
vendorSha256 = "sha256-o7vRSCEEqzhruHEnRPuxC1e4NzCl8Br4vvqg0pwGIgA=";
+4 -5
pkgs/tools/filesystems/bcachefs-tools/default.nix
···
stdenv.mkDerivation {
pname = "bcachefs-tools";
-
version = "unstable-2021-10-01";
+
version = "unstable-2021-07-08";
src = fetchFromGitHub {
owner = "koverstreet";
repo = "bcachefs-tools";
-
rev = "37850436dd7dfbe67738749c4d4a2506ffff1ec3";
-
sha256 = "040vgxrimahmfs9rhlggfwg0bzl7h9j2ksx3563rh63asjwlhnhi";
+
rev = "050d5f7bcf08bd02f5077a1c5559f352fa449e1e";
+
sha256 = "15bl9ni0ckmvs5d7hi6v26z690rrmkb7dx00skn6gwq87ffz3imw";
};
postPatch = ''
substituteInPlace Makefile \
--replace "pytest-3" "pytest --verbose" \
--replace "INITRAMFS_DIR=/etc/initramfs-tools" \
-
"INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools" \
-
--replace "doc/macro2rst.py" "python3 doc/macro2rst.py"
+
"INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools"
'';
nativeBuildInputs = [ pkg-config docutils ];
+33 -17
pkgs/tools/misc/ddcutil/default.nix
···
-
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
-
, glib, i2c-tools, udev, libgudev, libusb1, libdrm, xorg }:
+
{ lib
+
, stdenv
+
, fetchFromGitHub
+
, autoreconfHook
+
, pkg-config
+
, glib
+
, i2c-tools
+
, udev
+
, kmod
+
, libgudev
+
, libusb1
+
, libdrm
+
, xorg
+
}:
stdenv.mkDerivation rec {
pname = "ddcutil";
-
version = "1.1.0";
+
version = "1.2.0";
src = fetchFromGitHub {
-
owner = "rockowitz";
-
repo = "ddcutil";
-
rev = "v${version}";
-
sha256 = "0wv8a8zjahzmi4qx0lc24mwyi3jklj1yxqq26fwklmfh5dv1y8yc";
+
owner = "rockowitz";
+
repo = "ddcutil";
+
rev = "v${version}";
+
sha256 = "sha256-MH7WnJgROgLvttQEbd/21mLRFElObp4KINy8RarqkRo=";
};
-
patches = [
-
# Look for kernel modules in /run/booted-system/kernel-modules/lib/modules/*
-
./nixos-paths.diff
-
];
+
nativeBuildInputs = [ autoreconfHook pkg-config ];
-
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [
-
i2c-tools udev libgudev
-
glib libusb1 libdrm xorg.libXrandr
+
glib
+
i2c-tools
+
kmod
+
libdrm
+
libgudev
+
libusb1
+
udev
+
xorg.libXrandr
];
+
+
enableParallelBuilding = true;
meta = with lib; {
-
homepage = "http://www.ddcutil.com/";
+
homepage = "http://www.ddcutil.com/";
description = "Query and change Linux monitor settings using DDC/CI and USB";
-
license = licenses.gpl2;
-
platforms = platforms.linux;
+
license = licenses.gpl2;
+
platforms = platforms.linux;
maintainers = with maintainers; [ rnhmjoj ];
};
}
-30
pkgs/tools/misc/ddcutil/nixos-paths.diff
···
-
--- a/src/util/linux_util.c
-
+++ b/src/util/linux_util.c
-
@@ -125,6 +125,7 @@
-
"lib64",
-
"lib32",
-
"usr/lib", // needed for arch?
-
+ "run/booted-system/kernel-modules/lib", // NixOS
-
NULL};
-
int result = -1;
-
int ndx = 0;
-
@@ -204,14 +205,15 @@
-
if (debug)
-
printf("(%s) machine: %s", __func__, utsbuf.machine);
-
-
- char * libdirs[3];
-
+ char * libdirs[4];
-
libdirs[0] = "lib";
-
+ libdirs[1] = "run/booted-system/kernel-modules/lib";
-
if (streq(utsbuf.machine, "amd_64")){
-
- libdirs[1] = "lib64";
-
- libdirs[2] = NULL;
-
+ libdirs[2] = "lib64";
-
+ libdirs[3] = NULL;
-
}
-
else
-
- libdirs[1] = NULL;
-
+ libdirs[2] = NULL;
-
-
int libsndx = 0;
-
bool found = false;
+3 -3
pkgs/tools/misc/shadowenv/default.nix
···
rustPlatform.buildRustPackage rec {
pname = "shadowenv";
-
version = "2.0.5";
+
version = "2.0.6";
src = fetchFromGitHub {
owner = "Shopify";
repo = pname;
rev = version;
-
sha256 = "sha256-MPky0ZB7yfl/gOPThx1BpRoTgvY7mkLaoqnvGKPvSPo=";
+
sha256 = "sha256-OfrK5eQ2oJ7ZeUem4PZPE2tsjIObQ+aao6GrtrK8AqA=";
};
-
cargoSha256 = "sha256-reVw8YkKi+EMDk0Bva2Ugp72VhAYB6axHonkr9Kdos4=";
+
cargoSha256 = "sha256-gno44ZdLthcp5/+NP12d0C+x1jrmJHNkHSnyuHWl3Zk=";
nativeBuildInputs = [ installShellFiles ];
+2 -2
pkgs/tools/networking/mu/default.nix
···
stdenv.mkDerivation rec {
pname = "mu";
-
version = "1.6.6";
+
version = "1.6.7";
src = fetchFromGitHub {
owner = "djcb";
repo = "mu";
rev = version;
-
sha256 = "64TfXPz1NCGKnozI9j+yog+hln1rA/qpzCLvPNSvH+c=";
+
sha256 = "bhZrottFT5NX43Iz1wFGYzaUSAgvgkhOwNHX6fjUs7M=";
};
postPatch = lib.optionalString (batchSize != null) ''
+3 -3
pkgs/tools/security/rage/default.nix
···
rustPlatform.buildRustPackage rec {
pname = "rage";
-
version = "0.6.0";
+
version = "0.7.0";
src = fetchFromGitHub {
owner = "str4d";
repo = pname;
rev = "v${version}";
-
sha256 = "1vag448zpjyplcjpf1ir81l8ip3yxm9vkrxffqr78zslb4k6hw2w";
+
sha256 = "1dzsqppkcxvajyybmday8xnwwwqv3g44hb5fzqy4whkblwxbn2gk";
};
-
cargoSha256 = "06jfhq9vnkq5g5bw1zl2sxsih63yajcyk9zaizhzkdsbhydr4955";
+
cargoSha256 = "1bcj1rd78kgiy1xqpkxffzl6v9xdp778y66g6nhikjq2yarz77ji";
nativeBuildInputs = [ installShellFiles ];
+6 -3
pkgs/top-level/all-packages.nix
···
nodejs-slim-16_x = callPackage ../development/web/nodejs/v16.nix {
enableNpm = false;
};
+
nodejs-17_x = callPackage ../development/web/nodejs/v17.nix { };
+
nodejs-slim-17_x = callPackage ../development/web/nodejs/v17.nix {
+
enableNpm = false;
+
};
# Update this when adding the newest nodejs major version!
+
# Do not set to nodejs-17_x because it requires 10.13 SDK on Darwin
nodejs_latest = nodejs-16_x;
nodejs-slim_latest = nodejs-slim-16_x;
···
abc-verifier = callPackage ../applications/science/logic/abc {};
-
abella = callPackage ../applications/science/logic/abella {
-
ocamlPackages = ocaml-ng.ocamlPackages_4_07;
-
};
+
abella = callPackage ../applications/science/logic/abella { };
acgtk = callPackage ../applications/science/logic/acgtk {};
+26 -26
pkgs/top-level/ruby-packages.nix
···
platforms = [];
source = {
remotes = ["https://rubygems.org"];
-
sha256 = "1jvrl7400fv7v2jjri1r7ilj3sri36hzipwwgpn5psib4c9c59c6";
+
sha256 = "0xwcnbwnbqq8jp92mvawn6y69cb53wsz84wwmk9vsfk1jjvqfw2z";
type = "gem";
};
-
version = "0.1.1";
+
version = "0.2.0";
};
builder = {
groups = ["default"];
···
platforms = [];
source = {
remotes = ["https://rubygems.org"];
-
sha256 = "1bby4hbq96vnzcdbbybcbddin8dxdnj1ns758kcr4akykningqhh";
+
sha256 = "0kd7c61f28f810fgxg480j7457nlvqarza9c2ra0zhav0dd80288";
type = "gem";
};
-
version = "0.14.0";
+
version = "0.15.0";
};
eventmachine = {
groups = ["default"];
···
platforms = [];
source = {
remotes = ["https://rubygems.org"];
-
sha256 = "1iykfw2j6dd26rhgid3a17zghrmbmi68ppf3a7cdkvii68p4f37a";
+
sha256 = "0g45ib20cjwkf4lzgm30cl6n7b6h1k8p6pdg4vh8s1rllrzrz342";
type = "gem";
};
-
version = "0.85.0";
+
version = "0.87.0";
};
execjs = {
groups = ["default"];
···
platforms = [];
source = {
remotes = ["https://rubygems.org"];
-
sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci";
+
sha256 = "0a7p95md8j8lbgxx9dzygysxmrg1s80895f46f1y47k9kq9q56ry";
type = "gem";
};
-
version = "2.5.1";
+
version = "2.6.0";
};
jwt = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
-
sha256 = "036i5fc09275ms49mw43mh4i9pwaap778ra2pmx06ipzyyjl6bfs";
+
sha256 = "0bg8pjx0mpvl10k6d8a6gc8dzlv2z5jkqcjbjcirnk032iriq838";
type = "gem";
};
-
version = "2.2.3";
+
version = "2.3.0";
};
kramdown = {
groups = ["default"];
···
platforms = [];
source = {
remotes = ["https://rubygems.org"];
-
sha256 = "173dp4vqvx1sl6aq83daxwn5xvb5rn3jgynjmb91swl7gmgp17yl";
+
sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5";
type = "gem";
};
-
version = "1.1.1";
+
version = "1.1.2";
};
mini_portile2 = {
groups = ["default"];
···
platforms = [];
source = {
remotes = ["https://rubygems.org"];
-
sha256 = "0h4iarqdych6v4jm5s0ywkc01qspadz8sf6qn7pkqmszq4iqv67q";
+
sha256 = "0886fcc5bi0kc0rbma5fj3wa3hbg2nl7ivnbi2j995yzg36zq7xy";
type = "gem";
};
-
version = "0.13.0";
+
version = "0.13.1";
};
pg = {
groups = ["default"];
···
platforms = [];
source = {
remotes = ["https://rubygems.org"];
-
sha256 = "0ahk9a2a05985m0037gqlpha5vdkvmwhyk8v1shkbnwkkm30k0mq";
+
sha256 = "1xblxnrs0c5m326v7kgr32k4m00cl2ipcf5m0qvyisrw62vd5dbn";
type = "gem";
};
-
version = "5.5.0";
+
version = "5.5.2";
};
racc = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
-
sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g";
+
sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d";
type = "gem";
};
-
version = "1.5.2";
+
version = "1.6.0";
};
rack = {
groups = ["default"];
···
platforms = [];
source = {
remotes = ["https://rubygems.org"];
-
sha256 = "1ig832dp0xmpp6a934nifzaj7wm9lzjxzasw911fagycs8p6m720";
+
sha256 = "03r9739q3vq38g456snf3rk9hadf955bs5im6qs6m69h19mrz2yw";
type = "gem";
};
-
version = "4.4.0";
+
version = "4.5.1";
};
redis-rack = {
dependencies = ["rack" "redis-store"];
···
platforms = [];
source = {
remotes = ["https://rubygems.org"];
-
sha256 = "04ahv5gwfwdmwx6b7c0z91rrsfklvnqichgnqk1f9b9n6md3b8yw";
+
sha256 = "0z1qk9i18zma000cqd758av9ca0622ykwp2cwm1x4dv9c0vw03yg";
type = "gem";
};
-
version = "4.2.2";
+
version = "4.2.3";
};
rouge = {
groups = ["default"];
···
platforms = [];
source = {
remotes = ["https://rubygems.org"];
-
sha256 = "0dxwkacc0scc1bqq10wc3v7wbh5j0jl5zcmw90kmfbgfjzl0drbr";
+
sha256 = "0fmk4fkmqnh033sdsvbb6r2dadir0f9zaq0z2jyx1wfnvv5712md";
type = "gem";
};
-
version = "5.48.0";
+
version = "5.49.0";
};
sequel_pg = {
dependencies = ["pg" "sequel"];
···
platforms = [];
source = {
remotes = ["https://rubygems.org"];
-
sha256 = "07an5s5xfg8mll0h9ihdc1n23k6n9anil9ca07rm77aiq6k0n0vy";
+
sha256 = "0wy8ws5n2gvxgkncbhrp4vkwjcbphcczw4k7y3g2wfl8fdmv5b4n";
type = "gem";
};
-
version = "2.7.1";
+
version = "2.7.2";
};
slop = {
groups = ["default"];