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

1309 commits

Author SHA1 Message Date
Michael Raskin c940d2e1ac
Merge pull request #37158 from oxij/pkgs/tor-browsers
update tor browsers
2018-03-16 18:06:50 +00:00
taku0 16ee6b5ed9 nss: 3.34.1 -> 3.35; cacert.certdata2pem: 20160104 -> 20170717 2018-03-16 03:42:09 +00:00
Peter Simons e14fa3f228 hackage: update db snapshot 2018-03-15 21:33:05 +01:00
Tuomas Tynkkynen ef64208eba Merge commit '3ab2949' from staging into master
Conflicts:
	pkgs/development/compilers/llvm/6/llvm.nix
	pkgs/servers/home-assistant/component-packages.nix
2018-03-15 22:30:56 +02:00
John Ericson 2e87550ace
Merge pull request #36985 from obsidiansystems/no-allBut
treewide: get rid of platforms.allBut
2018-03-14 18:57:28 -04:00
John Ericson f79f80dbf2 treewide: get rid of platforms.allBut
Negative reasoning like `allBut` is a bad idea with an open world of
platforms. Concretely, if we add a new, quite different sort of
platform, existing packages with `allBut` will claim they work on it
even though they probably won't.
2018-03-14 18:44:42 -04:00
Tuomas Tynkkynen 2fec9c6e29 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/development/tools/build-managers/conan/default.nix
2018-03-13 23:04:18 +02:00
Peter Simons 1aaed17244 hackage: update database snapshot to latest version 2018-03-13 21:42:54 +01:00
Shea Levy aabfda6d5d
Merge branch 'merge/master-to-staging-20180310' of git://github.com/oxij/nixpkgs into staging 2018-03-11 17:28:07 -04:00
mingchuan cbf735e3f1
brise: change platforms to linux only 2018-03-11 23:46:05 +08:00
Michael Raskin bf41b468ad
Merge pull request #35588 from xeji/cacert-unbundled
cacert: add output "unbundled" for individual certificates
2018-03-11 10:08:07 +00:00
Jan Malakhovski 7079e744d4 Merge branch 'master' into staging
Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):

   pkgs/development/libraries/epoxy/default.nix
   pkgs/development/libraries/gtk+/3.x.nix
   pkgs/development/python-modules/asgiref/default.nix
   pkgs/development/python-modules/daphne/default.nix
   pkgs/os-specific/linux/systemd/default.nix
2018-03-10 20:38:13 +00:00
Ivan Solyankin fed464103f libkkc-data: init at 0.2.7 2018-03-10 17:13:38 +03:00
Ryan Mulligan 0373079efc iosevka: 1.14.0 -> 1.14.1
Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.14.1 with grep in /nix/store/96pxdcrjsqsw3wy79kqpjj1lwwndq62j-iosevka-1.14.1
- found 1.14.1 in filename of file in /nix/store/96pxdcrjsqsw3wy79kqpjj1lwwndq62j-iosevka-1.14.1
2018-03-08 20:05:47 -08:00
Peter Simons 68fd23fbb2 hackage: update database snapshot to latest version 2018-03-06 21:24:50 +01:00
Nikolay Amiantov fe708a3462 twemoji-color-font: include recommended fontconfig configuration 2018-03-06 13:07:14 +03:00
Peter Simons 18055971cb hackage: update database snapshot to latest version 2018-03-05 16:45:07 +01:00
José Romildo Malaquias 52a4d3183f numix-icon-theme-square: build GTK icon cache 2018-03-04 07:49:06 -03:00
José Romildo Malaquias cba652b766 numix-icon-theme-square: 17-12-25 -> 18-02-16 2018-03-04 07:49:06 -03:00
José Romildo Malaquias 86036cc65d numix-icon-theme-circle: build GTK icon cache 2018-03-04 07:49:05 -03:00
José Romildo Malaquias b087ca23bf numix-icon-theme-circle: 17-12-25 -> 18-02-16 2018-03-04 07:20:57 -03:00
José Romildo Malaquias c714c92d79 deepin-icon-theme: move to deepin meta package 2018-03-04 00:22:14 -03:00
Tuomas Tynkkynen 1e107443ad Merge commit '618ac29687a650d854c8bea7efd4490387589ce2' into staging 2018-03-03 22:40:32 +02:00
Jan Tojnar 618ac29687
cantarell-fonts: rename from cantarell_fonts 2018-03-03 00:36:38 +01:00
Jan Tojnar f6af32c654
cantarell_fonts: 0.0.25 → 0.100 2018-03-03 00:36:38 +01:00
Jörg Thalheim de71a45119
Merge pull request #36142 from romildo/new.deepin-icon-theme
deepin-icon-theme: init at 15.12.52
2018-03-02 09:25:06 +00:00
adisbladis 97b217fec1
Merge pull request #35950 from ryantm/auto-update/papirus-icon-theme-20171102-to-20180214
papirus-icon-theme: 20171102 -> 20180214
2018-03-02 10:53:22 +08:00
Peter Simons e05c99cfda hackage: update database snapshot to latest version 2018-03-01 21:58:31 +01:00
José Romildo Malaquias 555eacccb5 deepin-icon-theme: init at 15.12.52 2018-03-01 16:16:07 -03:00
Shea Levy 942855c8bd
tzdata: Fix cross-compilation 2018-02-28 15:01:33 -05:00
Tuomas Tynkkynen 34f95d92a2 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/applications/misc/pytrainer/default.nix
	pkgs/development/tools/pew/default.nix
	pkgs/tools/misc/you-get/default.nix
