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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Vladimír Čunát 2018-05-20 13:20:53 +02:00
commit 392e6de7d0
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
82 changed files with 5170 additions and 2247 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maintainers/maintainer-list.nix
View File

@ -1997,6 +1997,11 @@
github = "kini";
name = "Keshav Kini";
};
kirelagin = {
email = "kirelagin@gmail.com";
github = "kirelagin";
name = "Kirill Elagin";
};
kkallio = {
email = "tierpluspluslists@gmail.com";
name = "Karn Kallio";

3
nixos/modules/services/networking/cjdns.nix
View File

@ -260,7 +260,8 @@ in
RestartSec = 1;
CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW CAP_SETUID";
ProtectSystem = true;
MemoryDenyWriteExecute = true;
# Doesn't work on i686, causing service to fail
MemoryDenyWriteExecute = !pkgs.stdenv.isi686;
ProtectHome = true;
PrivateTmp = true;
};

4
nixos/modules/services/networking/dnscrypt-proxy.nix
View File

@ -192,6 +192,7 @@ in
security.apparmor.profiles = singleton (pkgs.writeText "apparmor-dnscrypt-proxy" ''
${pkgs.dnscrypt-proxy}/bin/dnscrypt-proxy {
/dev/null rw,
/dev/random r,
/dev/urandom r,
/etc/passwd r,
@ -211,6 +212,9 @@ in
${getLib pkgs.gcc.cc}/lib/libssp.so.* mr,
${getLib pkgs.libsodium}/lib/libsodium.so.* mr,
${getLib pkgs.systemd}/lib/libsystemd.so.* mr,
${getLib pkgs.utillinuxMinimal.out}/lib/libmount.so.* mr,
${getLib pkgs.utillinuxMinimal.out}/lib/libblkid.so.* mr,
${getLib pkgs.utillinuxMinimal.out}/lib/libuuid.so.* mr,
${getLib pkgs.xz}/lib/liblzma.so.* mr,
${getLib pkgs.libgcrypt}/lib/libgcrypt.so.* mr,
${getLib pkgs.libgpgerror}/lib/libgpg-error.so.* mr,

4
nixos/modules/services/networking/wireguard.nix
View File

@ -193,7 +193,7 @@ let
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
environment.DEVICE = name;
path = with pkgs; [ kmod iproute wireguard ];
path = with pkgs; [ kmod iproute wireguard-tools ];
serviceConfig = {
Type = "oneshot";
@ -279,7 +279,7 @@ in
config = mkIf (cfg.interfaces != {}) {
boot.extraModulePackages = [ kernel.wireguard ];
environment.systemPackages = [ pkgs.wireguard ];
environment.systemPackages = [ pkgs.wireguard-tools ];
systemd.services = mapAttrs' generateUnit cfg.interfaces;

3
nixos/tests/dnscrypt-proxy.nix
View File

@ -26,7 +26,8 @@ import ./make-test.nix ({ pkgs, ... }: {
$client->waitForUnit("dnsmasq");
# The daemon is socket activated; sending a single ping should activate it.
$client->fail("systemctl is-active dnscrypt-proxy");
$client->execute("${pkgs.iputils}/bin/ping -c1 example.com");
$client->succeed("systemctl is-active dnscrypt-proxy");
$client->waitUntilSucceeds("systemctl is-active dnscrypt-proxy");
'';
})

4
pkgs/applications/editors/vim/common.nix
View File

@ -1,12 +1,12 @@
{ lib, fetchFromGitHub }:
rec {
version = "8.0.1655";
version = "8.1.0001";
src = fetchFromGitHub {
owner = "vim";
repo = "vim";
rev = "v${version}";
sha256 = "1c6raqjaxgsjazn4l7wqg2cscd5i4bz9m2g2xhn9ba1injs7mps1";
sha256 = "056h9cyysyh6hqsr1s9xg94la554f56lwnpk87g013xmqf37bna6";
};
enableParallelBuilding = true;

2
pkgs/applications/kde/default.nix
View File

@ -127,6 +127,7 @@ let
konsole = callPackage ./konsole.nix {};
kontact = callPackage ./kontact.nix {};
kontactinterface = callPackage ./kontactinterface.nix {};
konquest = callPackage ./konquest.nix {};
korganizer = callPackage ./korganizer.nix {};
kpimtextedit = callPackage ./kpimtextedit.nix {};
ksmtp = callPackage ./ksmtp {};
@ -140,6 +141,7 @@ let
libgravatar = callPackage ./libgravatar.nix {};
libkcddb = callPackage ./libkcddb.nix {};
libkdcraw = callPackage ./libkdcraw.nix {};
libkdegames = callPackage ./libkdegames.nix {};
libkdepim = callPackage ./libkdepim.nix {};
libkexiv2 = callPackage ./libkexiv2.nix {};
libkgapi = callPackage ./libkgapi.nix {};

18
pkgs/applications/kde/konquest.nix Normal file
View File

@ -0,0 +1,18 @@
{ lib
, mkDerivation
, extra-cmake-modules
, kdoctools
, kdelibs4support
, libkdegames
, qtquickcontrols
}:
mkDerivation {
name = "konquest";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kdelibs4support libkdegames qtquickcontrols ];
meta = {
license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ lheckemann ];
};
}

26
pkgs/applications/kde/libkdegames.nix Normal file
View File

@ -0,0 +1,26 @@
{ lib
, mkDerivation
, extra-cmake-modules
, kdoctools
, kdelibs4support
, qtdeclarative
, kdeclarative
, kdnssd
, knewstuff
, openal
, libsndfile
, qtquickcontrols
}:
mkDerivation {
name = "libkdegames";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kdelibs4support qtdeclarative kdeclarative kdnssd knewstuff openal libsndfile
qtquickcontrols
];
meta = {
license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ lheckemann ];
};
}

39
pkgs/applications/misc/alacritty/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv,
lib,
fetchgit,
rustPlatform,
cmake,
@ -14,7 +15,15 @@
libXi,
libXrandr,
libGL,
xclip }:
xclip,
# Darwin Frameworks
AppKit,
CoreFoundation,
CoreGraphics,
CoreServices,
CoreText,
Foundation,
OpenGL }:
with rustPlatform;
@ -30,20 +39,29 @@ let
libGL
libXi
];
darwinFrameworks = [
AppKit
CoreFoundation
CoreGraphics
CoreServices
CoreText
Foundation
OpenGL
];
in buildRustPackage rec {
name = "alacritty-unstable-${version}";
version = "2018-04-16";
version = "2018-05-09";
# At the moment we cannot handle git dependencies in buildRustPackage.
# This fork only replaces rust-fontconfig/libfontconfig with a git submodules.
src = fetchgit {
url = https://github.com/Mic92/alacritty.git;
rev = "rev-${version}";
sha256 = "14qsfaij631pk0gxrhmp594f72v0z7kzymf4hnqv4k5w9xlxciwx";
sha256 = "0mgi4niy40zz80k2ammbzdw9d8flvfkwlxkjnbpwrrldd0sj8dlz";
fetchSubmodules = true;
};
cargoSha256 = "0gg28fbx0kisv7hqxgzqhv4z4ikk074djfjlj90nmmi4nddp017p";
cargoSha256 = "0d6bqfnwqfxqllrf00p1djlxdvnhrahgnyqv842qjn94j3wf0fym";
nativeBuildInputs = [
cmake
@ -51,20 +69,28 @@ in buildRustPackage rec {
pkgconfig
];
buildInputs = rpathLibs;
buildInputs = rpathLibs
++ lib.optionals stdenv.isDarwin darwinFrameworks;
postPatch = ''
substituteInPlace copypasta/src/x11.rs \
--replace Command::new\(\"xclip\"\) Command::new\(\"${xclip}/bin/xclip\"\)
'';
postBuild = lib.optionalString stdenv.isDarwin "make app";
installPhase = ''
runHook preInstall
install -D target/release/alacritty $out/bin/alacritty
patchelf --set-rpath "${stdenv.lib.makeLibraryPath rpathLibs}" $out/bin/alacritty
'' + (if stdenv.isDarwin then ''
mkdir $out/Applications
cp -r target/release/osx/Alacritty.app $out/Applications/Alacritty.app
'' else ''
install -D Alacritty.desktop $out/share/applications/alacritty.desktop
patchelf --set-rpath "${stdenv.lib.makeLibraryPath rpathLibs}" $out/bin/alacritty
'') + ''
runHook postInstall
'';
@ -76,6 +102,5 @@ in buildRustPackage rec {
homepage = https://github.com/jwilm/alacritty;
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ mic92 ];
platforms = platforms.linux;
};
}

2
pkgs/applications/misc/gv/default.nix
View File

@ -19,8 +19,8 @@ stdenv.mkDerivation {
Xaw3d
ghostscriptX
perl
] ++ stdenv.lib.optionals stdenv.isDarwin [
pkgconfig
] ++ stdenv.lib.optionals stdenv.isDarwin [
libiconv
];

6
pkgs/applications/misc/jekyll/basic/Gemfile.lock
View File

@ -13,17 +13,17 @@ GEM
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
eventmachine (1.2.6)
eventmachine (1.2.7)
ffi (1.9.23)
forwardable-extended (2.6.0)
gemoji (3.0.0)
html-pipeline (2.7.2)
html-pipeline (2.8.0)
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.6.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jekyll (3.8.1)
jekyll (3.8.2)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)

12
pkgs/applications/misc/jekyll/basic/gemset.nix
View File

