ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Jan Tojnar 2019-12-14 23:09:06 +01:00
commit 429561978b
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
115 changed files with 3180 additions and 1885 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
maintainers/maintainer-list.nix
View File

@ -1110,6 +1110,12 @@
githubId = 5555066;
name = "Andrew Cann";
};
cap = {
name = "cap";
email = "nixos_xasenw9@digitalpostkasten.de";
github = "scaredmushroom";
githubId = 45340040;
};
carlosdagos = {
email = "m@cdagostino.io";
github = "carlosdagos";
@ -5007,6 +5013,12 @@
githubId = 2946283;
name = "Brian Cohen";
};
novoxudonoser = {
email = "radnovox@gmail.com";
github = "novoxudonoser";
githubId = 6052922;
name = "Kirill Struokov";
};
np = {
email = "np.nix@nicolaspouillard.fr";
github = "np";
@ -6391,6 +6403,12 @@
githubId = 1437166;
name = "Xia Bin";
};
softinio = {
email = "code@softinio.com";
github = "softinio";
githubId = 3371635;
name = "Salar Rahmanian";
};
solson = {
email = "scott@solson.me";
github = "solson";

44
nixos/lib/make-ext4-fs.nix
View File

@ -4,8 +4,11 @@
# generated image is sized to only fit its contents, with the expectation
# that a script resizes the filesystem at boot time.
{ pkgs
, lib
# List of derivations to be included
, storePaths
# Whether or not to compress the resulting image with zstd
, compressImage ? false, zstd
# Shell commands to populate the ./files directory.
# All files in that directory are copied to the root of the FS.
, populateImageCommands ? ""
@ -20,18 +23,20 @@
let
sdClosureInfo = pkgs.buildPackages.closureInfo { rootPaths = storePaths; };
in
pkgs.stdenv.mkDerivation {
name = "ext4-fs.img";
name = "ext4-fs.img${lib.optionalString compressImage ".zst"}";
nativeBuildInputs = [e2fsprogs.bin libfaketime perl lkl];
nativeBuildInputs = [ e2fsprogs.bin libfaketime perl lkl ]
++ lib.optional compressImage zstd;
buildCommand =
''
${if compressImage then "img=temp.img" else "img=$out"}
(
mkdir -p ./files
${populateImageCommands}
)
# Add the closures of the top-level store objects.
storePaths=$(cat ${sdClosureInfo}/store-paths)
@ -42,28 +47,26 @@ pkgs.stdenv.mkDerivation {
bytes=$((2 * 4096 * $numInodes + 4096 * $numDataBlocks))
echo "Creating an EXT4 image of $bytes bytes (numInodes=$numInodes, numDataBlocks=$numDataBlocks)"
truncate -s $bytes $out
faketime -f "1970-01-01 00:00:01" mkfs.ext4 -L ${volumeLabel} -U ${uuid} $out
truncate -s $bytes $img
faketime -f "1970-01-01 00:00:01" mkfs.ext4 -L ${volumeLabel} -U ${uuid} $img
# Also include a manifest of the closures in a format suitable for nix-store --load-db.
cp ${sdClosureInfo}/registration nix-path-registration
cptofs -t ext4 -i $out nix-path-registration /
cptofs -t ext4 -i $img nix-path-registration /
# Create nix/store before copying paths
faketime -f "1970-01-01 00:00:01" mkdir -p nix/store
cptofs -t ext4 -i $out nix /
cptofs -t ext4 -i $img nix /
echo "copying store paths to image..."
cptofs -t ext4 -i $out $storePaths /nix/store/
cptofs -t ext4 -i $img $storePaths /nix/store/
(
echo "copying files to image..."
cd ./files
cptofs -t ext4 -i $out ./* /
)
cptofs -t ext4 -i $img ./files/* /
# I have ended up with corrupted images sometimes, I suspect that happens when the build machine's disk gets full during the build.
if ! fsck.ext4 -n -f $out; then
if ! fsck.ext4 -n -f $img; then
echo "--- Fsck failed for EXT4 image of $bytes bytes (numInodes=$numInodes, numDataBlocks=$numDataBlocks) ---"
cat errorlog
return 1
@ -71,9 +74,9 @@ pkgs.stdenv.mkDerivation {
(
# Resizes **snugly** to its actual limits (or closer to)
free=$(dumpe2fs $out | grep '^Free blocks:')
blocksize=$(dumpe2fs $out | grep '^Block size:')
blocks=$(dumpe2fs $out | grep '^Block count:')
free=$(dumpe2fs $img | grep '^Free blocks:')
blocksize=$(dumpe2fs $img | grep '^Block size:')
blocks=$(dumpe2fs $img | grep '^Block count:')
blocks=$((''${blocks##*:})) # format the number.
blocksize=$((''${blocksize##*:})) # format the number.
# System can't boot with 0 blocks free.
@ -82,10 +85,15 @@ pkgs.stdenv.mkDerivation {
size=$(( blocks - ''${free##*:} + fudge ))
echo "Resizing from $blocks blocks to $size blocks. (~ $((size*blocksize/1024/1024))MiB)"
EXT2FS_NO_MTAB_OK=yes resize2fs $out -f $size
EXT2FS_NO_MTAB_OK=yes resize2fs $img -f $size
)
# And a final fsck, because of the previous truncating.
fsck.ext4 -n -f $out
fsck.ext4 -n -f $img
if [ ${builtins.toString compressImage} ]; then
echo "Compressing image"
zstd -v --no-progress ./$img -o $out
fi
'';
}

13
nixos/modules/installer/cd-dvd/sd-image.nix
View File

@ -18,6 +18,7 @@ with lib;
let
rootfsImage = pkgs.callPackage ../../../lib/make-ext4-fs.nix ({
inherit (config.sdImage) storePaths;
compressImage = true;
populateImageCommands = config.sdImage.populateRootCommands;
volumeLabel = "NIXOS_SD";
} // optionalAttrs (config.sdImage.rootPartitionUUID != null) {
@ -128,10 +129,11 @@ in
sdImage.storePaths = [ config.system.build.toplevel ];
system.build.sdImage = pkgs.callPackage ({ stdenv, dosfstools, e2fsprogs, mtools, libfaketime, utillinux, bzip2 }: stdenv.mkDerivation {
system.build.sdImage = pkgs.callPackage ({ stdenv, dosfstools, e2fsprogs,
mtools, libfaketime, utillinux, bzip2, zstd }: stdenv.mkDerivation {
name = config.sdImage.imageName;
nativeBuildInputs = [ dosfstools e2fsprogs mtools libfaketime utillinux bzip2 ];
nativeBuildInputs = [ dosfstools e2fsprogs mtools libfaketime utillinux bzip2 zstd ];
inherit (config.sdImage) compressImage;
@ -146,11 +148,14 @@ in
echo "file sd-image $img" >> $out/nix-support/hydra-build-products
fi
echo "Decompressing rootfs image"
zstd -d --no-progress "${rootfsImage}" -o ./root-fs.img
# Gap in front of the first partition, in MiB
gap=8
# Create the image file sized to fit /boot/firmware and /, plus slack for the gap.
rootSizeBlocks=$(du -B 512 --apparent-size ${rootfsImage} | awk '{ print $1 }')
rootSizeBlocks=$(du -B 512 --apparent-size ./root-fs.img | awk '{ print $1 }')
firmwareSizeBlocks=$((${toString config.sdImage.firmwareSize} * 1024 * 1024 / 512))
imageSize=$((rootSizeBlocks * 512 + firmwareSizeBlocks * 512 + gap * 1024 * 1024))
truncate -s $imageSize $img
@ -168,7 +173,7 @@ in
# Copy the rootfs into the SD image
eval $(partx $img -o START,SECTORS --nr 2 --pairs)
dd conv=notrunc if=${rootfsImage} of=$img seek=$START count=$SECTORS
dd conv=notrunc if=./root-fs.img of=$img seek=$START count=$SECTORS
# Create a FAT32 /boot/firmware partition of suitable size into firmware_part.img
eval $(partx $img -o START,SECTORS --nr 1 --pairs)

1
nixos/modules/module-list.nix
View File

@ -866,6 +866,7 @@
./services/x11/hardware/digimend.nix
./services/x11/hardware/cmt.nix
./services/x11/gdk-pixbuf.nix
./services/x11/imwheel.nix
./services/x11/redshift.nix
./services/x11/urxvtd.nix
./services/x11/window-managers/awesome.nix

2
nixos/modules/programs/sway.nix
View File

@ -87,6 +87,8 @@ in {
hardware.opengl.enable = mkDefault true;
fonts.enableDefaultFonts = mkDefault true;
programs.dconf.enable = mkDefault true;
# To make a Sway session available if a display manager like SDDM is enabled:
services.xserver.displayManager.extraSessionFilePackages = [ swayJoined ];
};
meta.maintainers = with lib.maintainers; [ gnidorah primeos colemickens ];

4
nixos/modules/services/databases/postgresql.nix
View File

@ -339,9 +339,9 @@ in
'') cfg.ensureDatabases}
'' + ''
${concatMapStrings (user: ''
$PSQL -tAc "SELECT 1 FROM pg_roles WHERE rolname='${user.name}'" | grep -q 1 || $PSQL -tAc "CREATE USER ${user.name}"
$PSQL -tAc "SELECT 1 FROM pg_roles WHERE rolname='${user.name}'" | grep -q 1 || $PSQL -tAc 'CREATE USER "${user.name}"'
${concatStringsSep "\n" (mapAttrsToList (database: permission: ''
$PSQL -tAc 'GRANT ${permission} ON ${database} TO ${user.name}'
$PSQL -tAc 'GRANT ${permission} ON ${database} TO "${user.name}"'
'') user.ensurePermissions)}
'') cfg.ensureUsers}
'';

31
nixos/modules/services/misc/matrix-synapse.nix
View File

@ -671,43 +671,30 @@ in {
gid = config.ids.gids.matrix-synapse;
} ];
services.postgresql.enable = mkIf usePostgresql (mkDefault true);
services.postgresql = mkIf (usePostgresql && cfg.create_local_database) {
enable = mkDefault true;
ensureDatabases = [ cfg.database_name ];
ensureUsers = [{
name = cfg.database_user;
ensurePermissions = { "DATABASE \"${cfg.database_name}\"" = "ALL PRIVILEGES"; };
}];
};
systemd.services.matrix-synapse = {
description = "Synapse Matrix homeserver";
after = [ "network.target" "postgresql.service" ];
after = [ "network.target" ] ++ lib.optional config.services.postgresql.enable "postgresql.service" ;
wantedBy = [ "multi-user.target" ];
preStart = ''
${cfg.package}/bin/homeserver \
--config-path ${configFile} \
--keys-directory ${cfg.dataDir} \
--generate-keys
'' + optionalString (usePostgresql && cfg.create_local_database) ''
if ! test -e "${cfg.dataDir}/db-created"; then
${pkgs.sudo}/bin/sudo -u ${pg.superUser} \
${pg.package}/bin/createuser \
--login \
--no-createdb \
--no-createrole \
--encrypted \
${cfg.database_user}
${pkgs.sudo}/bin/sudo -u ${pg.superUser} \
${pg.package}/bin/createdb \
--owner=${cfg.database_user} \
--encoding=UTF8 \
--lc-collate=C \
--lc-ctype=C \
--template=template0 \
${cfg.database_name}
touch "${cfg.dataDir}/db-created"
fi
'';
serviceConfig = {
Type = "notify";
User = "matrix-synapse";
Group = "matrix-synapse";
WorkingDirectory = cfg.dataDir;
PermissionsStartOnly = true;
ExecStart = ''
${cfg.package}/bin/homeserver \
${ concatMapStringsSep "\n " (x: "--config-path ${x} \\") ([ configFile ] ++ cfg.extraConfigFiles) }

28
nixos/modules/services/web-servers/unit/default.nix
View File

@ -85,7 +85,7 @@ in {
systemd.tmpfiles.rules = [
"d '${cfg.stateDir}' 0750 ${cfg.user} ${cfg.group} - -"
"d '${cfg.logDir}' 0750 ${cfg.user} ${cfg.group} - -"
];
];
systemd.services.unit = {
description = "Unit App Server";
@ -93,23 +93,39 @@ in {
wantedBy = [ "multi-user.target" ];
path = with pkgs; [ curl ];
preStart = ''
test -f '/run/unit/control.unit.sock' || rm -f '/run/unit/control.unit.sock'
test -f '${cfg.stateDir}/conf.json' || rm -f '${cfg.stateDir}/conf.json'
'';
postStart = ''
curl -X PUT --data-binary '@${configFile}' --unix-socket '/run/unit/control.unit.sock' 'http://localhost/config'
'';
serviceConfig = {
User = cfg.user;
Group = cfg.group;
AmbientCapabilities = "CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID";
CapabilityBoundingSet = "CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID";
ExecStart = ''
${cfg.package}/bin/unitd --control 'unix:/run/unit/control.unit.sock' --pid '/run/unit/unit.pid' \
--log '${cfg.logDir}/unit.log' --state '${cfg.stateDir}' --no-daemon \
--user ${cfg.user} --group ${cfg.group}
'';
# User and group
User = cfg.user;
Group = cfg.group;
# Capabilities
AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" "CAP_SETGID" "CAP_SETUID" ];
# Security
NoNewPrivileges = true;
# Sanboxing
ProtectSystem = "full";
ProtectHome = true;
RuntimeDirectory = "unit";
RuntimeDirectoryMode = "0750";
PrivateTmp = true;
PrivateDevices = true;
ProtectHostname = true;
ProtectKernelTunables = true;
ProtectKernelModules = true;
ProtectControlGroups = true;
LockPersonality = true;
MemoryDenyWriteExecute = true;
RestrictRealtime = true;
PrivateMounts = true;
};
};

3
nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
View File

@ -35,6 +35,9 @@ in
name = "io.elementary.greeter";
};
# Show manual login card.
services.xserver.displayManager.lightdm.extraSeatDefaults = "greeter-show-manual-login=true";
environment.etc."lightdm/io.elementary.greeter.conf".source = "${pkgs.pantheon.elementary-greeter}/etc/lightdm/io.elementary.greeter.conf";
environment.etc."wingpanel.d/io.elementary.greeter.whitelist".source = "${pkgs.pantheon.elementary-default-settings}/etc/wingpanel.d/io.elementary.greeter.whitelist";

68
nixos/modules/services/x11/imwheel.nix Normal file
View File

@ -0,0 +1,68 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.xserver.imwheel;
in
{
options = {
services.xserver.imwheel = {
enable = mkEnableOption "IMWheel service";
extraOptions = mkOption {
type = types.listOf types.str;
default = [ "--buttons 45" ];
example = [ "--debug" ];
description = ''
Additional command-line arguments to pass to
<command>imwheel</command>.
'';
};
rules = mkOption {
type = types.attrsOf types.str;
default = {};
example = literalExample ''
".*" = '''
None, Up, Button4, 8
None, Down, Button5, 8
Shift_L, Up, Shift_L|Button4, 4
Shift_L, Down, Shift_L|Button5, 4
Control_L, Up, Control_L|Button4
Control_L, Down, Control_L|Button5
''';
'';
description = ''
Window class translation rules.
/etc/X11/imwheelrc is generated based on this config
which means this config is global for all users.
See <link xlink:href="http://imwheel.sourceforge.net/imwheel.1.html">offical man pages</link>
for more informations.
'';
};
};
};
config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.imwheel ];
environment.etc."X11/imwheel/imwheelrc".source =
pkgs.writeText "imwheelrc" (concatStringsSep "\n\n"
(mapAttrsToList
(rule: conf: "\"${rule}\"\n${conf}") cfg.rules
));
systemd.user.services.imwheel = {
description = "imwheel service";
wantedBy = [ "graphical-session.target" ];
partOf = [ "graphical-session.target" ];
serviceConfig = {
ExecStart = "${pkgs.imwheel}/bin/imwheel " + escapeShellArgs ([
"--detach"
"--kill"
] ++ cfg.extraOptions);
ExecStop = "${pkgs.procps}/bin/pkill imwheel";
Restart = "on-failure";
};
};
};
}

28
nixos/modules/virtualisation/lxd.nix
View File

@ -35,6 +35,18 @@ in
with nixos.
'';
};
recommendedSysctlSettings = mkOption {
type = types.bool;
default = false;
description = ''
enables various settings to avoid common pitfalls when
running containers requiring many file operations.
Fixes errors like "Too many open files" or
"neighbour: ndisc_cache: neighbor table overflow!".
See https://lxd.readthedocs.io/en/latest/production-setup/
for details.
'';
};
};
};
@ -69,8 +81,11 @@ in
ExecStart = "@${pkgs.lxd.bin}/bin/lxd lxd --group lxd";
Type = "simple";
KillMode = "process"; # when stopping, leave the containers alone
LimitMEMLOCK = "infinity";
LimitNOFILE = "1048576";
LimitNPROC = "infinity";
TasksMax = "infinity";
};
};
users.groups.lxd.gid = config.ids.gids.lxd;
@ -79,5 +94,16 @@ in
subUidRanges = [ { startUid = 1000000; count = 65536; } ];
subGidRanges = [ { startGid = 1000000; count = 65536; } ];
};
boot.kernel.sysctl = mkIf cfg.recommendedSysctlSettings {
"fs.inotify.max_queued_events" = 1048576;
"fs.inotify.max_user_instances" = 1048576;
"fs.inotify.max_user_watches" = 1048576;
"vm.max_map_count" = 262144;
"kernel.dmesg_restrict" = 1;
"net.ipv4.neigh.default.gc_thresh3" = 8192;
"net.ipv6.neigh.default.gc_thresh3" = 8192;
"kernel.keys.maxkeys" = 2000;
};
};
}

4
nixos/tests/xmonad.nix
View File

@ -27,13 +27,13 @@ import ./make-test-python.nix ({ pkgs, ...} : {
machine.wait_for_x()
machine.wait_for_file("${user.home}/.Xauthority")
machine.succeed("xauth merge ${user.home}/.Xauthority")
machine.send_chars("alt-ctrl-x")
machine.send_key("alt-ctrl-x")
machine.wait_for_window("${user.name}.*machine")
machine.sleep(1)
machine.screenshot("terminal")
machine.wait_until_succeeds("xmonad --restart")
machine.sleep(3)
machine.send_chars("alt-shift-ret")
machine.send_key("alt-shift-ret")
machine.wait_for_window("${user.name}.*machine")
machine.sleep(1)
machine.screenshot("terminal")

28
pkgs/applications/audio/renoise/default.nix
View File

@ -4,8 +4,7 @@
with stdenv.lib;
# To use the full release version:
# 1) Sign into https://backstage.renoise.com and download the appropriate (x86 or x86_64) version
# for your machine to some stable location.
# 1) Sign into https://backstage.renoise.com and download the release version to some stable location.
# 2) Override the releasePath attribute to point to the location of the newly downloaded bundle.
# Note: Renoise creates an individual build for each license which screws somewhat with the
# use of functions like requireFile as the hash will be different for every user.
@ -15,25 +14,20 @@ in
stdenv.mkDerivation rec {
pname = "renoise";
version = "3.1.0";
version = "3.2.0";
src =
if stdenv.hostPlatform.system == "x86_64-linux" then
if releasePath == null then
fetchurl {
url = "https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_x86_64.tar.bz2";
sha256 = "0pan68fr22xbj7a930y29527vpry3f07q3i9ya4fp6g7aawffsga";
}
fetchurl {
urls = [
"https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz"
"https://web.archive.org/web/https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz"
];
sha256 = "0cfczzpk1ddz61nk4d72fydbm5nbgxqp95v81by2n87s1wffjjhi";
}
else
releasePath
else if stdenv.hostPlatform.system == "i686-linux" then
if releasePath == null then
fetchurl {
url = "http://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_x86.tar.bz2";
sha256 = "1lccjj4k8hpqqxxham5v01v2rdwmx3c5kgy1p9lqvzqma88k4769";
}
else
releasePath
releasePath
else throw "Platform is not supported by Renoise";
buildInputs = [ alsaLib libjack2 libX11 libXcursor libXext libXrandr ];
@ -69,6 +63,6 @@ stdenv.mkDerivation rec {
homepage = https://www.renoise.com/;
license = licenses.unfree;
maintainers = [];
platforms = [ "i686-linux" "x86_64-linux" ];
platforms = [ "x86_64-linux" ];
};
}

26
pkgs/applications/audio/whipper/default.nix
View File

@ -1,24 +1,26 @@
{ stdenv, fetchFromGitHub, python2, cdparanoia, cdrdao, flac
, sox, accuraterip-checksum, utillinux, substituteAll }:
{ stdenv, fetchFromGitHub, python3, cdparanoia, cdrdao, flac
, sox, accuraterip-checksum, libsndfile, utillinux, substituteAll }:
python2.pkgs.buildPythonApplication rec {
name = "whipper-${version}";
version = "0.7.3";
python3.pkgs.buildPythonApplication rec {
pname = "whipper";
version = "0.9.0";
src = fetchFromGitHub {
owner = "whipper-team";
repo = "whipper";
rev = "v${version}";
sha256 = "0ypbgc458i7yvbyvg6wg6agz5yzlwm1v6zw7fmyq9h59xsv27mpr";
sha256 = "0x1qsp021i0l5sdcm2kcv9zfwp696k4izhw898v6marf8phll7xc";
};
pythonPath = with python2.pkgs; [
pythonPath = with python3.pkgs; [
pygobject3 musicbrainzngs urllib3 chardet
pycdio setuptools mutagen CDDB
pycdio setuptools setuptools_scm mutagen
requests
];
checkInputs = with python2.pkgs; [
buildInputs = [ libsndfile ];
checkInputs = with python3.pkgs; [
twisted
];
@ -33,6 +35,10 @@ python2.pkgs.buildPythonApplication rec {
"--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ accuraterip-checksum cdrdao utillinux flac sox ])
];
preBuild = ''
export SETUPTOOLS_SCM_PRETEND_VERSION="v${version}"
'';
# some tests require internet access
# https://github.com/JoeLametta/whipper/issues/291
doCheck = false;
@ -44,7 +50,7 @@ python2.pkgs.buildPythonApplication rec {
meta = with stdenv.lib; {
homepage = https://github.com/whipper-team/whipper;
description = "A CD ripper aiming for accuracy over speed";
maintainers = with maintainers; [ rycee ];
maintainers = with maintainers; [ rycee emily ];
license = licenses.gpl3Plus;
platforms = platforms.linux;
};

24
pkgs/applications/blockchains/bitcoin.nix
View File

@ -3,9 +3,24 @@
, withGui }:
with stdenv.lib;
stdenv.mkDerivation rec{
pname = if withGui then "bitcoin" else "bitcoind";
let
version = "0.19.0.1";
majorMinorVersion = versions.majorMinor version;
desktop = fetchurl {
url = "https://raw.githubusercontent.com/bitcoin-core/packaging/${majorMinorVersion}/debian/bitcoin-qt.desktop";
sha256 = "0cpna0nxcd1dw3nnzli36nf9zj28d2g9jf5y0zl9j18lvanvniha";
};
pixmap = fetchurl {
url = "https://raw.githubusercontent.com/bitcoin/bitcoin/v${version}/share/pixmaps/bitcoin128.png";
sha256 = "08p7j7dg50jlj783kkgdw037klmx0spqjikaprmbkzgcb620r25d";
};
in stdenv.mkDerivation rec {
pname = if withGui then "bitcoin" else "bitcoind";
inherit version;
src = fetchurl {
urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
@ -22,6 +37,11 @@ stdenv.mkDerivation rec{
++ optionals stdenv.isLinux [ utillinux ]
++ optionals withGui [ qtbase qttools qrencode ];
postInstall = optional withGui ''
install -Dm644 ${desktop} $out/share/applications/bitcoin-qt.desktop
install -Dm644 ${pixmap} $out/share/pixmaps/bitcoin128.png
'';
configureFlags = [ "--with-boost-libdir=${boost.out}/lib"
"--disable-bench"
] ++ optionals (!doCheck) [

6
pkgs/applications/editors/android-studio/default.nix
View File

@ -18,9 +18,9 @@ let
sha256Hash = "0qlrdf7a6f5585mrni1aa2chic4n7b9c8lgrj8br6q929hc2f5d9";
};
latestVersion = { # canary & dev
version = "4.0.0.5"; # "Android Studio 4.0 Canary 5"
build = "193.6039983";
sha256Hash = "19pidwl46z7alc0d7awhvi4aq1r87f99wh5yfi94s1zd2azm9f9z";
version = "4.0.0.6"; # "Android Studio 4.0 Canary 6"
build = "193.6052267";
sha256Hash = "1naxyfnrj7milqha7xbwbcvyi81a7fqb7jsm03hhq5xs2sw55m1c";
};
in {
# Attributes are named by their corresponding release channels

8
pkgs/applications/editors/emacs/macport.nix
View File

@ -4,10 +4,12 @@
}:
stdenv.mkDerivation rec {
emacsVersion = "26.3";
emacsName = "emacs-${emacsVersion}";
pname = "emacs";
version = "26.3";
emacsName = "emacs-${version}";
macportVersion = "7.7";
name = "emacs-mac-${emacsVersion}-${macportVersion}";
name = "emacs-mac-${version}-${macportVersion}";
src = fetchurl {
url = "mirror://gnu/emacs/${emacsName}.tar.xz";

6
pkgs/applications/editors/vscode/vscode.nix
View File

@ -11,13 +11,13 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "1zxj1vav7swjmvvgcn1y61figjhqrczf8d16rk6yayja1pfjgvs5";
x86_64-darwin = "0f6ck40rkngzcm5xih1rbwpz905r533n2z08maycgf4iajgwrn43";
x86_64-linux = "1ziw2b851kg17jaf713nwhsv5ikbvivq3h01xximhcglv9vzk93l";
x86_64-darwin = "0nndasa130551jf06mfrym593c02c3ypgg9f9rdg1fw5qbyjb8hm";
}.${system};
in
callPackage ./generic.nix rec {
version = "1.40.1";
version = "1.41.0";
pname = "vscode";
executableName = "code" + lib.optionalString isInsiders "-insiders";

6
pkgs/applications/editors/vscode/vscodium.nix
View File

@ -11,8 +11,8 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "01mblkwq3qnj70rwizv408x6sc0jg4wav44p9z3cmzcf9prpm2gs";
x86_64-darwin = "1lvh735vddz65l1ahbl66k04rck36lpvp1n3z3hrk0mjn451ga6v";
x86_64-linux = "1njxa19mzzydz1jacghwmha3dl4a13m9xzzwsb0rbks5zc9a0v7m";
x86_64-darwin = "0cpd87q0q3i172l4s43s79by42wa9k5pyik3v2z5mq8zpms8qcq4";
}.${system};
sourceRoot = {
@ -23,7 +23,7 @@ in
callPackage ./generic.nix rec {
inherit sourceRoot;
version = "1.40.1";
version = "1.41.0";
pname = "vscodium";
executableName = "codium";

62
pkgs/applications/misc/dupeguru/default.nix Normal file
View File

@ -0,0 +1,62 @@
{stdenv, python3Packages, gettext, qt5, fetchFromGitHub}:
python3Packages.buildPythonApplication rec {
pname = "dupeguru";
version = "4.0.4";
format = "other";
src = fetchFromGitHub {
owner = "arsenetar";
repo = "dupeguru";
rev = "${version}";
sha256 = "0ma4f1c6vmpz8gi4sdy43x1ik7wh42wayvk1iq520d3i714kfcpy";
fetchSubmodules = true;
};
nativeBuildInputs = [
gettext
python3Packages.pyqt5
qt5.wrapQtAppsHook
];
pythonPath = with python3Packages; [
pyqt5
send2trash
sphinx
polib
hsaudiotag3k
];
makeFlags = [
"PREFIX=${placeholder ''out''}"
"NO_VENV=1"
];
# TODO: package pytest-monkeyplus for running tests
# https://github.com/NixOS/nixpkgs/pull/75054/files#r357690123
doCheck = false;
# Avoid double wrapping Python programs.
dontWrapQtApps = true;
preFixup = ''
# TODO: A bug in python wrapper
# see https://github.com/NixOS/nixpkgs/pull/75054#discussion_r357656916
makeWrapperArgs="''${qtWrapperArgs[@]}"
'';
postFixup = ''
# Executable in $out/bin is a symlink to $out/share/dupeguru/run.py
# so wrapPythonPrograms hook does not handle it automatically.
wrapPythonProgramsIn "$out/share/dupeguru" "$out $pythonPath"
'';
meta = with stdenv.lib; {
description = "GUI tool to find duplicate files in a system";
homepage = "https://github.com/arsenetar/dupeguru";
license = licenses.bsd3;
platforms = platforms.linux;
maintainers = [ maintainers.novoxudonoser ];
};
}

1
pkgs/applications/misc/electrum/default.nix
View File

@ -74,6 +74,7 @@ python3Packages.buildPythonApplication {
tlslite-ng
# plugins
ckcc-protocol
keepkey
trezor
btchip

4
pkgs/applications/misc/hivemind/default.nix
View File

@ -2,14 +2,14 @@
buildGoPackage rec {
pname = "hivemind";
version = "1.0.4";
version = "1.0.6";
goPackagePath = "github.com/DarthSim/hivemind";
src = fetchFromGitHub {
owner = "DarthSim";
repo = "hivemind";
rev = "v${version}";
sha256 = "1z2izvyf0j3gi0cas5v22kkmkls03sg67182k8v3p6kwhzn0jw67";
sha256 = "0afcnd03wsdphbbpha65rv5pnv0x6ldnnm6rnv1m6xkkywgnzx95";
};
meta = with stdenv.lib; {

6
pkgs/applications/misc/wtf/default.nix
View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "wtf";
version = "0.24.0";
version = "0.25.0";
src = fetchFromGitHub {
owner = "wtfutil";
repo = pname;
rev = "v${version}";
sha256 = "0jz7hjcm0hfxcih2zplp47wx6lyvhhzj9ka4ljqrx0i4l7cm9ahs";
sha256 = "1g76hzlyi8s8dayd36cs4bhnwgrrr731ybflw3xk5pgkgcbs14sd";
};
modSha256 = "04d8hvd90f7v853p23xcx38qz3ryv7kz7zjk9b131cjnd4mcv0sm";
modSha256 = "186m7s20r59dyh5lpby4sd4vw3rvnkfzslylwin0c3r6150yrx8h";
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];

8
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View File

@ -93,19 +93,19 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
version = "9.0.1";
version = "9.0.2";
lang = "en-US";
srcs = {
x86_64-linux = fetchurl {
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";
sha256 = "09iasj13wn3d1dygpxn4www4rx8wnxxlm9h6df9lzf4wll15px55";
sha256 = "1xdnqphsj7wzwyv927jwd3fi36srx0minydwl5jg5yyd3m3if9hb";
};
i686-linux = fetchurl {
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz";
sha256 = "1vz3pvqi114c9lkyhqy754ngi90708c187xwiyr9786ff89sjw5i";
sha256 = "1qk9fg5dvyyvbngsqla00by8a974mpvq9pnm2djif54lr2nfivwf";
};
};
in
@ -397,7 +397,7 @@ stdenv.mkDerivation rec {
longDescription = tor-browser-bundle.meta.longDescription;
homepage = "https://www.torproject.org/";
platforms = attrNames srcs;
maintainers = with maintainers; [ offline matejc doublec thoughtpolice joachifm hax404 ];
maintainers = with maintainers; [ offline matejc doublec thoughtpolice joachifm hax404 cap ];
hydraPlatforms = [];
# MPL2.0+, GPL+, &c. While it's not entirely clear whether
# the compound is "libre" in a strict sense (some components place certain

7
pkgs/applications/networking/mumble/default.nix
View File

@ -16,7 +16,8 @@ assert iceSupport -> zeroc-ice != null;
with stdenv.lib;
let
generic = overrides: source: qt5.mkDerivation (source // overrides // {
name = "${overrides.type}-${source.version}";
pname = overrides.type;
version = source.version;
patches = (source.patches or []) ++ optional jackSupport ./mumble-jack-support.patch;
@ -63,9 +64,9 @@ let
meta = {
description = "Low-latency, high quality voice chat software";
homepage = https://mumble.info;
homepage = "https://mumble.info";
license = licenses.bsd3;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ petabyteboy ];
platforms = platforms.linux;
};
});

3
pkgs/applications/networking/nextcloud-client/default.nix
View File

@ -12,7 +12,6 @@
, qtkeychain
, qttools
, qtwebengine
, qtwebkit
, sqlite
}:
@ -45,7 +44,6 @@ mkDerivation rec {
qtkeychain
qttools
qtwebengine
qtwebkit
sqlite
];
@ -55,6 +53,7 @@ mkDerivation rec {
cmakeFlags = [
"-DCMAKE_INSTALL_LIBDIR=lib" # expected to be prefix-relative by build code setting RPATH
"-DNO_SHIBBOLETH=1" # allows to compile without qtwebkit
];
meta = with lib; {

4
pkgs/applications/networking/p2p/qbittorrent/default.nix
View File

@ -10,13 +10,13 @@ with lib;
mkDerivation rec {
pname = "qbittorrent";
version = "4.1.9.1";
version = "4.2.0";
src = fetchFromGitHub {
owner = "qbittorrent";
repo = "qbittorrent";
rev = "release-${version}";
sha256 = "19zgqlby7i1kr20wa4zd99qzd062a879xxxbmlf40rnqiqy4bhyi";
sha256 = "17vm6aa2k8k1q14z9r2r06c794bcr4m0l0fdsn08wid6mj1zjsbx";
};
# NOTE: 2018-05-31: CMake is working but it is not officially supported

15
pkgs/applications/networking/remote/citrix-workspace/default.nix
View File

@ -24,7 +24,7 @@
, gtk_engines
, alsaLib
, zlib
, version ? "19.10.0"
, version ? "19.12.0"
}:
let
@ -71,7 +71,18 @@ let
x86hash = "000zjik8wf8b6fadnsai0p77b4n2l95544zx503iyrb9pv53bj3y";
x64suffix = "15";
x86suffix = "15";
homepage = https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest1.html;
homepage = https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-1910.html;
};
"19.12.0" = {
major = "19";
minor = "12";
patch = "0";
x64hash = "1si5mkxbgb8m99bkvgc3l80idjfdp0kby6pv47s07nn43dbr1j7a";
x86hash = "07rfp90ksnvr8zv7ix7f0z6a59n48s7bd4kqbzilfwxgs4ddqmcy";
x64suffix = "19";
x86suffix = "19";
homepage = https://www.citrix.com/de-de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html;
};
};

12
pkgs/applications/office/skrooge/default.nix
View File

@ -7,21 +7,13 @@
mkDerivation rec {
pname = "skrooge";
version = "2.20.0";
version = "2.21.0";
src = fetchurl {
url = "http://download.kde.org/stable/skrooge/${pname}-${version}.tar.xz";
sha256 = "0rakfngp7j2x7h1isg6lbc5kva6k1kg99dz0zl43dc28s15can1w";
sha256 = "1aqn0367q7mdg728r5085aqzc4mgfz1bgqqlhgdjjp7r192yq7r2";
};
patches = [
(fetchpatch {
name = "skrooge-2.20.0-missing-header.patch";
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-office/skrooge/files/skrooge-2.20.0-missing-header.patch?id=cb8c91474b0ae2f9e889f89afe2d9114dbd1784f";
sha256 = "154zsidx45h6qrcqjh6czjxrcwrcmbyv3yh2k1s40v8pzvjwzrld";
})
];
nativeBuildInputs = [
cmake extra-cmake-modules kdoctools shared-mime-info
];

1
pkgs/applications/science/logic/coq/default.nix
View File

@ -32,6 +32,7 @@ let
"8.10.0" = "138jw94wp4mg5dgjc2asn8ng09ayz1mxdznq342n0m469j803gzg";
"8.10.1" = "072v2zkjzf7gj48137wpr3c9j0hg9pdhlr5l8jrgrwynld8fp7i4";
"8.10.2" = "0znxmpy71bfw0p6x47i82jf5k7v41zbz9bdpn901ysn3ir8l3wrz";
"8.11+beta1" = "06dlxj6v7gd51dh6ir121z7lgqdagkq717xxxrc8bdqhz7d2z7qj";
}.${version};
coq-version = stdenv.lib.versions.majorMinor version;
versionAtLeast = stdenv.lib.versionAtLeast coq-version;

10
pkgs/applications/science/math/sage/pybrial.nix
View File

@ -1,6 +1,7 @@
{ stdenv
, fetchFromGitHub
, buildPythonPackage
, brial
}:
# This has a cyclic dependency with sage. I don't include sage in the
# buildInputs and let python figure it out at runtime. Because of this,
@ -9,15 +10,10 @@
# it).
buildPythonPackage rec {
pname = "pyBRiAl";
version = "1.2.3";
version = brial.version;
# included with BRiAl source
src = fetchFromGitHub {
owner = "BRiAl";
repo = "BRiAl";
rev = version;
sha256 = "0qy4cwy7qrk4zg151cmws5cglaa866z461cnj9wdnalabs7v7qbg";
};
src = brial.src;
sourceRoot = "source/sage-brial";

20
pkgs/applications/science/misc/root/default.nix
View File

@ -1,27 +1,32 @@
{ stdenv, fetchurl, cmake, pcre, pkgconfig, python2
, libX11, libXpm, libXft, libXext, libGLU, libGL, zlib, libxml2, lz4, lzma, gsl, xxHash
{ stdenv, fetchurl, cmake, gl2ps, gsl, libX11, libXpm, libXft, libXext
, libGLU, libGL, libxml2, lz4, lzma, pcre, pkgconfig, python, xxHash, zlib
, Cocoa, OpenGL, noSplash ? false }:
stdenv.mkDerivation rec {
pname = "root";
version = "6.12.06";
version = "6.18.04";
src = fetchurl {
url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
sha256 = "1557b9sdragsx9i15qh6lq7fn056bgi87d31kxdl4vl0awigvp5f";
sha256 = "196ghma6g5a7sqz52wyjkgvmh4hj4vqwppm0zwdypy33hgy8anii";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake pcre python2 zlib libxml2 lz4 lzma gsl xxHash ]
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ gl2ps pcre python zlib libxml2 lz4 lzma gsl xxHash ]
++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ]
++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ]
;
propagatedBuildInputs = [ python.pkgs.numpy ];
patches = [
./sw_vers.patch
];
preConfigure = ''
rm -rf builtins/*
substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \
--replace 'set(lcgpackages ' '#set(lcgpackages '
patchShebangs build/unix/
'' + stdenv.lib.optionalString noSplash ''
substituteInPlace rootx/src/rootx.cxx --replace "gNoLogo = false" "gNoLogo = true"
@ -35,8 +40,10 @@ stdenv.mkDerivation rec {
"-Dbonjour=OFF"
"-Dcastor=OFF"
"-Dchirp=OFF"
"-Dclad=OFF"
"-Ddavix=OFF"
"-Ddcache=OFF"
"-Dfail-on-missing=ON"
"-Dfftw3=OFF"
"-Dfitsio=OFF"
"-Dfortran=OFF"
@ -57,6 +64,7 @@ stdenv.mkDerivation rec {
"-Drfio=OFF"
"-Dsqlite=OFF"
"-Dssl=OFF"
"-Dvdt=OFF"
"-Dxml=ON"
"-Dxrootd=OFF"
]

81
pkgs/applications/science/misc/root/sw_vers.patch
View File

@ -1,54 +1,46 @@
diff --git a/build/unix/compiledata.sh b/build/unix/compiledata.sh
diff a/build/unix/compiledata.sh b/build/unix/compiledata.sh
--- a/build/unix/compiledata.sh
+++ b/build/unix/compiledata.sh
@@ -49,7 +49,7 @@ fi
@@ -47,7 +47,7 @@ fi
if [ "$ARCH" = "macosx" ] || [ "$ARCH" = "macosx64" ] || \
[ "$ARCH" = "macosxicc" ]; then
- macosx_minor=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2`
+ macosx_minor=7
+ macosx_minor=12
SOEXT="so"
if [ $macosx_minor -ge 5 ]; then
if [ "x`echo $SOFLAGS | grep -- '-install_name'`" != "x" ]; then
diff --git a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake
diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake
--- a/cmake/modules/SetUpMacOS.cmake
+++ b/cmake/modules/SetUpMacOS.cmake
@@ -12,25 +12,11 @@ set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} /usr/X11R6)
#---------------------------------------------------------------------------------------------------------
@@ -2,17 +2,8 @@ set(ROOT_ARCHITECTURE macosx)
set(ROOT_PLATFORM macosx)
if (CMAKE_SYSTEM_NAME MATCHES Darwin)
- EXECUTE_PROCESS(COMMAND sw_vers "-productVersion"
- COMMAND cut -d . -f 1-2
- OUTPUT_VARIABLE MACOSX_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
-
- MESSAGE(STATUS "Found a Mac OS X System ${MACOSX_VERSION}")
- EXECUTE_PROCESS(COMMAND sw_vers "-productVersion"
- COMMAND cut -d . -f 2
- OUTPUT_VARIABLE MACOSX_MINOR OUTPUT_STRIP_TRAILING_WHITESPACE)
-
- if(MACOSX_VERSION VERSION_GREATER 10.7 AND ${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
set(libcxx ON CACHE BOOL "Build using libc++" FORCE)
- endif()
- if(${MACOSX_MINOR} GREATER 4)
- if(MACOSX_VERSION VERSION_GREATER 10.4)
#TODO: check haveconfig and rpath -> set rpath true
#TODO: check Thread, define link command
#TODO: more stuff check configure script
- execute_process(COMMAND /usr/sbin/sysctl machdep.cpu.extfeatures OUTPUT_VARIABLE SYSCTL_OUTPUT)
- if(${SYSCTL_OUTPUT} MATCHES 64)
- MESSAGE(STATUS "Found a 64bit system")
set(ROOT_ARCHITECTURE macosx64)
SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS} -m64")
@@ -38,27 +24,6 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin)
@@ -25,23 +16,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")
SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m64")
- else(${SYSCTL_OUTPUT} MATCHES 64)
- else()
- MESSAGE(STATUS "Found a 32bit system")
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
- SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m32")
- endif(${SYSCTL_OUTPUT} MATCHES 64)
- endif()
- endif()
-
- if(MACOSX_VERSION VERSION_GREATER 10.6)
@ -59,32 +51,51 @@ diff --git a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake
- endif()
- if(MACOSX_VERSION VERSION_GREATER 10.8)
- set(MACOSX_GLU_DEPRECATED ON)
- set(MACOSX_KRB5_DEPRECATED ON)
- endif()
- if(MACOSX_VERSION VERSION_GREATER 10.9)
- set(MACOSX_LDAP_DEPRECATED ON)
- endif()
+ endif()
if (CMAKE_COMPILER_IS_GNUCXX)
message(STATUS "Found GNU compiler collection")
@@ -135,7 +100,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin)
@@ -104,7 +79,6 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin)
endif()
#---Set Linker flags----------------------------------------------------------------------
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -mmacosx-version-min=${MACOSX_VERSION} -Wl,-rpath,@loader_path/../lib")
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath,@loader_path/../lib")
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -mmacosx-version-min=${MACOSX_VERSION}")
else (CMAKE_SYSTEM_NAME MATCHES Darwin)
diff --git a/config/root-config.in b/config/root-config.in
MESSAGE(FATAL_ERROR "There is no setup for this this Apple system up to now. Don't know waht to do. Stop cmake at this point.")
endif (CMAKE_SYSTEM_NAME MATCHES Darwin)
diff a/config/root-config.in b/config/root-config.in
--- a/config/root-config.in
+++ b/config/root-config.in
@@ -304,7 +304,7 @@ macosxicc)
@@ -306,12 +306,6 @@ macosxicc)
auxlibs="-lm -ldl"
;;
macosx64)
# MacOS X with gcc (GNU cc v4.x) in 64 bit mode
- # MacOS X with gcc (GNU cc v4.x) in 64 bit mode
- macosx_minor=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2`
+ macosx_minor=7
# cannot find the one linked to libGraf if relocated after built
if [ $macosx_minor -le 4 ]; then
rootlibs="$rootlibs -lfreetype"
- # cannot find the one linked to libGraf if relocated after built
- if [ $macosx_minor -le 4 ]; then
- rootlibs="$rootlibs -lfreetype"
- fi
auxcflags="${cxxversionflag} -m64"
auxldflags="-m64"
auxlibs="-lm -ldl"
@@ -375,18 +369,11 @@ freebsd* | openbsd* | linux*)
macosx*)
for f in $features ; do
if test "x$f" = "xthread" ; then
- if [ $macosx_minor -ge 5 ]; then
auxcflags="-pthread $auxcflags"
auxlibs="-lpthread $auxlibs"
- else
- auxcflags="-D_REENTRANT $auxcflags"
- auxlibs="-lpthread $auxlibs"
- fi
fi
if test "x$f" = "xrpath" ; then
- if [ $macosx_minor -ge 5 ]; then
auxlibs="-Wl,-rpath,$libdir $auxlibs"
- fi
fi
if test "x$f" = "xlibcxx" ; then
auxcflags="-stdlib=libc++ $auxcflags"

31
pkgs/applications/science/robotics/mavproxy/default.nix Normal file
View File

@ -0,0 +1,31 @@
{ lib, buildPythonApplication, fetchPypi, matplotlib, numpy, pymavlink, pyserial
, setuptools, wxPython_4_0 }:
buildPythonApplication rec {
pname = "MAVProxy";
version = "1.8.17";
src = fetchPypi {
inherit pname version;
sha256 = "193hjilsmbljbgj7v6icy3b4hzm14l0z6v05v7ycx6larij5xj2r";
};
propagatedBuildInputs = [
matplotlib
numpy
pymavlink
pyserial
setuptools
wxPython_4_0
];
# No tests
doCheck = false;
meta = with lib; {
description = "MAVLink proxy and command line ground station";
homepage = "https://github.com/ArduPilot/MAVProxy";
license = licenses.gpl3;
maintainers = with maintainers; [ lopsided98 ];
};
}

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

@ -2,18 +2,20 @@
buildGoModule rec {
pname = "lab";
version = "0.17.0";
version = "0.17.1";
src = fetchFromGitHub {
owner = "zaquestion";
repo = "lab";
rev = "v${version}";
sha256 = "1p8q21k8p1zw1g4fn6f7b80r3wziywbm1av1vg7hc8w1rfqj51wp";
sha256 = "1z83v1dl9c5f99jvvc23ijkwrfrv489la05rlsrc3r4zzza1hx1f";
};
subPackages = [ "." ];
modSha256 = "1cwj7p03j2bglj379h4hb25kxayx07msz0mnqwwbjv5i3zkc6kkg";
modSha256 = "03fqa7s6729g0a6ffiyc61dkldpi7vg8pvvpqak4c0mqi1dycivd";
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
postInstall = ''
mkdir -p "$out/share/bash-completion/completions" "$out/share/zsh/site-functions"

4
pkgs/applications/virtualization/conmon/default.nix
View File

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
project = "conmon";
name = "${project}-${version}";
version = "2.0.6";
version = "2.0.7";
src = fetchFromGitHub {
owner = "containers";
repo = project;
rev = "v${version}";
sha256 = "0h0cfpay296pbz0912aifhbq6g6imarpa22rkm8fdipwkqhhdidz";
sha256 = "1sfh94a1if907kky0wlqz188v6kfdl6v1i34pikpxjllngxzyfr9";
};
nativeBuildInputs = [ pkgconfig ];

4
pkgs/applications/virtualization/crun/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "crun";
version = "0.8";
version = "0.10.6";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = version;
sha256 = "1anvlgw373031w0pp0b28l10yrnyhbj192n60bbbjahw487dk2fi";
sha256 = "0v1hrlpnln0c976fb0k2ig4jv11qbyzf95z0wy92fd8r8in16rc1";
fetchSubmodules = true;
};

1
pkgs/build-support/writers/default.nix
View File

@ -148,6 +148,7 @@ rec {
cp $contentPath tmp.hs
${ghc.withPackages (_: libraries )}/bin/ghc tmp.hs
mv tmp $out
${pkgs.binutils-unwrapped}/bin/strip --strip-unneeded "$out"
'';
} name;

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

@ -15,11 +15,11 @@ let
in stdenv.mkDerivation rec {
pname = "gnome-shell";
version = "3.34.1";
version = "3.34.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "07kd7wdk12nba33jfr44xqdlryiy86wgvsyjs8cw55y8p5cnbn6c";
sha256 = "0k9vq2gh1nhdd6fpp7jnwx37qxaakawiqw1xnlfjvq5g5zdn8ckh";
};
LANG = "en_US.UTF-8";

15
pkgs/desktops/gnome-3/core/mutter/default.nix
View File

@ -42,13 +42,13 @@
stdenv.mkDerivation rec {
pname = "mutter";
version = "3.34.1";
version = "3.34.2";
outputs = [ "out" "dev" "man" ];
src = fetchurl {
url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "13kmmgg2zizr0522clwc2zn3bkwbir503b1wjiiixf5xi37jc65s";
sha256 = "0b8bz5kvs7rlwvqsg87cf6jhrrj95vgd1l235mjx8rip35ipfvrd";
};
mesonFlags = [
@ -105,17 +105,6 @@ stdenv.mkDerivation rec {
];
patches = [
# Fixes from gnome-3-34 branch 2019-11-29.
(fetchpatch {
name = "gnome-3-34-2019-11-29.patch";
url = "https://github.com/GNOME/mutter/compare/3.34.1...c0e76186da5b7baf7c8804c0ffa80232a5a6bf98.patch";
excludes = [
".gitlab-ci.yml"
".gitlab-ci/checkout-gnome-shell.sh"
];
sha256 = "1qmxic83bd3dvg6isipqy8jaaksd7p5s3cb7h44zinq738n8d0fb";
})
# Fix build with libglvnd provided headers
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/mutter/commit/a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90.patch";

4
pkgs/desktops/mate/atril/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "atril";
version = "1.22.2";
version = "1.22.3";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "11l78zkxszvsjr74cmk1wff5ycqrzd89y6k36rydv2rb5af2nsfw";
sha256 = "06hmyw7fwdrdyl3n79b8qxlrwbzf240n82arzmlg62q9zxzdc0is";
};
nativeBuildInputs = [

4
pkgs/desktops/mate/marco/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "marco";
version = "1.22.3";
version = "1.22.4";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0faiqj9i1mqqy1v4jdcwy8nsbkkvs0cwd2dqypgscmcqpbq7jf8a";
sha256 = "0z8q4nwm43imbnbxz348ylgzfl25sknb19kml57d6z6flxws19k3";
};
nativeBuildInputs = [

2
pkgs/development/compilers/chicken/4/eggDerivation.nix
View File

@ -8,7 +8,7 @@
let
libPath = "${chicken}/var/lib/chicken/${toString chicken.binaryVersion}/";
overrides = import ./overrides.nix;
baseName = lib.getName name;
baseName = stdenv.lib.getName name;
override = if builtins.hasAttr baseName overrides
then
builtins.getAttr baseName overrides

202
pkgs/development/compilers/chicken/4/eggs.nix
View File

@ -1,4 +1,4 @@
{ pkgs }:
{ pkgs, stdenv }:
rec {
inherit (pkgs) eggDerivation fetchegg;
@ -16,35 +16,6 @@ rec {
];
};
blob-utils = eggDerivation {
name = "blob-utils-1.0.3";
src = fetchegg {
name = "blob-utils";
version = "1.0.3";
sha256 = "17vdn02fnxnjx5ixgqimln93lqvzyq4y9w02fw7xnbdcjzqm0xml";
};
buildInputs = [
setup-helper
string-utils
];
};
check-errors = eggDerivation {
name = "check-errors-1.13.0";
src = fetchegg {
name = "check-errors";
version = "1.13.0";
sha256 = "12a0sn82n98jybh72zb39fdddmr5k4785xglxb16750fhy8rmjwi";
};
buildInputs = [
setup-helper
];
};
defstruct = eggDerivation {
name = "defstruct-1.6";
@ -60,31 +31,29 @@ rec {
};
http-client = eggDerivation {
name = "http-client-0.7.1";
name = "http-client-0.18";
src = fetchegg {
name = "http-client";
version = "0.7.1";
sha256 = "1s03zgmb7kb99ld0f2ylqgicrab9qgza53fkgsqvg7bh5njmzhxr";
version = "0.18";
sha256 = "1b9x66kfcglld4xhm06vba00gw37vr07c859kj7lmwnk9nwhcplg";
};
buildInputs = [
intarweb
uri-common
message-digest
md5
string-utils
simple-md5
sendfile
];
};
intarweb = eggDerivation {
name = "intarweb-1.3";
name = "intarweb-1.7";
src = fetchegg {
name = "intarweb";
version = "1.3";
sha256 = "0izlby78c25py29bdcbc0vapb6h7xgchqrzi6i51d0rb3mnwy88h";
version = "1.7";
sha256 = "1arjgn5g4jfdzj3nlrhxk235qwf6k6jxr14yhnncnfbgdb820xp8";
};
buildInputs = [
@ -94,92 +63,13 @@ rec {
];
};
lookup-table = eggDerivation {
name = "lookup-table-1.13.5";
src = fetchegg {
name = "lookup-table";
version = "1.13.5";
sha256 = "1nzly6rhynawlvzlyilk8z8cxz57cf9n5iv20glkhh28pz2izmrb";
};
buildInputs = [
setup-helper
check-errors
miscmacros
record-variants
synch
];
};
matchable = eggDerivation {
name = "matchable-3.3";
name = "matchable-3.7";
src = fetchegg {
name = "matchable";
version = "3.3";
sha256 = "07y3lpzgm4djiwi9y2adc796f9kwkmdr28fkfkw65syahdax8990";
};
buildInputs = [
];
};
md5 = eggDerivation {
name = "md5-3.1.0";
src = fetchegg {
name = "md5";
version = "3.1.0";
sha256 = "0bka43nx8x9b0b079qpvml2fl20km19ny0qjmhwzlh6rwmzazj2a";
};
buildInputs = [
message-digest
];
};
message-digest = eggDerivation {
name = "message-digest-3.1.0";
src = fetchegg {
name = "message-digest";
version = "3.1.0";
sha256 = "1w6bax19dwgih78vcimiws0rja7qsd8hmbm6qqg2hf9cw3vab21s";
};
buildInputs = [
setup-helper
miscmacros
check-errors
variable-item
blob-utils
string-utils
];
};
miscmacros = eggDerivation {
name = "miscmacros-2.96";
src = fetchegg {
name = "miscmacros";
version = "2.96";
sha256 = "1ajdgjrni10i2hmhcp4rawnxajjxry3kmq1krdmah4sf0kjrgajc";
};
buildInputs = [
];
};
record-variants = eggDerivation {
name = "record-variants-0.5.1";
src = fetchegg {
name = "record-variants";
version = "0.5.1";
sha256 = "15wgysxkm8m4hx9nhhw9akchzipdnqc7yj3qd3zn0z7sxg4sld1h";
version = "3.7";
sha256 = "1vc9rpb44fhn0n91hzglin986dw9zj87fikvfrd7j308z22a41yh";
};
buildInputs = [
@ -188,12 +78,12 @@ rec {
};
sendfile = eggDerivation {
name = "sendfile-1.7.29";
name = "sendfile-1.8.3";
src = fetchegg {
name = "sendfile";
version = "1.7.29";
sha256 = "1dc02cbkx5kixhbqjy26g6gs680vy7krc9qis1p1v4aa0b2lgj7k";
version = "1.8.3";
sha256 = "036x4xdndx7qly94afnag5b9idd1yymdm8d832w2cy054y7lxqsi";
};
buildInputs = [
@ -201,13 +91,13 @@ rec {
];
};
setup-helper = eggDerivation {
name = "setup-helper-1.5.4";
simple-md5 = eggDerivation {
name = "simple-md5-0.0.1";
src = fetchegg {
name = "setup-helper";
version = "1.5.4";
sha256 = "1k644y0md2isdcvazqfm4nyc8rh3dby6b0j3r4na4w8ryspqp6gj";
name = "simple-md5";
version = "0.0.1";
sha256 = "1h0b51p9wl1dl3pzs39hdq3hk2qnjgn8n750bgmh0651g4lzmq3i";
};
buildInputs = [
@ -215,38 +105,6 @@ rec {
];
};
string-utils = eggDerivation {
name = "string-utils-1.2.4";
src = fetchegg {
name = "string-utils";
version = "1.2.4";
sha256 = "07alvghg0dahilrm4jg44bndl0x69sv1zbna9l20cbdvi35i0jp1";
};
buildInputs = [
setup-helper
miscmacros
lookup-table
check-errors
];
};
synch = eggDerivation {
name = "synch-2.1.2";
src = fetchegg {
name = "synch";
version = "2.1.2";
sha256 = "1m9mnbq0m5jsxmd1a3rqpwpxj0l1b7vn1fknvxycc047pmlcyl00";
};
buildInputs = [
setup-helper
check-errors
];
};
uri-common = eggDerivation {
name = "uri-common-1.4";
@ -264,32 +122,16 @@ rec {
};
uri-generic = eggDerivation {
name = "uri-generic-2.41";
name = "uri-generic-2.46";
src = fetchegg {
name = "uri-generic";
version = "2.41";
sha256 = "1r5jbzjllbnmhm5n0m3fcx0g6dc2c2jzp1dcndkfmxz0cl99zxac";
version = "2.46";
sha256 = "10ivf4xlmr6jcm00l2phq1y73hjv6g3qgr38ycc8rw56wv6sbm4g";
};
buildInputs = [
matchable
defstruct
];
};
variable-item = eggDerivation {
name = "variable-item-1.3.1";
src = fetchegg {
name = "variable-item";
version = "1.3.1";
sha256 = "19b3mhb8kr892sz9yyzq79l0vv28dgilw9cf415kj6aq16yp4d5n";
};
buildInputs = [
setup-helper
check-errors
];
};
}

3
pkgs/development/compilers/chicken/4/setup-hook.sh
View File

@ -1,7 +1,6 @@
addChickenRepositoryPath() {
addToSearchPathWithCustomDelimiter : CHICKEN_REPOSITORY_EXTRA "$1/lib/chicken/8/"
# addToSearchPathWithCustomDelimiter \; CHICKEN_INCLUDE_PATH "$1/share/"
export CHICKEN_INCLUDE_PATH="$1/share;$CHICKEN_INCLUDE_PATH"
export CHICKEN_INCLUDE_PATH="$1/share${CHICKEN_INCLUDE_PATH:+;$CHICKEN_INCLUDE_PATH}"
}
addEnvHooks "$targetOffset" addChickenRepositoryPath

2
pkgs/development/compilers/chicken/5/eggDerivation.nix
View File

@ -7,7 +7,7 @@
let
overrides = import ./overrides.nix;
baseName = (builtins.parseDrvName name).name;
baseName = stdenv.lib.getName name;
override = if builtins.hasAttr baseName overrides
then
builtins.getAttr baseName overrides

6
pkgs/development/compilers/chicken/5/eggs.nix
View File

@ -47,12 +47,12 @@ rec {
};
srfi-13 = eggDerivation {
name = "srfi-13-0.2.1";
name = "srfi-13-0.3";
src = fetchegg {
name = "srfi-13";
version = "0.2.1";
sha256 = "0204i7fhc4dy0l89lbi2lv9cjndrvwyrk68z3wy7x445jb4ky1gq";
version = "0.3";
sha256 = "0yaw9i6zhpxl1794pirh168clprjgmsb0xlr96drirjzsslgm3zp";
};
buildInputs = [

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

@ -394,6 +394,11 @@ self: super: {
Random123 = dontCheck super.Random123;
systemd = dontCheck super.systemd;
# use the correct version of network
systemd_2_2_0 = dontCheck (super.systemd_2_2_0.override {
network = self.network_3_1_1_1;
});
# https://github.com/eli-frey/cmdtheline/issues/28
cmdtheline = dontCheck super.cmdtheline;
@ -1314,4 +1319,12 @@ self: super: {
# https://github.com/kazu-yamamoto/dns/issues/150
dns = dontCheck super.dns;
# needs newer version of the systemd package
spacecookie = super.spacecookie.override { systemd = self.systemd_2_2_0; };
# ghcide needs the latest versions of haskell-lsp.
ghcide = super.ghcide.override { haskell-lsp = self.haskell-lsp_0_18_0_0; lsp-test = self.lsp-test_0_8_2_0; };
haskell-lsp_0_18_0_0 = super.haskell-lsp_0_18_0_0.override { haskell-lsp-types = self.haskell-lsp-types_0_18_0_0; };
lsp-test_0_8_2_0 = (dontCheck super.lsp-test_0_8_2_0).override { haskell-lsp = self.haskell-lsp_0_18_0_0; };
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

10
pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
View File

@ -72,11 +72,13 @@ self: super: {
# use latest version to fix the build
brick = self.brick_0_50_1;
dbus = self.dbus_1_2_11;
doctemplates = self.doctemplates_0_7_2;
doctemplates = self.doctemplates_0_8;
exact-pi = doJailbreak super.exact-pi;
generics-sop = self.generics-sop_0_5_0_0;
hackage-db = self.hackage-db_2_1_0;
haddock-library = self.haddock-library_1_8_0;
haskell-src-meta = self.haskell-src-meta_0_8_5;
haskell-src-meta_0_8_5 = dontCheck super.haskell-src-meta_0_8_5;
HaTeX = self.HaTeX_3_22_0_0;
HsYAML = self.HsYAML_0_2_1_0;
json-autotype = doJailbreak super.json-autotype;
@ -89,7 +91,7 @@ self: super: {
microlens-th = self.microlens-th_0_4_3_2;
network = self.network_3_1_1_1;
optparse-applicative = self.optparse-applicative_0_15_1_0;
pandoc = self.pandoc_2_8_1;
pandoc = self.pandoc_2_9;
pandoc-types = self.pandoc-types_1_20;
prettyprinter = self.prettyprinter_1_5_1;
primitive = dontCheck super.primitive_0_7_0_0; # evaluating the test suite gives an infinite recursion
@ -121,10 +123,6 @@ self: super: {
sha256 = "01b2gnsq0x4fd9na8zpk6pajym55mbz64hgzawlwxdw0y6681kr5";
});
foundation = dontCheck super.foundation;
haskell-src-meta = appendPatch (dontCheck (doJailbreak super.haskell-src-meta)) (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/haskell-src-meta-0.8.3.patch";
sha256 = "1asl932mibr5y057xx8v1a7n3qy87lcnclsfh8pbxq1m3iwjkxy8";
});
vault = dontHaddock super.vault;
# https://github.com/snapframework/snap-core/issues/288

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

@ -43,7 +43,7 @@ core-packages:
- ghcjs-base-0
default-package-overrides:
# LTS Haskell 14.16
# LTS Haskell 14.17
- abstract-deque ==0.3
- abstract-deque-tests ==0.3
- abstract-par ==0.3.3
@ -176,7 +176,7 @@ default-package-overrides:
- bencoding ==0.4.5.2
- between ==0.11.0.0
- bibtex ==0.1.0.6
- bifunctors ==5.5.5
- bifunctors ==5.5.6
- bimap ==0.4.0
- bimap-server ==0.1.0.1
- binary-bits ==0.5
@ -222,7 +222,7 @@ default-package-overrides:
- boltzmann-samplers ==0.1.1.0
- Boolean ==0.2.4
- boolean-like ==0.1.1.0
- boolean-normal-forms ==0.0.1
- boolean-normal-forms ==0.0.1.1
- boolsimplifier ==0.1.8
- boots ==0.0.100
- bordacount ==0.1.0.0
@ -267,7 +267,7 @@ default-package-overrides:
- cabal-doctest ==1.0.8
- cabal-file-th ==0.2.6
- cabal-rpm ==1.0.1
- cache ==0.1.1.2
- cache ==0.1.2.0
- cacophony ==0.10.1
- calendar-recycling ==0.0.0.1
- call-stack ==0.1.0
@ -326,7 +326,7 @@ default-package-overrides:
- classy-prelude ==1.5.0
- classy-prelude-conduit ==1.5.0
- classy-prelude-yesod ==1.5.0
- clay ==0.13.2
- clay ==0.13.3
- clientsession ==0.9.1.2
- Clipboard ==2.3.2.0
- clock ==0.8
@ -355,7 +355,7 @@ default-package-overrides:
- comfort-array ==0.4
- comfort-graph ==0.0.3.1
- commutative ==0.0.2
- comonad ==5.0.5
- comonad ==5.0.6
- compact ==0.1.0.1
- compactmap ==0.1.4.2.1
- compensated ==0.7.3
@ -512,7 +512,7 @@ default-package-overrides:
- dependent-sum-template ==0.0.0.6
- deque ==0.4.3
- deriveJsonNoPrefix ==0.1.0.1
- deriving-compat ==0.5.7
- deriving-compat ==0.5.8
- derulo ==1.0.7
- detour-via-sci ==1.0.0
- dhall ==1.24.0
@ -684,7 +684,7 @@ default-package-overrides:
- fixed-vector-hetero ==0.5.0.0
- flac ==0.2.0
- flac-picture ==0.1.2
- flags-applicative ==0.1.0.1
- flags-applicative ==0.1.0.2
- flat-mcmc ==1.5.0
- flay ==0.4
- flexible-defaults ==0.0.3
@ -707,11 +707,11 @@ default-package-overrides:
- force-layout ==0.4.0.6
- foreign-store ==0.2
- forkable-monad ==0.2.0.3
- forma ==1.1.2
- forma ==1.1.3
- format-numbers ==0.1.0.0
- formatting ==6.3.7
- foundation ==0.0.25
- free ==5.1.2
- free ==5.1.3
- freenect ==1.2.1
- freer-simple ==1.2.1.1
- freetype2 ==0.1.2
@ -770,7 +770,7 @@ default-package-overrides:
- ghc-compact ==0.1.0.0
- ghc-core ==0.5.6
- ghc-exactprint ==0.6.1
- ghcid ==0.7.6
- ghcid ==0.7.7
- ghci-hexcalc ==0.1.1.0
- ghcjs-codemirror ==0.0.0.2
- ghc-lib ==8.8.0.20190424
@ -854,7 +854,7 @@ default-package-overrides:
- HandsomeSoup ==0.4.2
- hapistrano ==0.3.10.0
- happy ==1.19.12
- hasbolt ==0.1.3.5
- hasbolt ==0.1.3.6
- hashable ==1.2.7.0
- hashable-time ==0.2.0.2
- hashids ==1.0.2.4
@ -875,7 +875,7 @@ default-package-overrides:
- haskell-src-meta ==0.8.3
- haskey-btree ==0.3.0.1
- haskintex ==0.8.0.0
- haskoin-core ==0.9.6
- haskoin-core ==0.9.7
- hasql ==1.4.0.1
- hasql-optparse-applicative ==0.3.0.5
- hasql-pool ==0.5.1
@ -895,7 +895,7 @@ default-package-overrides:
- hedgehog ==1.0.1
- hedgehog-corpus ==0.1.0
- hedgehog-fn ==1.0
- hedis ==0.12.9
- hedis ==0.12.10
- hedn ==0.2.0.1
- here ==1.2.13
- heredoc ==0.2.0.0
@ -929,7 +929,7 @@ default-package-overrides:
- hmpfr ==0.4.4
- hoauth2 ==1.8.9
- Hoed ==0.5.1
- hOpenPGP ==2.8.4
- hOpenPGP ==2.8.5
- hopenpgp-tools ==0.21.3
- hopfli ==0.2.2.1
- hosc ==0.17
@ -1028,7 +1028,7 @@ default-package-overrides:
- hvect ==0.4.0.0
- hvega ==0.3.0.1
- hw-balancedparens ==0.2.0.4
- hw-bits ==0.7.0.8
- hw-bits ==0.7.1.0
- hw-conduit ==0.2.0.6
- hw-conduit-merges ==0.2.0.0
- hw-diagnostics ==0.0.0.7
@ -1049,7 +1049,7 @@ default-package-overrides:
- hw-parser ==0.1.0.2
- hw-prim ==0.6.2.39
- hw-rankselect ==0.13.0.0
- hw-rankselect-base ==0.3.2.3
- hw-rankselect-base ==0.3.3.0
- hw-simd ==0.1.1.5
- hw-streams ==0.0.0.12
- hw-string-parse ==0.0.0.4
@ -1087,7 +1087,7 @@ default-package-overrides:
- indexed ==0.1.3
- indexed-list-literals ==0.2.1.2
- infer-license ==0.2.0
- inflections ==0.4.0.4
- inflections ==0.4.0.5
- influxdb ==1.7.1.1
- ini ==0.4.1
- inj ==1.0
@ -1124,7 +1124,7 @@ default-package-overrides:
- io-streams-haproxy ==1.0.1.0
- ip ==1.5.1
- ip6addr ==1.0.0
- iproute ==1.7.7
- iproute ==1.7.8
- IPv6Addr ==1.1.2
- ipynb ==0.1
- ipython-kernel ==0.10.1.0
@ -1228,14 +1228,14 @@ default-package-overrides:
- LibZip ==1.0.1
- lifted-async ==0.10.0.4
- lifted-base ==0.2.3.12
- lift-generics ==0.1.2
- lift-generics ==0.1.3
- line ==4.0.1
- linear ==1.20.9
- linear-circuit ==0.1.0.2
- linux-file-extents ==0.2.0.0
- linux-namespaces ==0.1.3.0
- List ==0.6.2
- ListLike ==4.6.2
- ListLike ==4.6.3
- listsafe ==0.1.0.1
- list-t ==1.0.4
- ListTree ==0.2.3
@ -1278,7 +1278,7 @@ default-package-overrides:
- markdown ==0.1.17.4
- markdown-unlit ==0.5.0
- markov-chain ==0.0.3.4
- massiv ==0.4.3.0
- massiv ==0.4.4.0
- massiv-io ==0.1.9.0
- massiv-test ==0.1.1
- mathexpr ==0.3.0.0
@ -1297,7 +1297,7 @@ default-package-overrides:
- megaparsec-tests ==7.0.5
- mega-sdist ==0.4.0.1
- memory ==0.14.18
- MemoTrie ==0.6.9
- MemoTrie ==0.6.10
- menshen ==0.0.3
- mercury-api ==0.1.0.2
- merkle-tree ==0.1.1
@ -1348,10 +1348,10 @@ default-package-overrides:
- monad-extras ==0.6.0
- monadic-arrays ==0.2.2
- monad-journal ==0.8.1
- monad-logger ==0.3.30
- monad-logger ==0.3.31
- monad-logger-json ==0.1.0.0
- monad-logger-prefix ==0.1.11
- monad-logger-syslog ==0.1.5.0
- monad-logger-syslog ==0.1.6.0
- monad-loops ==0.4.3
- monad-memo ==0.5.1
- monad-metrics ==0.2.1.4
@ -1412,7 +1412,7 @@ default-package-overrides:
- natural-sort ==0.1.2
- natural-transformation ==0.4
- ndjson-conduit ==0.1.0.5
- neat-interpolation ==0.3.2.4
- neat-interpolation ==0.3.2.5
- netlib-carray ==0.1
- netlib-comfort-array ==0.0.0.1
- netlib-ffi ==0.1.1
@ -1426,7 +1426,7 @@ default-package-overrides:
- network-anonymous-i2p ==0.10.0
- network-attoparsec ==0.12.2
- network-bsd ==2.8.0.0
- network-byte-order ==0.1.1.1
- network-byte-order ==0.1.2.0
- network-conduit-tls ==1.3.2
- network-house ==0.1.0.2
- network-info ==0.2.0.10
@ -1486,7 +1486,7 @@ default-package-overrides:
- open-browser ==0.2.1.0
- openexr-write ==0.1.0.2
- OpenGL ==3.0.3.0
- OpenGLRaw ==3.3.3.0
- OpenGLRaw ==3.3.4.0
- openpgp-asciiarmor ==0.1.2
- opensource ==0.1.1.0
- openssl-streams ==1.2.2.0
@ -1574,7 +1574,7 @@ default-package-overrides:
- phantom-state ==0.2.1.2
- pid1 ==0.1.2.0
- pinboard ==0.10.1.4
- pipes ==4.3.12
- pipes ==4.3.13
- pipes-aeson ==0.4.1.8
- pipes-attoparsec ==0.5.1.5
- pipes-binary ==0.4.2
@ -1613,7 +1613,7 @@ default-package-overrides:
- port-utils ==0.2.1.0
- posix-paths ==0.2.1.6
- possibly ==1.0.0.0
- postgresql-binary ==0.12.1.3
- postgresql-binary ==0.12.2
- postgresql-libpq ==0.9.4.2
- postgresql-orm ==0.5.1
- postgresql-schema ==0.1.14
@ -1661,8 +1661,8 @@ default-package-overrides:
- prospect ==0.1.0.0
- protobuf ==0.2.1.2
- protobuf-simple ==0.1.1.0
- protocol-buffers ==2.4.12
- protocol-buffers-descriptor ==2.4.12
- protocol-buffers ==2.4.13
- protocol-buffers-descriptor ==2.4.13
- protocol-radius ==0.0.1.1
- protocol-radius-test ==0.1.0.1
- proto-lens ==0.5.1.0
@ -1708,7 +1708,7 @@ default-package-overrides:
- rando ==0.0.0.4
- random ==1.1
- random-bytestring ==0.1.3.2
- random-fu ==0.2.7.0
- random-fu ==0.2.7.3
- random-shuffle ==0.0.4
- random-source ==0.3.0.6
- random-tree ==0.6.0.5
@ -1717,7 +1717,7 @@ default-package-overrides:
- range-set-list ==0.1.3.1
- rank1dynamic ==0.4.0
- rank2classes ==1.3.1.2
- Rasterific ==0.7.4.4
- Rasterific ==0.7.5
- rasterific-svg ==0.3.3.2
- ratel ==1.0.9
- ratel-wai ==1.1.1
@ -1735,7 +1735,7 @@ default-package-overrides:
- reanimate ==0.1.8.0
- reanimate-svg ==0.9.3.1
- rebase ==1.3.1.1
- record-dot-preprocessor ==0.2.1
- record-dot-preprocessor ==0.2.2
- record-hasfield ==1.0
- records-sop ==0.1.0.3
- recursion-schemes ==5.1.3
@ -1804,7 +1804,7 @@ default-package-overrides:
- runmemo ==1.0.0.1
- rvar ==0.2.0.3
- s3-signer ==0.5.0.0
- safe ==0.3.17
- safe ==0.3.18
- safecopy ==0.9.4.3
- safe-exceptions ==0.1.7.0
- safe-exceptions-checked ==0.1.0
@ -1847,7 +1847,7 @@ default-package-overrides:
- selective ==0.3
- semialign ==1
- semigroupoid-extras ==5
- semigroupoids ==5.3.3
- semigroupoids ==5.3.4
- semigroups ==0.18.5
- semirings ==0.4.2
- semiring-simple ==1.0.0.1
@ -2131,7 +2131,7 @@ default-package-overrides:
- these ==1.0.1
- th-expand-syns ==0.4.5.0
- th-extras ==0.0.0.4
- th-lift ==0.8.0.1
- th-lift ==0.8.1
- th-lift-instances ==0.1.14
- th-nowq ==0.1.0.3
- th-orphans ==0.13.9
@ -2278,7 +2278,7 @@ default-package-overrides:
- users-test ==0.5.0.1
- utf8-light ==0.4.2
- utf8-string ==1.0.1.1
- util ==0.1.14.0
- util ==0.1.14.1
- utility-ht ==0.0.14
- uuid ==1.3.13
- uuid-types ==1.0.3
@ -2298,7 +2298,7 @@ default-package-overrides:
- vault ==0.3.1.3
- vec ==0.1.1.1
- vector ==0.12.0.3
- vector-algorithms ==0.8.0.1
- vector-algorithms ==0.8.0.3
- vector-binary-instances ==0.2.5.1
- vector-buffer ==0.4.1
- vector-builder ==0.3.8
@ -2357,7 +2357,7 @@ default-package-overrides:
- webrtc-vad ==0.1.0.3
- websockets ==0.12.6.1
- websockets-snap ==0.10.3.1
- weigh ==0.0.14
- weigh ==0.0.16
- wide-word ==0.1.0.9
- wikicfp-scraper ==0.1.0.11
- wild-bind ==0.1.2.4
@ -2397,7 +2397,7 @@ default-package-overrides:
- Xauth ==0.1
- xdg-basedir ==0.2.2
- xdg-userdirs ==0.1.0.2
- xeno ==0.3.5.1
- xeno ==0.3.5.2
- xenstore ==0.1.1
- xls ==0.1.2
- xlsx ==0.7.2
@ -2434,7 +2434,7 @@ default-package-overrides:
- yesod-auth-hashdb ==1.7.1.1
- yesod-auth-oauth2 ==0.6.1.2
- yesod-bin ==1.6.0.4
- yesod-core ==1.6.16.1
- yesod-core ==1.6.17
- yesod-csp ==0.2.5.0
- yesod-eventsource ==1.6.0
- yesod-fb ==0.5.0
@ -2448,7 +2448,7 @@ default-package-overrides:
- yesod-recaptcha2 ==0.3.0
- yesod-sitemap ==1.6.0
- yesod-static ==1.6.0.1
- yesod-test ==1.6.8
- yesod-test ==1.6.9
- yesod-text-markdown ==0.1.10
- yesod-websockets ==0.3.0.2
- yes-precure5-command ==5.5.3
@ -3657,7 +3657,6 @@ broken-packages:
- classy-miso
- classy-parallel
- ClassyPrelude
- clay
- clckwrks
- clckwrks-cli
- clckwrks-dot-com
@ -4192,6 +4191,7 @@ broken-packages:
- dhall-lsp-server
- dhall-nix
- dhall-to-cabal
- dhall-yaml
- dhcp-lease-parser
- dhrun
- dia-base
@ -5014,7 +5014,6 @@ broken-packages:
- ghci-lib
- ghci-ng
- ghci-pretty
- ghcide
- ghcjs-base-stub
- ghcjs-dom-jsffi
- ghcjs-fetch
@ -9111,7 +9110,6 @@ broken-packages:
- SourceGraph
- sousit
- soyuz
- spacecookie
- SpaceInvaders
- spacepart
- SpacePrivateers
@ -9971,6 +9969,7 @@ broken-packages:
- vector-space-opengl
- vector-static
- vectortiles
- venzone
- Verba
- verbalexpressions
- verdict

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

File diff suppressed because it is too large Load Diff

4
pkgs/development/interpreters/octave/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull
, libsndfile, portaudio, libX11, graphicsmagick, pcre, pkgconfig, libGL, libGLU, fltk
, fftw, fftwSinglePrec, zlib, curl, qrupdate, openblas, arpack, libwebp
, fftw, fftwSinglePrec, zlib, curl, qrupdate, openblas, arpack, libwebp, gl2ps
, qt ? null, qscintilla ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null
, suitesparse ? null, gnuplot ? null, jdk ? null, python ? null, overridePlatforms ? null
}:
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gfortran readline ncurses perl flex texinfo qhull
graphicsmagick pcre pkgconfig fltk zlib curl openblas libsndfile fftw
fftwSinglePrec portaudio qrupdate arpack libwebp ]
fftwSinglePrec portaudio qrupdate arpack libwebp gl2ps ]
++ (stdenv.lib.optional (qt != null) qt)
++ (stdenv.lib.optional (qscintilla != null) qscintilla)
++ (stdenv.lib.optional (ghostscript != null) ghostscript)

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

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "dlib";
version = "19.18";
version = "19.19";
src = fetchFromGitHub {
owner = "davisking";
repo = "dlib";
rev ="v${version}";
sha256 = "1kbrcf35pn2ymyr8q48ls98n2zb7rrz5207kwpisfh6k22g802ic";
sha256 = "0574p46zf85nx33cam4yqcg20g94kkmrvi5689r1xshprr0szghp";
};
postPatch = ''

2
pkgs/development/libraries/libmad/default.nix
View File

@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optionals stdenv.cc.isClang [
(fetchpatch {
url = "https://github.com/KaOSx/main/raw/1270b8080f37fb6cca562829a521991800b0a497/libmad/optimize.diff";
sha256 = "0ciyaj1acg08g8hpzqx6whayq206fvf4whksz2pjgxlv207lqgjh";
sha256 = "1wp60ywzk6nmxc3kq3v6i8b7s4cibvf5cjir859zv10y5aa1d0pk";
})
];

4
pkgs/development/libraries/physics/herwig/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "herwig";
version = "7.1.5";
version = "7.1.6";
src = fetchurl {
url = "https://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2";
sha256 = "0jnrv59zfa41gc37pqr3vaiz5jkh7w0k0alcax37b3mlbsnacr9r";
sha256 = "0h4gcmwnk4iyd31agzcq3p8bvlrgc8svm4ymzqgvvhizwflqf3yr";
};
nativeBuildInputs = [ autoconf automake libtool ];

4
pkgs/development/libraries/physics/thepeg/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "thepeg";
version = "2.1.5";
version = "2.1.6";
src = fetchurl {
url = "https://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2";
sha256 = "1rmmwhk9abn9mc9j3127axjwpvymv21ld4wcivwz01pldkxh06n6";
sha256 = "0krz6psr69kn48xkgr0mjadmzvq572mzn02inlasiz3bf61izrf1";
};
buildInputs = [ boost fastjet gsl hepmc2 lhapdf rivet zlib ];

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

@ -1,6 +1,6 @@
{ stdenv, fetchurl, libjpeg, zlib, perl }:
let version = "9.0.2";
let version = "9.1.0";
in
stdenv.mkDerivation rec {
pname = "qpdf";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/qpdf/qpdf/${version}/${pname}-${version}.tar.gz";
sha256 = "0b6jhhsifgiwrznxxi3h7hqm7bi91wph65jjbvs4g2860vcm296h";
sha256 = "0ygd80wxcmh613n04x2kmf8wlsl0drxyd5wwdcrm1rzj0xwvpfrs";
};
nativeBuildInputs = [ perl ];

4
pkgs/development/libraries/range-v3/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "range-v3";
version = "0.9.1";
version = "0.10.0";
src = fetchFromGitHub {
owner = "ericniebler";
repo = "range-v3";
rev = version;
sha256 = "0qga2fnfrlrzrvnnk1z1plpmvcr8b4c75g5xz0jv0sav0kmq5zwn";
sha256 = "1h9h5j7pdi0afpip9ncq76h1xjhvb8bnm585q17afz2l4fydy8qj";
};
nativeBuildInputs = [ cmake ];

4
pkgs/development/libraries/science/math/brial/default.nix
View File

@ -8,14 +8,14 @@
}:
stdenv.mkDerivation rec {
version = "1.2.5";
version = "1.2.6";
pname = "brial";
src = fetchFromGitHub {
owner = "BRiAl";
repo = "BRiAl";
rev = version;
sha256 = "1nv56fp3brpzanxj7vwvxqdafqfsfhdgq5imr3m94psw5gdfqwja";
sha256 = "1mc1zjr3mxcx6bg0js5k9jx65japg7644b0aj1al75m4nwh2ygab";
};
# FIXME package boost-test and enable checks

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "tcllib";
version = "1.19";
version = "1.20";
src = fetchurl {
url = "mirror://sourceforge/tcllib/tcllib-${version}.tar.gz";
sha256 = "173abxaazdmf210v651708ab6h7xhskvd52krxk6ifam337qgzh1";
sha256 = "0wax281h6ksz974a5qpfgf9y34lmlpd8i87lkm1w94ybbd3rgc73";
};
passthru = {

2
pkgs/development/ocaml-modules/containers/default.nix
View File

@ -16,7 +16,7 @@ buildDunePackage rec {
buildInputs = [ iter ];
checkInputs = lib.optionals doCheck [ gen mdx ounit qcheck uutf ];
checkInputs = lib.optionals doCheck [ gen mdx.bin ounit qcheck uutf ];
propagatedBuildInputs = [ result uchar ];

2
pkgs/development/ocaml-modules/iter/default.nix
View File

@ -11,7 +11,7 @@ buildDunePackage rec {
sha256 = "0j2sg50byn0ppmf6l36ksip7zx1d3gv7sc4hbbxs2rmx39jr7vxh";
};
buildInputs = lib.optionals doCheck [ mdx qtest ];
buildInputs = lib.optionals doCheck [ mdx.bin qtest ];
propagatedBuildInputs = [ result ];
doCheck = lib.versionAtLeast ocaml.version "4.04";

24
pkgs/development/ocaml-modules/mdx/default.nix
View File

@ -1,24 +1,30 @@
{ lib, fetchFromGitHub, buildDunePackage, ocaml, astring, cmdliner, cppo, fmt, logs, ocaml-migrate-parsetree, ocaml_lwt, pandoc, re }:
{ lib, fetchurl, buildDunePackage, opaline, ocaml
, astring, cmdliner, cppo, fmt, logs, ocaml-migrate-parsetree, ocaml-version, ocaml_lwt, pandoc, re }:
buildDunePackage rec {
pname = "mdx";
version = "1.4.0";
version = "1.5.0";
src = fetchFromGitHub {
owner = "realworldocaml";
repo = pname;
rev = version;
sha256 = "0ljd00d261s2wf7cab086asqi39icf9zs4nylni6dldaqb027d4w";
src = fetchurl {
url = "https://github.com/realworldocaml/mdx/releases/download/1.5.0/mdx-1.5.0.tbz";
sha256 = "0g45plf4z7d178gp0bx7842fwbd3m19679yfph3s95da6mrfm3xn";
};
nativeBuildInputs = [ cppo ];
buildInputs = [ astring cmdliner fmt logs ocaml-migrate-parsetree re ];
buildInputs = [ cmdliner ];
propagatedBuildInputs = [ astring fmt logs ocaml-migrate-parsetree ocaml-version re ];
checkInputs = lib.optionals doCheck [ ocaml_lwt pandoc ];
doCheck = !lib.versionAtLeast ocaml.version "4.08";
doCheck = true;
dontStrip = lib.versions.majorMinor ocaml.version == "4.04";
outputs = [ "bin" "lib" "out" ];
installPhase = ''
${opaline}/bin/opaline -prefix $bin -libdir $lib/lib/ocaml/${ocaml.version}/site-lib
'';
meta = {
homepage = https://github.com/realworldocaml/mdx;
description = "Executable OCaml code blocks inside markdown files";

22
pkgs/development/ocaml-modules/ocaml-version/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ lib, fetchurl, buildDunePackage, result }:
buildDunePackage rec {
pname = "ocaml-version";
version = "2.3.0";
src = fetchurl {
url = "https://github.com/ocurrent/ocaml-version/releases/download/v${version}/ocaml-version-v${version}.tbz";
sha256 = "0c711lifl35xila9k0rvhijy9zm3shd37q3jgw7xf01hn1swg0hn";
};
propagatedBuildInputs = [ result ];
meta = {
description = "Manipulate, parse and generate OCaml compiler version strings";
homepage = "https://github.com/ocurrent/ocaml-version";
license = lib.licenses.isc;
maintainers = [ lib.maintainers.vbgl ];
};
}

2
pkgs/development/ocaml-modules/printbox/default.nix
View File

@ -13,7 +13,7 @@ buildDunePackage rec {
sha256 = "16nwwpp13hzlcm9xqfxc558afm3i5s802dkj69l9s2vp04lgms5n";
};
checkInputs = lib.optional doCheck mdx;
checkInputs = lib.optional doCheck mdx.bin;
doCheck = !lib.versionAtLeast ocaml.version "4.08";

10
pkgs/development/python-modules/aws-adfs/default.nix
View File

@ -1,13 +1,15 @@
{ lib, buildPythonPackage, fetchPypi
, pytest, pytestrunner, pytestcov, mock, glibcLocales, lxml, boto3, requests, click, configparser }:
, pytest, pytestrunner, pytestcov, mock, glibcLocales, lxml, boto3
, requests, click, configparser, fido2, isPy27 }:
buildPythonPackage rec {
pname = "aws-adfs";
version = "1.19.1";
version = "1.20.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "20b2ad44d19aa494fa11cb2d1290359b3a7a0c6c8908179b4af0c9367d83e370";
sha256 = "1j18ffq5z8bcajavnlpbfhxrcadld5iv5gsfxg543yvdsp6hn2dg";
};
# Relax version constraint
@ -22,7 +24,7 @@ buildPythonPackage rec {
LC_ALL = "en_US.UTF-8";
checkInputs = [ glibcLocales pytest pytestrunner pytestcov mock ];
propagatedBuildInputs = [ lxml boto3 requests click configparser ];
propagatedBuildInputs = [ lxml boto3 requests click configparser fido2 ];
meta = with lib; {
description = "Command line tool to ease aws cli authentication against ADFS";

35
pkgs/development/python-modules/ckcc-protocol/default.nix Normal file
View File

@ -0,0 +1,35 @@
{ stdenv
, buildPythonPackage
, click
, ecdsa
, hidapi
, lib
, fetchPypi
, pytest
, pyaes
, pythonOlder
}:
buildPythonPackage rec {
pname = "ckcc-protocol";
version = "0.8.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "1mbs9l8qycy50j5lq6az7l5d8i40nb0vmlyhcyax298qp6c1r1gh";
};
checkInputs = [
pytest
];
propagatedBuildInputs = [ click ecdsa hidapi pyaes ];
meta = with stdenv.lib; {
description = "Communicate with your Coldcard using Python";
homepage = https://github.com/Coldcard/ckcc-protocol;
license = licenses.gpl3;
maintainers = [ maintainers.hkjn ];
};
}

9
pkgs/development/python-modules/pycdio/default.nix
View File

@ -4,20 +4,23 @@
, setuptools
, nose
, pkgs
, isPy27
}:
buildPythonPackage rec {
pname = "pycdio";
version = "2.1.0";
disabled = !isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "01b7vqqfry071p60sabydym7r3m3rxszyqpdbs1qi5rk2sfyblnn";
};
prePatch = "sed -i -e '/DRIVER_BSDI/d' pycdio.py";
prePatch = ''
substituteInPlace setup.py \
--replace 'library_dirs=library_dirs' 'library_dirs=[dir.decode("utf-8") for dir in library_dirs]' \
--replace 'include_dirs=include_dirs' 'include_dirs=[dir.decode("utf-8") for dir in include_dirs]' \
--replace 'runtime_library_dirs=runtime_lib_dirs' 'runtime_library_dirs=[dir.decode("utf-8") for dir in runtime_lib_dirs]'
'';
preConfigure = ''
patchShebangs .

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

@ -0,0 +1,23 @@
{ lib, buildPythonPackage, fetchPypi, future, lxml }:
buildPythonPackage rec {
pname = "pymavlink";
version = "2.4.1";
src = fetchPypi {
inherit pname version;
sha256 = "0y9rz3piddzdjpp7d5w9xi6lc9v9b4p4375a5hrfiphrmhds85i3";
};
propagatedBuildInputs = [ future lxml ];
# No tests included in PyPI tarball
doCheck = false;
meta = with lib; {
description = "Python MAVLink interface and utilities";
homepage = "https://github.com/ArduPilot/pymavlink";
license = licenses.lgpl3;
maintainers = with maintainers; [ lopsided98 ];
};
}

27
pkgs/development/python-modules/root_numpy/default.nix
View File

@ -1,27 +0,0 @@
{ lib, fetchPypi, isPy3k, buildPythonPackage, numpy, root, nose }:
buildPythonPackage rec {
pname = "root_numpy";
version = "4.8.0";
src = fetchPypi {
inherit pname version;
sha256 = "5842bbcde92133f60a61f56e9f0a875a0dbc2a567cc65a9ac141ecd72e416878";
};
disabled = isPy3k; # blocked by #27649
checkInputs = [ nose ];
checkPhase = ''
python setup.py install_lib -d .
nosetests -s -v root_numpy
'';
propagatedBuildInputs = [ numpy root ];
meta = with lib; {
homepage = http://scikit-hep.org/root_numpy;
license = licenses.bsd3;
description = "The interface between ROOT and NumPy";
maintainers = with maintainers; [ veprbl ];
};
}

30
pkgs/development/python-modules/rootpy/default.nix
View File

@ -1,30 +0,0 @@
{ lib, fetchPypi, isPy3k, buildPythonPackage, numpy, matplotlib, root, root_numpy, tables, pytest }:
buildPythonPackage rec {
pname = "rootpy";
version = "1.0.1";
src = fetchPypi {
inherit pname version;
sha256 = "0zp2bh87l3f0shiqslbvfmavfdj8m80y8fsrz8rsi5pzqj7zr1bx";
};
disabled = isPy3k;
propagatedBuildInputs = [ matplotlib numpy root root_numpy tables ];
checkInputs = [ pytest ];
checkPhase = ''
# tests fail with /homeless-shelter
export HOME=$PWD
# skip problematic tests
py.test rootpy -k "not test_stl and not test_cpp and not test_xrootd_glob_single and not test_xrootd_glob_multiple"
'';
meta = with lib; {
homepage = http://www.rootpy.org;
license = licenses.bsd3;
description = "Pythonic interface to the ROOT framework";
maintainers = with maintainers; [ veprbl ];
};
}

9
pkgs/development/tools/analysis/bingrep/default.nix
View File

@ -2,17 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "bingrep";
version = "0.7.0";
version = "0.8.1";
src = fetchFromGitHub {
owner = "m4b";
repo = pname;
# Currently doesn't tag versions so we're using the raw revision
rev = "33d56a4b020c4a3c111294fe41c613d5e8e9c7af";
sha256 = "0lg92wqknr584b44i5v4f97js56j89z7n8p2zpm8j1pfhjmgcigs";
rev = "v${version}";
sha256 = "1xig3lrw0jdaxibzirqnm50l8nj4si9pa9w0jypmyhf1lr6yzd0g";
};
cargoSha256 = "1yxm7waldhilx7wh1ag79rkp8kypb9k1px4ynmzq11r72yl2p4m7";
cargoSha256 = "1fsp1ycfswrzldwnjw5cdwi809fd37pwshvrpf7sp0wmzx2bqhgm";
meta = with stdenv.lib; {
description = "Greps through binaries from various OSs and architectures, and colors them";

5
pkgs/development/tools/analysis/flow/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "flow";
version = "0.113.0";
version = "0.114.0";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "refs/tags/v${version}";
sha256 = "1z7zy2ma1rmx2jjrsrnlrv2j5ff4zlzzlqvlmv7fc7dds3wlz6ia";
sha256 = "1dkp3v898b5vd0a9fl5xknwbbqv23v0icqml8ypyhzrv6wz5qiy3";
};
installPhase = ''
@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A static type checker for JavaScript";
homepage = https://flow.org/;
changelog = "https://github.com/facebook/flow/releases/tag/v${version}";
license = licenses.mit;
platforms = ocamlPackages.ocaml.meta.platforms;
maintainers = with maintainers; [ marsam puffnfresh ];

4
pkgs/development/tools/buildah/default.nix
View File

@ -4,13 +4,13 @@
buildGoPackage rec {
pname = "buildah";
version = "1.11.6";
version = "1.12.0";
src = fetchFromGitHub {
owner = "containers";
repo = "buildah";
rev = "v${version}";
sha256 = "0slhq11nmqsp2rjfwldvcwlpj823ckfpipggkaxhcb66dv8ymm7n";
sha256 = "0lsjsfp6ls38vlgibbnsyd1m7jvmjwdmpyrd0qigp4aa2abwi4dg";
};
outputs = [ "bin" "man" "out" ];

4
pkgs/development/tools/cue/default.nix
View File

@ -2,12 +2,12 @@
buildGoModule rec {
pname = "cue";
version = "0.0.14";
version = "0.0.15";
src = fetchgit {
url = "https://cue.googlesource.com/cue";
rev = "v${version}";
sha256 = "1gbw377wm41bhn9pw0l5l7v6g5s9jw1p2jammflac7hgwdrxkb64";
sha256 = "0mipzci2zjp6yh4lxg9jrdxn03ska188zg3jl6g1zr8rn0ry274h";
};
modSha256 = "04dapx75zwi8cv1pj3c6266znrhwihv3df4izm3gjk34r2i07q6s";

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "strace";
version = "5.3";
version = "5.4";
src = fetchurl {
url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz";
sha256 = "0ix06z4vnc49mv76f22kixz8dsh7daqv9mpgwcgl0mlnfjc124vc";
sha256 = "0hd7sb7l99y9rcj8jjc1b6m3ryds17krsymdg3dvd40jsla0bl7p";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
doCheck = false;
meta = with stdenv.lib; {
homepage = https://strace.io/;
homepage = "https://strace.io/";
description = "A system call tracer for Linux";
license = with licenses; [ lgpl21Plus gpl2Plus ]; # gpl2Plus is for the test suite
platforms = platforms.linux;

14
pkgs/development/tools/rust/cargo-make/Cargo.lock generated
View File

@ -98,15 +98,15 @@ dependencies = [
[[package]]
name = "cargo-make"
version = "0.24.1"
version = "0.24.2"
dependencies = [
"ci_info 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
"ci_info 0.9.0 (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.0 (registry+https://github.com/rust-lang/crates.io-index)",
"dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"envmnt 0.7.4 (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.0 (registry+https://github.com/rust-lang/crates.io-index)",
"git_info 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"home 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -143,7 +143,7 @@ dependencies = [
[[package]]
name = "ci_info"
version = "0.8.1"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"envmnt 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
@ -269,7 +269,7 @@ dependencies = [
[[package]]
name = "git_info"
version = "0.1.0"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@ -653,7 +653,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)" = "f52a465a666ca3d838ebbf08b241383421412fe7ebb463527bba275526d89f76"
"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
"checksum chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "31850b4a4d6bae316f7a09e691c944c28299298837edc0a03f755618c23cbc01"
"checksum ci_info 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "93b085342b4579e6bd92189bb6b832b2fff5564382e2472be42748b630e8063d"
"checksum ci_info 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a4e9091c3d285e7046afdb70fc7413d1ac670288705e151443f868f71e66ed2a"
"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
"checksum colored 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "433e7ac7d511768127ed85b0c4947f47a254131e37864b2dc13f52aa32cd37e5"
@ -667,7 +667,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum fern 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e69ab0d5aca163e388c3a49d284fed6c3d0810700e77c5ae2756a50ec1a4daaa"
"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
"checksum getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407"
"checksum git_info 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4862dc2fabbfe087ec247e8dda2a4c5b70e8506e7f6d5db6234627d6e81f2309"
"checksum git_info 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "add3a9c3c08c8905a2165ff06891dd1c3bb32d81b2a32d79528abc9793dfb06f"
"checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
"checksum home 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a3753954f7bd71f0e671afb8b5a992d1724cf43b7f95a563cd4a0bde94659ca8"
"checksum indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712d7b3ea5827fcb9d4fda14bf4da5f136f0db2ae9c8f4bd4e2d1c6fde4e6db2"

6
pkgs/development/tools/rust/cargo-make/default.nix
View File

@ -2,7 +2,7 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-make";
version = "0.24.1";
version = "0.24.2";
src =
let
@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
owner = "sagiegurari";
repo = pname;
rev = version;
sha256 = "0fnp3vv2vncrvc8cp24ijldb8bfb0i8m8cxiqa4vqnix9yi182yd";
sha256 = "02fc3vf802dzqvyh61cmkjf3vqf5xsl8dhjggns7p5zr2aqh8pfi";
};
in
runCommand "cargo-make-src" {} ''
@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
cargoSha256 = "1skias0jyridd0dv864m5ls1ifvj1zqnnymrgs6q0169aidwrbdc";
cargoSha256 = "1x2pkis82hsikjqgma7f6wmkcmviiqwc7pvdpmww61iq2aqfg7ds";
# Some tests fail because they need network access.
# However, Travis ensures a proper build.

4
pkgs/development/tools/rust/cargo-xbuild/default.nix
View File

@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-xbuild";
version = "0.5.18";
version = "0.5.19";
src = fetchFromGitHub {
owner = "rust-osdev";
repo = pname;
rev = "v${version}";
sha256 = "1hcsdwwl1xc59f1ppwlxj1zyp1md07z70gfvg4zqvafc6dzx708j";
sha256 = "0j15d52bpl3k6jw0hzcxdvjayd2azdp5b9s2fq3ywd4zbda8rqp7";
};
cargoSha256 = "1pj4x8y5vfpnn8vhxqqm3vicn29870r3jh0b17q3riq4vz1a2afp";

4
pkgs/games/harmonist/default.nix
View File

@ -3,13 +3,13 @@
buildGoPackage rec {
pname = "harmonist";
version = "0.2";
version = "0.3.0";
goPackagePath = "git.tuxfamily.org/harmonist/harmonist.git";
src = fetchurl {
url = "https://download.tuxfamily.org/harmonist/releases/${pname}-${version}.tar.gz";
sha256 = "1r78v312x2k1v9rkxkxffs5vxn9sc0dcszm66yw10p7qy9lyvicd";
sha256 = "16bh4zzq7szwcw19n34bslkf81fz3i0p4zqkd8gdi5ixkbm998lm";
};
goDeps = ./deps.nix;

8
pkgs/games/harmonist/deps.nix generated
View File

@ -4,8 +4,8 @@
fetch = {
type = "git";
url = "https://github.com/nsf/termbox-go";
rev = "eeb6cd0a176293eeb2c69270d83835972e3567bc";
sha256 = "14695dk07dj41s5f74l3wdf3xjj2flq4fq016i98f5xijh5f64i3";
rev = "93860e16131719fa9722e7c448dbf8c0e3210a0d";
sha256 = "03hz060cy8qrl4kgr80pbq6xvr38z4c6ghr3y81i8g854rvp6426";
};
}
{
@ -13,8 +13,8 @@
fetch = {
type = "git";
url = "https://github.com/mattn/go-runewidth";
rev = "703b5e6b11ae25aeb2af9ebb5d5fdf8fa2575211";
sha256 = "0znpyz71gajx3g0j2zp63nhjj2c07g16885vxv4ykwnrfmzbgk4w";
rev = "18c3d09a134a52720932bbaa92c798a0ab111004";
sha256 = "1snr8mk63vz2h44knq26dm81p83887v7kb09iywqmx0nqzngih66";
};
}
]

352
pkgs/misc/vim-plugins/generated.nix
View File

@ -39,12 +39,12 @@ let
agda-vim = buildVimPluginFrom2Nix {
pname = "agda-vim";
version = "2019-08-04";
version = "2019-12-08";
src = fetchFromGitHub {
owner = "derekelkins";
repo = "agda-vim";
rev = "4fc0a0a95a347b7b98715a78b6f41edd5aa084c5";
sha256 = "15zzc1aqzflw36462ka5914cmfqckciqcgcff0kfmzglfcx7is6z";
rev = "fbb55d9ef8829630ea8f12c112bebc69c7a15337";
sha256 = "0fg43ggaxpnybc9ism4b5q7l0n6rdgh4vkpch80x89mwld287lqv";
};
};
@ -204,12 +204,12 @@ let
calendar-vim = buildVimPluginFrom2Nix {
pname = "calendar-vim";
version = "2019-12-03";
version = "2019-12-13";
src = fetchFromGitHub {
owner = "itchyny";
repo = "calendar.vim";
rev = "335e67e32865259c8a1f27a08fd1260a8cb1897b";
sha256 = "1n35sf4v1piww31kqzg88s4xb5gdsxqgjvfmlif16na1kdvyjwd5";
rev = "6d6ac26c537b996819eda9f0cf8f303d10048c10";
sha256 = "120bx0wskkpk2r05sv74430270lf3c5j1z02bd05i9747dbjcgq5";
};
};
@ -413,12 +413,12 @@ let
coc-lists = buildVimPluginFrom2Nix {
pname = "coc-lists";
version = "2019-11-25";
version = "2019-12-10";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-lists";
rev = "c3d8bca71ba4cbf6eefdd24e77e62b595dcff856";
sha256 = "0djmzw782m8vy3sfff3gnnib4iz3wilvjv4hagv7mhzcf2lzswsb";
rev = "6dde4a564e33251d6745631fcf3168663cad7551";
sha256 = "1w6cln4ac6df4ka7q4wkv303sh5bmgfzl7gck2v2n5fff7yhrqxq";
};
};
@ -435,12 +435,12 @@ let
coc-pairs = buildVimPluginFrom2Nix {
pname = "coc-pairs";
version = "2019-12-02";
version = "2019-12-09";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-pairs";
rev = "97a757cadecabd5a1bf0ed0eb831535d7011ecbd";
sha256 = "0ygsiplb4slw7vf72njiy3cxslflnihr3qfi9i802dc9p02w4sl8";
rev = "08ad1b1565960b41005bedbbd051f90c8edacc3c";
sha256 = "0wfjs9hj11b0zfryfa2jnclgx4sfml9wvpjbwdqhhzz20ahc1jsh";
};
};
@ -479,12 +479,12 @@ let
coc-rls = buildVimPluginFrom2Nix {
pname = "coc-rls";
version = "2019-11-23";
version = "2019-12-07";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-rls";
rev = "1c7df237f76a50f25e8bbe3d8bec897991ca86b2";
sha256 = "0q9i1lz4id9c3d4lch3fxkh8qg9v59vh3kin9h2qdnp3xwgfcvjr";
rev = "c899418e8fae4a8c3eb15fee48513ae050b11d60";
sha256 = "0sipvs8r8i239l2334k4qnhwpaijwd524q598rp4ma34ry42c2xl";
};
};
@ -501,12 +501,12 @@ let
coc-snippets = buildVimPluginFrom2Nix {
pname = "coc-snippets";
version = "2019-10-24";
version = "2019-12-10";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-snippets";
rev = "1294af604d65b66bac4ff05e159dc0bd0adb8710";
sha256 = "093q9gx7fkahyk082gkawgvakzimvhhxazxhrdvmzsqs07yjxjmc";
rev = "3ffd09dad94f6f41dd03cf3cec2a6b92a7028702";
sha256 = "1qrkgva9yjjbjyflwaqfk84ia2vd5956ikjkmjfhd3gd52kh7hlg";
};
};
@ -534,12 +534,12 @@ let
coc-tabnine = buildVimPluginFrom2Nix {
pname = "coc-tabnine";
version = "2019-09-12";
version = "2019-12-10";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-tabnine";
rev = "cb787892b860a53fea65954b4afa32331ab17851";
sha256 = "0c7hk8alggvz837w48fqiz3d01z56pxg2qss13qpp01kvvw12np6";
rev = "f72b4f47109918cc6ad43b42ed566bec61feff8e";
sha256 = "1jaj6qsascdpdyz0g8yvi7bcxf4jwcrb0766x4dsmfk9r7prxifl";
};
};
@ -567,12 +567,12 @@ let
coc-tsserver = buildVimPluginFrom2Nix {
pname = "coc-tsserver";
version = "2019-11-23";
version = "2019-12-11";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-tsserver";
rev = "4f493d6c35bfef71ec21e8db648bcabda5f9ad21";
sha256 = "1n1b9ss5cjmn5vazfmy97x88s4nqw6f2mwvnqbnvx3cjrpwvyjy6";
rev = "1f76767ffb0c79a8917b122c8091dbcdf71aa824";
sha256 = "0p6pkhq4y69ib408g2r3a20ycfh8yyr8a5jld9snc1jpb8vi0m1l";
};
};
@ -622,12 +622,12 @@ let
coc-yank = buildVimPluginFrom2Nix {
pname = "coc-yank";
version = "2019-11-23";
version = "2019-12-11";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-yank";
rev = "1d145660c81cf4f160965feb12ea69129d1cce3e";
sha256 = "1sdpkr1rkvqaiixiddd5a0095di071nxr2gvnikb4pnzrknacngk";
rev = "79c5a97c9b7122180b869f90f7f011934f3ae8f5";
sha256 = "0dqz759aw0zlmgwrkv8ia45sdl27hb63ilawm9awzbl99w02psjf";
};
};
@ -733,12 +733,12 @@ let
csv-vim = buildVimPluginFrom2Nix {
pname = "csv-vim";
version = "2019-06-04";
version = "2019-12-11";
src = fetchFromGitHub {
owner = "chrisbra";
repo = "csv.vim";
rev = "f8d24584b01cc72e1a3bee640099a7d9bae98102";
sha256 = "112spld65z56zbgd0zm2p1psc8g728pbd8gig0az1lnbxp3pl3jc";
rev = "3128891191d7e363d39cbe70b96281ec8d897bcb";
sha256 = "1qapfsk4z637rqi9mppac50gliyi957cvl2dfknq0dy856a11274";
};
};
@ -843,12 +843,12 @@ let
denite-nvim = buildVimPluginFrom2Nix {
pname = "denite-nvim";
version = "2019-12-05";
version = "2019-12-13";
src = fetchFromGitHub {
owner = "Shougo";
repo = "denite.nvim";
rev = "f9567a0e9a8af56a33961192bbbbe93ada60155d";
sha256 = "1q20r409cxhywj5yzimirrj2aa1p6s4d1y4y429g8zl2qn9nr2fw";
rev = "13c8542818f418d1207c368f0072072c793f58c1";
sha256 = "1xrpmrr6wmy88s23j4cxcpsj9wlw7ak48sg3hjqpni9w231kp7a9";
};
};
@ -899,24 +899,24 @@ let
deoplete-go = buildVimPluginFrom2Nix {
pname = "deoplete-go";
version = "2019-12-01";
version = "2019-12-13";
src = fetchFromGitHub {
owner = "zchee";
repo = "deoplete-go";
rev = "45ab448ad0bdd19a6f13ce691a5ce3c0c381ee9e";
sha256 = "132wkvh62zhpiv37576k0a8akm90x40dq0sr7rc9q24cq5lym7rx";
rev = "a3ac3f53f0af482095ebcf09af8ca1d1edce45bc";
sha256 = "19xgsm5mbfcpdb0csckbwi83gl3b4wqdn8vchbv8j9faf10qnf2b";
fetchSubmodules = true;
};
};
deoplete-jedi = buildVimPluginFrom2Nix {
pname = "deoplete-jedi";
version = "2019-12-07";
version = "2019-12-13";
src = fetchFromGitHub {
owner = "deoplete-plugins";
repo = "deoplete-jedi";
rev = "331237df98f67a821715aec06cd3ff5784b10220";
sha256 = "0q0400il4lh39lvnfbshzs7mc4n3fkwgs1m47pglm31305g1mx1b";
rev = "7990447a308c6c5839ada856f31a7dd3e34f20a4";
sha256 = "1570k79ihz6kif85ichdgdnbipbdkqb5ks8izhqppb68lajyjvd2";
fetchSubmodules = true;
};
};
@ -932,14 +932,25 @@ let
};
};
deoplete-khard = buildVimPluginFrom2Nix {
pname = "deoplete-khard";
version = "2019-09-02";
src = fetchFromGitHub {
owner = "nicoe";
repo = "deoplete-khard";
rev = "27221723a3bb8e480ff8cbe7f4be9ff38c076bf7";
sha256 = "0g7sysm5lb8fpgagfg4565fz4rn16djdc4m2213ryq1s3crx40gw";
};
};
deoplete-lsp = buildVimPluginFrom2Nix {
pname = "deoplete-lsp";
version = "2019-12-03";
version = "2019-12-13";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deoplete-lsp";
rev = "dbac6111ae250e845070075f63a3d81fd6320815";
sha256 = "1p55jk21l6qd16vh0yh0zilxqz8dpksis1w7ildjwhd5f8b8ach0";
rev = "ca4018c69aca115033f3e3b5408331e76ff64cd0";
sha256 = "0k3vgikvjapqniz0cmnhjx4ds5dn4kscd443sf2x2nd6ppa6fd6j";
};
};
@ -978,23 +989,23 @@ let
deoplete-nvim = buildVimPluginFrom2Nix {
pname = "deoplete-nvim";
version = "2019-12-05";
version = "2019-12-10";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deoplete.nvim";
rev = "e3c1f55b6c9fda704b963558729c716e13d41244";
sha256 = "061vkq62rn83qwj6v01ahqawv4crscjad2hzmgzkffggjqfy5kzv";
rev = "e9aad25f28b68581cea2d94400b9fa64b724773b";
sha256 = "0wy5qapj6hfxj4ir38lb823zsgj6nqhi4r2sv0bm23g25sykg6ry";
};
};
dhall-vim = buildVimPluginFrom2Nix {
pname = "dhall-vim";
version = "2019-12-06";
version = "2019-12-09";
src = fetchFromGitHub {
owner = "vmchale";
repo = "dhall-vim";
rev = "13f70cf593193be45486dc502bcff473b8afc11d";
sha256 = "0qcb6wkdj7yvlq5drral4ik6s3ay5h512yh19789jcjgyv7mw9ak";
rev = "5be708edaa89c93a585ed0ba04339c4f857dae3a";
sha256 = "02s2wwd07qr2396hy3j3nw9f39ymahr9gpfsidrx4f1l4yb235in";
};
};
@ -1022,23 +1033,23 @@ let
echodoc-vim = buildVimPluginFrom2Nix {
pname = "echodoc-vim";
version = "2019-12-07";
version = "2019-12-08";
src = fetchFromGitHub {
owner = "Shougo";
repo = "echodoc.vim";
rev = "7fb542ca1eedc2a214279523aba4b0f095fa5f19";
sha256 = "1pn18a9jip9qfp1j4kqpy7kkj5xggbiw24nqn5b5gfrha5vw6s3h";
rev = "e20bff5f3ef4ea29b64f386fa1994281832863d0";
sha256 = "15xsin3wv7gba0wd7766ylgl9k32xzk0crv3liqmxsn5kgggkcxa";
};
};
editorconfig-vim = buildVimPluginFrom2Nix {
pname = "editorconfig-vim";
version = "2019-11-28";
version = "2019-12-10";
src = fetchFromGitHub {
owner = "editorconfig";
repo = "editorconfig-vim";
rev = "2ad3d7882d2e9622a7fdc1a5ba1c5d0064d89472";
sha256 = "00cyvjzn2sr49fvjfsxv0rj7kmdr2m2xlcpqvnfamh6l19nagb35";
rev = "53c56fcf358ca36b00b9cbf7dd70642c8922fdd0";
sha256 = "1i0sk2s10ac5lagvn74m21lxsss1h4nfnn51lxnaflqbvlba4rln";
fetchSubmodules = true;
};
};
@ -1090,12 +1101,12 @@ let
falcon = buildVimPluginFrom2Nix {
pname = "falcon";
version = "2019-12-07";
version = "2019-12-14";
src = fetchFromGitHub {
owner = "fenetikm";
repo = "falcon";
rev = "0c50419eb0babd6ad80c75e56b444a397f6c2bd3";
sha256 = "1x1vd83m9l6sfgz224q53h0x0kv8myp4j5j7a24z4jsj7rv3gm0q";
rev = "55ef64a057025209c48905df06f725430e63542f";
sha256 = "07qca1xmwaak45ccgv5vg69s3vwl1p5h9r2agh0aw30qw50jvkkw";
};
};
@ -1212,12 +1223,12 @@ let
gentoo-syntax = buildVimPluginFrom2Nix {
pname = "gentoo-syntax";
version = "2019-11-27";
version = "2019-12-13";
src = fetchFromGitHub {
owner = "gentoo";
repo = "gentoo-syntax";
rev = "c7ab3c0f6efbe68e864273ad460ab06905930bd0";
sha256 = "1h46s31miyd3j8shmrs61phkljj7qp9bkclcx1l0yd4cppm3vi06";
rev = "946aac94d5690e9ca1ca2db21a254fea56e45b2b";
sha256 = "1q1rq1rxxq5hyglz90d7vd1m6az12lr2wz9aafn6zir68n3ak0lj";
};
};
@ -1311,12 +1322,12 @@ let
gv-vim = buildVimPluginFrom2Nix {
pname = "gv-vim";
version = "2019-11-29";
version = "2019-12-09";
src = fetchFromGitHub {
owner = "junegunn";
repo = "gv.vim";
rev = "f12b8b80897c1214327e6075abc007ec6e55a691";
sha256 = "0fb0zsmpx1vbdfh3d04dpgy2gkd4wkdn05jflcpr5cyf50zr1z9y";
rev = "a18f4465974dfbd53f1ea33bfbbcc8a32baf1b4b";
sha256 = "1b4y39zqjggqw6sybmr73di3grhnk19xb5jvyckjb43rp8nxrr00";
};
};
@ -1465,12 +1476,12 @@ let
jedi-vim = buildVimPluginFrom2Nix {
pname = "jedi-vim";
version = "2019-12-05";
version = "2019-12-08";
src = fetchFromGitHub {
owner = "davidhalter";
repo = "jedi-vim";
rev = "ac6b2f1e3ec091c53d519fce04751fe96fdc2d3f";
sha256 = "0a7pl1y82yq8gls7yp034gpxchfz3pllkw16kczhgih49w87m00k";
rev = "c80a08d9835565bb8988d6314dfec616f70c53da";
sha256 = "0s86i6s0qwghcfb7a3mxy2cbzh001hw860dsaaf2jprnwsvs2p1q";
fetchSubmodules = true;
};
};
@ -1609,12 +1620,12 @@ let
lh-vim-lib = buildVimPluginFrom2Nix {
pname = "lh-vim-lib";
version = "2019-12-05";
version = "2019-12-13";
src = fetchFromGitHub {
owner = "LucHermitte";
repo = "lh-vim-lib";
rev = "97437f8cf030762b8dcd929575f70cac362a253a";
sha256 = "13qn9qrc1d9vmndqyi1f8c3fx60p1xzf1m2c9lq9wk5p4hb8pqqw";
rev = "12388bb5ce5f5a16dc55dc22b80d7a410410b479";
sha256 = "1k7l8sq6jcl0a6yk68ch72w20rhwi26fhrp0yvvvim0krs0yr068";
};
};
@ -1631,12 +1642,12 @@ let
lightline-vim = buildVimPluginFrom2Nix {
pname = "lightline-vim";
version = "2019-11-10";
version = "2019-12-13";
src = fetchFromGitHub {
owner = "itchyny";
repo = "lightline.vim";
rev = "e6f282f5e9ae931f0b404dd15aab2e5e249ae092";
sha256 = "0ymb55gln97xzq94slghrmyrvn10jnh6547ci44gw1lq655c7wvb";
rev = "ef6df46efe5ac5289f084045e57c492205bd08b5";
sha256 = "01nrkjh18qd65kbnrw9s2kdb2ml5a7648zvqzyjxw1mcqpw57838";
};
};
@ -1895,12 +1906,12 @@ let
neosnippet-vim = buildVimPluginFrom2Nix {
pname = "neosnippet-vim";
version = "2019-11-07";
version = "2019-12-12";
src = fetchFromGitHub {
owner = "Shougo";
repo = "neosnippet.vim";
rev = "b8350cbbcdc951e1bac962f8339b011e2632d03f";
sha256 = "11k3a8qgkl5wrk0wxhpnsvpcf5ymbb4kmnlp0k253ga6yhlxspmx";
rev = "84057dd1dd28e1198d0b2777301ef6cafd8f2cef";
sha256 = "164077vmqf4kcj0kn5c027faa4fjzfdbl1cz4j45dxpbak36hy6w";
};
};
@ -1917,12 +1928,12 @@ let
neoterm = buildVimPluginFrom2Nix {
pname = "neoterm";
version = "2019-11-11";
version = "2019-12-10";
src = fetchFromGitHub {
owner = "kassio";
repo = "neoterm";
rev = "18e7924ac96fb59a2a88c5a5a9ac1a7ec2fda297";
sha256 = "0cn158gngglll23vfyk2bpcvw606xg0lj39yzn8pnl2gfg3476fs";
rev = "9f0e71200274fc7906df1284d18d43c127214c2c";
sha256 = "0shg7a66w8l6g872fgpf59sialc8gs3nx9h1awgngy0kk0m17ilq";
};
};
@ -1950,12 +1961,12 @@ let
neoyank-vim = buildVimPluginFrom2Nix {
pname = "neoyank-vim";
version = "2019-03-27";
version = "2019-12-11";
src = fetchFromGitHub {
owner = "Shougo";
repo = "neoyank.vim";
rev = "6a41fd651c00b1ff6a6298cb2be088e8d27d3629";
sha256 = "1p084xbycwkghfih41z1sc6nn2xi7471vj8zgc9jgw0qkxbmbcnn";
rev = "1829c6e426f829edea46660d0db08d4488010fcd";
sha256 = "1y6fvxqpj3rwf1fmjib177lqzh3z7syp7bccn79g1j8177m515w6";
};
};
@ -2234,14 +2245,25 @@ let
};
};
quick-scope = buildVimPluginFrom2Nix {
pname = "quick-scope";
version = "2019-04-22";
src = fetchFromGitHub {
owner = "unblevable";
repo = "quick-scope";
rev = "994576d997a52b4c7828149e9f1325d1c4691ae2";
sha256 = "0lr27vwv2bzva9s7f9d856vvls10icwli0kwj5v5f1q8y83fa4zd";
};
};
quickfix-reflector-vim = buildVimPluginFrom2Nix {
pname = "quickfix-reflector-vim";
version = "2018-08-12";
version = "2019-12-11";
src = fetchFromGitHub {
owner = "stefandtw";
repo = "quickfix-reflector.vim";
rev = "c76b7a1f496864315eea3ff2a9d02a53128bad50";
sha256 = "02vb7qkdprx3ksj4gwnj3j180kkdal8jky69dcjn8ivr0x8g26s8";
rev = "8e9c05a110b80ab66fc8bc3d5fe9e6fa168aada6";
sha256 = "1i8453z3s0xmbmbzk3kpxwvd42ar9v2m2gjqic9k7njpxw87czvs";
};
};
@ -2302,12 +2324,12 @@ let
readline-vim = buildVimPluginFrom2Nix {
pname = "readline-vim";
version = "2019-08-24";
version = "2019-12-12";
src = fetchFromGitHub {
owner = "ryvnf";
repo = "readline.vim";
rev = "40964933819e2a719e6e34adcf3e8b2210c5c6ce";
sha256 = "1jc8lzl49nl7r3v1b7fk6zpiba41h51qsi2w4lhf8v6lnzbazii7";
rev = "9711f3c7c1d295e775750d7421060d74ee1b56e3";
sha256 = "0zvavhc8033isdn7gdfla5kwif40rkn9p4zmkvwy423dpb3432h2";
};
};
@ -2412,12 +2434,12 @@ let
seoul256-vim = buildVimPluginFrom2Nix {
pname = "seoul256-vim";
version = "2017-09-05";
version = "2019-12-13";
src = fetchFromGitHub {
owner = "junegunn";
repo = "seoul256.vim";
rev = "1475b7610663c68aa90b6e565997c8792ce0d222";
sha256 = "03gqw14f5cirivcg1p06g500ns066yv5rd0z3zikvn4ql7n278dk";
rev = "b68f4032c49b64065072b449dc0f0f1f30616d8d";
sha256 = "0bxw0ks5gndzrgixa6xqhnf78b7n75w2jnc3s6bv75lz0fn0gypx";
};
};
@ -2632,12 +2654,12 @@ let
targets-vim = buildVimPluginFrom2Nix {
pname = "targets-vim";
version = "2019-10-27";
version = "2019-12-08";
src = fetchFromGitHub {
owner = "wellle";
repo = "targets.vim";
rev = "be309773998ca729213206950109a758be15b556";
sha256 = "0ravnykqlhw09cz5yyjm6k4kbikx39jagmmpj87q31pgf1rzycmx";
rev = "8d6ff2984cdfaebe5b7a6eee8f226a6dd1226f2d";
sha256 = "192wq3x64x11nm2jhs4yrc627b0lh002dfnj72xrc7jak9vbdps9";
};
};
@ -2776,12 +2798,12 @@ let
ultisnips = buildVimPluginFrom2Nix {
pname = "ultisnips";
version = "2019-11-19";
version = "2019-12-10";
src = fetchFromGitHub {
owner = "SirVer";
repo = "ultisnips";
rev = "c309637e0243b71f7e3265ebe3cffdfe9674cfbc";
sha256 = "1q2miwd56k2l7lfwmw3khqnfry9izaca91dcf32p0xp06bc3ah28";
rev = "3a8b0548b3efd01bff0393f8f32228786149806c";
sha256 = "10mnhlkxrzl008q7cfv3j78p1bd1dqmprpnmcz8nc6mmkldnflri";
};
};
@ -3095,23 +3117,23 @@ let
vim-airline = buildVimPluginFrom2Nix {
pname = "vim-airline";
version = "2019-12-02";
version = "2019-12-13";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline";
rev = "2daef1bcb8b240c303ef34c3348ee1af071963b4";
sha256 = "1q806acihhv4yshd8pna7gs383yxs7mw2rnqm4c016sqhb20ba1i";
rev = "72286b27cc6e7a1eb2b8e1103f2fa34afa397034";
sha256 = "19lgsxgnp6aq0nsbg43xn84xxi8hjp1ih6aj842ryhl47ppj76sq";
};
};
vim-airline-themes = buildVimPluginFrom2Nix {
pname = "vim-airline-themes";
version = "2019-12-02";
version = "2019-12-13";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline-themes";
rev = "fe89bb50a15492c76a9fc55e0cff410f3d5f8b0f";
sha256 = "01qplr1md3vzwrd7as2dkm8f4qvx4qcpgaw3q9i7s2i4yv80qnn8";
rev = "67512f5e81b8ad088a8cbfe8b95f9e495bc81cf3";
sha256 = "049lnixxcvvnkq5bfwpmclw1k73xyf5gqfpw78rkzsbg9milyr74";
};
};
@ -3634,12 +3656,12 @@ let
vim-flagship = buildVimPluginFrom2Nix {
pname = "vim-flagship";
version = "2019-11-13";
version = "2019-12-09";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-flagship";
rev = "d3e1b07a426b44cdf068d3fc4b7549cba2eb3358";
sha256 = "095dz37qspjjg7sx22mmxnda6p592bp3bmnc59n0nan9g3zy8yk2";
rev = "e522bd0ffb0e329f695ead7d4288a6245ff22410";
sha256 = "0vqkdzd7b204kbinn12jk306kc9bn2f0yaifj49swd0g8hv6dk4b";
};
};
@ -3700,12 +3722,12 @@ let
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
version = "2019-12-06";
version = "2019-12-11";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
rev = "5d37b17e3447edafa418550f2b19e0226b4c7824";
sha256 = "1nk113y3ilrim94wd33c1jpvysbyxn6w0z8nd420jnsfrk4jfcc4";
rev = "b68b6d4329d9bee58a521e0ff8c6adbbc53915b4";
sha256 = "1lrx2vk6bj10sy297mby4fqjrn09s7ghq2xjbp8z2ajww4pcxp05";
};
};
@ -3777,12 +3799,12 @@ let
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
version = "2019-12-05";
version = "2019-12-13";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
rev = "106edc862b923f9fbf046aee74b5fc805cd7d13f";
sha256 = "1b2iqvilr7j0sx3q6jfpnl37h1h2dqwd8n2d5zcswl1m0fnyi1kr";
rev = "8e6fcae371918fa8ebae088ce8e71de7df8cdbca";
sha256 = "04gw6f1gmk916l7m0phh9aj0h8kd2fm156ylbgjkwg46dphs27xa";
};
};
@ -3799,12 +3821,12 @@ let
vim-grepper = buildVimPluginFrom2Nix {
pname = "vim-grepper";
version = "2019-11-19";
version = "2019-12-09";
src = fetchFromGitHub {
owner = "mhinz";
repo = "vim-grepper";
rev = "d8fa51d4fa99221511dc8b9e2eb1cba23a9b0c20";
sha256 = "1wb4g5g1phixqwpj9nd261f690ziimy80w12pjivrik20bj17ipd";
rev = "dde6a660c7dd4e02b331da238ea477770073aca2";
sha256 = "0c411yg2s6wb8141lqpgasg7iwgvfwy88z6l0c0gccmk8knypxhm";
};
};
@ -4141,12 +4163,12 @@ let
vim-jsx-pretty = buildVimPluginFrom2Nix {
pname = "vim-jsx-pretty";
version = "2019-11-19";
version = "2019-12-11";
src = fetchFromGitHub {
owner = "MaxMEllon";
repo = "vim-jsx-pretty";
rev = "8b96cea873612b35ddfd7aef4b6c21f991103f0f";
sha256 = "18ilra7s29jl7k3nda2z3r7bvixk5b8bbfn9d3nvfz7l26n8s6i6";
rev = "0d07dc85ba5a14b7e95f1f36539741d99c632bfb";
sha256 = "1wxxln76mk5wd73pmaf67kv2q7gj6rb9zdfgx4hqx0jdcywhrjnw";
};
};
@ -4361,12 +4383,12 @@ let
vim-mucomplete = buildVimPluginFrom2Nix {
pname = "vim-mucomplete";
version = "2019-12-01";
version = "2019-12-07";
src = fetchFromGitHub {
owner = "lifepillar";
repo = "vim-mucomplete";
rev = "92f0206dae54439bec6503c649263e38167011a9";
sha256 = "1ygsb16ha7kxns1f1km7j3br9c0ylf8pan5z46bnmixcbvia53gb";
rev = "137b7e5c671b4b376b2df7492c4023ac6e1439da";
sha256 = "1pv19ylhifd32p8jb8rvbd8l5wik7349q4m4f8a8qycab2ba5xhv";
};
};
@ -4493,12 +4515,12 @@ let
vim-orgmode = buildVimPluginFrom2Nix {
pname = "vim-orgmode";
version = "2019-10-12";
version = "2019-12-13";
src = fetchFromGitHub {
owner = "jceb";
repo = "vim-orgmode";
rev = "5099025d0b632a5e56fa457f826153cd37c48d3c";
sha256 = "145x60yxzxga92ix4pp0rac5r9r61jgqr8s0l991zz30jxcv1qy2";
rev = "c6cd668ed13af85d8292b524f827e729bf70ea0f";
sha256 = "1239c0yc51jyp5shwpx2j7kbsb63qj6zp3k2lirppy8c2lls4nsv";
};
};
@ -4581,34 +4603,34 @@ let
vim-peekaboo = buildVimPluginFrom2Nix {
pname = "vim-peekaboo";
version = "2019-08-11";
version = "2019-12-12";
src = fetchFromGitHub {
owner = "junegunn";
repo = "vim-peekaboo";
rev = "9d3c7f39a6771496fac5f730ae7574bc57da21b4";
sha256 = "0r61r0s01nn4n153k60dlhr3l0sfj0gcx4y5ry7cvixl85b6y505";
rev = "cc4469c204099c73dd7534531fa8ba271f704831";
sha256 = "11lgf60v2kj772d9azkfddypwidcgfps5mvnhmp4gg0fmfx12h99";
};
};
vim-pencil = buildVimPluginFrom2Nix {
pname = "vim-pencil";
version = "2019-11-22";
version = "2019-12-13";
src = fetchFromGitHub {
owner = "reedes";
repo = "vim-pencil";
rev = "9aead49ecfd0640e07fdf30fb149dc7d072051eb";
sha256 = "189mqxsawdpb68vs9gpkh6flm00m3zhh744awwjd433dhyhz07fx";
rev = "09458527601fdb2fbd174317bdddfb34e4c64e79";
sha256 = "09b30cxlwbr9l07ya05is9q2y9vzbzhcc656nvjjzf968l496xr2";
};
};
vim-plug = buildVimPluginFrom2Nix {
pname = "vim-plug";
version = "2019-12-07";
version = "2019-12-11";
src = fetchFromGitHub {
owner = "junegunn";
repo = "vim-plug";
rev = "897ce5e2fad66bdb39dc94894f16dde89eee87f7";
sha256 = "1ydfdi6svq91aws9g5frcy5j7cjyxk8sphjzn739z7y5fc6lnbwx";
rev = "359ce90b9b37442974fd3ccd9279493d85efb3af";
sha256 = "1dbdnyfzhfgn70jgcd0a079b76s4gdv9ykslmfiaiv7bvlmhs08s";
};
};
@ -4625,12 +4647,12 @@ let
vim-polyglot = buildVimPluginFrom2Nix {
pname = "vim-polyglot";
version = "2019-11-28";
version = "2019-12-12";
src = fetchFromGitHub {
owner = "sheerun";
repo = "vim-polyglot";
rev = "15aeea662e0b08088ac7b6e3ee661c834e69106a";
sha256 = "1x7xx12hdydn37hb2k0awzv4s00sb7zk09jixr9mjfrh2x7ywf1c";
rev = "cea0d08a062478503814e51aa21c6486a0dd1b21";
sha256 = "05vhwgq2kj3safjhnv0rl4fhcfszba02mbwnyrlq4ayyiyv3n7cc";
};
};
@ -4768,12 +4790,12 @@ let
vim-ruby = buildVimPluginFrom2Nix {
pname = "vim-ruby";
version = "2019-11-06";
version = "2019-12-08";
src = fetchFromGitHub {
owner = "vim-ruby";
repo = "vim-ruby";
rev = "d37f5a52a97239dcd503a3a84bb32dfc3200b5f7";
sha256 = "158wdfkskxxqzjm0dls3sza4nfrp2dqxwsdiiqfhar4vm2n7x8yp";
rev = "81f64ec3f33165159017f782bc8a1ce9f97348b4";
sha256 = "0dja73g2mhbwnb29yqcwamwh77k8l3qqbmn25w9pa2mlnfkp9jy8";
};
};
@ -4900,12 +4922,12 @@ let
vim-slime = buildVimPluginFrom2Nix {
pname = "vim-slime";
version = "2019-11-01";
version = "2019-12-13";
src = fetchFromGitHub {
owner = "jpalardy";
repo = "vim-slime";
rev = "93776ea69b99ad0ecd5291d8a5984386fd8ffa72";
sha256 = "1izcb2iwlwxhzc048xwi9jxr3gqyy5kqysbd1358p39sfhfcdy4j";
rev = "53c781b9532da50ab9d6ab1bbe640902b2629a0e";
sha256 = "1cyi4v3rqf8ln0lz1rgzh1qpxw5mq3ihixx83qnrxn81nd1ivk2i";
};
};
@ -4944,12 +4966,12 @@ let
vim-snippets = buildVimPluginFrom2Nix {
pname = "vim-snippets";
version = "2019-12-01";
version = "2019-12-12";
src = fetchFromGitHub {
owner = "honza";
repo = "vim-snippets";
rev = "a7a7d4d2dd252b71b904d362ba74572c660da67f";
sha256 = "0ys0sczmjpc219hv2wwgcrkyiys21vk66i174axm147h33m3cm4f";
rev = "3ba36bb710988349140138707731baeebd6337e4";
sha256 = "19831g3b6cd5ws0zp6xp4aj110pzf6za3av9ac1s9dnpi97d37g9";
};
};
@ -5076,12 +5098,12 @@ let
vim-table-mode = buildVimPluginFrom2Nix {
pname = "vim-table-mode";
version = "2019-11-16";
version = "2019-12-10";
src = fetchFromGitHub {
owner = "dhruvasagar";
repo = "vim-table-mode";
rev = "5ec330d114bdc27d636ce16a6186013f121470df";
sha256 = "168y5wbvhrislvj04g768mfhklczw7phmgf5am61gh4z2nsyw2lp";
rev = "5ac34a22dbf70e3c8afd7cc69726cec89655c4ad";
sha256 = "1rs68islvz2rd3ahgfk06q9ydr3ph25zh4amg8vk1svqhk1vh0mp";
};
};
@ -5219,23 +5241,23 @@ let
vim-tmux-focus-events = buildVimPluginFrom2Nix {
pname = "vim-tmux-focus-events";
version = "2019-04-19";
version = "2019-12-09";
src = fetchFromGitHub {
owner = "tmux-plugins";
repo = "vim-tmux-focus-events";
rev = "0f89b1ada151e22882a5a47a1ee2b6d6135bc5c1";
sha256 = "0rx1615wlsl62y62l217vgjd5vjfzf3zjwq43fflpc6bixikqc6j";
rev = "e80960715c09aef8ab9204848ed1683805a93a33";
sha256 = "0ds6qw2i1r67jhxh9ff36al45bafsmbxxdc127l6iy2vl5wj0d3d";
};
};
vim-tmux-navigator = buildVimPluginFrom2Nix {
pname = "vim-tmux-navigator";
version = "2019-12-02";
version = "2019-12-10";
src = fetchFromGitHub {
owner = "christoomey";
repo = "vim-tmux-navigator";
rev = "b5ae5805db294a72380f77ee82592cd99246272b";
sha256 = "0w8fn92k1p99wmhq4dv5w2fb97l0p8ay00qyzydm9lq87w06a939";
rev = "8fdf78292bb3aed1c9de880be7e03efdbf23d306";
sha256 = "0y92na4dcfcsj5zbs3m7y6csl3sd46a9968id78cdn9cgg8iwzac";
};
};
@ -5263,12 +5285,12 @@ let
vim-trailing-whitespace = buildVimPluginFrom2Nix {
pname = "vim-trailing-whitespace";
version = "2017-09-23";
version = "2019-12-09";
src = fetchFromGitHub {
owner = "bronson";
repo = "vim-trailing-whitespace";
rev = "4c596548216b7c19971f8fc94e38ef1a2b55fee6";
sha256 = "0f1cpnp1nxb4i5hgymjn2yn3k1jwkqmlgw1g02sq270lavp2dzs9";
rev = "6b7cdecff252474fe560d32c6f05641f3c5952c7";
sha256 = "0arv1hmlw7c1rlkc00hzjyg48pg8g4cc9q9l2hy8kpmsl037akm3";
};
};
@ -5406,12 +5428,12 @@ let
vim-xkbswitch = buildVimPluginFrom2Nix {
pname = "vim-xkbswitch";
version = "2019-03-28";
version = "2019-12-14";
src = fetchFromGitHub {
owner = "lyokha";
repo = "vim-xkbswitch";
rev = "3c968fd4fd83d3631dec4c0caf289c85917d8ca9";
sha256 = "17ncq06al2pzqxpx45bmh4b66d48y3kklxcd1f80jfsp9hh5v0vm";
rev = "b9839555f70d319b4e21fc7bc9b559d91cf1260a";
sha256 = "1ql8yv8rxpr9j9phf4jddqs1j81vcb9gpp0p3fmy6f8nf4b26nvw";
};
};
@ -5538,12 +5560,12 @@ let
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
version = "2019-12-02";
version = "2019-12-13";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
rev = "02829dee17a3d70889b5a0151a2f747754a0e2c4";
sha256 = "0kkm18mi1am1ww3lb3xqr9v11s057drkv8wpq0l5vqr550iviail";
rev = "0dd49a005bd7e5df51491d569e99c19a753ab44b";
sha256 = "15ksb158vjprpgymkn7gkpmnaayzjqlph8wssl6pi6nlmylr40sx";
};
};
@ -5738,12 +5760,12 @@ let
zig-vim = buildVimPluginFrom2Nix {
pname = "zig-vim";
version = "2019-12-06";
version = "2019-12-10";
src = fetchFromGitHub {
owner = "zig-lang";
repo = "zig.vim";
rev = "17d4772e984450b7c54e878d466dd2b3e6419831";
sha256 = "1gbpzcwig0g2045a42l1xi1bzm9apgl95l5ixwh8h7jahmkcdzig";
rev = "65f71de21c31a0b7f7b09a62f865d1b61f9f71ed";
sha256 = "0y0rfpsggl1a1h89zjzgpnx3vj244gmr3qwblsclh3hzf0sdav5r";
};
};

20
pkgs/misc/vim-plugins/overrides.nix
View File

@ -14,6 +14,9 @@
# coc-go dependency
, go
# deoplete-khard dependency
, khard
# vim-go denpencies
, asmfmt, delve, errcheck, godef, golint
, gomodifytags, gotags, gotools, go-motion
@ -115,12 +118,12 @@ self: super: {
# NB: Make sure you pick a rev from the release branch!
coc-nvim = buildVimPluginFrom2Nix rec {
pname = "coc-nvim";
version = "2019-11-29";
version = "2019-11-30";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc.nvim";
rev = "d566fa03807d8d86ce9302680d135198a36c7d4d";
sha256 = "0m355w837f61jfpjrhi3h47z7vq16g8yai8kd82v1h71ns5fw9gz";
rev = "42a45c639e2c43f9f1795c3804787c6a686781c0";
sha256 = "0bny7s7scbls01jkvrwcd516py09lp0vkr65p1ik4282blyxyy6s";
};
};
@ -174,6 +177,17 @@ self: super: {
'';
});
deoplete-khard = super.deoplete-khard.overrideAttrs(old: {
dependencies = [ self.deoplete-nvim ];
passthru.python3Dependencies = ps: [ (ps.toPythonModule khard) ];
meta = {
description = "Address-completion for khard via deoplete";
homepage = "https://github.com/nicoe/deoplete-khard";
license = stdenv.lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [ jorsn ];
};
});
ensime-vim = super.ensime-vim.overrideAttrs(old: {
passthru.python3Dependencies = ps: with ps; [ sexpdata websocket_client ];
dependencies = with super; [ vimproc-vim vimshell-vim super.self forms ];

4
pkgs/misc/vim-plugins/vim-plugin-names
View File

@ -15,8 +15,8 @@ andviro/flake8-vim
ap/vim-css-color
arcticicestudio/nord-vim
artur-shaik/vim-javacomplete2
ayu-theme/ayu-vim
autozimu/LanguageClient-neovim
ayu-theme/ayu-vim
bazelbuild/vim-bazel
bbchung/clighter8
benmills/vimux
@ -314,6 +314,7 @@ neovimhaskell/nvim-hs.vim
neovim/nvimdev.nvim
neutaaaaan/iosvkem
nfnty/vim-nftables
nicoe/deoplete-khard
nixprime/cpsm
NLKNguyen/papercolor-theme
noc7c9/vim-iced-coffee-script
@ -465,6 +466,7 @@ tyru/open-browser.vim
uarun/vim-protobuf
udalov/kotlin-vim
ujihisa/neco-look
unblevable/quick-scope
valloric/youcompleteme
vhda/verilog_systemverilog.vim
vim-airline/vim-airline

4
pkgs/os-specific/linux/fuse/default.nix
View File

@ -11,7 +11,7 @@ in {
};
fuse_3 = mkFuse {
version = "3.8.0";
sha256Hash = "0zbj5l2pffs0q38lqfrnkafsgxf50mw5mqmh4m2jmqab1fxg5mip";
version = "3.9.0";
sha256Hash = "00yppzmv15jqjy3wq5ki9d49jl6bfxrlwr5sfz50ihr40d6dgx9p";
};
}

4
pkgs/os-specific/linux/kernel/linux-4.19.nix
View File

@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "4.19.88";
version = "4.19.89";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1gizkdmq46ykw7ya3hibd6lalww2kvsia346pq3xvrk6s5mkp4n1";
sha256 = "0ijx8ih91p4g95zpwz6ga3q2x9lf1948xf2v5mz4348byf5hdwv8";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-5.3.nix
View File

@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "5.3.15";
version = "5.3.16";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "15qidl06lyfylx1b43b4wz2zfkr4000bkr7ialslmb7yi7mamj6f";
sha256 = "19asdv08rzp33f0zxa2swsfnbhy4zwg06agj7sdnfy4wfkrfwx49";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-5.4.nix
View File

@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "5.4.2";
version = "5.4.3";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0mx50cp61kajya3lfcksw7wksq7ihkqzrzszf4bb19kwhxb85y9j";
sha256 = "0lgfg31pgvdhkh9y4y4yh075mlk3qa6npxp7n19yxcg168pnhcb7";
};
} // (args.argsOverride or {}))

31
pkgs/os-specific/linux/procdump/default.nix
View File

@ -1,28 +1,19 @@
{ stdenv, fetchFromGitHub, fetchpatch, bash, coreutils, gdb, zlib }:
{ stdenv, fetchFromGitHub, bash, coreutils, gdb, zlib }:
stdenv.mkDerivation rec {
pname = "procdump";
version = "1.0.1";
version = "1.1";
src = fetchFromGitHub {
owner = "Microsoft";
repo = "ProcDump-for-Linux";
rev = version;
sha256 = "1lkm05hq4hl1vadj9ifm18hi7cbf5045xlfxdfbrpsl6kxgfwcc4";
sha256 = "1pcf6cpslpazla0na0q680dih9wb811q5irr7d2zmw0qmxm33jw2";
};
nativeBuildInputs = [ zlib ];
buildInputs = [ bash coreutils gdb ];
patches = [
# Fix name conflict when built with musl
# TODO: check if fixed upstream https://github.com/Microsoft/ProcDump-for-Linux/pull/50
(fetchpatch {
url = "https://github.com/Microsoft/ProcDump-for-Linux/commit/1b7b50b910f20b463fb628c8213663c8a8d11d0d.patch";
sha256 = "0h0dj3gi6hw1wdpc0ih9s4kkagv0d9jzrg602cr85r2z19lmb7yk";
})
];
postPatch = ''
substituteInPlace src/CoreDumpWriter.c \
--replace '"gcore ' '"${gdb}/bin/gcore ' \
@ -31,16 +22,26 @@ stdenv.mkDerivation rec {
'';
makeFlags = [
"DESTDIR=$(out)"
"DESTDIR=${placeholder "out"}"
"INSTALLDIR=/bin"
"MANDIR=/share/man/man1"
];
doCheck = false; # needs root
doCheck = false; # needs sudo root
doInstallCheck = true;
installCheckPhase = ''
runHook preInstallCheck
set +o pipefail
($out/bin/procdump -h | grep "ProcDump v${version}") ||
(echo "ERROR: ProcDump is not the expected version or does not run properly" ; exit 1)
set -o pipefail
runHook postInstallCheck
'';
meta = with stdenv.lib; {
description = "A Linux version of the ProcDump Sysinternals tool";
homepage = https://github.com/Microsoft/ProcDump-for-Linux;
homepage = "https://github.com/Microsoft/ProcDump-for-Linux";
license = licenses.mit;
maintainers = with maintainers; [ c0bw3b ];
platforms = platforms.linux;

4
pkgs/servers/amqp/rabbitmq-server/default.nix
View File

@ -6,12 +6,12 @@
stdenv.mkDerivation rec {
pname = "rabbitmq-server";
version = "3.8.1";
version = "3.8.2";
# when updating, consider bumping elixir version in all-packages.nix
src = fetchurl {
url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "17ymzjgz3544jgf321f8f788gdxs9l252ah61nlgsglv0x8gggrh";
sha256 = "17gixahxass9n4d697my8sq4an51rw3cicb36fqvl8fbhnwjjrwc";
};
buildInputs =

4
pkgs/servers/documize-community/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "documize-community";
version = "3.5.2";
version = "3.6.0";
src = fetchFromGitHub {
owner = "documize";
repo = "community";
rev = "v${version}";
sha256 = "0wi85ag5n49zqs68gznifza8qv8zkg9l8z1q6ckkvbkl2f3zpdl5";
sha256 = "0wic4j7spw9ya1m6yz0mkpqi1px6jd2vk60w8ldx0m0k606wy6ir";
};
modSha256 = "1z0v7n8klaxcqv7mvzf3jzgrp78zb4yiibx899ppk6i5qnj4xiv0";

8
pkgs/servers/matrix-synapse/default.nix
View File

@ -7,11 +7,11 @@ with python3.pkgs;
let
matrix-synapse-ldap3 = buildPythonPackage rec {
pname = "matrix-synapse-ldap3";
version = "0.1.3";
version = "0.1.4";
src = fetchPypi {
inherit pname version;
sha256 = "0a0d1y9yi0abdkv6chbmxr3vk36gynnqzrjhbg26q4zg06lh9kgn";
sha256 = "01bms89sl16nyh9f141idsz4mnhxvjrc3gj721wxh1fhikps0djx";
};
propagatedBuildInputs = [ service-identity ldap3 twisted ];
@ -23,11 +23,11 @@ let
in buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.6.1";
version = "1.7.0";
src = fetchPypi {
inherit pname version;
sha256 = "184d7qd76bb2714pfkx9p4zzn4akb6xkx2iw86cpn7aqmccxysld";
sha256 = "1z7q34yazjb3glzhm0si0pzif32gnp03bmd490gckkl30rklyxsp";
};
patches = [

4
pkgs/servers/mpd/default.nix
View File

@ -82,7 +82,7 @@ let
# Disable platform specific features if needed
# using libmad to decode mp3 files on darwin is causing a segfault -- there
# is probably a solution, but I'm disabling it for now
platformMask = lib.optionals stdenv.isDarwin [ "mad" "pulse" "jack" "nfs" "smb" ]
platformMask = lib.optionals stdenv.isDarwin [ "mad" "pulse" "jack" "nfs" "smbclient" ]
++ lib.optionals (!stdenv.isLinux) [ "alsa" "systemd" "syslog" ];
knownFeatures = builtins.attrNames featureDependencies;
@ -113,7 +113,7 @@ let
buildInputs = [ glib boost ]
++ (lib.concatLists (lib.attrVals features_ featureDependencies))
++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.AudioToolbox;
++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AudioToolbox darwin.apple_sdk.frameworks.AudioUnit ];
nativeBuildInputs = [ meson ninja pkgconfig ];

13
pkgs/tools/X11/imwheel/default.nix
View File

@ -10,10 +10,15 @@ stdenv.mkDerivation rec {
buildInputs = [ libX11 libXext libXi libXmu libXt libXtst ];
postPatch = ''
substituteInPlace Makefile.in --replace "ETCDIR = " "ETCDIR = $out"
substituteInPlace util.c --replace "/etc/X11/imwheel" "$out/etc/X11/imwheel"
'';
makeFlags = [
"sysconfdir=/etc"
"ETCDIR=/etc"
];
installFlags = [
"sysconfdir=${placeholder "out"}/etc"
"ETCDIR=${placeholder "out"}/etc"
];
meta = with stdenv.lib; {
homepage = "http://imwheel.sourceforge.net/";

4
pkgs/tools/admin/tigervnc/default.nix
View File

@ -5,7 +5,7 @@
, cmake, gettext, libtool
, libGLU
, gnutls, pam, nettle
, xterm, openssh
, xterm, openssh, perl
, makeWrapper}:
with stdenv.lib;
@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
buildInputs = with xorg; [
libjpeg_turbo fltk pixman
gnutls pam nettle
gnutls pam nettle perl
xorgproto
utilmacros libXtst libXext libX11 libXext libICE libXi libSM libXft
libxkbfile libXfont2 libpciaccess

4
pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
View File

@ -13,13 +13,13 @@ in
stdenv.mkDerivation rec {
pname = "ibus-typing-booster";
version = "2.7.0";
version = "2.7.2";
src = fetchFromGitHub {
owner = "mike-fabian";
repo = "ibus-typing-booster";
rev = version;
sha256 = "1rd9dkjc9s15mxifcbr12944rsh8z66p0j6abh3iw8vkiylk674s";
sha256 = "1v11hipdh8chkd81gcack42v8h8q4z2x2gv2gyymqk15yj0959i3";
};
patches = [ ./hunspell-dirs.patch ];

4
pkgs/tools/misc/fluent-bit/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "fluent-bit";
version = "1.3.2";
version = "1.3.4";
src = fetchFromGitHub {
owner = "fluent";
repo = "fluent-bit";
rev = "v${version}";
sha256 = "155szha6mx7cvq0bzqb528zg4q1m9gip7f0m1zv9yrz1sr9p1nzv";
sha256 = "01iy8xgsyc1clhpik4nmkxw6xnblzswvn35qz4h4p5sw97c4iwq8";
};
nativeBuildInputs = [ cmake flex bison ];

12
pkgs/tools/misc/html-proofer/Gemfile.lock
View File

@ -5,20 +5,22 @@ GEM
public_suffix (>= 2.0.2, < 5.0)
ethon (0.12.0)
ffi (>= 1.3.0)
ffi (1.11.2)
html-proofer (3.14.1)
ffi (1.11.3)
html-proofer (3.15.0)
addressable (~> 2.3)
mercenary (~> 0.3)
nokogiri (~> 1.10)
nokogumbo (~> 2.0)
parallel (~> 1.3)
rainbow (~> 3.0)
typhoeus (~> 1.3)
yell (~> 2.0)
mercenary (0.3.6)
mini_portile2 (2.4.0)
nokogiri (1.10.5)
nokogiri (1.10.7)
mini_portile2 (~> 2.4.0)
parallel (1.19.0)
nokogumbo (2.0.2)
nokogiri (~> 1.8, >= 1.8.4)
parallel (1.19.1)
public_suffix (4.0.1)
rainbow (3.0.0)
typhoeus (1.3.1)

29
pkgs/tools/misc/html-proofer/gemset.nix
View File

@ -26,21 +26,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0cbads5da12lb3j0mg2hjrd57s5qkkairxh2y6r9bqyblb5b8xbw";
sha256 = "10ay35dm0lkcqprsiya6q2kwvyid884102ryipr4vrk790yfp8kd";
type = "gem";
};
version = "1.11.2";
version = "1.11.3";
};
html-proofer = {
dependencies = ["addressable" "mercenary" "nokogiri" "parallel" "rainbow" "typhoeus" "yell"];
dependencies = ["addressable" "mercenary" "nokogumbo" "parallel" "rainbow" "typhoeus" "yell"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "16i803vhrygcbln077czhv9ngipljsawr338lbvd0zr2473r8qja";
sha256 = "0nmwxmn0dxgs53g1cqn251dzmjrklw14cpa6z6wz7cdwvjq47500";
type = "gem";
};
version = "3.14.1";
version = "3.15.0";
};
mercenary = {
groups = ["default"];
@ -68,20 +68,31 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "185g3dwba73jqxjr94bd2zk6fil6n9hmcfnfyzh3p1w47vm296r7";
sha256 = "0r0qpgf80h764k176yr63gqbs2z0xbsp8vlvs2a79d5r9vs83kln";
type = "gem";
};
version = "1.10.5";
version = "1.10.7";
};
nokogumbo = {
dependencies = ["nokogiri"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sxjnpjvrn10gdmfw2dimhch861lz00f28hvkkz0b1gc2rb65k9s";
type = "gem";
};
version = "2.0.2";
};
parallel = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bsg06zklvxv1qkpqhiric2m07108rqlmnl4axv5fzpxx9973pfz";
sha256 = "12jijkap4akzdv11lm08dglsc8jmc87xcgq6947i1s3qb69f4zn2";
type = "gem";
};
version = "1.19.0";
version = "1.19.1";
};
public_suffix = {
groups = ["default"];

6
pkgs/tools/misc/starship/default.nix
View File

@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "starship";
version = "0.29.0";
version = "0.30.1";
src = fetchFromGitHub {
owner = "starship";
repo = pname;
rev = "v${version}";
sha256 = "07haspmx0wid472jc8p92xqqf34rchc0jzx09089p9jcxi6qdv4y";
sha256 = "19h6ahbqfrq5jfdjqxd7phzh1lanqqvkb1phr4fx6qnn5icj9hlm";
};
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
--replace "/bin/echo" "echo"
'';
cargoSha256 = "19j7z0223f1yqhdgxgmzrl3ypx6d79lgccdacsmgnd8wgwxx05zg";
cargoSha256 = "0391l44rqshjz62658mfl58c2npv7k11l4lb4kk9gb3ywdhbjv26";
checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root";
meta = with stdenv.lib; {

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