Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): bump octokit from 4.24.0 to 4.25.0 in /pkgs/tools/security/metasploit #14

Closed
wants to merge 3 commits into from
Closed

build(deps): bump octokit from 4.24.0 to 4.25.0 in /pkgs/tools/security/metasploit #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21f489a
emacs: Make the application bundle name configurable
Oct 20, 2019
3bd885c
Drop an incompatible compiler optimization flag
jwiegley Nov 14, 2021
7252225
build(deps): bump octokit in /pkgs/tools/security/metasploit
dependabot[bot] Jun 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pkgs/applications/editors/emacs/generic.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp {

patches = patches fetchpatch;

appName = "Emacs"; # used by Darwin systems in emacs/wrapper.nix

src = fetchFromSavannah {
repo = "emacs";
rev = version;
Expand Down
20 changes: 11 additions & 9 deletions pkgs/build-support/emacs/wrapper.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ let
if lib.isFunction packagesFun
then packagesFun self
else packagesFun;

appName = emacs.appName or "Emacs";
in

runCommand
Expand Down Expand Up @@ -216,21 +218,21 @@ runCommand
# Wrap MacOS app
# this has to pick up resources and metadata
# to recognize it as an "app"
if [ -d "$emacs/Applications/Emacs.app" ]; then
mkdir -p $out/Applications/Emacs.app/Contents/MacOS
cp -r $emacs/Applications/Emacs.app/Contents/Info.plist \
$emacs/Applications/Emacs.app/Contents/PkgInfo \
$emacs/Applications/Emacs.app/Contents/Resources \
$out/Applications/Emacs.app/Contents
if [ -d "$emacs/Applications/${appName}.app" ]; then
mkdir -p $out/Applications/${appName}.app/Contents/MacOS
cp -r $emacs/Applications/${appName}.app/Contents/Info.plist \
$emacs/Applications/${appName}.app/Contents/PkgInfo \
$emacs/Applications/${appName}.app/Contents/Resources \
$out/Applications/${appName}.app/Contents


substitute ${./wrapper.sh} $out/Applications/Emacs.app/Contents/MacOS/Emacs \
substitute ${./wrapper.sh} $out/Applications/${appName}.app/Contents/MacOS/${appName} \
--subst-var-by bash ${emacs.stdenv.shell} \
--subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \
--subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp:" \
--subst-var-by autoloadExpression "-l cl-loaddefs -l nix-generated-autoload" \
--subst-var-by prog "$emacs/Applications/Emacs.app/Contents/MacOS/Emacs"
chmod +x $out/Applications/Emacs.app/Contents/MacOS/Emacs
--subst-var-by prog "$emacs/Applications/${appName}.app/Contents/MacOS/${appName}"
chmod +x $out/Applications/${appName}.app/Contents/MacOS/${appName}
fi

mkdir -p $out/share
Expand Down
2 changes: 1 addition & 1 deletion pkgs/tools/security/metasploit/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ GEM
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
nori (2.6.0)
octokit (4.24.0)
octokit (4.25.0)
faraday (>= 1, < 3)
sawyer (~> 0.9)
openssl-ccm (1.2.2)
Expand Down
2 changes: 1 addition & 1 deletion pkgs/tools/system/tree/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ let
# way to select one ore the other setting other than editing the file
# manually, so we have to duplicate the know how here.
systemFlags = lib.optionalString stdenv.isDarwin ''
CFLAGS="-O2 -Wall -fomit-frame-pointer -no-cpp-precomp"
CFLAGS=-O2
LDFLAGS=
'' + lib.optionalString stdenv.isCygwin ''
CFLAGS="-O2 -Wall -fomit-frame-pointer"
Expand Down