@ -45,10 +45,10 @@
eventmachine = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "08477hl609rmmngwfy8dmsqz5zvsg8xrsrrk6xi70jf48majwli0";
sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r";
type = "gem";
};
version = "1.2.6";
version = "1.2.7";
};
ffi = {
source = {
@ -78,10 +78,10 @@
dependencies = ["activesupport" "nokogiri"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fdnxi9lh88vjndk4g94pwa45awbzklqc9b38nhqqb3sxg6my6zp";
sha256 = "07m365sbabwxf4ad29ykgxrln68ma7va0hqqspv26s7yg8pdgixf";
type = "gem";
};
version = "2.7.2";
version = "2.8.0";
};
"http_parser.rb" = {
source = {
@ -104,10 +104,10 @@
dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01s1r5pjfdvk5r1pz3j4smz42jsfv5vvp4q7fg0mrzxn9xk2nvi6";
sha256 = "1cp1iijcf4w2i7lzfbszpv2in9fcxm23fv0znghkm934rxrw55g8";
type = "gem";
};
version = "3.8.1";
version = "3.8.2";
};
jekyll-avatar = {
dependencies = ["jekyll"];

12
pkgs/applications/misc/jekyll/full/Gemfile.lock
View File

@ -20,21 +20,21 @@ GEM
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
eventmachine (1.2.6)
eventmachine (1.2.7)
execjs (2.7.0)
faraday (0.15.0)
faraday (0.15.1)
multipart-post (>= 1.2, < 3)
fast-stemmer (1.0.2)
ffi (1.9.23)
forwardable-extended (2.6.0)
gemoji (3.0.0)
html-pipeline (2.7.2)
html-pipeline (2.8.0)
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.6.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jekyll (3.8.1)
jekyll (3.8.2)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
@ -92,7 +92,7 @@ GEM
multipart-post (2.0.0)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
octokit (4.8.0)
octokit (4.9.0)
sawyer (~> 0.8.0, >= 0.5.3)
pathutil (0.16.1)
forwardable-extended (~> 2.6)
@ -103,7 +103,7 @@ GEM
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rdiscount (2.2.0.1)
rdoc (6.0.3)
rdoc (6.0.4)
redcarpet (3.4.0)
rouge (3.1.1)
ruby_dep (1.5.0)

24
pkgs/applications/misc/jekyll/full/gemset.nix
View File

@ -79,10 +79,10 @@
eventmachine = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "08477hl609rmmngwfy8dmsqz5zvsg8xrsrrk6xi70jf48majwli0";
sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r";
type = "gem";
};
version = "1.2.6";
version = "1.2.7";
};
execjs = {
source = {
@ -96,10 +96,10 @@
dependencies = ["multipart-post"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1dv1vcxxyw4vy0r2diiml0r8zqk1csrksfxv8nkrw61xlf2daaaa";
sha256 = "0q3z6mm6ym11jrzi1hqcwi0mkydb5m980g8is6ggkcxrinmx2nxx";
type = "gem";
};
version = "0.15.0";
version = "0.15.1";
};
fast-stemmer = {
source = {
@ -137,10 +137,10 @@
dependencies = ["activesupport" "nokogiri"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fdnxi9lh88vjndk4g94pwa45awbzklqc9b38nhqqb3sxg6my6zp";
sha256 = "07m365sbabwxf4ad29ykgxrln68ma7va0hqqspv26s7yg8pdgixf";
type = "gem";
};
version = "2.7.2";
version = "2.8.0";
};
"http_parser.rb" = {
source = {
@ -163,10 +163,10 @@
dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01s1r5pjfdvk5r1pz3j4smz42jsfv5vvp4q7fg0mrzxn9xk2nvi6";
sha256 = "1cp1iijcf4w2i7lzfbszpv2in9fcxm23fv0znghkm934rxrw55g8";
type = "gem";
};
version = "3.8.1";
version = "3.8.2";
};
jekyll-avatar = {
dependencies = ["jekyll"];
@ -379,10 +379,10 @@
dependencies = ["sawyer"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hp77svmpxcwnfajb324i1g2b7jazg23fn4ccjr5y3lww0rnj1dg";
sha256 = "1ssn5iyax07a22mvmj0y45bfy8ali129bl1qmasp6bcg03bvk298";
type = "gem";
};
version = "4.8.0";
version = "4.9.0";
};
pathutil = {
dependencies = ["forwardable-extended"];
@ -438,10 +438,10 @@
rdoc = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ia6gq4fnwkm29j34yncg74w0nq5iyyrcjjhmkwzmzw9dbs0zy8a";
sha256 = "0anv42cqcdc6g4n386mrva7mgav5i0c2ry3yzvzzc6z6hymkmcr7";
type = "gem";
};
version = "6.0.3";
version = "6.0.4";
};
redcarpet = {
source = {

786
pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
View File

File diff suppressed because it is too large Load Diff

786
pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
View File

File diff suppressed because it is too large Load Diff

4
pkgs/applications/networking/cluster/minikube/default.nix
View File

@ -23,7 +23,7 @@ let
in buildGoPackage rec {
pname = "minikube";
name = "${pname}-${version}";
version = "0.26.0";
version = "0.27.0";
goPackagePath = "k8s.io/minikube";
@ -31,7 +31,7 @@ in buildGoPackage rec {
owner = "kubernetes";
repo = "minikube";
rev = "v${version}";
sha256 = "1wc2gvmgb59yh0ldm2plvh6s8mvxvysrxp6w75z16ii86jmi3wr6";
sha256 = "00gj8x5p0vxwy0y0g5nnddmq049h7zxvhb73lb4gii5mghr9mkws";
};
patches = [

2
pkgs/applications/networking/cluster/openshift/default.nix
View File

@ -69,6 +69,8 @@ in stdenv.mkDerivation rec {
installPhase = ''
mkdir -p "$out/bin"
cp -a "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$out/bin/"
install -D -t "$out/etc/bash_completion.d" contrib/completions/bash/*
install -D -t "$out/share/zsh/site-functions" contrib/completions/zsh/*
'';
preFixup = ''

4
pkgs/applications/networking/instant-messengers/riot/riot-web.nix
View File

@ -3,11 +3,11 @@
let configFile = writeText "riot-config.json" conf; in
stdenv.mkDerivation rec {
name= "riot-web-${version}";
version = "0.14.2";
version = "0.15.3";
src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
sha256 = "1qma49a6lvr9anrry3vbhjhvy06bgapknnvbdljnbb3l9c99nmxi";
sha256 = "0vh2zjg0vaczh5mfyykb2kk9d8mi07dkr8zy60bpqf0y1lfamv0a";
};
installPhase = ''

4
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View File

@ -14,7 +14,7 @@ in {
stable = mkTelegram stableVersion;
preview = mkTelegram (stableVersion // {
stable = false;
version = "1.2.20";
sha256Hash = "00ncpb1qs88jrrmmx7f7l8wy37wbwnrb958x3xls14p1h1xg63l6";
version = "1.2.21";
sha256Hash = "0s7dywyz8p626741m32l4a90l1x01564xg2g10gvdb25s2phdfdl";
});
}

5
pkgs/applications/networking/remote/x2goclient/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "x2goclient-${version}";
version = "4.1.0.0";
version = "4.1.1.1";
src = fetchurl {
url = "http://code.x2go.org/releases/source/x2goclient/${name}.tar.gz";
sha256 = "0sibrj4qppww7mirdixrqrknkyq3g97s64186h88j8k66sy1anab";
sha256 = "0jzlwn0v8b123h5l7hrhs35x2z6mb98zg1s0shqb4yfp2g641yp3";
};
buildInputs = [ cups libssh libXpm nxproxy openldap openssh qt4 ];
@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
patchPhase = ''
substituteInPlace Makefile \
--replace "SHELL=/bin/bash" "SHELL=$SHELL" \
--replace "lrelease-qt4" "${qt4}/bin/lrelease" \
--replace "qmake-qt4" "${qt4}/bin/qmake" \
--replace "-o root -g root" ""

4
pkgs/applications/version-management/git-and-tools/default.nix
View File

@ -67,7 +67,9 @@ rec {
git-crypt = callPackage ./git-crypt { };
git-dit = callPackage ./git-dit { };
git-dit = callPackage ./git-dit {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
};
git-extras = callPackage ./git-extras { };

9
pkgs/applications/version-management/git-and-tools/git-dit/default.nix
View File

@ -8,6 +8,10 @@
, perl
, pkgconfig
, rustPlatform
, curl
, libiconv
, CoreFoundation
, Security
}:
with rustPlatform;
@ -35,6 +39,11 @@ buildRustPackage rec {
openssl
libssh
zlib
] ++ stdenv.lib.optionals (stdenv.isDarwin) [
curl
libiconv
CoreFoundation
Security
];
meta = with stdenv.lib; {

4
pkgs/applications/video/obs-studio/default.nix
View File

@ -29,13 +29,13 @@ let
optional = stdenv.lib.optional;
in stdenv.mkDerivation rec {
name = "obs-studio-${version}";
version = "21.1.1";
version = "21.1.2";
src = fetchFromGitHub {
owner = "jp9000";
repo = "obs-studio";
rev = "${version}";
sha256 = "11gr4szjypihp0562r23pvkmaln6vjz1z4y4ls34bmc8n9ixrdcv";
sha256 = "1gl6qibvckczk3yl44h3yshml6sn3izwn58qpxils5837rpkwlc5";
};
patches = [ ./find-xcb.patch ];

6
pkgs/build-support/rust/build-rust-crate.nix
View File

@ -47,7 +47,7 @@ let makeDeps = dependencies:
'';
configureCrate =
{ crateName, crateVersion, crateAuthors, build, libName, crateFeatures, colors, libPath, release, buildDependencies, completeDeps, completeBuildDeps, verbose, dependencies, workspace_member }:
{ crateName, crateVersion, crateAuthors, build, libName, crateFeatures, colors, libPath, release, buildDependencies, completeDeps, completeBuildDeps, verbose, dependencies, workspace_member, extraLinkFlags }:
let version_ = lib.splitString "-" crateVersion;
versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1;
version = lib.splitString "." (lib.head version_);
@ -79,6 +79,8 @@ let makeDeps = dependencies:
mkdir -p target/{deps,lib,build,buildDeps}
chmod uga+w target -R
echo ${extraLinkFlags} > target/link
echo ${extraLinkFlags} > target/link.final
for i in ${completeDepsDir}; do
symlink_dependency $i target/deps
done
@ -421,9 +423,11 @@ stdenv.mkDerivation (rec {
if lib.attrByPath ["plugin"] false crate then "dylib" else
(crate.type or "lib");
colors = lib.attrByPath [ "colors" ] "always" crate;
extraLinkFlags = builtins.concatStringsSep " " (crate.extraLinkFlags or []);
configurePhase = configureCrate {
inherit crateName dependencies buildDependencies completeDeps completeBuildDeps
crateFeatures libName build workspace_member release libPath crateVersion
extraLinkFlags
crateAuthors verbose colors;
};
extraRustcOpts = if crate ? extraRustcOpts then crate.extraRustcOpts else [];

5
pkgs/build-support/rust/default-crate-overrides.nix
View File

@ -19,8 +19,9 @@ in
crateBin = [ { name = "cargo-vendor"; path = "src/main.rs"; } ];
};
curl-sys = attrs: {
buildInputs = [ pkgconfig zlib ];
propagatedBuiltInputs = [ curl ];
buildInputs = [ pkgconfig zlib curl ];
propagatedBuildInputs = [ curl zlib ];
extraLinkFlags = ["-L${zlib.out}/lib"];
};
libgit2-sys = attrs: {
LIBGIT2_SYS_USE_PKG_CONFIG = true;

4
pkgs/data/misc/hackage/default.nix
View File

@ -1,6 +1,6 @@
{ fetchurl }:
fetchurl {
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/3a2febcad5a83b15dea74462890e3c48c13f55f1.tar.gz";
sha256 = "1z6mfk49hsxvcpv183wayirspx78xd1l0w42wf8mfyf0jh8grfff";
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/7988bc2977184737900cc54b2dda27af6921f5ee.tar.gz";
sha256 = "1zagnnab5z3zymniw5rrdahlxrfpnyf30iysa1lylgwlscnzfv0l";
}

4
pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
View File

@ -9,13 +9,13 @@
# TODO: ovirt (optional)
let
version = "3.28.3";
version = "3.28.4";
in stdenv.mkDerivation rec {
name = "gnome-boxes-${version}";
src = fetchurl {
url = "mirror://gnome/sources/gnome-boxes/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "05x9c7w60cafcd3bdkr68ra8pbh7m8pciw67871hckaqafw76q1d";
sha256 = "1378zzqdwv0hnirg8k91s5vgkcl1brfild3hgach5jhg78nxdb4j";
};
doCheck = true;

4
pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "gnome-getting-started-docs-${version}";
version = "3.28.1";
version = "3.28.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-getting-started-docs/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "0x60aava6ba4xliy4p4i6jm5d2nq8hx9aqgnaw4d34fvmcpcy5w0";
sha256 = "0vg0b4nr7azj6p5cpd7h7ya5hw6q89gnzig8hvp6swwrwg2p5nif";
};
passthru = {

4
pkgs/desktops/gnome-3/apps/gnome-music/default.nix
View File

@ -6,13 +6,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "gnome-music";
version = "3.28.2";
version = "3.28.2.1";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${pname}-${version}.tar.xz";
sha256 = "0xkbw9cp002vwwq6vlsbkahz9xbwpkyydd9cvh7az379sdlz4rid";
sha256 = "09lvpiqhijiq0kddnfi9rmmw806qh9a03czfhssqczd9fxmmbx5v";
};
nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobjectIntrospection ];

4
pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "gnome-desktop-${version}";
version = "3.28.1";
version = "3.28.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-desktop/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "16nbgrp0hihvrsa6kmqk0z8y7ajravyagmkmq1nnwn27psi9g8vq";
sha256 = "0c439hhpfd9axmv4af6fzhibksh69pnn2nnbghbbqqbwy6zqfl30";
};
passthru = {

4
pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "gnome-disk-utility-${version}";
version = "3.28.1";
version = "3.28.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-disk-utility/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "09dmknfas8iifv6k5jb4a9ag57s8awrn0f26fd1qlg0mbfjlnfd6";
sha256 = "1j3l4b1prbnixzy6srvcsjfg1dx5nqys2lmygm31ygfdq7svp3m6";
};
passthru = {

4
pkgs/desktops/gnome-3/core/gnome-software/default.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "gnome-software-${version}";
version = "3.28.1";
version = "3.28.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-software/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "0j27zygb3g08q9i8ygwpxqf6g0lrivq2vhj7p7g9x0zh9r0vzlbs";
sha256 = "1s19p50nrkvxg4sb7bkn9ccajgaj251y9iz20bkn31ysq19ih03w";
};
patches = [

4
pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "gnome-system-monitor-${version}";
version = "3.28.1";
version = "3.28.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-system-monitor/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "0wdpd5mfrm0gwmwjvcj556c3mpxf3pcfnvh7x698i8if53ci0gw7";
sha256 = "164in885dyfvna5yjzgdyrbrsskvh5wzxdmkjgb4mbh54lzqd1zb";
};
doCheck = true;

4
pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "gnome-user-docs-${version}";
version = "3.28.1";
version = "3.28.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-user-docs/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "189j78d23c6jr5x5j9nxkbdqxg31xvmwvyblz7f9xi9ncy0qdvfh";
sha256 = "0gg1rgg15lbgjdwpwlqazfjv8sm524ys024qsd4n09jlgx21jscd";
};
passthru = {

46
pkgs/development/compilers/gcc/5/libcxx38-and-above.patch
View File

@ -1,46 +0,0 @@
This is a slightly modified version of https://svnweb.freebsd.org/ports/head/lang/gcc5/files/patch-libc%2B%2B?revision=432958&view=co&pathrev=432958,
which doesn't apply cleanly due to them using a slightly different format of patch from us. I just replaced the .orig file references with a/b paths.
--- a/gcc/auto-profile.c 2015-01-18 02:25:42 UTC
+++ b/gcc/auto-profile.c
@@ -19,11 +19,9 @@ along with GCC; see the file COPYING3.
<http://www.gnu.org/licenses/>. */
#include "config.h"
-#include "system.h"
-
-#include <string.h>
#include <map>
#include <set>
+#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
--- a/gcc/graphite-isl-ast-to-gimple.c 2017-01-19 21:02:12 UTC
+++ b/gcc/graphite-isl-ast-to-gimple.c
@@ -38,6 +38,7 @@ extern "C" {
#endif
#endif
+#include <map>
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
@@ -75,7 +76,6 @@ extern "C" {
#include "tree-scalar-evolution.h"
#include "gimple-ssa.h"
#include "tree-into-ssa.h"
-#include <map>
#ifdef HAVE_isl
#include "graphite-poly.h"
--- a/gcc/system.h 2015-01-05 12:33:28 UTC
+++ b/gcc/system.h
@@ -217,6 +217,7 @@ extern int errno;
#ifdef __cplusplus
# include <algorithm>
# include <cstring>
+# include <new>
# include <utility>
#endif

1
pkgs/development/compilers/ghc/7.10.3-binary.nix
View File

@ -65,6 +65,7 @@ stdenv.mkDerivation rec {
# Some scripts used during the build need to have their shebangs patched
''
patchShebangs ghc-${version}/utils/
patchShebangs ghc-${version}/configure
'' +
# Strip is harmful, see also below. It's important that this happens

6
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -82,7 +82,7 @@ self: super: {
name = "git-annex-${drv.version}-src";
url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + drv.version;
sha256 = "05rygb8jm4nh7ggzihz6664hcgwkbqspi8gbpkpf7l7wwvzdm1rd";
sha256 = "1w0gzqk70ymlpvh9zqkg1cd3ipaw4n85k4zsf49xl6kjp4vbcmwj";
};
})).overrideScope (self: super: {
aws = dontCheck (self.aws_0_18);
@ -1036,8 +1036,8 @@ self: super: {
vulkan = super.vulkan.override { vulkan = pkgs.vulkan-loader; };
# Builds only with the latest version of indexed-list-literals.
vector-sized_1_0_1_0 = super.vector-sized_1_0_1_0.override {
indexed-list-literals = self.indexed-list-literals_0_2_0_0;
vector-sized_1_0_2_0 = super.vector-sized_1_0_2_0.override {
indexed-list-literals = self.indexed-list-literals_0_2_1_1;
};
# https://github.com/dmwit/encoding/pull/3

42
pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
View File

@ -73,41 +73,6 @@ self: super: {
doHaddock = false;
});
## Needs bump to a versioned attribute
hspec = overrideCabal super.hspec_2_5_0 (drv: {
## Setup: Encountered missing dependencies:
## hspec-core ==2.4.4, hspec-discover ==2.4.4
##
## error: while evaluating the attribute ‘buildInputs’ of the derivation ‘hspec-2.4.8’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11:
## while evaluating the attribute ‘buildInputs’ of the derivation ‘stringbuilder-0.5.1’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11:
## infinite recursion encountered, at undefined position
## test suite causes an infinite loop
doCheck = false;
});
## Needs bump to a versioned attribute
hspec-core = overrideCabal super.hspec-core_2_5_0 (drv: {
## • No instance for (Semigroup Summary)
## arising from the superclasses of an instance declaration
## • In the instance declaration for ‘Monoid Summary’
##
## error: while evaluating the attribute ‘buildInputs’ of the derivation ‘hspec-core-2.4.8’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11:
## while evaluating the attribute ‘buildInputs’ of the derivation ‘silently-1.2.5’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11:
## while evaluating the attribute ‘buildInputs’ of the derivation ‘temporary-1.2.1.1’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11:
## while evaluating the attribute ‘buildInputs’ of the derivation ‘base-compat-0.9.3’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11:
## while evaluating the attribute ‘propagatedBuildInputs’ of the derivation ‘hspec-2.4.8’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11:
## infinite recursion encountered, at undefined position
doCheck = false;
});
## Needs bump to a versioned attribute
## Setup: Encountered missing dependencies:
## hspec-discover ==2.4.8
hspec-discover = super.hspec-discover_2_5_0;
# https://github.com/jcristovao/enclosed-exceptions/issues/12
enclosed-exceptions = dontCheck super.enclosed-exceptions;
## On Hackage:
## Upstreamed, awaiting a Hackage release
@ -444,17 +409,20 @@ self: super: {
});
# Older versions don't compile.
base-compat = self.base-compat_0_10_1;
brick = self.brick_0_37;
dhall = self.dhall_1_13_0;
dhall_1_13_0 = doJailbreak super.dhall_1_13_0; # support ansi-terminal 0.8.x
HaTeX = self.HaTeX_3_19_0_0;
hpack = self.hpack_0_28_2;
hspec = dontCheck super.hspec_2_5_1;
hspec-core = dontCheck super.hspec-core_2_5_1;
hspec-discover = self.hspec-discover_2_5_1;
hspec-smallcheck = self.hspec-smallcheck_0_5_2;
matrix = self.matrix_0_3_6_1;
pandoc = self.pandoc_2_2;
pandoc = self.pandoc_2_2_1;
pandoc-types = self.pandoc-types_1_17_4_2;
wl-pprint-text = self.wl-pprint-text_1_2_0_0;
base-compat = self.base-compat_0_10_1;
# https://github.com/xmonad/xmonad/issues/155
xmonad = addBuildDepend (appendPatch super.xmonad (pkgs.fetchpatch

47
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@ -38,7 +38,7 @@ core-packages:
- ghcjs-base-0
default-package-overrides:
# LTS Haskell 11.8
# LTS Haskell 11.9
- abstract-deque ==0.3
- abstract-deque-tests ==0.3
- abstract-par ==0.3.3
@ -94,7 +94,7 @@ default-package-overrides:
- amqp ==0.18.1
- annotated-wl-pprint ==0.7.0
- ansigraph ==0.3.0.5
- ansi-terminal ==0.8.0.3
- ansi-terminal ==0.8.0.4
- ansi-wl-pprint ==0.6.8.2
- ANum ==0.2.0.2
- apecs ==0.2.4.7
@ -291,7 +291,7 @@ default-package-overrides:
- Chart-cairo ==1.8.3
- chaselev-deque ==0.5.0.5
- ChasingBottoms ==1.3.1.4
- chatwork ==0.1.3.2
- chatwork ==0.1.3.3
- cheapskate ==0.1.1
- cheapskate-highlight ==0.1.0.0
- cheapskate-lucid ==0.1.0.0
@ -526,7 +526,7 @@ default-package-overrides:
- doctest-driver-gen ==0.2.0.2
- do-list ==1.0.1
- dom-parser ==3.0.0
- dotenv ==0.5.2.4
- dotenv ==0.5.2.5
- dotnet-timespan ==0.0.1.0
- double-conversion ==2.0.2.0
- download ==0.3.2.6
@ -906,7 +906,7 @@ default-package-overrides:
- hmpfr ==0.4.4
- hocilib ==0.2.0
- Hoed ==0.5.1
- hOpenPGP ==2.6.1
- hOpenPGP ==2.6.2
- hopfli ==0.2.2.1
- hosc ==0.16
- hostname ==1.0
@ -937,9 +937,9 @@ default-package-overrides:
- hs-GeoIP ==0.3
- hsignal ==0.2.7.5
- hsinstall ==1.6
- HSlippyMap ==3.0
- HSlippyMap ==3.0.1
- hslogger ==1.2.10
- hslua ==0.9.5.1
- hslua ==0.9.5.2
- hslua-aeson ==0.3.0.1
- hslua-module-text ==0.1.2.1
- hsndfile ==0.8.0
@ -1051,7 +1051,7 @@ default-package-overrides:
- indentation-parsec ==0.0.0.1
- indents ==0.4.0.1
- indexed-list-literals ==0.1.0.1
- inflections ==0.4.0.1
- inflections ==0.4.0.3
- influxdb ==1.3.0.1
- ini ==0.3.6
- inline-c ==0.6.0.6
@ -1087,7 +1087,7 @@ default-package-overrides:
- IPv6DB ==0.2.6
- ipython-kernel ==0.9.0.2
- irc ==0.6.1.0
- irc-client ==1.1.0.2
- irc-client ==1.1.0.3
- irc-conduit ==0.3.0.1
- irc-ctcp ==0.1.3.0
- irc-dcc ==2.0.1
@ -1101,7 +1101,7 @@ default-package-overrides:
- ix-shapable ==0.1.0
- jack ==0.7.1.3
- javascript-extras ==0.3.2.0
- jmacro ==0.6.14
- jmacro ==0.6.15
- jmacro-rpc ==0.3.2
- jmacro-rpc-happstack ==0.3.2
- jmacro-rpc-snap ==0.3
@ -1287,7 +1287,7 @@ default-package-overrides:
- minimorph ==0.1.6.1
- minio-hs ==1.0.0
- miniutter ==0.4.7.0
- mintty ==0.1.1
- mintty ==0.1.2
- misfortune ==0.1.1.2
- miso ==0.14.0.0
- missing-foreign ==0.1.1
@ -1315,7 +1315,7 @@ default-package-overrides:
- monadloc ==0.7.1
- monad-logger ==0.3.28.5
- monad-logger-json ==0.1.0.0
- monad-logger-prefix ==0.1.9
- monad-logger-prefix ==0.1.10
- monad-logger-syslog ==0.1.4.0
- monad-loops ==0.4.3
- monad-memo ==0.4.1
@ -1358,7 +1358,7 @@ default-package-overrides:
- murmur-hash ==0.1.0.9
- mustache ==2.3.0
- mutable-containers ==0.3.4
- mwc-probability ==2.0.2
- mwc-probability ==2.0.3
- mwc-random ==0.13.6.0
- mwc-random-accelerate ==0.1.0.0
- mysql ==0.1.5
@ -1653,7 +1653,7 @@ default-package-overrides:
- raaz ==0.2.0
- rainbow ==0.28.0.4
- rainbox ==0.18.0.10
- rakuten ==0.1.1.1
- rakuten ==0.1.1.2
- ramus ==0.1.2
- random ==1.1
- random-fu ==0.2.7.0
@ -1731,6 +1731,7 @@ default-package-overrides:
- rfc5051 ==0.1.0.3
- riak ==1.1.2.4
- riak-protobuf ==0.23.0.0
- rio ==0.1.2.0
- rng-utils ==0.3.0
- roles ==0.2.0.0
- rollbar-hs ==0.2.0.0
@ -1754,13 +1755,13 @@ default-package-overrides:
- say ==0.1.0.0
- sbp ==2.3.16
- sbv ==7.5
- SCalendar ==1.1.0
- scalendar ==1.2.0
- SCalendar ==1.1.0
- scalpel ==0.5.1
- scalpel-core ==0.5.1
- scanner ==0.2
- schematic ==0.4.2.0
- scientific ==0.3.6.0
- scientific ==0.3.6.2
- scotty ==0.11.1
- scrypt ==0.5.0
- sdl2 ==2.4.0.1
@ -1798,7 +1799,7 @@ default-package-overrides:
- servant-github-webhook ==0.4.1.0
- servant-js ==0.9.3.2
- servant-JuicyPixels ==0.3.0.3
- servant-kotlin ==0.1.1.0
- servant-kotlin ==0.1.1.1
- servant-lucid ==0.8
- servant-mock ==0.8.4
- servant-pandoc ==0.5.0.0
@ -1951,7 +1952,7 @@ default-package-overrides:
- sum-type-boilerplate ==0.1.1
- sundown ==0.6
- superbuffer ==0.3.1.1
- svg-builder ==0.1.0.2
- svg-builder ==0.1.1
- svg-tree ==0.6.2.2
- swagger ==0.3.0
- swagger2 ==2.2.1
@ -2128,7 +2129,7 @@ default-package-overrides:
- ua-parser ==0.7.4.1
- uglymemo ==0.1.0.1
- unbounded-delays ==0.1.1.0
- unbound-generics ==0.3.2
- unbound-generics ==0.3.3
- unboxed-ref ==0.4.0.0
- uncertain ==0.3.1.0
- unexceptionalio ==0.3.0
@ -2258,7 +2259,7 @@ default-package-overrides:
- web-routes-th ==0.22.6.3
- web-routes-wai ==0.24.3.1
- webrtc-vad ==0.1.0.3
- websockets ==0.12.4.0
- websockets ==0.12.4.1
- websockets-rpc ==0.6.0
- websockets-simple ==0.0.6.3
- websockets-snap ==0.10.2.5
@ -2305,7 +2306,7 @@ default-package-overrides:
- x509-validation ==1.6.10
- Xauth ==0.1
- xdg-basedir ==0.2.2
- xeno ==0.3.3
- xeno ==0.3.4
- xenstore ==0.1.1
- xhtml ==3000.2.2
- xls ==0.1.1
@ -2333,7 +2334,7 @@ default-package-overrides:
- xturtle ==0.2.0.0
- xxhash ==0.0.2
- xxhash-ffi ==0.2.0.0
- yaml ==0.8.29
- yaml ==0.8.30
- Yampa ==0.10.7
- YampaSynth ==0.2
- yeshql ==3.0.1.3
@ -2343,7 +2344,7 @@ default-package-overrides:
- yesod-auth-fb ==1.9.0
- yesod-auth-hashdb ==1.7
- yesod-bin ==1.6.0.2
- yesod-core ==1.6.4
- yesod-core ==1.6.5
- yesod-csp ==0.2.4.0
- yesod-eventsource ==1.6.0
- yesod-fb ==0.5.0

4460
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

38
pkgs/development/interpreters/gauche/default.nix Normal file
View File

@ -0,0 +1,38 @@
{ stdenv, fetchurl, pkgconfig, texinfo, libiconv, gdbm, openssl, zlib }:
stdenv.mkDerivation rec {
name = "gauche-${version}";
version = "0.9.5";
src = fetchurl {
url = "mirror://sourceforge/gauche/Gauche-${version}.tgz";
sha256 = "0g77nik15whm5frxb7l0pwzd95qlq949dym5pn5p04p17lhm72jc";
};
nativeBuildInputs = [ pkgconfig texinfo ];
buildInputs = [ libiconv gdbm openssl zlib ];
configureFlags = [
"--enable-multibyte=utf-8"
"--with-iconv=${libiconv}"
"--with-dbm=gdbm"
"--with-zlib=${zlib}"
# TODO: Enable slib
# Current slib in nixpkgs is specialized to Guile
# "--with-slib=${slibGuile}/lib/slib"
];
enableParallelBuilding = true;
# TODO: Fix tests that fail in sandbox build
doCheck = false;
meta = with stdenv.lib; {
description = "R7RS Scheme scripting engine";
homepage = https://practical-scheme.net/gauche/;
maintainers = with maintainers; [ mnacamura ];
license = licenses.bsd3;
platforms = platforms.unix;
};
}

21
pkgs/development/interpreters/lua-5/5.1.0004-Fix-stack-overflow-in-vararg-functions.patch Normal file
View File

@ -0,0 +1,21 @@
From: Enrico Tassi <gareuselesinge@debian.org>
Date: Tue, 26 Aug 2014 16:20:55 +0200
Subject: Fix stack overflow in vararg functions
---
src/ldo.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/ldo.c b/src/ldo.c
index d1bf786..30333bf 100644
--- a/src/ldo.c
+++ b/src/ldo.c
@@ -274,7 +274,7 @@ int luaD_precall (lua_State *L, StkId func, int nresults) {
CallInfo *ci;
StkId st, base;
Proto *p = cl->p;
- luaD_checkstack(L, p->maxstacksize);
+ luaD_checkstack(L, p->maxstacksize + p->numparams);
func = restorestack(L, funcr);
if (!p->is_vararg) { /* no varargs? */
base = func + 1;

7
pkgs/development/interpreters/lua-5/5.1.nix
View File

@ -20,12 +20,7 @@ stdenv.mkDerivation rec {
buildInputs = [ readline ];
patches = (if stdenv.isDarwin then [ ./5.1.darwin.patch ] else [ dsoPatch ])
++ [(fetchpatch {
name = "CVE-2014-5461.patch";
url = "http://anonscm.debian.org/cgit/pkg-lua/lua5.1.git/plain/debian/patches/"
+ "0004-Fix-stack-overflow-in-vararg-functions.patch?id=b75a2014db2ad65683521f7bb295bfa37b48b389";
sha256 = "05i5vh53d9i6dy11ibg9i9qpwz5hdm0s8bkx1d9cfcvy80cm4c7f";
})];
++ [ ./5.1.0004-Fix-stack-overflow-in-vararg-functions.patch ];
configurePhase =
if stdenv.isDarwin

4
pkgs/development/libraries/gegl/4.0.nix
View File

@ -3,13 +3,13 @@
, libwebp, gnome3, libintl }:
let
version = "0.4.0";
version = "0.4.2";
in stdenv.mkDerivation rec {
name = "gegl-${version}";
src = fetchurl {
url = "http://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2";
sha256 = "1ighk4z8nlqrzyj8w97s140hzj59564l3xv6fpzbr97m1zx2nkfh";
sha256 = "13bzl0k5l12pk8bkcq4ar7wscbnw7jswhp34mwfsrf10kp0qndba";
};
# needs fonts otherwise, don't know how to pass them

4
pkgs/development/libraries/librelp/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, gnutls, zlib }:
stdenv.mkDerivation rec {
name = "librelp-1.2.15";
name = "librelp-1.2.16";
src = fetchurl {
url = "http://download.rsyslog.com/librelp/${name}.tar.gz";
sha256 = "16d9km99isa4mwk6psf8brny1sfl45dijlkdwzp0yrjnj0nq6cd9";
sha256 = "0lzxc2ydjbbs50dalqp2s107ckp63arpk223cigasq0hl395s8qc";
};
nativeBuildInputs = [ pkgconfig ];

4
pkgs/development/libraries/mlt/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
name = "mlt-${version}";
version = "6.6.0";
version = "6.8.0";
src = fetchFromGitHub {
owner = "mltframework";
repo = "mlt";
rev = "v${version}";
sha256 = "0b2fq0819r7n141l6hhr66hpayqqcmjr2yxw9azxkapg1h0div6q";
sha256 = "0hmxlz3i9yasw5jdkrczak8shzlnpi1acaahn50lvgg9b14kg7b8";
};
buildInputs = [

16
pkgs/development/libraries/slib/default.nix
View File

@ -1,28 +1,18 @@
{ fetchurl, stdenv, unzip, scheme, texinfo }:
stdenv.mkDerivation rec {
name = "slib-3b2";
name = "slib-3b5";
src = fetchurl {
url = "http://groups.csail.mit.edu/mac/ftpdir/scm/${name}.zip";
sha256 = "1s6a7f3ha2bhwj4nkg34n0j511ww1nlgrn5xis8k53l8ghdrrjxi";
sha256 = "0q0p2d53p8qw2592yknzgy2y1p5a9k7ppjx0cfrbvk6242c4mdpq";
};
patches = [ ./catalog-in-library-vicinity.patch ];
buildInputs = [ unzip scheme texinfo ];
configurePhase = ''
mkdir -p "$out"
sed -i "Makefile" \
-e "s|^[[:blank:]]*prefix[[:blank:]]*=.*$|prefix = $out/|g"
'';
buildPhase = "make infoz";
installPhase = ''
make install
postInstall = ''
ln -s mklibcat{.scm,}
SCHEME_LIBRARY_PATH="$out/lib/slib" make catalogs

28
pkgs/development/ocaml-modules/earley/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ stdenv, fetchFromGitHub, which, ocaml, findlib, ocamlbuild }:
if !stdenv.lib.versionAtLeast ocaml.version "4.03"
then throw "earley is not available for OCaml ${ocaml.version}"
else
stdenv.mkDerivation rec {
version = "1.0.2";
name = "ocaml${ocaml.version}-earley-${version}";
src = fetchFromGitHub {
owner = "rlepigre";
repo = "ocaml-earley";
rev = "ocaml-earley_${version}";
sha256 = "110njakmx1hyq42hyr6gx6qhaxly860whfhd6r0vks4yfp68qvcx";
};
buildInputs = [ which ocaml findlib ocamlbuild ];
createFindlibDestdir = true;
meta = {
description = "Parser combinators based on Earley Algorithm";
license = stdenv.lib.licenses.cecill-b;
maintainers = [ stdenv.lib.maintainers.vbgl ];
inherit (ocaml.meta) platforms;
inherit (src.meta) homepage;
};
}

21
pkgs/development/python-modules/geojson/default.nix Normal file
View File

@ -0,0 +1,21 @@
{ lib, buildPythonPackage, fetchPypi, glibcLocales }:
buildPythonPackage rec {
pname = "geojson";
version = "2.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "06ihcb8839zzgk5jcv18kc6nqld4hhj3nk4f3drzcr8n8893v1y8";
};
LC_ALL = "en_US.UTF-8";
checkInputs = [ glibcLocales ];
meta = {
homepage = https://github.com/frewsxcv/python-geojson;
description = "Python bindings and utilities for GeoJSON";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ geistesk ];
};
}

4
pkgs/development/tools/git-ftp/default.nix
View File

@ -1,12 +1,12 @@
{ lib, stdenv, fetchFromGitHub, pandoc, man }:
stdenv.mkDerivation rec {
name = "git-ftp-${version}";
version = "1.4.0";
version = "1.5.1";
src = fetchFromGitHub {
owner = "git-ftp";
repo = "git-ftp";
rev = version;
sha256 = "0n8q1azamf10qql8f8c4ppbd3iisy460gwxx09v5d9hji5md27s3";
sha256 = "0nh2f58rwwfzmglm75fmmm10470a80q0vsihc2msa8xswngihg22";
};
dontBuild = true;

8
pkgs/development/tools/gnome-desktop-testing/default.nix
View File

@ -1,18 +1,18 @@
{ stdenv, glib, autoreconfHook, pkgconfig, libgsystem, fetchgit }:
{ stdenv, glib, autoreconfHook, pkgconfig, systemd, fetchgit }:
stdenv.mkDerivation rec {
version = "2016.1";
version = "2018.1";
name = "gnome-desktop-testing-${version}";
src = fetchgit {
url = https://git.gnome.org/browse/gnome-desktop-testing;
rev = "v${version}";
sha256 = "18qhmsab6jc01qrfzjx8m4799gbs72c4jg830mp0p865rcbl68dc";
sha256 = "1bcd8v101ynsv2p5swh30hnajjf6z8dxzd89h9racp847hgjgyxc";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ glib libgsystem ];
buildInputs = [ glib systemd ];
enableParallelBuilding = true;

7
pkgs/misc/themes/materia-theme/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "materia-theme-${version}";
version = "20180321";
version = "20180519";
src = fetchFromGitHub {
owner = "nana-4";
repo = "materia-theme";
rev = "v${version}";
sha256 = "1nj9ylg9g74smd2kdyzlamdw9cg0f3jz77vn5898drjyscw5qpp6";
sha256 = "0javva2a3kmwb7xss2zmbpc988gagrkjgxncy7i1jifyvbnamf70";
};
nativeBuildInputs = [ gnome3.glib libxml2 bc ];
@ -25,8 +25,7 @@ stdenv.mkDerivation rec {
-e "s|if .*which gnome-shell.*;|if true;|" \
-e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${gnome3.version}|"
mkdir -p $out/share/themes
# name is used internally by the package installation script
name= ./install.sh --dest $out/share/themes
./install.sh --dest $out/share/themes
rm $out/share/themes/*/COPYING
'';

45
pkgs/os-specific/darwin/m-cli/default.nix Normal file
View File

@ -0,0 +1,45 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "m-cli-${version}";
version = "0.2.5";
src = fetchFromGitHub {
owner = "rgcr";
repo = "m-cli";
rev = "v${version}";
sha512 = "0mkcx7jq91pbfs8327qc8434gj73fvjgdfdsrza0lyd9wns6jhsqsf0585klzl68aqscvksgzi2asdnim4va35cdkp2fdzl0g3sm4kd";
};
dontBuild = true;
installPhase = ''
local MPATH="$out/share/m"
gawk -i inplace '{
gsub(/^\[ -L.*|^\s+\|\| pushd.*|^popd.*/, "");
gsub(/MPATH=.*/, "MPATH='$MPATH'");
gsub(/(update|uninstall)_mcli \&\&.*/, "echo NOOP \\&\\& exit 0");
print
}' m
install -Dt "$MPATH/plugins" -m755 plugins/*
install -Dm755 m $out/bin/m
install -Dt "$out/share/bash-completion/completions/" -m444 completion/bash/m
install -Dt "$out/share/fish/vendor_completions.d/" -m444 completion/fish/m.fish
install -Dt "$out/share/zsh/site-functions/" -m444 completion/zsh/_m
'';
meta = with stdenv.lib; {
description = "Swiss Army Knife for macOS";
inherit (src.meta) homepage;
repositories.git = git://github.com/rgcr/m-cli.git;
license = licenses.mit;
platforms = platforms.darwin;
maintainers = with maintainers; [ yurrriq ];
};
}

12
pkgs/os-specific/linux/dpdk/default.nix
View File

@ -1,24 +1,22 @@
{ stdenv, lib, kernel, fetchurl, pkgconfig, libvirt }:
assert lib.versionAtLeast kernel.version "3.18";
{ stdenv, kernel, fetchurl, pkgconfig, numactl }:
stdenv.mkDerivation rec {
name = "dpdk-${version}-${kernel.version}";
version = "17.05.1";
version = "17.11.2";
src = fetchurl {
url = "http://fast.dpdk.org/rel/dpdk-${version}.tar.xz";
sha256 = "1w3nx5cqf8z600bdlbwz7brmdb5yn233qrqvv24kbmmxhbwp7qld";
sha256 = "19m5l3jkrns8r1zbjb6ry18w50ff36kbl5b5g6pfcp9p57sfisd2";
};
nativeBuildInputs = [ pkgconfig ] ++ kernel.moduleBuildDependencies;
buildInputs = [ libvirt ];
buildInputs = [ numactl ];
RTE_KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
RTE_TARGET = "x86_64-native-linuxapp-gcc";
# we need sse3 instructions to build
NIX_CFLAGS_COMPILE = [ "-march=core2" ];
NIX_CFLAGS_COMPILE = [ "-msse3" ];
enableParallelBuilding = true;
outputs = [ "out" "kmod" ];

32
pkgs/os-specific/linux/odp-dpdk/configure.patch
View File

@ -1,32 +0,0 @@
diff --git a/configure.ac b/configure.ac
index 001ebfc2893b..7d19ebcd213f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -215,7 +215,7 @@ AC_SUBST([testdir])
##########################################################################
AM_CONDITIONAL([netmap_support], [test x$netmap_support = xyes ])
AM_CONDITIONAL([PKTIO_DPDK], [test x$pktio_dpdk_support = xyes ])
-AM_CONDITIONAL([HAVE_PCAP], [test $have_pcap = yes])
+AM_CONDITIONAL([HAVE_PCAP], [test x$have_pcap = xyes])
AM_CONDITIONAL([DPDK_DEFAULT_DIR], [test "x${DPDK_DEFAULT_DIR}" = "x1"])
AM_CONDITIONAL([test_installdir], [test "$testdir" != ""])
AM_CONDITIONAL([cunit_support], [test x$cunit_support = xyes ])
@@ -320,18 +320,6 @@ ODP_CFLAGS="$ODP_CFLAGS -Wcast-align -Wnested-externs -Wcast-qual -Wformat-nonli
ODP_CFLAGS="$ODP_CFLAGS -Wformat-security -Wundef -Wwrite-strings"
ODP_CFLAGS="$ODP_CFLAGS -std=gnu99"
-dnl Use -Werror in the checks below since Clang emits a warning instead of
-dnl an error when it encounters an unknown warning option.
-AX_CHECK_COMPILE_FLAG([-Wimplicit-fallthrough=0],
- [ODP_CFLAGS="$ODP_CFLAGS -Wimplicit-fallthrough=0"],
- [], [-Werror])
-AX_CHECK_COMPILE_FLAG([-Wformat-truncation=0],
- [ODP_CFLAGS="$ODP_CFLAGS -Wformat-truncation=0"],
- [], [-Werror])
-AX_CHECK_COMPILE_FLAG([-Wformat-overflow=0],
- [ODP_CFLAGS="$ODP_CFLAGS -Wformat-overflow=0"],
- [], [-Werror])
-
# Extra flags for example to suppress certain warning types
ODP_CFLAGS="$ODP_CFLAGS $ODP_CFLAGS_EXTRA"

26
pkgs/os-specific/linux/odp-dpdk/default.nix
View File

@ -1,31 +1,27 @@
{ stdenv, fetchgit, autoreconfHook, openssl, libpcap, dpdk }:
{ stdenv, fetchurl, autoreconfHook, pkgconfig
, dpdk, libconfig, libpcap, numactl, openssl
}:
stdenv.mkDerivation rec {
name = "odp-dpdk-${version}";
version = "1.15.0.0";
version = "1.19.0.0_DPDK_17.11";
src = fetchgit {
url = "https://git.linaro.org/lng/odp-dpdk.git";
rev = "d8533b4e575d62c9f6f2caedd38d98a1a56fb8d3";
sha256 = "1p09rw7dxxqcxxrdb8wbwp2imapyjvdbvap7s9km2i9hbd8ipdif";
src = fetchurl {
url = "https://git.linaro.org/lng/odp-dpdk.git/snapshot/${name}.tar.gz";
sha256 = "05bwjaxl9hqc6fbkp95nniq11g3kvzmlxw0bq55i7p2v35nv38px";
};
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ openssl dpdk libpcap ];
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ dpdk libconfig libpcap numactl openssl ];
RTE_SDK = "${dpdk}";
RTE_SDK = dpdk;
RTE_TARGET = "x86_64-native-linuxapp-gcc";
dontDisableStatic = true;
configureFlags = [
"--disable-shared"
"--with-sdk-install-path=${dpdk}/${RTE_TARGET}"
];
patches = [
./configure.patch
./odp_crypto.patch
"--with-dpdk-path=${dpdk}"
];
meta = with stdenv.lib; {

18
pkgs/os-specific/linux/odp-dpdk/odp_crypto.patch
View File

@ -1,18 +0,0 @@
diff --git a/platform/linux-dpdk/odp_crypto.c b/platform/linux-dpdk/odp_crypto.c
index d95b157805dc..d13ad5bbde95 100644
--- a/platform/linux-dpdk/odp_crypto.c
+++ b/platform/linux-dpdk/odp_crypto.c
@@ -900,11 +900,12 @@ int odp_crypto_session_create(odp_crypto_session_param_t *param,
/* Setup session */
session = rte_cryptodev_sym_session_create(cdev_id, first_xform);
- if (session == NULL)
+ if (session == NULL) {
/* remove the crypto_session_entry_t */
memset(entry, 0, sizeof(*entry));
free_session(entry);
return -1;
+ }
entry->rte_session = (intptr_t)session;
entry->cipher_xform = cipher_xform;

34
pkgs/os-specific/linux/pktgen/Makefile.patch
View File

@ -1,34 +0,0 @@
diff --git a/app/Makefile b/app/Makefile
index 5078b9a..99b208a 100644
--- a/app/Makefile
+++ b/app/Makefile
@@ -46,29 +46,10 @@ APP = pktgen
CFLAGS += -O3 -g $(WERROR_FLAGS) -fno-stack-protector
CFLAGS += -I$(RTE_SRCDIR) -I$(RTE_SRCDIR)/../lib/common
-dpdk_ver := $(RTE_SDK)/xusertools/dpdk-version.sh
-pktgen_ver := $(RTE_SRCDIR)/../tools/dpdk-version.sh
-ver_cmd := $(if $(wildcard $(dpdk_ver)),$(dpdk_ver),$(pktgen_ver))
-# $(info ver_cmd=$(ver_cmd))
-
-yy := $(shell $(ver_cmd) -yy)
-# mm := $(shell $(ver_cmd) -mm)
-
-# $(info yy=$(yy))
-
-ifeq ($(yy),17)
COMMON_PRE := $(RTE_SRCDIR)/../lib/common
LUA_PRE := $(RTE_SRCDIR)/../lib/lua/src
CLI_PRE := $(RTE_SRCDIR)/../lib/cli
GUI_PRE := $(RTE_SRCDIR)/../gui/gui
-else
-ifeq ($(yy),16)
-COMMON_PRE := $(RTE_SRCDIR)/../lib/common/lib/common
-LUA_PRE := $(RTE_SRCDIR)/../lib/lua/src/lib/lua/src
-CLI_PRE := $(RTE_SRCDIR)/../lib/cli/lib/cli
-GUI_PRE := $(RTE_SRCDIR)/../gui
-endif
-endif
COMMON_LIB := $(COMMON_PRE)/$(RTE_TARGET)
LUA_LIB := $(LUA_PRE)/$(RTE_TARGET)

40
pkgs/os-specific/linux/pktgen/default.nix
View File

@ -1,34 +1,48 @@
{ stdenv, fetchurl, dpdk, libpcap, utillinux
, pkgconfig
{ stdenv, lib, fetchurl, pkgconfig
, dpdk, libpcap, numactl, utillinux
, gtk2, withGtk ? false
}:
stdenv.mkDerivation rec {
let
# pktgen needs a specific version of lua to apply its patch (see lib/lua/Makefile).
lua = rec {
name = "lua-5.3.4";
basename = name + ".tar.gz";
src = fetchurl {
url = "https://www.lua.org/ftp/${basename}";
sha256 = "0320a8dg3aci4hxla380dx1ifkw8gj4gbw5c4dz41g1kh98sm0gn";
};
};
in stdenv.mkDerivation rec {
name = "pktgen-${version}";
version = "3.4.0";
version = "3.5.0";
src = fetchurl {
url = "http://dpdk.org/browse/apps/pktgen-dpdk/snapshot/pktgen-${version}.tar.gz";
sha256 = "0fcyb56d4mkvchi5i8s3m210f5c3xa8zbjb08ranpa1a2k1kzfg5";
url = "http://dpdk.org/browse/apps/pktgen-dpdk/snapshot/pktgen-${version}.tar.xz";
sha256 = "1gy99jr9dbwzi9pd3w5k673h3pfnbkz6rbzmrkwcyis72pnphy5z";
};
nativeBuildInputs = stdenv.lib.optionals withGtk [ pkgconfig ];
buildInputs =
[ dpdk libpcap ]
[ dpdk libpcap numactl ]
++ stdenv.lib.optionals withGtk [gtk2];
RTE_SDK = "${dpdk}";
RTE_TARGET = "x86_64-native-linuxapp-gcc";
GUI = stdenv.lib.optionalString withGtk "true";
NIX_CFLAGS_COMPILE = [ "-march=core2" ];
NIX_CFLAGS_COMPILE = [ "-msse3" ];
patches = [ ./Makefile.patch ];
postPatch = ''
substituteInPlace lib/lua/src/luaconf.h --replace /usr/local $out
postPatch = let dpdkMajor = lib.versions.major dpdk.version; in ''
substituteInPlace app/Makefile --replace 'yy :=' 'yy := ${dpdkMajor} #'
substituteInPlace lib/common/lscpu.h --replace /usr/bin/lscpu ${utillinux}/bin/lscpu
ln -s ${lua.src} lib/lua/${lua.basename}
make -C lib/lua get_tarball # unpack and patch
substituteInPlace lib/lua/${lua.name}/src/luaconf.h --replace /usr/local $out
'';
installPhase = ''
@ -38,6 +52,8 @@ stdenv.mkDerivation rec {
install -m 0644 Pktgen.lua $out/lib/lua/5.3
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Traffic generator powered by DPDK";
homepage = http://dpdk.org/;

1
pkgs/os-specific/linux/tmon/default.nix
View File

@ -12,6 +12,7 @@ stdenv.mkDerivation {
'';
makeFlags = kernel.makeFlags ++ [ "INSTALL_ROOT=\"$(out)\"" "BINDIR=bin" ];
NIX_CFLAGS_LINK = "-lgcc_s";
enableParallelBuilding = true;

81
pkgs/os-specific/linux/wireguard/default.nix
View File

@ -1,73 +1,36 @@
{ stdenv, fetchurl, libmnl, kernel ? null }:
{ stdenv, fetchzip, kernel, wireguard-tools }:
# module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements
assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10";
assert stdenv.lib.versionAtLeast kernel.version "3.10";
let
stdenv.mkDerivation rec {
name = "wireguard-${version}";
version = "0.0.20180514";
src = fetchurl {
url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
sha256 = "1nk6yj1gdmpar99zzw39n1v795m6fxsrilg37d02jm780rgbd5g8";
};
inherit (wireguard-tools) src;
preConfigure = ''
cd src
sed -i '/depmod/,+1d' Makefile
'';
hardeningDisable = [ "pic" ];
KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
INSTALL_MOD_PATH = "\${out}";
NIX_CFLAGS = ["-Wno-error=cpp"];
nativeBuildInputs = kernel.moduleBuildDependencies;
buildPhase = "make module";
meta = with stdenv.lib; {
homepage = https://www.wireguard.com/;
downloadPage = https://git.zx2c4.com/WireGuard/refs/;
description = "A prerelease of an experimental VPN tunnel which is not to be depended upon for security";
description = " Tools for the WireGuard secure network tunnel";
maintainers = with maintainers; [ ericsagnes mic92 zx2c4 ];
license = licenses.gpl2;
platforms = platforms.linux;
};
module = stdenv.mkDerivation {
inherit src meta name;
preConfigure = ''
cd src
sed -i '/depmod/,+1d' Makefile
'';
hardeningDisable = [ "pic" ];
KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
INSTALL_MOD_PATH = "\${out}";
NIX_CFLAGS = ["-Wno-error=cpp"];
nativeBuildInputs = kernel.moduleBuildDependencies;
buildPhase = "make module";
};
tools = stdenv.mkDerivation {
inherit src meta name;
preConfigure = "cd src";
buildInputs = [ libmnl ];
enableParallelBuilding = true;
makeFlags = [
"WITH_BASHCOMPLETION=yes"
"WITH_WGQUICK=yes"
"WITH_SYSTEMDUNITS=yes"
"DESTDIR=$(out)"
"PREFIX=/"
"-C" "tools"
];
buildPhase = "make tools";
postInstall = ''
substituteInPlace $out/lib/systemd/system/wg-quick@.service \
--replace /usr/bin $out/bin
'';
};
in if kernel == null
then tools
else module
}

4
pkgs/servers/monitoring/prometheus/default.nix
View File

@ -45,8 +45,8 @@ let
} // attrs');
in rec {
prometheus_1 = generic {
version = "1.8.1";
sha256 = "07xvpjhhxc0r73qfmkvf94zhv19zv76privw6blg35k5nxcnj7j4";
version = "1.8.2";
sha256 = "088flpg3qgnj9afl9vbaa19v2s1d21yxy38nrlv5m7cxwy2pi5pv";
};
prometheus_2 = generic {

4
pkgs/servers/sql/postgresql/pgroonga/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "pgroonga-${version}";
version = "2.0.5";
version = "2.0.6";
src = fetchurl {
url = "http://packages.groonga.org/source/pgroonga/${name}.tar.gz";
sha256 = "1c4m1rg3122y8rndgz7sj9a49l3v9nm0qbpa04pls20pxzx21g5a";
sha256 = "1hfmz3d0xwhsa4vw8i08s15i7pfd0h0smi2rv663x3cjjjn40i68";
};
nativeBuildInputs = [ pkgconfig ];

25
pkgs/shells/zsh/antibody/default.nix Normal file
View File

@ -0,0 +1,25 @@
{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "antibody-${version}";
version = "3.4.6";
rev = "v${version}";
goPackagePath = "github.com/getantibody/antibody";
src = fetchFromGitHub {
inherit rev;
owner = "getantibody";
repo = "antibody";
sha256 = "0pvsngvlxv5iw7yj18snslag8c61ji4w3j3rw543ckl6k3f9zq6c";
};
goDeps = ./deps.nix;
meta = with lib; {
description = "The fastest shell plugin manager";
homepage = https://github.com/getantibody/antibody;
license = licenses.mit;
maintainers = with maintainers; [ worldofpeace ];
};
}

83
pkgs/shells/zsh/antibody/deps.nix generated Normal file
View File

@ -0,0 +1,83 @@
[
{
goPackagePath = "github.com/alecthomas/kingpin";
fetch = {
type = "git";
url = "https://github.com/alecthomas/kingpin";
rev = "a39589180ebd6bbf43076e514b55f20a95d43086";
sha256 = "0b00bfiwl76qflnmnk3cnlaii6wxgzzdnby99cxdych4f8qmzlv3";
};
}
{
goPackagePath = "github.com/alecthomas/template";
fetch = {
type = "git";
url = "https://github.com/alecthomas/template";
rev = "a0175ee3bccc567396460bf5acd36800cb10c49c";
sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
};
}
{
goPackagePath = "github.com/alecthomas/units";
fetch = {
type = "git";
url = "https://github.com/alecthomas/units";
rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a";
sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
};
}
{
goPackagePath = "github.com/caarlos0/gohome";
fetch = {
type = "git";
url = "https://github.com/caarlos0/gohome";
rev = "c08fdebe2a8b9b92637a423c66ac5d4a8f4e91e8";
sha256 = "1wpg7dpi44kic4y20bk6fjwpanm65h1hj4762dsp41kbdfzc8322";
};
}
{
goPackagePath = "github.com/getantibody/folder";
fetch = {
type = "git";
url = "https://github.com/getantibody/folder";
rev = "e65aa38ebeb03e6d6e91b90a637f3b7c17e1b6d6";
sha256 = "0h8al3sl4gxg1p33s8jrz91i7vrqahk12p0b3srlhnz1sn4ahn8n";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "1a580b3eff7814fc9b40602fd35256c63b50f491";
sha256 = "11adgxc6fzcb3dxr5v2g4nk6ggrz04qnx633hzgmzfh2wv3blgv7";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "2491c5de3490fced2f6cff376127c667efeed857";
sha256 = "1wmijnrxi9p2rv8g6clqkzdihn5ncv29j0s4s1bz9ksncdr36ll3";
};
}
{
goPackagePath = "golang.org/x/sync";
fetch = {
type = "git";
url = "https://go.googlesource.com/sync";
rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca";
sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b";
sha256 = "03fhkng37rczqwfgah5hd7d373jps3hcfx79dmky2fh62yvpcyn3";
};
}
]

32
pkgs/tools/graphics/blockhash/default.nix Normal file
View File

@ -0,0 +1,32 @@
{ stdenv, fetchFromGitHub, python, pkgconfig, imagemagick }:
stdenv.mkDerivation rec {
name = "blockhash-${version}";
version = "0.3";
src = fetchFromGitHub {
owner = "commonsmachinery";
repo = "blockhash";
rev = "v${version}";
sha256 = "15iwljpkykn2711jhls7cwkb23gk6iawlvvk4prl972wic2wlxcj";
};
nativeBuildInputs = [ python pkgconfig ];
buildInputs = [ imagemagick ];
configurePhase = "python waf configure --prefix=$out";
buildPhase = "python waf";
installPhase = "python waf install";
meta = with stdenv.lib; {
homepage = "http://blockhash.io/";
description = ''
This is a perceptual image hash calculation tool based on algorithm
descibed in Block Mean Value Based Image Perceptual Hashing by Bian Yang,
Fan Gu and Xiamu Niu.
'';
license = licenses.mit;
maintainers = [ maintainers.infinisil ];
platforms = platforms.unix;
};
}

2
pkgs/tools/misc/html-proofer/Gemfile Normal file
View File

@ -0,0 +1,2 @@
source 'https://rubygems.org'
gem 'html-proofer'

48
pkgs/tools/misc/html-proofer/Gemfile.lock Normal file
View File

@ -0,0 +1,48 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (5.2.0)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
colorize (0.8.1)
concurrent-ruby (1.0.5)
ethon (0.11.0)
ffi (>= 1.3.0)
ffi (1.9.23)
html-proofer (3.8.0)
activesupport (>= 4.2, < 6.0)
addressable (~> 2.3)
colorize (~> 0.8)
mercenary (~> 0.3.2)
nokogiri (~> 1.8.1)
parallel (~> 1.3)
typhoeus (~> 1.3)
yell (~> 2.0)
i18n (1.0.1)
concurrent-ruby (~> 1.0)
mercenary (0.3.6)
mini_portile2 (2.3.0)
minitest (5.11.3)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
parallel (1.12.1)
public_suffix (3.0.2)
thread_safe (0.3.6)
typhoeus (1.3.0)
ethon (>= 0.9.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
yell (2.0.7)
PLATFORMS
ruby
DEPENDENCIES
html-proofer
BUNDLED WITH
1.14.6

18
pkgs/tools/misc/html-proofer/default.nix Normal file
View File

@ -0,0 +1,18 @@
{ bundlerEnv, ruby, lib }:
bundlerEnv rec {
name = "${pname}-${version}";
pname = "html-proofer";
version = (import ./gemset.nix).html-proofer.version;
inherit ruby;
gemdir = ./.;
meta = with lib; {
description = "A tool to validate HTML files";
homepage = https://github.com/gjtorikian/html-proofer;
license = licenses.mit;
maintainers = with maintainers; [ primeos ];
platforms = platforms.unix;
};
}

154
pkgs/tools/misc/html-proofer/gemset.nix Normal file
View File

@ -0,0 +1,154 @@
{
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1nkzg31x501l8d1hbygyh1lr4c3vnw88a3c1rxz5ifvvzb10i6zm";
type = "gem";
};
version = "5.2.0";
};
addressable = {
dependencies = ["public_suffix"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
type = "gem";
};
version = "2.5.2";
};
colorize = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "133rqj85n400qk6g3dhf2bmfws34mak1wqihvh3bgy9jhajw580b";
type = "gem";
};
version = "0.8.1";
};
concurrent-ruby = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf";
type = "gem";
};
version = "1.0.5";
};
ethon = {
dependencies = ["ffi"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0y70szwm2p0b9qfvpqrzjrgm3jz0ig65vlbfr6ppc3z0m1h7kv48";
type = "gem";
};
version = "0.11.0";
};
ffi = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr";
type = "gem";
};
version = "1.9.23";
};
html-proofer = {
dependencies = ["activesupport" "addressable" "colorize" "mercenary" "nokogiri" "parallel" "typhoeus" "yell"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06ggsx2fhsis1iw0sw12a709h99ksbs9kbmv0j05kvbak7b9m51a";
type = "gem";
};
version = "3.8.0";
};
i18n = {
dependencies = ["concurrent-ruby"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1milplpsdpxlvn23q6pvir4jgxsphq2ps2jgdb3i29kzpc55gm7y";
type = "gem";
};
version = "1.0.1";
};
mercenary = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "10la0xw82dh5mqab8bl0dk21zld63cqxb1g16fk8cb39ylc4n21a";
type = "gem";
};
version = "0.3.6";
};
mini_portile2 = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
type = "gem";
};
version = "2.3.0";
};
minitest = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq";
type = "gem";
};
version = "5.11.3";
};
nokogiri = {
dependencies = ["mini_portile2"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "05fm3xh462glvs0rwnfmc1spmgl4ljg2giifynbmwwqvl42zaaiq";
type = "gem";
};
version = "1.8.2";
};
parallel = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "01hj8v1qnyl5ndrs33g8ld8ibk0rbcqdpkpznr04gkbxd11pqn67";
type = "gem";
};
version = "1.12.1";
};
public_suffix = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s";
type = "gem";
};
version = "3.0.2";
};
thread_safe = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
type = "gem";
};
version = "0.3.6";
};
typhoeus = {
dependencies = ["ethon"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01pd16n6bvknyip42r1r7js0j8x8ly37gmr72z3695zcczh1blyq";
type = "gem";
};
version = "1.3.0";
};
tzinfo = {
dependencies = ["thread_safe"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z";
type = "gem";
};
version = "1.2.5";
};
yell = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1m3q1l33sznrl86myjhd2l7chma1wdcdrdmnf2fi7aydapwd4vib";
type = "gem";
};
version = "2.0.7";
};
}

