Merge master into staging-next

This commit is contained in:
Frederik Rietdijk 2020-02-07 19:27:52 +01:00
commit 30f0909e3a
101 changed files with 5975 additions and 5435 deletions

View file

@ -52,7 +52,7 @@ let
set -s escape-time ${toString cfg.escapeTime}
set -g history-limit ${toString cfg.historyLimit}
${cfg.extraTmuxConf}
${cfg.extraConfig}
'';
in {
@ -102,7 +102,7 @@ in {
description = "Time in milliseconds for which tmux waits after an escape is input.";
};
extraTmuxConf = mkOption {
extraConfig = mkOption {
default = "";
description = ''
Additional contents of /etc/tmux.conf
@ -181,4 +181,8 @@ in {
};
};
};
imports = [
(lib.mkRenamedOptionModule [ "programs" "tmux" "extraTmuxConf" ] [ "programs" "tmux" "extraConfig" ])
];
}

View file

@ -103,6 +103,34 @@ in
Create the repository if it doesn't exist.
'';
};
pruneOpts = mkOption {
type = types.listOf types.str;
default = [];
description = ''
A list of options (--keep-* et al.) for 'restic forget
--prune', to automatically prune old snapshots. The
'forget' command is run *after* the 'backup' command, so
keep that in mind when constructing the --keep-* options.
'';
example = [
"--keep-daily 7"
"--keep-weekly 5"
"--keep-monthly 12"
"--keep-yearly 75"
];
};
dynamicFilesFrom = mkOption {
type = with types; nullOr str;
default = null;
description = ''
A script that produces a list of files to back up. The
results of this command are given to the '--files-from'
option.
'';
example = "find /home/matt/git -type d -name .git";
};
};
}));
default = {};
@ -134,25 +162,41 @@ in
let
extraOptions = concatMapStrings (arg: " -o ${arg}") backup.extraOptions;
resticCmd = "${pkgs.restic}/bin/restic${extraOptions}";
filesFromTmpFile = "/run/restic-backups-${name}/includes";
backupPaths = if (backup.dynamicFilesFrom == null)
then concatStringsSep " " backup.paths
else "--files-from ${filesFromTmpFile}";
pruneCmd = optionals (builtins.length backup.pruneOpts > 0) [
( resticCmd + " forget --prune " + (concatStringsSep " " backup.pruneOpts) )
( resticCmd + " check" )
];
in nameValuePair "restic-backups-${name}" ({
environment = {
RESTIC_PASSWORD_FILE = backup.passwordFile;
RESTIC_REPOSITORY = backup.repository;
};
path = with pkgs; [
openssh
];
path = [ pkgs.openssh ];
restartIfChanged = false;
serviceConfig = {
Type = "oneshot";
ExecStart = "${resticCmd} backup ${concatStringsSep " " backup.extraBackupArgs} ${concatStringsSep " " backup.paths}";
ExecStart = [ "${resticCmd} backup ${concatStringsSep " " backup.extraBackupArgs} ${backupPaths}" ] ++ pruneCmd;
User = backup.user;
RuntimeDirectory = "restic-backups-${name}";
} // optionalAttrs (backup.s3CredentialsFile != null) {
EnvironmentFile = backup.s3CredentialsFile;
};
} // optionalAttrs backup.initialize {
} // optionalAttrs (backup.initialize || backup.dynamicFilesFrom != null) {
preStart = ''
${resticCmd} snapshots || ${resticCmd} init
${optionalString (backup.initialize) ''
${resticCmd} snapshots || ${resticCmd} init
''}
${optionalString (backup.dynamicFilesFrom != null) ''
${pkgs.writeScript "dynamicFilesFromScript" backup.dynamicFilesFrom} > ${filesFromTmpFile}
''}
'';
} // optionalAttrs (backup.dynamicFilesFrom != null) {
postStart = ''
rm ${filesFromTmpFile}
'';
})
) config.services.restic.backups;

View file

