Commit Graph

235 Commits

Author SHA1 Message Date
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
R. RyanTM
59e213b70e bash-completion: 2.10 -> 2.11 2020-10-17 17:13:01 +00:00
Tim Steinbach
3333139f4d
bash: 5.0p17 -> 5.0p18 2020-10-15 19:40:53 -04:00
Tim Steinbach
d63ddacf93
bash: Use nix-shell in update script
The script assumed that `wget` was available in the environment
along with common CA certificates.
Replaced the detection of GPG, which is not necessary anymore.
Added pulling the public key bash releases and patches are signed with,
without which we cannot verify signatures.
2020-10-15 19:34:49 -04:00
Florian Klink
3bfdbea881 bash-completion: disable tests
Unfortunately, they're very flaky. Let's disable them for now.
2020-09-14 23:07:45 +02:00
Matthew Bauer
d0677e6d45 treewide: add warning comment to “boot” packages
This adds a warning to the top of each “boot” package that reads:

  Note: this package is used for bootstrapping fetchurl, and thus cannot
  use fetchpatch! All mutable patches (generated by GitHub or cgit) that
  are needed here should be included directly in Nixpkgs as files.

This makes it clear to maintainer that they may need to treat this
package a little differently than others. Importantly, we can’t use
fetchpatch here due to using <nix/fetchurl.nix>. To avoid having stale
hashes, we need to include patches that are subject to changing
overtime (for instance, gitweb’s patches contain a version number at
the bottom).
2020-07-31 08:56:53 +02:00
Philipp Adolf
3c8cdbff84 Revert "bashCompletion: speed-up test execution by using xdist"
This reverts commit a85b07cbcb as
executing the tests in parallel makes them flaky. This can be seen very
easily on armv7l machines (and probably other machines that are slower
than common x86_64 machines as well), but is also reproducible on
x86_64.