27
pkgs/tools/misc/nms/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "nms-${version}";
version = "0.3.3";
src = fetchFromGitHub {
owner = "bartobri";
repo = "no-more-secrets";
rev = "v${version}";
sha256 = "1zfv4qabikf8w9winsr4brxrdvs3f0d7xvydksyx8bydadsm2v2h";
};
buildFlags = [ "nms" "sneakers" ];
installFlags = [ "prefix=$(out)" ];
meta = with stdenv.lib; {
homepage = "https://github.com/bartobri/no-more-secrets";
description = ''
A command line tool that recreates the famous data decryption
effect seen in the 1992 movie Sneakers.
'';
license = licenses.gpl3;
maintainers = [ maintainers.infinisil ];
platforms = platforms.unix;
};
}

14
pkgs/tools/networking/connman/default.nix
View File

@ -4,10 +4,10 @@
stdenv.mkDerivation rec {
name = "connman-${version}";
version = "1.35";
version = "1.36";
src = fetchurl {
url = "mirror://kernel/linux/network/connman/${name}.tar.xz";
sha256 = "1apj5j25kj7v1bsfv3nh54aiq873nfrsjfbj85p5qm3ihfwxxmv6";
sha256 = "0x00dq5c2frz06md3g5y0jh5kbcj2hrfl5qjcqga8gs4ri0xp2f7";
};
buildInputs = [ openconnect polkit
@ -16,14 +16,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig file gawk ];
patches = [
(fetchpatch {
name = "header-include.patch";
url = "https://git.kernel.org/pub/scm/network/connman/connman.git/patch/?id=bdfb3526466f8fb8f13d9259037d8f42c782ce24";
sha256 = "0q6ysy2xvvcmkcbw1y29x90g7g7kih7v95k1xbxdcxkras5yl8nf";
})
];
preConfigure = ''
export WPASUPPLICANT=${wpa_supplicant}/sbin/wpa_supplicant
export PPPD=${ppp}/sbin/pppd
@ -61,7 +53,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A daemon for managing internet connections";
homepage = https://connman.net/;
homepage = https://01.org/connman;
maintainers = [ maintainers.matejc ];
platforms = platforms.linux;
license = licenses.gpl2;

28
pkgs/tools/networking/wireguard-go/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ stdenv, buildGoPackage, fetchzip }:
buildGoPackage rec {
name = "wireguard-go-${version}";
version = "0.0.20180514";
goPackagePath = "wireguard-go";
src = fetchzip {
url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz";
sha256 = "1i1w4vj8w353b92nfhs92k0f7fifrwi067qfmgckdk0kk76nv2id";
};
goDeps = ./deps.nix;
postPatch = ''
# Replace local imports so that go tools do not trip on them
find . -name '*.go' -exec sed -i '/import (/,/)/s@"./@"${goPackagePath}/@' {} \;
'';
meta = with stdenv.lib; {
description = "Userspace Go implementation of WireGuard";
homepage = https://git.zx2c4.com/wireguard-go/about/;
license = licenses.gpl2;
maintainers = with maintainers; [ kirelagin ];
platforms = with platforms; linux ++ darwin ++ windows;
};
}

