Commit Graph

168 Commits

Author SHA1 Message Date
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