Merge master into staging-next (677e25fc) · Commits · nix / nixpkgs

nixos/modules/installer/cd-dvd/channel.nix

+27 −27

Original line number	Diff line number	Diff line
		@@ -3,8 +3,6 @@

		{ config, lib, pkgs, ... }:

		with lib;

		let
		# This is copied into the installer image, so it's important that it is filtered
		# to avoid including a large .git directory.
		@@ -27,16 +25,17 @@ let
		if [ ! -e $out/nixos/nixpkgs ]; then
		ln -s . $out/nixos/nixpkgs
		fi
		${optionalString (config.system.nixos.revision != null) ''
		${lib.optionalString (config.system.nixos.revision != null) ''
		echo -n ${config.system.nixos.revision} > $out/nixos/.git-revision
		''}
		echo -n ${config.system.nixos.versionSuffix} > $out/nixos/.version-suffix
		echo ${config.system.nixos.versionSuffix} \| sed -e s/pre// > $out/nixos/svn-revision
		'';

		in

		{
		options.system.installer.channel.enable = (lib.mkEnableOption "bundling NixOS/Nixpkgs channel in the installer") // { default = true; };
		config = lib.mkIf config.system.installer.channel.enable {
		# Pin the nixpkgs flake in the installer to our cleaned up nixpkgs source.
		# FIXME: this might be surprising and is really only needed for offline installations,
		# see discussion in https://github.com/NixOS/nixpkgs/pull/204178#issuecomment-1336289021
		@@ -47,18 +46,19 @@ in

		# Provide the NixOS/Nixpkgs sources in /etc/nixos. This is required
		# for nixos-install.
		boot.postBootCommands = mkAfter
		boot.postBootCommands = lib.mkAfter
		''
		if ! [ -e /var/lib/nixos/did-channel-init ]; then
		echo "unpacking the NixOS/Nixpkgs sources..."
		mkdir -p /nix/var/nix/profiles/per-user/root
		${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/per-user/root/channels \
		-i ${channelSources} --quiet --option build-use-substitutes false \
		${optionalString config.boot.initrd.systemd.enable "--option sandbox false"} # There's an issue with pivot_root
		${lib.optionalString config.boot.initrd.systemd.enable "--option sandbox false"} # There's an issue with pivot_root
		mkdir -m 0700 -p /root/.nix-defexpr
		ln -s /nix/var/nix/profiles/per-user/root/channels /root/.nix-defexpr/channels
		mkdir -m 0755 -p /var/lib/nixos
		touch /var/lib/nixos/did-channel-init
		fi
		'';
		};
		}

pkgs/applications/audio/pocket-casts/default.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -9,13 +9,13 @@

		stdenv.mkDerivation rec {
		pname = "pocket-casts";
		version = "0.6.0";
		version = "0.7.0";

		src = fetchFromGitHub {
		owner = "felicianotech";
		repo = "pocket-casts-desktop-app";
		rev = "v${version}";
		sha256 = "sha256-WMv2G4b7kYnWy0pz8YyI2eTdefs1mtWau+HQLiRygjE=";
		sha256 = "sha256-d4uVeHy4/91Ki6Wk6GlOt2lcK6U+M7fOryiOYA7q/x4=";
		};

		desktopItems = [

pkgs/applications/misc/mkgmap/default.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -15,12 +15,12 @@ let
		in
		stdenv.mkDerivation rec {
		pname = "mkgmap";
		version = "4914";
		version = "4916";

		src = fetchsvn {
		url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk";
		rev = version;
		sha256 = "sha256-aA5jGW6GTo2OvFZ/uPA4KpS+SjNB/tRGwgj1oM7zywU=";
		sha256 = "sha256-Ok6s1DaTZBcYtkHA7WAxjGz0HycvFqBpkwZIirc+dFU=";
		};

		patches = [

pkgs/applications/networking/instant-messengers/discord/default.nix

+12 −12

Original line number	Diff line number	Diff line
		{ branch ? "stable", callPackage, fetchurl, lib, stdenv }:
		let
		versions = if stdenv.isLinux then {
		stable = "0.0.32";
		ptb = "0.0.51";
		canary = "0.0.171";
		stable = "0.0.33";
		ptb = "0.0.53";
		canary = "0.0.173";
		development = "0.0.1";
		} else {
		stable = "0.0.281";
		ptb = "0.0.82";
		canary = "0.0.320";
		stable = "0.0.282";
		ptb = "0.0.84";
		canary = "0.0.329";
		development = "0.0.2";
		};
		version = versions.${branch};
		@@ -16,15 +16,15 @@ let
		x86_64-linux = {
		stable = fetchurl {
		url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
		hash = "sha256-XeGDKRKnvDyl0AWm9Vs/PDeIfAq/FL9AsjLt+dNg1HQ=";
		hash = "sha256-UVgufPNIS7fa3VDzjCWwgK3xxmqNivq461qWLgirClc=";
		};
		ptb = fetchurl {
		url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
		hash = "sha256-VlvGZ5qy61zse0mhvrROYwr0C94Zy1Kh4D4dp+sJTN0=";
		hash = "sha256-g2NhwkfNi5Yf+n9vHq/MJ0kylPF3MPocgF/zYfCvoZM=";
		};
		canary = fetchurl {
		url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
		hash = "sha256-NcmV+DPI5hfNdBUgoaOLsjG32QfjF+x7f01B6PR10Vc=";
		hash = "sha256-YFjGUAaZMy1JhtKhAqLbfYTKQSgS9TKWqR078cERNUI=";
		};
		development = fetchurl {
		url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
		@@ -34,15 +34,15 @@ let
		x86_64-darwin = {
		stable = fetchurl {
		url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg";
		hash = "sha256-Qxh9K0u99xfsVPJyAD3bFeZPxBXg2EeDyM+rbF80EC8=";
		hash = "sha256-3WeC+4W9+tpXNXqETorQfnE1HZWCqRkBqW0JM7whRCw=";
		};
		ptb = fetchurl {
		url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
		hash = "sha256-U99FiR3IUL8saGtVrWblWqsCIJc0rK5ZMII9/BL5H7w=";
		hash = "sha256-e2gvjXUw0Yx8UY6utg1SdX8/buewuVYPl5I8fS3QtrI=";
		};
		canary = fetchurl {
		url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
		hash = "sha256-7fPlb4x116HIXEJr1G7wVHriOQu6/2u69SpbU9qxHNw=";
		hash = "sha256-B4LPFts+sx8GpZp9iRbwapUYrK4c9unH+mAoODGqDgU=";
		};
		development = fetchurl {
		url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";

pkgs/by-name/ca/cargo-xwin/package.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -7,16 +7,16 @@

		rustPlatform.buildRustPackage rec {
		pname = "cargo-xwin";
		version = "0.14.8";
		version = "0.14.9";

		src = fetchFromGitHub {
		owner = "rust-cross";
		repo = "cargo-xwin";
		rev = "v${version}";
		hash = "sha256-VhpqmGhGBqB20ZteIwbd0GCIUltBGfBw7XF9lH7witA=";
		hash = "sha256-y2hlzewDWYxkKhr77JB3lkYo5hexcdmPiCRbXLtnolM=";
		};

		cargoHash = "sha256-e5QyaiQKlIzBwJE781BrhdVINacw0iniPywIsoMlCGg=";
		cargoHash = "sha256-uIFjWgoNCU5kUX4i1Law/YE0TmFLOi6V3Y4b9BpQlI4=";

		buildInputs = lib.optionals stdenv.isDarwin [
		darwin.apple_sdk.frameworks.Security

Admin message