30
pkgs/tools/networking/wireguard-go/deps.nix generated Normal file
View File

@ -0,0 +1,30 @@
# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
[
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "1a580b3eff7814fc9b40602fd35256c63b50f491";
sha256 = "11adgxc6fzcb3dxr5v2g4nk6ggrz04qnx633hzgmzfh2wv3blgv7";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "2491c5de3490fced2f6cff376127c667efeed857";
sha256 = "1wmijnrxi9p2rv8g6clqkzdihn5ncv29j0s4s1bz9ksncdr36ll3";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b";
sha256 = "03fhkng37rczqwfgah5hd7d373jps3hcfx79dmky2fh62yvpcyn3";
};
}
]

46
pkgs/tools/networking/wireguard-tools/default.nix Normal file
View File

@ -0,0 +1,46 @@
{ stdenv, lib, fetchzip, libmnl, useSystemd ? stdenv.isLinux }:
let
inherit (lib) optional optionalString;
in
stdenv.mkDerivation rec {
name = "wireguard-tools-${version}";
version = "0.0.20180514";
src = fetchzip {
url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
sha256 = "15z0s1i8qyq1fpw8j6rky53ffrpp3f49zn1022jwdslk4g0ncaaj";
};
preConfigure = "cd src";
buildInputs = optional stdenv.isLinux libmnl;
enableParallelBuilding = true;
makeFlags = [
"WITH_BASHCOMPLETION=yes"
"WITH_WGQUICK=yes"
"WITH_SYSTEMDUNITS=${if useSystemd then "yes" else "no"}"
"DESTDIR=$(out)"
"PREFIX=/"
"-C" "tools"
];
buildPhase = "make tools";
postInstall = optionalString useSystemd ''
substituteInPlace $out/lib/systemd/system/wg-quick@.service \
--replace /usr/bin $out/bin
'';
meta = with stdenv.lib; {
homepage = https://www.wireguard.com/;
downloadPage = https://git.zx2c4.com/WireGuard/refs/;
description = " Tools for the WireGuard secure network tunnel";
maintainers = with maintainers; [ ericsagnes mic92 zx2c4 ];
license = licenses.gpl2;
platforms = platforms.unix;
};
}

