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

10 commits

Author SHA1 Message Date
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
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
Danylo Hlynskyi 7585496eff
Merge branch 'master' into flip-map-foreach 2019-08-05 14:09:28 +03:00
danbst 0f8596ab3f mass replace "flip map -> forEach"
See `forEach`-introduction commit.
```
rg 'flip map ' --files-with-matches | xargs sed -i 's/flip map /forEach /g'
```
2019-08-05 14:03:38 +03:00
danbst 91bb646e98 Revert "mass replace "flip map -> foreach""
This reverts commit 3b0534310c.
2019-08-05 14:01:45 +03:00
Orivej Desh 32fbbc6f9b Merge master into staging 2019-07-25 09:23:21 +00:00
Maximilian Bosch 0a571ae256 citrix_workspace: add 1906 (citrix_workspace_19_6_0)
New release available:
https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html

Apart from the new version the following things changed:

* Updated the docs as all notes about `citrix_receiver` also apply for
  `citrix_workspace`. Also added a deprecation warning about the
  upcoming removal.

* Removed the `libidn_134` override as neither `citrix_workspace_19_3_0`
  nor `citrix_workspace_19_6_0` require this library anymore according
  to `readelf -d ./result/opt/citrix-icaclient/wfica` (in contrast to
  `citrix_receiver_13_10_0`).

* Added myself as maintainer as well.
2019-07-24 13:06:19 +02:00
worldofpeace b1bc0645ea gdk-pixbuf: rename from gdk_pixbuf 2019-07-22 18:50:57 -04:00
danbst 3b0534310c mass replace "flip map -> foreach"
See `foreach`-introduction commit.
```
rg 'flip map ' --files-with-matches | xargs sed -i 's/flip map /foreach /g'
```
2019-07-14 13:46:10 +03:00
Garry Cairns f6a68410f8 Adds Citrix workspace app package
Citrix workspace is replacing Citrix receiver as per
https://docs.citrix.com/en-us/citrix-workspace-app.html
2019-05-28 08:50:47 +02:00