2018-02-28 20:52:49 +02:00
Tim Steinbach 79c876b1e5
fira-code: 1.204 -> 1.205 2018-02-27 20:37:33 -05:00
Ryan Mulligan f3ed511b44
media-player-info: 22 -> 23
Semi-automatic update. These checks were performed:

- built on NixOS
- found 23 with grep in /nix/store/fwi1kp97s2smbwf5ir9jrykf6427i4n6-media-player-info-23
- found 23 in filename of file in /nix/store/fwi1kp97s2smbwf5ir9jrykf6427i4n6-media-player-info-23
2018-02-27 23:54:09 +01:00
Ryan Mulligan 52ee1d87e9 papirus-icon-theme: 20171102 -> 20180214
Semi-automatic update. These checks were performed:

- built on NixOS
2018-02-27 09:28:09 -08:00
Ryan Mulligan dc53d5f3b8 man-pages: 4.14 -> 4.15
Semi-automatic update. These checks were performed:

- built on NixOS
2018-02-26 22:22:35 -08:00
Vladimír Čunát e2243a5ac9
Revert "Revert "Merge staging at '8d490ca9934d0' into master""
This reverts commit f5ce8f86df.
2018-02-26 22:54:48 +01:00
Vladimír Čunát f5ce8f86df
Revert "Merge staging at '8d490ca9934d0' into master"
This reverts commit fc23242220, reversing
changes made to 754816b84b.
We don't have many binaries yet.  Comment on the original merge commit.
2018-02-26 22:53:18 +01:00
Peter Simons 0f7a7cb3d8 hackage: update db snapshot 2018-02-26 14:28:40 +01:00
Frederik Rietdijk fc23242220 Merge staging at '8d490ca9934d0c01e1e9ade455657e54e2e843c0' into master 2018-02-26 13:05:32 +01:00
xeji c9a1639e20 cacert: add output "unbundled"
which contains all certs, each in a separate file.
This output is not installed by default.
2018-02-25 23:48:54 +01:00
Tim Steinbach 45fcaa64ef
hicolor-icon-theme: 0.15 -> 0.17 2018-02-25 12:53:06 -05:00
Tim Steinbach 7b2cff98a0
font-awesome: Add 5.0.6
Rename font-awesome-ttf to font-awesome_4, add alias to old name
2018-02-25 12:50:20 -05:00
Jan Tojnar a31d98f312
tree-wide: autorename gnome packages to use dashes 2018-02-25 17:41:16 +01:00
Yegor Timoshenko cd4afaca45 papirus-icon-theme: build GTK icon cache 2018-02-24 11:49:40 +00:00
Yegor Timoshenko 09b54dec1d paper-icon-theme: build GTK icon cache 2018-02-24 11:42:09 +00:00
Yegor Timoshenko 466d051924 numix-icon-theme: build GTK icon cache 2018-02-24 11:38:54 +00:00
Yegor Timoshenko 0765f0528d maia-icon-theme: use CMake (build from source)
Did not add GTK icon cache due to the following error:

  gtk-update-icon-cache: The generated cache was invalid.
2018-02-24 11:27:41 +00:00
Yegor Timoshenko 4593cc2317 hicolor_icon_theme: platforms.unix 2018-02-24 11:14:00 +00:00
Yegor Timoshenko cc3bd76540 moka-icon-theme: build GTK icon cache 2018-02-24 11:12:37 +00:00
Yegor Timoshenko c087641f64 faba-mono-icons: build GTK icon cache 2018-02-24 11:12:20 +00:00