4
pkgs/tools/security/lastpass-cli/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "lastpass-cli-${version}";
version = "1.3.0";
version = "1.3.1";
src = fetchFromGitHub {
owner = "lastpass";
repo = "lastpass-cli";
rev = "v${version}";
sha256 = "0k3vnlibv05wnn6qn3qjlcyj2s07di7zkmdnijd6cp1hfk76z2r5";
sha256 = "11drzmfdvb8ydw1dxaz9zz8rk0jjqmfv076vydz05qqvgx59s38h";
};
nativeBuildInputs = [ asciidoc cmake docbook_xsl pkgconfig ];

1
pkgs/top-level/aliases.nix
View File

@ -295,6 +295,7 @@ mapAliases (rec {
vorbisTools = vorbis-tools; # added 2016-01-26
wineStaging = wine-staging; # added 2018-01-08
winusb = woeusb; # added 2017-12-22
wireguard = wireguard-tools; # added 2018-05-19
x11 = xlibsWrapper; # added 2015-09
xbmc = kodi; # added 2018-04-25
xbmcPlain = kodiPlain; # added 2018-04-25

21
pkgs/top-level/all-packages.nix
View File

@ -484,6 +484,7 @@ with pkgs;
alacritty = callPackage ../applications/misc/alacritty {
inherit (xorg) libXcursor libXxf86vm libXi;
inherit (darwin.apple_sdk.frameworks) AppKit CoreFoundation CoreGraphics CoreServices CoreText Foundation OpenGL;
};
amazon-glacier-cmd-interface = callPackage ../tools/backup/amazon-glacier-cmd-interface { };
@ -683,6 +684,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
};
m-cli = callPackage ../os-specific/darwin/m-cli { };
reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace {};
skhd = callPackage ../os-specific/darwin/skhd {
@ -841,6 +844,8 @@ with pkgs;
blink = callPackage ../applications/networking/instant-messengers/blink { };
blockhash = callPackage ../tools/graphics/blockhash { };
bluemix-cli = callPackage ../tools/admin/bluemix-cli { };
libqmatrixclient = libsForQt5.callPackage ../development/libraries/libqmatrixclient { };
@ -1460,6 +1465,8 @@ with pkgs;
utillinux = utillinuxMinimal;
};
antibody = callPackage ../shells/zsh/antibody { };
antigen = callPackage ../shells/zsh/antigen { };
apparix = callPackage ../tools/misc/apparix { };
@ -2968,6 +2975,8 @@ with pkgs;
hping = callPackage ../tools/networking/hping { };
html-proofer = callPackage ../tools/misc/html-proofer { };
htpdate = callPackage ../tools/networking/htpdate { };
http-prompt = callPackage ../tools/networking/http-prompt { };
@ -3160,7 +3169,7 @@ with pkgs;
jing-trang = callPackage ../tools/text/xml/jing-trang { };
jira-cli = callPackage ../development/tools/jira_cli { };
jl = haskellPackages.callPackage ../development/tools/jl { };
jmespath = callPackage ../development/tools/jmespath { };
@ -4012,6 +4021,8 @@ with pkgs;
nitrogen = callPackage ../tools/X11/nitrogen {};
nms = callPackage ../tools/misc/nms { };
notify-desktop = callPackage ../tools/misc/notify-desktop {};
nkf = callPackage ../tools/text/nkf {};
@ -5498,6 +5509,8 @@ with pkgs;
whois = callPackage ../tools/networking/whois { };
wireguard-tools = callPackage ../tools/networking/wireguard-tools { };
woff2 = callPackage ../development/web/woff2 { };
woof = callPackage ../tools/misc/woof { };
@ -5712,6 +5725,8 @@ with pkgs;
wipe = callPackage ../tools/security/wipe { };
wireguard-go = callPackage ../tools/networking/wireguard-go { };
wkhtmltopdf = callPackage ../tools/graphics/wkhtmltopdf {
overrideDerivation = lib.overrideDerivation;
};
@ -15636,6 +15651,8 @@ with pkgs;
ganttproject-bin = callPackage ../applications/misc/ganttproject-bin { };
gauche = callPackage ../development/interpreters/gauche { };
gcal = callPackage ../applications/misc/gcal { };
geany = callPackage ../applications/editors/geany { };
@ -18410,8 +18427,6 @@ with pkgs;
erlang = erlangR18;
};
wireguard = callPackage ../os-specific/linux/wireguard { };
alsamixer.app = callPackage ../applications/window-managers/windowmaker/dockapps/alsamixer.app.nix { };
wllvm = callPackage ../development/tools/wllvm { };

2
pkgs/top-level/ocaml-packages.nix
View File

@ -215,6 +215,8 @@ let
dtoa = callPackage ../development/ocaml-modules/dtoa { };
earley = callPackage ../development/ocaml-modules/earley { };
easy-format = callPackage ../development/ocaml-modules/easy-format { };
eliom = callPackage ../development/ocaml-modules/eliom { };

2
pkgs/top-level/python-packages.nix
View File

@ -5983,6 +5983,8 @@ in {
geopandas = callPackage ../development/python-modules/geopandas { };
geojson = callPackage ../development/python-modules/geojson { };
gevent-websocket = buildPythonPackage rec {
name = "gevent-websocket-0.9.3";