diff options
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 33 | ||||
-rw-r--r-- | pkgs/top-level/dhall-packages.nix | 28 | ||||
-rw-r--r-- | pkgs/top-level/dotnet-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/perl-packages.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 6 |
5 files changed, 52 insertions, 21 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac4a5b7d97f0..311a9d48e68c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1968,7 +1968,7 @@ in interlock = callPackage ../servers/interlock {}; - jellyfin = callPackage ../servers/jellyfin { ffmpeg = ffmpeg_4; }; + jellyfin = callPackage ../servers/jellyfin { }; jellyfin-mpv-shim = python3Packages.callPackage ../applications/video/jellyfin-mpv-shim { }; @@ -10615,6 +10615,10 @@ in jenkins-job-builder = with python3Packages; toPythonApplication jenkins-job-builder; + julius = callPackage ../games/julius { }; + + augustus = callPackage ../games/augustus { }; + kafkacat = callPackage ../development/tools/kafkacat { }; kati = callPackage ../development/tools/build-managers/kati { }; @@ -11719,8 +11723,6 @@ in ffmpeg = ffmpeg_4; ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { - ffmpeg = ffmpeg_4; - # The following need to be fixed on Darwin frei0r = if stdenv.isDarwin then null else frei0r; game-music-emu = if stdenv.isDarwin then null else game-music-emu; @@ -12077,7 +12079,7 @@ in gsettings-qt = libsForQt5.callPackage ../development/libraries/gsettings-qt { }; gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { - callPackage = newScope { libav = pkgs.ffmpeg_4; }; + callPackage = newScope { libav = pkgs.ffmpeg; }; inherit (darwin.apple_sdk.frameworks) CoreServices; }); @@ -13811,7 +13813,7 @@ in withGUI = false; }; - mlt = callPackage ../development/libraries/mlt { ffmpeg = ffmpeg_4; }; + mlt = callPackage ../development/libraries/mlt { }; mlv-app = libsForQt5.callPackage ../applications/video/mlv-app { }; @@ -14367,9 +14369,7 @@ in kpmcore = callPackage ../development/libraries/kpmcore { }; - mlt = callPackage ../development/libraries/mlt/qt-5.nix { - ffmpeg = ffmpeg_4; - }; + mlt = callPackage ../development/libraries/mlt/qt-5.nix { }; openbr = callPackage ../development/libraries/openbr { }; @@ -15540,6 +15540,8 @@ in kerberos = libkrb5; }; + adguardhome = callPackage ../servers/adguardhome {}; + apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { }; apacheHttpd = pkgs.apacheHttpd_2_4; @@ -18871,7 +18873,6 @@ in bibletime = libsForQt5.callPackage ../applications/misc/bibletime { }; bino3d = libsForQt5.callPackage ../applications/video/bino3d { - ffmpeg = ffmpeg_4; glew = glew110; }; @@ -20235,6 +20236,8 @@ in pulseSupport = config.pulseaudio or false; }; + hikari = callPackage ../applications/window-managers/hikari { }; + i3 = callPackage ../applications/window-managers/i3 { xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; }; @@ -20865,6 +20868,10 @@ in meld = callPackage ../applications/version-management/meld { }; + meli = callPackage ../applications/networking/mailreaders/meli { }; + + melonDS = callPackage ../misc/emulators/melonDS { }; + meme = callPackage ../applications/graphics/meme { }; mendeley = libsForQt5.callPackage ../applications/office/mendeley { @@ -21064,6 +21071,7 @@ in mpvScripts = recurseIntoAttrs { convert = callPackage ../applications/video/mpv/scripts/convert.nix {}; mpris = callPackage ../applications/video/mpv/scripts/mpris.nix {}; + simple-mpv-webui = callPackage ../applications/video/mpv/scripts/simple-mpv-webui.nix {}; }; mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { }; @@ -21381,7 +21389,7 @@ in obs-linuxbrowser = callPackage ../applications/video/obs-studio/linuxbrowser.nix { }; - obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { ffmpeg = ffmpeg_4; }; + obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { }; obs-wlrobs = callPackage ../applications/video/obs-studio/wlrobs.nix { }; @@ -23662,7 +23670,6 @@ in inherit (plasma5) oxygen; inherit (kdeApplications) akonadi-contacts; inherit (kdeFrameworks) kcalendarcore; - ffmpeg = ffmpeg_4; opencv3 = opencv3WithoutCuda; }; @@ -26369,9 +26376,7 @@ in vazir-fonts = callPackage ../data/fonts/vazir-fonts { }; - vbam = callPackage ../misc/emulators/vbam { - ffmpeg = ffmpeg_4; - }; + vbam = callPackage ../misc/emulators/vbam { }; vice = callPackage ../misc/emulators/vice { giflib = giflib_4_1; diff --git a/pkgs/top-level/dhall-packages.nix b/pkgs/top-level/dhall-packages.nix index 6cdd84c22799..9d4801e9dc5c 100644 --- a/pkgs/top-level/dhall-packages.nix +++ b/pkgs/top-level/dhall-packages.nix @@ -8,20 +8,40 @@ let let callPackage = newScope self; + prefer = version: path: + let + packages = callPackage path { }; + + in + packages."${version}".overrideAttrs (_: { + passthru = packages; + } + ); + buildDhallPackage = callPackage ../development/interpreters/dhall/build-dhall-package.nix { }; + buildDhallGitHubPackage = + callPackage ../development/interpreters/dhall/build-dhall-github-package.nix { }; + + buildDhallDirectoryPackage = + callPackage ../development/interpreters/dhall/build-dhall-directory-package.nix { }; + in - { inherit buildDhallPackage; + { inherit + buildDhallPackage + buildDhallGitHubPackage + buildDhallDirectoryPackage + ; dhall-kubernetes = - callPackage ../development/dhall-modules/dhall-kubernetes.nix { }; + prefer "3.0.0" ../development/dhall-modules/dhall-kubernetes.nix; dhall-packages = - callPackage ../development/dhall-modules/dhall-packages.nix { }; + prefer "0.11.1" ../development/dhall-modules/dhall-packages.nix; Prelude = - callPackage ../development/dhall-modules/Prelude.nix { }; + prefer "13.0.0" ../development/dhall-modules/Prelude.nix; }; in diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 3b58e1937b60..f14ae3133b8b 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -4,6 +4,7 @@ , fetchurl , fetchFromGitHub , fetchNuGet +, glib , pkgconfig , mono , fsharp @@ -544,6 +545,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { buildInputs = [ fsharp + glib dotnetPackages.FSharpCompilerService dotnetPackages.NewtonsoftJson dotnetPackages.NDeskOptions diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 89bf25c15908..e212da337696 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3614,7 +3614,7 @@ let sha256 = "3cc7126d5841107237a9be2dc5c7fbc167cf3c4b4ce34678a8448b850757014c"; }; propagatedBuildInputs = [ ClassMix ]; - perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' + perlPreHook = stdenv.lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; }; CryptIDEA = buildPerlPackage { @@ -3734,7 +3734,7 @@ let sha256 = "93ebdfaaefcfe9ab683f0121c85f24475d8197f0bcec46018219e4111434dde3"; }; propagatedBuildInputs = [ DigestSHA1 ]; - perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' + perlPreHook = stdenv.lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; }; CryptRijndael = buildPerlPackage { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5e7e70563526..331f7292b930 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1927,7 +1927,9 @@ in { bids-validator = callPackage ../development/python-modules/bids-validator { }; - binwalk = callPackage ../development/python-modules/binwalk { }; + binwalk = callPackage ../development/python-modules/binwalk { + pyqtgraph = null; + }; binwalk-full = appendToName "full" (self.binwalk.override { pyqtgraph = self.pyqtgraph; @@ -3250,6 +3252,8 @@ in { plaster-pastedeploy = callPackage ../development/python-modules/plaster-pastedeploy {}; + playsound = callPackage ../development/python-modules/playsound { }; + plexapi = callPackage ../development/python-modules/plexapi { }; plexauth = callPackage ../development/python-modules/plexauth { }; |