@ -53,7 +53,7 @@ in {
blacklistPlugins = mkOption {
type = types.listOf types.str;
default = [ "test" ];
default = [];
example = [ "udev" ];
description = ''
Allow blacklisting specific plugins
@ -91,6 +91,9 @@ in {
###### implementation
config = mkIf cfg.enable {
# Disable test related plug-ins implicitly so that users do not have to care about them.
services.fwupd.blacklistPlugins = cfg.package.defaultBlacklistedPlugins;
environment.systemPackages = [ cfg.package ];
environment.etc = {

View file

@ -127,9 +127,14 @@ in
"/share/gtksourceview-4.0"
];
services.xserver.displayManager.sessionPackages = [
pkgs.xfce.xfce4-session
];
services.xserver.desktopManager.session = [{
name = "xfce";
bgSupport = true;
start = ''
${pkgs.runtimeShell} ${pkgs.xfce.xfce4-session.xinitrc} &
waitPID=$!
'';
}];
services.xserver.updateDbusEnvironment = true;
services.xserver.gdk-pixbuf.modulePackages = [ pkgs.librsvg ];

View file

@ -248,6 +248,7 @@ in
radicale = handleTest ./radicale.nix {};
redis = handleTest ./redis.nix {};
redmine = handleTest ./redmine.nix {};
restic = handleTest ./restic.nix {};
roundcube = handleTest ./roundcube.nix {};
rspamd = handleTest ./rspamd.nix {};
rss2email = handleTest ./rss2email.nix {};

View file

@ -1,11 +1,11 @@
{ pkgs, makeInstalledTest, ... }:
{ pkgs, lib, makeInstalledTest, ... }:
makeInstalledTest {
tested = pkgs.fwupd;
testConfig = {
services.fwupd.enable = true;
services.fwupd.blacklistPlugins = []; # don't blacklist test plugin
services.fwupd.blacklistPlugins = lib.mkForce []; # don't blacklist test plugin
services.fwupd.enableTestRemote = true;
virtualisation.memorySize = 768;
};

63
nixos/tests/restic.nix Normal file
View file

@ -0,0 +1,63 @@
import ./make-test-python.nix (
{ pkgs, ... }:
let
password = "some_password";
repository = "/tmp/restic-backup";
passwordFile = pkgs.writeText "password" "correcthorsebatterystaple";
in
{
name = "restic";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ bbigras ];
};
nodes = {
server =
{ ... }:
{
services.restic.backups = {
remotebackup = {
inherit repository;
passwordFile = "${passwordFile}";
initialize = true;
paths = [ "/opt" ];
pruneOpts = [
"--keep-daily 2"
"--keep-weekly 1"
"--keep-monthly 1"
"--keep-yearly 99"
];
};
};
};
};
testScript = ''
server.start()
server.wait_for_unit("dbus.socket")
server.fail(
"${pkgs.restic}/bin/restic -r ${repository} -p ${passwordFile} snapshots"
)
server.succeed(
"mkdir -p /opt",
"touch /opt/some_file",
"timedatectl set-time '2016-12-13 13:45'",
"systemctl start restic-backups-remotebackup.service",
'${pkgs.restic}/bin/restic -r ${repository} -p ${passwordFile} snapshots -c | grep -e "^1 snapshot"',
"timedatectl set-time '2017-12-13 13:45'",
"systemctl start restic-backups-remotebackup.service",
"timedatectl set-time '2018-12-13 13:45'",
"systemctl start restic-backups-remotebackup.service",
"timedatectl set-time '2018-12-14 13:45'",
"systemctl start restic-backups-remotebackup.service",
"timedatectl set-time '2018-12-15 13:45'",
"systemctl start restic-backups-remotebackup.service",
"timedatectl set-time '2018-12-16 13:45'",
"systemctl start restic-backups-remotebackup.service",
'${pkgs.restic}/bin/restic -r ${repository} -p ${passwordFile} snapshots -c | grep -e "^4 snapshot"',
)
'';
}
)

View file

@ -5,14 +5,14 @@
python3Packages.buildPythonApplication rec {
pname = "gpodder";
version = "3.10.12";
version = "3.10.13";
format = "other";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "0q95am079gg01dkivr972mm2k87y8z296a9yf7amzsf9hxfycdra";
sha256 = "1h542syaxsx1hslfzlk3fx1nbp190zjw35kigw7a1kx1jwvfwapg";
};
patches = [

View file

@ -2,11 +2,11 @@
mkDerivation rec {
pname = "padthv1";
version = "0.9.11";
version = "0.9.12";
src = fetchurl {
url = "mirror://sourceforge/padthv1/${pname}-${version}.tar.gz";
sha256 = "02yfwyirjqxa075yqdnci9b9k57kdmkjvn9gnpdbnjp887pds76g";
sha256 = "1zz3rz990k819q0rlzllqdwvag0x9k63443lb0mp8lwlczxnza6l";
};
buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ];

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "samplv1";
version = "0.9.11";
version = "0.9.12";
src = fetchurl {
url = "mirror://sourceforge/samplv1/${pname}-${version}.tar.gz";
sha256 = "17zs8kvvwqv00bm4lxpn09a5hxjlbz7k5mkl3k7jspw7rqn3djf2";
sha256 = "0xzjxiqzcf1ygabrjsy0iachhnpy85rp9519fmj2f568r6ml6hzg";
};
buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools];

View file

@ -2,11 +2,11 @@
mkDerivation rec {
pname = "synthv1";
version = "0.9.11";
version = "0.9.12";
src = fetchurl {
url = "mirror://sourceforge/synthv1/${pname}-${version}.tar.gz";
sha256 = "116k2vca9dygvsd684wvxm61p0l1xrrgdph4qrrprlsr6vj0llgm";
sha256 = "1amxrl1cqwgncw5437r572frgf6xhss3cfpbgh178i8phlq1q731";
};
buildInputs = [ qtbase qttools libjack2 alsaLib liblo lv2 ];

View file

@ -7,13 +7,13 @@ with stdenv.lib;
mkDerivation rec {
name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version;
version = "0.20.9";
version = "0.20.12";
src = fetchFromGitHub {
owner = "bitcoin-ABC";
repo = "bitcoin-abc";
rev = "v${version}";
sha256 = "1dmk7vm4r9n0yia8dazlx4fmr8i1r8cz8p1pj11glpa3pwda3669";
sha256 = "0ar3syrz7psf83bh24hn2y0mxjgn7cjqk2h8q4cgdp7mq55v8ynj";
};
patches = [ ./fix-bitcoin-qt-build.patch ];

View file

@ -10,13 +10,13 @@
with stdenv.lib;
stdenv.mkDerivation rec {
name = "pivx-${version}";
version = "4.0.0";
version = "4.0.2";
src = fetchFromGitHub {
owner = "PIVX-Project";
repo= "PIVX";
rev = "v${version}";
sha256 = "0m85nc7c8cppdysqz4m12rgmzacrcbwnvf7wy90wzfvfr3xkbapd";
sha256 = "12lnp318k8dx1sar24zfmv2imnzs30srssnlpb31y7hcxhz0wpc5";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ] ++ optionals withGui [ wrapQtAppsHook ];

View file

@ -5,13 +5,13 @@
buildPythonApplication rec {
pname = "rednotebook";
version = "2.15";
version = "2.16";
src = fetchFromGitHub {
owner = "jendrikseipp";
repo = "rednotebook";
rev = "v${version}";
sha256 = "1p43xncqb898rgfx4vv1nxy6dj57pvxpc0b5j3kgs58ir70rg1js";
sha256 = "1cziac9pmhpxvs8qg54wbckzgjpplqb55hykg5vdwdqqs7j054aj";
};
# We have not packaged tests.

View file

@ -4,13 +4,13 @@ with python3.pkgs;
buildPythonApplication rec {
pname = "thonny";
version = "3.2.4";
version = "3.2.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "1hfpjw4fac0kq3n9jqwfzbys6h35qjbh5rpc4jzhlln200h6zvwj";
sha256 = "19krnxpp3i1n65zafazvdm9mvnjry5rml0y9imj4365q4bkj20g2";
};
propagatedBuildInputs = with python3.pkgs; [

View file

@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "drawio";
version = "12.5.3";
version = "12.6.5";
src = fetchurl {
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm";
sha256 = "048lksq2akkyi5jg1fiz455n2nv6w58kv8xb9y41qms5dshpww2q";
sha256 = "14x4h680q3w9wsdmivy2k1bggb09vdm3a3wrpfwd79dbaagjk4lc";
};
nativeBuildInputs = [

View file

@ -1,22 +1,22 @@
{ stdenv, fetchFromGitHub
, cmake, wrapGAppsHook
, libX11, xorg, libzip, glfw, gnome3
, libX11, libzip, glfw, libpng, xorg, gnome3
}:
stdenv.mkDerivation rec {
pname = "tev";
version = "1.13";
version = "1.14";
src = fetchFromGitHub {
owner = "Tom94";
repo = pname;
rev = "v${version}";
fetchSubmodules = true;
sha256 = "0c8md6yv1q449aszs05xfby6a2aiw8pac7x0zs169i5mpqrrbfa9";
sha256 = "1g86wl0sdn0wprfxff2q1yc1hiq9fndmzhyvj09cw51lzbab5faw";
};
nativeBuildInputs = [ cmake wrapGAppsHook ];
buildInputs = [ libX11 libzip glfw ]
buildInputs = [ libX11 libzip glfw libpng ]
++ (with xorg; [ libXrandr libXinerama libXcursor libXi libXxf86vm ]);
dontWrapGApps = true; # We also need zenity (see below)

View file

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, python3Packages }:
python3Packages.buildPythonApplication rec {
version = "0.25.0";
version = "0.25.2";
name = "toot-${version}";
src = fetchFromGitHub {
owner = "ihabunek";
repo = "toot";
rev = version;
sha256 = "0padc5jbr55spgbp4avk2kj3if52vzn8dg4ch5jc3h5fvb9l8xz1";
sha256 = "0g18x8pbwhk2d3aphah6dqqbhz62k48pwx63flsnqd4brccd0jkh";
};
checkInputs = with python3Packages; [ pytest ];

View file

@ -1,24 +1,47 @@
{ fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk2, expat, curl
{ fetchurl, fetchpatch, stdenv, makeWrapper
, pkgconfig, intltool, gettext, gtk2, expat, curl
, gpsd, bc, file, gnome-doc-utils, libexif, libxml2, libxslt, scrollkeeper
, docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect
, geoclue2, liboauth, nettle }:
, docbook_xml_dtd_412, gexiv2, gpsbabel, expect
, withMapnik ? false, mapnik
, withMBTiles ? true, sqlite
, withOAuth ? true, liboauth
, withMd5Hash ? true, nettle
, withGeoClue ? true, geoclue2 }:
stdenv.mkDerivation rec {
pname = "viking";
version = "1.7";
version = "1.8";
src = fetchurl {
url = "mirror://sourceforge/viking/viking/viking-${version}.tar.bz2";
sha256 = "092q2dv0rcz12nh2js1z1ralib1553dmzy9pdrvz9nv2vf61wybw";
sha256 = "1a0g0fbj4q5s9p8fv0mqvxws10q3naj81l72sz30vvqpbz6vqp45";
};
patches = [
# Fix build without mapnik and sqlite https://github.com/viking-gps/viking/pull/79
(fetchpatch {
url = "https://github.com/viking-gps/viking/commit/995feefcb97bdb1590ed018224cf47ce197fe0c1.patch";
sha256 = "1xb0b76kg690fag9mw3yfj5k766jmqp1sm8q4f29n1h3nz5g8izd";
})
];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils
libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite
geoclue2 liboauth nettle
];
libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2
] ++ stdenv.lib.optional withMapnik mapnik
++ stdenv.lib.optional withGeoClue geoclue2
++ stdenv.lib.optional withMd5Hash nettle
++ stdenv.lib.optional withOAuth liboauth
++ stdenv.lib.optional withMBTiles sqlite;
configureFlags = [ "--disable-scrollkeeper --disable-mapnik" ];
configureFlags = [
"--disable-scrollkeeper"
(stdenv.lib.enableFeature withMapnik "mapnik")
(stdenv.lib.enableFeature withGeoClue "geoclue")
(stdenv.lib.enableFeature withMd5Hash "nettle")
(stdenv.lib.enableFeature withOAuth "oauth")
(stdenv.lib.enableFeature withMBTiles "mbtiles")
];
preBuild = ''
sed -i help/Makefile \
@ -45,7 +68,7 @@ stdenv.mkDerivation rec {
'';
homepage = https://sourceforge.net/projects/viking/;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ pSub ];
maintainers = with maintainers; [ pSub sikmir ];
platforms = with platforms; linux;
};
}

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "xmrig";
version = "5.5.1";
version = "5.5.3";
src = fetchFromGitHub {
owner = "xmrig";
repo = "xmrig";
rev = "v${version}";
sha256 = "0b9wfv56s5696q493hid2ikaa0ycgkx35pyyvxsdrcf94rbxyd1x";
sha256 = "1an68ghs65dvxs8lvcflv7wmf431lqw417np76895w10w436gh7x";
};
nativeBuildInputs = [ cmake ];

View file

@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
beta = {
sha256 = "07h3znqb1r8hgcxzm5f04xkj2r66s1rhixqyyxi4hadf7qjx02n7";
sha256bin64 = "0r7706gxdqws8dm5859869p5h8gas6f65qz674rk18l8dbg40fzw";
version = "80.0.3987.66";
sha256 = "13mcn37nhf44bzaafr4bwmmfkihhfi1bzdd6ba2yzfwsbp56y7zm";
sha256bin64 = "08nvmrrglssrxhp9s8bcj479dfhi83nmnjim6cignfhbzqmwpgdl";
version = "80.0.3987.87";
};
dev = {
sha256 = "1sm1ndq4y2d4fs4y9d5k4dcs6q2pqilv7b0ffx2nlazdrr73la3n";
sha256bin64 = "0kr49hvk0c6pmxpm94fscxvdd6whxz1x7ic27xk86csjpjz6s5dg";
version = "81.0.4033.2";
sha256 = "173saw11pvz1fgw60hrfm1hnfjq3hk4zri7jpphk0ws7930zkhf4";
sha256bin64 = "1g718g0a0m87qkvy0mf1kbhv398iyqks7d9g40cqp5rf1b7yjkw2";
version = "81.0.4040.5";
};
stable = {
sha256 = "183vz3lf1588cr9s5vlnj65qvbmz36s8cg8k7dvr64cxmcqk86an";
sha256bin64 = "1550fs4n3lgvb80hij2yq13zkw0bjih210ylpd74n1mw9yw4ygk1";
version = "79.0.3945.130";
sha256 = "13mcn37nhf44bzaafr4bwmmfkihhfi1bzdd6ba2yzfwsbp56y7zm";
sha256bin64 = "0qdslcl028v0fx8q0n8f5kjkwd8b0z5yz531dbn7wg2dcbp7vq45";
version = "80.0.3987.87";
};
}

View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "rambox-pro";
version = "1.2.0";
version = "1.2.2";
dontBuild = true;
dontStrip = true;
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/ramboxapp/download/releases/download/v${version}/RamboxPro-${version}-linux-x64.tar.gz";
sha256 = "189rpsrs25c4100xf1zhcwvdyigbzsw8ffhayj8mmrx4akg39653";
sha256 = "1zzlfk86gzg20qapqz9s8p9vmak8vj1smkwn9yrzs2yisfqh0gpc";
};
installPhase = ''

View file

@ -12,7 +12,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
version = "0.29.2";
version = "0.29.3";
pname = "notmuch";
passthru = {
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://notmuchmail.org/releases/${pname}-${version}.tar.xz";
sha256 = "1pjmrnbn0iavm5pnw7wgfw5d6hg5i6miqfa6s7s4027vn94n3nhv";
sha256 = "0dfwa38vgnxk9cvvpza66szjgp8lir6iz6yy0cry9593lywh9xym";
};
nativeBuildInputs = [ pkgconfig ];

View file

@ -13,11 +13,11 @@ let
in
mkDerivation rec {
pname = "eagle";
version = "9.5.1";
version = "9.5.2";
src = fetchurl {
url = "https://eagle-updates.circuits.io/downloads/${builtins.replaceStrings ["."] ["_"] version}/Autodesk_EAGLE_${version}_English_Linux_64bit.tar.gz";
sha256 = "07lvjn0mxqkv5kx41bzakifpb5bjhljx0ssvk33ipzb0nvl6nx63";
sha256 = "0k707pyh0g2r6sgyran59sznq0nlh0i16la2gxqj3c5da1vb58y5";
};
desktopItem = makeDesktopItem {

View file

@ -1,10 +1,10 @@
{ stdenv, python2Packages, fetchurl }:
python2Packages.buildPythonApplication rec {
pname = "labelImg";
version = "1.6.0";
version = "1.8.1";
src = fetchurl {
url = "https://github.com/tzutalin/labelImg/archive/v${version}.tar.gz";
sha256 = "126kc4r7xm9170kh7snqsfkkc868m5bcnswrv7b4cq9ivlrdwbm4";
sha256 = "1banpkpbrny1jx3zsgs544xai62z5yvislbq782a5r47gv2f2k4a";
};
nativeBuildInputs = with python2Packages; [
pyqt4

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "delta";
version = "0.0.15";
version = "0.0.16";
src = fetchFromGitHub {
owner = "dandavison";
repo = pname;
rev = version;
sha256 = "1c2zqvkzkrj8rcz226vfk43yw113b1fdcz2gx0xh8fs72arqx6wh";
sha256 = "01jiqizg1ywvrrwhqzfqzbaqrzyfaqm66sixas0mpyzmd6cdwmh6";
};
cargoSha256 = "1888bvkpalfcw9bc9zmf9bmil6x35l9ia31x6mx1h2dvrfpw3bb1";
cargoSha256 = "1zmk70hccrxn1gdr1bksnvh6sa2h4518s0ni8k2ihxi4ld1ch5p2";
meta = with lib; {
homepage = "https://github.com/dandavison/delta";

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "git-repo";
version = "1.13.9.2";
version = "1.13.9.3";
src = fetchFromGitHub {
owner = "android";
repo = "tools_repo";
rev = "v${version}";
sha256 = "1a6vyj7a9qba9nidi6x3hkpvpzikskh5jsagzkx7m95p0hcvvb7v";
sha256 = "0xrgq6v1bh9zgrgg2r9z4zndzch08p0z5y3sppffyrb19mib055k";
};
patches = [ ./import-ssl-module.patch ];

View file

@ -5,10 +5,10 @@
mkDerivation rec {
pname = "clipgrab";
version = "3.8.6";
version = "3.8.7";
src = fetchurl {
sha256 = "1w2j1wk9sf22nnschlraxdbxabqblrxyb8kq0lkyk7dkfa5d0hdq";
sha256 = "1mjkq487w168537qzw4pd010lp25vm1s2zji6cykcaa2cxcd6p7p";
# The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz!
url = "https://download.clipgrab.org/${pname}-${version}.tar.gz";
};

View file

@ -7,12 +7,12 @@
}:
buildPythonApplication rec {
version = "1.25.1";
version = "1.25.4";
pname = "docker-compose";
src = fetchPypi {
inherit pname version;
sha256 = "003rb5hp8plb3yvv0x5dwzz13gdvq91nvrvx29d41h97n1lklw67";
sha256 = "1ww8ckpj3n5jdg63qvmiqx3gk0fsrnynnnqj17fppymbwjzf5fps";
};
# lots of networking and other fails
@ -44,6 +44,6 @@ buildPythonApplication rec {
homepage = https://docs.docker.com/compose/;
description = "Multi-container orchestration for Docker";
license = licenses.asl20;
maintainers = [ ];
maintainers = with maintainers; [ Frostman ];
};
}

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, desktop-file-utils, appstream-glib, libxslt
{ stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, desktop-file-utils, appstream-glib, libxslt
, libxml2, gettext, itstool, wrapGAppsHook, docbook_xsl, docbook_xml_dtd_43
, gnome3, gtk3, glib, gsettings-desktop-schemas }:
@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
sha256 = "16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300";
};
patches = [
# fix AppStream validation
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-dictionary/commit/1c94d612030ef87c6e26a01a490470b71c39e341.patch";
sha256 = "sha256:0cbswmhs9mks3gsc0iy4wnidsa8sfzzf4s1kgvb80qwffgxz5m8b";
})
];
doCheck = true;
nativeBuildInputs = [

View file

@ -1,4 +1,4 @@
{ mkXfceDerivation, polkit, exo, libxfce4util, libxfce4ui, xfconf, iceauth, gtk3, glib, libwnck3, xorg, xfce4-session, runtimeShell }:
{ mkXfceDerivation, polkit, exo, libxfce4util, libxfce4ui, xfconf, iceauth, gtk3, glib, libwnck3, xorg, xfce4-session }:
mkXfceDerivation {
category = "xfce";
@ -14,25 +14,9 @@ mkXfceDerivation {
# See https://github.com/NixOS/nixpkgs/issues/36468
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
# Don't use startxfce4 in xfce.desktop
# It's has FHS isms
postFixup = ''
chmod +x $out/etc/xdg/xfce4/xinitrc
patchShebangs $out/etc/xdg/xfce4/xinitrc
passthru.xinitrc = "${xfce4-session}/etc/xdg/xfce4/xinitrc";
substituteInPlace "$out/share/xsessions/xfce.desktop" \
--replace "Exec=startxfce4" "Exec=$out/etc/xdg/xfce4/xinitrc"
'';
passthru = {
xinitrc = "${xfce4-session}/etc/xdg/xfce4/xinitrc";
providedSessions = [
"xfce"
];
};
meta = {
meta = {
description = "Session manager for Xfce";
};
}

View file

@ -76,42 +76,6 @@ let
sha512 = "rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==";
};
};
"@types/events-3.0.0" = {
name = "_at_types_slash_events";
packageName = "@types/events";
version = "3.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz";
sha512 = "EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==";
};
};
"@types/glob-7.1.1" = {
name = "_at_types_slash_glob";
packageName = "@types/glob";
version = "7.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz";
sha512 = "1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==";
};
};
"@types/minimatch-3.0.3" = {
name = "_at_types_slash_minimatch";
packageName = "@types/minimatch";
version = "3.0.3";
src = fetchurl {
url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz";
sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==";
};
};
"@types/node-13.1.2" = {
name = "_at_types_slash_node";
packageName = "@types/node";
version = "13.1.2";
src = fetchurl {
url = "https://registry.npmjs.org/@types/node/-/node-13.1.2.tgz";
sha512 = "B8emQA1qeKerqd1dmIsQYnXi+mmAzTB7flExjmy5X1aVAKFNNNDubkavwR13kR6JnpeLp3aLoJhwn9trWPAyFQ==";
};
};
"accepts-1.3.7" = {
name = "accepts";
packageName = "accepts";
@ -121,13 +85,13 @@ let
sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==";
};
};
"ajv-6.10.2" = {
"ajv-6.11.0" = {
name = "ajv";
packageName = "ajv";
version = "6.10.2";
version = "6.11.0";
src = fetchurl {
url = "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz";
sha512 = "TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==";
url = "https://registry.npmjs.org/ajv/-/ajv-6.11.0.tgz";
sha512 = "nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA==";
};
};
"ansi-regex-2.1.1" = {
@ -310,13 +274,13 @@ let
sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
};
};
"aws4-1.9.0" = {
"aws4-1.9.1" = {
name = "aws4";
packageName = "aws4";
version = "1.9.0";
version = "1.9.1";
src = fetchurl {
url = "https://registry.npmjs.org/aws4/-/aws4-1.9.0.tgz";
sha512 = "Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A==";
url = "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz";
sha512 = "wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==";
};
};
"babel-runtime-6.18.0" = {
@ -841,13 +805,13 @@ let
sha512 = "5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==";
};
};
"core-js-3.6.1" = {
"core-js-3.6.4" = {
name = "core-js";
packageName = "core-js";
version = "3.6.1";
version = "3.6.4";
src = fetchurl {
url = "https://registry.npmjs.org/core-js/-/core-js-3.6.1.tgz";
sha512 = "186WjSik2iTGfDjfdCZAxv2ormxtKgemjC3SI6PL31qOA0j5LhTDVjHChccoc7brwLvpvLPiMyRlcO88C4l1QQ==";
url = "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz";
sha512 = "4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==";
};
};
"core-util-is-1.0.2" = {
@ -985,13 +949,13 @@ let
sha512 = "h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==";
};
};
"defer-to-connect-1.1.1" = {
"defer-to-connect-1.1.3" = {
name = "defer-to-connect";
packageName = "defer-to-connect";
version = "1.1.1";
version = "1.1.3";
src = fetchurl {
url = "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.1.tgz";
sha512 = "J7thop4u3mRTkYRQ+Vpfwy2G5Ehoy82I14+14W4YMDLKdWloI9gSzRbV30s/NckQGVJtPkWNcW4oMAUigTdqiQ==";
url = "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz";
sha512 = "0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==";
};
};
"define-properties-1.1.3" = {
@ -1102,14 +1066,14 @@ let
sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d";
};
};
"elm-analyse-git://github.com/elm-tooling/elm-analyse#f2a983fc7bab262a3e44b46732735d8510d18876" = {
"elm-analyse-git://github.com/elm-tooling/elm-analyse#1a665a6e540d7d11b29b3c5e3c52089704325d9c" = {
name = "elm-analyse";
packageName = "elm-analyse";
version = "0.16.4";
version = "0.16.5";
src = fetchgit {
url = "git://github.com/elm-tooling/elm-analyse";
rev = "f2a983fc7bab262a3e44b46732735d8510d18876";
sha256 = "ce2770330503a0b8fe56eb369a95e9bad13b46676ff76f5303570d731cea4de2";
rev = "1a665a6e540d7d11b29b3c5e3c52089704325d9c";
sha256 = "a442bce37ae37a65c1488c66e477c404da1c7f137a6668d89c4b09de845ca374";
};
};
"elm-hot-1.1.1" = {
@ -1175,13 +1139,13 @@ let
sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==";
};
};
"es-abstract-1.17.0" = {
"es-abstract-1.17.4" = {
name = "es-abstract";
packageName = "es-abstract";
version = "1.17.0";
version = "1.17.4";
src = fetchurl {
url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.0.tgz";
sha512 = "yYkE07YF+6SIBmg1MsJ9dlub5L48Ek7X0qz+c/CPCHS9EBXfESorzng4cJQjJW5/pB6vDF41u7F8vUhLVDqIug==";
url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz";
sha512 = "Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==";
};
};
"es-to-primitive-1.2.1" = {
@ -1256,13 +1220,13 @@ let
sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==";
};
};
"execa-3.4.0" = {
"execa-4.0.0" = {
name = "execa";
packageName = "execa";
version = "3.4.0";
version = "4.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/execa/-/execa-3.4.0.tgz";
sha512 = "r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g==";
url = "https://registry.npmjs.org/execa/-/execa-4.0.0.tgz";
sha512 = "JbDUxwV3BoT5ZVXQrSVbAiaXhXUkIwvbhPIwZ0N13kX+5yCzOhUNdocxB/UQRuYOHRYYwAxKYwJYc0T4D12pDA==";
};
};
"expand-brackets-2.1.4" = {
@ -1355,13 +1319,13 @@ let
sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
};
};
"fast-deep-equal-2.0.1" = {
"fast-deep-equal-3.1.1" = {
name = "fast-deep-equal";
packageName = "fast-deep-equal";
version = "2.0.1";
version = "3.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz";
sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49";
url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz";
sha512 = "8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==";
};
};
"fast-diff-1.2.0" = {
@ -1499,13 +1463,13 @@ let
sha512 = "8KcmfI0jgSECnzdhucm0i7vrwef3BWwgjimW2YkRC5eSFwjb5DibVoA0YvgkYwwxuJi9c+7M7X3b3lX8o9B6wg==";
};
};
"follow-redirects-1.9.0" = {
"follow-redirects-1.10.0" = {
name = "follow-redirects";
packageName = "follow-redirects";
version = "1.9.0";
version = "1.10.0";
src = fetchurl {
url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.9.0.tgz";
sha512 = "CRcPzsSIbXyVDl0QI01muNDu69S8trU4jArW9LpOt2WtC6LyUJetcIrmfHsRBx7/Jb6GHJUiuqyYxPooFfNt6A==";
url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.10.0.tgz";
sha512 = "4eyLK6s6lH32nOvLLwlIOnr9zrL8Sm+OvW4pVTJNoXeGzYIkHVf+pADQi+OJ0E67hiuSLezPVPyBcIZO50TmmQ==";
};
};
"for-in-1.0.2" = {
@ -1733,13 +1697,13 @@ let
sha512 = "qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==";
};
};
"globby-10.0.1" = {
"globby-11.0.0" = {
name = "globby";
packageName = "globby";
version = "10.0.1";
version = "11.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/globby/-/globby-10.0.1.tgz";
sha512 = "sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A==";
url = "https://registry.npmjs.org/globby/-/globby-11.0.0.tgz";
sha512 = "iuehFnR3xu5wBBtm4xi0dMe92Ob87ufyu/dHwpDYfbcpYpIbrO5OnS8M1vWvrBhSGEJ3/Ecj7gnX76P8YxpPEg==";
};
};
"got-8.3.2" = {
@ -2498,13 +2462,13 @@ let
sha512 = "NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==";
};
};
"kind-of-6.0.2" = {
"kind-of-6.0.3" = {
name = "kind-of";
packageName = "kind-of";
version = "6.0.2";
version = "6.0.3";
src = fetchurl {
url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz";
sha512 = "s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==";
url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz";
sha512 = "dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==";
};
};
"klaw-2.1.1" = {
@ -2705,22 +2669,22 @@ let
sha512 = "QgrPRJfE+riq5TPZMcHZOtm8c6K/yYrMbKIoRfapfiGLxS8OTeIfRhUGW5LU7MlRa52KOAGCfUNruqLrIBvWZw==";
};
};
"mime-db-1.42.0" = {
"mime-db-1.43.0" = {
name = "mime-db";
packageName = "mime-db";
version = "1.42.0";
version = "1.43.0";
src = fetchurl {
url = "https://registry.npmjs.org/mime-db/-/mime-db-1.42.0.tgz";
sha512 = "UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ==";
url = "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz";
sha512 = "+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==";
};
};
"mime-types-2.1.25" = {
"mime-types-2.1.26" = {
name = "mime-types";
packageName = "mime-types";
version = "2.1.25";
version = "2.1.26";
src = fetchurl {
url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.25.tgz";
sha512 = "5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg==";
url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz";
sha512 = "01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==";
};
};
"mimic-fn-2.1.0" = {
@ -3155,15 +3119,6 @@ let
sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae";
};
};
"p-finally-2.0.1" = {
name = "p-finally";
packageName = "p-finally";
version = "2.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz";
sha512 = "vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==";
};
};
"p-is-promise-1.1.0" = {
name = "p-is-promise";
packageName = "p-is-promise";
@ -3308,13 +3263,13 @@ let
sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
};
};
"picomatch-2.1.1" = {
"picomatch-2.2.1" = {
name = "picomatch";
packageName = "picomatch";
version = "2.1.1";
version = "2.2.1";
src = fetchurl {
url = "https://registry.npmjs.org/picomatch/-/picomatch-2.1.1.tgz";
sha512 = "OYMyqkKzK7blWO/+XZYP6w8hH0LDvkBvdvKukti+7kqYFCiEAk+gI3DWnryapc0Dau05ugGTy0foQ6mqn4AHYA==";
url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.1.tgz";
sha512 = "ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==";
};
};
"pify-3.0.0" = {
@ -3515,13 +3470,13 @@ let
sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e";
};
};
"readable-stream-2.3.6" = {
"readable-stream-2.3.7" = {
name = "readable-stream";
packageName = "readable-stream";
version = "2.3.6";
version = "2.3.7";
src = fetchurl {
url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz";
sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==";
url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz";
sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==";
};
};
"readdirp-3.1.3" = {
@ -4586,13 +4541,13 @@ let
sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
};
};
"util.promisify-1.0.0" = {
"util.promisify-1.0.1" = {
name = "util.promisify";
packageName = "util.promisify";
version = "1.0.0";
version = "1.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz";
sha512 = "i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==";
url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz";
sha512 = "g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==";
};
};
"utils-merge-1.0.1" = {
@ -4604,13 +4559,13 @@ let
sha1 = "9f95710f50a267947b2ccc124741c1028427e713";
};
};
"uuid-3.3.3" = {
"uuid-3.4.0" = {
name = "uuid";
packageName = "uuid";
version = "3.3.3";
version = "3.4.0";
src = fetchurl {
url = "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz";
sha512 = "pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==";
url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz";
sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==";
};
};
"vary-1.1.2" = {
@ -4694,13 +4649,13 @@ let
sha1 = "2f7f9b8fd10d677262b18a884e28d19618e028fb";
};
};
"web-tree-sitter-0.15.11" = {
"web-tree-sitter-0.16.0" = {
name = "web-tree-sitter";
packageName = "web-tree-sitter";
version = "0.15.11";
version = "0.16.0";
src = fetchurl {
url = "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.15.11.tgz";
sha512 = "7Sr26MV8bPPvKU+4VMpOoLYwaAFBsCsxRGtxYPSxClWIaR2KIciqg6zUeG14W9QrdlpBt7VHHzhd1CBb0e6i8w==";
url = "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.16.0.tgz";
sha512 = "ETAt+Nf9KUc6bvE8waKVpEJir9F+L80//IUyOd5/nvF+1HLb+3QoZpyOW2R1ywEaXMGOer7tOtTZfyCIR2qGzA==";
};
};
"which-1.3.1" = {
@ -4896,14 +4851,14 @@ in
};
dependencies = [
sources."@types/color-name-1.1.1"
sources."ajv-6.10.2"
sources."ajv-6.11.0"
sources."ansi-styles-4.2.1"
sources."anymatch-3.1.1"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
sources."asynckit-0.4.0"
sources."aws-sign2-0.7.0"
sources."aws4-1.9.0"
sources."aws4-1.9.1"
sources."balanced-match-1.0.0"
sources."bcrypt-pbkdf-1.0.2"
sources."binary-0.3.0"
@ -4930,7 +4885,7 @@ in
sources."elmi-to-json-1.3.0"
sources."extend-3.0.2"
sources."extsprintf-1.3.0"
sources."fast-deep-equal-2.0.1"
sources."fast-deep-equal-3.1.1"
sources."fast-json-stable-stringify-2.1.0"
sources."fill-range-7.0.1"
(sources."find-elm-dependencies-2.0.2" // {
@ -4970,8 +4925,8 @@ in
sources."jsonfile-4.0.0"
sources."jsprim-1.4.1"
sources."lodash-4.17.15"
sources."mime-db-1.42.0"
sources."mime-types-2.1.25"
sources."mime-db-1.43.0"
sources."mime-types-2.1.26"
sources."minimatch-3.0.4"
sources."minimist-1.2.0"
sources."minipass-2.9.0"
@ -4999,7 +4954,7 @@ in
sources."path-is-absolute-1.0.1"
sources."path-key-3.1.1"
sources."performance-now-2.1.0"
sources."picomatch-2.1.1"
sources."picomatch-2.2.1"
sources."psl-1.7.0"
sources."punycode-2.1.1"
sources."qs-6.5.2"
@ -5032,7 +4987,7 @@ in
sources."universalify-0.1.2"
sources."unzip-stream-0.3.0"
sources."uri-js-4.2.2"
sources."uuid-3.3.3"
sources."uuid-3.4.0"
sources."verror-1.10.0"
sources."which-2.0.1"
sources."wrappy-1.0.2"
@ -5058,7 +5013,7 @@ in
sha512 = "dAOv+U9hXZ0IRGx19mkpCAdf5rUwoJWlzFmcR2gvOzE/QjZUSlPh3e0IIDAfGUuEF8DjfE5CTe31fNtIkkd2rQ==";
};
dependencies = [
sources."ajv-6.10.2"
sources."ajv-6.11.0"
sources."ansi-regex-4.1.0"
sources."ansi-styles-3.2.1"
sources."anymatch-3.1.1"
@ -5066,7 +5021,7 @@ in
sources."assert-plus-1.0.0"
sources."asynckit-0.4.0"
sources."aws-sign2-0.7.0"
sources."aws4-1.9.0"
sources."aws4-1.9.1"
sources."balanced-match-1.0.0"
sources."bcrypt-pbkdf-1.0.2"
sources."binary-0.3.0"
@ -5109,7 +5064,7 @@ in
sources."escape-string-regexp-1.0.5"
sources."extend-3.0.2"
sources."extsprintf-1.3.0"
sources."fast-deep-equal-2.0.1"
sources."fast-deep-equal-3.1.1"
sources."fast-json-stable-stringify-2.1.0"
sources."fill-range-7.0.1"
(sources."find-elm-dependencies-2.0.2" // {
@ -5153,8 +5108,8 @@ in
sources."jsprim-1.4.1"
sources."locate-path-3.0.0"
sources."lodash-4.17.15"
sources."mime-db-1.42.0"
sources."mime-types-2.1.25"
sources."mime-db-1.43.0"
sources."mime-types-2.1.26"
sources."minimatch-3.0.4"
sources."minimist-1.2.0"
sources."minipass-2.9.0"
@ -5184,7 +5139,7 @@ in
sources."path-is-absolute-1.0.1"
sources."path-key-3.1.1"
sources."performance-now-2.1.0"
sources."picomatch-2.1.1"
sources."picomatch-2.2.1"
sources."psl-1.7.0"
sources."punycode-2.1.1"
sources."qs-6.5.2"
@ -5226,7 +5181,7 @@ in
sources."universalify-0.1.2"
sources."unzip-stream-0.3.0"
sources."uri-js-4.2.2"
sources."uuid-3.3.3"
sources."uuid-3.4.0"
sources."verror-1.10.0"
sources."which-2.0.1"
sources."which-module-2.0.0"
@ -5322,7 +5277,7 @@ in
sources."cookie-0.4.0"
sources."cookie-signature-1.0.6"
sources."copy-descriptor-0.1.1"
sources."core-js-3.6.1"
sources."core-js-3.6.4"
sources."core-util-is-1.0.2"
sources."cross-spawn-6.0.5"
sources."debug-2.6.9"
@ -5337,7 +5292,7 @@ in
sources."ee-first-1.1.1"
sources."encodeurl-1.0.2"
sources."end-of-stream-1.4.4"
sources."es-abstract-1.17.0"
sources."es-abstract-1.17.4"
sources."es-to-primitive-1.2.1"
sources."escape-html-1.0.3"
sources."escape-string-regexp-1.0.5"
@ -5447,7 +5402,7 @@ in
sources."isurl-1.0.0"
sources."json-buffer-3.0.0"
sources."keyv-3.0.0"
sources."kind-of-6.0.2"
sources."kind-of-6.0.3"
sources."latest-version-4.0.0"
sources."lowercase-keys-1.0.1"
sources."makeerror-1.0.11"
@ -5458,8 +5413,8 @@ in
sources."methods-1.1.2"
sources."micromatch-3.1.10"
sources."mime-1.6.0"
sources."mime-db-1.42.0"
sources."mime-types-2.1.25"
sources."mime-db-1.43.0"
sources."mime-types-2.1.26"
sources."mimic-response-1.0.1"
sources."minimatch-3.0.4"
sources."minimist-1.2.0"
@ -5520,7 +5475,7 @@ in
sources."range-parser-1.2.1"
sources."raw-body-2.4.0"
sources."rc-1.2.8"
sources."readable-stream-2.3.6"
sources."readable-stream-2.3.7"
sources."regex-not-1.0.2"
sources."registry-auth-token-3.4.0"
sources."registry-url-3.1.0"
@ -5645,7 +5600,7 @@ in
sources."url-to-options-1.0.1"
sources."use-3.1.1"
sources."util-deprecate-1.0.2"
sources."util.promisify-1.0.0"
sources."util.promisify-1.0.1"
sources."utils-merge-1.0.1"
sources."vary-1.1.2"
sources."walker-1.0.7"
@ -5684,7 +5639,7 @@ in
sources."clone-response-1.0.2"
sources."config-chain-1.1.12"
sources."decompress-response-3.3.0"
sources."defer-to-connect-1.1.1"
sources."defer-to-connect-1.1.3"
sources."duplexer3-0.1.4"
sources."end-of-stream-1.4.4"
sources."fs-extra-8.1.0"
@ -5745,14 +5700,14 @@ in
};
dependencies = [
sources."accepts-1.3.7"
sources."ajv-6.10.2"
sources."ajv-6.11.0"
sources."array-flatten-1.1.1"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
sources."async-limiter-1.0.1"
sources."asynckit-0.4.0"
sources."aws-sign2-0.7.0"
sources."aws4-1.9.0"
sources."aws4-1.9.1"
sources."babel-runtime-6.18.0"
sources."bcrypt-pbkdf-1.0.2"
sources."body-parser-1.19.0"
@ -5801,7 +5756,7 @@ in
})
sources."extend-3.0.2"
sources."extsprintf-1.3.0"
sources."fast-deep-equal-2.0.1"
sources."fast-deep-equal-3.1.1"
sources."fast-json-stable-stringify-2.1.0"
(sources."finalhandler-1.1.1" // {
dependencies = [
@ -5839,8 +5794,8 @@ in
sources."merge-descriptors-1.0.1"
sources."methods-1.1.2"
sources."mime-1.4.1"
sources."mime-db-1.42.0"
sources."mime-types-2.1.25"
sources."mime-db-1.43.0"
sources."mime-types-2.1.26"
sources."minimist-1.2.0"
sources."ms-2.0.0"
sources."negotiator-0.6.2"
@ -5902,7 +5857,7 @@ in
sources."uri-js-4.2.2"
sources."util-deprecate-1.0.2"
sources."utils-merge-1.0.1"
sources."uuid-3.3.3"
sources."uuid-3.4.0"
sources."vary-1.1.2"
sources."verror-1.10.0"
(sources."ws-3.3.1" // {
@ -5963,7 +5918,7 @@ in
})
sources."fill-range-7.0.1"
sources."finalhandler-1.1.2"
(sources."follow-redirects-1.9.0" // {
(sources."follow-redirects-1.10.0" // {
dependencies = [
sources."debug-3.2.6"
sources."ms-2.1.2"
@ -6003,7 +5958,7 @@ in
sources."parseurl-1.3.3"
sources."path-key-2.0.1"
sources."pem-1.14.2"
sources."picomatch-2.1.1"
sources."picomatch-2.2.1"
sources."pseudomap-1.0.2"
sources."pump-3.0.0"
sources."range-parser-1.2.1"
@ -6063,7 +6018,7 @@ in
sources."klaw-2.1.1"
sources."minimist-1.2.0"
sources."process-nextick-args-2.0.1"
sources."readable-stream-2.3.6"
sources."readable-stream-2.3.7"
sources."safe-buffer-5.1.2"
sources."semver-6.3.0"
sources."semver-regex-1.0.0"
@ -6091,21 +6046,17 @@ in
"@elm-tooling/elm-language-server" = nodeEnv.buildNodePackage {
name = "_at_elm-tooling_slash_elm-language-server";
packageName = "@elm-tooling/elm-language-server";
version = "1.4.6";
version = "1.5.0";
src = fetchurl {
url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-1.4.6.tgz";
sha512 = "Cf1atW2nqZtDgyPFug0c9qo3A1a1mtTtKHRr3jGpIQnp8eb99kbPkERI3xFcbgyhgBOygVd3g282Y8jGawHbdA==";
url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-1.5.0.tgz";
sha512 = "xyO0Su4pAL4jAM09Hn8YEx8D3xqxUHvyLtTxSLos+bgmKXQd4gSbXi76En3EUfRIEQlgtzB/ywvCZe3zJApNxw==";
};
dependencies = [
sources."@nodelib/fs.scandir-2.1.3"
sources."@nodelib/fs.stat-2.0.3"
sources."@nodelib/fs.walk-1.2.4"
sources."@types/events-3.0.0"
sources."@types/glob-7.1.1"
sources."@types/minimatch-3.0.3"
sources."@types/node-13.1.2"
sources."accepts-1.3.7"
sources."ajv-6.10.2"
sources."ajv-6.11.0"
sources."array-flatten-1.1.1"
sources."array-union-2.1.0"
sources."asn1-0.2.4"
@ -6113,17 +6064,14 @@ in
sources."async-limiter-1.0.1"
sources."asynckit-0.4.0"
sources."aws-sign2-0.7.0"
sources."aws4-1.9.0"
sources."aws4-1.9.1"
sources."babel-runtime-6.18.0"
sources."balanced-match-1.0.0"
sources."bcrypt-pbkdf-1.0.2"
sources."body-parser-1.18.2"
sources."brace-expansion-1.1.11"
sources."body-parser-1.19.0"
sources."braces-3.0.2"
sources."bytes-3.0.0"
sources."bytes-3.1.0"
sources."caseless-0.12.0"
sources."combined-stream-1.0.8"
sources."concat-map-0.0.1"
sources."concat-stream-1.5.2"
sources."content-disposition-0.5.2"
sources."content-type-1.0.4"
@ -6140,7 +6088,7 @@ in
sources."dir-glob-3.0.1"
sources."ecc-jsbn-0.1.2"
sources."ee-first-1.1.1"
(sources."elm-analyse-git://github.com/elm-tooling/elm-analyse#f2a983fc7bab262a3e44b46732735d8510d18876" // {
(sources."elm-analyse-git://github.com/elm-tooling/elm-analyse#1a665a6e540d7d11b29b3c5e3c52089704325d9c" // {
dependencies = [
sources."ultron-1.1.1"
sources."ws-3.3.1"
@ -6150,12 +6098,29 @@ in
sources."end-of-stream-1.4.4"
sources."escape-html-1.0.3"
sources."etag-1.8.1"
(sources."execa-3.4.0" // {
(sources."execa-4.0.0" // {
dependencies = [
sources."is-stream-2.0.0"
];
})
sources."express-4.16.3"
(sources."express-4.16.3" // {
dependencies = [
sources."body-parser-1.18.2"
sources."bytes-3.0.0"
sources."http-errors-1.6.3"
sources."iconv-lite-0.4.19"
sources."qs-6.5.1"
(sources."raw-body-2.3.2" // {
dependencies = [
sources."depd-1.1.1"
sources."http-errors-1.6.2"
sources."setprototypeof-1.0.3"
];
})
sources."setprototypeof-1.1.0"
sources."statuses-1.4.0"
];
})
(sources."express-ws-2.0.0" // {
dependencies = [
sources."ws-1.1.5"
@ -6163,34 +6128,35 @@ in
})
sources."extend-3.0.2"
sources."extsprintf-1.3.0"
sources."fast-deep-equal-2.0.1"
sources."fast-deep-equal-3.1.1"
sources."fast-diff-1.2.0"
sources."fast-glob-3.1.1"
sources."fast-json-stable-stringify-2.1.0"
sources."fastq-1.6.0"
sources."fill-range-7.0.1"
sources."finalhandler-1.1.1"
(sources."finalhandler-1.1.1" // {
dependencies = [
sources."statuses-1.4.0"
];
})
sources."find-0.2.7"
sources."forever-agent-0.6.1"
sources."form-data-2.3.3"
sources."forwarded-0.1.2"
sources."fresh-0.5.2"
sources."fs-extra-2.0.0"
sources."fs.realpath-1.0.0"
sources."get-stream-5.1.0"
sources."getpass-0.1.7"
sources."glob-7.1.6"
sources."glob-parent-5.1.0"
sources."globby-10.0.1"
sources."globby-11.0.0"
sources."graceful-fs-4.2.3"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
sources."http-errors-1.6.3"
sources."http-errors-1.7.2"
sources."http-signature-1.2.0"
sources."human-signals-1.1.1"
sources."iconv-lite-0.4.19"
sources."iconv-lite-0.4.24"
sources."ignore-5.1.4"
sources."inflight-1.0.6"
sources."inherits-2.0.3"
sources."ipaddr.js-1.9.0"
sources."is-extglob-2.1.1"
@ -6216,10 +6182,9 @@ in
sources."methods-1.1.2"
sources."micromatch-4.0.2"
sources."mime-1.4.1"
sources."mime-db-1.42.0"
sources."mime-types-2.1.25"
sources."mime-db-1.43.0"
sources."mime-types-2.1.26"
sources."mimic-fn-2.1.0"
sources."minimatch-3.0.4"
sources."minimist-1.2.0"
sources."ms-2.0.0"
sources."negotiator-0.6.2"
@ -6233,29 +6198,21 @@ in
sources."options-0.0.6"
sources."os-homedir-1.0.2"
sources."os-tmpdir-1.0.2"
sources."p-finally-2.0.1"
sources."parseurl-1.3.3"
sources."path-is-absolute-1.0.1"
sources."path-key-3.1.1"
sources."path-to-regexp-0.1.7"
sources."path-type-4.0.0"
sources."performance-now-2.1.0"
sources."picomatch-2.1.1"
sources."picomatch-2.2.1"
sources."pjson-1.0.9"
sources."process-nextick-args-1.0.7"
sources."proxy-addr-2.0.5"
sources."psl-1.7.0"
sources."pump-3.0.0"
sources."punycode-2.1.1"
sources."qs-6.5.1"
sources."qs-6.7.0"
sources."range-parser-1.2.1"
(sources."raw-body-2.3.2" // {
dependencies = [
sources."depd-1.1.1"
sources."http-errors-1.6.2"
sources."setprototypeof-1.0.3"
];
})
sources."raw-body-2.4.0"
sources."readable-stream-2.0.6"
sources."regenerator-runtime-0.9.6"
(sources."request-2.88.0" // {
@ -6269,21 +6226,28 @@ in
sources."rxjs-6.5.4"
sources."safe-buffer-5.1.1"
sources."safer-buffer-2.1.2"
sources."send-0.16.2"
(sources."send-0.16.2" // {
dependencies = [
sources."http-errors-1.6.3"
sources."setprototypeof-1.1.0"
sources."statuses-1.4.0"
];
})
sources."serve-static-1.13.2"
sources."setprototypeof-1.1.0"
sources."setprototypeof-1.1.1"
sources."shebang-command-2.0.0"
sources."shebang-regex-3.0.0"
sources."signal-exit-3.0.2"
sources."slash-3.0.0"
sources."sshpk-1.16.1"
sources."statuses-1.4.0"
sources."statuses-1.5.0"
sources."string_decoder-0.10.31"
sources."strip-final-newline-2.0.0"
sources."sums-0.2.4"
sources."through2-2.0.1"
sources."tmp-0.0.31"
sources."to-regex-range-5.0.1"
sources."toidentifier-1.0.0"
(sources."tough-cookie-2.4.3" // {
dependencies = [
sources."punycode-1.4.1"
@ -6300,7 +6264,7 @@ in
sources."uri-js-4.2.2"
sources."util-deprecate-1.0.2"
sources."utils-merge-1.0.1"
sources."uuid-3.3.3"
sources."uuid-3.4.0"
sources."vary-1.1.2"
sources."verror-1.10.0"
sources."vscode-jsonrpc-4.0.0"
@ -6312,7 +6276,7 @@ in
sources."vscode-languageserver-protocol-3.14.1"
sources."vscode-languageserver-types-3.14.0"
sources."vscode-uri-2.1.1"
sources."web-tree-sitter-0.15.11"
sources."web-tree-sitter-0.16.0"
sources."which-2.0.2"
sources."wrappy-1.0.2"
sources."ws-7.2.1"

View file

@ -21,6 +21,10 @@ let params = {
rev = "V8.10+beta1";
sha256 = "1slw227idwjw9a21vj3s6kal22mrmvvlpg8r7xk590ml99bn6404";
};
"8.11" = {
rev = "V8.11.0";
sha256 = "1xcd7c7qlvs0narfba6px34zq0mz8rffnhxw0kzhhg6i4iw115dp";
};
};
param = params.${coq.coq-version};
in

View file

@ -736,7 +736,7 @@ self: super: {
owner = "haskell-servant";
repo = "servant";
rev = "v${ver}";
sha256 = "0kqglih3rv12nmkzxvalhfaaafk4b2irvv9x5xmc48i1ns71y23l";
sha256 = "0xk3czk3jhqjxhy0g8r2248m8yxgvmqhgn955k92z0h7p02lfs89";
}}/doc";
# Needed after sphinx 1.7.9 -> 1.8.3
postPatch = ''

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "janet";
version = "1.6.0";
version = "1.7.0";
src = fetchFromGitHub {
owner = "janet-lang";
repo = pname;
rev = "v${version}";
sha256 = "044pqwbpdyn7afij68wxks8drb84kmj31c8ziqsfm5msi2al0rw2";
sha256 = "1z7r4ddgwxgxy1pp36p2wchcmzjqfyki3a4kicnr23ldflqv9ycc";
};
nativeBuildInputs = [ meson ninja ];

View file

@ -23,7 +23,7 @@
, pngquant
}:
stdenv.mkDerivation rec {
name = "appstream-glib-0.7.15";
name = "appstream-glib-0.7.16";
outputs = [ "out" "dev" "man" "installedTests" ];
outputBin = "dev";
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
owner = "hughsie";
repo = "appstream-glib";
rev = stdenv.lib.replaceStrings [ "." "-" ] [ "_" "_" ] name;
sha256 = "16cqs1s7nqc551sipgaxbbzwap1km0n12s4lcgfbxzzl9bcjbp9m";
sha256 = "05x2pmsq18fcpgfvx0y54qdlryy5c9k3sxk6kgank8frkzhgnm9r";
};
nativeBuildInputs = [

View file

@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
pname = "libhandy";
version = "0.0.12";
version = "0.0.13";
outputs = [ "out" "dev" "devdoc" "glade" ];
outputBin = "dev";
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
owner = "Librem5";
repo = pname;
rev = "v${version}";
sha256 = "09wlknarzsbk9hr5ws6s7x5kibkhx9ayrbhshfqib4zkhq2f76hw";
sha256 = "1y23k623sjkldfrdiwfarpchg5mg58smcy1pkgnwfwca15wm1ra5";
};
nativeBuildInputs = [

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libqglviewer";
version = "2.7.1";
version = "2.7.2";
src = fetchurl {
url = "http://www.libqglviewer.com/src/libQGLViewer-${version}.tar.gz";
sha256 = "08f10yk22kjdsvrqhd063gqa8nxnl749c20mwhaxij4f7rzdkixz";
sha256 = "023w7da1fyn2z69nbkp2rndiv886zahmc5cmira79zswxjfpklp2";
};
nativeBuildInputs = [ qmake ];

View file

@ -20,14 +20,6 @@ stdenv.mkDerivation rec {
"-Dx-locale-root=${libX11.out}/share/X11/locale"
];
patches = stdenv.lib.optionals stdenv.isDarwin [
# Fix build on darwin
(fetchpatch {
url = "https://github.com/xkbcommon/libxkbcommon/commit/32d178b50fe0da05e51e4fe8903c84371d133331.patch";
sha256 = "1wqdjla8hmgdqr8xc2manw363sxrqqsn3s8bd397h3cd7fj3hh1v";
})
];
doCheck = false; # fails, needs unicode locale
meta = with stdenv.lib; {

View file

@ -1,20 +1,22 @@
{stdenv, fetchpatch, autoconf, automake, fetchFromGitHub, pkgconfig}:
{ stdenv
, fetchpatch
, autoconf
, automake
, fetchFromGitHub
, pkgconfig
}:
let
stdenv.mkDerivation rec {
pname = "mypaint-brushes";
version = "1.3.0";
in stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "Jehan";
owner = "mypaint";
repo = pname;
rev = "v${version}";
sha256 = "1iz89z6v2mp8j1lrf942k561s8311i3s34ap36wh4rybb2lq15m0";
};
nativeBuildInputs = [ autoconf automake pkgconfig ];
patches = [
# build with automake 1.16
(fetchpatch {
@ -23,10 +25,16 @@ in stdenv.mkDerivation {
})
];
nativeBuildInputs = [
autoconf
automake
pkgconfig
];
preConfigure = "./autogen.sh";
meta = with stdenv.lib; {
homepage = http://mypaint.org/;
homepage = "http://mypaint.org/";
description = "Brushes used by MyPaint and other software using libmypaint.";
license = licenses.cc0;
maintainers = with maintainers; [ jtojnar ];

View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "openwsman";
version = "2.6.9";
version = "2.6.11";
src = fetchFromGitHub {
owner = "Openwsman";
repo = "openwsman";
rev = "v${version}";
sha256 = "19s5h551ppxmi2kljf8z58jjc6yrpczbxdrl4hh2l4jxv7iphk5i";
sha256 = "0s8xdxrxnh1l0v41n5cw89b89rrlqlxn1yj14sw224230y8m70ka";
};
nativeBuildInputs = [ cmake pkgconfig ];

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "spdk";
version = "19.10.1";
version = "20.01";
src = fetchFromGitHub {
owner = "spdk";
repo = "spdk";
rev = "v${version}";
sha256 = "1fajcc4c09p6wcfw08k0x4x7v8yh0ghq94zhs5d4g9563p2va6ab";
sha256 = "13pbl46bfzc3z10ydr1crimklyj7f0s73873bjknglw474gm52h8";
};
patches = [ ./spdk-dpdk-meson.patch ];

View file

@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "tiledb";
version = "1.7.2";
version = "1.7.5";
src = fetchFromGitHub {
owner = "TileDB-Inc";
repo = "TileDB";
rev = version;
sha256 = "00ykfc7p6n0nc97lvjnqjar95xyv8b2b77cjqczy03wh5i4gmifj";
sha256 = "1fx0db4x0vcahzk5lk2p0ls644s48vfz7mf9qgsr72pplyn1kcnc";
};
nativeBuildInputs = [

File diff suppressed because it is too large Load diff

View file

@ -13,13 +13,13 @@ let
sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
};
};
"ajv-6.10.2" = {
"ajv-6.11.0" = {
name = "ajv";
packageName = "ajv";
version = "6.10.2";
version = "6.11.0";
src = fetchurl {
url = "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz";
sha512 = "TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==";
url = "https://registry.npmjs.org/ajv/-/ajv-6.11.0.tgz";
sha512 = "nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA==";
};
};
"ansi-regex-2.1.1" = {
@ -553,13 +553,13 @@ let
sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
};
};
"fast-deep-equal-2.0.1" = {
"fast-deep-equal-3.1.1" = {
name = "fast-deep-equal";
packageName = "fast-deep-equal";
version = "2.0.1";
version = "3.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz";
sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49";
url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz";
sha512 = "8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==";
};
};
"fast-json-stable-stringify-2.1.0" = {
@ -1471,13 +1471,13 @@ let
sha512 = "qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==";
};
};
"npm-packlist-1.4.7" = {
"npm-packlist-1.4.8" = {
name = "npm-packlist";
packageName = "npm-packlist";
version = "1.4.7";
version = "1.4.8";
src = fetchurl {
url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.7.tgz";
sha512 = "vAj7dIkp5NhieaGZxBJB8fF4R0078rqsmhJcAfXZ6O7JJhjhPK96n5Ry1oZcfLXgfun0GWTZPOxaEyqv8GBykQ==";
url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz";
sha512 = "5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==";
};
};
"npm-registry-client-8.6.0" = {
@ -1831,13 +1831,13 @@ let
sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==";
};
};
"resolve-1.14.2" = {
"resolve-1.15.1" = {
name = "resolve";
packageName = "resolve";
version = "1.14.2";
version = "1.15.1";
src = fetchurl {
url = "https://registry.npmjs.org/resolve/-/resolve-1.14.2.tgz";
sha512 = "EjlOBLBO1kxsUxsKjLt7TAECyKW6fOh1VRkykQkKGzcBbjjPIxBqGh0jf7GJ3k/f5mxMqW3htMD3WdTUVtW8HQ==";
url = "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz";
sha512 = "84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==";
};
};
"resolve-dir-1.0.1" = {
@ -2619,7 +2619,7 @@ in
sources."regex-not-1.0.2"
sources."repeat-element-1.1.3"
sources."repeat-string-1.6.1"
sources."resolve-1.14.2"
sources."resolve-1.15.1"
sources."resolve-dir-1.0.1"
sources."resolve-url-0.2.1"
sources."ret-0.1.15"
@ -2744,7 +2744,7 @@ in
};
dependencies = [
sources."abbrev-1.1.1"
sources."ajv-6.10.2"
sources."ajv-6.11.0"
sources."ansi-regex-2.1.1"
sources."aproba-1.2.0"
sources."are-we-there-yet-1.1.5"
@ -2774,7 +2774,7 @@ in
sources."ecc-jsbn-0.1.2"
sources."extend-3.0.2"
sources."extsprintf-1.3.0"
sources."fast-deep-equal-2.0.1"
sources."fast-deep-equal-3.1.1"
sources."fast-json-stable-stringify-2.1.0"
sources."findit-2.0.0"
sources."foreachasync-3.0.0"
@ -2869,7 +2869,7 @@ in
];
})
sources."request-2.88.0"
sources."resolve-1.14.2"
sources."resolve-1.15.1"
sources."retry-0.10.1"
sources."rimraf-2.6.3"
sources."safe-buffer-5.2.0"
@ -2934,7 +2934,7 @@ in
};
dependencies = [
sources."abbrev-1.1.1"
sources."ajv-6.10.2"
sources."ajv-6.11.0"
sources."ansi-regex-2.1.1"
sources."aproba-1.2.0"
sources."are-we-there-yet-1.1.5"
@ -2960,7 +2960,7 @@ in
sources."env-paths-2.2.0"
sources."extend-3.0.2"
sources."extsprintf-1.3.0"
sources."fast-deep-equal-2.0.1"
sources."fast-deep-equal-3.1.1"
sources."fast-json-stable-stringify-2.1.0"
sources."forever-agent-0.6.1"
sources."form-data-2.3.3"
@ -3111,7 +3111,7 @@ in
sources."nopt-4.0.1"
sources."npm-bundled-1.1.1"
sources."npm-normalize-package-bin-1.0.1"
sources."npm-packlist-1.4.7"
sources."npm-packlist-1.4.8"
sources."npmlog-4.1.2"
sources."number-is-nan-1.0.1"
sources."object-assign-4.1.1"

View file

@ -13,13 +13,13 @@ let
sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
};
};
"ajv-6.10.2" = {
"ajv-6.11.0" = {
name = "ajv";
packageName = "ajv";
version = "6.10.2";
version = "6.11.0";
src = fetchurl {
url = "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz";
sha512 = "TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==";
url = "https://registry.npmjs.org/ajv/-/ajv-6.11.0.tgz";
sha512 = "nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA==";
};
};
"ansi-regex-2.1.1" = {
@ -85,13 +85,13 @@ let
sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
};
};
"aws4-1.9.0" = {
"aws4-1.9.1" = {
name = "aws4";
packageName = "aws4";
version = "1.9.0";
version = "1.9.1";
src = fetchurl {
url = "https://registry.npmjs.org/aws4/-/aws4-1.9.0.tgz";
sha512 = "Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A==";
url = "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz";
sha512 = "wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==";
};
};
"balanced-match-1.0.0" = {
@ -283,13 +283,13 @@ let
sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
};
};
"fast-deep-equal-2.0.1" = {
"fast-deep-equal-3.1.1" = {
name = "fast-deep-equal";
packageName = "fast-deep-equal";
version = "2.0.1";
version = "3.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz";
sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49";
url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz";
sha512 = "8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==";
};
};
"fast-json-stable-stringify-2.1.0" = {
@ -571,22 +571,22 @@ let
sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2";
};
};
"mime-db-1.42.0" = {
"mime-db-1.43.0" = {
name = "mime-db";
packageName = "mime-db";
version = "1.42.0";
version = "1.43.0";
src = fetchurl {
url = "https://registry.npmjs.org/mime-db/-/mime-db-1.42.0.tgz";
sha512 = "UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ==";
url = "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz";
sha512 = "+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==";
};
};
"mime-types-2.1.25" = {
"mime-types-2.1.26" = {
name = "mime-types";
packageName = "mime-types";
version = "2.1.25";
version = "2.1.26";
src = fetchurl {
url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.25.tgz";
sha512 = "5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg==";
url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz";
sha512 = "01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==";
};
};
"minimatch-3.0.4" = {
@ -841,13 +841,13 @@ let
sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849";
};
};
"psl-1.6.0" = {
"psl-1.7.0" = {
name = "psl";
packageName = "psl";
version = "1.6.0";
version = "1.7.0";
src = fetchurl {
url = "https://registry.npmjs.org/psl/-/psl-1.6.0.tgz";
sha512 = "SYKKmVel98NCOYXpkwUqZqh0ahZeeKfmisiLIcEZdsb+WbLv02g/dI5BUmZnIyOe7RzZtLax81nnb2HbvC2tzA==";
url = "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz";
sha512 = "5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==";
};
};
"punycode-1.4.1" = {
@ -877,13 +877,13 @@ let
sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==";
};
};
"readable-stream-2.3.6" = {
"readable-stream-2.3.7" = {
name = "readable-stream";
packageName = "readable-stream";
version = "2.3.6";
version = "2.3.7";
src = fetchurl {
url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz";
sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==";
url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz";
sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==";
};
};
"request-2.88.0" = {
@ -895,13 +895,13 @@ let
sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==";
};
};
"resolve-1.14.1" = {
"resolve-1.15.1" = {
name = "resolve";
packageName = "resolve";
version = "1.14.1";
version = "1.15.1";
src = fetchurl {
url = "https://registry.npmjs.org/resolve/-/resolve-1.14.1.tgz";
sha512 = "fn5Wobh4cxbLzuHaE+nphztHy43/b++4M6SsGFC2gB8uYwf0C8LcarfCz1un7UTW8OFQg9iNjZ4xpcFVGebDPg==";
url = "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz";
sha512 = "84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==";
};
};
"retry-0.10.1" = {
@ -1183,13 +1183,13 @@ let
sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
};
};
"uuid-3.3.3" = {
"uuid-3.4.0" = {
name = "uuid";
packageName = "uuid";
version = "3.3.3";
version = "3.4.0";
src = fetchurl {
url = "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz";
sha512 = "pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==";
url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz";
sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==";
};
};
"validate-npm-package-license-3.0.4" = {
@ -1268,7 +1268,7 @@ in
};
dependencies = [
sources."abbrev-1.1.1"
sources."ajv-6.10.2"
sources."ajv-6.11.0"
sources."ansi-regex-2.1.1"
sources."aproba-1.2.0"
sources."are-we-there-yet-1.1.5"
@ -1276,7 +1276,7 @@ in
sources."assert-plus-1.0.0"
sources."asynckit-0.4.0"
sources."aws-sign2-0.7.0"
sources."aws4-1.9.0"
sources."aws4-1.9.1"
sources."balanced-match-1.0.0"
sources."base64-js-1.3.1"
sources."bcrypt-pbkdf-1.0.2"
@ -1298,7 +1298,7 @@ in
sources."ecc-jsbn-0.1.2"
sources."extend-3.0.2"
sources."extsprintf-1.3.0"
sources."fast-deep-equal-2.0.1"
sources."fast-deep-equal-3.1.1"
sources."fast-json-stable-stringify-2.1.0"
sources."findit-2.0.0"
sources."foreachasync-3.0.0"
@ -1339,8 +1339,8 @@ in
sources."json-stringify-safe-5.0.1"
sources."jsonfile-1.0.1"
sources."jsprim-1.4.1"
sources."mime-db-1.42.0"
sources."mime-types-2.1.25"
sources."mime-db-1.43.0"
sources."mime-types-2.1.26"
sources."minimatch-3.0.4"
sources."minimist-0.0.8"
sources."minipass-2.9.0"
@ -1384,16 +1384,16 @@ in
sources."performance-now-2.1.0"
sources."process-nextick-args-2.0.1"
sources."proto-list-1.2.4"
sources."psl-1.6.0"
sources."psl-1.7.0"
sources."punycode-2.1.1"
sources."qs-6.5.2"
(sources."readable-stream-2.3.6" // {
(sources."readable-stream-2.3.7" // {
dependencies = [
sources."safe-buffer-5.1.2"
];
})
sources."request-2.88.0"
sources."resolve-1.14.1"
sources."resolve-1.15.1"
sources."retry-0.10.1"
sources."rimraf-2.6.3"
sources."safe-buffer-5.2.0"
@ -1429,7 +1429,7 @@ in
sources."uid-number-0.0.5"
sources."uri-js-4.2.2"
sources."util-deprecate-1.0.2"
sources."uuid-3.3.3"
sources."uuid-3.4.0"
sources."validate-npm-package-license-3.0.4"
sources."validate-npm-package-name-3.0.0"
sources."verror-1.10.0"

View file

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "alot";
version = "0.8.1";
version = "0.9";
outputs = [ "out" ] ++ lib.optional withManpage "man";
disabled = !isPy3k;
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "pazz";
repo = "alot";
rev = version;
sha256 = "1gzis6w45d860mr2qbmjhnbrhy6d9xwhw27wpmvs56vndafvv9d3";
sha256 = "sha256-WUwOJcq8JE7YO8sFeZwYikCRhpufO0pL6MKu54ZYsHI=";
};
nativeBuildInputs = lib.optional withManpage sphinx;

View file

@ -1,14 +1,14 @@
diff --git a/tests/test_sftp.py b/tests/test_sftp.py
index db9cc88..234004b 100644
index d94379f..4ee46a9 100644
--- a/tests/test_sftp.py
+++ b/tests/test_sftp.py
@@ -957,8 +957,8 @@ class _TestSFTP(_CheckSFTP):
@@ -955,8 +955,8 @@ class _TestSFTP(_CheckSFTP):
try:
self._create_file('file')
- yield from sftp.chmod('file', 0o4321)
- await sftp.chmod('file', 0o4321)
- self.assertEqual(stat.S_IMODE(os.stat('file').st_mode), 0o4321)
+ yield from sftp.chmod('file', 0o1234)
+ await sftp.chmod('file', 0o1234)
+ self.assertEqual(stat.S_IMODE(os.stat('file').st_mode), 0o1234)
finally:
remove('file')

View file

@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "Django";
version = "1.11.27";
version = "1.11.28";
src = fetchurl {
url = "https://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz";
sha256 = "1f39c5af0lkls6mqw1fd2r9rf4mbshchqjy900ab3lcshs1i6490";
sha256 = "1ss1jyip7mlbfjn27m0j6wx80s8h4ksg6g5annkgwigp8xgy6g5k";
};
patches = stdenv.lib.optionals withGdal [

View file

@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "Django";
version = "2.2.9";
version = "2.2.10";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "199mwqs6apdxjm4afqjbvqs98j2927rv2wbgy5vzvqwjhzviyak6";
sha256 = "16h7lw9vnmwarl4pjwc7xnkwmcjq1c79prvfwv8fzixiw65ic9hj";
};
patches = stdenv.lib.optional withGdal

View file

@ -1,31 +1,28 @@
{ lib
, buildPythonPackage
, fetchPypi
, isPy3k
, isPy27
, bz2file
, mock
, nose
, pytest
, numpy
, six
, h5py
, pydicom
, scipy
}:
buildPythonPackage rec {
pname = "nibabel";
version = "3.0.0";
version = "3.0.1";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "0f5bc325c9cb203c6f0ab876ba1a5ada811284bb3a4c5d063eeaafaefbad873d";
sha256 = "08nlny8vzkpjpyb0q943cq57m2s4wndm86chvd3d5qvar9z6b36k";
};
propagatedBuildInputs = [
numpy
six
] ++ lib.optional (!isPy3k) bz2file;
propagatedBuildInputs = [ numpy scipy h5py pydicom ];
checkInputs = [ nose mock ];
checkInputs = [ nose pytest ];
checkPhase = ''
nosetests
@ -36,5 +33,6 @@ buildPythonPackage rec {
description = "Access a multitude of neuroimaging data formats";
license = licenses.mit;
maintainers = with maintainers; [ ashgillman ];
platforms = platforms.x86_64; # https://github.com/nipy/nibabel/issues/861
};
}

View file

@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchPypi, nose, nibabel, numpy, scikitlearn
, scipy, matplotlib }:
{ stdenv, buildPythonPackage, fetchPypi, pytest
, nibabel, numpy, pandas, scikitlearn, scipy, matplotlib, joblib }:
buildPythonPackage rec {
pname = "nilearn";
@ -10,19 +10,24 @@ buildPythonPackage rec {
sha256 = "07eb764f2b7b39b487f806a067e394d8ebffff21f57cd1ecdb5c4030b7210210";
};
postPatch = ''
substituteInPlace setup.py --replace "required_packages.append('sklearn')" ""
'';
# https://github.com/nilearn/nilearn/issues/2288
# disable some failing tests
checkPhase = ''
nosetests nilearn/tests \
-e test_cache_mixin_with_expand_user -e test_clean_confounds -e test_detrend \
-e test_clean_detrending -e test_high_variance_confounds
pytest nilearn/tests -k 'not test_cache_mixin_with_expand_user' # accesses ~/
'';
checkInputs = [ nose ];
checkInputs = [ pytest ];
propagatedBuildInputs = [
joblib
matplotlib
nibabel
numpy
pandas
scikitlearn
scipy
];

View file

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "PyChromecast";
version = "4.1.0";
version = "4.1.1";
src = fetchPypi {
inherit pname version;
sha256 = "b6979f1ddce1ff8760586aa6b8828290964b38f34c01aa1380ab1740330eeee2";
sha256 = "13cxyxs0cl2cwbx1fkw6b26hrzpllx1wfq2q58fx298yjn3niiby";
};
disabled = !isPy3k;

View file

@ -8,12 +8,12 @@
}:
buildPythonPackage rec {
version = "1.3.0";
version = "1.4.1";
pname = "pydicom";
src = fetchPypi {
inherit pname version;
sha256 = "1j11lsykqbnw9d6gzgj6kfn6lawvm5d9azd9palj3l1xhj0hlnsq";
sha256 = "0ki4736h6mp77733rsrwicl8pyig39idywzcmwvw3nzi2r1yc7w8";
};
propagatedBuildInputs = [ numpy pillow ];

View file

@ -386,6 +386,11 @@ let
packagesWithBuildInputs = {
# sort -t '=' -k 2
gam = lib.optionals stdenv.isDarwin [ pkgs.libiconv ];
quantreg = lib.optionals stdenv.isDarwin [ pkgs.libiconv ];
rmutil = lib.optionals stdenv.isDarwin [ pkgs.libiconv ];
robustbase = lib.optionals stdenv.isDarwin [ pkgs.libiconv ];
SparseM = lib.optionals stdenv.isDarwin [ pkgs.libiconv ];
svKomodo = [ pkgs.which ];
nat = [ pkgs.which ];
nat_templatebrains = [ pkgs.which ];

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "flow";
version = "0.117.0";
version = "0.118.0";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "refs/tags/v${version}";
sha256 = "1s3qlq0jfx94fr7vzzc7jw8l5mvsrrxhq9mcf50aq0ipz0fz0il9";
sha256 = "103dgj61qhbqzfgqjbcww2bfipk894glj9xjg1r2zwfsgpxy6x26";
};
installPhase = ''

View file

@ -10,12 +10,12 @@
buildPythonApplication rec {
pname = "cmake-format";
version = "0.6.5";
version = "0.6.8";
src = fetchPypi {
inherit version;
pname = "cmake_format";
sha256 = "0fzfczf66df81szp488zwdz6phx6lcq6wkb0dzpzq6ni39r7kvw8";
sha256 = "0zpx7g5j8wv52zj0s7bk7cj5v82icn4il0jfydc1cmg4p5krf5iy";
};
propagatedBuildInputs = [ autopep8 flake8 jinja2 pylint pyyaml ];

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "jtc";
version = "1.75c";
version = "1.75d";
src = fetchFromGitHub {
owner = "ldn-softdev";
repo = pname;
rev = version;
sha256 = "0q72vak1sbhigqq1a0s873knnm666sz1k3sdxbbi3bzq1x8mnykd";
sha256 = "0vgb5hcgml0vmdal494231jq6dlr0qgssqhnrgsvqqjapy8xhnpw";
};
buildPhase = ''

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "strace";
version = "5.4";
version = "5.5";
src = fetchurl {
url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz";
sha256 = "0hd7sb7l99y9rcj8jjc1b6m3ryds17krsymdg3dvd40jsla0bl7p";
sha256 = "1zrhpzjlgfwfl8dd53llswmmharm5rbi0zch7lln5sjris69an4z";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];

View file

@ -6,11 +6,11 @@ else
stdenv.mkDerivation rec {
pname = "dune";
version = "2.1.3";
version = "2.2.0";
src = fetchurl {
url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
sha256 = "1cxf7g2kld7jmk6m47fdvmfdyqy1di517qiph55jrq7sm5akp3hy";
sha256 = "1x4bipcyqhgagzvd5iq6p498a4qwvj622j240grsch8nq9qbjpmb";
};
buildInputs = [ ocaml findlib ];
@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "https://dune.build/";
description = "A composable build system";
changelog = "https://github.com/ocaml/dune/releases/tag/${version}";
maintainers = [ stdenv.lib.maintainers.vbgl stdenv.lib.maintainers.marsam ];
license = stdenv.lib.licenses.mit;
inherit (ocaml.meta) platforms;

View file

@ -33,7 +33,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "attohttpc"
version = "0.10.1"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
@ -99,14 +99,14 @@ dependencies = [
[[package]]
name = "cargo-make"
version = "0.26.2"
version = "0.27.0"
dependencies = [
"ci_info 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
"clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
"colored 1.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
"dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"duckscript 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"duckscriptsdk 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"duckscript 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"duckscriptsdk 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"envmnt 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"fern 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
"git_info 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -235,23 +235,24 @@ dependencies = [
[[package]]
name = "duckscript"
version = "0.1.7"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "duckscriptsdk"
version = "0.1.8"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"attohttpc 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
"duckscript 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"attohttpc 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
"base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
"duckscript 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"home 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
"hostname 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"java-properties 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"meval 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
"walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"whoami 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -398,16 +399,6 @@ dependencies = [
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "hostname"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
"match_cfg 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "http"
version = "0.2.0"
@ -469,11 +460,6 @@ dependencies = [
"cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "match_cfg"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "matches"
version = "0.1.8"
@ -910,6 +896,11 @@ name = "wasi"
version = "0.9.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "whoami"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "winapi"
version = "0.3.8"
@ -943,7 +934,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
"checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee"
"checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
"checksum attohttpc 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "baf13118df3e3dce4b5ac930641343b91b656e4e72c8f8325838b01a4b1c9d45"
"checksum attohttpc 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ac9fd7bdf8ff0a1b9d73b41f95cb189d77528110295c80e3c858bf343db24fa3"
"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
"checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
@ -965,8 +956,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4"
"checksum dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3"
"checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b"
"checksum duckscript 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8ce2dedb6f752438ee1eaf67cb8f8b1008945ba59cba042325681bd97d683520"
"checksum duckscriptsdk 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "701d0a8d1e0c645d1ce5c959493e0166819d7afda998b8ec73659aa5afe127aa"
"checksum duckscript 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "747bb4e541a0830b4581bffc001045d3dc259683546fbf35a35f47af831634b5"
"checksum duckscriptsdk 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "799c03843d05bb809ea1ee653c4f9ba9a5ee766c07490cc684cf6b259b68ba94"
"checksum encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec"
"checksum encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91"
"checksum encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81"
@ -986,7 +977,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
"checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772"
"checksum home 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654"
"checksum hostname 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "01b1af8d6d068ba9de1c39c6ff0d879aed20f74873d4d3929a4535000bb07886"
"checksum http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b708cc7f06493459026f53b9a61a7a121a5d1ec6238dee58ea4941132b30156b"
"checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
"checksum indexmap 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b54058f0a6ff80b6803da8faf8997cde53872b38f4023728f6830b06cd3c0dc"
@ -995,7 +985,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
"checksum match_cfg 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4"
"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
"checksum memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3197e20c7edb283f87c071ddfc7a2cca8f8e0b888c242959846a6fce03c72223"
"checksum meval 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f79496a5651c8d57cd033c5add8ca7ee4e3d5f7587a4777484640d9cb60392d9"
@ -1051,6 +1040,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
"checksum walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
"checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
"checksum whoami 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "622a663c45e12b7ae198748afb532d0c53d2daea11037312221e26198ca4e8e9"
"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
"checksum winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4ccfbf554c6ad11084fb7517daca16cfdcaccbdadba4fc336f032a8b12c2ad80"

View file

@ -2,7 +2,7 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-make";
version = "0.26.2";
version = "0.27.0";
src =
let
@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
owner = "sagiegurari";
repo = pname;
rev = version;
sha256 = "022krw38kyvv9wr8v7rnwp21d64pdiivwgvbmdix725dlypl43h4";
sha256 = "197r7rlgk8csvq612gz4431vvrvyxhcmfswarsdczp4b94pzaa6h";
};
in
runCommand "cargo-make-src" {} ''
@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ]
++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
cargoSha256 = "10ij0k428ia9yy8j1dr9f6xf1cgc8778prry4bp8ribd3wymxs1j";
cargoSha256 = "02bx8nz8kkr0l8m1b8nfc9576qx9is6s72x4ji3bzwimy76jvx3j";
# Some tests fail because they need network access.
# However, Travis ensures a proper build.

View file

@ -5,21 +5,21 @@
# See https://github.com/mikefarah/yq/issues/227
buildGoPackage rec {
pname = "yq-go";
version = "2.4.0";
version = "3.1.0";
goPackagePath = "gopkg.in/mikefarah/yq.v2";
goPackagePath = "github.com/mikefarah/yq/v3";
src = fetchFromGitHub {
owner = "mikefarah";
rev = version;
repo = "yq";
sha256 = "0nizg08mdpb8g6hj887kk5chljba6x9v0f5ysqf28py511yp0dym";
sha256 = "0hsb9m0pq2agsg7392r6h9sv5vqa2r7fl0ff1q24vpx8jlpq1vc6";
};
goDeps = ./deps.nix;
postInstall = ''
mv $bin/bin/yq.v2 $bin/bin/yq
mv $bin/bin/v3 $bin/bin/yq
'';
meta = with stdenv.lib; {

View file

@ -1,12 +1,201 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
[
{
goPackagePath = "github.com/BurntSushi/toml";
fetch = {
type = "git";
url = "https://github.com/BurntSushi/toml";
rev = "v0.3.1";
sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
};
}
{
goPackagePath = "github.com/armon/consul-api";
fetch = {
type = "git";
url = "https://github.com/armon/consul-api";
rev = "eb2c6b5be1b6";
sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9";
};
}
{
goPackagePath = "github.com/coreos/etcd";
fetch = {
type = "git";
url = "https://github.com/coreos/etcd";
rev = "v3.3.10";
sha256 = "1x2ii1hj8jraba8rbxz6dmc03y3sjxdnzipdvg6fywnlq1f3l3wl";
};
}
{
goPackagePath = "github.com/coreos/go-etcd";
fetch = {
type = "git";
url = "https://github.com/coreos/go-etcd";
rev = "v2.0.0";
sha256 = "1xb34hzaa1lkbq5vkzy9vcz6gqwj7hp6cdbvyack2bf28dwn33jj";
};
}
{
goPackagePath = "github.com/coreos/go-semver";
fetch = {
type = "git";
url = "https://github.com/coreos/go-semver";
rev = "v0.2.0";
sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0";
};
}
{
goPackagePath = "github.com/cpuguy83/go-md2man";
fetch = {
type = "git";
url = "https://github.com/cpuguy83/go-md2man";
rev = "v1.0.10";
sha256 = "1bqkf2bvy1dns9zd24k81mh2p1zxsx2nhq5cj8dz2vgkv1xkh60i";
};
}
{
goPackagePath = "github.com/davecgh/go-spew";
fetch = {
type = "git";
url = "https://github.com/davecgh/go-spew";
rev = "v1.1.1";
sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
};
}
{
goPackagePath = "github.com/fsnotify/fsnotify";
fetch = {
type = "git";
url = "https://github.com/fsnotify/fsnotify";
rev = "v1.4.7";
sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
};
}
{
goPackagePath = "github.com/hashicorp/hcl";
fetch = {
type = "git";
url = "https://github.com/hashicorp/hcl";
rev = "v1.0.0";
sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66";
};
}
{
goPackagePath = "github.com/inconshreveable/mousetrap";
fetch = {
type = "git";
url = "https://github.com/inconshreveable/mousetrap";
rev = "v1.0.0";
sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
};
}
{
goPackagePath = "github.com/kylelemons/godebug";
fetch = {
type = "git";
url = "https://github.com/kylelemons/godebug";
rev = "v1.1.0";
sha256 = "0dkk3friykg8p6wgqryx6745ahhb9z1j740k7px9dac6v5xjp78c";
};
}
{
goPackagePath = "github.com/magiconair/properties";
fetch = {
type = "git";
url = "https://github.com/magiconair/properties";
rev = "v1.8.0";
sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
};
}
{
goPackagePath = "github.com/mitchellh/go-homedir";
fetch = {
type = "git";
url = "https://github.com/mitchellh/go-homedir";
rev = "v1.1.0";
sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1";
};
}
{
goPackagePath = "github.com/mitchellh/mapstructure";
fetch = {
type = "git";
url = "https://github.com/mitchellh/mapstructure";
rev = "v1.1.2";
sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr";
};
}
{
goPackagePath = "github.com/pelletier/go-toml";
fetch = {
type = "git";
url = "https://github.com/pelletier/go-toml";
rev = "v1.2.0";
sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy";
};
}
{
goPackagePath = "github.com/pkg/errors";
fetch = {
type = "git";
url = "https://github.com/pkg/errors";
rev = "27936f6d90f9c8e1145f11ed52ffffbfdb9e0af7";
sha256 = "0yzmgi6g4ak4q8y7w6x0n5cbinlcn8yc3gwgzy4yck00qdn25d6y";
rev = "v0.8.1";
sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
};
}
{
goPackagePath = "github.com/pmezard/go-difflib";
fetch = {
type = "git";
url = "https://github.com/pmezard/go-difflib";
rev = "v1.0.0";
sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
};
}
{
goPackagePath = "github.com/russross/blackfriday";
fetch = {
type = "git";
url = "https://github.com/russross/blackfriday";
rev = "v1.5.2";
sha256 = "0jzbfzcywqcrnym4gxlz6nphmm1grg6wsl4f0r9x384rn83wkj7c";
};
}
{
goPackagePath = "github.com/spf13/afero";
fetch = {
type = "git";
url = "https://github.com/spf13/afero";
rev = "v1.1.2";
sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k";
};
}
{
goPackagePath = "github.com/spf13/cast";
fetch = {
type = "git";
url = "https://github.com/spf13/cast";
rev = "v1.3.0";
sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5";
};
}
{
goPackagePath = "github.com/spf13/cobra";
fetch = {
type = "git";
url = "https://github.com/spf13/cobra";
rev = "v0.0.5";
sha256 = "0z4x8js65mhwg1gf6sa865pdxfgn45c3av9xlcc1l3xjvcnx32v2";
};
}
{
goPackagePath = "github.com/spf13/jwalterweatherman";
fetch = {
type = "git";
url = "https://github.com/spf13/jwalterweatherman";
rev = "v1.0.0";
sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8";
};
}
{
@ -14,8 +203,125 @@
fetch = {
type = "git";
url = "https://github.com/spf13/pflag";
rev = "972238283c0625cf3e881de7699ba8f2524c340a";
sha256 = "194h0lq3s27wcxcgahjl350x46v116x81zgkgh98q9v5iydig28l";
rev = "v1.0.3";
sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd";
};
}
{
goPackagePath = "github.com/spf13/viper";
fetch = {
type = "git";
url = "https://github.com/spf13/viper";
rev = "v1.3.2";
sha256 = "1829hvf805kda65l59r17wvid7y0vr390s23zfhf4w7vdb4wp3zh";
};
}
{
goPackagePath = "github.com/stretchr/testify";
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
rev = "v1.2.2";
sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
};
}
{
goPackagePath = "github.com/ugorji/go";
fetch = {
type = "git";
url = "https://github.com/ugorji/go";
rev = "d75b2dcb6bc8";
sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps";
};
}
{
goPackagePath = "github.com/xordataexchange/crypt";
fetch = {
type = "git";
url = "https://github.com/xordataexchange/crypt";
rev = "b2862e3d0a77";
sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "87dc89f01550";
sha256 = "0z4i1m2yn3f31ci7wvcm2rxkx2yiv7a78mfzklncmsz2k97rlh2g";
};
}
{
goPackagePath = "golang.org/x/mod";
fetch = {
type = "git";
url = "https://go.googlesource.com/mod";
rev = "c90efee705ee";
sha256 = "0i5md645rmcy5z5ij9ng428k9rz4g3k1kjy3blsq1264rn426gdf";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "3b0461eec859";
sha256 = "0l00c8l0a8xnv6qdpwfzxxsr58jggacgzdrwiprrfx2xqm37b6d5";
};
}
{
goPackagePath = "golang.org/x/sync";
fetch = {
type = "git";
url = "https://go.googlesource.com/sync";
rev = "112230192c58";
sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "97732733099d";
sha256 = "118hkp01i4z1f5h6hcjm0ff2ngqhrzj1f7731n0kw8dr6hvbx0sw";
};
}
{
goPackagePath = "golang.org/x/text";
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "v0.3.0";
sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
};
}
{
goPackagePath = "golang.org/x/tools";
fetch = {
type = "git";
url = "https://go.googlesource.com/tools";
rev = "04c2e8eff935";
sha256 = "0xfif9h5ssf5f7f65k35zr5n6z524zv65kv68zg2qybnmb3c008d";
};
}
{
goPackagePath = "golang.org/x/xerrors";
fetch = {
type = "git";
url = "https://go.googlesource.com/xerrors";
rev = "1b5146add898";
sha256 = "0w2akj91krxjag0xdhsg78470888nicc5ismc2ap9jqpss6v1zih";
};
}
{
goPackagePath = "gopkg.in/check.v1";
fetch = {
type = "git";
url = "https://gopkg.in/check.v1";
rev = "20d25e280405";
sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np";
};
}
{
@ -23,35 +329,35 @@
fetch = {
type = "git";
url = "https://gopkg.in/imdario/mergo.v0";
rev = "7c29201646fa3de8506f701213473dd407f19646";
rev = "v0.3.7";
sha256 = "05ir0jj74w0yfi1lrhjd97v759in1dpsma64cgmbiqvyp6hfmmf8";
};
}
{
goPackagePath = "gopkg.in/mikefarah/yaml.v2";
fetch = {
type = "git";
url = "https://gopkg.in/mikefarah/yaml.v2";
rev = "1a71b09ff830e9b158685a8657c85f6462559726";
sha256 = "0rvix49in3bm3i90v1dp1s49b14m1pyyqm3fv27mgg0spvcqy7vr";
};
}
{
goPackagePath = "gopkg.in/op/go-logging.v1";
fetch = {
type = "git";
url = "https://gopkg.in/op/go-logging.v1";
rev = "b2cb9fa56473e98db8caba80237377e83fe44db5";
rev = "b2cb9fa56473";
sha256 = "01a6lkpj5p82gplddh55az194s9y3014p4j8x4zc8yv886z9c8gn";
};
}
{
goPackagePath = "gopkg.in/spf13/cobra.v0";
goPackagePath = "gopkg.in/yaml.v2";
fetch = {
type = "git";
url = "https://gopkg.in/spf13/cobra.v0";
rev = "f2b07da1e2c38d5f12845a4f607e2e1018cbb1f5";
sha256 = "0z4x8js65mhwg1gf6sa865pdxfgn45c3av9xlcc1l3xjvcnx32v2";
url = "https://gopkg.in/yaml.v2";
rev = "v2.2.2";
sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
};
}
{
goPackagePath = "gopkg.in/yaml.v3";
fetch = {
type = "git";
url = "https://gopkg.in/yaml.v3";
rev = "4206685974f2";
sha256 = "1ff5fd8x45cay9100ds63hxd32s7czsrric0ql6a1jrxczsgqk1g";
};
}
]

View file

@ -5,6 +5,6 @@ let
in
buildNodejs {
inherit enableNpm;
version = "10.18.1";
sha256 = "0dgax08lkgjvafp6i0c5h8wqqs0w49j8mh8fqi6ppbrryhviibrr";
version = "10.19.0";
sha256 = "0sginvcsf7lrlzsnpahj4bj1f673wfvby8kaxgvzlrbb7sy229v2";
}

View file

@ -5,8 +5,8 @@ let
in
buildNodejs {
inherit enableNpm;
version = "12.14.1";
sha256 = "1nvsivl496fgaypbk2pqqh7py29g7wsggyjlqydy1c0q4f24nyw7";
version = "12.15.0";
sha256 = "06x8sma4rxbw0mxj0l4438lfpv9abxmnw2ibamq1acng1jl4zyyj";
patches = stdenv.lib.optionals stdenv.isDarwin [ ./disable-libatomic-darwin.patch ];
}

View file

@ -5,6 +5,6 @@ let
in
buildNodejs {
inherit enableNpm;
version = "13.7.0";
sha256 = "1fql5858aqny8krrqrgdp97kfia8xv0jlviwnm3akmv8i1i6xqkh";
version = "13.8.0";
sha256 = "1h437yvg43xci35rvp55gvb94rddkf4j9i9iw81bmkwhvb4h8qdv";
}

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "gemrb";
version = "0.8.5";
version = "0.8.6";
src = fetchFromGitHub {
owner = "gemrb";
repo = "gemrb";
rev = "v${version}";
sha256 = "0xkjsiawxz53rac26vqz9sfgva0syff8x8crabrpbpxgmbacih7a";
sha256 = "0vsr3fsqmv9b7s5l0cwhpq2pf7ah2wvgmcn9y8asj6w8hprp17d4";
};
# TODO: make libpng, libvorbis, sdl_mixer, freetype, vlc, glew (and other gl reqs) optional

View file

@ -100,6 +100,13 @@ stdenv.mkDerivation {
url = "https://savannah.gnu.org/patch/download.php?file_id=47859";
sha256 = "0aimayzgi5065gkcfcr8d5lkd9c0471q7dqmln42hjzq847n6d5y";
})
# Fix build with modern Pango
# https://savannah.gnu.org/bugs/index.php?57759
(fetchpatch {
url = "https://savannah.gnu.org/file/0001-Do-not-depend-on-pangox.patch?file_id=48366";
sha256 = "02x7sl5zwd1ld2n4b6bp16c5gk91qsap0spfbb5iwpglq3galv2l";
})
];
configureFlags = with stdenv.lib; [

View file

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "eventstat";
version = "0.04.07";
version = "0.04.08";
src = fetchzip {
url = "https://kernel.ubuntu.com/~cking/tarballs/eventstat/eventstat-${version}.tar.gz";
sha256 = "05gl060lgm6i10ayk0hri49k7vln1sdqkqqy1kjgck6gkbamk7a5";
sha256 = "08a2fg2bl7rf29br1mryix5hp2njy0cjl648lnyiv7wngi341qsm";
};
buildInputs = [ ncurses ];
installFlags = [ "DESTDIR=$(out)" ];

View file

@ -1,4 +1,4 @@
# Updating? Keep $out/etc synchronized with passthru.filesInstalledToEtc
# Updating? Keep $out/etc synchronized with passthru keys
{ stdenv
, fetchurl
@ -94,7 +94,10 @@ stdenv.mkDerivation rec {
sha256 = "02mzn3whk5mba4nxyrkypawr1gzjx79n4nrkhrp8vja6mxxgsf10";
};
outputs = [ "out" "dev" "devdoc" "man" "installedTests" ];
# libfwupd goes to lib
# daemon, plug-ins and libfwupdplugin go to out
# CLI programs go to out
outputs = [ "out" "lib" "dev" "devdoc" "man" "installedTests" ];
nativeBuildInputs = [
meson
@ -148,6 +151,10 @@ stdenv.mkDerivation rec {
./fix-paths.patch
./add-option-for-installation-sysconfdir.patch
# install plug-ins and libfwupdplugin to out,
# they are not really part of the library
./install-fwupdplugin-to-out.patch
# installed tests are installed to different output
# we also cannot have fwupd-tests.conf in $out/etc since it would form a cycle
(substituteAll {
@ -203,6 +210,12 @@ stdenv.mkDerivation rec {
"--localstatedir=/var"
"--sysconfdir=/etc"
"-Dsysconfdir_install=${placeholder "out"}/etc"
# We do not want to place the daemon into lib (cyclic reference)
"--libexecdir=${placeholder "out"}/libexec"
# Our builder only adds $lib/lib to rpath but some things link
# against libfwupdplugin which is in $out/lib.
"-Dc_link_args=-Wl,-rpath,${placeholder "out"}/lib"
] ++ stdenv.lib.optionals (!haveDell) [
"-Dplugin_dell=false"
"-Dplugin_synaptics=false"
@ -261,6 +274,12 @@ stdenv.mkDerivation rec {
"pki/fwupd-metadata/LVFS-CA.pem"
];
# BlacklistPlugins key in fwupd/daemon.conf
defaultBlacklistedPlugins = [
"test"
"invalid"
];
tests = {
installedTests = nixosTests.installed-tests.fwupd;
};

View file

@ -0,0 +1,37 @@
diff --git a/libfwupdplugin/meson.build b/libfwupdplugin/meson.build
index 0abcd45c..51cbc912 100644
--- a/libfwupdplugin/meson.build
+++ b/libfwupdplugin/meson.build
@@ -114,7 +114,8 @@
],
link_args : vflag,
link_depends : fwupdplugin_mapfile,
- install : true
+ install : true,
+ install_dir : bindir / '..' / 'lib',
)
fwupdplugin_pkgg = import('pkgconfig')
@@ -167,7 +168,8 @@
'GUsb-1.0',
fwupd_gir[0],
],
- install : true
+ install : true,
+ install_dir_typelib : bindir / '..' / 'lib' / 'girepository-1.0',
)
gnome.generate_vapi('fwupdplugin',
sources : fwupd_gir[0],
diff --git a/meson.build b/meson.build
index b1a523d2..00125997 100644
--- a/meson.build
+++ b/meson.build
@@ -389,7 +389,7 @@
if host_machine.system() == 'windows'
plugin_dir = 'fwupd-plugins-3'
else
- plugin_dir = join_paths(libdir, 'fwupd-plugins-3')
+ plugin_dir = join_paths(bindir, '..', 'lib', 'fwupd-plugins-3')
endif
conf.set_quoted('FWUPD_PLUGINDIR', plugin_dir)
endif

View file

@ -8,11 +8,11 @@ assert withMysql -> (mysql_jdbc != null);
stdenvNoCC.mkDerivation rec {
pname = "atlassian-confluence";
version = "7.2.0";
version = "7.2.1";
src = fetchurl {
url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz";
sha256 = "1srwxk9c26hp1j3v6v1hr16l4dqaaiwrli5a9n9a44hkl7qy8yzl";
sha256 = "1d37hiabph56frsp8jrn80fmglgw6k1dlc4x8p7m82fb3vild049";
};
buildPhase = ''

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "jackett";
version = "0.12.907";
version = "0.12.1301";
src = fetchurl {
url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.LinuxAMDx64.tar.gz";
sha256 = "0f88zjd8abkr72sjbzm51npxsjbk6xklfqd7iyaq3j0l5hxh6b8w";
sha256 = "03glp5qhyb6bldslbhivywcfbxpv374q9aaybz5f2s0r9il5cb35";
};
buildInputs = [ makeWrapper ];

View file

@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "grafana";
version = "6.6.0";
version = "6.6.1";
goPackagePath = "github.com/grafana/grafana";
@ -12,12 +12,12 @@ buildGoPackage rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "0pdhi3lrcfyr60cs93dqskkwlbn7ic4jngaksa3y6kicy6z1nmgz";
sha256 = "0yw7yq201f5c3dzy51jaa2mgn0bdh69341a7r9hz9bxpb21w0zq9";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
sha256 = "1xp92kbvgyb3pl0sslwdn6bai41ym0yr26wp8qj39rvqamsh86g2";
sha256 = "0xrkaiz3kl1avq040xyyal35rkf2mg6s2y0wggmndvsnwc3q5p0f";
};
postPatch = ''
@ -38,7 +38,7 @@ buildGoPackage rec {
description = "Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB";
license = licenses.asl20;
homepage = "https://grafana.com";
maintainers = with maintainers; [ offline fpletz willibutz globin ];
maintainers = with maintainers; [ offline fpletz willibutz globin ma27 ];
platforms = platforms.linux;
};
}

View file

@ -1,13 +1,13 @@
{ lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage }:
let
version = "2.14.0";
version = "2.15.2";
src = fetchFromGitHub {
rev = "v${version}";
owner = "prometheus";
repo = "prometheus";
sha256 = "0zmxj78h3cnqbhsqab940hyzpim5i9r81b15a57f3dnrrd10p287";
sha256 = "0gl11qqbq57vkx226n8z4x07fwvly5f21y6dn20kjh2fxigmrb2n";
};
webui = mkYarnPackage {
@ -59,12 +59,6 @@ in buildGoPackage rec {
cp -a $src/console_libraries $src/consoles $bin/etc/prometheus
'';
# Disable module-mode, because Go 1.13 automatically enables it if there is
# go.mod file. Remove after https://github.com/NixOS/nixpkgs/pull/73380
preCheck = ''
export GO111MODULE=off
'';
doCheck = true;
meta = with lib; {

View file

@ -11074,11 +11074,11 @@
};
}
{
name = "typescript___typescript_3.6.4.tgz";
name = "typescript___typescript_3.7.2.tgz";
path = fetchurl {
name = "typescript___typescript_3.6.4.tgz";
url = "https://registry.yarnpkg.com/typescript/-/typescript-3.6.4.tgz";
sha1 = "b18752bb3792bc1a0281335f7f6ebf1bbfc5b91d";
name = "typescript___typescript_3.7.2.tgz";
url = "https://registry.yarnpkg.com/typescript/-/typescript-3.7.2.tgz";
sha1 = "27e489b95fa5909445e9fef5ee48d81697ad18fb";
};
}
{

View file

@ -3,7 +3,7 @@
}:
let
version = "11.35.3";
version = "11.35.9";
in stdenv.mkDerivation {
pname = "monetdb";
@ -11,7 +11,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2";
sha256 = "185v8ph8jq8im77dmm20d64nwgjzzc01kz71rh09nb6x6rgcna2x";
sha256 = "0bs7z41vwm9aidxl1f40yx8r0qz3qranmxd0xzd4a1hahjq3j5rx";
};
postPatch = ''

View file

@ -3,13 +3,13 @@
python3Packages.buildPythonApplication rec {
pname = "wpgtk";
version = "6.0.11";
version = "6.0.12";
src = fetchFromGitHub {
owner = "deviantfero";
repo = "wpgtk";
rev = version;
sha256 = "0da4gj54c361a0bicrjhhb9bp9yr5lx7p1knrsc4dykap1xn23vi";
sha256 = "1wqdjq3pjgwb1da549izw3bzi1bk6q7d1hjw3i2zg5nhig1vvxw6";
};
buildInputs = [

View file

@ -15,7 +15,7 @@ buildPythonApplication rec {
};
propagatedBuildInputs = [
pymysql configobj sqlparse prompt_toolkit pygments click pycrypto cli-helpers
paramiko pymysql configobj sqlparse prompt_toolkit pygments click pycrypto cli-helpers
];
checkInputs = [ pytest mock glibcLocales ];

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "mpd-mpris";
version = "0.2.3";
version = "0.2.4";
src = fetchFromGitHub {
owner = "natsukagami";
repo = pname;
rev = "v${version}";
sha256 = "19sz1ykdzradhpdwdvvxh9scp5sv2i072qircs0q4374cdgccfbb";
sha256 = "1cr5j2z2ynj1hwkjzi5amcg59vmgazsci41v6vpsj119g7psjmzm";
};
modSha256 = "1a95kfy8w952269x4llbl0afyxr5fjkg30mxsn81zdh5wr8gabwh";

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "playerctl";
version = "2.0.2";
version = "2.1.1";
src = fetchFromGitHub {
owner = "acrisci";
repo = "playerctl";
rev = "v${version}";
sha256 = "1f3njnpd52djx3dmhh9a8p5a67f0jmr1gbk98icflr2q91149gjz";
sha256 = "03f3645ssqf8dpkyzj9rlglrzh0840sflalskx9s4i03bgq3v4r9";
};
nativeBuildInputs = [ meson ninja pkgconfig gtk-doc docbook_xsl gobject-introspection ];

View file

@ -1,4 +1,4 @@
{ lib, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoPackage, fetchFromGitHub, nixosTests }:
buildGoPackage rec {
pname = "restic";
@ -18,6 +18,8 @@ buildGoPackage rec {
go run build.go
'';
passthru.tests.restic = nixosTests.restic;
installPhase = ''
mkdir -p \
$bin/bin \

View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "vips";
version = "8.9.0";
version = "8.9.1";
src = fetchFromGitHub {
owner = "libvips";
repo = "libvips";
rev = "v${version}";
sha256 = "0x61vnfnqv53pnp52nx610470x7pzdjbkqzk8wlc8i6cc2cg7f91";
sha256 = "01vgvzlygg3fzpinb0x1rdm2sqvnqxmvxbnlbg73ygdadv3l2s0v";
# Remove unicode file names which leads to different checksums on HFS+
# vs. other filesystems because of unicode normalisation.
extraPostFetch = ''

View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "ibus-table";
version = "1.9.21";
version = "1.9.22";
src = fetchFromGitHub {
owner = "kaio";
repo = "ibus-table";
rev = version;
sha256 = "1rswbhbfvir443mw3p7xw6calkpfss4fcgn8nhfnrbin49q6w1vm";
sha256 = "1a1dr3l6aa69llfyd0k5w29qalvyap369kmnwww9fhppmwfclgd1";
};
postPatch = ''

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "bash_unit";
version = "1.6.1";
version = "1.7.1";
src = fetchFromGitHub {
owner = "pgrange";
repo = pname;
rev = "v${version}";
sha256 = "0jcjpcyf569b12vm4jrd53iqrrsjvr8sp9y29w2ls38fm8a16vr6";
sha256 = "02cam5gkhnlwhb9aqcqmkl8kskgikih0bmyx09ybi3gpaf4z82f7";
};
installPhase = ''

View file

@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "topgrade";
version = "3.7.1";
version = "3.9.0";
src = fetchFromGitHub {
owner = "r-darwish";
repo = pname;
rev = "v${version}";
sha256 = "0vs0gnfs9swlmzsj7m3b88xfzcfy7n68bgm4i94csc3qsbip6m0j";
sha256 = "0g9pb4f5skigyahv8kpx7wkvv625lvgnbqz6iq7j7wgixxf4nl1i";
};
cargoSha256 = "1y85hl7xl60vsj3ivm6pyd6bvk39wqg25bqxfx00r9myha94iqmd";

View file

@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "dnscrypt-proxy2";
version = "2.0.36";
version = "2.0.39";
goPackagePath = "github.com/jedisct1/dnscrypt-proxy";
@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "jedisct1";
repo = "dnscrypt-proxy";
rev = version;
sha256 = "05pk0fl4cyh69lfssvx9prd2gg0akw1l14b4q76zfhh9vc47z6x1";
sha256 = "0fvnp2brmqkwn04v01k53f9djk9ywa1cg26m2frhv4lj0581430y";
};
meta = with stdenv.lib; {

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "frp";
version = "0.31.1";
version = "0.31.2";
src = fetchFromGitHub {
owner = "fatedier";
repo = pname;
rev = "v${version}";
sha256 = "1cf2f0nbcg76i4mv8l3d38c13lw0mma6d2xzwkb9iqn7jflj1j9y";
sha256 = "0947psq6qcr175xsgwr5k6idphs3s4vdv130ms738bcqf0h9snky";
};
modSha256 = "1zbl0gfc99pbzdacxhfa1k3y6i7v13sb441wpbp9aygxhvwqrms9";

View file

@ -4,7 +4,7 @@
buildGoPackage rec {
pname = "grpcurl";
version = "1.0.0";
version = "1.4.0";
rev = "v${version}";
goPackagePath = "github.com/fullstorydev/grpcurl";
@ -12,13 +12,11 @@ buildGoPackage rec {
src = fetchFromGitHub {
owner = "fullstorydev";
repo = "grpcurl";
rev = "d4d048fade4abcc2f0c3fb6f3e207289401d0a10";
sha256 = "0v45lwjw2phavhi6m4ql49ri1423m249a6xcf00v9hi2x1y9dh6q";
rev = "ccc9007156e7177388c8dd45ec694aebeb2da996";
sha256 = "1zgiqg9c6vk45x16n04bpfvj9z838nck7ihdcsbfz89xgq7f1c0b";
};
goDeps = if stdenv.isDarwin
then ./deps-darwin.nix
else ./deps-linux.nix;
goDeps = ./deps.nix;
meta = {
description = "Like cURL, but for gRPC: Command-line tool for interacting with gRPC servers";

View file

@ -1,57 +0,0 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
[
{
goPackagePath = "github.com/golang/protobuf";
fetch = {
type = "git";
url = "https://github.com/golang/protobuf";
rev = "ddf22928ea3c56eb4292a0adbbf5001b1e8e7d0d";
sha256 = "16awkanx2rgxzhwi9vpm4i8jmmsw10gb104ncwfinvb6a9nzm28l";
};
}
{
goPackagePath = "github.com/jhump/protoreflect";
fetch = {
type = "git";
url = "https://github.com/jhump/protoreflect";
rev = "b28d968eb345542b430a717dc72a88abf10d0b95";
sha256 = "0i8k55xx2wyzfz635nbjqma505sn03l75mq6lgbknzwhv1xbx39s";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "146acd28ed5894421fb5aac80ca93bc1b1f46f87";
sha256 = "0d177474z85nvxz8ch6y9wjqz288844wwx8q9za3x2njnk4jbgxj";
};
}
{
goPackagePath = "golang.org/x/text";
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "4d1c5fb19474adfe9562c9847ba425e7da817e81";
sha256 = "1y4rf9cmjyf8r56khr1sz0chbq1v0ynaj63i2z1mq6k6h6ww45da";
};
}
{
goPackagePath = "google.golang.org/genproto";
fetch = {
type = "git";
url = "https://github.com/google/go-genproto";
rev = "af9cb2a35e7f169ec875002c1829c9b315cddc04";
sha256 = "1942rw8h7zhbzvxn1rqn8z265sl2i14hm0z4hbfbc93slmml7p7n";
};
}
{
goPackagePath = "google.golang.org/grpc";
fetch = {
type = "git";
url = "https://github.com/grpc/grpc-go";
rev = "c195587d96d5ae30321b96a1e2e175fea09e9fda";
sha256 = "1av4hgaqk0hgji8ycdkgganh6bqajk2ygm4ifrmyzbm1hzwi3gg7";
};
}
]

View file

@ -1,66 +0,0 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
[
{
goPackagePath = "github.com/golang/protobuf";
fetch = {
type = "git";
url = "https://github.com/golang/protobuf";
rev = "ddf22928ea3c56eb4292a0adbbf5001b1e8e7d0d";
sha256 = "16awkanx2rgxzhwi9vpm4i8jmmsw10gb104ncwfinvb6a9nzm28l";
};
}
{
goPackagePath = "github.com/jhump/protoreflect";
fetch = {
type = "git";
url = "https://github.com/jhump/protoreflect";
rev = "b28d968eb345542b430a717dc72a88abf10d0b95";
sha256 = "0i8k55xx2wyzfz635nbjqma505sn03l75mq6lgbknzwhv1xbx39s";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "49bb7cea24b1df9410e1712aa6433dae904ff66a";
sha256 = "111q4qm3hcjvzvyv9y5rz8ydnyg48rckcygxqy6gv63q618wz6gn";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "4497e2df6f9e69048a54498c7affbbec3294ad47";
sha256 = "028qmbfmy84pl7wmjgvrv1x7x7nzv3qr9w7vcnrcparr43k7415s";
};
}
{
goPackagePath = "golang.org/x/text";
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "4d1c5fb19474adfe9562c9847ba425e7da817e81";
sha256 = "1y4rf9cmjyf8r56khr1sz0chbq1v0ynaj63i2z1mq6k6h6ww45da";
};
}
{
goPackagePath = "google.golang.org/genproto";
fetch = {
type = "git";
url = "https://github.com/google/go-genproto";
rev = "af9cb2a35e7f169ec875002c1829c9b315cddc04";
sha256 = "1942rw8h7zhbzvxn1rqn8z265sl2i14hm0z4hbfbc93slmml7p7n";
};
}
{
goPackagePath = "google.golang.org/grpc";
fetch = {
type = "git";
url = "https://github.com/grpc/grpc-go";
rev = "c195587d96d5ae30321b96a1e2e175fea09e9fda";
sha256 = "1av4hgaqk0hgji8ycdkgganh6bqajk2ygm4ifrmyzbm1hzwi3gg7";
};
}
]

183
pkgs/tools/networking/grpcurl/deps.nix generated Normal file
View file

@ -0,0 +1,183 @@
# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
[
{
goPackagePath = "cloud.google.com/go";
fetch = {
type = "git";
url = "https://code.googlesource.com/gocloud";
rev = "v0.26.0";
sha256 = "149v3ci17g6wd2pm18mzcncq5qpl9hwdjnz3rlbn5rfidyn46la1";
};
}
{
goPackagePath = "github.com/BurntSushi/toml";
fetch = {
type = "git";
url = "https://github.com/BurntSushi/toml";
rev = "v0.3.1";
sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
};
}
{
goPackagePath = "github.com/client9/misspell";
fetch = {
type = "git";
url = "https://github.com/client9/misspell";
rev = "v0.3.4";
sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs";
};
}
{
goPackagePath = "github.com/golang/glog";
fetch = {
type = "git";
url = "https://github.com/golang/glog";
rev = "23def4e6c14b";
sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
};
}
{
goPackagePath = "github.com/golang/mock";
fetch = {
type = "git";
url = "https://github.com/golang/mock";
rev = "v1.1.1";
sha256 = "0ap8wb6pdl6ccmdb43advjll2ly4sz26wsc3axw0hbrjrybybzgy";
};
}
{
goPackagePath = "github.com/golang/protobuf";
fetch = {
type = "git";
url = "https://github.com/golang/protobuf";
rev = "v1.3.1";
sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl";
};
}
{
goPackagePath = "github.com/google/go-cmp";
fetch = {
type = "git";
url = "https://github.com/google/go-cmp";
rev = "v0.2.0";
sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds";
};
}
{
goPackagePath = "github.com/jhump/protoreflect";
fetch = {
type = "git";
url = "https://github.com/jhump/protoreflect";
rev = "v1.5.0";
sha256 = "1xwccif809sbgf0xginpd1cm3q1dv7c1rv0qhnvjwbkp9agd0x2a";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "c2843e01d9a2";
sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r";
};
}
{
goPackagePath = "golang.org/x/lint";
fetch = {
type = "git";
url = "https://go.googlesource.com/lint";
rev = "d0100b6bd8b3";
sha256 = "0b0amr9x4ji66iv9ayfx7zrfx52k1m5g66qfcxkgj80qrb1y2yn7";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "d8887717615a";
sha256 = "1wfm6ngxjyj7v5a2dqib6lw8bb2rdnf1kl48diykxjrsddn0s163";
};
}
{
goPackagePath = "golang.org/x/oauth2";
fetch = {
type = "git";
url = "https://go.googlesource.com/oauth2";
rev = "d2e6202438be";
sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7";
};
}
{
goPackagePath = "golang.org/x/sync";
fetch = {
type = "git";
url = "https://go.googlesource.com/sync";
rev = "1d60e4601c6f";
sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "d0b11bdaac8a";
sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl";
};
}
{
goPackagePath = "golang.org/x/text";
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "v0.3.0";
sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
};
}
{
goPackagePath = "golang.org/x/tools";
fetch = {
type = "git";
url = "https://go.googlesource.com/tools";
rev = "11955173bddd";
sha256 = "0hlkai67w167wiyivkzd1fgqrnyxkb94l2c6kr51jwcscizfyfn3";
};
}
{
goPackagePath = "google.golang.org/appengine";
fetch = {
type = "git";
url = "https://github.com/golang/appengine";
rev = "v1.1.0";
sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x";
};
}
{
goPackagePath = "google.golang.org/genproto";
fetch = {
type = "git";
url = "https://github.com/google/go-genproto";
rev = "c66870c02cf8";
sha256 = "0siq7sv68556ygqi2d2zmvx8l1xjqdc0fylqzci5h1mq2i14bayn";
};
}
{
goPackagePath = "google.golang.org/grpc";
fetch = {
type = "git";
url = "https://github.com/grpc/grpc-go";
rev = "v1.21.0";
sha256 = "0zxjlxnvjqfn6zfx7gbmqhadx0j788vxfn95g1ngbmjkgppzsnfp";
};
}
{
goPackagePath = "honnef.co/go/tools";
fetch = {
type = "git";
url = "https://github.com/dominikh/go-tools";
rev = "c2f93a96b099";
sha256 = "07lg29aiap80ca9f201jzng9vjr168cv3qmvjmbd7v5pmww9kmr8";
};
}
]

View file

@ -3,7 +3,6 @@
iptables ? null,
iproute ? null,
libmnl ? null,
makeWrapper ? null,
openresolv ? null,
procps ? null,
@ -24,7 +23,6 @@ stdenv.mkDerivation rec {
sourceRoot = "source/src";
nativeBuildInputs = [ makeWrapper ];
buildInputs = optional stdenv.isLinux libmnl;
makeFlags = [
"DESTDIR=$(out)"

View file

@ -4,16 +4,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-edit";
version = "0.4.2";
version = "0.5.0";
src = fetchFromGitHub {
owner = "killercup";
repo = pname;
rev = "v${version}";
sha256 = "0y0sq0kll6bg0qrfdyas8rcx5dj50j9f05qx244kv7vqxp2q25jq";
sha256 = "16gpljbzk6cibry9ssnl22xbcsx2cr57mrs3x3n6cfmldbp6bhbr";
};
cargoSha256 = "0prd53p20cha2y2qp8dmq0ywd32f6jm8mszdkbi4x606dj9bcgbl";
cargoSha256 = "1cjpbfgbqzlfs5hck2j3d2v719fwandpnc7bdk4243j7j0k1ng9q";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];

View file

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "chrome-token-signing";
version = "1.1.0";
version = "1.1.1";
src = fetchFromGitHub {
owner = "open-eid";
repo = "chrome-token-signing";
rev = "v${version}";
sha256 = "1bksh7xrgqfmyrl04l0fri4ldigb1vkzff32n89bnl44nd42bgcr";
sha256 = "1gh4gm0krz8m5vgwkjzg9al82rrrrsikzjh180jy7ha808ib2drw";
};
buildInputs = [ qmake pcsclite pkgconfig ];

View file

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "tpm2-tools";
version = "4.1";
version = "4.1.1";
src = fetchurl {
url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz";
sha256 = "1wnw4i2m6dkafqjjma8mxw9419py2v1knhn3zf1gaizdabskgkh7";
sha256 = "1cd74nd57wmms2yrnzs64xki29rf4kx61kd30fyd56wlicyjdfa0";
};
nativeBuildInputs = [ pandoc pkgconfig makeWrapper ];

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "jump";
version = "0.30.0";
version = "0.30.1";
src = fetchFromGitHub {
owner = "gsamokovarov";
repo = pname;
rev = "v${version}";
sha256 = "1pp3d9xkdaqrcbzwnnask8786capdxvgq6wbpwkzkfni978vv2l4";
sha256 = "0mph3bqfjnw3yf0a6ml3ccmkr1shviwvvq4d04ky4gppfy6z51jy";
};
modSha256 = "1fzsm85c31vkdw80kijxmjhk8jyhjz8b21npgks2qrnizhm6iaf8";

View file

@ -5,6 +5,7 @@
, liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null
, libmongo-client ? null, czmq ? null, rabbitmq-c ? null, hiredis ? null, mongoc ? null
, libmaxminddb ? null
, nixosTests ? null
}:
with stdenv.lib;
@ -103,6 +104,10 @@ stdenv.mkDerivation rec {
(mkFlag true "generate-man-pages")
];
passthru.tests = {
nixos-rsyslogd = nixosTests.rsyslogd;
};
meta = {
homepage = https://www.rsyslog.com/;
description = "Enhanced syslog implementation";

View file

@ -2,7 +2,7 @@
rustPlatform.buildRustPackage rec {
pname = "rav1e";
version = "0.2.1";
version = "0.3.0";
src = stdenv.mkDerivation rec {
name = "${pname}-${version}-source";
@ -11,11 +11,11 @@ rustPlatform.buildRustPackage rec {
owner = "xiph";
repo = "rav1e";
rev = "v${version}";
sha256 = "1lv8g1vw11lanyx6lqr34hb6m4x1fvwb60kgg5nk8s8hgdr18i0y";
sha256 = "1z8wdwhmczd7qq61gpngnyhl9614csccm0vnavvzjmaqsljlm0qi";
};
cargoLock = fetchurl {
url = "https://github.com/xiph/rav1e/releases/download/v${version}/Cargo.lock";
sha256 = "1d51wcm537pzfmq48vsv87dwf035yl03qkfc0372gchpv079561w";
sha256 = "0qhgiryb71qgil5nawy7n3mj5g9aiikl3hq3nlikg94rm9dl0dhv";
};
installPhase = ''
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
'';
};
cargoSha256 = "0frr4sx05pwvj9gmlvmis6lrnbwk3x579fv3kw38374jy33nrr6z";
cargoSha256 = "185jnmyirfhrv8bxvmwizf3lvq49sjj1696g3gflph31d8bfpb0c";
nativeBuildInputs = [ nasm ];

Some files were not shown because too many files have changed in this diff Show more