1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 12:11:28 +00:00
Commit graph

777 commits

Author SHA1 Message Date
Frederik Rietdijk fc74ba8291 Merge master into staging-next 2019-08-31 09:50:38 +02: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