Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs

6 files changed, 8 insertions, 3 deletions

diff --git a/nixpkgs/pkgs/by-name/al/alephone-apotheosis-x/package.nix b/nixpkgs/pkgs/by-name/al/alephone-apotheosis-x/package.nix
index 16bed9fad97e..566b98f9e856 100644
--- a/nixpkgs/pkgs/by-name/al/alephone-apotheosis-x/package.nix
+++ b/nixpkgs/pkgs/by-name/al/alephone-apotheosis-x/package.nix
@@ -1,4 +1,4 @@
-{ alephone, requireFile }:
+{ lib, alephone, requireFile }:
 
 alephone.makeWrapper rec {
   pname = "apotheosis-x";
@@ -16,5 +16,6 @@ alephone.makeWrapper rec {
   meta = {
     description = "Total conversion for Marathon Infinity running on the Aleph One engine";
     homepage = "https://simplici7y.com/items/apotheosis-x-5";
+    license = lib.licenses.unfree;
   };
 }
diff --git a/nixpkgs/pkgs/by-name/al/alephone/package.nix b/nixpkgs/pkgs/by-name/al/alephone/package.nix
index 44349b7621e5..5ee1ef50a76b 100644
--- a/nixpkgs/pkgs/by-name/al/alephone/package.nix
+++ b/nixpkgs/pkgs/by-name/al/alephone/package.nix
@@ -84,6 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description =
       "Aleph One is the open source continuation of Bungie’s Marathon 2 game engine";
+    mainProgram = "alephone";
     homepage = "https://alephone.lhowon.org/";
     license = [ lib.licenses.gpl3 ];
     maintainers = with lib.maintainers; [ ehmry ];
diff --git a/nixpkgs/pkgs/by-name/al/alsa-lib-with-plugins/package.nix b/nixpkgs/pkgs/by-name/al/alsa-lib-with-plugins/package.nix
index 4388884f75a6..63ffa5550c44 100644
--- a/nixpkgs/pkgs/by-name/al/alsa-lib-with-plugins/package.nix
+++ b/nixpkgs/pkgs/by-name/al/alsa-lib-with-plugins/package.nix
@@ -12,6 +12,7 @@ in
 runCommand "${alsa-lib.pname}-${alsa-lib.version}" {
   meta = with lib; {
     description = "wrapper to ease access to ALSA plugins";
+    mainProgram = "aserver";
     platforms = platforms.linux;
     maintainers = with maintainers; [ gm6k ];
   };
diff --git a/nixpkgs/pkgs/by-name/al/alsa-lib/package.nix b/nixpkgs/pkgs/by-name/al/alsa-lib/package.nix
index f22f68d19cf8..50f40cd0686c 100644
--- a/nixpkgs/pkgs/by-name/al/alsa-lib/package.nix
+++ b/nixpkgs/pkgs/by-name/al/alsa-lib/package.nix
@@ -37,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = with lib; {
     homepage = "http://www.alsa-project.org/";
     description = "ALSA, the Advanced Linux Sound Architecture libraries";
+    mainProgram = "aserver";
 
     longDescription = ''
       The Advanced Linux Sound Architecture (ALSA) provides audio and
diff --git a/nixpkgs/pkgs/by-name/al/alsa-oss/package.nix b/nixpkgs/pkgs/by-name/al/alsa-oss/package.nix
index f600b52c5f3a..71c53580c286 100644
--- a/nixpkgs/pkgs/by-name/al/alsa-oss/package.nix
+++ b/nixpkgs/pkgs/by-name/al/alsa-oss/package.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     homepage = "http://www.alsa-project.org/";
     description = "ALSA, the Advanced Linux Sound Architecture alsa-oss emulation";
+    mainProgram = "aoss";
 
     longDescription = ''
       The Advanced Linux Sound Architecture (ALSA) provides audio and
diff --git a/nixpkgs/pkgs/by-name/al/alt-tab-macos/package.nix b/nixpkgs/pkgs/by-name/al/alt-tab-macos/package.nix
index d63dd91c05db..98b2d3da2d25 100644
--- a/nixpkgs/pkgs/by-name/al/alt-tab-macos/package.nix
+++ b/nixpkgs/pkgs/by-name/al/alt-tab-macos/package.nix
@@ -6,11 +6,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "alt-tab-macos";
-  version = "6.61.0";
+  version = "6.66.0";
 
   src = fetchurl {
     url = "https://github.com/lwouis/alt-tab-macos/releases/download/v${finalAttrs.version}/AltTab-${finalAttrs.version}.zip";
-    hash = "sha256-crmeYVeSmu5avNSd3dCbEeGnuqonh1HC5NnEOz8OB2U=";
+    hash = "sha256-mQ4tS9htL+X4lXqSe3L+mnwgVnHb3Zxyz6dgzmYHY9w=";
   };
 
   sourceRoot = ".";