mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 19:51:17 +00:00
Code Issues Wiki Activity

Merge remote-tracking branch 'upstream/master' into HEAD

Browse source
This commit is contained in:
Frederik Rietdijk 2017-08-17 18:34:17 +02:00
parent 9289365627 31eea73f99
commit 8f2ea38f8f
67 changed files with 1727 additions and 731 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.travis.yml
View file

@ -12,15 +12,21 @@ matrix:
script:
- ./maintainers/scripts/travis-nox-review-pr.sh nixpkgs-verify nixpkgs-manual nixpkgs-tarball nixpkgs-unstable
- ./maintainers/scripts/travis-nox-review-pr.sh nixos-options nixos-manual
env:
- BUILD_TYPE="Test Nixpkgs evaluation & NixOS manual build"
- os: linux
sudo: required
dist: trusty
before_script:
- sudo mount -o remount,exec,size=2G,mode=755 /run/user
script: ./maintainers/scripts/travis-nox-review-pr.sh nox pr
env:
- BUILD_TYPE="Build affected packages (Linux)"
- os: osx
osx_image: xcode7.3
script: ./maintainers/scripts/travis-nox-review-pr.sh nox pr
env:
- BUILD_TYPE="Build affected packages (macOS)"
env:
global:
- GITHUB_TOKEN=5edaaf1017f691ed34e7f80878f8f5fbd071603f

3
doc/languages-frameworks/ruby.xml
View file

@ -20,7 +20,7 @@ $ cd sensu
$ cat > Gemfile
source 'https://rubygems.org'
gem 'sensu'
$ $(nix-build '<nixpkgs>' -A bundix)/bin/bundix --magic
$ $(nix-build '<nixpkgs>' -A bundix --no-out-link)/bin/bundix --magic
$ cat > default.nix
{ lib, bundlerEnv, ruby }:
@ -114,6 +114,7 @@ in stdenv.mkDerivation {
script = ./my-script.rb;
buildCommand = ''
install -D -m755 $script $out/bin/my-script
patchShebangs $out/bin/my-script
'';
}]]>
</programlisting>

1
lib/maintainers.nix
View file

@ -602,6 +602,7 @@
vdemeester = "Vincent Demeester <vincent@sbr.pm>";
veprbl = "Dmitry Kalinkin <veprbl@gmail.com>";
vifino = "Adrian Pistol <vifino@tty.sh>";
vinymeuh = "VinyMeuh <vinymeuh@gmail.com>";
viric = "Lluís Batlle i Rossell <viric@viric.name>";
vizanto = "Danny Wilson <danny@prime.vc>";
vklquevs = "vklquevs <vklquevs@gmail.com>";

4
maintainers/scripts/travis-nox-review-pr.sh
View file

@ -53,8 +53,8 @@ while test -n "$1"; do
nox)
echo "=== Fetching Nox from binary cache"
# build nox silently so it's not in the log
nix-build "<nixpkgs>" -A nox -A stdenv
# build nox (+ a basic nix-shell env) silently so it's not in the log
nix-shell -p nox stdenv --command true
;;
pr)

39
nixos/modules/services/network-filesystems/ipfs.nix
View file

@ -49,6 +49,12 @@ in
description = "The data dir for IPFS";
};
defaultMode = mkOption {
description = "systemd service that is enabled by default";
type = types.enum [ "online" "offline" "norouting" ];
default = "online";
};
autoMigrate = mkOption {
type = types.bool;
default = false;
@ -147,10 +153,11 @@ in
systemd.services.ipfs = {
description = "IPFS Daemon";
wantedBy = [ "multi-user.target" ];
wantedBy = mkIf (cfg.defaultMode == "online") [ "multi-user.target" ];
after = [ "network.target" "local-fs.target" "ipfs-init.service" ];
conflicts = [ "ipfs-offline.service" ];
conflicts = [ "ipfs-offline.service" "ipfs-norouting.service"];
wants = [ "ipfs-init.service" ];
environment.IPFS_PATH = cfg.dataDir;
@ -169,9 +176,11 @@ in
systemd.services.ipfs-offline = {
description = "IPFS Daemon (offline mode)";
wantedBy = mkIf (cfg.defaultMode == "offline") [ "multi-user.target" ];
after = [ "local-fs.target" "ipfs-init.service" ];
conflicts = [ "ipfs.service" ];
conflicts = [ "ipfs.service" "ipfs-norouting.service"];
wants = [ "ipfs-init.service" ];
environment.IPFS_PATH = cfg.dataDir;
@ -186,5 +195,29 @@ in
RestartSec = 1;
};
};
systemd.services.ipfs-norouting = {
description = "IPFS Daemon (no routing mode)";
wantedBy = mkIf (cfg.defaultMode == "norouting") [ "multi-user.target" ];
after = [ "local-fs.target" "ipfs-init.service" ];
conflicts = [ "ipfs.service" "ipfs-offline.service"];
wants = [ "ipfs-init.service" ];
environment.IPFS_PATH = cfg.dataDir;
path = [ pkgs.ipfs ];
serviceConfig = {
ExecStart = "${ipfs}/bin/ipfs daemon ${ipfsFlags} --routing=none";
User = cfg.user;
Group = cfg.group;
Restart = "on-failure";
RestartSec = 1;
};
};
};
}

2
nixos/modules/virtualisation/vmware-guest.nix
View file

@ -33,7 +33,7 @@ in
serviceConfig.ExecStart = "${open-vm-tools}/bin/vmtoolsd";
};
environment.etc."vmware-tools".source = "${pkgs.open-vm-tools}/etc/vmware-tools/*";
environment.etc."vmware-tools".source = "${open-vm-tools}/etc/vmware-tools/*";
services.xserver = mkIf (!cfg.headless) {
videoDrivers = mkOverride 50 [ "vmware" ];

4
pkgs/applications/audio/google-play-music-desktop-player/default.nix
View file

@ -4,7 +4,7 @@
}:
let
version = "4.3.0";
version = "4.4.0";
deps = [
alsaLib
@ -46,7 +46,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-/releases/download/v${version}/google-play-music-desktop-player_${version}_amd64.deb";
sha256 = "0mbrfnsnajmpwyqyrjmcv84ywzimjmm2b8faxqiwfcikdgpm9amb";
sha256 = "01a52rsp0a9k47mm3wqnhnmlnd7fw6xmdrn882msldijjgwsq5cc";
};
dontBuild = true;

12
pkgs/applications/editors/emacs-modes/elpa-generated.nix
View file

