Commit graph

1071 commits

Author SHA1 Message Date
Frederik Rietdijk
419bc0a4cd Revert "Revert "Merge master into staging-next""
In 87a19e9048 I merged staging-next into master using the GitHub gui as intended.
In ac241fb7a5 I merged master into staging-next for the next staging cycle, however, I accidentally pushed it to master.
Thinking this may cause trouble, I reverted it in 0be87c7979. This was however wrong, as it "removed" master.

This reverts commit 0be87c7979.
2020-02-05 19:41:25 +01:00
Frederik Rietdijk
0be87c7979 Revert "Merge master into staging-next"
I merged master into staging-next but accidentally pushed it to master.
This should get us back to 87a19e9048.

This reverts commit ac241fb7a5, reversing
changes made to 76a439239e.
2020-02-05 19:18:35 +01:00
Tim Steinbach
e9a21da6a1
oh-my-zsh: 2020-02-04 -> 2020-02-04 2020-02-05 08:31:36 -05:00
Tim Steinbach
3931b82775
oh-my-zsh: 2020-01-31 -> 2020-02-04 2020-02-04 09:44:47 -05:00
Martin Weinelt
f40dcc6c52
zsh-powerlevel10k: 1.0 -> 1.1 2020-02-02 21:34:05 +01:00
Tim Steinbach
d0f3e3e07f
oh-my-zsh: 2020-01-30 -> 2020-01-31 2020-02-01 09:18:52 -05:00
Maximilian Bosch
4afad26f79
Merge pull request #78782 from cust0dian/nushell-0.9.0
nushell: 0.8.0 -> 0.9.0
2020-02-01 12:29:01 +01:00
Tim Steinbach
79713f8a90
oh-my-zsh: 2020-01-04 -> 2020-01-30 2020-01-30 16:41:13 -05:00
Serg Nesterov
e8e47ce945
nushell: 0.8.0 -> 0.9.0 2020-01-30 14:16:28 +03:00
Izorkin
8f5af404d2 zsh: fix bracketed-paste-magic 2020-01-30 14:02:34 +03:00
Frederik Rietdijk
dce0ca29d9 Merge master into staging-next 2020-01-28 10:46:13 +01:00
Silvan Mosberger
80a2740991
Merge pull request #78265 from Synthetica9/https-homepages
treewide: fix redirected urls
2020-01-27 15:00:53 +01:00
Patrick Hilhorst
593e11fd94
treewide: fix redirected urls
According to https://repology.org/repository/nix_unstable/problems, we have a
lot of packages that have http links that redirect to https as their homepage.
This commit updates all these packages to use the https links as their
homepage.

The following script was used to make these updates:

