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

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source
This commit is contained in:
Martin Weinelt
2021-05-12 18:28:03 +02:00
parent 1d2db66464 aca1a33de6
commit a18880bf72
32 changed files with 216 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/all-packages.nix
+6 -2
View File
@@ -156,7 +156,9 @@ in
antsimulator = callPackage ../games/antsimulator { };
atuin = callPackage ../tools/misc/atuin { };
atuin = callPackage ../tools/misc/atuin {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
fiche = callPackage ../servers/fiche { };
@@ -28452,6 +28454,8 @@ in
nativeOnly = true;
}).run;
steam-tui = callPackage ../games/steam-tui { };
steamcmd = steamPackages.steamcmd;
protontricks = python3Packages.callPackage ../tools/package-management/protontricks {
@@ -30861,7 +30865,7 @@ in
vimb = wrapFirefox vimb-unwrapped { };
vips = callPackage ../tools/graphics/vips {
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation;
};
nip2 = callPackage ../tools/graphics/nip2 { };
pkgs/top-level/python-packages.nix
+2
View File
@@ -5304,6 +5304,8 @@ in {
py-air-control-exporter = callPackage ../development/python-modules/py-air-control-exporter { };
py-dmidecode = callPackage ../development/python-modules/py-dmidecode { };
py-ubjson = callPackage ../development/python-modules/py-ubjson { };
py2bit = callPackage ../development/python-modules/py2bit { };