public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2021-03-19 18:17:01 +01:00
parent c804f22a81 fe7df3f3ff
commit 1ecb97eae9
22 changed files with 108 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
View File

@@ -295,7 +295,7 @@ fi
# Resolve the flake.
if [[ -n $flake ]]; then
flake=$(nix "${flakeFlags[@]}" flake info --json "${extraBuildFlags[@]}" "${lockFlags[@]}" -- "$flake" | jq -r .url)
flake=$(nix "${flakeFlags[@]}" flake metadata --json "${extraBuildFlags[@]}" "${lockFlags[@]}" -- "$flake" | jq -r .url)
fi
# Find configuration.nix and open editor instead of building.

4
pkgs/os-specific/linux/s6-linux-init/default.nix
View File

@@ -4,8 +4,8 @@ with skawarePackages;
buildPackage {
pname = "s6-linux-init";
version = "1.0.6.0";
sha256 = "0kzif3dqhm7h4h7c6npzdbcy7w756222g8ysw116fgb8j385dr6w";
version = "1.0.6.1";
sha256 = "0sq8ya39a1qs61cdjns8ijwrvxnqd4snk2ab4j5wl9a87i7wixhn";
description = "A set of minimalistic tools used to create a s6-based init system, including a /sbin/init binary, on a Linux kernel";
platforms = lib.platforms.linux;