```

curl https://repology.org/api/v1/repository/nix_unstable/problems \
    | jq '.[] | .problem' -r \
    | rg 'Homepage link "(.+)" is a permanent redirect to "(.+)" and should be updated' --replace 's@$1@$2@' \
    | sort | uniq > script.sed

find -name '*.nix' | xargs -P4 -- sed -f script.sed -i
```
2020-01-22 11:26:22 +01:00
Silvan Mosberger
b785f2a98a
Merge pull request #65430 from pasqui23/zbd
zsh-bd:init at 2018-07-04
2020-01-21 16:11:56 +01:00
Pasquale
341097c8cf zsh-bd: init at 2018-07-04 2020-01-21 12:38:22 +01:00
Maximilian Bosch
70afd4e63b
zsh-you-should-use: 1.6.0 -> 1.7.0
https://github.com/MichaelAquilina/zsh-you-should-use/blob/1.7.0/CHANGELOG.md#170
2020-01-20 13:44:29 +01:00
Linus Heckemann
645c9a672b
Merge pull request #78020 from dywedir/oil
oil: 0.7.pre9 -> 0.7.pre11
2020-01-19 21:07:22 +01:00
Mario Rodas
82a484d375
Merge pull request #78003 from marsam/enable-mrsh-darwin
mrsh: enable on darwin
2020-01-19 10:32:36 -05:00
Florian Klink
26f1ce1276
Merge pull request #77841 from mweinelt/powerlevel10k-1.0
zsh-powerlevel10k: unstable-2019-12-19 -> 1.0
2020-01-19 15:50:20 +01:00
Vladyslav M
b334b46c6a
oil: 0.7.pre9 -> 0.7.pre11 2020-01-19 11:33:10 +02:00
Mario Rodas
fb055f51aa
mrsh: enable on darwin 2020-01-18 04:20:00 -05:00
Gabriel Ebner
26afc6c46d fish: fix systemctl completion 2020-01-17 17:42:33 +01:00
Martin Weinelt
67b968a9ec
zsh-powerlevel10k: unstable-2019-12-19 -> 1.0 2020-01-16 20:18:29 +01:00
Arnout Engelen
996e11d92b bash: enable PGRP_PIPE deterministically #77055 2020-01-15 09:45:11 +01:00
Will Dietz
2e63e9c433 zsh-autosuggestions: 0.6.3 -> 0.6.4 2020-01-11 12:51:27 -08:00
Matthias Beyer
dd78f9c247 mrsh: init at 2020-01-08
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
2020-01-08 14:38:43 +01:00
Maximilian Bosch
a1932826d7
Merge pull request #77249 from filalex77/nushell-0.8.0
nushell: 0.7.1 -> 0.8.0
2020-01-07 22:06:15 +01:00
Oleksii Filonenko
6418e73552
nushell: 0.7.1 -> 0.8.0 2020-01-07 19:58:06 +02:00
Martin Weinelt
6eb0aee387 zsh-powerlevel10k: init at unstable-2019-12-19 2020-01-06 21:49:15 +01:00
Tim Steinbach
7b9da94d49
oh-my-zsh: 2020-01-01 -> 2020-01-04 2020-01-05 16:17:40 -05:00
Frederik Rietdijk
f08e3e38d4 Merge master into staging-next 2020-01-02 21:41:13 +01:00
Maximilian Bosch
2ff742e970
nushell: 0.7.0 -> 0.7.1
https://crates.io/crates/nu/0.7.1

