Commit Graph

213 Commits

Author SHA1 Message Date
Jan Tojnar
5810109b42 Merge branch 'staging-next' into staging
- readline6 attribute removed from all-packages.nix in d879125d61
- readline attribute was bumped to readline82 in 50adabdd60
2023-01-02 03:04:32 +01:00
Naïm Favier
d62198f2d4
Merge pull request #207224 from ncfavier/nix-bash-completions 2023-01-01 10:43:13 +01:00
Markus Napierkowski
aae36e6869
bash: 5.1 -> 5.2 2022-12-28 21:05:43 +01:00
Sandro Jäckel
363980f93d bash: remove ? null inputs, other little cleanups 2022-12-27 09:33:27 +01:00
Naïm Favier
cd5d9f6206
nix-bash-completions: don't handle the nix command
See https://github.com/hedning/nix-bash-completions/issues/20.

Even with the low priority on this package, completing `nix-build` will
load the nix-bash-completion for the `nix` command, which is undesirable
since Nix provides its own completion since 2.4.

The maintainer seems unresponsive.
2022-12-22 13:14:11 +01:00
Vladimír Čunát
9c497bb8d6
Merge branch 'staging-next' into staging 2022-12-09 10:27:46 +01:00
tars0x9752
49a8c118b2
blesh: unstable-2022-07-24 -> unstable-2022-07-29, refactor 2022-12-08 13:39:55 +01:00
Sandro
682351f259
Merge pull request #151090 from thefloweringash/readline-update 2022-11-30 17:55:09 +01:00
Artturin
7e49471316 treewide: optional -> optionals where the argument is a list
the argument to optional should not be list
2022-10-10 15:40:21 +03:00
cidkidnix
db31db7e84 bash: give bionic file with comment about "fortify" 2022-09-29 08:51:21 -05:00
cidkidnix
0bf33f0e83 bash: make android comment more clear 2022-09-23 14:50:09 -05:00
Dylan Green
2870a5e506
match libc, instead of useAndroidPrebuilt
Co-authored-by: John Ericson <git@JohnEricson.me>
2022-09-23 14:07:04 -05:00
cidkidnix
2b6bf950e7 bash: fix android cross-compile 2022-09-23 09:49:23 -05:00
Alyssa Ross
5330c0a1af
treewide: use isAarch where appropriate 2022-07-30 16:18:27 +00:00
Yuto Oguchi
d5086eb862
blesh: init at 2022-07-24 (#181963)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-07-25 15:57:30 +02:00
Loïc Reynier
09e68b8535 fzf-obc: init at 1.3.0
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-07-18 10:43:48 +02:00
Artturin
4f180210a0 bash: enable strictDeps 2022-05-06 23:39:22 +03:00
Artturin
ea79263e60 pkgs/shells: enable strictDeps 2022-05-06 22:31:38 +03:00
Andrew Childs
dd358e2111 readline: default to readline81 instead of readline6 2022-03-30 13:04:48 +09:00
github-actions[bot]
6787116890
Merge master into staging-next 2022-02-28 00:02:07 +00:00
Daniel Fullmer
0a8007498f bash: use default PATH in FHS environments
If bash is executed within an environment where PATH is not set, it uses
the DEFAULT_PATH_VALUE compiled into bash to set PATH. In nixpkgs we set
this to /no-such-path by default. This makes sense in a nixpkgs/NixOS
environment since paths like /bin or /usr/bin should not be used.
However, when bash is used inside an FHS environment, this produces
results that differ from distributions which follow the FHS standard.

Before this change:
$ steam-run env -i /bin/bash -c 'echo $PATH'
/no-such-path

After this change:
$ steam-run env -i /bin/bash -c 'echo $PATH'
/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:.
2022-02-27 15:59:39 -08:00
github-actions[bot]
6ceaf1126b
Merge staging-next into staging 2022-02-20 12:01:51 +00:00
Sandro
ed96cc2f19
Merge pull request #157688 from SuperSandro2000/bash-readline 2022-02-15 12:03:21 +01:00
Tom Bereknyei
2a448a9ccd bashInteractive: set mainProgram 2022-02-12 14:06:05 -05:00
Bjørn Forsman
5153446c44 nix-bash-completions: add missing pre/postInstall hooks 2022-02-12 10:22:17 +01:00
Sandro Jäckel
830435ccc3
bash: 5.1p12 -> 5.1p16 2022-02-01 13:17:11 +01:00
Artturin
233c7e8ec5 bash_4: remove
it was brought back in for the output size but that issue has been fixed
40a6918af3
nothing in nixpkgs uses bash_4
2021-12-24 17:00:32 +02:00
github-actions[bot]
017d32f216
Merge master into staging-next 2021-11-28 18:00:57 +00:00
Robert Hensing
7658c0dfc8
Merge pull request #145830 from l0b0/fix-shellcheck-lints
bash: Fix shellcheck lint
2021-11-28 13:59:31 +01:00
github-actions[bot]
b529eccbb3
Merge master into staging-next 2021-11-26 18:01:19 +00:00
Samuel Dionne-Riel
8608d393e8 nix-bash-completions: Reduce priority for Nix 2.4
Reducing the priority makes the system build prefer the Nix-provided
completions, for e.g. the new `nix` commands.
2021-11-26 02:17:15 -05:00
Victor Engmark
34f54b0c83 bash: Quote variable reference
ShellCheck SC2086.
2021-11-23 20:35:45 +13:00
Julien Moutinho
f91691f6a8
bash: update patches (#146463) 2021-11-20 03:46:17 +09:00
Peter Simons
476635afe1 Drop myself from meta.maintainers for most packages.
I'd like to reduce the number of Github notifications and
review requests I receive.
2021-10-14 11:01:27 +02:00
Damien Cassou
0588980396
yarn-bash-completion: init at 0.17.0 2021-09-01 20:35:03 +02:00
happysalada
5dae71ea08 bash: update 5.1 patches 2021-08-26 07:36:01 +09:00
happysalada
1a5b80085f bash: update-patch-set script fixes
- make the script runnable from any directory
- add missing nix dependency to run nix-hash
- make padding non implicit
- small shellcheck fixes (variable quoting...)
2021-08-26 07:36:01 +09:00
Kira Bruneau
cd4780fab4
maintainers: rename metadark -> kira-bruneau (#124035) 2021-05-22 16:47:40 +02:00
github-actions[bot]
98d7aac597
Merge staging-next into staging 2021-05-04 00:49:43 +00:00
Kira Bruneau
2008b4f9f4 undistract-me: init at unstable-2020-08-09 2021-04-30 09:49:05 -04:00
Lancelot SIX
090b1804b7 bash_5: upgrade readline dependency to 8.1
Readline 8.1 is required for bash-5.1 to work properly.

From bash-5.1 release message[1]:

> Bash can be linked against an already-installed Readline library
> rather than the private version in lib/readline if desired.  Only
> readline-8.1 and later versions are able to provide all of the symbols
> that bash-5.1 requires; earlier versions of the Readline library will
> not work correctly.

[1] https://lists.gnu.org/archive/html/info-gnu/2020-12/msg00003.html
2021-04-14 21:27:24 +01:00
Arnout Engelen
3f4ad3d37d
bash: don't rely on patch timestamps in build
When, after patching, `configure.ac` is newer than `configure`, the
Makefile will try to regenerate `configure` from `configure.ac`.

While that might usually be desirable, in this case we want to keep
bootstrapping simple and directly use the `configure` from the package
so we can avoid a dependency on automake.

Previously, we used the `-T` parameter to automake to make sure the
timestamps were okay. However, this is brittle when we update: when the
timestamp of the original file changes, and no longer matches the
timestamp of the original file in the patch, `patch` will show a warning
but otherwise continue without updating the timestamp.

This PR changes things so we only patch `configure`, so that will always
have a newer timestamp.

Refs https://github.com/NixOS/nixpkgs/issues/115177
2021-03-21 16:11:09 +01:00
Ben Siraphob
e245ae3c3a pkgs/shells: stdenv.lib -> lib 2021-01-15 14:24:03 +07:00
Profpatsch
4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
Marc Seeger
1d83fc2aac bash-completion: fix build on darwin (#107768) 2020-12-29 09:34:54 -08:00
Luke Worth
7bc7073430
bash: 5.0 -> 5.1 2020-12-22 10:43:59 +11:00
Graham Christensen
bc49a0815a
utillinux: rename to util-linux 2020-11-24 12:42:06 -05:00
Vladimír Čunát
89023c38fc
Recover the complicated situation after my bad merge
I made a mistake merge.  Reverting it in c778945806 undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.

I reconstructed the "desired" state of staging-next tree by:
 - checking out the last commit of the problematic range: 4effe769e2
 - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
   merge commit and its revert from that range (while keeping
   reapplication from 4effe769e2)
 - merging the last unaffected staging-next commit (803ca85c20)
 - fortunately no other commits have been pushed to staging-next yet
 - applying a diff on staging-next to get it into that state
2020-10-26 09:01:04 +01:00
Vladimír Čunát
c778945806
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
2020-10-25 09:41:51 +01:00
Jan Tojnar
5c766c5c24
Merge branch 'staging-next' into staging 2020-10-18 21:21:03 +02:00