This fixes #91706.
2020-07-11 11:04:27 +02:00
Will Dietz
b20a7f09e4
bash_5: 5.0p16 -> 5.0p17
https://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-017
2020-07-06 17:14:09 -05:00
Andreas Rammhold
a85b07cbcb
bashCompletion: speed-up test execution by using xdist
Currently the tests take an eternity and are also sometimes flaky. By
following upstream in using xdist for parallel test execution we at
least get the feedback cycle down. On my machine that means instead of
running this for ~25min it runs in 1 minute and 10 seconds.
2020-05-07 16:17:02 +02:00
Andrew Childs
42afec1e58 bash-completion: ignore failing gcc tests on Aarch32 2020-04-30 01:06:40 +09:00
Konrad Borowski
0d120b1f25
bash-completion: 2.9 -> 2.10 2020-04-13 19:11:18 +02:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Tor Hedin Brønner
0e5d4573d4
nix-bash-completions: 0.6.7 -> 0.6.8 (#81019) 2020-03-05 15:08:03 +01:00
Will Dietz
afc321fa91 bash_5: 5p11 -> 5p16
https://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-012
https://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-013
https://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-014
https://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-015
https://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-016
2020-02-16 10:19:58 +01:00
Arnout Engelen
996e11d92b bash: enable PGRP_PIPE deterministically #77055 2020-01-15 09:45:11 +01:00
Merijn Broeren
133103d709
treewide: replace make/build/configure/patchFlags with nix lists 2019-12-30 12:58:11 +01:00
Robin Gloster
53cbd1b7bf
bash: *Flags are lists 2019-12-30 11:13:41 +01:00
Daniel Șerbănescu
a3e1c455d3 Updated bash 5.0 with the latest patches. 2019-12-17 09:37:20 +01:00
Jörg Thalheim
8031617f3f
bash-completion: apply musl patch unconditionally
This way we don't forget accidentally to remove the patch on the next upgrade.
2019-12-02 10:15:10 +00:00
Niklas Hambüchen
0a854379c4 bash-completion: Fix tests with musl.
Fixes test error

    self = <test_iconv.TestIconv object at 0x7ffff52f3410>
    completion = <CompletionResult []>

        @pytest.mark.complete("iconv -")
        def test_1(self, completion):
    >       assert completion
    E       assert <CompletionResult []>

    ../t/test_iconv.py:7: AssertionError

by applying upstream commit not present in a newer release.
2019-12-02 04:20:08 +01:00
Mario Rodas
bef1709e90
bash-completion: fix build on darwin
Disable tests on Darwin because is failing consistently.
2019-10-25 21:00:00 -05:00
Frederik Rietdijk
061c6b8024 bash-completion: do not change pkgconfig behaviour, fixes #71662
Since 2.9 bash-completion hardcodes paths in pkgconfig file. We want to
be able to override certain paths, so this commit restores the original
behaviour.

https://github.com/NixOS/nixpkgs/issues/71662
2019-10-23 08:44:10 +02:00
Jonathan Ringer
12fd773ff0 bash-completion: 2.8 -> 2.9 2019-10-22 10:23:22 +02:00
Vladimír Čunát
985d1ac425
Merge branch 'master' into staging-next
There were several more conflicts from name -> pname+version;
all auto-solved by kdiff3, hopefully OK.

Hydra nixpkgs: ?compare=1538611
2019-08-25 14:57:11 +02:00
Will Dietz
db5f966b99
bash_5: 5.0p7 -> 5.0p9 2019-08-22 14:07:55 -05:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Will Dietz
95f7deffec bash_5: 5.0-p2 -> 5.0-p7 2019-04-21 11:47:25 -05:00
Will Dietz
d0b4b3527d bash_5: 5.0p0 -> 5.0p2 2019-01-20 01:25:17 -06:00
Jörg Thalheim
26c7c59c0d
bash: cygwin patch no longer applies 2019-01-09 08:28:29 +00:00
Will Dietz
c9b95f54bc bash5: add myself to maintainer list 2019-01-08 17:36:14 -06:00
Will Dietz
fa00f7fb70 bash5: remove patch w/musl
Leave the configureFlags, esp disabling bash malloc.
2019-01-08 17:35:28 -06:00
Will Dietz
844bd53740 bash5: enable parallel building optimistically
Works for me and they've had quite some time to fix it ;).
2019-01-08 00:16:45 -06:00
Will Dietz
86a1a3950b bash5: init bash 5.0
https://lists.gnu.org/archive/html/info-gnu/2019-01/msg00010.html
2019-01-07 23:57:59 -06:00
Tor Hedin Brønner
ad8f5ca2bb nix-bash-completions: 0.6.6 -> 0.6.7 2018-12-04 08:34:23 +01:00
c0bw3b
0498ccd076 Treewide: use HTTPS on GNU domains
HTTP -> HTTPS for :
- http://gnu.org/
- http://www.gnu.org/
- http://elpa.gnu.org/
- http://lists.gnu.org/
- http://gcc.gnu.org/
- http://ftp.gnu.org/ (except in fetchurl mirrors)
- http://bugs.gnu.org/
2018-12-02 15:51:59 +01:00
volth
ecf1ded466
bash: fix typo in configureFlags 2018-11-21 07:58:32 +00:00
John Ericson
0828e2d8c3 treewide: Remove usage of remaining redundant platform compatability stuff
Want to get this out of here for 18.09, so it can be deprecated
thereafter.
2018-08-30 17:20:32 -04:00
Jan Malakhovski
ef2f89b2b9 bash: make tests run, but dependency cycle 2018-08-11 09:35:34 +00:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Will Dietz
d07237ff09 bash: 4.4p19 -> 4.4p23 2018-06-10 01:15:45 -05:00
Matthew Justin Bauer
eeb016e8f0
Merge branch 'staging' into fix-ncurses-darwin-extensions 2018-05-02 15:40:38 -05:00
Jan Malakhovski
3c7f6572ce bash: simplify expression, add withDocs option 2018-04-25 19:50:54 +00:00
Tor Hedin Brønner
954e02f835 nix-bash-completions: 0.6.5 -> 0.6.6 2018-04-25 11:19:51 +02:00
Matthew Bauer
ddaea6ac77 pkgs/shells: move extensions to subdirs
These are not reaal shells and should go into their parent shell
directory.
2018-04-17 14:47:32 -05:00
Will Dietz
3d88d7af0f bash: 4.4p12 -> 4.4p19 2018-03-09 13:11:07 -06:00
Jan Malakhovski
d45e39c9a9 bash, bashInteractive: install manpages for both variants
This mostly reverts commit bd0e161f0c.
2018-02-26 22:46:35 +00:00
Will Dietz
b42c8af907 bash: fix on musl 2018-02-13 09:44:36 -06:00
John Ericson
5b74540c5b treewide: Use depsBuildBuild for buildPackges.stdenv.cc 2017-12-30 22:04:21 -05:00
Frederik Rietdijk
6bbc3a0b24 Merge commit '3b29468313bc8604fe8f85c8d9316fd276d3985c' into HEAD 2017-08-21 04:44:40 +02:00
Klaas van Schelven
3c65062a43 bash: cleanup unused file
The only usage location was removed in f803270b7e
Grepping for bash-4.3 yields no results
2017-08-18 12:36:30 +03:00
Tuomas Tynkkynen
bd0e161f0c bashInteractive: Fix manpages since previous commits 2017-08-11 21:32:55 +03:00
Tuomas Tynkkynen
1ff422aa23 treewide: Add man & info outputs where necessary (instead of doc)
Because man & info pages won't be going to $doc after the next commit.
Scripted change for the files having one-package-per-file.
2017-08-11 21:32:54 +03:00
David McFarland
af165175da bash: fix cygwin build 2017-06-26 09:33:03 -03:00
John Ericson
f75ad79375 bash: Modernize derivation, hopefully fixing cross compilation 2017-06-22 17:53:53 -04:00
Tuomas Tynkkynen
7194179854 bash: Remove unnecessary 'Makefile.inc' that is keeping reference to bootstrap-tools
The file is an example makefile for developing bash plugins, and
contains stuff like:

````
example:	example.o
	$(SHOBJ_LD) $(SHOBJ_LDFLAGS) $(SHOBJ_XLDFLAGS) -o $@ example.o $(SHOBJ_LIBS)
````

So no package is really going to depend on that, and it's making the
.dev output keep a reference to the bootstrap tools. Just nuke it.
2017-04-26 13:19:51 +03:00
Eelco Dolstra
48bc3cf9f4
bash: 4.4p5 -> 4.4p12 2017-03-20 16:47:13 +01:00
Tuomas Tynkkynen
dff0ba38a2 bash: Set bash_cv_getcwd_malloc=yes when cross compiling
Because if you don't, the configure script assumes that your getcwd()
function is broken. Which then makes bash use it's own getcwd()
implementation, which doesn't work if the path to the current directory
contains bind mounts in its paths. This shows up as:

shell-init: error retrieving current directory: getcwd: cannot access parent directories: Bad file descriptor

... and fails the aarch64 glibc build with sandboxes enabled.

Sigh.
2017-03-14 00:33:29 +02:00
Vladimír Čunát
f803270b7e
bash: switch the default 4.3 -> 4.4
... and remove the now-unused 4.3 expression.
2017-01-05 01:07:36 +01:00
Vladimír Čunát
57fc4d21b7
bash-4.4: p0 -> p5 + a security patch from Gentoo 2017-01-05 01:01:02 +01:00
Vladimír Čunát
22796f0d4f
bash-4.3: fix security problems via a Gentoo patch 2017-01-05 00:00:24 +01:00
Daiderd Jordan
f04783876c
bash-4.3-p46 -> bash-4.3-p48 2017-01-04 22:37:07 +01:00
Vladimír Čunát
30f551d8b2 Merge branch 'master' into staging 2016-10-05 19:02:48 +02:00
Markus Hauck
aafbd40577 Replace hard coded /bin/bash occurrences 2016-10-04 20:15:37 +02:00
Vladimír Čunát
f37566d396 bash 4.4: split headers into .dev 2016-09-17 10:51:32 +02:00
Vladimír Čunát
40a6918af3 bash: bring back 4.3 for the non-interactive version
... until someone looks better at the outputs. The size has grown in 4.4,
and it seems like installing binary plugins, headers, etc.
2016-09-17 10:49:28 +02:00
Vladimír Čunát
bbadb1da2a readline70: init at 7.0p0
Also switch bash-4.4 to it, as it's unable to link with older readline
versions (only bashInteractive is affected).
2016-09-17 01:16:24 +02:00
Vladimír Čunát
02163da708 bash: fixup the patch-list paths 2016-09-17 00:43:13 +02:00
Matthias Beyer
3689be00d8 Add bash-4.4-patches.nix 2016-09-16 22:06:55 +02:00
Matthias Beyer
4a674282e5 bash: 4.3 -> 4.4 2016-09-16 22:05:18 +02:00
Franz Pletz
098680e78e
Revert "Revert "bash: 4.3-p42 -> 4.3-p46""
This reverts commit 36e75a2285.

Sorry, had bash reverted temporarily to test the build of the
sqlite bump and forgot to remove that commit.
2016-08-26 17:08:58 +02:00
Franz Pletz
36e75a2285
Revert "bash: 4.3-p42 -> 4.3-p46"
This reverts commit e39a3237e6.
2016-08-26 17:06:45 +02:00
Eelco Dolstra
e39a3237e6 bash: 4.3-p42 -> 4.3-p46 2016-08-26 16:36:07 +02:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Peter Simons
8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
Vladimír Čunát
c7377b0e4a zlib, bash: mass-rebuild cleanup 2016-04-25 17:12:49 +02:00
Robin Gloster
d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Vladimír Čunát
61ebdc192d bash-interactive: better split doc stuff
... while avoiding mass rebuild ATM.
2016-03-08 09:59:24 +01:00
Franz Pletz
baee91ec60 cc-wrapper: Check if ld supports -z, fixes darwin 2016-03-07 21:40:20 +01:00
Vladimír Čunát
f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00