`aarch64-linux` is currently not supported as several crates fail to
compile on ARM archs (https://github.com/nushell/nushell/issues/485).
2020-01-02 12:35:48 +01:00
Tim Steinbach
3ebcd9a338
oh-my-zsh: 2019-12-29 -> 2020-01-01 2020-01-01 16:12:27 -05:00
Matthew Bauer
13b0141486
powershell: set shellPath
Fixes #45830
2019-12-31 13:25:47 -05:00
mox
89c23241ed Adding passthru to ion shell to allow using it as a login shell as advised for a similar case in https://github.com/NixOS/nixpkgs/issues/45830 2019-12-31 06:40:07 +01:00
Robin Gloster
006242fd5a
treewide: fix types for mkDerivation params 2019-12-31 01:23:19 +01:00
Frederik Rietdijk
6d059becd3 Merge gcc-9 into staging (#68029) 2019-12-30 16:38:38 +01:00
Robin Gloster
2157dcd141
treewide: installFlags is a list 2019-12-30 13:22:43 +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
Franz Pletz
0852b7d5bb
ksh: add patch to fix darwin build 2019-12-30 03:50:35 +01:00
Tim Steinbach
124ec9c18e
oh-my-zsh: 2019-12-27 -> 2019-12-29 2019-12-28 23:19:54 -05:00
Tim Steinbach
8c01abd962
oh-my-zsh: 2019-12-22 -> 2019-12-27 2019-12-26 20:10:45 -05:00
Maximilian Bosch
9842c4b107
treewide: update which packages I'm currently maintaining
Idea shamelessly stolen from 4e60b0efae.

I realized that I don't really know anymore where I'm listed as maintainer and what
I'm actually (co)-maintaining which means that I can't proactively take
care of packages I officially maintain.

As I don't have the time, energy and motivation to take care of stuff I
was interested in 1 or 2 years ago (or packaged for someone else in the
past), I decided that I make this explicit by removing myself from several
packages and adding myself in some other stuff I'm now interested in.

I've seen it several times now that people remove themselves from a
package without removing the package if it's unmaintained after that
which is why I figured that it's fine in my case as the affected pkgs
are rather low-prio and were pretty easy to maintain.
2019-12-26 15:27:47 +01:00
Franz Pletz
77b6c3cd06
Merge remote-tracking branch 'origin/master' into gcc-9 2019-12-26 14:17:36 +01:00
Tim Steinbach
e865acf44c
oh-my-zsh: 2019-12-20 -> 2019-12-22 2019-12-22 20:11:22 -05:00
Tim Steinbach
e093c7503f
oh-my-zsh: 2019-12-18 -> 2019-12-20 2019-12-20 11:36:44 -05:00
Renaud
3a30486bea
Merge pull request #75301 from dasj19/upgrade-bash-50-p11
bash 5.0p9 -> 5.0p11
2019-12-19 22:50:36 +01:00
Mario Rodas
54d52ec0bf
Merge pull request #75932 from filalex77/nushell-0.7.0
nushell: 0.6.1 -> 0.7.0
2019-12-19 10:00:39 -05:00
Oleksii Filonenko
7c7e2afc5c
nushell: change --all-features to --features=stable 2019-12-19 16:26:35 +02:00
Oleksii Filonenko
297a5627af
nushell: 0.6.1 -> 0.7.0 2019-12-19 11:17:23 +02:00
Tim Steinbach
52ed4751af
oh-my-zsh: 2019-12-07 -> 2019-12-18 2019-12-18 11:37:42 -05:00
Daniel Șerbănescu
a3e1c455d3 Updated bash 5.0 with the latest patches. 2019-12-17 09:37:20 +01:00
Christian Kampka
c98d54a3e9
zsh-history: Add tests 2019-12-14 10:58:38 +01:00
Tim Steinbach
60512b1823
oh-my-zsh: GitHub repo moved 2019-12-12 07:38:40 -05:00
worldofpeace
d157c97b43
Merge pull request #75434 from kampka/zsh-history
zsh-history: 2019-10-07 -> 2019-12-10
2019-12-10 23:59:38 -05:00
Vladyslav M
8a5cfec1c2 oil: 0.7.pre6 -> 0.7.pre9 2019-12-10 19:28:47 -08:00
Christian Kampka
1d2e21ad1f
zsh-history: 2019-10-07 -> 2019-12-10 2019-12-10 13:18:38 +01:00
Tim Steinbach
65543e5839
oh-my-zsh: 2019-12-07 -> 2019-12-07 2019-12-09 12:01:33 -05: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
Oleksii Filonenko
76c83c0ef3
nushell: 0.6.0 -> 0.6.1 2019-12-01 11:00:19 +02:00
Mario Rodas
4bd191d4c9
powershell: disable dotnet telemetry 2019-11-29 18:00:00 -05:00
Oleksii Filonenko
160a9764ae
nushell: 0.5.0 -> 0.6.0 2019-11-27 08:49:59 +02:00
Oleksii Filonenko
a9cda5f14c
nushell: add filalex77 to maintainers 2019-11-27 08:49:18 +02:00
Tim Steinbach
bdf74811ce
oh-my-zsh: 2019-11-21 -> 2019-11-23 2019-11-25 09:14:39 -05:00
John Ericson
d0d5136cce Merge remote-tracking branch 'upstream/master' into wrapper-pname-support 2019-11-24 17:25:07 +00:00
John Ericson
9b090ccbca treewide: Get rid of most parseDrvName without breaking compat
That is because this commit should be merged to both master and
release-19.09.
2019-11-24 17:22:28 +00:00
Tim Steinbach
ab84418b10 oh-my-zsh: 2019-10-30 -> 2019-11-21 2019-11-21 19:55:38 -05:00
pasqui23
c20f765bb4 zsh-fast-syntax-highlighting: init at 1.54 (#65429) 2019-11-19 21:20:17 -05:00
R. RyanTM
96630a9e49 grml-zsh-config: 0.16.0 -> 0.16.1
(#72511)
2019-11-13 16:16:07 +01:00
Vladyslav M
1c30315488
oil: 0.7.pre5 -> 0.7.pre6 2019-11-13 11:09:48 +02:00
Mario Rodas
1933ae3973
Merge pull request #73121 from marsam/init-nushell
nushell: init at 0.5.0
2019-11-12 22:33:06 -05:00
Renaud
a6220c3384
Merge pull request #73072 from cko/missing_descriptions
treewide: add missing descriptions & homepages
2019-11-13 00:34:31 +01:00
Mario Rodas
a8942c6cbd
nushell: add withAllFeatures flag
Co-authored-by: Evan Stoll <evanjs@users.noreply.github.com>
2019-11-12 04:20:00 -05:00
Oleksii Filonenko
dfb9a1e164
antibody: add filalex77 as a maintainer 2019-11-11 13:51:02 +02:00
Oleksii Filonenko
3f72f7bac2
antibody: 4.1.2 -> 4.2.0 2019-11-11 13:50:42 +02:00
Christine Koppelt
92d66a9d95 oh: add missing description & homepage 2019-11-10 07:59:05 +01:00
Mario Rodas
1024689318
nushell: init at 0.5.0 2019-11-09 04:20:00 -05:00
Franz Pletz
8dca8b9ccb
Merge remote-tracking branch 'origin/master' into gcc-9 2019-11-05 01:07:22 +01:00
R. RyanTM
e834edcbdd zsh-history-substring-search: 1.0.1 -> 1.0.2 2019-11-04 11:08:40 +00:00
Franz Pletz
35dd9c7dbf
ksh: 93v -> 2020.0.0 2019-11-03 00:52:53 +01:00
Maximilian Bosch
8a0fdf0011
Merge pull request #72195 from Ma27/package-fzf-zsh
fzf-zsh: init at unstable-2019-09-09
2019-10-31 23:32:02 +01:00
Tim Steinbach
8a75eaa6a0
oh-my-zsh: 2019-10-27 -> 2019-10-30 2019-10-31 10:42:54 -04:00
Maximilian Bosch
69653b4889
xonsh: 0.9.11 -> 0.9.13
https://github.com/xonsh/xonsh/releases/tag/0.9.12
https://github.com/xonsh/xonsh/releases/tag/0.9.13
2019-10-28 23:53:58 +01:00
Maximilian Bosch
bd4b70b075
fzf-zsh: init at unstable-2019-09-09
Simple `fzf` wrapper which provides a way nicer interface for ZSH's
<C-r> search. When using oh-my-zsh it can be enabled like this:

``` nix
{ pkgs, ... }: {
  programs.zsh = {
    enable = true;
    ohMyZsh = {
      enable = true;
      customPkgs = [ pkgs.fzf-zsh ];
      plugins = [ "fzf-zsh" ];
    };
  };
}
```
2019-10-28 21:55:34 +01:00
Tim Steinbach
4aaf2ad527
oh-my-zsh: 2019-10-25 -> 2019-10-27 2019-10-27 14:59:39 -04: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
Tim Steinbach
50208ab5b9
oh-my-zsh: 2019-10-24 -> 2019-10-25 2019-10-25 13:44:03 -04:00
Tim Steinbach
6373b7ac51
oh-my-zsh: 2019-10-22 -> 2019-10-24 2019-10-24 18:23:36 -04:00
Frederik Rietdijk
09c9a2de7e Merge master into staging-next 2019-10-23 16:50:09 +02:00
Tim Steinbach
ad55ac4a40
oh-my-zsh: 2019-10-20 -> 2019-10-22 2019-10-23 08:30:55 -04: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
Frederik Rietdijk
d7a921cad9
Merge pull request #71221 from NixOS/staging-next
Staging next
2019-10-22 09:15:19 +02:00
Tim Steinbach
ad5994f182
oh-my-zsh: 2019-10-19 -> 2019-10-20 2019-10-21 07:34:51 -04:00
Frederik Rietdijk
ad8bd84fc9 Merge master into staging-next 2019-10-20 16:22:45 +02:00
Tim Steinbach
71ab7a57ff
oh-my-zsh: 2019-10-16 -> 2019-10-19 2019-10-19 20:53:48 -04:00
Jan Tojnar
7ba42794a8
Revert "fish: switch to fetchFromGitHub"
This reverts commit cc997f28d1.

I confused the URLs. The files have the same contents but the former URL is recommended by upstream.
2019-10-20 01:53:10 +02:00
Maximilian Bosch
70783011e2
zsh-you-should-use: 1.4.0 -> 1.6.0
https://github.com/MichaelAquilina/zsh-you-should-use/blob/master/CHANGELOG.md#160
2019-10-19 21:36:06 +02:00
Jan Tojnar
cc997f28d1
fish: switch to fetchFromGitHub
The expression claimed there are differences between the release tarball and the tarball github packages from the tag but fetchFromGitHub literally downloads the same tarball.
2019-10-19 14:30:25 +02:00
Tim Steinbach
b54d23a3c0
oh-my-zsh: 2019-10-15 -> 2019-10-16 2019-10-18 12:33:12 -04:00
Frederik Rietdijk
12441bdf9f Merge staging-next into staging 2019-10-16 11:17:12 +02:00
worldofpeace
fce8b4837a
Merge pull request #67670 from kampka/zsh-history
zsh-history: init at unstable-2019-08-29
2019-10-16 01:57:23 +00:00
Tim Steinbach
2f6f6a3855
oh-my-zsh: 2019-10-10 -> 2019-10-15 2019-10-15 16:10:38 -04:00
Christian Kampka
0bfefb0913
zsh-history: Backport upstream patch for config generation 2019-10-15 11:45:29 +02:00
Tim Steinbach
950ae44ea9
oh-my-zsh: 2019-10-09 -> 2019-10-10 2019-10-12 11:17:24 -04:00
Jan Tojnar
e2e3861d6b
Merge branch 'staging-next' into staging 2019-10-12 00:51:55 +02:00
Tim Steinbach
0e751e6655
oh-my-zsh: 2019-10-08 -> 2019-10-09 2019-10-09 17:19:57 -04:00
Tim Steinbach
6879b2d6b9
oh-my-zsh: 2019-10-07 -> 2019-10-08 2019-10-08 10:01:51 -04:00
Alva
d63593bb42
oil: add alva as maintainer 2019-10-08 10:39:58 +02:00
Tim Steinbach
0cf6a50359
oh-my-zsh: 2019-10-03 -> 2019-10-07 2019-10-07 18:01:57 -04:00
Christian Kampka
5ddfcc1f60
Update pkgs/shells/zsh/zsh-history/default.nix
Co-Authored-By: worldofpeace <worldofpeace@protonmail.ch>
2019-10-07 21:02:56 +02:00
Christian Kampka
c0570ed238
zsh-history: use goModule build infrastructure 2019-10-07 10:09:54 +02:00
Alva
fe30f41890
oil: add passthru.shellPath 2019-10-06 23:01:33 +02:00
Alva
1047a165b8
oil: enable readline 2019-10-06 17:17:00 +02:00
Linus Heckemann
f523177869
Merge pull request #70415 from dywedir/oil
oil: 0.7.pre3 -> 0.7.pre5
2019-10-06 13:24:21 +02:00
Vladyslav M
b0bf7bd589
oil: 0.7.pre3 -> 0.7.pre5 2019-10-06 10:39:43 +03:00
Tim Steinbach
b16998f51e
oh-my-zsh: 2019-10-02 -> 2019-10-03 2019-10-05 10:55:44 -04:00
Tim Steinbach
cac7fdfdcd
oh-my-zsh: 2019-10-01 -> 2019-10-02 2019-10-03 07:34:21 -04:00
Jan Tojnar
b9c5f849a4
Merge branch 'staging-next' into staging 2019-10-03 01:47:41 +02:00
Tim Steinbach
f7765fb052
oh-my-zsh: 2019-09-24 -> 2019-10-01 2019-10-01 08:04:40 -04:00
R. RyanTM
96c6b9d4a7 xonsh: 0.9.10 -> 0.9.11
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/xonsh/versions
2019-09-29 02:59:11 -07:00
Christian Kampka
0f132d0f27 zsh-history: make use of installShellCompletions helper 2019-09-28 13:09:18 +02:00
Christian Kampka
165b47bfe4 zsh-history: Refactor use of with lib 2019-09-28 13:09:18 +02:00
Christian Kampka
ab42e39367 zsh-history: package build improvements 2019-09-28 13:09:17 +02:00
Christian Kampka
887c1741dc zsh-history: unsable 2019-08-29 -> 2019-09-27 2019-09-28 13:09:17 +02:00
Christian Kampka
a81317364c zsh-history: init at unstable-2019-08-29 2019-09-28 13:09:17 +02:00
R. RyanTM
52a9e1509a
powershell: 6.2.2 -> 6.2.3
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/powershell/versions
2019-09-27 18:10:23 -07:00
Tim Steinbach
5c1adffe6e
oh-my-zsh: 2019-09-20 -> 2019-09-24 2019-09-26 10:45:50 -04:00
Will Dietz
97c1065ae7
zsh-completions: 0.30.0 -> 0.31.0 2019-09-21 02:54:36 -05:00
Tim Steinbach
861840baf6
oh-my-zsh: 2019-09-13 -> 2019-09-20 2019-09-20 09:48:17 -04:00
José Romildo Malaquias
9653933097
Merge pull request #66429 from Gerschtli/add/liquidprompt
liquidprompt: init at 2018-05-21
2019-09-20 08:14:30 -03:00
Tobias Happ
0c00a15e75 liquidprompt: init at 2018-05-21 2019-09-19 13:49:05 +02:00
Tim Steinbach
4a719e2884
oh-my-zsh: 2019-09-11 -> 2019-09-13 2019-09-18 07:19:12 -04:00
geistesk
aaf514d322 spaceship-prompt: 3.7.1 -> 3.11.2 2019-09-14 18:50:09 +09:00
Tim Steinbach
833baa746b
oh-my-zsh: 2019-09-08 -> 2019-09-11 2019-09-12 18:53:18 -04:00
Tim Steinbach
5e3faee99f
oh-my-zsh: 2019-08-07 -> 2019-09-08 2019-09-09 08:46:35 -04:00
volth
7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
Vladimír Čunát
4aad2947f8
Merge branch 'master' into staging-next 2019-09-04 11:00:56 +02:00
Maximilian Bosch
c3f2d66e31
zsh-you-should-use: 1.1.0 -> 1.4.0
https://github.com/MichaelAquilina/zsh-you-should-use/blob/master/CHANGELOG.md#140
2019-09-01 21:32:38 +02:00
volth
7bb6b373ab treewide: name -> pname (#67513) 2019-08-31 07:41:22 -04:00
Frederik Rietdijk
ad1d58c622 Merge staging-next into staging 2019-08-31 10:04:20 +02:00
Frederik Rietdijk
fc74ba8291 Merge master into staging-next 2019-08-31 09:50:38 +02:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Сухарик
2c23a35ff6 oil: 0.6.0 -> 0.7.pre3 2019-08-27 14:14:02 +03: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
Vladimír Čunát
2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Samuel Leathers
867163e1f8
Merge pull request #67287 from dtzWill/update/bash-5.0p9
bash_5: 5.0p7 -> 5.0p9
2019-08-24 00:40:29 -04:00
Robin Gloster
c7e75df21f
Merge remote-tracking branch 'upstream/master' into openssl-1.1 2019-08-23 02:00:31 +02:00
Will Dietz
db5f966b99
bash_5: 5.0p7 -> 5.0p9 2019-08-22 14:07:55 -05:00
Robin Gloster
0f4256a2f8
powershell: pint to openssl 1.0.2 2019-08-22 16:47:25 +02:00
R. RyanTM
fed6f60871 xonsh: 0.9.9 -> 0.9.10
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/xonsh/versions
2019-08-20 22:46:33 -07:00
volth
c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00: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
Jörg Thalheim
cf5f02b4bb
zsh/pth/zsync: cross fixes (#65780)
zsh/pth/zsync: cross fixes
2019-08-14 07:15:01 +01:00
Marek Mahut
8effb0a4fb
Merge pull request #65126 from r-ryantm/auto-update/powershell
powershell: 6.2.1 -> 6.2.2
2019-08-10 10:03:53 +02:00
Marek Mahut
ce8a9968c9 powershell: updating darwin sha 2019-08-10 09:39:04 +02:00
Tim Steinbach
cacc355f61
oh-my-zsh: 2019-08-06 -> 2019-08-07 2019-08-08 10:28:50 -04:00
Tim Steinbach
6808d00dfa
oh-my-zsh: 2019-07-31 -> 2019-08-06 2019-08-07 09:32:11 -04:00
Jörg Thalheim
84d2202a46
zsh: fix cross-compiling support 2019-08-02 10:04:10 +01:00
Artemis Tosini
5f44f311de
xonsh: 0.9.8 → 0.9.9 2019-07-31 23:08:31 +00:00
Tim Steinbach
15feb3893d
oh-my-zsh: 2019-07-22 -> 2019-07-31 2019-07-31 09:25:19 -04:00
Maximilian Bosch
c954e00a51
Merge pull request #64715 from Emiller88/fix/xonsh-update
xonsh: 0.9.6 -> 0.9.8
2019-07-28 10:02:18 +02:00
Tim Steinbach
ebf746457d
oh-my-zsh: 2019-07-13 -> 2019-07-22 2019-07-23 08:36:18 -04:00
R. RyanTM
7d2643af88 powershell: 6.2.1 -> 6.2.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/powershell/versions
2019-07-19 19:27:40 -07:00
worldofpeace
b2e0ab39a7
Merge pull request #64843 from nyarly/fish_system_wcwidth
fish: use internal wcwidth
2019-07-18 18:32:39 -04:00
Judson
2c9c395a22
fish: use internal wcwidth
Fish 3.0 has an updated an more robust handling of unicode glyphs. Per
the original author of the INTERNAL_WCWIDTH flag, it was something of
misfeature, and they regret that NixOS came to rely on it.

Removes the flag from the Nix expression.

Flag was added originally to Nixpkgs in 68076b7d49

It is being removed entirely from upstream fish:
https://github.com/fish-shell/fish-shell/pull/5777.
2019-07-18 15:00:29 -07:00
Ryan Mulligan
b8f84b24de
Merge pull request #64947 from r-ryantm/auto-update/rush
rush: 1.9 -> 2.1
2019-07-17 05:41:45 -07:00
R. RyanTM
a7958005fa rush: 1.9 -> 2.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/rush/versions
2019-07-16 13:58:03 -07:00
Linus Heckemann
0ddb9e0495
Merge pull request #64853 from r-ryantm/auto-update/oil
oil: 0.6.pre15 -> 0.6.0
2019-07-16 08:11:28 +02:00
R. RyanTM
7c64e05720 oil: 0.6.pre15 -> 0.6.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/oil/versions
2019-07-15 19:13:15 -07:00
Tim Steinbach
7403a08153
oh-my-zsh: 2019-07-01 -> 2019-07-13 2019-07-15 07:26:55 -04:00
Edmund Miller
3335b49f09
xonsh: 0.9.6 -> 0.9.8
Update to correct repo, since a group was created
2019-07-13 13:33:04 -05:00
Maximilian Bosch
241a7bb363
Merge pull request #63920 from Ma27/package-zsh-you-should-use
zsh-you-should-use: init at 1.1.0
2019-07-09 23:28:53 +02:00
Rok Garbas
65781e204d
Remove me (garbas) as maintainer since I don't have much time to maintain anything 2019-07-03 11:27:39 +02:00
R. RyanTM
0c96c9b505 zsh-autosuggestions: 0.5.2 -> 0.6.3
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/zsh-autosuggestions/versions
2019-07-03 08:29:01 +02:00
Tim Steinbach
ec846ecf71
oh-my-zsh: 2019-06-27 -> 2019-07-01 2019-07-01 18:30:51 -04:00
Maximilian Bosch
02e8a36df1
zsh-you-should-use: init at 1.1.0
Simple zsh plugin that reminds you to use existing aliases. With
`oh-my-zsh` it can be installed like this:

```
{
  programs.zsh.ohMyZsh = {
    customPkgs = [ pkgs.zsh-you-should-use ];
    plugins = [ "you-should-use" ];
  };
}
```
2019-06-29 12:14:42 +02:00
Tim Steinbach
2cbaf5b75c
oh-my-zsh: 2019-06-15 -> 2019-06-27 2019-06-28 07:57:58 -04:00
Tim Steinbach
9c9229207b
oh-my-zsh: 2019-06-15 -> 2019-06-15 2019-06-19 08:54:10 -04:00
R. RyanTM
dd420f45ed xonsh: 0.9.4 -> 0.9.6
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/xonsh/versions
2019-06-18 11:28:45 -07:00
volth
f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
R. RyanTM
599ec87849 antibody: 4.1.1 -> 4.1.2 (#63210)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/antibody/versions
2019-06-16 09:05:55 -07:00
Tim Steinbach
3385abd753
oh-my-zsh: 2019-06-12 -> 2019-06-15 2019-06-15 13:58:09 -04:00
Tim Steinbach
910b179506
oh-my-zsh: 2019-06-11 -> 2019-06-12 2019-06-13 10:06:36 -04:00
Tim Steinbach
eb359ddb73
oh-my-zsh: 2019-06-08 -> 2019-06-11 2019-06-12 13:09:46 -04:00
Tim Steinbach
aea4b4a030
oh-my-zsh: 2019-06-01 -> 2019-06-08 2019-06-08 19:17:04 -04:00
Matthew Bauer
1f22e71439 ksh: add libiconv dependency 2019-06-05 23:43:37 -04:00
R. RyanTM
cbc5f612c2
powershell: 6.2.0 -> 6.2.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/powershell/versions
2019-06-02 13:12:23 -05:00
Tim Steinbach
57815f9164
oh-my-zsh: 2019-05-28 -> 2019-06-01 2019-06-02 13:27:17 -04:00
Alyssa Ross
062210bdff treewide: update cargoSha256 hashes for cargo-vendor upgrade
A recent upgrade of cargo-vendor changed its output slightly, which
broke all cargoSha256 hashes in nixpkgs.
See https://github.com/NixOS/nixpkgs/issues/60668 for more information.

Since then, a few hashes have been fixed in master by hand, but there
were a lot still to do, so I did all of the ones left over with some
scripts I wrote.

The one hash I wasn’t able to update was habitat's, because it’s
currently broken and the build doesn’t get far enough to produce a
hash anyway.
2019-06-01 15:17:52 +00:00
Will Dietz
8fc3b6a7fa
xonsh: 0.9.0 -> 0.9.4 2019-05-28 20:02:33 -05:00
Tim Steinbach
90267ba813
oh-my-zsh: 2019-05-27 -> 2019-05-28 2019-05-28 18:12:37 -04:00
Tim Steinbach
c0c947814d
oh-my-zsh: 2019-05-26 -> 2019-05-27 2019-05-28 08:44:42 -04:00
Tim Steinbach
567b63c78f
oh-my-zsh: 2019-05-21 -> 2019-05-26 2019-05-26 10:10:57 -04:00
Tim Steinbach
963a993097
oh-my-zsh: 2019-05-19 -> 2019-05-21 2019-05-22 09:04:12 -04:00
Tim Steinbach
7711aed354
oh-my-zsh: 2019-05-17 -> 2019-05-19 2019-05-20 11:04:31 -04:00
Tim Steinbach
9d200707ba
oh-my-zsh: 2019-05-11 -> 2019-05-17 2019-05-17 10:28:16 -04:00
Renaud
a46ee786da
Merge pull request #61452 from r-ryantm/auto-update/xonsh
xonsh: 0.8.12 -> 0.9.0
2019-05-14 19:49:15 +02:00