nixpkgs

mirror of https://github.com/CHN-beta/nixpkgs.git synced 2026-01-12 02:40:31 +08:00

Files

obadz 3de6e5be50 Merge branch 'master' into staging

Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix

2016-08-27 23:54:54 +01:00

bash

Revert "Revert "bash: 4.3-p42 -> 4.3-p46""

2016-08-26 17:08:58 +02:00

bash-completion

Bring my stdenv.lib.maintainers user name in line with my github nick.

2016-05-16 22:49:55 +02:00

dash

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-08-03 13:34:44 +00:00

elvish

buildGoPackage: remove Go deps file libs.json