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.

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

Jump to bottom

direnv: fix missing BASH_PATH #89165

Merged
merged 1 commit into from May 29, 2020
Merged

direnv: fix missing BASH_PATH #89165

merged 1 commit into from May 29, 2020

Conversation

zimbatm
Copy link
Member

@zimbatm zimbatm commented May 29, 2020

Motivation for this change

Fix #89129

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@zimbatm
direnv: fix missing BASH_PATH
2d3256d 
This was broken by the switch to go modules (NixOS#87932) which doesn't
respect makeFlags.

Fixes NixOS#89129
@zimbatm zimbatm changed the title direnv bash path direnv: fix missing BASH_PATH May 29, 2020
@zimbatm zimbatm requested a review from zowoq May 29, 2020 12:16
@ofborg ofborg bot requested a review from kalbasit May 29, 2020 12:23
@zowoq
Copy link
Contributor

zowoq commented May 29, 2020

Apologies if I broke it when I changed it to buildGoModule.

@zimbatm
Copy link
Member Author

zimbatm commented May 29, 2020

No problem, it happens

@zimbatm zimbatm merged commit bc3b694 into NixOS:master May 29, 2020
@zimbatm zimbatm deleted the direnv-bash-path branch May 29, 2020 14:02
github-actions bot added a commit to utdemir/dotfiles-nix that referenced this pull request Jun 4, 2020
@github-actions
niv nixpkgs: update 571212eb -> 00df2371
0423297 
## Changelog for nixpkgs:
Commits: [NixOS/nixpkgs@571212eb...00df2371](NixOS/nixpkgs@571212e...00df237)

* [`f0d90a2e`](NixOS/nixpkgs@f0d90a2) python27Packages.py_scrypt: 0.8.13 -> 0.8.15
* [`db2ce641`](NixOS/nixpkgs@db2ce64) python3Packages.pygls: init at 0.8.1
* [`f3ee91d4`](NixOS/nixpkgs@f3ee91d) pythonPackages.pytest-datadir: init at 1.3.1
* [`ec905d07`](NixOS/nixpkgs@ec905d0) cmake-language-server: init at 0.1.1
* [`8609b214`](NixOS/nixpkgs@8609b21) oniguruma: switch to autotools
* [`9afcc52f`](NixOS/nixpkgs@9afcc52) vimPlugins: update
* [`5f3b37a9`](NixOS/nixpkgs@5f3b37a) vimPlugins: resolve github repository redirects
* [`4b0e7b12`](NixOS/nixpkgs@4b0e7b1) vimPlugins.conjure: init at 2020-05-26
* [`b7e89a58`](NixOS/nixpkgs@b7e89a5) maintainers: change my data
* [`98228241`](NixOS/nixpkgs@9822824) openmpt123: 0.4.12 -> 0.5.0
* [`d1a6f2ed`](NixOS/nixpkgs@d1a6f2e) maintainers: add stianlagstad
* [`1992d685`](NixOS/nixpkgs@1992d68) ocamlPackages.core_kernel: remove at 112.24.00
* [`c4562881`](NixOS/nixpkgs@c456288) bazel_3: init at 3.1.0
* [`1c5386fa`](NixOS/nixpkgs@1c5386f) bazel: Make bazel_3 the default version
* [`6e513d3a`](NixOS/nixpkgs@6e513d3) androidStudioPackages.stable: 3.6.3.0 -> 4.0.0.16
* [`94447562`](NixOS/nixpkgs@9444756) appimage: replace radare2+jq with readelf+awk+sha256sum
* [`ac3e2063`](NixOS/nixpkgs@ac3e206) lxqt.liblxqt: 0.15.0 -> 0.15.1
* [`4e19cd6c`](NixOS/nixpkgs@4e19cd6) zuki-themes: 3.36-2 -> 3.36-3
* [`7c748178`](NixOS/nixpkgs@7c74817) duplicati: 2.0.4.24 -> 2.0.5.1
* [`7172514b`](NixOS/nixpkgs@7172514) bazel: 3.1.0 -> 3.2.0
* [`b8cc6757`](NixOS/nixpkgs@b8cc675) ripgrep: 12.1.0 -> 12.1.1
* [`bc3b694a`](NixOS/nixpkgs@bc3b694) direnv: fix missing BASH_PATH (NixOS/nixpkgs#89165)
* [`b742305f`](NixOS/nixpkgs@b742305) wtf: 0.29.0 -> 0.30.0
* [`3bc5b859`](NixOS/nixpkgs@3bc5b85) gpsd: clarify license
* [`19aac241`](NixOS/nixpkgs@19aac24) confd: 0.9.0 -> 0.16.0 (NixOS/nixpkgs#89180)
* [`ca3f5fe1`](NixOS/nixpkgs@ca3f5fe) Delete versioned node-packages
* [`8a03e80e`](NixOS/nixpkgs@8a03e80) Change to non-versioned node-packages generate.sh
* [`2312f5fb`](NixOS/nixpkgs@2312f5f) Change to nodePackages and nodePackages_latest
* [`c8dddcb1`](NixOS/nixpkgs@c8dddcb) docker: 19.03.9 -> 19.03.10
* [`4df2f78e`](NixOS/nixpkgs@4df2f78) Revert "Merge pull request NixOS/nixpkgs#78910 from serokell/libarchive-zstd"
* [`db062297`](NixOS/nixpkgs@db06229) Add meta.broken and meta.platforms to node-packages
* [`4d0d0b8d`](NixOS/nixpkgs@4d0d0b8) rav1e: 0.3.1 -> 0.3.2
* [`4fa8c3e6`](NixOS/nixpkgs@4fa8c3e) LTS Haskell 15.13
* [`b2e0f05b`](NixOS/nixpkgs@b2e0f05) haskellPackages.tart: unmark as broken
* [`44e8c5c0`](NixOS/nixpkgs@44e8c5c) haskellPackages.vulkan: unbreak
* [`9a302dff`](NixOS/nixpkgs@9a302df) rhine, rhine-gloss: Remove broken marker
* [`678e947b`](NixOS/nixpkgs@678e947) haskellPackages.dhall-lsp-server: unbreak
* [`368364fb`](NixOS/nixpkgs@368364f) Unbreak amazonka-dynamodb
* [`e9b61135`](NixOS/nixpkgs@e9b6113) configuration-hackage2nix: Add maralorn as a maintainer for a number of haskellPackages
* [`80cc18ac`](NixOS/nixpkgs@80cc18a) haskellPackages.shh: Mark unbroken
* [`496fad52`](NixOS/nixpkgs@496fad5) hackage2nix.yaml: cabal-fmt now has a maintainer
* [`05ba8c56`](NixOS/nixpkgs@05ba8c5) hackage2nix.yaml: update list of broken builds
* [`5c3eab8a`](NixOS/nixpkgs@5c3eab8) hackage-packages.nix: automatic Haskell package set update
* [`41786ec2`](NixOS/nixpkgs@41786ec) Update tensorflow-haskell dependencies.
* [`d895bad1`](NixOS/nixpkgs@d895bad) Fix dependencies issues of postgresql-syntax and re+base
* [`accaa879`](NixOS/nixpkgs@accaa87) guid: fix compilation of Setup.hs and disable tests
* [`995bdd4c`](NixOS/nixpkgs@995bdd4) haskell-ghc-lib-parser: fix overrides for the new release
* [`330227bc`](NixOS/nixpkgs@330227b) haskell-extra: update overrides for the new version
* [`fbc0845f`](NixOS/nixpkgs@fbc0845) haskell-cabal-fmt: overriding Cabal-3.2 is unnecessary for ghc-8.10.x and beyond
* [`6d817507`](NixOS/nixpkgs@6d81750) haskellPackages.shh: Disable tests
* [`5244ef40`](NixOS/nixpkgs@5244ef4) haskell-dhall: configure overrides for the newly added 0.32.0 version
* [`eb1e0786`](NixOS/nixpkgs@eb1e078) haskell-devtools: break infinite recursion with mprelude
* [`e35f94c8`](NixOS/nixpkgs@e35f94c) all-cabal-hashes: update to Hackage at 2020-05-28T23:38:21Z
* [`a0798587`](NixOS/nixpkgs@a079858) git-annex: don't update to version 8.20200522 yet to avoid test suite failures
* [`4b2b6ce6`](NixOS/nixpkgs@4b2b6ce) idris: drop obsolete overrides for the new 1.3.3 version
* [`53594c65`](NixOS/nixpkgs@53594c6) haskellPackages.VulkanMemoryAllocator: Add extra library necessary for compilation
* [`32d2de8e`](NixOS/nixpkgs@32d2de8) haskell: Fix with-packages-wrapper MacOS linker hack for GHC 8.8
* [`28c8a68f`](NixOS/nixpkgs@28c8a68) cue: 0.1.2 -> 0.2.0
* [`3b2c8ef4`](NixOS/nixpkgs@3b2c8ef) perlPackages.DataULID: init at 1.0.0
* [`1f7b543e`](NixOS/nixpkgs@1f7b543) wifite2: 2.5.3 -> 2.5.5
* [`6149df8f`](NixOS/nixpkgs@6149df8) Readd the two node-packages that were lost in transition and time
* [`268ea8ab`](NixOS/nixpkgs@268ea8a) minikube: 1.10.1 -> 1.11.0
* [`54f4bb44`](NixOS/nixpkgs@54f4bb4) .editorconfig: add/disable files
* [`a25bdf17`](NixOS/nixpkgs@a25bdf1) colormake: use fetchFromGitHub
* [`9b5df089`](NixOS/nixpkgs@9b5df08) atlassian-jira: 8.8.0 -> 8.9.0
* [`f943f002`](NixOS/nixpkgs@f943f00) act: 0.2.8 -> 0.2.9
* [`036eb89f`](NixOS/nixpkgs@036eb89) dstask: init at 0.18
* [`fee8e799`](NixOS/nixpkgs@fee8e79) nodePackages.pulp: fix build
* [`9921d785`](NixOS/nixpkgs@9921d78) nodePackages: fix insect build
* [`a32bc05d`](NixOS/nixpkgs@a32bc05) minecraft: 2.1.14403 -> 2.1.14947
* [`b4fa9575`](NixOS/nixpkgs@b4fa957) minecraft: set platforms
* [`6e0f899b`](NixOS/nixpkgs@6e0f899) keybase-gui: set platforms to x86_64-linux
* [`71fd66ef`](NixOS/nixpkgs@71fd66e) catch2: 2.12.1 -> 2.12.2
* [`7d69a04d`](NixOS/nixpkgs@7d69a04) androidenv: add missing emulator dynamic libraries
* [`35142ce3`](NixOS/nixpkgs@35142ce) solaar: 1.0.1 -> 1.0.2
* [`d75908d5`](NixOS/nixpkgs@d75908d) ncdu: 1.14.2 -> 1.15
* [`3f99cc76`](NixOS/nixpkgs@3f99cc7) out-of-tree: 1.2.1 -> 1.3.0
* [`746fe02a`](NixOS/nixpkgs@746fe02) linux_latest-libre: 17445 -> 17506
* [`f75d6294`](NixOS/nixpkgs@f75d629) jenkins: 2.222.3 -> 2.222.4
* [`180d1d37`](NixOS/nixpkgs@180d1d3) nixos/kvmgt: allow multiple uuids on same mdev
* [`22ff7852`](NixOS/nixpkgs@22ff785) intel-media-sdk: remove samples
* [`ea956bb5`](NixOS/nixpkgs@ea956bb) unit: 1.17.0 -> 1.18.0
* [`a4bf2cc1`](NixOS/nixpkgs@a4bf2cc) unit: Expose PHP expressions used so it can easily be accessed for configs
* [`3a77caa4`](NixOS/nixpkgs@3a77caa) ardour: add ardour 6 and make it the default (NixOS/nixpkgs#89175)
* [`3ee20ba0`](NixOS/nixpkgs@3ee20ba) pulp: add purescript to PATH
* [`8cc640b5`](NixOS/nixpkgs@8cc640b) cocoapods: 1.9.2 -> 1.9.3
* [`9a11cd67`](NixOS/nixpkgs@9a11cd6) cocoapods-beta: 1.9.2 -> 1.9.3
* [`45ac2597`](NixOS/nixpkgs@45ac259) jc: 1.10.12 -> 1.11.1
* [`d7898570`](NixOS/nixpkgs@d789857) sbcl: add option to disable immobile space
* [`3e201de1`](NixOS/nixpkgs@3e201de) iconpack-obsidian: 4.11 -> 4.12
* [`70609273`](NixOS/nixpkgs@7060927) gitaly: fix gitlab-shell-config path patching
* [`af05325f`](NixOS/nixpkgs@af05325) gitlab: 12.10.6 -> 12.10.8
* [`b3206bb4`](NixOS/nixpkgs@b3206bb) vamp-plugin-sdk: 2.9 -> 2.10
* [`40eaca1c`](NixOS/nixpkgs@40eaca1) .editorconfig: fix for node-packages
* [`3052b4ea`](NixOS/nixpkgs@3052b4e) nixos/libvirtd: correct spelling
* [`665dfc26`](NixOS/nixpkgs@665dfc2) libversion: Fix unsafe concatenation of $LD_LIBRARY_PATH
* [`93f30ea3`](NixOS/nixpkgs@93f30ea) gnuradio: 3.7.13.4 -> 3.7.14.0
* [`69d71eb2`](NixOS/nixpkgs@69d71eb) gitea: 1.11.5 -> 1.11.6
* [`e536b9e2`](NixOS/nixpkgs@e536b9e) maintainers: add timstott
* [`162f00a3`](NixOS/nixpkgs@162f00a) go-jira: 1.0.17 -> 1.0.23
* [`f7056dca`](NixOS/nixpkgs@f7056dc) docker-compose: fix zsh completion
* [`c06682b9`](NixOS/nixpkgs@c06682b) hyperfine: install man and shell completion
* [`b3204747`](NixOS/nixpkgs@b320474) Add shardy to maintainers
* [`2d955362`](NixOS/nixpkgs@2d95536) yabai: 3.0.1 -> 3.0.2
* [`b24a082b`](NixOS/nixpkgs@b24a082) hugo: 0.71.1 -> 0.72.0
* [`a03e0483`](NixOS/nixpkgs@a03e048) haskellPackages.cachix: dontCheck
* [`7fb87309`](NixOS/nixpkgs@7fb8730) todoist-electron: 1.20 -> 1.22
* [`49832631`](NixOS/nixpkgs@4983263) intel-media-sdk: enable unit tests
* [`7c3ff4de`](NixOS/nixpkgs@7c3ff4d) gnuchess: 6.2.6 -> 6.2.7
* [`0e3a28a4`](NixOS/nixpkgs@0e3a28a) rabbitmq: fix darwin build
* [`4e455343`](NixOS/nixpkgs@4e45534) cawbird: 1.0.5 -> 1.1.0
* [`25776e4c`](NixOS/nixpkgs@25776e4) v2ray: 4.23.0 -> 4.23.2
* [`7c7fc820`](NixOS/nixpkgs@7c7fc82) gopacked - init at 0.4.1
* [`e90c5fe0`](NixOS/nixpkgs@e90c5fe) linuxPackages.wireguard: 1.0.20200506 -> 1.0.20200520
* [`f32733fc`](NixOS/nixpkgs@f32733f) udiskie: 2.1.0 -> 2.2.0
* [`5e898d1c`](NixOS/nixpkgs@5e898d1) diffoscope: 144 -> 146
* [`e238cf45`](NixOS/nixpkgs@e238cf4) lxqt.lxqt-qtplugin: 0.15.0 -> 0.15.1
* [`146d626d`](NixOS/nixpkgs@146d626) lxqt.lxqt-qtplugin: sort dependencies
* [`c784d3ab`](NixOS/nixpkgs@c784d3a) nixos/haproxy: add reloading support, use upstream service hardening
* [`09244cbd`](NixOS/nixpkgs@09244cb) nixos/nscd: set positive hosts caching ttl to 0
* [`43e6a42d`](NixOS/nixpkgs@43e6a42) gitstatus: unstable-2020-04-21 -> 1.1.3
* [`5cb2c698`](NixOS/nixpkgs@5cb2c69) zsh-powerlevel10k: 1.7.0 -> 1.11.0
* [`83ad0f5a`](NixOS/nixpkgs@83ad0f5) .github/stale.yml: quote labels
* [`67325b12`](NixOS/nixpkgs@67325b1) ip2unix: 2.1.2 -> 2.1.3
* [`55e7f952`](NixOS/nixpkgs@55e7f95) doc/stdenv: improve autoPatchelfHook description
* [`5e8e887e`](NixOS/nixpkgs@5e8e887) pipenv: 2018.11.26 -> 2020.5.28
* [`55fea6d2`](NixOS/nixpkgs@55fea6d) mautrix-whatsapp: 2020-05-27 -> 2020-05-29
* [`043ecdbe`](NixOS/nixpkgs@043ecdb) alacritty: 0.4.2 -> 0.4.3
* [`79b9b772`](NixOS/nixpkgs@79b9b77) fluentd: add cloudwatchlogs plugin (NixOS/nixpkgs#68028)
* [`f3c8acc0`](NixOS/nixpkgs@f3c8acc) nixos/doc: update stale fn name s/copy_file_from_host/copy_from_host/
* [`52374315`](NixOS/nixpkgs@5237431) matrix-appservice-discord: init at 0.5.2 (NixOS/nixpkgs#62744)
* [`ab327b27`](NixOS/nixpkgs@ab327b2) nixos/mautrix-telegram: add module (NixOS/nixpkgs#63589)
* [`d5117e79`](NixOS/nixpkgs@d5117e7) gpxsee: 7.29 -> 7.30 (NixOS/nixpkgs#89290)
* [`99b5c0bc`](NixOS/nixpkgs@99b5c0b) sbt-extras: 2019-10-21 -> 2020-06-01 (NixOS/nixpkgs#89289)
* [`e9b0f308`](NixOS/nixpkgs@e9b0f30) mdcat: 0.17.1 -> 0.18.2
* [`51a24425`](NixOS/nixpkgs@51a2442) cde-gtk-theme: init at 1.3
* [`82ee41b1`](NixOS/nixpkgs@82ee41b) maintainers: update 1000101 (mail)
* [`19dab239`](NixOS/nixpkgs@19dab23) coqPackages.CoLoR: enable for Coq 8.11
* [`46f2bf63`](NixOS/nixpkgs@46f2bf6) firmwareLinuxNonfree: 2020-01-22 -> 2020-05-19
* [`a4ea8aba`](NixOS/nixpkgs@a4ea8ab) docker: 19.03.10 -> 19.03.11
* [`54efe7b5`](NixOS/nixpkgs@54efe7b) v2ray: 4.23.2 -> 4.23.3
* [`46fcaf3c`](NixOS/nixpkgs@46fcaf3) openttd: Add XDG support (NixOS/nixpkgs#89296)
* [`d85dc4f6`](NixOS/nixpkgs@d85dc4f) qemu-vm: fix inconsistent caching of xchg dirs
* [`75b07778`](NixOS/nixpkgs@75b0777) dblatex: add pdflscape as a dependency
* [`5f97610f`](NixOS/nixpkgs@5f97610) ubootROCPCRK3399: init at 2020.04
* [`f5ca4bc6`](NixOS/nixpkgs@f5ca4bc) sysprof: fix build on i686
* [`c516c31d`](NixOS/nixpkgs@c516c31) .github/stale.yml: fix formatting
* [`55053317`](NixOS/nixpkgs@5505331) coqPackages.InfSeqExt: 20180918 → 20200131
* [`6f9d1246`](NixOS/nixpkgs@6f9d124) coqPackages.Cheerios: 20181102 → 20200201
* [`f0d985cf`](NixOS/nixpkgs@f0d985c) coqPackages.Verdi: 20190202 → 20200131
@github-actions github-actions bot mentioned this pull request Jun 4, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zowoq zowoq zowoq approved these changes

@kalbasit kalbasit Awaiting requested review from kalbasit

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

direnv tries to run bash from $PATH
2 participants
@zimbatm @zowoq