@ -822,10 +822,10 @@
gited = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "gited";
version = "0.3.2";
version = "0.3.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/gited-0.3.2.tar";
sha256 = "1y40zn1w5m2srrqffkpvvzk3j5zzq21smsqychyx2diggn4c0hgi";
url = "https://elpa.gnu.org/packages/gited-0.3.3.tar";
sha256 = "0h3ps26sy4wp1s9vpsj066fpqjqacjlprz3kb09macgsg88k2c1p";
};
packageRequires = [ cl-lib emacs ];
meta = {
@ -1446,10 +1446,10 @@
}) {};
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org";
version = "20170807";
version = "20170814";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-20170807.tar";
sha256 = "185pyc0v4vwzvkygqhpld14lk62ygvfb9ycz609n99m0wqlamwz3";
url = "https://elpa.gnu.org/packages/org-20170814.tar";
sha256 = "1rk3y4ns5f7f22vv0pg1x5mpn3vpm1123sxpd1ilbzajw3hfgwwn";
};
packageRequires = [];
meta = {

1036
pkgs/applications/editors/emacs-modes/melpa-generated.nix
View file

File diff suppressed because it is too large Load diff

200
pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
View file

@ -1268,6 +1268,27 @@
license = lib.licenses.free;
};
}) {};
amx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "amx";
version = "1.1.1";
src = fetchFromGitHub {
owner = "DarwinAwardWinner";
repo = "amx";
rev = "7d5d7974057a36a332f8b30e99fe464f25b6e0ae";
sha256 = "0jqvah4i2r5di8k3rx6hyjnxdr3alzqmlv6iab5wdhkafyvwl0dq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c55bfad05343b2b0f3150fd2b4adb07a1768c1c0/recipes/amx";
sha256 = "1ikhjvkca0lsb9j719yf6spg6nwc0qaydkd8aax162sis7kp9fap";
name = "amx";
};
packageRequires = [];
meta = {
homepage = "https://melpa.org/#/amx";
license = lib.licenses.free;
};
}) {};
anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
melpaBuild {
pname = "anaconda-mode";
@ -3859,12 +3880,12 @@
cfengine-code-style = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cfengine-code-style";
version = "3.10.1";
version = "3.11.0";
src = fetchFromGitHub {
owner = "cfengine";
repo = "core";
rev = "99e8b116e779f97e96866891362817c1c5c6534c";
sha256 = "1ckk6jvmwrrlfd4ja8n5q99ajasgvbdkzkba9mswhq9dvk6avvn0";
rev = "520851447dba901097b121b58b1a0da370481a2c";
sha256 = "0sz4zqw2s7f5rhqad4kmrfdsl24xqflfsm4hzfbwzvsrlp7ndis7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@ -4564,12 +4585,12 @@
cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cmake-mode";
version = "3.9.0";
version = "3.9.1";
src = fetchFromGitHub {
owner = "Kitware";
repo = "CMake";
rev = "f15cfd891d1e01247ed285320ae32b6c3182ac8f";
sha256 = "0asp6kijrmf9bayg8jvhgkd1z2falzhyippkwgih9ygpa65qvqpq";
rev = "fca4423786ba2c4a5ab0ec6c1a1cbac8cd8600b4";
sha256 = "08x5mqhrsm3y28hiy32h336n9ggn2snb56k242hqhij1lsg7iga3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@ -5365,6 +5386,27 @@
license = lib.licenses.free;
};
}) {};
company-terraform = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, terraform-mode }:
melpaBuild {
pname = "company-terraform";
version = "1.1";
src = fetchFromGitHub {
owner = "rafalcieslak";
repo = "emacs-company-terraform";
rev = "b08ced5bac44c0253e3725a7f7a6246bdf1cf2b6";
sha256 = "10922ykv6ii28rnhg4vri2g1fs5897xjxw6a5pk1rw2mld5kx57r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1d9732da975dcf59d3b311b19e20abbb29c33656/recipes/company-terraform";
sha256 = "198ppqn6f7y9bg582z5s4cl9gg1q9ibsr7mmn68b50zvma7ankzh";
name = "company-terraform";
};
packageRequires = [ company emacs terraform-mode ];
meta = {
homepage = "https://melpa.org/#/company-terraform";
license = lib.licenses.free;
};
}) {};
company-web = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }:
melpaBuild {
pname = "company-web";
@ -6313,12 +6355,12 @@
dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }:
melpaBuild {
pname = "dashboard";
version = "1.0.3";
version = "1.2.3";
src = fetchFromGitHub {
owner = "rakanalh";
repo = "emacs-dashboard";
rev = "cd9899342bc94e59aa42275554810e50d045aaa4";
sha256 = "1klmjdym4w3cbarabzvkxddjdcisfk62wkpys3z4nclp4g91p8as";
rev = "f435fd394edc5ad9cf82065ef73b5821e3f93c58";
sha256 = "0f0ipnij69z90qv9lzl6x9id3f6nayrgqxppbcf4gkxh25pi5nkw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard";
@ -7265,12 +7307,12 @@
docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }:
melpaBuild {
pname = "docker-compose-mode";
version = "0.2.2";
version = "0.3.1";
src = fetchFromGitHub {
owner = "meqif";
repo = "docker-compose-mode";
rev = "e4cce60d4e6c6b517cb786c14fbf9ed8a13f530c";
sha256 = "0fn8b9dmz911sqqlq2f6vd84qg39j2ban3ixh0wblcxbrd5wli2v";
rev = "37d8afb6a72f829fdbc77e76f18587530ff319b4";
sha256 = "11283gl19iqm03a5l635qq36fpxlj05j7a6hlnv7v15n3h7d5512";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/37dd4c1fc11d22598c6faf03ccc860503a68b950/recipes/docker-compose-mode";
@ -7873,12 +7915,12 @@
ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ebal";
version = "0.3.0";
version = "0.3.1";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "ebal";
rev = "7bc6c5a5e504353282848cd2d0f7c73b4bccda83";
sha256 = "06pn4srx00l63lkk6kyd68svlyajxkpxd9mpjlvdpgbydzh914xl";
rev = "4d19565516785348894c4911e757e33a270b3efd";
sha256 = "1wj9h8ypi70az387c7pcrpc59lpf89dkp2q4df2ighxw3l648mb7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/629aa451162a0085488caad4052a56366b7ce392/recipes/ebal";
@ -11419,12 +11461,12 @@
fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fcitx";
version = "0.2.2";
version = "0.2.3";
src = fetchFromGitHub {
owner = "cute-jumper";
repo = "fcitx.el";
rev = "77f1e187b9cecb6975bedcfe91c8c81f1b133686";
sha256 = "0n0v9jwswcc16cigyffvy3m9y7qqrs8qzjs11sq3d420zrv16b39";
rev = "6d552ab44234ed78ce9a50f2412f56197266bc9f";
sha256 = "08l859rw1lwj6hdxrlxqlxf1cfxv8yv9h1jsgs5zfis3hp7nq39j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e8c40f09d9397b3ca32a7ed37203f490497dc984/recipes/fcitx";
@ -12308,12 +12350,12 @@
flycheck-popup-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }:
melpaBuild {
pname = "flycheck-popup-tip";
version = "0.12.1";
version = "0.12.2";
src = fetchFromGitHub {
owner = "flycheck";
repo = "flycheck-popup-tip";
rev = "6a857d43a1fa136e5b6715421d1b44a72170be0c";
sha256 = "1hglfhf1vrvrp2vf1p4b226mpab7m2napjw6w0qlw3dj72787pqw";
rev = "ef86aad907f27ca076859d8d9416f4f7727619c6";
sha256 = "1bi6f9nm4bylsbjv4qnkar35s6xzdf2cc2cxi3g691p9527apdz6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9b2269ee9532bb092756ae0c0693cb44b73820e8/recipes/flycheck-popup-tip";
@ -12350,12 +12392,12 @@
flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-pycheckers";
version = "0.1";
version = "0.2";
src = fetchFromGitHub {
owner = "msherry";
repo = "flycheck-pycheckers";
rev = "3c89f455472b5a77e28129825bb801b464d96ca1";
sha256 = "1fxbabxsdqm98vhs51k5z6prjkskjq2nsl9vsmlbwgjgyg4hx1xr";
rev = "220c551df591792d08fc9d149ab3329171743cb9";
sha256 = "0q1sz28nlnamcm4l587q94b7cyak9d4wpgpr33a05m9lw4a6z74i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers";
@ -14479,12 +14521,12 @@
gitpatch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gitpatch";
version = "0.5.0";
version = "0.5.1";
src = fetchFromGitHub {
owner = "tumashu";
repo = "gitpatch";
rev = "577d5adf65c8133caa325c10e89e1e2fc323c907";
sha256 = "1jj12pjwza6cq8a3kr8nqnmm3vxs0wam8h983irry4xr4ifywsn4";
rev = "94d40a2ee2b7cd7b209546ea02568079176b0034";
sha256 = "1drf4fvmak7brf16axkh4nfz8pg44i7pjhfjz3dbkycbpp8y5vig";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e1746d87f65dc4b0d8f47c7d6ba4c7e0dfa35953/recipes/gitpatch";
@ -15004,12 +15046,12 @@
google-this = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "google-this";
version = "1.11";
version = "1.12";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "emacs-google-this";
rev = "22cff810e7ed3b3c9dae066588508864c25c6d99";
sha256 = "14dz9wjp8ym86a03pw5y1sd51zw83d6485hpq8mh8zm0j1fba0y0";
rev = "8a2e3ca5da6a8c89bfe99a21486c6c7db125dc84";
sha256 = "1dbra309w8awmi0g0pp7r2dm9nwrj2j9lpl7md8wa89rnzazwahl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/google-this";
@ -15295,15 +15337,15 @@
license = lib.licenses.free;
};
}) {};
graphene = callPackage ({ company, dash, exec-path-from-shell, fetchFromGitHub, fetchurl, flycheck, graphene-meta-theme, ido-ubiquitous, lib, melpaBuild, ppd-sr-speedbar, smartparens, smex, sr-speedbar, web-mode }:
graphene = callPackage ({ company, dash, exec-path-from-shell, fetchFromGitHub, fetchurl, flycheck, graphene-meta-theme, ido-completing-read-plus, lib, melpaBuild, ppd-sr-speedbar, smartparens, smex, sr-speedbar, web-mode }:
melpaBuild {
pname = "graphene";
version = "0.9.7";
version = "0.9.8";
src = fetchFromGitHub {
owner = "rdallasgray";
repo = "graphene";
rev = "b25707ae82e286aefa5a66087b12c9cb3b7bf2ed";
sha256 = "1h21fv8plxydydm509immp0kpkf24ba6j3wrbpvp5w4nkx49mlkl";
rev = "89bbdaa465b3440f46f588664eada0f091ed6bfe";
sha256 = "1xrk26v9d3njydwab7drqg4p3qd8rw2diicfr7bfwd0d21bs5ykz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0206d6adcb7855c2174c3cd506b71c21def1209b/recipes/graphene";
@ -15316,7 +15358,7 @@
exec-path-from-shell
flycheck
graphene-meta-theme
ido-ubiquitous
ido-completing-read-plus
ppd-sr-speedbar
smartparens
smex
@ -16017,6 +16059,27 @@
license = lib.licenses.free;
};
}) {};
hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
melpaBuild {
pname = "hasky-stack";
version = "0.1.0";
src = fetchFromGitHub {
owner = "hasky-mode";
repo = "hasky-stack";
rev = "a11d1e00f41407ec77ea9e6eab93949a18f58069";
sha256 = "1bib7nic9by2vrqvrzpp62dk4apz2iyyprvk4hlgji2hkxyf2wpb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack";
sha256 = "08ds0v5p829s47lbhibswnbn1aqfnwf6xx7p5bc5062wxdvqahw8";
name = "hasky-stack";
};
packageRequires = [ emacs f magit-popup ];
meta = {
homepage = "https://melpa.org/#/hasky-stack";
license = lib.licenses.free;
};
}) {};
haxor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "haxor-mode";
@ -18495,22 +18558,22 @@
license = lib.licenses.free;
};
}) {};
ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, s }:
melpaBuild {
pname = "ido-completing-read-plus";
version = "4.3";
version = "4.5";
src = fetchFromGitHub {
owner = "DarwinAwardWinner";
repo = "ido-completing-read-plus";
rev = "1a1f695eb8e7d4ae2035e506ea3ff5bd4e2d0533";
sha256 = "15m8x3dp9m0brpap4l9hsbc47s4fgax3lppxz5v6rcwm625s0ac9";
rev = "e8cfebac1df2bfca52003f28ed84cb1a39dc8345";
sha256 = "14g5v823wsr0sgrawqw9kwilm68w0k4plz3b00jd7z903np9cxih";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+";
sha256 = "0rxdv3cd0bg0p8c1bck5vichdq941dki934k23qf5p6cfgw8gw4z";
name = "ido-completing-read-plus";
};
packageRequires = [ cl-lib emacs s ];
packageRequires = [ cl-lib emacs memoize s ];
meta = {
homepage = "https://melpa.org/#/ido-completing-read+";
license = lib.licenses.free;
@ -18603,12 +18666,12 @@
ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
melpaBuild {
pname = "ido-ubiquitous";
version = "4.3";
version = "4.5";
src = fetchFromGitHub {
owner = "DarwinAwardWinner";
repo = "ido-completing-read-plus";
rev = "1a1f695eb8e7d4ae2035e506ea3ff5bd4e2d0533";
sha256 = "15m8x3dp9m0brpap4l9hsbc47s4fgax3lppxz5v6rcwm625s0ac9";
rev = "e8cfebac1df2bfca52003f28ed84cb1a39dc8345";
sha256 = "14g5v823wsr0sgrawqw9kwilm68w0k4plz3b00jd7z903np9cxih";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-ubiquitous";
@ -19379,12 +19442,12 @@
intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
melpaBuild {
pname = "intero";
version = "0.1.20";
version = "0.1.21";
src = fetchFromGitHub {
owner = "commercialhaskell";
repo = "intero";
rev = "402722b5ad035b87fc08bc73343f05610a5fcb3c";
sha256 = "143y94b4spslh06x4klvsvil7ywn3cmrad4mg1qc0y0h0d9ksd4v";
rev = "4c8f3e7f4ad03179425c722d5072beae254da73b";
sha256 = "0q377rpgszqixjbmwck6kcczfb3j8axx0pk6fqavzp8qyc3q121l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@ -24873,12 +24936,12 @@
omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }:
melpaBuild {
pname = "omnisharp";
version = "4.0";
version = "4.1";
src = fetchFromGitHub {
owner = "OmniSharp";
repo = "omnisharp-emacs";
rev = "bf0edf7c74ddcd9976753543481a61a5607eec4e";
sha256 = "1x7bvpy2lx51j58grbc45l99mzf55wlx657icc7q5rf2vgb56k01";
rev = "a9a66b047606c6b5dc48abdb0eb70a1f9dcd08f2";
sha256 = "0m1f62cr0h426g66c7r36v3yr2bdakkjwxzdvpd0gh81xazn8yjz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@ -28623,12 +28686,12 @@
protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "protobuf-mode";
version = "3.4.0pre1";
version = "3.4.0pre3";
src = fetchFromGitHub {
owner = "google";
repo = "protobuf";
rev = "3afcded28a6aa9c44adf801ca5bff2133fcf3030";
sha256 = "03m1fprfz6cwxijp5fls502g6g3svyz760bwwwnbvyx4carwzmsp";
rev = "eaeca0d42b1fc4a8023a7f90d889631eda9360a3";
sha256 = "02c360xhmnhcybl23fa0p7l3x3zn4mil1c7cnpilnv0bqxy5399n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@ -30492,12 +30555,12 @@
ruby-electric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ruby-electric";
version = "2.3.0";
version = "2.3.1";
src = fetchFromGitHub {
owner = "knu";
repo = "ruby-electric.el";
rev = "d04313dbee42c0d1009558a7c9424e4ae8611908";
sha256 = "03g6m2xjfjjm06v5gid1vxivzb6lnsdc65d1p2wjaz32j1rmb6gm";
rev = "3553448a780a1ea5c3b0e9becd820d4762876593";
sha256 = "0h47lfgxjcyyl8gb1w7l8j8h65s3lp1hsq742sl7a1gf5y6bbm3v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5fd5fa797a813e02a6433ecbe2bca1270a383753/recipes/ruby-electric";
@ -31016,11 +31079,11 @@
secretaria = callPackage ({ alert, emacs, f, fetchgit, fetchurl, lib, melpaBuild, org, s }:
melpaBuild {
pname = "secretaria";
version = "0.2.4";
version = "0.2.5";
src = fetchgit {
url = "https://bitbucket.org/shackra/secretaria.el";
rev = "aae30bfc93fa5ea846bce086b22321c46b94ff7b";
sha256 = "18ad7q2a131gpvjj8923vp06zh0zfdy1589vs3f09v16aazbcfqc";
rev = "7bd1cf591528b18a153e15a260d7817b72c900f2";
sha256 = "0n9mj2g59yiqbg81rk0gglbgpvfs550r4y26n8nf5pyxpxfllv5s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7b4c9ccbf2eeaa290f3b9d1e5eaaeb5b5547b365/recipes/secretaria";
@ -31558,6 +31621,27 @@
license = lib.licenses.free;
};
}) {};
shrink-path = callPackage ({ dash, f, fetchFromGitLab, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "shrink-path";
version = "0.3.1";
src = fetchFromGitLab {
owner = "bennya";
repo = "shrink-path.el";
rev = "9b8cfb59a2dcee8b39b680ab9adad5ecb1f53c0b";
sha256 = "0kx0c4syd7k6ff9j463bib32pz4wq0rzjlg6b0yqnymlzfr1mbki";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/86b0d105e8a57d5f0bcde779441dc80b85e170ea/recipes/shrink-path";
sha256 = "0fq13c6g7qbq6f2ry9dzdyg1f6p41wimkjcdaj177rnilz77alzb";
name = "shrink-path";
};
packageRequires = [ dash f s ];
meta = {
homepage = "https://melpa.org/#/shrink-path";
license = lib.licenses.free;
};
}) {};
shrink-whitespace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "shrink-whitespace";

12
pkgs/applications/editors/emacs-modes/org-generated.nix
View file

@ -1,10 +1,10 @@
{ callPackage }: {
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org";
version = "20170807";
version = "20170814";
src = fetchurl {
url = "http://orgmode.org/elpa/org-20170807.tar";
sha256 = "0cpkkfw7wmz242r5zzpcnzp7gfsmja90gqqb5h20azxmq96kfzga";
url = "http://orgmode.org/elpa/org-20170814.tar";
sha256 = "1r55vfjbll18h1nb5a48293x9lwmcmxgpx8h20n77n3inqmc6yli";
};
packageRequires = [];
meta = {
@ -14,10 +14,10 @@
}) {};
org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org-plus-contrib";
version = "20170807";
version = "20170814";
src = fetchurl {
url = "http://orgmode.org/elpa/org-plus-contrib-20170807.tar";
sha256 = "145j9g1lx5nj85irdh9ljhh4rhwj9ys8nnca549lyxd9a5yiav5k";
url = "http://orgmode.org/elpa/org-plus-contrib-20170814.tar";
sha256 = "15v3944p1vnjqmy6il6gr1ipqw32cjzdq6w43rniwv2vr5lmh6iz";
};
packageRequires = [];
meta = {

20
pkgs/applications/editors/sublime3/default.nix
View file

@ -31,20 +31,19 @@ in let
dontStrip = true;
dontPatchELF = true;
buildInputs = [ makeWrapper ];
buildInputs = [ makeWrapper zip unzip ];
# make exec.py in Default.sublime-package use own bash with
# an LD_PRELOAD instead of "/bin/bash"
patchPhase = ''
mkdir Default.sublime-package-fix
( cd Default.sublime-package-fix
${unzip}/bin/unzip ../Packages/Default.sublime-package > /dev/null
unzip -q ../Packages/Default.sublime-package
substituteInPlace "exec.py" --replace \
"[\"/bin/bash\"" \
"[\"$out/sublime_bash\""
zip -q ../Packages/Default.sublime-package **/*
)
${zip}/bin/zip -j Default.sublime-package.zip Default.sublime-package-fix/* > /dev/null
mv Default.sublime-package.zip Packages/Default.sublime-package
rm -r Default.sublime-package-fix
'';
@ -85,14 +84,17 @@ in stdenv.mkDerivation {
name = "sublimetext3-${build}";
phases = [ "installPhase" ];
inherit sublime;
installPhase = ''
mkdir -p $out/bin
ln -s ${sublime}/sublime_text $out/bin/subl
ln -s ${sublime}/sublime_text $out/bin/sublime
ln -s ${sublime}/sublime_text $out/bin/sublime3
ln -s $sublime/sublime_text $out/bin/subl
ln -s $sublime/sublime_text $out/bin/sublime
ln -s $sublime/sublime_text $out/bin/sublime3
mkdir -p $out/share/applications
ln -s ${sublime}/sublime_text.desktop $out/share/applications/sublime_text.desktop
ln -s ${sublime}/Icon/256x256/ $out/share/icons
ln -s $sublime/sublime_text.desktop $out/share/applications/sublime_text.desktop
ln -s $sublime/Icon/256x256/ $out/share/icons
'';
meta = with stdenv.lib; {

4
pkgs/applications/misc/cbatticon/default.nix
View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "cbatticon-${version}";
version = "1.6.5";
version = "1.6.6";
src = fetchFromGitHub {
owner = "valr";
repo = "cbatticon";
rev = version;
sha256 = "1j7gbmmygvbrawqn1bbaf47lb600lylslzqbvfwlhifmi7qnm6ca";
sha256 = "0gphijkjmg5q349ffhnx12dppg6hajkr90n0x5b6s9cad5b4q0kq";
};
makeFlags = "PREFIX=$(out)";

4
pkgs/applications/misc/gpxsee/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "gpxsee-${version}";
version = "4.8";
version = "4.9";
src = fetchFromGitHub {
owner = "tumic0";
repo = "GPXSee";
rev = version;
sha256 = "17s1v6b1j7pi0yj554bd0cg14bl854gssp5gj2pl51rxji6zr0wp";
sha256 = "0jk99yhrms1wzqpcnsjydcl2nysidv639s2j7l53yp60g0zz8174";
};
nativeBuildInputs = [ qmake qttools ];

2
pkgs/applications/misc/octoprint/default.nix
View file

@ -60,7 +60,7 @@ in pythonPackages.buildPythonApplication rec {
owner = "foosel";
repo = "OctoPrint";
rev = version;
sha256 = "06l8khbq3waaaa4cqpv6056w1ziylkfgzlb28v30i1h234rlkknq";
sha256 = "1hci8cfmbzcghla1vmrcn6zicm8nj50drm7gp2hkr0drglq5fgr2";
};
# We need old Tornado

27
pkgs/applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things/default.nix Normal file
View file

@ -0,0 +1,27 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "urxvt-autocomplete-all-the-things-${version}";
version = "1.6.0";
src = fetchFromGitHub {
owner = "Vifon";
repo = "autocomplete-ALL-the-things";
rev = version;
sha256 = "06xd59c6gd9rglwq4km93n2p078k7v4x300lqrg1f32vvnjvs7sr";
};
installPhase = ''
mkdir -p $out/lib/urxvt/perl
cp autocomplete-ALL-the-things $out/lib/urxvt/perl
'';
meta = with stdenv.lib; {
description = "urxvt plugin allowing user to easily complete arbitrary text";
homepage = "https://github.com/Vifon/autocomplete-ALL-the-things";
license = licenses.gpl3;
maintainers = with maintainers; [ nickhu ];
platforms = with platforms; unix;
};
}

27
pkgs/applications/misc/syncthing-tray/default.nix Normal file
View file

@ -0,0 +1,27 @@
{ stdenv, fetchFromGitHub, buildGoPackage, pkgconfig, libappindicator-gtk3 }:
buildGoPackage rec {
name = "syncthing-tray-${version}";
version = "0.7";
goPackagePath = "github.com/alex2108/syncthing-tray";
src = fetchFromGitHub {
owner = "alex2108";
repo = "syncthing-tray";
rev = "v${version}";
sha256 = "0869kinnsfzb8ydd0sv9fgqsi1sy5rhqg4whfdnrv82xjc71xyw3";
};
goDeps = ./deps.nix;
buildInputs = [ pkgconfig libappindicator-gtk3 ];
meta = with stdenv.lib; {
description = "Simple application tray for syncthing";
homepage = https://github.com/alex2108/syncthing-tray;
license = licenses.mit;
maintainers = with maintainers; [ nickhu ];
platforms = platforms.all;
};
}

93
pkgs/applications/misc/syncthing-tray/deps.nix Normal file
View file

@ -0,0 +1,93 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
[
{
goPackagePath = "github.com/alex2108/systray";
fetch = {
type = "git";
url = "https://github.com/alex2108/systray";
rev = "40e874866be2dc2c57ab031bcbde27a76b90721a";
sha256 = "1bxnb6skb9ss0lwlwswql07ardkhm28nxglvlsxkdlmzv1dcwy1q";
};
}
{
goPackagePath = "github.com/getlantern/context";
fetch = {
type = "git";
url = "https://github.com/getlantern/context";
rev = "624d99b1798d7c5375ea1d3ca4c5b04d58f7c775";
sha256 = "09yf9x6478a5z01hybr98zwa8ax3fx7l6wwsvdkxp3fdg9dqm13b";
};
}
{
goPackagePath = "github.com/getlantern/errors";
fetch = {
type = "git";
url = "https://github.com/getlantern/errors";
rev = "99fa440517e8f3d1e4cd8d6dbed6b41f4c1ed3d6";
sha256 = "08rl32l5ks67hcgjxik62nd5g558mv4101kmz1ak7d3vfgg3m6i3";
};
}
{
goPackagePath = "github.com/getlantern/golog";
fetch = {
type = "git";
url = "https://github.com/getlantern/golog";
rev = "cca714f7feb5df8e455f409b549d384441ac4578";
sha256 = "0gnf30n38zkx356cqc6jdv1kbzy59ddqhqndwrxsm2n2zc3b5p7q";
};
}
{
goPackagePath = "github.com/getlantern/hex";
fetch = {
type = "git";
url = "https://github.com/getlantern/hex";
rev = "083fba3033ad473db3dd31c9bb368473d37581a7";
sha256 = "18q6rypmcqmcwlfzrrdcz08nff0a289saplvd9y3ifnfcqdw3j77";
};
}
{
goPackagePath = "github.com/getlantern/hidden";
fetch = {
type = "git";
url = "https://github.com/getlantern/hidden";
rev = "d52a649ab33af200943bb599898dbdcfdbc94cb7";
sha256 = "0133qmp4sjq8da5di3459vc5g5nqbpqra0f558zd95js3fdmkmsi";
};
}
{
goPackagePath = "github.com/getlantern/ops";
fetch = {
type = "git";
url = "https://github.com/getlantern/ops";
rev = "b70875f5d689a9438bca72aefd7142a2af889b18";
sha256 = "0cfa2bbkykbzbskmgd2an34him72z6f3y88ag1v5ffpb0d6bnar7";
};
}
{
goPackagePath = "github.com/getlantern/stack";
fetch = {
type = "git";
url = "https://github.com/getlantern/stack";
rev = "02f928aad224fbccd50d66edd776fc9d1e9f2f2b";
sha256 = "0ddl5r4iw3c7p4drh4d8phl7d0ssdddsnd3xjm1lzgxylqq6r568";
};
}
{
goPackagePath = "github.com/oxtoacart/bpool";
fetch = {
type = "git";
url = "https://github.com/oxtoacart/bpool";
rev = "4e1c5567d7c2dd59fa4c7c83d34c2f3528b025d6";
sha256 = "01kk6dhkz96yhp3p5v2rjwq8mbrwrdsn6glqw7jp4h7g5za7yi95";
};
}
{
goPackagePath = "github.com/toqueteos/webbrowser";
fetch = {
type = "git";
url = "https://github.com/toqueteos/webbrowser";
rev = "e2ebfdc6cb1a3fdc4fc4dbd20a0cae0c2e406792";
sha256 = "0sgjnxrq0jgipkij8b6xiy4am9bv9zziqxxdhw15rdjc5piyk3a2";
};
}
]

8
pkgs/applications/networking/browsers/palemoon/default.nix
View file

@ -5,19 +5,19 @@
, gtk2, hunspell, icu, libevent, libjpeg, libnotify
, libstartup_notification, libvpx, makeWrapper, mesa
, nspr, nss, pango, perl, python, libpulseaudio, sqlite
, unzip, xlibs, which, yasm, zip, zlib
, unzip, xlibs, which, yasm, zip, zlib, gcc
}:
stdenv.mkDerivation rec {
name = "palemoon-${version}";
version = "27.2.1";
version = "27.4.1";
src = fetchFromGitHub {
name = "palemoon-src";
owner = "MoonchildProductions";
repo = "Pale-Moon";
rev = version + "_Release";
sha256 = "1yyipxd5lmavf4aca4vrcnp7hb8zkn4sv2zp6n2cm6w4pxlza0g4";
sha256 = "0sgy0iq038pj676w6k5nwbavrdmrznhydjibdpj6irdz5qxxdgjn";
};
desktopItem = makeDesktopItem {
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
gst-plugins-base gstreamer gst_all_1.gst-plugins-base gtk2
hunspell icu libevent libjpeg libnotify libstartup_notification
libvpx makeWrapper mesa nspr nss pango perl pkgconfig python
libpulseaudio sqlite unzip which yasm zip zlib
libpulseaudio sqlite unzip which yasm zip zlib gcc
] ++ (with xlibs; [
libX11 libXext libXft libXi libXrender libXScrnSaver
libXt pixman scrnsaverproto xextproto

38
pkgs/applications/networking/mailreaders/msgviewer/default.nix Normal file
View file

@ -0,0 +1,38 @@
{ stdenv, fetchurl, makeWrapper, writeScript, unzip, jre }:
let
version = "1.9";
name = "msgviewer-${version}";
uname = "MSGViewer-${version}";
in stdenv.mkDerivation rec {
inherit name;
src = fetchurl {
url = "mirror://sourceforge/msgviewer/${uname}/${uname}.zip";
sha256 = "0igmr8c0757xsc94xlv2470zv2mz57zaj52dwr9wj8agmj23jbjz";
};
buildCommand = ''
dir=$out/lib/msgviewer
mkdir -p $out/bin $dir
unzip $src -d $dir
mv $dir/${uname}/* $dir
rmdir $dir/${uname}
cat <<_EOF > $out/bin/msgviewer
#!${stdenv.shell} -eu
${stdenv.lib.getBin jre}/bin/java -jar $dir/MSGViewer.jar $@
_EOF
chmod 755 $out/bin/msgviewer
'';
nativeBuildInputs = [ makeWrapper unzip ];
meta = with stdenv.lib; {
description = "Viewer for .msg files (MS Outlook)";
homepage = https://www.washington.edu/alpine/;
license = licenses.asl20;
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.all;
};
}

11
pkgs/applications/networking/syncthing/default.nix
View file

@ -1,14 +1,14 @@
{ stdenv, lib, fetchFromGitHub, go, procps, removeReferencesTo }:
stdenv.mkDerivation rec {
version = "0.14.32";
version = "0.14.36";
name = "syncthing-${version}";
src = fetchFromGitHub {
owner = "syncthing";
repo = "syncthing";
rev = "v${version}";
sha256 = "1agjr3m4gnywbp40idi0pwy25cp836sdcar7r6r9hwcqxyyzz545";
sha256 = "1l4s74qlabwfkpi9lmm588ym0myavbs06a5gpp9nihzrsal18727";
};
buildInputs = [ go removeReferencesTo ];
@ -21,13 +21,14 @@ stdenv.mkDerivation rec {
# Syncthing's build.go script expects this working directory
cd src/github.com/syncthing/syncthing
go run build.go -no-upgrade -version v${version} install all
go run build.go -no-upgrade -version v${version} build
'';
installPhase = ''
mkdir -p $out/bin $out/lib/systemd/{system,user}
mkdir -p $out/lib/systemd/{system,user}
install -Dm755 syncthing $out/bin/syncthing
cp bin/* $out/bin
'' + lib.optionalString (stdenv.isLinux) ''
substitute etc/linux-systemd/system/syncthing-resume.service \
$out/lib/systemd/system/syncthing-resume.service \

32
pkgs/applications/office/grisbi/default.nix Normal file
View file

@ -0,0 +1,32 @@
{ fetchurl, stdenv, gtk, pkgconfig, libofx, intltool, wrapGAppsHook
, hicolor_icon_theme, libsoup, gnome3 }:
stdenv.mkDerivation rec {
name = "grisbi-${version}";
version = "1.0.2";
src = fetchurl {
url = "mirror://sourceforge/grisbi/${name}.tar.bz2";
sha256 = "1m31a1h4i59z36ri4a22rrd29byg6wnxq37559042hdhn557kazm";
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
buildInputs = [ gtk libofx intltool hicolor_icon_theme libsoup
gnome3.defaultIconTheme ];
meta = with stdenv.lib; {
description = "A personnal accounting application.";
longDescription = ''
Grisbi is an application written by French developers, so it perfectly
respects French accounting rules. Grisbi can manage multiple accounts,
currencies and users. It manages third party, expenditure and receipt
categories, budgetary lines, financial years, budget estimates, bankcard
management and other information that make Grisbi adapted for
associations.
'';
homepage = "http://grisbi.org";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ layus ];
platforms = platforms.linux;
};
}

3
pkgs/applications/virtualization/qemu/default.nix
View file

@ -55,7 +55,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
patches = [ ./no-etc-install.patch ]
++ optional nixosTestRunner ./force-uid0-on-9p.patch;
++ optional nixosTestRunner ./force-uid0-on-9p.patch
++ optional pulseSupport ./fix-hda-recording.patch;
hardeningDisable = [ "stackprotector" ];

34
pkgs/applications/virtualization/qemu/fix-hda-recording.patch Normal file
View file

@ -0,0 +1,34 @@
diff --git a/audio/paaudio.c b/audio/paaudio.c
index fea6071..c1169d4 100644
--- a/audio/paaudio.c
+++ b/audio/paaudio.c
@@ -608,6 +608,7 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque)
{
int error;
pa_sample_spec ss;
+ pa_buffer_attr ba;
struct audsettings obt_as = *as;
PAVoiceIn *pa = (PAVoiceIn *) hw;
paaudio *g = pa->g = drv_opaque;
@@ -616,6 +617,12 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque)
ss.channels = as->nchannels;
ss.rate = as->freq;
+ ba.fragsize = pa_frame_size (&ss) * g->conf.samples;
+ ba.maxlength = 5 * ba.fragsize;
+ ba.tlength = -1;
+ ba.prebuf = -1;
+ ba.minreq = -1;
+
obt_as.fmt = pa_to_audfmt (ss.format, &obt_as.endianness);
pa->stream = qpa_simple_new (
@@ -625,7 +632,7 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque)
g->conf.source,
&ss,
NULL, /* channel map */
- NULL, /* buffering attributes */
+ &ba, /* buffering attributes */
&error
);
if (!pa->stream) {

4
pkgs/data/misc/dns-root-data/default.nix
View file

@ -4,7 +4,7 @@ let
rootHints = fetchurl {
url = "http://www.internic.net/domain/named.root";
sha256 = "1zf3ydn44z70gq1kd95lvk9cp68xlbl8vqpswqlhd30qafx6v6d1";
sha256 = "0qsyxpj5b3i7n162qfyv76ljqbvnwjii7jk8mpfinklx0sk01473";
};
rootKey = ./root.key;
@ -13,7 +13,7 @@ let
in
stdenv.mkDerivation {
name = "dns-root-data-2017-07-11";
name = "dns-root-data-2017-07-26";
buildCommand = ''
mkdir $out

45
pkgs/development/compilers/gcc-arm-embedded/6/default.nix Normal file
View file

@ -0,0 +1,45 @@
{ stdenv, fetchurl, ncurses5, python27 }:
stdenv.mkDerivation rec {
name = "gcc-arm-embedded-${version}";
version = "6-2017-q2-update";
subdir = "6-2017q2";
platformString =
if stdenv.isLinux then "linux"
else if stdenv.isDarwin then "mac"
else throw "unsupported platform";
urlString = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-${platformString}.tar.bz2";
src =
if stdenv.isLinux then fetchurl { url=urlString; sha256="1hvwi02mx34al525sngnl0cm7dkmzxfkb1brq9kvbv28wcplp3p6"; }
else if stdenv.isDarwin then fetchurl { url=urlString; sha256="0019ylpq4inq7p5gydpmc9m8ni72fz2csrjlqmgx1698998q0c3x"; }
else throw "unsupported platform";
phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
installPhase = ''
mkdir -p $out
cp -r * $out
'';
dontPatchELF = true;
dontStrip = true;
preFixup = ''
find $out -type f | while read f; do
patchelf $f > /dev/null 2>&1 || continue
patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true
done
'';
meta = {
description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors (Cortex-M0/M0+/M3/M4/M7, Cortex-R4/R5/R7/R8)";
homepage = https://developer.arm.com/open-source/gnu-toolchain/gnu-rm;
license = with stdenv.lib.licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ];
maintainers = with stdenv.lib.maintainers; [ vinymeuh ];
platforms = with stdenv.lib.platforms; linux ++ darwin;
};
}

11
pkgs/development/compilers/ponyc/pony-stable.nix
View file

@ -1,13 +1,14 @@
{stdenv, fetchFromGitHub, ponyc }:
stdenv.mkDerivation {
name = "pony-stable-unstable-2017-07-26";
stdenv.mkDerivation rec {
name = "pony-stable-${version}";
version = "0.0.1";
src = fetchFromGitHub {
owner = "ponylang";
repo = "pony-stable";
rev = "4016f9253a4e3114ee69100d3d02154ffd3fd7e4";
sha256 = "0xz5syjn2f8k31vny49k3jm8zisa15ly4hbcb3rh4jvq8jjp1ldr";
rev = version;
sha256 = "0q05135mnzzdwam7cnmxq34clqhmc83yp2gi63sx20c74rcw3p6v";
};
buildInputs = [ ponyc ];
@ -20,7 +21,7 @@ stdenv.mkDerivation {
description = "A simple dependency manager for the Pony language.";
homepage = http://www.ponylang.org;
license = stdenv.lib.licenses.bsd2;
maintainers = [ stdenv.lib.maintainers.dipinhora ];
maintainers = with stdenv.lib.maintainers; [ dipinhora kamilchm ];
platforms = stdenv.lib.platforms.unix;
};
}

8
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -87,6 +87,11 @@ self: super: {
hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
};
# Fix test trying to access /home directory
shell-conduit = (overrideCabal super.shell-conduit (drv: {
postPatch = "sed -i s/home/tmp/ test/Spec.hs";
}));
# https://github.com/froozen/kademlia/issues/2
kademlia = dontCheck super.kademlia;
@ -417,6 +422,9 @@ self: super: {
# https://github.com/basvandijk/threads/issues/10
threads = dontCheck super.threads;
# https://github.com/purescript/purescript/pull/3041
purescript = doJailbreak super.purescript;
# Missing module.
rematch = dontCheck super.rematch; # https://github.com/tcrayford/rematch/issues/5
rematch-text = dontCheck super.rematch-text; # https://github.com/tcrayford/rematch/issues/6

92
pkgs/development/interpreters/red/default.nix Normal file
View file

@ -0,0 +1,92 @@
{ stdenv, stdenv_32bit, pkgsi686Linux, fetchFromGitHub, fetchurl }:
stdenv.mkDerivation rec {
name = "red-v${version}";
version = "0.6.3";
src = fetchFromGitHub {
rev = "6a43c767fa2e85d668b83f749158a18e62c30f70";
owner = "red";
repo = "red";
sha256 = "1zh6xc728bs7r4v5jz1jjrdk0xd838xsxmvy9gfg75a3zffm0slr";
};
rebol = fetchurl {
url = "http://www.rebol.com/downloads/v278/rebol-core-278-4-2.tar.gz";
sha256 = "1c1v0pyhf3d8z98qc93a5zmx0bbl0qq5lr8mbkdgygqsq2bv2xbz";
};
buildInputs = [ pkgsi686Linux.curl stdenv_32bit ];
r2 = "./rebol/releases/rebol-core/rebol";
configurePhase = ''
# Download rebol
mkdir rebol/
tar -xzvf ${rebol} -C rebol/
patchelf --set-interpreter \
${stdenv_32bit.cc.libc.out}/lib/32/ld-linux.so.2 \
${r2}
'';
buildPhase = ''
# Do tests
#${r2} -qw run-all.r
# Build test
${r2} -qw red.r tests/hello.red
# Compiling the Red console...
${r2} -qw red.r -r environment/console/console.red
# Generating docs...
cd docs
../${r2} -qw makedoc2.r red-system-specs.txt
../${r2} -qw makedoc2.r red-system-quick-test.txt
cd ../
'';
installPhase = ''
mkdir $out
# Install
install -d $out/opt/red
find quick-test -type f -executable -print0 | xargs -0 rm
cp -R * $out/opt/red/
rm -rf $out/opt/red/rebol
install -Dm755 console $out/bin/red
install -Dm644 BSD-3-License.txt \
$out/share/licenses/${name}/BSD-3-License.txt
install -Dm644 BSL-License.txt \
$out/share/licenses/${name}/BSL-License.txt
install -Dm644 docs/red-system-quick-test.html \
$out/share/doc/${name}/red-system-quick-test.html
install -Dm644 docs/red-system-specs.html \
$out/share/doc/${name}/red-system-specs.html
# PathElf
patchelf --set-interpreter \
${stdenv_32bit.cc.libc.out}/lib/32/ld-linux.so.2 \
$out/opt/red/console
patchelf --set-rpath ${pkgsi686Linux.curl.out}/lib \
$out/opt/red/console
patchelf --set-interpreter \
${stdenv_32bit.cc.libc.out}/lib/32/ld-linux.so.2 \
$out/bin/red
patchelf --set-rpath ${pkgsi686Linux.curl.out}/lib \
$out/bin/red
'';
meta = with stdenv.lib; {
description = ''
New programming language strongly inspired by Rebol, but with a
broader field of usage thanks to its native-code compiler, from system
programming to high-level scripting, while providing modern support for
concurrency and multi-core CPUs
'';
maintainers = with maintainers; [ uralbash ];
platforms = [ "i686-linux" "x86_64-linux" ];
license = licenses.bsd3;
homepage = http://www.red-lang.org/;
};
}

23
pkgs/development/libraries/libsndfile/default.nix
View file

@ -10,6 +10,29 @@ stdenv.mkDerivation rec {
sha256 = "1afzm7jx34jhqn32clc5xghyjglccam2728yxlx37yj2y0lkkwqz";
};
patches = [
# CVE-2017-12562
(fetchurl {
url = "https://github.com/erikd/libsndfile/commit/cf7a8182c2642c50f1cf90dddea9ce96a8bad2e8.patch";
sha256 = "1jg3wq30wdn9nv52mcyv6jyi4d80h4r1h9p96czcria7l91yh4sy";
})
# CVE-2017-6892
(fetchurl {
url = "https://github.com/erikd/libsndfile/commit/f833c53cb596e9e1792949f762e0b33661822748.patch";
sha256 = "05xkmz2ihc1zcj73sbmj1ikrv9qlcym2bkp1v6ak7w53ky619mwq";
})
# CVE-2017-8361, CVE-2017-8363, CVE-2017-8363
(fetchurl {
url = "https://github.com/erikd/libsndfile/commit/fd0484aba8e51d16af1e3a880f9b8b857b385eb3.patch";
sha256 = "0ccndnvjzx5fw18zvy03vnb29rr81h5vsh1m16msqbxk8ibndln2";
})
# CVE-2017-8362
(fetchurl {
url = "https://github.com/erikd/libsndfile/commit/ef1dbb2df1c0e741486646de40bd638a9c4cd808.patch";
sha256 = "1xyv30ga71cpy4wx5f76sc4dma91la2lcc6s9f3pk9rndyi7gj9x";
})
];
buildInputs = [ pkgconfig flac libogg libvorbis ]
++ stdenv.lib.optionals stdenv.isDarwin [ Carbon AudioToolbox ];

9
pkgs/development/libraries/libxslt/default.nix
View file

@ -17,7 +17,14 @@ stdenv.mkDerivation rec {
sha256 = "1klh81xbm9ppzgqk339097i39b7fnpmlj8lzn8bpczl3aww6x5xm";
};
patches = stdenv.lib.optional stdenv.isSunOS ./patch-ah.patch;
patches = [
(fetchpatch {
name = "CVE-2017-5029";
url = "https://git.gnome.org/browse/libxslt/"
+ "patch/?id=08ab2774b870de1c7b5a48693df75e8154addae5";
sha256 = "10azfmyffjf9d7b5js4ipxw9f20qi0kw3zq34bpqmbcpq3l338ky";
})
] ++ stdenv.lib.optional stdenv.isSunOS ./patch-ah.patch;
# fixes: can't build x86_64-unknown-cygwin shared library unless -no-undefined is specified
postPatch = optionalString hostPlatform.isCygwin ''

16
pkgs/development/libraries/opencv/3.x.nix
View file

@ -17,6 +17,7 @@
, enableEigen ? false, eigen
, enableOpenblas ? false, openblas
, enableCuda ? false, cudatoolkit, gcc5
, enableTesseract ? false, tesseract, leptonica
, AVFoundation, Cocoa, QTKit
}:
@ -44,6 +45,9 @@ let
sha256 = "11dsq8dwh1k6f7zglbc26xwsjw184ggf2531mhf7v77kd72k19fm";
};
# Contrib must be built in order to enable Tesseract support:
buildContrib = enableContrib || enableTesseract;
vggFiles = fetchFromGitHub {
owner = "opencv";
repo = "opencv_3rdparty";
@ -66,7 +70,7 @@ stdenv.mkDerivation rec {
inherit version src;
postUnpack =
(lib.optionalString enableContrib ''
(lib.optionalString buildContrib ''
cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib"
# This fixes the build on macOS.
@ -118,7 +122,7 @@ stdenv.mkDerivation rec {
ln -s "${ippicv}" "${dir}/${name}"
''
) +
(lib.optionalString enableContrib ''
(lib.optionalString buildContrib ''
cmakeFlagsArray+=("-DOPENCV_EXTRA_MODULES_PATH=$NIX_BUILD_TOP/opencv_contrib")
'');
@ -137,8 +141,12 @@ stdenv.mkDerivation rec {
++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ])
++ lib.optional enableEigen eigen
++ lib.optional enableOpenblas openblas
# There is seemingly no compile-time flag for Tesseract. It's
# simply enabled automatically if contrib is built, and it detects
# tesseract & leptonica.
++ lib.optionals enableTesseract [ tesseract leptonica ]
++ lib.optionals enableCuda [ cudatoolkit gcc5 ]
++ lib.optional enableContrib protobuf3_1
++ lib.optional buildContrib protobuf3_1
++ lib.optionals stdenv.isDarwin [ AVFoundation Cocoa QTKit ];
propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;
@ -158,7 +166,7 @@ stdenv.mkDerivation rec {
(opencvFlag "CUDA" enableCuda)
(opencvFlag "CUBLAS" enableCuda)
] ++ lib.optionals enableCuda [ "-DCUDA_FAST_MATH=ON" ]
++ lib.optional enableContrib "-DBUILD_PROTOBUF=off"
++ lib.optional buildContrib "-DBUILD_PROTOBUF=off"
++ lib.optionals stdenv.isDarwin ["-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF"];
enableParallelBuilding = true;

12
pkgs/development/libraries/portaudio/default.nix
View file

@ -1,15 +1,15 @@
{ stdenv, fetchurl, alsaLib, pkgconfig
{ stdenv, fetchurl, alsaLib, pkgconfig, libjack2
, AudioUnit, AudioToolbox, CoreAudio, CoreServices, Carbon }:
stdenv.mkDerivation rec {
name = "portaudio-19-20140130";
name = "portaudio-190600-20161030";
src = fetchurl {
url = http://www.portaudio.com/archives/pa_stable_v19_20140130.tgz;
sha256 = "0mwddk4qzybaf85wqfhxqlf0c5im9il8z03rd4n127k8y2jj9q4g";
url = http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz;
sha256 = "04qmin6nj144b8qb9kkd9a52xfvm0qdgm8bg8jbl7s3frmyiv8pm";
};
buildInputs = [ pkgconfig ]
buildInputs = [ pkgconfig libjack2 ]
++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
configureFlags = [ "--disable-mac-universal" ];

1
pkgs/development/lisp-modules/define-package.nix
View file

@ -20,6 +20,7 @@ let
echo "export NIX_LDFLAGS='$NIX_LDFLAGS'\"\''${NIX_LDFLAGS:+ \$NIX_LDFLAGS}\"" >> "$config_script"
echo "export NIX_LISP_COMMAND='$NIX_LISP_COMMAND'" >> "$config_script"
echo "export NIX_LISP_ASDF='$NIX_LISP_ASDF'" >> "$config_script"
set | grep NIX_CC_WRAPPER_ | sed -e 's@^NIX_CC_WRAPPER@export &@' >> "$config_script"
echo "export PATH=\"\''${PATH:+\$PATH:}$PATH\"" >> "$config_script"
echo "echo \"\$ASDF_OUTPUT_TRANSLATIONS\" | grep -E '(^|:)$store_translation(:|\$)' >/dev/null || export ASDF_OUTPUT_TRANSLATIONS=\"\''${ASDF_OUTPUT_TRANSLATIONS:+\$ASDF_OUTPUT_TRANSLATIONS:}\"'$store_translation'" >> "$config_script"
echo "source '$path_config_script'" >> "$config_script"

2
pkgs/development/python-modules/breathe/default.nix
View file

@ -12,7 +12,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ docutils six sphinx ];
disabled = isPy3k;
doCheck = !isPy3k;
meta = {
homepage = https://github.com/michaeljones/breathe;

23
pkgs/development/python-modules/hyperlink/default.nix Normal file
View file

@ -0,0 +1,23 @@
{ stdenv, buildPythonPackage, fetchurl, pytest }:
buildPythonPackage rec {
name = "hyperlink-${version}";
version = "17.3.0";
src = fetchurl {
url = "mirror://pypi/h/hyperlink/${name}.tar.gz";
sha256 = "06mgnxwjzx8hv34bifc7jvgxz21ixhk5s6xy2kd84hdrlbfvpbfx";
};
checkInputs = [ pytest ];
checkPhase = ''
py.test $out
'';
meta = with stdenv.lib; {
description = "A featureful, correct URL for Python";
license = licenses.mit;
platforms = platforms.all;
maintainers = with maintainers; [ apeschar ];
};
}

44
pkgs/development/python-modules/pywbem/default.nix Normal file
View file

@ -0,0 +1,44 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, libxml2
, m2crypto, ply, pyyaml, six
, httpretty, lxml, mock, pytest, requests
}:
buildPythonPackage rec {
name = "pywbem-${version}";
version = "0.10.0";
src = fetchFromGitHub {
owner = "pywbem";
repo = "pywbem";
rev = "v${version}";
sha256 = "0jcwklip03xcni0dvsk9va8ilqz21g4fxwqd5kzvv91slaadfcym";
};
propagatedBuildInputs = [ m2crypto ply pyyaml six ];
checkInputs = [ httpretty lxml mock pytest requests ];
# 1 test fails because it doesn't like running in our sandbox. Deleting the
# whole file is admittedly a little heavy-handed but at least the vast
# majority of tests are run.
checkPhase = ''
rm testsuite/testclient/networkerror.yaml
substituteInPlace makefile \
--replace "PYTHONPATH=." "" \
--replace '--cov $(package_name) --cov-config coveragerc' ""
for f in testsuite/test_cim_xml.py testsuite/validate.py ; do
substituteInPlace $f --replace "'xmllint" "'${stdenv.lib.getBin libxml2}/bin/xmllint"
done
make PATH=$PATH:${stdenv.lib.getBin libxml2}/bin test
'';
meta = with stdenv.lib; {
description = "Support for the WBEM standard for systems management.";
homepage = http://pywbem.github.io/pywbem/;
license = licenses.gpl2;
maintainers = with maintainers; [ peterhoeg ];
};
}

4
pkgs/development/tools/build-managers/meson/default.nix
View file

@ -1,12 +1,12 @@
{ lib, python3Packages }:
python3Packages.buildPythonApplication rec {
version = "0.40.0";
version = "0.41.2";
pname = "meson";
name = "${pname}-${version}";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "1hb6y5phzd5738rlpz78w8hfzk7sbxj81551mb7bbkkqz8ql1gjw";
sha256 = "0p69hir68ar3nzrjn0zjsnyzq181b0kq6arrcmxqpzl7g5qhf5xd";
};
postFixup = ''

8
pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
View file

@ -1,16 +1,16 @@
{ lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }:
let
version = "9.3.0";
version = "9.4.2";
# Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
docker_x86_64 = fetchurl {
url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz";
sha256 = "1svml4k1zkmnw49sg4ipzl4fzvxx9rbj0643lwf6vm55j8xykhrq";
sha256 = "1cf8iasn47dlnbchh389ishzx5dqbyzg94w83j1w2ik4z0na6b7g";
};
docker_arm = fetchurl {
url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz";
sha256 = "0xbbbjd7hvhlzi47rzf09fzcpkd7jrf80xk1y736px75yyvq3jr2";
sha256 = "120rvxlksza9zpjin0awq8gnnplnv6qmqlidgnxs63c71kyjiwf3";
};
in
buildGoPackage rec {
@ -29,7 +29,7 @@ buildGoPackage rec {
owner = "gitlab-org";
repo = "gitlab-ci-multi-runner";
rev = "v${version}";
sha256 = "0ddsh31sqjp9xs6mv5jbmqvjq2hcy6j21grrn1m73z8blk4ylxsd";
sha256 = "06g4y6vn99b0g0k2als7fz5y2f87pg1cfwsxs8psqgl7nxmhw3i6";
};
patches = [ ./fix-shell-path.patch ];

8
pkgs/development/tools/misc/kibana/default.nix
View file

@ -11,13 +11,13 @@ let
elasticArch = archOverrides."${arch}" or arch;
plat = elemAt info 1;
shas = {
"x86_64-linux" = "1md3y3a8rxvf37lnfc56kbirv2rjl68pa5672yxhfmjngrr20rcw";
"i686-linux" = "0d77a2v14pg5vr711hzbva8jjy0sxw9w889f2r1vhwngrhcfz4pf";
"x86_64-darwin" = "1cajljx13h8bncmayzvlzsynwambz61cspjnsn2h19zghn2vj2c9";
"x86_64-linux" = "1wnnrhhpgc58s09p99cmi8r2jmwsd5lmh2inb0k8nmizz5v1sjz0";
"i686-linux" = "0sdx59jlfrf7r9793xpn2vxaxjdczgn3qfw8yny03dcs6fjaxi2y";
"x86_64-darwin" = "0rmp536kn001g52lxngpj6x6d0j3qj0r11d4djbz7h6s5ml03kza";
};
in stdenv.mkDerivation rec {
name = "kibana-${version}";
version = "4.6.0";
version = "4.6.5";
src = fetchurl {
url = "https://download.elastic.co/kibana/kibana/${name}-${plat}-${elasticArch}.tar.gz";

54
pkgs/development/tools/wp-cli/default.nix
View file

@ -1,51 +1,49 @@
{ stdenv, lib, fetchurl, php }:
{ stdenv, lib, fetchurl, writeScript, writeText, php }:
let
version = "1.2.1";
name = "wp-cli-${version}";
version = "1.3.0";
bin = "bin/wp";
ini = "etc/php/wp-cli.ini";
phar = "share/wp-cli/wp-cli.phar";
src = fetchurl {
url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar";
sha256 = "0q5d32jq7a6rba77sr1yyj6ib6x838hw14mm186ah1xxgnn7rnry";
};
completion = fetchurl {
url = "https://raw.githubusercontent.com/wp-cli/wp-cli/v${version}/utils/wp-completion.bash";
sha256 = "15d330x6d3fizrm6ckzmdknqg6wjlx5fr87bmkbd5s6a1ihs0g24";
};
in stdenv.mkDerivation rec {
name = "wp-cli-${version}";
bin = writeScript "wp" ''
#! ${stdenv.shell}
src = fetchurl {
url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar";
sha256 = "1ds9nhm0akajwykblg0s131vki02k3rpf72a851r3wjw2qv116wz";
};
set -euo pipefail
buildCommand = ''
mkdir -p $out/bin $out/etc/php
exec ${lib.getBin php}/bin/php \
-c ${ini} \
-f ${src} -- "$@"
'';
cat <<_EOF > $out/${bin}
#! ${stdenv.shell} -eu
exec ${lib.getBin php}/bin/php \\
-c $out/${ini} \\
-f $out/${phar} "\$@"
_EOF
chmod 755 $out/${bin}
cat <<_EOF > $out/${ini}
ini = writeText "wp-cli.ini" ''
[Phar]
phar.readonly = Off
_EOF
chmod 644 $out/${ini}
'';
install -Dm644 ${src} $out/${phar}
in stdenv.mkDerivation rec {
inherit name version;
buildCommand = ''
mkdir -p $out/{bin,share/bash-completion/completions}
ln -s ${bin} $out/bin/wp
install -Dm644 ${completion} $out/share/bash-completion/completions/wp
'';
meta = with stdenv.lib; {
description = "A command line interface for WordPress";
homepage = https://wp-cli.org;
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.all;
homepage = https://wp-cli.org;
license = licenses.mit;
platforms = platforms.all;
};
}

8
pkgs/games/factorio/default.nix
View file

@ -10,7 +10,7 @@ assert releaseType == "alpha" || releaseType == "headless" || releaseType == "de
with stdenv.lib;
let
version = if releaseType != "demo" then "0.15.31" else "0.15.31";
version = if releaseType != "demo" then "0.15.33" else "0.15.33";
arch = if stdenv.system == "x86_64-linux" then {
inUrl = "linux64";
@ -26,9 +26,9 @@ let
url = "https://www.factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}";
name = "factorio_${releaseType}_${arch.inTar}-${version}.tar.xz";
x64 = {
headless = fetchurl { inherit name url; sha256 = "1kbf6pj0rdiydx7g3xaqhnvvjr01g1afys2flw8x5myanffhql9x"; };
alpha = authenticatedFetch { inherit name url; sha256 = "0mz7x0hc3kvs6l1isnryld08sfy8gkgq81vvmmssa3ayp5y67rh4"; };
demo = fetchurl { inherit name url; sha256 = "0zsjlgys96qlqs79m634wh36vx5d7faq4749i9lsxm88b6fylfaf"; };
headless = fetchurl { inherit name url; sha256 = "17x0dlmfd7jwmpmn5i8wag28rl01iysqz3ri6g6msxjnvj5l6byn"; };
alpha = authenticatedFetch { inherit name url; sha256 = "1m2r0n99ngqq47s9fzr09d347i15an6x9v1qlij8yf8w7lyrdy4z"; };
demo = fetchurl { inherit name url; sha256 = "03nwn4838yhqq0r76pf2m4wxi32rsq0knsxmq3qq4ycji89q1dyc"; };
};
i386 = {
headless = abort "Factorio 32-bit headless binaries are not available for download.";

4
pkgs/os-specific/linux/busybox/default.nix
View file

@ -27,11 +27,11 @@ let
in
stdenv.mkDerivation rec {
name = "busybox-1.26.2";
name = "busybox-1.27.1";
src = fetchurl {
url = "http://busybox.net/downloads/${name}.tar.bz2";
sha256 = "05mg6rh5smkzfwqfcazkpwy6h6555llsazikqnvwkaf17y8l8gns";
sha256 = "0dprylmcignrp29g41nkwr1b30v7i5x21lwymp3b93i1zd9sr468";
};
hardeningDisable = [ "format" ] ++ lib.optional enableStatic [ "fortify" ];

4
pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
View file

@ -1,9 +1,9 @@
{ stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
let
version = "4.12.5";
version = "4.12.7";
revision = "a";
sha256 = "03cyh9fsbd95gdd477k1jmk3f9aj5dnw5wr8041y51v8f63vzbpk";
sha256 = "1kj0s5r7fx2d0crak7576jv9r6q7yx4aqmxpib6mhj1zfhsczdp0";
in
import ./generic.nix (args // {

8
pkgs/os-specific/linux/shadow/default.nix
View file

@ -20,13 +20,13 @@ in
stdenv.mkDerivation rec {
name = "shadow-${version}";
version = "4.4";
version = "4.5";
src = fetchFromGitHub {
owner = "shadow-maint";
repo = "shadow";
rev = "${version}";
sha256 = "005qk3n86chc8mlg86qhrns2kpl52n5f3las3m5s6266xij3qwka";
sha256 = "1aj7s2arnsfqf34ak40is2zmwm666l28pay6rv1ffx46j0wj4hws";
};
buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam;
@ -37,10 +37,6 @@ stdenv.mkDerivation rec {
patches =
[ ./keep-path.patch
dots_in_usernames
(fetchpatch {
url = https://github.com/shadow-maint/shadow/commit/507f96cdeb54079fb636c7ce21e371f7a16a520e.patch;
sha256 = "10k70fx3z051f83p1k7ljjaawbykhn7cy6fg1zy04jp3xkvdwxc7";
})
];
# The nix daemon often forbids even creating set[ug]id files.

5
pkgs/servers/apcupsd/default.nix
View file

@ -15,6 +15,11 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig utillinux man ] ++ stdenv.lib.optional enableCgiScripts gd;
prePatch = ''
sed -e "s,\$(INSTALL_PROGRAM) \$(STRIP),\$(INSTALL_PROGRAM)," \
-i ./src/apcagent/Makefile ./autoconf/targets.mak
'';
# ./configure ignores --prefix, so we must specify some paths manually
# There is no real reason for a bin/sbin split, so just use bin.
preConfigure = ''

3
pkgs/servers/dns/knot-dns/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gnutls, jansson, liburcu, lmdb, libcap_ng, libidn
, systemd, nettle, libedit, zlib, libiconv, fetchpatch
, systemd, nettle, libedit, zlib, libiconv, libintlOrEmpty
}:
let inherit (stdenv.lib) optional optionals; in
@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
]
# Use embedded lmdb there for now, as detection is broken on Darwin somehow.
++ optionals stdenv.isLinux [ libcap_ng systemd lmdb ]
++ libintlOrEmpty
++ optional stdenv.isDarwin zlib; # perhaps due to gnutls
# Not ideal but seems to work on Linux.

36
pkgs/servers/monitoring/nagios/plugins/official-2.x.nix
View file

@ -1,36 +0,0 @@
{ stdenv, fetchurl, openssh, openssl }:
stdenv.mkDerivation rec {
name = "nagios-plugins-${version}";
version = "2.2.0";
src = fetchurl {
url = "http://nagios-plugins.org/download/${name}.tar.gz";
sha256 = "074yia04py5y07sbgkvri10dv8nf41kqq1x6kmwqcix5vvm9qyy3";
};
# !!! Awful hack. Grrr... this of course only works on NixOS.
# Anyway the check that configure performs to figure out the ping
# syntax is totally impure, because it runs an actual ping to
# localhost (which won't work for ping6 if IPv6 support isn't
# configured on the build machine).
preConfigure= "
configureFlagsArray=(
--with-ping-command='/run/wrappers/bin/ping -4 -n -U -w %d -c %d %s'
--with-ping6-command='/run/wrappers/bin/ping -6 -n -U -w %d -c %d %s'
)
";
postInstall = "ln -s libexec $out/bin";
# !!! make openssh a runtime dependency only
buildInputs = [ openssh openssl ];
meta = {
description = "Official plugins for Nagios";
homepage = http://www.nagios.org/download/plugins;
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ thoughtpolice relrod ];
};
}

71
pkgs/servers/monitoring/plugins/default.nix Normal file
View file

@ -0,0 +1,71 @@
{ stdenv, fetchFromGitHub, autoreconfHook
, coreutils, gnugrep, gnused, lm_sensors, net_snmp, openssh, openssl, perl }:
with stdenv.lib;
let
majorVersion = "2.2";
minorVersion = ".0";
binPath = makeBinPath [ coreutils gnugrep gnused lm_sensors net_snmp ];
in stdenv.mkDerivation rec {
name = "monitoring-plugins-${majorVersion}${minorVersion}";
src = fetchFromGitHub {
owner = "monitoring-plugins";
repo = "monitoring-plugins";
rev = "v${majorVersion}";
sha256 = "1pw7i6d2cnb5nxi2lbkwps2qzz04j9zd86fzpv9ka896b4aqrwv1";
};
# !!! Awful hack. Grrr... this of course only works on NixOS.
# Anyway the check that configure performs to figure out the ping
# syntax is totally impure, because it runs an actual ping to
# localhost (which won't work for ping6 if IPv6 support isn't
# configured on the build machine).
preConfigure= ''
substituteInPlace po/Makefile.in.in \
--replace /bin/sh ${stdenv.shell}
sed -i configure.ac \
-e 's|^DEFAULT_PATH=.*|DEFAULT_PATH=\"\$out/bin:/run/wrappers/bin:${binPath}\"|'
configureFlagsArray=(
--with-ping-command='/run/wrappers/bin/ping -4 -n -U -w %d -c %d %s'
--with-ping6-command='/run/wrappers/bin/ping -6 -n -U -w %d -c %d %s'
)
'';
# !!! make openssh a runtime dependency only
buildInputs = [ net_snmp openssh openssl perl ];
nativeBuildInputs = [ autoreconfHook ];
enableParallelBuilding = true;
# For unknown reasons the installer tries executing $out/share and fails if
# it doesn't succeed.
# So we create it and remove it again later.
preBuild = ''
mkdir -p $out
cat <<_EOF > $out/share
#!${stdenv.shell}
exit 0
_EOF
chmod 755 $out/share
'';
postInstall = ''
rm $out/share
ln -s libexec $out/bin
'';
meta = {
description = "Official monitoring plugins for Nagios/Ichinga/Sensu and others.";
homepage = https://www.monitoring-plugins.org;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ thoughtpolice relrod ];
};
}

37
pkgs/servers/monitoring/plugins/esxi.nix Normal file
View file

@ -0,0 +1,37 @@
{ stdenv, fetchFromGitHub, python2Packages }:
let
bName = "check_esxi_hardware";
pName = stdenv.lib.replaceStrings [ "_" ] [ "-" ] "${bName}";
in python2Packages.buildPythonApplication rec {
name = "${pName}-${version}";
version = "20161013";
src = fetchFromGitHub {
owner = "Napsty";
repo = bName;
rev = version;
sha256 = "19zybcg62dqcinixnp1p8zw916x3w7xvy6dlsmn347iigfa5s55s";
};
dontBuild = true;
doCheck = false;
installPhase = ''
runHook preInstall
install -Dm755 -t $out/bin ${bName}.py
install -Dm644 -t $out/share/doc/${pName} README.md
runHook postInstall
'';
propagatedBuildInputs = with python2Packages; [ pywbem ];
meta = with stdenv.lib; {
homepage = https://www.claudiokuenzler.com/nagios-plugins/;
license = licenses.gpl2;
maintainer = with maintainers; [ peterhoeg ];
};
}

72
pkgs/servers/monitoring/plugins/labs_consol_de.nix Normal file
View file

@ -0,0 +1,72 @@
{ stdenv, fetchFromGitHub, buildPerlPackage, autoreconfHook, makeWrapper
, perl, NetSNMP, coreutils, gnused, gnugrep }:
let
owner = "lausser";
glplugin = fetchFromGitHub {
repo = "GLPlugin";
rev = "b92a261ca4bf84e5b20d3025cc9a31ade03c474b";
sha256 = "0kflnmpjmklq8fy2vf2h8qyvaiznymdi09z2h5qscrfi51xc9gmh";
inherit owner;
};
generic = { pname, version, rev, sha256, description, ... } @ attrs:
let
attrs' = builtins.removeAttrs attrs [ "pname" "version" "rev" "sha256"];
in perl.stdenv.mkDerivation rec {
name = stdenv.lib.replaceStrings [ "-" ] [ "_" ] "${pname}-${version}";
src = fetchFromGitHub {
repo = pname;
inherit owner rev sha256;
};
buildInputs = [ perl NetSNMP ];
nativeBuildInputs = [ autoreconfHook makeWrapper ];
prePatch = with stdenv.lib; ''
ln -s ${glplugin}/* GLPlugin
substituteInPlace plugins-scripts/Makefile.am \
--replace /bin/cat ${getBin coreutils}/bin/cat \
--replace /bin/echo ${getBin coreutils}/bin/echo \
--replace /bin/grep ${getBin gnugrep}/bin/grep \
--replace /bin/sed ${getBin gnused}/bin/sed
'';
postInstall = ''
test -d $out/libexec && ln -sr $out/libexec $out/bin
'';
postFixup = ''
for f in $out/bin/* ; do
wrapProgram $f --prefix PERL5LIB : $PERL5LIB
done
'';
meta = with stdenv.lib; {
homepage = https://labs.consol.de/;
license = licenses.gpl2;
maintainer = with maintainers; [ peterhoeg ];
inherit description;
};
};
in {
check-nwc-health = generic {
pname = "check_nwc_health";
version = "20170804";
rev = "e959b412b5cf027c82a446668e026214fdcf8df3";
sha256 = "11l74xw62g15rqrbf9ff2bfd5iw159gwhhgbkxwdqi8sp9j6navk";
description = "Check plugin for network equipment.";
};
check-ups-health = generic {
pname = "check_ups_health";
version = "20170804";
rev = "32a8a359ea46ec0d6f3b7aea19ddedaad63b04b9";
sha256 = "05na48dxfxrg0i9185j1ck2795p0rw1zwcs8ra0f14cm0qw0lp4l";
description = "Check plugin for UPSs.";
};
}

4
pkgs/stdenv/linux/make-bootstrap-tools.nix
View file

@ -21,8 +21,8 @@ rec {
enableMinimal = true;
extraConfig = ''
CONFIG_ASH y
CONFIG_ASH_BUILTIN_ECHO y
CONFIG_ASH_BUILTIN_TEST y
CONFIG_ASH_ECHO y
CONFIG_ASH_TEST y
CONFIG_ASH_OPTIMIZE_FOR_SIZE y
CONFIG_MKDIR y
CONFIG_TAR y

4
pkgs/tools/graphics/maim/default.nix
View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "maim-${version}";
version = "5.4.67";
version = "5.4.68";
src = fetchFromGitHub {
owner = "naelstrof";
repo = "maim";
rev = "v${version}";
sha256 = "1p72pkfnzhxxmlnryjyvgr6cgjm5ww10xr35si9mx9s4b9pz38jd";
sha256 = "12jvfxzfhh6cbk6ygliwnkvm3mb7rca60k6x9qdzm17jsz65xhh0";
};
nativeBuildInputs = [ cmake pkgconfig ];

6
pkgs/tools/graphics/optipng/default.nix
View file

@ -17,6 +17,12 @@ stdenv.mkDerivation rec {
buildInputs = [ libpng ];
LDFLAGS = optional static "-static";
# Workaround for crash in cexcept.h. See
# https://github.com/NixOS/nixpkgs/issues/28106
preConfigure = ''
export LD=$CC
'';
configureFlags = [
"--with-system-zlib"
"--with-system-libpng"

23
pkgs/tools/misc/direnv/default.nix
View file

@ -1,26 +1,32 @@
{ stdenv, fetchFromGitHub, go, bash, writeText}:
{ stdenv, fetchFromGitHub, buildGoPackage, bash, writeText}:
stdenv.mkDerivation rec {
buildGoPackage rec {
name = "direnv-${version}";
version = "2.10.0";
version = "2.12.2";
goPackagePath = "github.com/direnv/direnv";
src = fetchFromGitHub {
owner = "direnv";
repo = "direnv";
rev = "v${version}";
sha256 = "04b098i8dlr6frks67ik0kbc281c6j8lkb6v0y33iwqv45n233q3";
sha256 = "0i8fnxhcl1zin714wxk93x8fi36z4fibapfn4jl3qkwbczkj8c8b";
};
buildInputs = [ go ];
postConfigure = ''
cd $NIX_BUILD_TOP/go/src/$goPackagePath
'';
buildPhase = ''
make BASH_PATH=${bash}/bin/bash
'';
installPhase = ''
make install DESTDIR=$out
mkdir -p $out/share/fish/vendor_conf.d
echo "eval ($out/bin/direnv hook fish)" > $out/share/fish/vendor_conf.d/direnv.fish
mkdir -p $out
make install DESTDIR=$bin
mkdir -p $bin/share/fish/vendor_conf.d
echo "eval ($bin/bin/direnv hook fish)" > $bin/share/fish/vendor_conf.d/direnv.fish
'' + stdenv.lib.optionalString (stdenv.isDarwin) ''
install_name_tool -delete_rpath $out/lib $bin/bin/direnv
'';
meta = with stdenv.lib; {
@ -39,6 +45,5 @@ stdenv.mkDerivation rec {
homepage = http://direnv.net;
license = licenses.mit;
maintainers = with maintainers; [ zimbatm ];
inherit (go.meta) platforms;
};
}

27
pkgs/tools/misc/fontforge/default.nix
View file

@ -9,22 +9,28 @@
stdenv.mkDerivation rec {
name = "fontforge-${version}";
version = "20160404";
version = "20170730";
src = fetchFromGitHub {
owner = "fontforge";
repo = "fontforge";
rev = version;
sha256 = "15nacq84n9gvlzp3slpmfrrbh57kfb6lbdlc46i7aqgci4qv6fg0";
sha256 = "15k6x97383p8l40jvcivalhwgbbcdg5vciyjz6m9r0lrlnjqkv99";
};
patches = [(fetchpatch {
name = "use-system-uthash.patch";
url = "http://pkgs.fedoraproject.org/cgit/fontforge.git/plain/"
+ "fontforge-20140813-use-system-uthash.patch?id=8bdf933";
sha256 = "0n8i62qv2ygfii535rzp09vvjx4qf9zp5qq7qirrbzm1l9gykcjy";
})];
patchFlags = "-p0";
patches = [ ./fontforge-20140813-use-system-uthash.patch ];
# use $SOURCE_DATE_EPOCH instead of non-determenistic timestamps
postPatch = ''
find . -type f -name '*.c' -exec sed -r -i 's#\btime\(&(.+)\)#if (getenv("SOURCE_DATE_EPOCH")) \1=atol(getenv("SOURCE_DATE_EPOCH")); else &#g' {} \;
sed -r -i 's#author\s*!=\s*NULL#& \&\& !getenv("SOURCE_DATE_EPOCH")#g' fontforge/cvexport.c fontforge/dumppfa.c fontforge/print.c fontforge/svg.c fontforge/splineutil2.c
sed -r -i 's#\bb.st_mtime#getenv("SOURCE_DATE_EPOCH") ? atol(getenv("SOURCE_DATE_EPOCH")) : &#g' fontforge/parsepfa.c fontforge/sfd.c fontforge/svg.c
sed -r -i 's#^\s*ttf_fftm_dump#if (!getenv("SOURCE_DATE_EPOCH")) ttf_fftm_dump#g' fontforge/tottf.c
sed -r -i 's#sprintf\(.+ author \);#if (!getenv("SOURCE_DATE_EPOCH")) &#g' fontforgeexe/fontinfo.c
'';
# do not use x87's 80-bit arithmetic, rouding errors result in very different font binaries
NIX_CFLAGS_COMPILE = lib.optionals stdenv.isi686 [ "-msse2" "-mfpmath=sse" ];
buildInputs = [
autoconf automake gnum4 libtool perl pkgconfig gettext uthash
@ -41,6 +47,9 @@ stdenv.mkDerivation rec {
# work-around: git isn't really used, but configuration fails without it
preConfigure = ''
# The way $version propagates to $version of .pe-scripts (https://github.com/dejavu-fonts/dejavu-fonts/blob/358190f/scripts/generate.pe#L19)
export SOURCE_DATE_EPOCH=$(date -d ${version} +%s)
export GIT="$(type -P true)"
cp -r "${gnulib}" ./gnulib
chmod +w -R ./gnulib

30
pkgs/tools/misc/fontforge/fontforge-20140813-use-system-uthash.patch Normal file
View file

@ -0,0 +1,30 @@
--- a/Makefile.am.old 2014-08-12 10:07:32.000000000 +0530
+++ b/Makefile.am 2014-09-08 16:23:56.046996941 +0530
@@ -43,7 +43,6 @@
AM_CPPFLAGS =
AM_LDFLAGS =
-BUILT_SOURCES = uthash/src
EXTRA_DIST =
CLEANFILES =
MOSTLYCLEANFILES =
@@ -113,7 +112,6 @@
Packaging/FontForge-doc.spec \
Packaging/FontForge.spec \
Packaging/FontForge.static.spec \
- uthash/src \
$(NULL)
#--------------------------------------------------------------------------
@@ -129,11 +127,6 @@
#--------------------------------------------------------------------------
-uthash/src:
- if [ ! -e uthash/src ]; then \
- if [ -e uthash ] ; then rm -r uthash ; fi ; \
- git clone https://github.com/troydhanson/uthash ; \
- fi ;
# We import a selection of targets from Frank's standard packaging Makefile.

16
pkgs/tools/misc/fontforge/fontforge-fonttools.nix
View file

@ -1,7 +1,15 @@
{stdenv, fontforge, zlib}:
{stdenv, fetchFromGitHub, zlib}:
stdenv.mkDerivation rec {
name = "fontforge-fonttools-${fontforge.version}";
src = fontforge.src;
version = "20160404";
name = "fontforge-fonttools-${version}";
src = fetchFromGitHub {
owner = "fontforge";
repo = "fontforge";
rev = version;
sha256 = "15nacq84n9gvlzp3slpmfrrbh57kfb6lbdlc46i7aqgci4qv6fg0";
};
buildInputs = [zlib];
@ -17,7 +25,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = ''Small font tools shipped in FontForge contrib'';
license = fontforge.meta.license;
license = licenses.bsd3;
maintainers = with maintainers; [ raskin ];
platforms = with platforms; unix;
};

4
pkgs/tools/networking/http-prompt/default.nix
View file

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, pythonPackages, httpie }:
pythonPackages.buildPythonApplication rec {
version = "0.9.1";
version = "0.10.2";
name = "http-prompt";
src = fetchFromGitHub {
rev = "v${version}";
repo = "http-prompt";
owner = "eliangcs";
sha256 = "0s2syjjz5n7256a4hn8gv3xfr0zd3qqimf4w8l188dbfvx8b8s06";
sha256 = "0c03n1ll61zd4f60kzih3skl0hspck5hhpcf74h5l6v5as7qdbi2";
};
propagatedBuildInputs = with pythonPackages; [

4
pkgs/tools/networking/keepalived/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "keepalived-${version}";
version = "1.3.5";
version = "1.3.6";
src = fetchFromGitHub {
owner = "acassen";
repo = "keepalived";
rev = "v${version}";
sha256 = "0lbzbw5giddr4rrhppdpsswh88x86ywxrl01vm8z5am7acixn1zr";
sha256 = "05088vv510dlflzyg8sh8l8qfscnvxl6n6pw9ycp27zhb6r5cr5y";
};
buildInputs = [

4
pkgs/tools/package-management/dpkg/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "dpkg-${version}";
version = "1.18.18";
version = "1.18.24";
src = fetchurl {
url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz";
sha256 = "1xbgjdazcxb9iqrz6jcmy8qwgwggvf6rws2265sh01b6skin32y8";
sha256 = "1d6p22vk1b9v16q96mwaz9w2xr4ly28yamkh49md9gq67qfhhlyq";
};
configureFlags = [

4
pkgs/tools/security/keybase/default.nix
View file

@ -2,7 +2,7 @@
buildGoPackage rec {
name = "keybase-${version}";
version = "1.0.22";
version = "1.0.27";
goPackagePath = "github.com/keybase/client";
subPackages = [ "go/keybase" ];
@ -13,7 +13,7 @@ buildGoPackage rec {
owner = "keybase";
repo = "client";
rev = "v${version}";
sha256 = "1642d11gjgkdklppmm1j3vwc2r3qg9qqw5x07jnqs819i57mr47f";
sha256 = "0s68awgaq32hl5rvcrnhn9i98dwh23kws0l4czcghyn6imx8h89i";
};
buildFlags = [ "-tags production" ];

6
pkgs/tools/system/das_watchdog/default.nix
View file

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "das_watchdog-${version}";
version = "git-2015-04-02";
version = "git-2015-09-12";
src = fetchgit {
url = "https://github.com/kmatheussen/das_watchdog.git";
rev = "1c203d9a55455c4670c164f945ea2dd9fd197ba9";
sha256 = "c817491d67d31297dcd6177b9c33b5c3977c1c383eac588026631dd6961ba6bf";
rev = "5ac0db0b98e5b4e690aca0aa7fb6ec60ceddcb06";
sha256 = "02y1vfb3wh4908xjj1kpyf8kgxk29x8dw7yl3pnl220qz2gi99vr";
};
buildInputs = [ libgtop xmessage which pkgconfig ];

38
pkgs/top-level/all-packages.nix
View file

@ -5541,7 +5541,8 @@ with pkgs;
sha256 = "1r0rqbnw7rf94f5bsa3gi8bick4xb7qnp1dkvdjfbvqjvysvc44r";
ncurses = pkgsi686Linux.ncurses5;
};
gcc-arm-embedded = gcc-arm-embedded-5;
gcc-arm-embedded-6 = callPackage ../development/compilers/gcc-arm-embedded/6 {};
gcc-arm-embedded = gcc-arm-embedded-6;
gforth = callPackage ../development/compilers/gforth {};
@ -6417,6 +6418,8 @@ with pkgs;
rascal = callPackage ../development/interpreters/rascal { };
red = callPackage ../development/interpreters/red { };
regina = callPackage ../development/interpreters/regina { };
inherit (ocamlPackages) reason;
@ -9650,7 +9653,7 @@ with pkgs;
opencollada = callPackage ../development/libraries/opencollada { };
opencore-amr = callPackage ../development/libraries/opencore-amr { };
opencsg = callPackage ../development/libraries/opencsg { };
openct = callPackage ../development/libraries/openct { };
@ -11361,12 +11364,19 @@ with pkgs;
munin = callPackage ../servers/monitoring/munin { };
nagiosPluginsOfficial = callPackage ../servers/monitoring/nagios/plugins/official-2.x.nix { };
monitoring-plugins = callPackage ../servers/monitoring/plugins { };
nagiosPluginsOfficial = monitoring-plugins;
inherit (callPackage ../servers/monitoring/plugins/labs_consol_de.nix { inherit (perlPackages) NetSNMP; })
check-nwc-health
check-ups-health;
checkSSLCert = callPackage ../servers/monitoring/nagios/plugins/check_ssl_cert.nix { };
neo4j = callPackage ../servers/nosql/neo4j { };
check-esxi-hardware = callPackage ../servers/monitoring/plugins/esxi.nix {};
net_snmp = callPackage ../servers/monitoring/net-snmp {
# https://sourceforge.net/p/net-snmp/bugs/2712/
# remove after net-snmp > 5.7.3
@ -12006,17 +12016,7 @@ with pkgs;
linuxHeaders_4_4 = callPackage ../os-specific/linux/kernel-headers/4.4.nix {
cross = if targetPlatform != hostPlatform then targetPlatform else null;
};
# We can choose:
linuxHeaders =
if targetPlatform != hostPlatform
then
{ # switch
"4.4" = linuxHeaders_4_4;
}.${targetPlatform.platform.kernelMajor}
or (throw "Unknown linux kernel version")
else
linuxHeaders_4_4;
linuxHeaders = linuxHeaders_4_4;
kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { };
@ -13278,6 +13278,8 @@ with pkgs;
tcl = tcl-8_5;
};
msgviewer = callPackage ../applications/networking/mailreaders/msgviewer { };
amarok = kde4.callPackage ../applications/audio/amarok {
ffmpeg = ffmpeg_2;
};
@ -14478,6 +14480,8 @@ with pkgs;
graphicsmagick = callPackage ../applications/graphics/graphicsmagick { };
graphicsmagick_q16 = callPackage ../applications/graphics/graphicsmagick { quantumdepth = 16; };
grisbi = callPackage ../applications/office/grisbi { gtk = gtk2; };
gtkpod = callPackage ../applications/audio/gtkpod {
gnome = gnome3;
inherit (gnome2) libglade;
@ -15893,6 +15897,7 @@ with pkgs;
rxvt_unicode-with-plugins = callPackage ../applications/misc/rxvt_unicode/wrapper.nix {
plugins = [
urxvt_autocomplete_all_the_things
urxvt_perl
urxvt_perls
urxvt_tabbedex
@ -15903,6 +15908,7 @@ with pkgs;
};
# urxvt plugins
urxvt_autocomplete_all_the_things = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things { };
urxvt_perl = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-perl { };
urxvt_perls = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-perls { };
urxvt_tabbedex = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-tabbedex { };
@ -16190,6 +16196,8 @@ with pkgs;
syncthing-inotify = callPackage ../applications/networking/syncthing/inotify.nix { };
syncthing-tray = callPackage ../applications/misc/syncthing-tray { };
# linux only by now
synergy = callPackage ../applications/misc/synergy { };

32
pkgs/top-level/perl-packages.nix
View file

@ -946,15 +946,15 @@ let self = _self // overrides; _self = with self; {
};
};
Carp = buildPerlPackage {
name = "Carp-1.36";
Carp = buildPerlPackage rec {
name = "Carp-1.38";
src = fetchurl {
url = mirror://cpan/authors/id/R/RJ/RJBS/Carp-1.36.tar.gz;
sha256 = "dcc789935126461c80df0653f98c1d8d0b936dcc3d04174287cb02767eca123c";
url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
sha256 = "00bijwwc0ix27h2ma3lvsf3b56biar96bl9dikxgx7cmpcycxad5";
};
meta = {
meta = with stdenv.lib; {
description = "Alternative warn and die for modules";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
license = with licenses; [ artistic1 gpl1Plus ];
};
};
@ -4667,6 +4667,26 @@ let self = _self // overrides; _self = with self; {
};
};
EmailOutlookMessage = buildPerlPackage rec {
name = "Email-Outlook-Message-${version}";
version = "0.918";
src = fetchurl {
url = "mirror://cpan/authors/id/M/MV/MVZ/${name}.tar.gz";
sha256 = "1w1s858xzp3vbi91qa01qnmk4n78fmvl4a7axrx2r15vr3s2k2pv";
};
propagatedBuildInputs = [
Carp Encode EmailMIME EmailMIMEContentType EmailSender
EmailSimple GetoptLong IOString OLEStorage_Lite PodUsage
];
buildInputs = [ TestMore IOAll ];
meta = with stdenv.lib; {
homepage = http://www.matijs.net/software/msgconv/;
description = "A .MSG to mbox converter";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = with maintainers; [ peterhoeg ];
};
};
EmailSender = buildPerlPackage rec {
name = "Email-Sender-1.300028";
src = fetchurl {

4
pkgs/top-level/python-packages.nix
View file

@ -8357,6 +8357,7 @@ in {
};
};
hyperlink = callPackage ../development/python-modules/hyperlink {};
zope_copy = buildPythonPackage rec {
name = "zope.copy-4.0.2";
@ -28589,6 +28590,9 @@ EOF
};
};
# We need "normal" libxml2 and not the python package by the same name.
pywbem = callPackage ../development/python-modules/pywbem { libxml2 = pkgs.libxml2; };
unicorn = buildPythonPackage rec {
name = "unicorn-${version}";
version = "1.0.1";

18
pkgs/top-level/release.nix
View file

@ -108,24 +108,6 @@ let
#rPackages = packagePlatforms pkgs.rPackages;
ocamlPackages = { };
perlPackages = { };
pythonPackages = {
blaze = unix;
pandas = unix;
scikitlearn = unix;
};
python2Packages = { };
python27Packages = { };
python3Packages = { };
python35Packages = {
blaze = unix;
pandas = unix;
scikitlearn = unix;
};
python36Packages = {
blaze = unix;
pandas = unix;
scikitlearn = unix;
};
# hack around broken eval of non-linux packages for now.
tests.macOSSierraShared = darwin;