public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source 
* master: (293 commits)
  go_1_9: skip flaky TestServerCancelsReadTimeoutWhenIdle
  qsyncthingtray: fix build
  qt56.qtwebengine: fix build
  stdman: d860212 -> 2017.04.02
  jackett: use mono50
  hg-git: disable with python3
  hg-git: 0.8.5 -> 0.8.10
  xfce4-settings: enable parallel building
  gcc-snapshot: mark as broken
  heaptrack: 2017-02-14 -> 2017-10-30
  nixos-container: Modify existing test to cover show-ip command
  nixos-container: Make show-ip work together with ipv4 + netmask
  linux-copperhead: 4.13.12.a -> 4.13.13.a
  matterbridge: 1.1.0 -> 1.4.1
  nixos/nghttpx: add module for the nghttpx proxy server (#31680)
  mattermost: 4.3.0 -> 4.4.0
  breakpad: delete
  simp_le: 0.2.0 -> 0.6.1
  certbot: 0.11.1 -> 0.19.0
  afl: 2.51b -> 2.52b
  ...
This commit is contained in:
Orivej Desh
2017-11-17 05:35:09 +00:00
parent 020a6663d3 3ac474aee6
commit d99a2fc093
349 changed files with 9856 additions and 68183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/misc/bashdb/default.nix
View File

@@ -1,14 +1,14 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "bashdb-4.4-0.92";
name = "bashdb-4.4-0.94";
src = fetchurl {
url = "mirror://sourceforge/bashdb/${name}.tar.bz2";
sha256 = "6a8c2655e04339b954731a0cb0d9910e2878e45b2fc08fe469b93e4f2dbaaf92";
sha256 = "01n0dml866sacls7q8h1c6mm4nc47lq3vrar9idmkajky71aycar";
};
meta = {
meta = {
description = "Bash script debugger";
homepage = http://bashdb.sourceforge.net/;
license = stdenv.lib.licenses.gpl2;

6
pkgs/development/tools/misc/hydra/default.nix
View File

@@ -62,15 +62,15 @@ let
};
in releaseTools.nixBuild rec {
name = "hydra-${version}";
version = "2017-09-14";
version = "2017-10-26";
inherit stdenv;
src = fetchFromGitHub {
owner = "NixOS";
repo = "hydra";
rev = "b828224fee451ad26e87cfe4eeb9c0704ee1062b";
sha256 = "05xv10ldsa1rahxbbgh5kwvl1dv4yvc8idczpifgb55fgqj8zazm";
rev = "2cdc84f34f4de647dd89c5ef503782a3a48ff623";
sha256 = "1gcp22ldyc914aik4yhlzy60ym7z8513pvp0ag5637j44nz0rf7h";
};
buildInputs =

4
pkgs/development/tools/misc/objconv/default.nix
View File

@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "objconv-${version}";
version = "2.44";
version = "2.48";
src = fetchurl {
# Versioned archive of objconv sources maintained by orivej.
url = "https://archive.org/download/objconv/${name}.zip";
sha256 = "1dlnpv8qwz0rwivpbgk84kmsjz3vh1i149z44ha2dvg8afzyfhjl";
sha256 = "1y4bmy99dfhyqykkib50fiwsha2a62s9ya1qsv5mwj21w1l0snj7";
};
nativeBuildInputs = [ unzip ];