diff options
author | sternenseemann <sternenseemann@systemli.org> | 2023-01-26 16:18:50 +0100 |
---|---|---|
committer | sternenseemann <sternenseemann@systemli.org> | 2023-01-26 16:18:50 +0100 |
commit | 4671a0d96b10f87bbfc885dfb2f09c51139ea2e8 (patch) | |
tree | d55e2130e17f85d0165ccb5a56f1fb8b6bb895a8 /pkgs/top-level | |
parent | 0f008a08f08e97837c43bc09fbf614ccd7577aa4 (diff) | |
parent | 4f3f2f548defc38a835145c981650c254e07b93f (diff) |
Merge remote-tracking branch 'origin/master' into haskell-updates
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 20 |
2 files changed, 18 insertions, 3 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 565ce41c5c682..7ac2ca83654bc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -343,7 +343,6 @@ mapAliases ({ debian_devscripts = throw "'debian_devscripts' has been renamed to/replaced by 'debian-devscripts'"; # Converted to throw 2022-02-22 debugedit-unstable = debugedit; # Added 2021-11-22 - deepin = throw "deepin was a work in progress and it has been canceled and removed https://github.com/NixOS/nixpkgs/issues/94870"; # added 2020-08-31 deepspeech = throw "deepspeech was removed in favor of stt. https://github.com/NixOS/nixpkgs/issues/119496"; # added 2021-05-05 deisctl = throw "deisctl was removed ; the service does not exist anymore"; # added 2022-02-06 deis = throw "deis was removed ; the service does not exist anymore"; # added 2022-02-06 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 87fc70d7834a9..4cc4638bbc554 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -526,6 +526,7 @@ with pkgs; probe-run = callPackage ../development/tools/rust/probe-run { inherit (darwin.apple_sdk.frameworks) AppKit IOKit; + inherit (darwin) DarwinTools; }; mix2nix = callPackage ../development/tools/mix2nix { }; @@ -4785,6 +4786,8 @@ with pkgs; gsctl = callPackage ../applications/misc/gsctl { }; + gsocket = callPackage ../tools/networking/gsocket { }; + gthree = callPackage ../development/libraries/gthree { }; gtg = callPackage ../applications/office/gtg { }; @@ -8615,6 +8618,7 @@ with pkgs; kakoune-unwrapped = callPackage ../applications/editors/kakoune { # See comments on https://github.com/NixOS/nixpkgs/pull/198836 # Remove below when stdenv for linux-aarch64 become recent enough. + # https://github.com/NixOS/nixpkgs/issues/201254 stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv else stdenv; }; kakoune = wrapKakoune kakoune-unwrapped { @@ -18283,6 +18287,8 @@ with pkgs; inherit (callPackage ../development/tools/replay-io { }) replay-io replay-node-cli; + reshape = callPackage ../development/tools/reshape { } ; + retdec = callPackage ../development/tools/analysis/retdec { stdenv = gcc8Stdenv; }; @@ -19363,6 +19369,8 @@ with pkgs; expat = callPackage ../development/libraries/expat { }; + exprtk = callPackage ../development/libraries/exprtk { }; + eventlog = callPackage ../development/libraries/eventlog { }; faac = callPackage ../development/libraries/faac { }; @@ -22863,6 +22871,7 @@ with pkgs; SDL_compat = callPackage ../development/libraries/SDL_compat { inherit (darwin.apple_sdk.frameworks) Cocoa; + inherit (darwin) autoSignDarwinBinariesHook; }; SDL = SDL_classic; @@ -23461,7 +23470,7 @@ with pkgs; stdenv = gcc9Stdenv; inherit (darwin) libobjc; inherit (darwin.apple_sdk.libs) xpc; - inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration + inherit (darwin.apple_sdk.frameworks) AGL Cocoa CoreServices DiskArbitration IOKit CFNetwork Security ApplicationServices CoreText IOSurface ImageIO OpenGL GLUT; }; @@ -23471,7 +23480,7 @@ with pkgs; vtk_9 = libsForQt5.callPackage ../development/libraries/vtk/9.x.nix { inherit (darwin) libobjc; inherit (darwin.apple_sdk.libs) xpc; - inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration + inherit (darwin.apple_sdk.frameworks) AGL Cocoa CoreServices DiskArbitration IOKit CFNetwork Security ApplicationServices CoreText IOSurface ImageIO OpenGL GLUT; }; @@ -24425,6 +24434,8 @@ with pkgs; mattermost-desktop = callPackage ../applications/networking/instant-messengers/mattermost-desktop { }; + mbusd = callPackage ../servers/mbusd { }; + memcached = callPackage ../servers/memcached {}; merecat = callPackage ../servers/http/merecat { }; @@ -30608,6 +30619,7 @@ with pkgs; ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { }; ladybird = qt6Packages.callPackage ../applications/networking/browsers/ladybird { + # https://github.com/NixOS/nixpkgs/issues/201254 stdenv = if stdenv.isDarwin then llvmPackages_14.stdenv else gcc11Stdenv; }; @@ -34104,6 +34116,8 @@ with pkgs; inherit (nodePackages) zx; + zxfer = callPackage ../applications/system/zxfer {}; + zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { guiModule = "zest"; fftw = fftwSinglePrec; @@ -35680,6 +35694,8 @@ with pkgs; cinnamon = recurseIntoAttrs (callPackage ../desktops/cinnamon { }); inherit (cinnamon) mint-x-icons mint-y-icons; + deepin = recurseIntoAttrs (callPackage ../desktops/deepin { }); + enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment { }); gnome2 = recurseIntoAttrs (callPackage ../desktops/gnome-2 { }); |