nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix

Merge branch 'master' into staging-next

Hydra nixpkgs: ?compare=1548439

+2555 -1217
+17
maintainers/maintainer-list.nix
··· 2637 2637 githubId = 1401179; 2638 2638 name = "Guanpeng Xu"; 2639 2639 }; 2640 + hexa = { 2641 + github = "mweinelt"; 2642 + githubId = 131599; 2643 + name = "Martin Weinelt"; 2644 + }; 2640 2645 hhm = { 2641 2646 email = "heehooman+nixpkgs@gmail.com"; 2642 2647 github = "hhm0"; ··· 3276 3271 githubId = 8460; 3277 3272 name = "John Wiegley"; 3278 3273 }; 3274 + jwijenbergh = { 3275 + email = "jeroenwijenbergh@protonmail.com"; 3276 + github = "jwijenbergh"; 3277 + githubId = 46386452; 3278 + name = "Jeroen Wijenbergh"; 3279 + }; 3279 3280 jwilberding = { 3280 3281 email = "jwilberding@afiniate.com"; 3281 3282 name = "Jordan Wilberding"; ··· 3323 3312 karolchmist = { 3324 3313 email = "info+nix@chmist.com"; 3325 3314 name = "karolchmist"; 3315 + }; 3316 + kayhide = { 3317 + email = "kayhide@gmail.com"; 3318 + github = "kayhide"; 3319 + githubId = 1730718; 3320 + name = "Hideaki Kawai"; 3326 3321 }; 3327 3322 kazcw = { 3328 3323 email = "kaz@lambdaverse.org";
+1 -2
nixos/modules/config/pulseaudio.nix
··· 51 51 # that we can disable the autospawn feature in programs that 52 52 # are built with PulseAudio support (like KDE). 53 53 clientConf = writeText "client.conf" '' 54 - autospawn=${if nonSystemWide then "yes" else "no"} 55 - ${optionalString nonSystemWide "daemon-binary=${binary}"} 54 + autospawn=no 56 55 ${cfg.extraClientConf} 57 56 ''; 58 57
+7
nixos/modules/hardware/steam-hardware.nix
··· 21 21 services.udev.packages = [ 22 22 pkgs.steamPackages.steam 23 23 ]; 24 + 25 + # The uinput module needs to be loaded in order to trigger the udev rules 26 + # defined in the steam package for setting permissions on /dev/uinput. 27 + # 28 + # If the udev rules are not triggered, some controllers won't work with 29 + # steam. 30 + boot.kernelModules = [ "uinput" ]; 24 31 }; 25 32 }
+1
nixos/modules/module-list.nix
··· 806 806 ./services/web-apps/restya-board.nix 807 807 ./services/web-apps/tt-rss.nix 808 808 ./services/web-apps/selfoss.nix 809 + ./services/web-apps/shiori.nix 809 810 ./services/web-apps/virtlyst.nix 810 811 ./services/web-apps/wordpress.nix 811 812 ./services/web-apps/youtrack.nix
+21
nixos/modules/profiles/hardened.nix
··· 52 52 "ax25" 53 53 "netrom" 54 54 "rose" 55 + 56 + # Old or rare or insufficiently audited filesystems 57 + "adfs" 58 + "affs" 59 + "bfs" 60 + "befs" 61 + "cramfs" 62 + "efs" 63 + "erofs" 64 + "exofs" 65 + "freevxfs" 66 + "f2fs" 67 + "hfs" 68 + "hpfs" 69 + "jfs" 70 + "minix" 71 + "nilfs2" 72 + "qnx4" 73 + "qnx6" 74 + "sysv" 75 + "ufs" 55 76 ]; 56 77 57 78 # Restrict ptrace() usage to processes with a pre-defined relationship
+1
nixos/modules/services/network-filesystems/samba.nix
··· 45 45 daemonService = appName: args: 46 46 { description = "Samba Service Daemon ${appName}"; 47 47 48 + after = [ "network.target" ]; 48 49 requiredBy = [ "samba.target" ]; 49 50 partOf = [ "samba.target" ]; 50 51
+50
nixos/modules/services/web-apps/shiori.nix
··· 1 + { config, lib, pkgs, ... }: 2 + 3 + with lib; 4 + let 5 + cfg = config.services.shiori; 6 + in { 7 + options = { 8 + services.shiori = { 9 + enable = mkEnableOption "Shiori simple bookmarks manager"; 10 + 11 + package = mkOption { 12 + type = types.package; 13 + default = pkgs.shiori; 14 + defaultText = "pkgs.shiori"; 15 + description = "The Shiori package to use."; 16 + }; 17 + 18 + address = mkOption { 19 + type = types.str; 20 + default = ""; 21 + description = '' 22 + The IP address on which Shiori will listen. 23 + If empty, listens on all interfaces. 24 + ''; 25 + }; 26 + 27 + port = mkOption { 28 + type = types.port; 29 + default = 8080; 30 + description = "The port of the Shiori web application"; 31 + }; 32 + }; 33 + }; 34 + 35 + config = mkIf cfg.enable { 36 + systemd.services.shiori = with cfg; { 37 + description = "Shiori simple bookmarks manager"; 38 + wantedBy = [ "multi-user.target" ]; 39 + 40 + serviceConfig = { 41 + ExecStart = "${package}/bin/shiori serve --address '${address}' --port '${toString port}'"; 42 + DynamicUser = true; 43 + Environment = "SHIORI_DIR=/var/lib/shiori"; 44 + StateDirectory = "shiori"; 45 + }; 46 + }; 47 + }; 48 + 49 + meta.maintainers = with maintainers; [ minijackson ]; 50 + }
+3 -2
nixos/modules/services/x11/display-managers/lightdm.nix
··· 220 220 exec ${lightdm}/sbin/lightdm 221 221 ''; 222 222 223 - # Replaces getty and plymouth quit since it quits plymouth on it's own. 223 + # Replaces getty 224 224 systemd.services.display-manager.conflicts = [ 225 225 "getty@tty7.service" 226 - "plymouth-quit.service" 226 + # TODO: Add "plymouth-quit.service" so LightDM can control when plymouth 227 + # quits. Currently this breaks switching to configurations with plymouth. 227 228 ]; 228 229 229 230 # Pull in dependencies of services we replace.
+16 -6
nixos/modules/system/boot/systemd-nspawn.nix
··· 113 113 config = 114 114 let 115 115 units = mapAttrs' (n: v: let nspawnFile = "${n}.nspawn"; in nameValuePair nspawnFile (instanceToUnit nspawnFile v)) cfg; 116 - in mkIf (cfg != {}) { 116 + in 117 + mkMerge [ 118 + (mkIf (cfg != {}) { 119 + environment.etc."systemd/nspawn".source = mkIf (cfg != {}) (generateUnits "nspawn" units [] []); 120 + }) 121 + { 122 + systemd.targets.multi-user.wants = [ "machines.target" ]; 117 123 118 - environment.etc."systemd/nspawn".source = generateUnits "nspawn" units [] []; 119 - 120 - systemd.targets.multi-user.wants = [ "machines.target" ]; 121 - }; 122 - 124 + # Workaround for https://github.com/NixOS/nixpkgs/pull/67232#issuecomment-531315437 and https://github.com/systemd/systemd/issues/13622 125 + # Once systemd fixes this upstream, we can re-enable -U 126 + systemd.services."systemd-nspawn@".serviceConfig.ExecStart = [ 127 + "" # deliberately empty. signals systemd to override the ExecStart 128 + # Only difference between upstream is that we do not pass the -U flag 129 + "${pkgs.systemd}/bin/systemd-nspawn --quiet --keep-unit --boot --link-journal=try-guest --network-veth --settings=override --machine=%i" 130 + ]; 131 + } 132 + ]; 123 133 }
+1
nixos/tests/all-tests.nix
··· 25 25 atd = handleTest ./atd.nix {}; 26 26 automysqlbackup = handleTest ./automysqlbackup.nix {}; 27 27 avahi = handleTest ./avahi.nix {}; 28 + babeld = handleTest ./babeld.nix {}; 28 29 bcachefs = handleTestOn ["x86_64-linux"] ./bcachefs.nix {}; # linux-4.18.2018.10.12 is unsupported on aarch64 29 30 beanstalkd = handleTest ./beanstalkd.nix {}; 30 31 beegfs = handleTestOn ["x86_64-linux"] ./beegfs.nix {}; # beegfs is unsupported on aarch64
+148
nixos/tests/babeld.nix
··· 1 + 2 + import ./make-test.nix ({ pkgs, lib, ...} : { 3 + name = "babeld"; 4 + meta = with pkgs.stdenv.lib.maintainers; { 5 + maintainers = [ hexa ]; 6 + }; 7 + 8 + nodes = 9 + { client = { pkgs, lib, ... }: 10 + { 11 + virtualisation.vlans = [ 10 ]; 12 + 13 + networking = { 14 + useDHCP = false; 15 + interfaces."eth1" = { 16 + ipv4.addresses = lib.mkForce [ { address = "192.168.10.2"; prefixLength = 24; } ]; 17 + ipv4.routes = lib.mkForce [ { address = "0.0.0.0"; prefixLength = 0; via = "192.168.10.1"; } ]; 18 + ipv6.addresses = lib.mkForce [ { address = "2001:db8:10::2"; prefixLength = 64; } ]; 19 + ipv6.routes = lib.mkForce [ { address = "::"; prefixLength = 0; via = "2001:db8:10::1"; } ]; 20 + }; 21 + }; 22 + }; 23 + 24 + localRouter = { pkgs, lib, ... }: 25 + { 26 + virtualisation.vlans = [ 10 20 ]; 27 + 28 + boot.kernel.sysctl."net.ipv4.conf.all.forwarding" = 1; 29 + boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = 1; 30 + 31 + networking = { 32 + useDHCP = false; 33 + firewall.enable = false; 34 + 35 + interfaces."eth1" = { 36 + ipv4.addresses = lib.mkForce [ { address = "192.168.10.1"; prefixLength = 24; } ]; 37 + ipv6.addresses = lib.mkForce [ { address = "2001:db8:10::1"; prefixLength = 64; } ]; 38 + }; 39 + 40 + interfaces."eth2" = { 41 + ipv4.addresses = lib.mkForce [ { address = "192.168.20.1"; prefixLength = 24; } ]; 42 + ipv6.addresses = lib.mkForce [ { address = "2001:db8:20::1"; prefixLength = 64; } ]; 43 + }; 44 + }; 45 + 46 + services.babeld = { 47 + enable = true; 48 + interfaces.eth2 = { 49 + hello-interval = 1; 50 + type = "wired"; 51 + }; 52 + extraConfig = '' 53 + local-port-readwrite 33123 54 + 55 + import-table 254 # main 56 + export-table 254 # main 57 + 58 + in ip 192.168.10.0/24 deny 59 + in ip 192.168.20.0/24 deny 60 + in ip 2001:db8:10::/64 deny 61 + in ip 2001:db8:20::/64 deny 62 + 63 + in ip 192.168.30.0/24 allow 64 + in ip 2001:db8:30::/64 allow 65 + 66 + in deny 67 + 68 + redistribute local proto 2 69 + redistribute local deny 70 + ''; 71 + }; 72 + }; 73 + remoteRouter = { pkgs, lib, ... }: 74 + { 75 + virtualisation.vlans = [ 20 30 ]; 76 + 77 + boot.kernel.sysctl."net.ipv4.conf.all.forwarding" = 1; 78 + boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = 1; 79 + 80 + networking = { 81 + useDHCP = false; 82 + firewall.enable = false; 83 + 84 + interfaces."eth1" = { 85 + ipv4.addresses = lib.mkForce [ { address = "192.168.20.2"; prefixLength = 24; } ]; 86 + ipv6.addresses = lib.mkForce [ { address = "2001:db8:20::2"; prefixLength = 64; } ]; 87 + }; 88 + 89 + interfaces."eth2" = { 90 + ipv4.addresses = lib.mkForce [ { address = "192.168.30.1"; prefixLength = 24; } ]; 91 + ipv6.addresses = lib.mkForce [ { address = "2001:db8:30::1"; prefixLength = 64; } ]; 92 + }; 93 + }; 94 + 95 + services.babeld = { 96 + enable = true; 97 + interfaces.eth1 = { 98 + hello-interval = 1; 99 + type = "wired"; 100 + }; 101 + extraConfig = '' 102 + local-port-readwrite 33123 103 + 104 + import-table 254 # main 105 + export-table 254 # main 106 + 107 + in ip 192.168.20.0/24 deny 108 + in ip 192.168.30.0/24 deny 109 + in ip 2001:db8:20::/64 deny 110 + in ip 2001:db8:30::/64 deny 111 + 112 + in ip 192.168.10.0/24 allow 113 + in ip 2001:db8:10::/64 allow 114 + 115 + in deny 116 + 117 + redistribute local proto 2 118 + redistribute local deny 119 + ''; 120 + }; 121 + 122 + }; 123 + }; 124 + 125 + testScript = 126 + '' 127 + startAll; 128 + 129 + $client->waitForUnit("network-online.target"); 130 + $localRouter->waitForUnit("network-online.target"); 131 + $remoteRouter->waitForUnit("network-online.target"); 132 + 133 + $localRouter->waitForUnit("babeld.service"); 134 + $remoteRouter->waitForUnit("babeld.service"); 135 + 136 + $localRouter->waitUntilSucceeds("ip route get 192.168.30.1"); 137 + $localRouter->waitUntilSucceeds("ip route get 2001:db8:30::1"); 138 + 139 + $remoteRouter->waitUntilSucceeds("ip route get 192.168.10.1"); 140 + $remoteRouter->waitUntilSucceeds("ip route get 2001:db8:10::1"); 141 + 142 + $client->succeed("ping -c1 192.168.30.1"); 143 + $client->succeed("ping -c1 2001:db8:30::1"); 144 + 145 + $remoteRouter->succeed("ping -c1 192.168.10.2"); 146 + $remoteRouter->succeed("ping -c1 2001:db8:10::2"); 147 + ''; 148 + })
+17
nixos/tests/shiori.nix
··· 1 + import ./make-test.nix ({ lib, ...}: 2 + 3 + { 4 + name = "shiori"; 5 + meta.maintainers = with lib.maintainers; [ minijackson ]; 6 + 7 + machine = 8 + { ... }: 9 + { services.shiori.enable = true; }; 10 + 11 + testScript = '' 12 + $machine->waitForUnit('shiori.service'); 13 + $machine->waitForOpenPort('8080'); 14 + $machine->succeed("curl --fail http://localhost:8080/"); 15 + $machine->succeed("curl --fail --location http://localhost:8080/ | grep -qi shiori"); 16 + ''; 17 + })
+27
pkgs/applications/audio/spotify-tui/default.nix
··· 1 + { stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, Security }: 2 + 3 + rustPlatform.buildRustPackage rec { 4 + pname = "spotify-tui"; 5 + version = "0.5.0"; 6 + 7 + src = fetchFromGitHub { 8 + owner = "Rigellute"; 9 + repo = "spotify-tui"; 10 + rev = "v${version}"; 11 + sha256 = "1spnr67fb2wjjf9sfkk3vps6q45w0zrk47an79bhv4imziy4dbs3"; 12 + }; 13 + 14 + cargoSha256 = "029g80mcqvmckszpbzm4hxs5w63n41ah4rc1b93i9c1nzvncd811"; 15 + 16 + nativeBuildInputs = [ pkgconfig ]; 17 + buildInputs = [ openssl ] 18 + ++ stdenv.lib.optional stdenv.isDarwin Security; 19 + 20 + meta = with stdenv.lib; { 21 + description = "Spotify for the terminal written in Rust"; 22 + homepage = https://github.com/Rigellute/spotify-tui; 23 + license = licenses.mit; 24 + maintainers = with maintainers; [ jwijenbergh ]; 25 + platforms = platforms.all; 26 + }; 27 + }
+2 -2
pkgs/applications/blockchains/go-ethereum.nix
··· 2 2 3 3 buildGoPackage rec { 4 4 pname = "go-ethereum"; 5 - version = "1.9.5"; 5 + version = "1.9.6"; 6 6 7 7 goPackagePath = "github.com/ethereum/go-ethereum"; 8 8 ··· 17 17 owner = "ethereum"; 18 18 repo = pname; 19 19 rev = "v${version}"; 20 - sha256 = "1h1c02dgazlcgp9lrm0zsig80nfj0c9553jy9nsvjyzf95ym1542"; 20 + sha256 = "08k6p7mbszlg8mq8k3vi5xrfnhfbxlh2ynd0nr0j64qdhmhcdnq6"; 21 21 }; 22 22 23 23 meta = with stdenv.lib; {
+15 -12
pkgs/applications/blockchains/pivx.nix
··· 1 - { fetchFromGitHub, stdenv, pkgconfig, autoreconfHook 2 - , openssl, db48, boost, zlib, miniupnpc, gmp 1 + { fetchFromGitHub, stdenv, pkgconfig, autoreconfHook, wrapQtAppsHook ? null 2 + , openssl_1_0_2, db48, boost, zlib, miniupnpc, gmp 3 3 , qrencode, glib, protobuf, yasm, libevent 4 4 , utillinux, qtbase ? null, qttools ? null 5 5 , enableUpnp ? false ··· 9 9 10 10 with stdenv.lib; 11 11 stdenv.mkDerivation rec { 12 - pname = "pivx"; 13 - version = "3.2.0"; 12 + name = "pivx-${version}"; 13 + version = "3.4.0"; 14 14 15 15 src = fetchFromGitHub { 16 16 owner = "PIVX-Project"; 17 17 repo= "PIVX"; 18 18 rev = "v${version}"; 19 - sha256 = "1sym6254vhq8qqpxq9qhy10m5167v7x93kqaj1gixc1vwwbxyazy"; 19 + sha256 = "1fqccdqhbwyvix0ihhbgg2w048i6bhfmazr36h2cn4j65n1fgmi2"; 20 20 }; 21 21 22 - nativeBuildInputs = [ pkgconfig autoreconfHook ]; 23 - buildInputs = [ glib gmp openssl db48 yasm boost zlib libevent miniupnpc protobuf utillinux ] 22 + nativeBuildInputs = [ pkgconfig autoreconfHook ] ++ optionals withGui [ wrapQtAppsHook ]; 23 + buildInputs = [ glib gmp openssl_1_0_2 db48 yasm boost zlib libevent miniupnpc protobuf utillinux ] 24 24 ++ optionals withGui [ qtbase qttools qrencode ]; 25 25 26 26 configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] ··· 28 28 ++ optional disableWallet "--disable-wallet" 29 29 ++ optional disableDaemon "--disable-daemon" 30 30 ++ optionals withGui [ "--with-gui=yes" 31 + "--with-unsupported-ssl" # TODO remove this ASAP 31 32 "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" 32 33 ]; 33 34 ··· 38 37 mkdir -p $out/share/applications $out/share/icons 39 38 cp contrib/debian/pivx-qt.desktop $out/share/applications/ 40 39 cp share/pixmaps/*128.png $out/share/icons/ 40 + ''; 41 + 42 + doInstallCheck = true; 43 + installCheckPhase = '' 44 + $out/bin/test_pivx 41 45 ''; 42 46 43 47 meta = with stdenv.lib; { ··· 56 50 homepage = https://www.dash.org; 57 51 maintainers = with maintainers; [ wucke13 ]; 58 52 platforms = platforms.unix; 59 - 53 + # TODO 60 54 # upstream doesn't support newer openssl versions 61 55 # https://github.com/PIVX-Project/PIVX/issues/748 62 - # "Your system is most probably using openssl 1.1 which is not the 63 - # officialy supported version. Either use 1.0.1 or run again configure 64 - # with the given option." 65 - broken = true; 56 + # openssl_1_0_2 should be replaced with openssl ASAP 66 57 }; 67 58 }
+16 -16
pkgs/applications/editors/ne/default.nix
··· 1 1 { stdenv, fetchFromGitHub, ncurses, texinfo, texlive, perl, ghostscript }: 2 2 3 - 4 3 stdenv.mkDerivation rec { 5 4 pname = "ne"; 6 - version = "3.1.2"; 5 + version = "3.2.1"; 6 + 7 7 src = fetchFromGitHub { 8 8 owner = "vigna"; 9 - repo = "ne"; 9 + repo = pname; 10 10 rev = version; 11 - sha256 = "154grh9gdzydnqn9xxj7zpia9cc5x6a7y1g73vwizr9bkg92l5cc"; 11 + sha256 = "0h6d08cnwrk96ss83i9bragwwanph6x54sm3ak1z81146dsqsiif"; 12 12 }; 13 - buildInputs = [ ncurses texlive.combined.scheme-medium texinfo perl ghostscript ]; 14 - dontBuild = true; 15 - installPhase = '' 16 - substituteInPlace src/makefile --replace "CC=c99" "cc=gcc" 17 - substituteInPlace src/makefile --replace "-lcurses" "-lncurses" 13 + 14 + postPatch = '' 18 15 substituteInPlace makefile --replace "./version.pl" "perl version.pl" 19 - cd doc && make && cd .. 20 - cd src && make && cd .. 21 - make PREFIX=$out install 16 + substituteInPlace src/makefile --replace "-lcurses" "-lncurses" 22 17 ''; 23 18 24 - meta = { 19 + nativeBuildInputs = [ texlive.combined.scheme-medium texinfo perl ghostscript ]; 20 + buildInputs = [ ncurses ]; 21 + 22 + makeFlags = [ "PREFIX=${placeholder "out"}" ]; 23 + 24 + meta = with stdenv.lib; { 25 25 description = "The nice editor"; 26 - homepage = https://github.com/vigna/ne; 26 + homepage = "http://ne.di.unimi.it/"; 27 27 longDescription = '' 28 28 ne is a free (GPL'd) text editor based on the POSIX standard that runs 29 29 (we hope) on almost any UN*X machine. ne is easy to use for the beginner, 30 30 but powerful and fully configurable for the wizard, and most sparing in its 31 31 resource usage. See the manual for some highlights of ne's features. 32 32 ''; 33 - license = stdenv.lib.licenses.gpl3; 34 - platforms = stdenv.lib.platforms.unix; 33 + license = licenses.gpl3; 34 + platforms = platforms.unix; 35 35 }; 36 36 }
+3 -3
pkgs/applications/editors/vscode/vscodium.nix
··· 11 11 archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; 12 12 13 13 sha256 = { 14 - x86_64-linux = "15m7mfb8gmx3pwydc37blj0rxwgmkrnqfj6y79rpqlr2dg92gwlb"; 15 - x86_64-darwin = "080k4fnfa5ylmmya6zprgci3gld9mrbqsfnk53hgcny91ykl5xj5"; 14 + x86_64-linux = "1vhrfz36ay67laa5159jcnxyl4prgm8v1mp6anv1s7bppazigg2n"; 15 + x86_64-darwin = "0cxsl0qpk223khndfwwgxl8az4rz4ap657yrkvws9bh8k4vv473h"; 16 16 }.${system}; 17 17 18 18 sourceRoot = { ··· 23 23 callPackage ./generic.nix rec { 24 24 inherit sourceRoot; 25 25 26 - version = "1.38.1"; 26 + version = "1.39.1"; 27 27 pname = "vscodium"; 28 28 29 29 executableName = "codium";
+2 -2
pkgs/applications/misc/cherrytree/default.nix
··· 4 4 stdenv.mkDerivation rec { 5 5 6 6 pname = "cherrytree"; 7 - version = "0.38.8"; 7 + version = "0.38.9"; 8 8 9 9 src = fetchurl { 10 10 url = "https://www.giuspen.com/software/${pname}-${version}.tar.xz"; 11 - sha256 = "1ns87xl2sgrf3nha4xkhp0xcxlycqszlp6xdrn95lg6vzm0fa8dg"; 11 + sha256 = "0xal09ijgxbzvp003s40xbrfnpq3ald1fw8nnpqq3yg7h6g6c5pw"; 12 12 }; 13 13 14 14 buildInputs = with pythonPackages;
+7 -7
pkgs/applications/misc/copyq/default.nix
··· 1 - { stdenv, fetchFromGitHub, cmake, qtbase, qtscript, qtwebkit, libXfixes, libXtst 2 - , qtx11extras, git 1 + { lib, mkDerivation, fetchFromGitHub, cmake 2 + , qtbase, qtscript, qtwebkit, libXfixes, libXtst, qtx11extras, git 3 3 , webkitSupport ? true 4 4 }: 5 5 6 - stdenv.mkDerivation rec { 6 + mkDerivation rec { 7 7 pname = "CopyQ"; 8 - version = "3.9.0"; 8 + version = "3.9.2"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "hluk"; 12 12 repo = "CopyQ"; 13 13 rev = "v${version}"; 14 - sha256 = "1l9f0hg2ggy944sjlyiyglln5mjm9fvgmvwp3pnvmmc6mfbmslq3"; 14 + sha256 = "02zs444i7hnqishs1i6vp8ffjxlxk3xkrw935pdwnwppv9s9v202"; 15 15 }; 16 16 17 17 nativeBuildInputs = [ cmake ]; 18 18 19 19 buildInputs = [ 20 20 git qtbase qtscript libXfixes libXtst qtx11extras 21 - ] ++ stdenv.lib.optional webkitSupport qtwebkit; 21 + ] ++ lib.optional webkitSupport qtwebkit; 22 22 23 - meta = with stdenv.lib; { 23 + meta = with lib; { 24 24 homepage = https://hluk.github.io/CopyQ; 25 25 description = "Clipboard Manager with Advanced Features"; 26 26 license = licenses.gpl3;
+2 -2
pkgs/applications/misc/krusader/default.nix
··· 6 6 7 7 let 8 8 pname = "krusader"; 9 - version = "2.7.1"; 9 + version = "2.7.2"; 10 10 in mkDerivation rec { 11 11 pname = "krusader"; 12 12 inherit version; 13 13 14 14 src = fetchurl { 15 15 url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz"; 16 - sha256 = "1svxj1qygyr3a4dkx0nh2d6r4q7pfj00brzghl94mf4q0rz4vhfm"; 16 + sha256 = "02b1jz5a7cjr13v6c7fczrhs1xmg1krnva5fxk8x2bf4nd1rm8s1"; 17 17 }; 18 18 19 19 meta = with lib; {
+1 -1
pkgs/applications/misc/qlcplus/default.nix
··· 40 40 maintainers = [ maintainers.globin ]; 41 41 license = licenses.asl20; 42 42 platforms = platforms.all; 43 - homepage = "http://www.qlcplus.org/"; 43 + homepage = "https://www.qlcplus.org/"; 44 44 }; 45 45 }
+3 -12
pkgs/applications/misc/tilix/default.nix
··· 20 20 21 21 stdenv.mkDerivation { 22 22 pname = "tilix"; 23 - version = "unstable-2019-08-03"; 23 + version = "unstable-2019-10-02"; 24 24 25 25 src = fetchFromGitHub { 26 26 owner = "gnunn1"; 27 27 repo = "tilix"; 28 - rev = "09ec4e8e113703ca795946d8d2a83091e7b741e4"; 29 - sha256 = "1vvp6l25xygzhbhscg8scik8y59nl8a92ri024ijk0c0lclga05m"; 28 + rev = "ffcd31e3c0e1a560ce89468152d8726065e8fb1f"; 29 + sha256 = "1bzv7xiqhyblz1rw8ln4zpspmml49vnshn1zsv9di5q7kfgpqrgq"; 30 30 }; 31 31 32 32 # Default upstream else LDC fails to link ··· 52 52 gtkd 53 53 libsecret 54 54 libunwind 55 - ]; 56 - 57 - patches = [ 58 - # Depends on libsecret optionally 59 - # https://github.com/gnunn1/tilix/pull/1745 60 - (fetchpatch { 61 - url = "https://github.com/gnunn1/tilix/commit/e38dd182bfb92419d70434926ef9c0530189aab8.patch"; 62 - sha256 = "1ws4iyzi67crzlp9p7cw8jr752b3phcg5ymx5aj0bh6321g38kfk"; 63 - }) 64 55 ]; 65 56 66 57 postPatch = ''
+1 -1
pkgs/applications/misc/zathura/wrapper.nix
··· 17 17 ''; 18 18 19 19 meta = with lib; { 20 - homepage = https://pwmt.org/projects/zathura/; 20 + homepage = https://git.pwmt.org/pwmt/zathura/; 21 21 description = "A highly customizable and functional PDF viewer"; 22 22 longDescription = '' 23 23 Zathura is a highly customizable and functional PDF viewer based on the
+9
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
··· 44 44 , shared-mime-info 45 45 , gsettings-desktop-schemas 46 46 47 + # Hardening 48 + , graphene-hardened-malloc 49 + , useHardenedMalloc ? graphene-hardened-malloc != null && builtins.elem stdenv.system graphene-hardened-malloc.meta.platforms 50 + 47 51 # Whether to disable multiprocess support to work around crashing tabs 48 52 # TODO: fix the underlying problem instead of this terrible work-around 49 53 , disableContentSandbox ? true ··· 249 245 GeoIPv6File $TBB_IN_STORE/TorBrowser/Data/Tor/geoip6 250 246 EOF 251 247 248 + WRAPPER_LD_PRELOAD=${optionalString useHardenedMalloc 249 + "${graphene-hardened-malloc}/lib/libhardened_malloc.so"} 250 + 252 251 WRAPPER_XDG_DATA_DIRS=${concatMapStringsSep ":" (x: "${x}/share") [ 253 252 gnome3.adwaita-icon-theme 254 253 shared-mime-info ··· 334 327 # 335 328 # XDG_DATA_DIRS is set to prevent searching system dirs (looking for .desktop & icons) 336 329 exec env -i \ 330 + LD_PRELOAD=$WRAPPER_LD_PRELOAD \ 331 + \ 337 332 TZ=":" \ 338 333 TZDIR="\''${TZDIR:-}" \ 339 334 LOCALE_ARCHIVE="\$LOCALE_ARCHIVE" \
+1 -2
pkgs/applications/networking/browsers/vivaldi/default.nix
··· 82 82 --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ \ 83 83 ${stdenv.lib.optionalString enableWidevine "--suffix LD_LIBRARY_PATH : ${libPath}"} 84 84 '' + stdenv.lib.optionalString enableWidevine '' 85 - rm $out/opt/${vivaldiName}/libwidevinecdm.so 86 - ln -s ${vivaldi-widevine}/lib/libwidevinecdm.so $out/opt/${vivaldiName}/libwidevinecdm.so 85 + ln -sf ${vivaldi-widevine}/lib/libwidevinecdm.so $out/opt/${vivaldiName}/libwidevinecdm.so 87 86 ''; 88 87 89 88 meta = with stdenv.lib; {
+3 -2
pkgs/applications/networking/cluster/argo/default.nix
··· 2 2 3 3 buildGoPackage rec { 4 4 pname = "argo"; 5 - version = "2.2.1"; 5 + version = "2.4.1"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "argoproj"; 9 9 repo = "argo"; 10 10 rev = "v${version}"; 11 - sha256 = "0x3aizwbqkg2712021wcq4chmwjhw2df702wbr6zd2a2cdypwb67"; 11 + sha256 = "1f9l9d4r0qfhpr2fn17faczcwmwmdz8f56f27cmmnhxz4r7qcm48"; 12 12 }; 13 13 14 14 goDeps = ./deps.nix; 15 15 goPackagePath = "github.com/argoproj/argo"; 16 + subPackages = [ "cmd/argo" ]; 16 17 17 18 meta = with lib; { 18 19 description = "Container native workflow engine for Kubernetes";
+373 -157
pkgs/applications/networking/cluster/argo/deps.nix
··· 5 5 fetch = { 6 6 type = "git"; 7 7 url = "https://code.googlesource.com/gocloud"; 8 - rev = "64a2037ec6be8a4b0c1d1f706ed35b428b989239"; 9 - sha256 = "149v3ci17g6wd2pm18mzcncq5qpl9hwdjnz3rlbn5rfidyn46la1"; 8 + rev = "ceeb313ad77b789a7fa5287b36a1d127b69b7093"; 9 + sha256 = "0z5z3qag9g4fc7g6di7ijxzz0s3c7al1rx0sxxkbqbpwlgk4iwf2"; 10 + }; 11 + } 12 + { 13 + goPackagePath = "contrib.go.opencensus.io/exporter/ocagent"; 14 + fetch = { 15 + type = "git"; 16 + url = "https://github.com/census-ecosystem/opencensus-go-exporter-ocagent"; 17 + rev = "f9129169651c35ecbdc1186c3ba4aa876ee62e1e"; 18 + sha256 = "09n7w31668f6f55qw6qkw85mp6mhkmxs2x5hk4vr0p5qiqap576h"; 19 + }; 20 + } 21 + { 22 + goPackagePath = "github.com/Azure/go-autorest"; 23 + fetch = { 24 + type = "git"; 25 + url = "https://github.com/Azure/go-autorest"; 26 + rev = "880eb0e2aca291c40538ddef66e5914fb1cc1d7f"; 27 + sha256 = "0v6d6la29n3kkgn7r3b63pf96cpj5kf88rddkm2x2vqb9x2gmi0p"; 10 28 }; 11 29 } 12 30 { ··· 41 23 fetch = { 42 24 type = "git"; 43 25 url = "https://github.com/PuerkitoBio/purell"; 44 - rev = "0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4"; 45 - sha256 = "0vsxyn1fbm7g873b8kf3hcsgqgncb5nmfq3zfsc35a9yhzarka91"; 26 + rev = "44968752391892e1b0d0b821ee79e9a85fa13049"; 27 + sha256 = "0c525frsxmalrn55hzzsxy17ng8avkd40ga0wxfw9haxsdjgqdqy"; 46 28 }; 47 29 } 48 30 { ··· 59 41 fetch = { 60 42 type = "git"; 61 43 url = "https://github.com/argoproj/pkg"; 62 - rev = "1aa3e0c55668da17703adba5c534fff6930db589"; 63 - sha256 = "0lr1dimm443qq3zzcrpialvxq9bl8pb3317zn34gmf1sycqh4iii"; 44 + rev = "5616f48963eebf7cca912632230032b263bb62bc"; 45 + sha256 = "1m50mpmgdv4hjdpl994xdkdbjfwv7dagn6mhix17cb5mf61ixs6z"; 46 + }; 47 + } 48 + { 49 + goPackagePath = "github.com/aws/aws-sdk-go"; 50 + fetch = { 51 + type = "git"; 52 + url = "https://github.com/aws/aws-sdk-go"; 53 + rev = "d57c8d96f72d9475194ccf18d2ba70ac294b0cb3"; 54 + sha256 = "09bv2ay7vnv15vj83ysqs98v0hcjg0nziwnp7qjdr0iasrhl4r21"; 64 55 }; 65 56 } 66 57 { ··· 77 50 fetch = { 78 51 type = "git"; 79 52 url = "https://github.com/beorn7/perks"; 80 - rev = "3a771d992973f24aa725d07868b467d1ddfceafb"; 81 - sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; 53 + rev = "37c8de3658fcb183f997c4e13e8337516ab753e6"; 54 + sha256 = "17n4yygjxa6p499dj3yaqzfww2g7528165cl13haj97hlx94dgl7"; 55 + }; 56 + } 57 + { 58 + goPackagePath = "github.com/census-instrumentation/opencensus-proto"; 59 + fetch = { 60 + type = "git"; 61 + url = "https://github.com/census-instrumentation/opencensus-proto"; 62 + rev = "d89fa54de508111353cb0b06403c00569be780d8"; 63 + sha256 = "19fcx3sc99i5dsklny6r073z5j20vlwn2xqm6di1q3b1xwchzqfj"; 64 + }; 65 + } 66 + { 67 + goPackagePath = "github.com/colinmarc/hdfs"; 68 + fetch = { 69 + type = "git"; 70 + url = "https://github.com/colinmarc/hdfs"; 71 + rev = "9746310a4d311e21ce43b2a645c5a1e64c5e8efa"; 72 + sha256 = "0r5dyadjck22i7fyci67r00ajbcqgx52z13rhriy0sw68j510r1r"; 82 73 }; 83 74 } 84 75 { ··· 104 59 fetch = { 105 60 type = "git"; 106 61 url = "https://github.com/davecgh/go-spew"; 107 - rev = "346938d642f2ec3594ed81d874461961cd0faa76"; 108 - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; 62 + rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73"; 63 + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; 64 + }; 65 + } 66 + { 67 + goPackagePath = "github.com/dgrijalva/jwt-go"; 68 + fetch = { 69 + type = "git"; 70 + url = "https://github.com/dgrijalva/jwt-go"; 71 + rev = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"; 72 + sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; 109 73 }; 110 74 } 111 75 { ··· 122 68 fetch = { 123 69 type = "git"; 124 70 url = "https://github.com/docker/spdystream"; 125 - rev = "bc6354cbbc295e925e4c611ffe90c1f287ee54db"; 126 - sha256 = "08746a15snvmax6cnzn2qy7cvsspxbsx97vdbjpdadir3pypjxya"; 71 + rev = "6480d4af844c189cf5dd913db24ddd339d3a4f85"; 72 + sha256 = "19glzj20vvy19igsl5bji9xrxi9m0ixhk4zs98dg15mh8ah36zak"; 127 73 }; 128 74 } 129 75 { ··· 140 86 fetch = { 141 87 type = "git"; 142 88 url = "https://github.com/emicklei/go-restful"; 143 - rev = "3eb9738c1697594ea6e71a7156a9bb32ed216cf0"; 144 - sha256 = "1zqcjhg4q7788hyrkhwg4b6r1vc4qnzbw8c5j994mr18x42brxzg"; 89 + rev = "6ac3b8eb89d325e5c750d77f344a6870464d03c3"; 90 + sha256 = "0dgjld5240xhz45rj929ffm452n931qfw3fx8x99vhlnii9qrwz2"; 145 91 }; 146 92 } 147 93 { ··· 149 95 fetch = { 150 96 type = "git"; 151 97 url = "https://github.com/emirpasic/gods"; 152 - rev = "f6c17b524822278a87e3b3bd809fec33b51f5b46"; 153 - sha256 = "1zhkppqzy149fp561pif8d5d92jd9chl3l9z4yi5f8n60ibdmmjf"; 98 + rev = "1615341f118ae12f353cc8a983f35b584342c9b3"; 99 + sha256 = "0i5qqq7ajvw3mikr95zl9rsnfsjanzwpqqs6kzzplsfgsifybar1"; 154 100 }; 155 101 } 156 102 { ··· 158 104 fetch = { 159 105 type = "git"; 160 106 url = "https://github.com/evanphx/json-patch"; 161 - rev = "afac545df32f2287a079e2dfb7ba2745a643747e"; 162 - sha256 = "1d90prf8wfvndqjn6nr0k405ykia5vb70sjw4ywd49s9p3wcdyn8"; 163 - }; 164 - } 165 - { 166 - goPackagePath = "github.com/fsnotify/fsnotify"; 167 - fetch = { 168 - type = "git"; 169 - url = "https://github.com/fsnotify/fsnotify"; 170 - rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"; 171 - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; 107 + rev = "026c730a0dcc5d11f93f1cf1cc65b01247ea7b6f"; 108 + sha256 = "144mk2v9q37l1qjf8498nff4hhz96mlkl7ls7ihixbmrji4lmch4"; 172 109 }; 173 110 } 174 111 { ··· 167 122 fetch = { 168 123 type = "git"; 169 124 url = "https://github.com/ghodss/yaml"; 170 - rev = "c7ce16629ff4cd059ed96ed06419dd3856fd3577"; 171 - sha256 = "10cyv1gy3zwwkr04kk8cvhifb7xddakyvnk5s13yfcqj9hcjz8d1"; 172 - }; 173 - } 174 - { 175 - goPackagePath = "github.com/go-ini/ini"; 176 - fetch = { 177 - type = "git"; 178 - url = "https://github.com/go-ini/ini"; 179 - rev = "358ee7663966325963d4e8b2e1fbd570c5195153"; 180 - sha256 = "1zr51xaka7px1pmfndm12fvg6a3cr24kg77j28zczbfcc6h339gy"; 125 + rev = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7"; 126 + sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; 181 127 }; 182 128 } 183 129 { ··· 176 140 fetch = { 177 141 type = "git"; 178 142 url = "https://github.com/go-openapi/jsonpointer"; 179 - rev = "3a0015ad55fa9873f41605d3e8f28cd279c32ab2"; 180 - sha256 = "02an755ashhckqwxyq2avgn8mm4qq3hxda2jsj1a3bix2gkb45v7"; 143 + rev = "a105a905c5e6ad147f08504784917f3e178e0ba5"; 144 + sha256 = "1s3cqf4svrbygvvpvi7hf122szsgihas52vqh0bba3avf4w03g9n"; 181 145 }; 182 146 } 183 147 { ··· 185 149 fetch = { 186 150 type = "git"; 187 151 url = "https://github.com/go-openapi/jsonreference"; 188 - rev = "3fb327e6747da3043567ee86abd02bb6376b6be2"; 189 - sha256 = "0zwsrmqqcihm0lj2pc18cpm7wnn1dzwr4kvrlyrxf0lnn7dsdsbm"; 152 + rev = "2903bfd4bfbaf188694f1edf731f2725a8fa344f"; 153 + sha256 = "0v933yvcwyzzlpdxwb9204ki7lls2rwfd96ww2i901ndvz37kdf8"; 190 154 }; 191 155 } 192 156 { ··· 194 158 fetch = { 195 159 type = "git"; 196 160 url = "https://github.com/go-openapi/spec"; 197 - rev = "bce47c9386f9ecd6b86f450478a80103c3fe1402"; 198 - sha256 = "0agys8v5rkfyinvmjd8hzgwvb20hnqninwkxwqkwbbsnakhi8shk"; 161 + rev = "bdfd7e07daecc404d77868a88b2364d0aed0ee5a"; 162 + sha256 = "1r2my46qc85fp1j4lbddmd6c1n0am9bq1wyqsnw7x8raiznqxp5l"; 199 163 }; 200 164 } 201 165 { ··· 203 167 fetch = { 204 168 type = "git"; 205 169 url = "https://github.com/go-openapi/swag"; 206 - rev = "2b0bd4f193d011c203529df626a65d63cb8a79e8"; 207 - sha256 = "14c998wkycmy69jhjqkrah8acrr9xfam1dxbzl0lf4s2ghwn7bdn"; 170 + rev = "c3d0f7896d589f3babb99eea24bbc7de98108e72"; 171 + sha256 = "1z34vqc5yz6rzvarrvlhkimxx33p74iaxb28l1mv716njvlsmjhg"; 172 + }; 173 + } 174 + { 175 + goPackagePath = "github.com/go-sql-driver/mysql"; 176 + fetch = { 177 + type = "git"; 178 + url = "https://github.com/go-sql-driver/mysql"; 179 + rev = "72cd26f257d44c1114970e19afddcd812016007e"; 180 + sha256 = "1fvsvwc1v2i0gqn01mynvi1shp5xm0xaym6xng09fcbqb56lbjx1"; 208 181 }; 209 182 } 210 183 { ··· 221 176 fetch = { 222 177 type = "git"; 223 178 url = "https://github.com/gogo/protobuf"; 224 - rev = "636bf0302bc95575d69441b25a2603156ffdddf1"; 225 - sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; 226 - }; 227 - } 228 - { 229 - goPackagePath = "github.com/golang/glog"; 230 - fetch = { 231 - type = "git"; 232 - url = "https://github.com/golang/glog"; 233 - rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; 234 - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; 179 + rev = "0ca988a254f991240804bf9821f3450d87ccbb1b"; 180 + sha256 = "0slfyrmbpdcppf0z3waar90bpszdhi2gv705ys1b0zx5x6ax8f1a"; 235 181 }; 236 182 } 237 183 { ··· 230 194 fetch = { 231 195 type = "git"; 232 196 url = "https://github.com/golang/protobuf"; 233 - rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265"; 234 - sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq"; 197 + rev = "6c65a5562fc06764971b7c5d05c76c75e84bdbf7"; 198 + sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; 235 199 }; 236 200 } 237 201 { ··· 239 203 fetch = { 240 204 type = "git"; 241 205 url = "https://github.com/google/gofuzz"; 242 - rev = "24818f796faf91cd76ec7bddd72458fbced7a6c1"; 243 - sha256 = "0cq90m2lgalrdfrwwyycrrmn785rgnxa3l3vp9yxkvnv88bymmlm"; 206 + rev = "f140a6486e521aad38f5917de355cbf147cc0496"; 207 + sha256 = "0qz439qvccm91w0mmjz4fqgx48clxdwagkvvx89cr43q1d4iry36"; 244 208 }; 245 209 } 246 210 { ··· 248 212 fetch = { 249 213 type = "git"; 250 214 url = "https://github.com/googleapis/gnostic"; 251 - rev = "7c663266750e7d82587642f65e60bc4083f1f84e"; 252 - sha256 = "0yh3ckd7m0r9h50wmxxvba837d0wb1k5yd439zq4p1kpp4390z12"; 215 + rev = "ab0dd09aa10e2952b28e12ecd35681b20463ebab"; 216 + sha256 = "1f4bs71hrqkwg8fdhsxh25s12xnkxly13cnmp6m4qj6vc6k6zr2n"; 253 217 }; 254 218 } 255 219 { ··· 257 221 fetch = { 258 222 type = "git"; 259 223 url = "https://github.com/gorilla/websocket"; 260 - rev = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b"; 261 - sha256 = "1bhgs2542qs49p1dafybqxfs2qc072xv41w5nswyrknwyjxxs2a1"; 224 + rev = "c3e18be99d19e6b3e8f1559eea2c161a665c4b6b"; 225 + sha256 = "03n1n0nwz3k9qshmriycqznnnvd3dkzsfwpnfjzzvafjxk9kyapv"; 226 + }; 227 + } 228 + { 229 + goPackagePath = "github.com/grpc-ecosystem/grpc-gateway"; 230 + fetch = { 231 + type = "git"; 232 + url = "https://github.com/grpc-ecosystem/grpc-gateway"; 233 + rev = "471f45a5a99a578de7a8638dc7ed29e245bde097"; 234 + sha256 = "1jbr14p1dh6jpq3q6b4nq97ryh56h17ali0nckicpxhdrvxgi81c"; 235 + }; 236 + } 237 + { 238 + goPackagePath = "github.com/hashicorp/go-uuid"; 239 + fetch = { 240 + type = "git"; 241 + url = "https://github.com/hashicorp/go-uuid"; 242 + rev = "4f571afc59f3043a65f8fe6bf46d887b10a01d43"; 243 + sha256 = "0jvb88m0rq41bwgirsadgw7mnayl27av3gd2vqa3xvxp3fy0hp5k"; 262 244 }; 263 245 } 264 246 { ··· 284 230 fetch = { 285 231 type = "git"; 286 232 url = "https://github.com/hashicorp/golang-lru"; 287 - rev = "0fb14efe8c47ae851c0034ed7a448854d3d34cf3"; 288 - sha256 = "0vg4yn3088ym4sj1d34kr13lp4v5gya7r2nxshp2bz70n46fsqn2"; 289 - }; 290 - } 291 - { 292 - goPackagePath = "github.com/howeyc/gopass"; 293 - fetch = { 294 - type = "git"; 295 - url = "https://github.com/howeyc/gopass"; 296 - rev = "bf9dde6d0d2c004a008c27aaee91170c786f6db8"; 297 - sha256 = "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45"; 233 + rev = "7f827b33c0f158ec5dfbba01bb0b14a4541fd81d"; 234 + sha256 = "1p2igd58xkm8yaj2c2wxiplkf2hj6kxwrg6ss7mx61s5rd71v5xb"; 298 235 }; 299 236 } 300 237 { ··· 293 248 fetch = { 294 249 type = "git"; 295 250 url = "https://github.com/imdario/mergo"; 296 - rev = "9f23e2d6bd2a77f959b2bf6acdbefd708a83a4a4"; 297 - sha256 = "1lbzy8p8wv439sqgf0n21q52flf2wbamp6qa1jkyv6an0nc952q7"; 251 + rev = "7c29201646fa3de8506f701213473dd407f19646"; 252 + sha256 = "05ir0jj74w0yfi1lrhjd97v759in1dpsma64cgmbiqvyp6hfmmf8"; 298 253 }; 299 254 } 300 255 { ··· 316 271 }; 317 272 } 318 273 { 274 + goPackagePath = "github.com/jcmturner/gofork"; 275 + fetch = { 276 + type = "git"; 277 + url = "https://github.com/jcmturner/gofork"; 278 + rev = "dc7c13fece037a4a36e2b3c69db4991498d30692"; 279 + sha256 = "0xzsnjqv3d59w9pgqzf6550wdwaqnac7zcdgqfd25w65yhcffzhr"; 280 + }; 281 + } 282 + { 283 + goPackagePath = "github.com/jmespath/go-jmespath"; 284 + fetch = { 285 + type = "git"; 286 + url = "https://github.com/jmespath/go-jmespath"; 287 + rev = "c2b33e84"; 288 + sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz"; 289 + }; 290 + } 291 + { 319 292 goPackagePath = "github.com/json-iterator/go"; 320 293 fetch = { 321 294 type = "git"; 322 295 url = "https://github.com/json-iterator/go"; 323 - rev = "1624edc4454b8682399def8740d46db5e4362ba4"; 324 - sha256 = "11wn4hpmrs8bmpvd93wqk49jfbbgylakhi35f9k5qd7jd479ci4s"; 296 + rev = "27518f6661eba504be5a7a9a9f6d9460d892ade3"; 297 + sha256 = "0n79p4s67zl5zprxv7diayw3vavnmmfqkmd6snz0i9bxp825dsyz"; 325 298 }; 326 299 } 327 300 { ··· 347 284 fetch = { 348 285 type = "git"; 349 286 url = "https://github.com/kevinburke/ssh_config"; 350 - rev = "9fc7bb800b555d63157c65a904c86a2cc7b4e795"; 351 - sha256 = "102icrla92zmr5zngipc8c9yfbqhf73zs2w2jq6s7p0gdjifigc8"; 287 + rev = "6cfae18c12b8934b1afba3ce8159476fdef666ba"; 288 + sha256 = "05jvz5r58a057zxvic9dyr9v2wilha8l6366npwkqgxmnmk9sh5f"; 289 + }; 290 + } 291 + { 292 + goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; 293 + fetch = { 294 + type = "git"; 295 + url = "https://github.com/konsorten/go-windows-terminal-sequences"; 296 + rev = "f55edac94c9bbba5d6182a4be46d86a2c9b5b50e"; 297 + sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7"; 298 + }; 299 + } 300 + { 301 + goPackagePath = "github.com/lib/pq"; 302 + fetch = { 303 + type = "git"; 304 + url = "https://github.com/lib/pq"; 305 + rev = "3427c32cb71afc948325f299f040e53c1dd78979"; 306 + sha256 = "08j1smm6rassdssdks4yh9aspa1dv1g5nvwimmknspvhx8a7waqz"; 352 307 }; 353 308 } 354 309 { ··· 374 293 fetch = { 375 294 type = "git"; 376 295 url = "https://github.com/mailru/easyjson"; 377 - rev = "03f2033d19d5860aef995fe360ac7d395cd8ce65"; 378 - sha256 = "0r62ym6m1ijby7nwplq0gdnhak8in63njyisrwhr3xpx9vkira97"; 296 + rev = "b2ccc519800e761ac8000b95e5d57c80a897ff9e"; 297 + sha256 = "0q85h383mhbkcjm2vqm72bi8n2252fv3c56q3lclzb8n2crnjcdk"; 379 298 }; 380 299 } 381 300 { ··· 392 311 fetch = { 393 312 type = "git"; 394 313 url = "https://github.com/minio/minio-go"; 395 - rev = "70799fe8dae6ecfb6c7d7e9e048fce27f23a1992"; 396 - sha256 = "0xvvnny59v4p1y2kbvz90ga5xvc5sq1gc4wv6cym82rdbvgzb2ax"; 314 + rev = "c6c2912aa5522e5f5a505e6cba30e95f0d8456fa"; 315 + sha256 = "0f5av1da4xbcy34j6dfy7c90na4a1capmsyac9qswq4xzq2zky10"; 397 316 }; 398 317 } 399 318 { ··· 401 320 fetch = { 402 321 type = "git"; 403 322 url = "https://github.com/mitchellh/go-homedir"; 404 - rev = "58046073cbffe2f25d425fe1331102f55cf719de"; 405 - sha256 = "0kwflrwsjdsy8vbhyzicc4c2vdi7lhdvn4rarfr18x1qsrb7n1bx"; 323 + rev = "af06845cf3004701891bf4fdb884bfe4920b3727"; 324 + sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; 325 + }; 326 + } 327 + { 328 + goPackagePath = "github.com/mitchellh/go-ps"; 329 + fetch = { 330 + type = "git"; 331 + url = "https://github.com/mitchellh/go-ps"; 332 + rev = "621e5597135b1d14a7d9c2bfc7bc312e7c58463c"; 333 + sha256 = "0sjkz24kqz5nzgncnvdlzhlyba4jwmf6cxj8c4p8mb44679gkphh"; 406 334 }; 407 335 } 408 336 { ··· 433 343 }; 434 344 } 435 345 { 436 - goPackagePath = "github.com/pelletier/go-buffruneio"; 437 - fetch = { 438 - type = "git"; 439 - url = "https://github.com/pelletier/go-buffruneio"; 440 - rev = "c37440a7cf42ac63b919c752ca73a85067e05992"; 441 - sha256 = "0l83p1gg6g5mmhmxjisrhfimhbm71lwn1r2w7d6siwwqm9q08sd2"; 442 - }; 443 - } 444 - { 445 346 goPackagePath = "github.com/pkg/errors"; 446 347 fetch = { 447 348 type = "git"; 448 349 url = "https://github.com/pkg/errors"; 449 - rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; 450 - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; 350 + rev = "ba968bfe8b2f7e042a574c888954fccecfa385b4"; 351 + sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; 451 352 }; 452 353 } 453 354 { ··· 464 383 fetch = { 465 384 type = "git"; 466 385 url = "https://github.com/prometheus/client_model"; 467 - rev = "5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f"; 468 - sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0"; 386 + rev = "14fe0d1b01d4d5fc031dd4bec1823bd3ebbe8016"; 387 + sha256 = "0zdmk6rbbx39cvfz0r59v2jg5sg9yd02b4pds5n5llgvivi99550"; 469 388 }; 470 389 } 471 390 { ··· 473 392 fetch = { 474 393 type = "git"; 475 394 url = "https://github.com/prometheus/common"; 476 - rev = "c7de2306084e37d54b8be01f3541a8464345e9a5"; 477 - sha256 = "11dqfm2d0m4sjjgyrnayman96g59x2apmvvqby9qmww2qj2k83ig"; 395 + rev = "31bed53e4047fd6c510e43a941f90cb31be0972a"; 396 + sha256 = "1q16br348117ffycxdwsldb0i39p34miclfa8z93k6vjwnrqbh2l"; 478 397 }; 479 398 } 480 399 { ··· 482 401 fetch = { 483 402 type = "git"; 484 403 url = "https://github.com/prometheus/procfs"; 485 - rev = "05ee40e3a273f7245e8777337fc7b46e533a9a92"; 486 - sha256 = "0f6fnczxa42b9rys2h3l0m8fy3x5hrhaq707vq0lbx5fcylw8lis"; 404 + rev = "00ec24a6a2d86e7074629c8384715dbb05adccd8"; 405 + sha256 = "1z5jq5rjala0a0di4nwk1rai0z9f73qwqj6mgcbpjbg2qknlb544"; 487 406 }; 488 407 } 489 408 { ··· 500 419 fetch = { 501 420 type = "git"; 502 421 url = "https://github.com/sirupsen/logrus"; 503 - rev = "3e01752db0189b9157070a0e1668a620f9a85da2"; 504 - sha256 = "029irw2lsbqi944gdrbkwdw0m2794sqni4g21gsnmz142hbzds8c"; 422 + rev = "839c75faf7f98a33d445d181f3018b5c3409a45e"; 423 + sha256 = "087k2lxrr9p9dh68yw71d05h5g9p5v26zbwd6j7lghinjfaw334x"; 505 424 }; 506 425 } 507 426 { ··· 509 428 fetch = { 510 429 type = "git"; 511 430 url = "https://github.com/spf13/cobra"; 512 - rev = "7c4570c3ebeb8129a1f7456d0908a8b676b6f9f1"; 513 - sha256 = "16amh0prlzqrrbg5j629sg0f688nfzfgn9sair8jyybqampr3wc7"; 431 + rev = "fe5e611709b0c57fa4a89136deaa8e1d4004d053"; 432 + sha256 = "1pn7g9jmhqc9yg6x02dgp4phiggnnxz8a11pv5y4vxhrvkjm6h71"; 514 433 }; 515 434 } 516 435 { ··· 518 437 fetch = { 519 438 type = "git"; 520 439 url = "https://github.com/spf13/pflag"; 521 - rev = "583c0c0531f06d5278b7d917446061adc344b5cd"; 522 - sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5"; 440 + rev = "298182f68c66c05229eb03ac171abe6e309ee79a"; 441 + sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; 523 442 }; 524 443 } 525 444 { ··· 527 446 fetch = { 528 447 type = "git"; 529 448 url = "https://github.com/src-d/gcfg"; 530 - rev = "f187355171c936ac84a82793659ebb4936bc1c23"; 531 - sha256 = "1hrdxlha4kkcpyydmjqd929rmwn5a9xq7arvwhryxppxq7502axk"; 449 + rev = "1ac3a1ac202429a54835fe8408a92880156b489d"; 450 + sha256 = "044j95skmyrwjw5fwjk6ka32rjgsg0ar0mfp9np19sh1acwv4x4r"; 532 451 }; 533 452 } 534 453 { ··· 545 464 fetch = { 546 465 type = "git"; 547 466 url = "https://github.com/stretchr/testify"; 548 - rev = "f35b8ab0b5a2cef36673838d662e249dd9c94686"; 549 - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; 467 + rev = "221dbe5ed46703ee255b1da0dec05086f5035f62"; 468 + sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb"; 550 469 }; 551 470 } 552 471 { ··· 554 473 fetch = { 555 474 type = "git"; 556 475 url = "https://github.com/tidwall/gjson"; 557 - rev = "1e3f6aeaa5bad08d777ea7807b279a07885dd8b2"; 558 - sha256 = "0b0kvpzq0xxk2fq4diy3ab238yjx022s56h5jv1lc9hglds80lnn"; 476 + rev = "c5e72cdf74dff23857243dd662c465b810891c21"; 477 + sha256 = "0cg23va26ga6d0gckp5i3ramc98cbz6ij9gn9dqqyc8igvcx9cb3"; 559 478 }; 560 479 } 561 480 { ··· 563 482 fetch = { 564 483 type = "git"; 565 484 url = "https://github.com/tidwall/match"; 566 - rev = "1731857f09b1f38450e2c12409748407822dc6be"; 567 - sha256 = "14nv96h0mjki5q685qx8y331h4yga6hlfh3z9nz6acvnv284q578"; 485 + rev = "33827db735fff6510490d69a8622612558a557ed"; 486 + sha256 = "1ip5nkjvmzzzsypyzdd9nsnzbhwssprlx8qs5llqh16fl7kcvi3n"; 487 + }; 488 + } 489 + { 490 + goPackagePath = "github.com/tidwall/pretty"; 491 + fetch = { 492 + type = "git"; 493 + url = "https://github.com/tidwall/pretty"; 494 + rev = "1166b9ac2b65e46a43d8618d30d1554f4652d49b"; 495 + sha256 = "1jwpj5903lh8hsj9apm2gwd70809zq0gjgmivkxaq4iq29wnv0n9"; 568 496 }; 569 497 } 570 498 { ··· 590 500 fetch = { 591 501 type = "git"; 592 502 url = "https://github.com/valyala/fasttemplate"; 593 - rev = "dcecefd839c4193db0d35b88ec65b4c12d360ab0"; 594 - sha256 = "0kkxn0ad5a36533djh50n9l6wsylmnykridkm91dqlqbjirn7216"; 503 + rev = "8b5e4e491ab636663841c42ea3c5a9adebabaf36"; 504 + sha256 = "0l131znbv8v67y20s4q361mwiww2c33zdc68mwvxchzk1gpy5ywq"; 595 505 }; 596 506 } 597 507 { ··· 599 509 fetch = { 600 510 type = "git"; 601 511 url = "https://github.com/xanzy/ssh-agent"; 602 - rev = "640f0ab560aeb89d523bb6ac322b1244d5c3796c"; 603 - sha256 = "069nlriymqswg52ggiwi60qhwrin9nzhd2g65a7h59z2qbcvk2hy"; 512 + rev = "6a3e2ff9e7c564f36873c2e36413f634534f1c44"; 513 + sha256 = "1chjlnv5d6svpymxgsr62d992m2xi6jb5lybjc5zn1h3hv1m01av"; 514 + }; 515 + } 516 + { 517 + goPackagePath = "go.opencensus.io"; 518 + fetch = { 519 + type = "git"; 520 + url = "https://github.com/census-instrumentation/opencensus-go"; 521 + rev = "aab39bd6a98b853ab66c8a564f5d6cfcad59ce8a"; 522 + sha256 = "1x1ysvpyak1hcmfgvy0mk30g1ammbsmw19c9s0brz5h9wn7m4vva"; 604 523 }; 605 524 } 606 525 { ··· 617 518 fetch = { 618 519 type = "git"; 619 520 url = "https://go.googlesource.com/crypto"; 620 - rev = "f027049dab0ad238e394a753dba2d14753473a04"; 621 - sha256 = "026475grqvylk9n2ld4ygaxmzck6v97j48sc2x58jjsmqflnhzld"; 521 + rev = "9756ffdc24725223350eb3266ffb92590d28f278"; 522 + sha256 = "0q7hxaaq6lp0v8qqzifvysl47z5rfdlrxkh3d29vsl3wyby3dxl8"; 622 523 }; 623 524 } 624 525 { ··· 626 527 fetch = { 627 528 type = "git"; 628 529 url = "https://go.googlesource.com/net"; 629 - rev = "f9ce57c11b242f0f1599cf25c89d8cb02c45295a"; 630 - sha256 = "1m507gyjd9246cr3inpn6lgv3vnc3i11x4fgz0k0hdxv3cn9dyx2"; 530 + rev = "ba9fcec4b297b415637633c5a6e8fa592e4a16c3"; 531 + sha256 = "1hbqvy6r0s5h0dpdqw8fynl3cq0acin3iyqki9xvl5r8h33yb9bx"; 631 532 }; 632 533 } 633 534 { ··· 635 536 fetch = { 636 537 type = "git"; 637 538 url = "https://go.googlesource.com/oauth2"; 638 - rev = "3d292e4d0cdc3a0113e6d207bb137145ef1de42f"; 639 - sha256 = "0jvivlvx7snacd6abd1prqxa7h1z6b7s6mqahn8lpqlag3asryrl"; 539 + rev = "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33"; 540 + sha256 = "06jwpvx0x2gjn2y959drbcir5kd7vg87k0r1216abk6rrdzzrzi2"; 541 + }; 542 + } 543 + { 544 + goPackagePath = "golang.org/x/sync"; 545 + fetch = { 546 + type = "git"; 547 + url = "https://go.googlesource.com/sync"; 548 + rev = "112230192c580c3556b8cee6403af37a4fc5f28c"; 549 + sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; 640 550 }; 641 551 } 642 552 { ··· 653 545 fetch = { 654 546 type = "git"; 655 547 url = "https://go.googlesource.com/sys"; 656 - rev = "904bdc257025c7b3f43c19360ad3ab85783fad78"; 657 - sha256 = "1pmj9axkj898bk4i4lny03b3l0zbkpvxj03gyjckliabqimqz0az"; 548 + rev = "9109b7679e13aa34a54834cfb4949cac4b96e576"; 549 + sha256 = "169sg6fyjkykiylrgxr0pynv2zc3frkgssbsk5w2lqyl8mb319hl"; 658 550 }; 659 551 } 660 552 { ··· 662 554 fetch = { 663 555 type = "git"; 664 556 url = "https://go.googlesource.com/text"; 665 - rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"; 666 - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; 557 + rev = "342b2e1fbaa52c93f31447ad2c6abc048c63e475"; 558 + sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; 667 559 }; 668 560 } 669 561 { ··· 671 563 fetch = { 672 564 type = "git"; 673 565 url = "https://go.googlesource.com/time"; 674 - rev = "fbb02b2291d28baffd63558aa44b4b56f178d650"; 675 - sha256 = "0jjqcv6rzihlgg4i797q80g1f6ch5diz2kxqh6488gwkb6nds4h4"; 566 + rev = "9d24e82272b4f38b78bc8cff74fa936d31ccd8ef"; 567 + sha256 = "1f5nkr4vys2vbd8wrwyiq2f5wcaahhpxmia85d1gshcbqjqf8dkb"; 676 568 }; 677 569 } 678 570 { ··· 680 572 fetch = { 681 573 type = "git"; 682 574 url = "https://go.googlesource.com/tools"; 683 - rev = "ca6481ae56504398949d597084558e50ad07117a"; 684 - sha256 = "0pza1pd0wy9r0pf9b9hham9ldr2byyg1slqf8p56dhf8b6j9jw9v"; 575 + rev = "be0da057c5e3c2df569a2c25cd280149b7d7e7d0"; 576 + sha256 = "19i9sjvbk79sgzyzjzrnmf575rnwj2bjsj4r1fmp7827dq97kqks"; 577 + }; 578 + } 579 + { 580 + goPackagePath = "google.golang.org/api"; 581 + fetch = { 582 + type = "git"; 583 + url = "https://code.googlesource.com/google-api-go-client"; 584 + rev = "feb0267beb8644f5088a03be4d5ec3f8c7020152"; 585 + sha256 = "1lzdzkd2i41v6amxs9jah1q44qbvf1yvm8906jpfjiq6c3ffhqss"; 685 586 }; 686 587 } 687 588 { ··· 698 581 fetch = { 699 582 type = "git"; 700 583 url = "https://github.com/golang/appengine"; 701 - rev = "b1f26356af11148e710935ed1ac8a7f5702c7612"; 702 - sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x"; 584 + rev = "5f2a59506353b8d5ba8cbbcd9f3c1f41f1eaf079"; 585 + sha256 = "1gwcwh8w5b1l15pjm8pqs3bbymvjcak3wva37zi5z9ilzr8c5wnx"; 586 + }; 587 + } 588 + { 589 + goPackagePath = "google.golang.org/genproto"; 590 + fetch = { 591 + type = "git"; 592 + url = "https://github.com/google/go-genproto"; 593 + rev = "24fa4b261c55da65468f2abfdae2b024eef27dfb"; 594 + sha256 = "109zhaqlfd8zkbr1hk6zqbs6vcxfrk64scjwh2nswph05gr0m84d"; 595 + }; 596 + } 597 + { 598 + goPackagePath = "google.golang.org/grpc"; 599 + fetch = { 600 + type = "git"; 601 + url = "https://github.com/grpc/grpc-go"; 602 + rev = "6eaf6f47437a6b4e2153a190160ef39a92c7eceb"; 603 + sha256 = "1cn33r2gclmq2v1ndpf1n5bmhf2qs8mms7ii5cnl6f9ch4r2c4k3"; 703 604 }; 704 605 } 705 606 { ··· 730 595 }; 731 596 } 732 597 { 598 + goPackagePath = "gopkg.in/ini.v1"; 599 + fetch = { 600 + type = "git"; 601 + url = "https://github.com/go-ini/ini"; 602 + rev = "d4cae42d398bc0095297fc3315669590d29166ea"; 603 + sha256 = "1z7531wz62305hwg9y2f04d819am8x3ys96ssy6qndlzmw60yjsr"; 604 + }; 605 + } 606 + { 607 + goPackagePath = "gopkg.in/jcmturner/aescts.v1"; 608 + fetch = { 609 + type = "git"; 610 + url = "https://github.com/jcmturner/aescts"; 611 + rev = "f6abebb3171c4c1b1fea279cb7c7325020a26290"; 612 + sha256 = "0rbq4zf3db48xa2gqdp2swws7wizmbwagigqkr1zxzd1ramps6rv"; 613 + }; 614 + } 615 + { 616 + goPackagePath = "gopkg.in/jcmturner/dnsutils.v1"; 617 + fetch = { 618 + type = "git"; 619 + url = "https://github.com/jcmturner/dnsutils"; 620 + rev = "13eeb8d49ffb74d7a75784c35e4d900607a3943c"; 621 + sha256 = "0l543c64pyzbnrc00jspg21672l3a0kjjw9pbdxwna93w8d8m927"; 622 + }; 623 + } 624 + { 625 + goPackagePath = "gopkg.in/jcmturner/gokrb5.v5"; 626 + fetch = { 627 + type = "git"; 628 + url = "https://github.com/jcmturner/gokrb5"; 629 + rev = "32ba44ca5b42f17a4a9f33ff4305e70665a1bc0f"; 630 + sha256 = "0jynpkncifdd2ib2pc9qhh0r8q7ab7yw0ygzpzgisdzv8ars1diq"; 631 + }; 632 + } 633 + { 634 + goPackagePath = "gopkg.in/jcmturner/rpc.v0"; 635 + fetch = { 636 + type = "git"; 637 + url = "https://github.com/jcmturner/rpc"; 638 + rev = "4480c480c9cd343b54b0acb5b62261cbd33d7adf"; 639 + sha256 = "0hivgq52gwxsqs5x1my2047k7nqh7wx3yi0llsj3lc3h2mjy4yhd"; 640 + }; 641 + } 642 + { 733 643 goPackagePath = "gopkg.in/src-d/go-billy.v4"; 734 644 fetch = { 735 645 type = "git"; 736 646 url = "https://github.com/src-d/go-billy"; 737 - rev = "83cf655d40b15b427014d7875d10850f96edba14"; 738 - sha256 = "18fghcyk69g460px8rvmhmqldkbhw17dpnhg45qwdvaq90b0bkx9"; 647 + rev = "780403cfc1bc95ff4d07e7b26db40a6186c5326e"; 648 + sha256 = "0jcyi4ink2njgflp3f2mbl5b86p2w0rh945k5xplcl158i5wkrc6"; 739 649 }; 740 650 } 741 651 { ··· 788 608 fetch = { 789 609 type = "git"; 790 610 url = "https://github.com/src-d/go-git"; 791 - rev = "3bd5e82b2512d85becae9677fa06b5a973fd4cfb"; 792 - sha256 = "1krg24ncckwalmhzs2vlp8rwyk4rfnhfydwg8iw7gaywww2c1wfc"; 611 + rev = "0d1a009cbb604db18be960db5f1525b99a55d727"; 612 + sha256 = "0n4x7r69qrmpss51b3wd3vj4b9jmip4archz3fbqk6q1yyd1pxjb"; 793 613 }; 794 614 } 795 615 { ··· 806 626 fetch = { 807 627 type = "git"; 808 628 url = "https://github.com/go-yaml/yaml"; 809 - rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; 810 - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; 629 + rev = "51d6538a90f86fe93ac480b35f37b2be17fef232"; 630 + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; 811 631 }; 812 632 } 813 633 { ··· 815 635 fetch = { 816 636 type = "git"; 817 637 url = "https://github.com/kubernetes/api"; 818 - rev = "0f11257a8a25954878633ebdc9841c67d8f83bdb"; 819 - sha256 = "1y8k0b03ibr8ga9dr91dc2imq2cbmy702a1xqggb97h8lmb6jqni"; 638 + rev = "e3a6b8045b0b303430f6d0c261fd9e35be50800e"; 639 + sha256 = "1c1nrcy0j7aj93l2xgdw0asyvxa4h8pzz004drf7pvh9pvsg0vqq"; 820 640 }; 821 641 } 822 642 { ··· 824 644 fetch = { 825 645 type = "git"; 826 646 url = "https://github.com/kubernetes/apimachinery"; 827 - rev = "e386b2658ed20923da8cc9250e552f082899a1ee"; 828 - sha256 = "0lgwpsvx0gpnrdnkqc9m96xwkifdq50l7cj9rvh03njws4rbd8jz"; 647 + rev = "8f6ac2502e5143406f4eaedc4ca4262854d877ce"; 648 + sha256 = "0v8cb63nvry4b0ls1h185hb3llp6rk0b4n92f76jcjsv1b7sspbi"; 829 649 }; 830 650 } 831 651 { ··· 833 653 fetch = { 834 654 type = "git"; 835 655 url = "https://github.com/kubernetes/client-go"; 836 - rev = "a312bfe35c401f70e5ea0add48b50da283031dc3"; 837 - sha256 = "0z360np4iv7jdgacw576gdxbzl8ss810kbqwyrjk39by589rfkl9"; 656 + rev = "6d55c1b1f1ca8ad83d572bbc3ca55ba5526d9d71"; 657 + sha256 = "1j8m0pqn9c6lwr7h5aq7zrpdd73bwbwnhy4mbc0654ylmc3lnq8q"; 838 658 }; 839 659 } 840 660 { ··· 842 662 fetch = { 843 663 type = "git"; 844 664 url = "https://github.com/kubernetes/code-generator"; 845 - rev = "9de8e796a74d16d2a285165727d04c185ebca6dc"; 846 - sha256 = "09858ykfrd3cyzkkpafzhqs6h7bk3n90s3p52x3axn4f7ikjh7k4"; 665 + rev = "6c2a4329ac290d921e8616cad41635c87dbb1518"; 666 + sha256 = "18kx2wcqb5cvivbl61q7vyic5rp0fica9n6xgrjfsxczjbihlq70"; 847 667 }; 848 668 } 849 669 { ··· 851 671 fetch = { 852 672 type = "git"; 853 673 url = "https://github.com/kubernetes/gengo"; 854 - rev = "c42f3cdacc394f43077ff17e327d1b351c0304e4"; 855 - sha256 = "05vbrqfa96izm5j2q9f4yiyrbyx23nrkj5yv4fhfc7pvwb35iy04"; 674 + rev = "a874a240740c2ae854082ec73d46c5efcedd2149"; 675 + sha256 = "0z8gay4bj6l8cv7gzi55l2c3jx94caq28sk0x6p3s6wxqxmnqp92"; 676 + }; 677 + } 678 + { 679 + goPackagePath = "k8s.io/klog"; 680 + fetch = { 681 + type = "git"; 682 + url = "https://github.com/kubernetes/klog"; 683 + rev = "3ca30a56d8a775276f9cdae009ba326fdc05af7f"; 684 + sha256 = "0a7kn145q4cbsd2cfpv7sz09prjrxl6aaqzdcgq7p7jxc23a7zps"; 856 685 }; 857 686 } 858 687 { ··· 869 680 fetch = { 870 681 type = "git"; 871 682 url = "https://github.com/kubernetes/kube-openapi"; 872 - rev = "e3762e86a74c878ffed47484592986685639c2cd"; 873 - sha256 = "1n9j08dwnj77iflzj047hrk0zg6nh1m4a5pljjdsvvf3xgka54pz"; 683 + rev = "5e22f3d471e6f24ca20becfdffdc6206c7cecac8"; 684 + sha256 = "08drikf269fhlnrhc29v7rhxl1950d94rl5x8l11n0qf2v2ffwib"; 685 + }; 686 + } 687 + { 688 + goPackagePath = "k8s.io/utils"; 689 + fetch = { 690 + type = "git"; 691 + url = "https://github.com/kubernetes/utils"; 692 + rev = "3a4a5477acf81b48e20870a3b9dc743f63c66730"; 693 + sha256 = "1f01ck7nvm9rmw1fkylbnr1cdd9byiagl9ni40j9p9gfy5v5nxk8"; 694 + }; 695 + } 696 + { 697 + goPackagePath = "sigs.k8s.io/yaml"; 698 + fetch = { 699 + type = "git"; 700 + url = "https://github.com/kubernetes-sigs/yaml"; 701 + rev = "fd68e9863619f6ec2fdd8625fe1f02e7c877e480"; 702 + sha256 = "1p7hvjdr5jsyk7nys1g1pmgnf3ys6n320i6hds85afppk81k01kb"; 703 + }; 704 + } 705 + { 706 + goPackagePath = "upper.io/db.v3"; 707 + fetch = { 708 + type = "git"; 709 + url = "https://upper.io/db.v3"; 710 + rev = "fad80cdab4f761cb26416675df120f5d8c3f0db7"; 711 + sha256 = "1bddpi278bzp39470llrgnsnnfyqqmzym5hmd8dxmczmzhhkirfv"; 874 712 }; 875 713 } 876 714 ]
+8 -2
pkgs/applications/networking/cluster/terraform-providers/default.nix
··· 2 2 , buildGoPackage 3 3 , fetchFromGitHub 4 4 , callPackage 5 + , buildGo112Module 5 6 }: 6 7 let 7 8 list = import ./data.nix; ··· 17 16 inherit owner repo sha256; 18 17 rev = "v${version}"; 19 18 }; 20 - 19 + 21 20 22 21 # Terraform allow checking the provider versions, but this breaks 23 22 # if the versions are not provided via file paths. ··· 25 24 }; 26 25 in 27 26 { 28 - elasticsearch = callPackage ./elasticsearch {}; 27 + elasticsearch = callPackage ./elasticsearch { 28 + # Version 0.7.0 fails to build with go 1.13 due to dependencies: 29 + # verifying git.apache.org/thrift.git@v0.12.0/go.mod: git.apache.org/thrift.git@v0.12.0/go.mod: Get https://sum.golang.org/lookup/git.apache.org/thrift.git@v0.12.0: dial tcp: lookup sum.golang.org on [::1]:53: read udp [::1]:52968->[::1]:53: read: connection refused 30 + # verifying github.com/hashicorp/terraform@v0.12.0/go.mod: github.com/hashicorp/terraform@v0.12.0/go.mod: Get https://sum.golang.org/lookup/github.com/hashicorp/terraform@v0.12.0: dial tcp: lookup sum.golang.org on [::1]:53: read udp [::1]:52968->[::1]:53: read: connection refused 31 + buildGoModule = buildGo112Module; 32 + }; 29 33 gandi = callPackage ./gandi {}; 30 34 ibm = callPackage ./ibm {}; 31 35 libvirt = callPackage ./libvirt {};
-1
pkgs/applications/networking/feedreaders/newsboat/default.nix
··· 53 53 maintainers = with maintainers; [ dotlambda nicknovitski ]; 54 54 license = licenses.mit; 55 55 platforms = platforms.unix; 56 - broken = true; 57 56 }; 58 57 }
+1 -1
pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
··· 2 2 "name": "riot-web", 3 3 "productName": "Riot", 4 4 "main": "src/electron-main.js", 5 - "version": "1.4.1", 5 + "version": "1.4.2", 6 6 "description": "A feature-rich client for Matrix.org", 7 7 "author": "New Vector Ltd.", 8 8 "dependencies": {
+2 -2
pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
··· 6 6 7 7 let 8 8 executableName = "riot-desktop"; 9 - version = "1.4.1"; 9 + version = "1.4.2"; 10 10 riot-web-src = fetchFromGitHub { 11 11 owner = "vector-im"; 12 12 repo = "riot-web"; 13 13 rev = "v${version}"; 14 - sha256 = "0w4w39smak6hp65vam5rrz6l48rb4yzszzyn1yjhr1m8w8j9bvfl"; 14 + sha256 = "1s1m2jbcax92pql9yzw3kxdmn97a2xnas49rw3n1vldkla2wx4zx"; 15 15 }; 16 16 17 17 in yarn2nix-moretea.mkYarnPackage rec {
+2 -2
pkgs/applications/networking/instant-messengers/riot/riot-web.nix
··· 5 5 6 6 stdenv.mkDerivation rec { 7 7 pname = "riot-web"; 8 - version = "1.4.1"; 8 + version = "1.4.2"; 9 9 10 10 src = fetchurl { 11 11 url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; 12 - sha256 = "16lgxyqxs6vpjcfdr4j7gnn7h8gyi6b5520b8nq8hxynh24iyhcq"; 12 + sha256 = "0bbal3y4clgp7j703f3ll5zwhbpjz6zpw3qslwza6lik4g4k0vaj"; 13 13 }; 14 14 15 15 installPhase = let
+2 -2
pkgs/applications/networking/instant-messengers/zoom-us/default.nix
··· 14 14 let 15 15 inherit (stdenv.lib) concatStringsSep makeBinPath optional; 16 16 17 - version = "3.0.301026.0930"; 17 + version = "3.0.303290.1010"; 18 18 srcs = { 19 19 x86_64-linux = fetchurl { 20 20 url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; 21 - sha256 = "0y3c7345y2wibz6p7d6p89wraaqb51651p176z4v7lcjv3gr8dar"; 21 + sha256 = "0rs18csmwb8r5n0fc1ka1zjz3f0rydm6fxiy1pa1c2k5bmya56f9"; 22 22 }; 23 23 }; 24 24
+3 -3
pkgs/applications/networking/station/default.nix
··· 2 2 3 3 let 4 4 pname = "station"; 5 - version = "1.51.1"; 5 + version = "1.52.2"; 6 6 in appimageTools.wrapType2 rec { 7 7 name = "${pname}-${version}"; 8 8 9 9 src = fetchurl { 10 - url = "https://github.com/getstation/desktop-app-releases/releases/download/${version}/Station-${version}.AppImage"; 11 - sha256 = "1vfis2q7zf1sabdlxzmbxh135jk25ylhavrgfc30k5nad9cacw8k"; 10 + url = "https://github.com/getstation/desktop-app-releases/releases/download/${version}/Station-${version}-x86_64.AppImage"; 11 + sha256 = "0lhiwvnf94is9klvzrqv2wri53gj8nms9lg2678bs4y58pvjxwid"; 12 12 }; 13 13 14 14 profile = ''
+74
pkgs/applications/office/envelope/default.nix
··· 1 + { stdenv 2 + , fetchFromGitHub 3 + , fetchpatch 4 + , meson 5 + , ninja 6 + , pkgconfig 7 + , pantheon 8 + , python3 9 + , vala 10 + , appstream-glib 11 + , desktop-file-utils 12 + , gettext 13 + , glib 14 + , gtk3 15 + , libgee 16 + , sqlite 17 + , wrapGAppsHook 18 + }: 19 + 20 + stdenv.mkDerivation rec { 21 + pname = "envelope"; 22 + version = "0.0.4"; 23 + 24 + src = fetchFromGitHub { 25 + owner = "cjfloss"; 26 + repo = pname; 27 + rev = version; 28 + sha256 = "111lq1gijcm7qwpac09q11ymwiw2x3m12a28ki52f28fb1amvffc"; 29 + }; 30 + 31 + nativeBuildInputs = [ 32 + appstream-glib 33 + desktop-file-utils 34 + gettext 35 + meson 36 + ninja 37 + vala 38 + pkgconfig 39 + python3 40 + wrapGAppsHook 41 + ]; 42 + 43 + buildInputs = [ 44 + glib 45 + gtk3 46 + libgee 47 + pantheon.granite 48 + sqlite 49 + ]; 50 + 51 + doCheck = true; 52 + 53 + patches = [ 54 + # Fix AppData Validation. 55 + # https://github.com/cjfloss/envelope/pull/59 56 + (fetchpatch { 57 + url = "https://github.com/cjfloss/envelope/commit/b6a28eced89b8f944479fcc695aebfb9aae0c691.patch"; 58 + sha256 = "11znc8z52kl893n3gmmdpnp3y4vpzmb263m5gp0qxbl3xykq2wzr"; 59 + }) 60 + ]; 61 + 62 + postPatch = '' 63 + chmod +x data/post_install.py 64 + patchShebangs data/post_install.py 65 + ''; 66 + 67 + meta = with stdenv.lib; { 68 + description = "Personal finance manager for elementary OS"; 69 + homepage = "https://github.com/cjfloss/envelope"; 70 + maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers; 71 + platforms = platforms.linux; 72 + license = licenses.gpl3Plus; 73 + }; 74 + }
+2 -2
pkgs/applications/radio/chirp/default.nix
··· 3 3 4 4 stdenv.mkDerivation rec { 5 5 pname = "chirp-daily"; 6 - version = "20190718"; 6 + version = "20190905"; 7 7 8 8 src = fetchurl { 9 9 url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz"; 10 - sha256 = "1zngdqqqrlm8qpv8dzinamhwq6rr8zcq7db3vb284wrq0jcvrry5"; 10 + sha256 = "01xglzzl94wzkd2d8zmyv6s1xqsfc7biph15k0ap8rlf98874rlf"; 11 11 }; 12 12 13 13 nativeBuildInputs = [ makeWrapper ];
+2 -2
pkgs/applications/science/electronics/eagle/eagle.nix
··· 13 13 in 14 14 stdenv.mkDerivation rec { 15 15 pname = "eagle"; 16 - version = "9.4.2"; 16 + version = "9.5.0"; 17 17 18 18 src = fetchurl { 19 19 url = "https://eagle-updates.circuits.io/downloads/${builtins.replaceStrings ["."] ["_"] version}/Autodesk_EAGLE_${version}_English_Linux_64bit.tar.gz"; 20 - sha256 = "0lrwrvqcb91mcggmicvwjrngccsdy0f06l7a8nfgp9ckn4d9vmg2"; 20 + sha256 = "0wakaja98mkdgcxp18d7499i0254ns1xhnx4bag2lqi7j8qn8rqy"; 21 21 }; 22 22 23 23 desktopItem = makeDesktopItem {
+2 -2
pkgs/applications/science/math/clp/default.nix
··· 1 1 { stdenv, fetchurl, zlib }: 2 2 3 3 stdenv.mkDerivation rec { 4 - version = "1.17.2"; 4 + version = "1.17.3"; 5 5 pname = "clp"; 6 6 src = fetchurl { 7 7 url = "https://www.coin-or.org/download/source/Clp/Clp-${version}.tgz"; 8 - sha256 = "1fkmgpn0zaraymi6s3isrrscgjxggcs2yjrx7jfy4hb1jacx71zz"; 8 + sha256 = "0ws515f73vq2p4nzyq0fbnm4zp9a7mjg54szdzvkql5dj51gafx1"; 9 9 }; 10 10 11 11 propagatedBuildInputs = [ zlib ];
+4 -4
pkgs/applications/version-management/git-and-tools/gita/default.nix
··· 2 2 , buildPythonApplication 3 3 , fetchPypi 4 4 , pyyaml 5 + , setuptools 5 6 }: 6 7 7 8 buildPythonApplication rec { 8 - version = "0.9.2"; 9 + version = "0.9.9"; 9 10 pname = "gita"; 10 11 11 12 src = fetchPypi { 12 13 inherit pname version; 13 - sha256 = "1aycqq4crsa57ghpv7xc497rf4y8x43fcfd0v9prd2kn6h1793r0"; 14 + sha256 = "1si2f9nyisbrvv8cvrjxj8r4cbrgc97ic0wdlbf34gvp020dsmgv"; 14 15 }; 15 16 16 17 propagatedBuildInputs = [ 17 18 pyyaml 19 + setuptools 18 20 ]; 19 - 20 - doCheck = false; # Releases don't include tests 21 21 22 22 meta = with lib; { 23 23 description = "A command-line tool to manage multiple git repos";
+13 -12
pkgs/applications/video/cinelerra/default.nix
··· 1 - { stdenv, fetchgit, autoconf, automake, libtool 1 + { stdenv, fetchFromGitHub, autoconf, automake, libtool 2 2 , pkgconfig, faad2, faac, a52dec, alsaLib, fftw, lame, libavc1394 3 3 , libiec61883, libraw1394, libsndfile, libvorbis, libogg, libjpeg 4 4 , libtiff, freetype, mjpegtools, x264, gettext, openexr ··· 7 7 , fontconfig, intltool }: 8 8 9 9 stdenv.mkDerivation { 10 - name = "cinelerra-unstable-2016-01-12"; 10 + name = "cinelerra-cv-2018-05-16"; 11 11 12 - src = fetchgit { 13 - url = "git://git.cinelerra-cv.org/j6t/cinelerra.git"; 14 - rev = "454be60e201c18c1fc3f1f253a6d2184fcfc94c4"; 15 - sha256 = "1n4kshqhgnr7aivsi8dgx48phyd2nzvv4szbc82mndklvs9jfb7r"; 12 + src = fetchFromGitHub { 13 + owner = "ratopi"; 14 + repo = "CinelerraCV"; 15 + rev = "d9c0dbf4393717f0a42f4b91c3e1ed5b16f955dc"; 16 + sha256 = "0a8kfm1v96sv6jh4568crg6nkr6n3579i9xksfj8w199s6yxzsbk"; 16 17 }; 17 18 18 - # touch config.rpath: work around bug in automake 1.10 ? 19 19 preConfigure = '' 20 20 find -type f -print0 | xargs --null sed -e "s@/usr/bin/perl@${perl}/bin/perl@" -i 21 - touch config.rpath 22 21 ./autogen.sh 23 22 sed -i -e "s@/usr/bin/file@${file}/bin/file@" ./configure 24 23 ''; 24 + 25 + ## fix bug with parallel building 26 + preBuild = '' 27 + make -C cinelerra versioninfo.h 28 + ''; 29 + enableParallelBuilding = true; 25 30 26 31 buildInputs = 27 32 [ automake ··· 41 36 perl 42 37 fontconfig intltool 43 38 ]; 44 - 45 - # $ make -C cinelerra edl.o 46 - # edl.C:50:25: fatal error: versioninfo.h: No such file or directory 47 - enableParallelBuilding = false; 48 39 49 40 meta = { 50 41 description = "Video Editor";
+3 -3
pkgs/applications/virtualization/runc/default.nix
··· 5 5 6 6 buildGoPackage rec { 7 7 pname = "runc"; 8 - version = "1.0.0-rc8"; 8 + version = "1.0.0-rc9"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "opencontainers"; 12 12 repo = "runc"; 13 13 rev = "v${version}"; 14 - sha256 = "05s4p12mgmdcy7gjralh41wlgds6m69zdgwbpdn1xjj2487dmhxf"; 14 + sha256 = "1ss5b46cbbckyqlwgj8dbd5l59c5y0kp679hcpc0ybaj53pmwxj7"; 15 15 }; 16 16 17 17 goPackagePath = "github.com/opencontainers/runc"; ··· 53 53 homepage = https://runc.io/; 54 54 description = "A CLI tool for spawning and running containers according to the OCI specification"; 55 55 license = licenses.asl20; 56 - maintainers = with maintainers; [ offline vdemeester ]; 56 + maintainers = with maintainers; [ offline vdemeester saschagrunert ]; 57 57 platforms = platforms.linux; 58 58 }; 59 59 }
+1 -1
pkgs/data/fonts/gohufont/default.nix
··· 24 24 # convert bdf to psf fonts 25 25 build=$(pwd) 26 26 mkdir psf 27 - cd ${bdf2psf}/usr/share/bdf2psf 27 + cd ${bdf2psf}/share/bdf2psf 28 28 for i in $bdf/*.bdf; do 29 29 bdf2psf \ 30 30 --fb "$i" standard.equivalents \
+161 -131
pkgs/development/compilers/elm/packages/node-packages.nix
··· 13 13 sha512 = "r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA=="; 14 14 }; 15 15 }; 16 - "@nodelib/fs.scandir-2.1.2" = { 16 + "@nodelib/fs.scandir-2.1.3" = { 17 17 name = "_at_nodelib_slash_fs.scandir"; 18 18 packageName = "@nodelib/fs.scandir"; 19 - version = "2.1.2"; 19 + version = "2.1.3"; 20 20 src = fetchurl { 21 - url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.2.tgz"; 22 - sha512 = "wrIBsjA5pl13f0RN4Zx4FNWmU71lv03meGKnqRUoCyan17s4V3WL92f3w3AIuWbNnpcrQyFBU5qMavJoB8d27w=="; 21 + url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz"; 22 + sha512 = "eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw=="; 23 23 }; 24 24 }; 25 - "@nodelib/fs.stat-2.0.2" = { 25 + "@nodelib/fs.stat-2.0.3" = { 26 26 name = "_at_nodelib_slash_fs.stat"; 27 27 packageName = "@nodelib/fs.stat"; 28 - version = "2.0.2"; 28 + version = "2.0.3"; 29 29 src = fetchurl { 30 - url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.2.tgz"; 31 - sha512 = "z8+wGWV2dgUhLqrtRYa03yDx4HWMvXKi1z8g3m2JyxAx8F7xk74asqPk5LAETjqDSGLFML/6CDl0+yFunSYicw=="; 30 + url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz"; 31 + sha512 = "bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA=="; 32 32 }; 33 33 }; 34 - "@nodelib/fs.walk-1.2.3" = { 34 + "@nodelib/fs.walk-1.2.4" = { 35 35 name = "_at_nodelib_slash_fs.walk"; 36 36 packageName = "@nodelib/fs.walk"; 37 - version = "1.2.3"; 37 + version = "1.2.4"; 38 38 src = fetchurl { 39 - url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.3.tgz"; 40 - sha512 = "l6t8xEhfK9Sa4YO5mIRdau7XSOADfmh3jCr0evNHdY+HNkW6xuQhgMH7D73VV6WpZOagrW0UludvMTiifiwTfA=="; 39 + url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz"; 40 + sha512 = "1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ=="; 41 41 }; 42 42 }; 43 43 "@sindresorhus/is-0.7.0" = { ··· 76 76 sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; 77 77 }; 78 78 }; 79 - "@types/node-12.7.5" = { 79 + "@types/node-12.7.12" = { 80 80 name = "_at_types_slash_node"; 81 81 packageName = "@types/node"; 82 - version = "12.7.5"; 82 + version = "12.7.12"; 83 83 src = fetchurl { 84 - url = "https://registry.npmjs.org/@types/node/-/node-12.7.5.tgz"; 85 - sha512 = "9fq4jZVhPNW8r+UYKnxF1e2HkDWOWKM5bC2/7c9wPV835I0aOrVbS/Hw/pWPk2uKrNXQqg9Z959Kz+IYDd5p3w=="; 84 + url = "https://registry.npmjs.org/@types/node/-/node-12.7.12.tgz"; 85 + sha512 = "KPYGmfD0/b1eXurQ59fXD1GBzhSQfz6/lKBxkaHX9dKTzjXbK68Zt7yGUxUsCS1jeTy/8aL+d9JEr+S54mpkWQ=="; 86 86 }; 87 87 }; 88 88 "accepts-1.3.7" = { ··· 148 148 sha512 = "5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw=="; 149 149 }; 150 150 }; 151 - "anymatch-3.1.0" = { 151 + "anymatch-3.1.1" = { 152 152 name = "anymatch"; 153 153 packageName = "anymatch"; 154 - version = "3.1.0"; 154 + version = "3.1.1"; 155 155 src = fetchurl { 156 - url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.0.tgz"; 157 - sha512 = "Ozz7l4ixzI7Oxj2+cw+p0tVUt27BpaJ+1+q1TCeANWxHpvyn2+Un+YamBdfKu0uh8xLodGhoa1v7595NhKDAuA=="; 156 + url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz"; 157 + sha512 = "mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg=="; 158 158 }; 159 159 }; 160 160 "arr-diff-4.0.0" = { ··· 382 382 sha512 = "Y+Wvypk3JhH5GPZAvlwJAWOVH/OsOhQMSj37vySuWHwQivoALplPxfBA8b973rFJI7OS+O+1YmmYXIiEXVMAcw=="; 383 383 }; 384 384 }; 385 - "bluebird-3.5.5" = { 385 + "bluebird-3.7.0" = { 386 386 name = "bluebird"; 387 387 packageName = "bluebird"; 388 - version = "3.5.5"; 388 + version = "3.7.0"; 389 389 src = fetchurl { 390 - url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz"; 391 - sha512 = "5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w=="; 390 + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.0.tgz"; 391 + sha512 = "aBQ1FxIa7kSWCcmKHlcHFlT2jt6J/l4FzC7KcPELkOJOsPOb/bccdhmIrKDfXhwFrmc7vDoDrrepFvGqjyXGJg=="; 392 392 }; 393 393 }; 394 394 "body-parser-1.18.2" = { ··· 598 598 sha512 = "c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA=="; 599 599 }; 600 600 }; 601 - "chownr-1.1.2" = { 601 + "chownr-1.1.3" = { 602 602 name = "chownr"; 603 603 packageName = "chownr"; 604 - version = "1.1.2"; 604 + version = "1.1.3"; 605 605 src = fetchurl { 606 - url = "https://registry.npmjs.org/chownr/-/chownr-1.1.2.tgz"; 607 - sha512 = "GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A=="; 606 + url = "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz"; 607 + sha512 = "i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw=="; 608 608 }; 609 609 }; 610 610 "class-utils-0.3.6" = { ··· 679 679 sha512 = "wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="; 680 680 }; 681 681 }; 682 - "commander-3.0.1" = { 682 + "commander-3.0.2" = { 683 683 name = "commander"; 684 684 packageName = "commander"; 685 - version = "3.0.1"; 685 + version = "3.0.2"; 686 686 src = fetchurl { 687 - url = "https://registry.npmjs.org/commander/-/commander-3.0.1.tgz"; 688 - sha512 = "UNgvDd+csKdc9GD4zjtkHKQbT8Aspt2jCBqNSPp53vAS0L1tS9sXB2TCEOPHJ7kt9bN/niWkYj8T3RQSoMXdSQ=="; 687 + url = "https://registry.npmjs.org/commander/-/commander-3.0.2.tgz"; 688 + sha512 = "Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow=="; 689 689 }; 690 690 }; 691 691 "component-emitter-1.3.0" = { ··· 857 857 src = fetchurl { 858 858 url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz"; 859 859 sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; 860 + }; 861 + }; 862 + "cross-spawn-7.0.1" = { 863 + name = "cross-spawn"; 864 + packageName = "cross-spawn"; 865 + version = "7.0.1"; 866 + src = fetchurl { 867 + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.1.tgz"; 868 + sha512 = "u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg=="; 860 869 }; 861 870 }; 862 871 "crypt-0.0.2" = { ··· 1112 1103 sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; 1113 1104 }; 1114 1105 }; 1115 - "end-of-stream-1.4.1" = { 1106 + "end-of-stream-1.4.4" = { 1116 1107 name = "end-of-stream"; 1117 1108 packageName = "end-of-stream"; 1118 - version = "1.4.1"; 1109 + version = "1.4.4"; 1119 1110 src = fetchurl { 1120 - url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz"; 1121 - sha512 = "1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q=="; 1111 + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"; 1112 + sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; 1122 1113 }; 1123 1114 }; 1124 - "es-abstract-1.14.2" = { 1115 + "es-abstract-1.15.0" = { 1125 1116 name = "es-abstract"; 1126 1117 packageName = "es-abstract"; 1127 - version = "1.14.2"; 1118 + version = "1.15.0"; 1128 1119 src = fetchurl { 1129 - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.14.2.tgz"; 1130 - sha512 = "DgoQmbpFNOofkjJtKwr87Ma5EW4Dc8fWhD0R+ndq7Oc456ivUfGOOP6oAZTTKl5/CcNMP+EN+e3/iUzgE0veZg=="; 1120 + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.15.0.tgz"; 1121 + sha512 = "bhkEqWJ2t2lMeaJDuk7okMkJWI/yqgH/EoGwpcvv0XW9RWQsRspI4wt6xuyuvMvvQE3gg/D9HXppgk21w78GyQ=="; 1131 1122 }; 1132 1123 }; 1133 1124 "es-to-primitive-1.2.0" = { ··· 1202 1193 sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; 1203 1194 }; 1204 1195 }; 1205 - "execa-2.0.4" = { 1196 + "execa-2.1.0" = { 1206 1197 name = "execa"; 1207 1198 packageName = "execa"; 1208 - version = "2.0.4"; 1199 + version = "2.1.0"; 1209 1200 src = fetchurl { 1210 - url = "https://registry.npmjs.org/execa/-/execa-2.0.4.tgz"; 1211 - sha512 = "VcQfhuGD51vQUQtKIq2fjGDLDbL6N1DTQVpYzxZ7LPIXw3HqTuIz6uxRmpV1qf8i31LHf2kjiaGI+GdHwRgbnQ=="; 1201 + url = "https://registry.npmjs.org/execa/-/execa-2.1.0.tgz"; 1202 + sha512 = "Y/URAVapfbYy2Xp/gb6A0E7iR8xeqOCXsuuaoMn7A5PzrXUK84E1gyiEfq0wQd/GHA6GsoHWwhNq8anb0mleIw=="; 1212 1203 }; 1213 1204 }; 1214 1205 "expand-brackets-2.1.4" = { ··· 1319 1310 sha512 = "xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="; 1320 1311 }; 1321 1312 }; 1322 - "fast-glob-3.0.4" = { 1313 + "fast-glob-3.1.0" = { 1323 1314 name = "fast-glob"; 1324 1315 packageName = "fast-glob"; 1325 - version = "3.0.4"; 1316 + version = "3.1.0"; 1326 1317 src = fetchurl { 1327 - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.0.4.tgz"; 1328 - sha512 = "wkIbV6qg37xTJwqSsdnIphL1e+LaGz4AIQqr00mIubMaEhv1/HEmJ0uuCGZRNRUkZZmOB5mJKO0ZUTVq+SxMQg=="; 1318 + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.1.0.tgz"; 1319 + sha512 = "TrUz3THiq2Vy3bjfQUB2wNyPdGBeGmdjbzzBLhfHN4YFurYptCKwGq/TfiRavbGywFRzY6U2CdmQ1zmsY5yYaw=="; 1329 1320 }; 1330 1321 }; 1331 1322 "fast-json-stable-stringify-2.0.0" = { ··· 1562 1553 sha512 = "GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA=="; 1563 1554 }; 1564 1555 }; 1565 - "fs-minipass-1.2.6" = { 1556 + "fs-minipass-1.2.7" = { 1566 1557 name = "fs-minipass"; 1567 1558 packageName = "fs-minipass"; 1568 - version = "1.2.6"; 1559 + version = "1.2.7"; 1569 1560 src = fetchurl { 1570 - url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.6.tgz"; 1571 - sha512 = "crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ=="; 1561 + url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz"; 1562 + sha512 = "GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA=="; 1572 1563 }; 1573 1564 }; 1574 1565 "fs.realpath-1.0.0" = { ··· 1598 1589 sha512 = "oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw=="; 1599 1590 }; 1600 1591 }; 1601 - "fsevents-2.0.7" = { 1592 + "fsevents-2.1.0" = { 1602 1593 name = "fsevents"; 1603 1594 packageName = "fsevents"; 1604 - version = "2.0.7"; 1595 + version = "2.1.0"; 1605 1596 src = fetchurl { 1606 - url = "https://registry.npmjs.org/fsevents/-/fsevents-2.0.7.tgz"; 1607 - sha512 = "a7YT0SV3RB+DjYcppwVDLtn13UQnmg0SWZS7ezZD0UjnLwXmy8Zm21GMVGLaFGimIqcvyMQaOJBrop8MyOp1kQ=="; 1597 + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.0.tgz"; 1598 + sha512 = "+iXhW3LuDQsno8dOIrCIT/CBjeBWuP7PXe8w9shnj9Lebny/Gx1ZjVBYwexLz36Ri2jKuXMNpV6CYNh8lHHgrQ=="; 1608 1599 }; 1609 1600 }; 1610 1601 "function-bind-1.1.1" = { ··· 1706 1697 sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae"; 1707 1698 }; 1708 1699 }; 1709 - "glob-parent-5.0.0" = { 1700 + "glob-parent-5.1.0" = { 1710 1701 name = "glob-parent"; 1711 1702 packageName = "glob-parent"; 1712 - version = "5.0.0"; 1703 + version = "5.1.0"; 1713 1704 src = fetchurl { 1714 - url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.0.0.tgz"; 1715 - sha512 = "Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg=="; 1705 + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz"; 1706 + sha512 = "qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw=="; 1716 1707 }; 1717 1708 }; 1718 1709 "globby-10.0.1" = { ··· 2759 2750 sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; 2760 2751 }; 2761 2752 }; 2762 - "minipass-2.5.1" = { 2753 + "minipass-2.9.0" = { 2763 2754 name = "minipass"; 2764 2755 packageName = "minipass"; 2765 - version = "2.5.1"; 2756 + version = "2.9.0"; 2766 2757 src = fetchurl { 2767 - url = "https://registry.npmjs.org/minipass/-/minipass-2.5.1.tgz"; 2768 - sha512 = "dmpSnLJtNQioZFI5HfQ55Ad0DzzsMAb+HfokwRTNXwEQjepbTkl5mtIlSVxGIkOkxlpX7wIn5ET/oAd9fZ/Y/Q=="; 2758 + url = "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz"; 2759 + sha512 = "wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg=="; 2769 2760 }; 2770 2761 }; 2771 - "minizlib-1.2.2" = { 2762 + "minizlib-1.3.3" = { 2772 2763 name = "minizlib"; 2773 2764 packageName = "minizlib"; 2774 - version = "1.2.2"; 2765 + version = "1.3.3"; 2775 2766 src = fetchurl { 2776 - url = "https://registry.npmjs.org/minizlib/-/minizlib-1.2.2.tgz"; 2777 - sha512 = "hR3At21uSrsjjDTWrbu0IMLTpnkpv8IIMFDFaoz43Tmu4LkmAXfH44vNNzpTnf+OAQQCHrb91y/wc2J4x5XgSQ=="; 2767 + url = "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz"; 2768 + sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q=="; 2778 2769 }; 2779 2770 }; 2780 2771 "mixin-deep-1.3.2" = { ··· 3524 3515 sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ=="; 3525 3516 }; 3526 3517 }; 3527 - "readdirp-3.1.2" = { 3518 + "readdirp-3.1.3" = { 3528 3519 name = "readdirp"; 3529 3520 packageName = "readdirp"; 3530 - version = "3.1.2"; 3521 + version = "3.1.3"; 3531 3522 src = fetchurl { 3532 - url = "https://registry.npmjs.org/readdirp/-/readdirp-3.1.2.tgz"; 3533 - sha512 = "8rhl0xs2cxfVsqzreYCvs8EwBfn/DhVdqtoLmw19uI3SC5avYX9teCurlErfpPXGmYtMHReGaP2RsLnFvz/lnw=="; 3523 + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.1.3.tgz"; 3524 + sha512 = "ZOsfTGkjO2kqeR5Mzr5RYDbTGYneSkdNKX2fOX2P5jF7vMrd/GNnIAUtDldeHHumHUCQ3V05YfWUdxMPAsRu9Q=="; 3534 3525 }; 3535 3526 }; 3536 3527 "regenerator-runtime-0.9.6" = { ··· 3920 3911 sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; 3921 3912 }; 3922 3913 }; 3914 + "shebang-command-2.0.0" = { 3915 + name = "shebang-command"; 3916 + packageName = "shebang-command"; 3917 + version = "2.0.0"; 3918 + src = fetchurl { 3919 + url = "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz"; 3920 + sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; 3921 + }; 3922 + }; 3923 3923 "shebang-regex-1.0.0" = { 3924 3924 name = "shebang-regex"; 3925 3925 packageName = "shebang-regex"; ··· 3936 3918 src = fetchurl { 3937 3919 url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"; 3938 3920 sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; 3921 + }; 3922 + }; 3923 + "shebang-regex-3.0.0" = { 3924 + name = "shebang-regex"; 3925 + packageName = "shebang-regex"; 3926 + version = "3.0.0"; 3927 + src = fetchurl { 3928 + url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"; 3929 + sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; 3939 3930 }; 3940 3931 }; 3941 3932 "signal-exit-3.0.2" = { ··· 4235 4208 sha512 = "tPYCsLGWTDRlET7cen2iAwbmO+lSwfIdKoLkUPC41t/54UhqbzpwXL4RhODu5fQnmZdQZlEFKeD0W/BysU5WEg=="; 4236 4209 }; 4237 4210 }; 4238 - "tar-4.4.10" = { 4211 + "tar-4.4.13" = { 4239 4212 name = "tar"; 4240 4213 packageName = "tar"; 4241 - version = "4.4.10"; 4214 + version = "4.4.13"; 4242 4215 src = fetchurl { 4243 - url = "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz"; 4244 - sha512 = "g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA=="; 4216 + url = "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz"; 4217 + sha512 = "w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA=="; 4245 4218 }; 4246 4219 }; 4247 4220 "temp-0.8.3" = { ··· 4703 4676 sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; 4704 4677 }; 4705 4678 }; 4679 + "which-2.0.1" = { 4680 + name = "which"; 4681 + packageName = "which"; 4682 + version = "2.0.1"; 4683 + src = fetchurl { 4684 + url = "https://registry.npmjs.org/which/-/which-2.0.1.tgz"; 4685 + sha512 = "N7GBZOTswtB9lkQBZA4+zAXrjEIWAUOB93AvzUiudRzRxhUdLURQ7D/gAIMY1gatT/LTbmbcv8SiYazy3eYB7w=="; 4686 + }; 4687 + }; 4706 4688 "which-module-2.0.0" = { 4707 4689 name = "which-module"; 4708 4690 packageName = "which-module"; ··· 4829 4793 sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; 4830 4794 }; 4831 4795 }; 4832 - "yallist-3.0.3" = { 4796 + "yallist-3.1.1" = { 4833 4797 name = "yallist"; 4834 4798 packageName = "yallist"; 4835 - version = "3.0.3"; 4799 + version = "3.1.1"; 4836 4800 src = fetchurl { 4837 - url = "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz"; 4838 - sha512 = "S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="; 4801 + url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"; 4802 + sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; 4839 4803 }; 4840 4804 }; 4841 4805 "yargs-13.3.0" = { ··· 4906 4870 sources."binary-0.3.0" 4907 4871 sources."binary-extensions-1.13.1" 4908 4872 sources."binwrap-0.2.2" 4909 - sources."bluebird-3.5.5" 4873 + sources."bluebird-3.7.0" 4910 4874 sources."brace-expansion-1.1.11" 4911 4875 (sources."braces-2.3.2" // { 4912 4876 dependencies = [ ··· 4924 4888 sources."fsevents-1.2.9" 4925 4889 ]; 4926 4890 }) 4927 - sources."chownr-1.1.2" 4891 + sources."chownr-1.1.3" 4928 4892 (sources."class-utils-0.3.6" // { 4929 4893 dependencies = [ 4930 4894 sources."define-property-0.2.5" ··· 5008 4972 sources."form-data-2.3.3" 5009 4973 sources."fragment-cache-0.2.1" 5010 4974 sources."fs-extra-0.30.0" 5011 - sources."fs-minipass-1.2.6" 4975 + sources."fs-minipass-1.2.7" 5012 4976 sources."fs.realpath-1.0.0" 5013 4977 sources."fsevents-1.2.4" 5014 4978 sources."get-value-2.0.6" ··· 5069 5033 sources."mime-types-2.1.24" 5070 5034 sources."minimatch-3.0.4" 5071 5035 sources."minimist-1.2.0" 5072 - (sources."minipass-2.5.1" // { 5036 + (sources."minipass-2.9.0" // { 5073 5037 dependencies = [ 5074 - sources."yallist-3.0.3" 5038 + sources."yallist-3.1.1" 5075 5039 ]; 5076 5040 }) 5077 - sources."minizlib-1.2.2" 5041 + sources."minizlib-1.3.3" 5078 5042 sources."mixin-deep-1.3.2" 5079 5043 (sources."mkdirp-0.5.1" // { 5080 5044 dependencies = [ ··· 5196 5160 sources."stealthy-require-1.1.1" 5197 5161 sources."string_decoder-1.1.1" 5198 5162 sources."supports-color-4.2.0" 5199 - (sources."tar-4.4.10" // { 5163 + (sources."tar-4.4.13" // { 5200 5164 dependencies = [ 5201 - sources."yallist-3.0.3" 5165 + sources."yallist-3.1.1" 5202 5166 ]; 5203 5167 }) 5204 5168 (sources."temp-0.8.3" // { ··· 5263 5227 elm-verify-examples = nodeEnv.buildNodePackage { 5264 5228 name = "elm-verify-examples"; 5265 5229 packageName = "elm-verify-examples"; 5266 - version = "4.0.1"; 5230 + version = "4.0.2"; 5267 5231 src = fetchurl { 5268 - url = "https://registry.npmjs.org/elm-verify-examples/-/elm-verify-examples-4.0.1.tgz"; 5269 - sha512 = "YlkOLWIDnlgkKG8gnxQkKKJHkkx4MqyIXqjmYqvGPwatrPmLo46BJ2drOPHNIh43T7mh7c1K8vxrzV4seQtFUA=="; 5232 + url = "https://registry.npmjs.org/elm-verify-examples/-/elm-verify-examples-4.0.2.tgz"; 5233 + sha512 = "zvQ1SvfXyMCb9TwiC74+QyFsl/4Hjpr1lb37QRKWrSCu+hOhbxM2MkJ6+KP1izGK36kzRr97y81Z1of0/EX3cg=="; 5270 5234 }; 5271 5235 dependencies = [ 5272 5236 sources."ajv-6.10.2" ··· 5299 5263 sources."binary-0.3.0" 5300 5264 sources."binary-extensions-1.13.1" 5301 5265 sources."binwrap-0.2.2" 5302 - sources."bluebird-3.5.5" 5266 + sources."bluebird-3.7.0" 5303 5267 sources."brace-expansion-1.1.11" 5304 5268 (sources."braces-2.3.2" // { 5305 5269 dependencies = [ ··· 5318 5282 sources."fsevents-1.2.9" 5319 5283 ]; 5320 5284 }) 5321 - sources."chownr-1.1.2" 5285 + sources."chownr-1.1.3" 5322 5286 (sources."class-utils-0.3.6" // { 5323 5287 dependencies = [ 5324 5288 sources."define-property-0.2.5" ··· 5418 5382 sources."jsonfile-4.0.0" 5419 5383 ]; 5420 5384 }) 5421 - sources."fs-minipass-1.2.6" 5385 + sources."fs-minipass-1.2.7" 5422 5386 sources."fs.realpath-1.0.0" 5423 5387 sources."fsevents-1.2.4" 5424 5388 sources."get-caller-file-2.0.5" ··· 5482 5446 sources."mime-types-2.1.24" 5483 5447 sources."minimatch-3.0.4" 5484 5448 sources."minimist-1.2.0" 5485 - (sources."minipass-2.5.1" // { 5449 + (sources."minipass-2.9.0" // { 5486 5450 dependencies = [ 5487 - sources."yallist-3.0.3" 5451 + sources."yallist-3.1.1" 5488 5452 ]; 5489 5453 }) 5490 - sources."minizlib-1.2.2" 5454 + sources."minizlib-1.3.3" 5491 5455 sources."mixin-deep-1.3.2" 5492 5456 (sources."mkdirp-0.5.1" // { 5493 5457 dependencies = [ ··· 5618 5582 sources."string_decoder-1.1.1" 5619 5583 sources."strip-ansi-5.2.0" 5620 5584 sources."supports-color-5.5.0" 5621 - (sources."tar-4.4.10" // { 5585 + (sources."tar-4.4.13" // { 5622 5586 dependencies = [ 5623 - sources."yallist-3.0.3" 5587 + sources."yallist-3.1.1" 5624 5588 ]; 5625 5589 }) 5626 5590 (sources."temp-0.8.3" // { ··· 5754 5718 sources."collection-visit-1.0.0" 5755 5719 sources."color-convert-1.9.3" 5756 5720 sources."color-name-1.1.3" 5757 - sources."commander-3.0.1" 5721 + sources."commander-3.0.2" 5758 5722 sources."component-emitter-1.3.0" 5759 5723 sources."concat-map-0.0.1" 5760 5724 sources."content-disposition-0.5.3" ··· 5776 5740 sources."duplexer3-0.1.4" 5777 5741 sources."ee-first-1.1.1" 5778 5742 sources."encodeurl-1.0.2" 5779 - sources."end-of-stream-1.4.1" 5780 - sources."es-abstract-1.14.2" 5743 + sources."end-of-stream-1.4.4" 5744 + sources."es-abstract-1.15.0" 5781 5745 sources."es-to-primitive-1.2.0" 5782 5746 sources."escape-html-1.0.3" 5783 5747 sources."escape-string-regexp-1.0.5" ··· 6342 6306 elm-live = nodeEnv.buildNodePackage { 6343 6307 name = "elm-live"; 6344 6308 packageName = "elm-live"; 6345 - version = "4.0.0"; 6309 + version = "4.0.1"; 6346 6310 src = fetchurl { 6347 - url = "https://registry.npmjs.org/elm-live/-/elm-live-4.0.0.tgz"; 6348 - sha512 = "Yf6afXvBnghRZkefxgXCf/KjCm3DlwT6lfTrjLSc5v0I0VXE2Rc5T9iqXihjg3alh9t8NwDVLL+/py8PkkdC9Q=="; 6311 + url = "https://registry.npmjs.org/elm-live/-/elm-live-4.0.1.tgz"; 6312 + sha512 = "IlonaC1pO/QoXlOrwwrJaxyvpJAT8QDSfzenkChbhU1PC1fJetkj2TwZfki+y1ZxpSMTnMSomMraOdWA6DO3VQ=="; 6349 6313 }; 6350 6314 dependencies = [ 6351 6315 sources."ansi-regex-2.1.1" 6352 6316 sources."ansi-styles-2.2.1" 6353 - sources."anymatch-3.1.0" 6317 + sources."anymatch-3.1.1" 6354 6318 sources."async-limiter-1.0.1" 6355 6319 sources."binary-extensions-2.0.0" 6356 6320 sources."braces-3.0.2" ··· 6368 6332 sources."ee-first-1.1.1" 6369 6333 sources."elm-hot-1.1.1" 6370 6334 sources."encodeurl-1.0.2" 6371 - sources."end-of-stream-1.4.1" 6335 + sources."end-of-stream-1.4.4" 6372 6336 sources."es6-promisify-6.0.2" 6373 6337 sources."escape-html-1.0.3" 6374 6338 sources."escape-string-regexp-1.0.5" ··· 6388 6352 ]; 6389 6353 }) 6390 6354 sources."fresh-0.5.2" 6391 - sources."fsevents-2.0.7" 6355 + sources."fsevents-2.1.0" 6392 6356 sources."get-stream-4.1.0" 6393 - sources."glob-parent-5.0.0" 6357 + sources."glob-parent-5.1.0" 6394 6358 sources."has-ansi-2.0.0" 6395 6359 sources."http-errors-1.7.3" 6396 6360 sources."http-proxy-1.17.0" ··· 6425 6389 sources."pseudomap-1.0.2" 6426 6390 sources."pump-3.0.0" 6427 6391 sources."range-parser-1.2.1" 6428 - sources."readdirp-3.1.2" 6392 + sources."readdirp-3.1.3" 6429 6393 sources."requires-port-1.0.0" 6430 6394 sources."semver-5.7.1" 6431 6395 (sources."send-0.17.1" // { ··· 6470 6434 sha512 = "9AjXLkznJBVLHHO+KErcgFMKeXe3tcudjj3PYIH6gWXG6W3PT+HF+t2zCflvgFPlhJO5H/wQCCo4rfCApltBzg=="; 6471 6435 }; 6472 6436 dependencies = [ 6473 - sources."bluebird-3.5.5" 6437 + sources."bluebird-3.7.0" 6474 6438 sources."core-util-is-1.0.2" 6475 6439 sources."fs-extra-6.0.1" 6476 6440 sources."graceful-fs-4.2.2" ··· 6510 6474 sha512 = "gzN/ee5JfQmg/+2xFq49zRN62ZFeMTu5A0unwQpOf3qLZa8Rz7no6OIaCnl6nEkNsaoAjvZxv1aFJOd2TtNtFw=="; 6511 6475 }; 6512 6476 dependencies = [ 6513 - sources."@nodelib/fs.scandir-2.1.2" 6514 - sources."@nodelib/fs.stat-2.0.2" 6515 - sources."@nodelib/fs.walk-1.2.3" 6477 + sources."@nodelib/fs.scandir-2.1.3" 6478 + sources."@nodelib/fs.stat-2.0.3" 6479 + sources."@nodelib/fs.walk-1.2.4" 6516 6480 sources."@types/events-3.0.0" 6517 6481 sources."@types/glob-7.1.1" 6518 6482 sources."@types/minimatch-3.0.3" 6519 - sources."@types/node-12.7.5" 6483 + sources."@types/node-12.7.12" 6520 6484 sources."accepts-1.3.7" 6521 6485 sources."ajv-6.10.2" 6522 6486 sources."array-flatten-1.1.1" ··· 6544 6508 sources."cookie-signature-1.0.6" 6545 6509 sources."core-js-2.6.9" 6546 6510 sources."core-util-is-1.0.2" 6547 - sources."cross-spawn-6.0.5" 6511 + sources."cross-spawn-7.0.1" 6548 6512 sources."dashdash-1.14.1" 6549 6513 sources."debug-2.6.9" 6550 6514 sources."delayed-stream-1.0.0" ··· 6560 6524 ]; 6561 6525 }) 6562 6526 sources."encodeurl-1.0.2" 6563 - sources."end-of-stream-1.4.1" 6527 + sources."end-of-stream-1.4.4" 6564 6528 sources."escape-html-1.0.3" 6565 6529 sources."etag-1.8.1" 6566 - (sources."execa-2.0.4" // { 6530 + (sources."execa-2.1.0" // { 6567 6531 dependencies = [ 6568 6532 sources."is-stream-2.0.0" 6569 6533 ]; ··· 6578 6542 sources."extsprintf-1.3.0" 6579 6543 sources."fast-deep-equal-2.0.1" 6580 6544 sources."fast-diff-1.2.0" 6581 - sources."fast-glob-3.0.4" 6545 + sources."fast-glob-3.1.0" 6582 6546 sources."fast-json-stable-stringify-2.0.0" 6583 6547 sources."fastq-1.6.0" 6584 6548 sources."fill-range-7.0.1" ··· 6593 6557 sources."get-stream-5.1.0" 6594 6558 sources."getpass-0.1.7" 6595 6559 sources."glob-7.1.4" 6596 - sources."glob-parent-5.0.0" 6560 + sources."glob-parent-5.1.0" 6597 6561 sources."globby-10.0.1" 6598 6562 sources."graceful-fs-4.2.2" 6599 6563 sources."har-schema-2.0.0" ··· 6635 6599 sources."minimist-1.2.0" 6636 6600 sources."ms-2.0.0" 6637 6601 sources."negotiator-0.6.2" 6638 - sources."nice-try-1.0.5" 6639 6602 sources."node-watch-0.5.5" 6640 - (sources."npm-run-path-3.1.0" // { 6641 - dependencies = [ 6642 - sources."path-key-3.1.0" 6643 - ]; 6644 - }) 6603 + sources."npm-run-path-3.1.0" 6645 6604 sources."oauth-sign-0.9.0" 6646 6605 sources."on-finished-2.3.0" 6647 6606 sources."once-1.4.0" ··· 6648 6617 sources."p-finally-2.0.1" 6649 6618 sources."parseurl-1.3.3" 6650 6619 sources."path-is-absolute-1.0.1" 6651 - sources."path-key-2.0.1" 6620 + sources."path-key-3.1.0" 6652 6621 sources."path-to-regexp-0.1.7" 6653 6622 sources."path-type-4.0.0" 6654 6623 sources."performance-now-2.1.0" ··· 6680 6649 sources."rxjs-6.5.3" 6681 6650 sources."safe-buffer-5.1.1" 6682 6651 sources."safer-buffer-2.1.2" 6683 - sources."semver-5.7.1" 6684 6652 sources."send-0.16.2" 6685 6653 sources."serve-static-1.13.2" 6686 6654 sources."setprototypeof-1.1.0" 6687 - sources."shebang-command-1.2.0" 6688 - sources."shebang-regex-1.0.0" 6655 + sources."shebang-command-2.0.0" 6656 + sources."shebang-regex-3.0.0" 6689 6657 sources."signal-exit-3.0.2" 6690 6658 sources."slash-3.0.0" 6691 6659 sources."sshpk-1.16.1" ··· 6724 6694 sources."vscode-languageserver-types-3.14.0" 6725 6695 sources."vscode-uri-2.0.3" 6726 6696 sources."web-tree-sitter-0.15.9" 6727 - sources."which-1.3.1" 6697 + sources."which-2.0.1" 6728 6698 sources."wrappy-1.0.2" 6729 6699 sources."ws-7.1.2" 6730 6700 sources."xtend-4.0.2"
+239
pkgs/development/compilers/go/1.13.nix
··· 1 + { stdenv, fetchurl, tzdata, iana-etc, runCommand 2 + , perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation 3 + , mailcap, runtimeShell 4 + , buildPackages, pkgsTargetTarget 5 + }: 6 + 7 + let 8 + 9 + inherit (stdenv.lib) optionals optionalString; 10 + 11 + goBootstrap = runCommand "go-bootstrap" {} '' 12 + mkdir $out 13 + cp -rf ${buildPackages.go_bootstrap}/* $out/ 14 + chmod -R u+w $out 15 + find $out -name "*.c" -delete 16 + cp -rf $out/bin/* $out/share/go/bin/ 17 + ''; 18 + 19 + goarch = platform: { 20 + "i686" = "386"; 21 + "x86_64" = "amd64"; 22 + "aarch64" = "arm64"; 23 + "arm" = "arm"; 24 + "armv5tel" = "arm"; 25 + "armv6l" = "arm"; 26 + "armv7l" = "arm"; 27 + }.${platform.parsed.cpu.name} or (throw "Unsupported system"); 28 + 29 + in 30 + 31 + stdenv.mkDerivation rec { 32 + pname = "go"; 33 + version = "1.13.1"; 34 + 35 + src = fetchurl { 36 + url = "https://dl.google.com/go/go${version}.src.tar.gz"; 37 + sha256 = "0n4k42bbrj5g9b1kczkfsih049v43vqzaps7n69gmfa4jpk59wc1"; 38 + }; 39 + 40 + # perl is used for testing go vet 41 + nativeBuildInputs = [ perl which pkgconfig patch procps ]; 42 + buildInputs = [ cacert pcre ] 43 + ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] 44 + ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; 45 + 46 + 47 + propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; 48 + 49 + hardeningDisable = [ "all" ]; 50 + 51 + prePatch = '' 52 + patchShebangs ./ # replace /bin/bash 53 + 54 + # This source produces shell script at run time, 55 + # and thus it is not corrected by patchShebangs. 56 + substituteInPlace misc/cgo/testcarchive/carchive_test.go \ 57 + --replace '#!/usr/bin/env bash' '#!${runtimeShell}' 58 + 59 + # Patch the mimetype database location which is missing on NixOS. 60 + substituteInPlace src/mime/type_unix.go \ 61 + --replace '/etc/mime.types' '${mailcap}/etc/mime.types' 62 + 63 + # Disabling the 'os/http/net' tests (they want files not available in 64 + # chroot builds) 65 + rm src/net/{listen,parse}_test.go 66 + rm src/syscall/exec_linux_test.go 67 + 68 + # !!! substituteInPlace does not seems to be effective. 69 + # The os test wants to read files in an existing path. Just don't let it be /usr/bin. 70 + sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go 71 + sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go 72 + # Disable the unix socket test 73 + sed -i '/TestShutdownUnix/aif true \{ return\; \}' src/net/net_test.go 74 + # Disable the hostname test 75 + sed -i '/TestHostname/aif true \{ return\; \}' src/os/os_test.go 76 + # ParseInLocation fails the test 77 + sed -i '/TestParseInSydney/aif true \{ return\; \}' src/time/format_test.go 78 + # Remove the api check as it never worked 79 + sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go 80 + # Remove the coverage test as we have removed this utility 81 + sed -i '/TestCoverageWithCgo/aif true \{ return\; \}' src/cmd/go/go_test.go 82 + # Remove the timezone naming test 83 + sed -i '/TestLoadFixed/aif true \{ return\; \}' src/time/time_test.go 84 + # Remove disable setgid test 85 + sed -i '/TestRespectSetgidDir/aif true \{ return\; \}' src/cmd/go/internal/work/build_test.go 86 + # Remove cert tests that conflict with NixOS's cert resolution 87 + sed -i '/TestEnvVars/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go 88 + # TestWritevError hangs sometimes 89 + sed -i '/TestWritevError/aif true \{ return\; \}' src/net/writev_test.go 90 + # TestVariousDeadlines fails sometimes 91 + sed -i '/TestVariousDeadlines/aif true \{ return\; \}' src/net/timeout_test.go 92 + 93 + sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go 94 + sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go 95 + 96 + # Disable cgo lookup tests not works, they depend on resolver 97 + rm src/net/cgo_unix_test.go 98 + 99 + '' + optionalString stdenv.isLinux '' 100 + sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go 101 + '' + optionalString stdenv.isAarch32 '' 102 + echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash 103 + '' + optionalString stdenv.isDarwin '' 104 + substituteInPlace src/race.bash --replace \ 105 + "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true 106 + sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go 107 + sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go 108 + sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go 109 + 110 + sed -i '/TestChdirAndGetwd/aif true \{ return\; \}' src/os/os_test.go 111 + sed -i '/TestCredentialNoSetGroups/aif true \{ return\; \}' src/os/exec/exec_posix_test.go 112 + sed -i '/TestRead0/aif true \{ return\; \}' src/os/os_test.go 113 + sed -i '/TestSystemRoots/aif true \{ return\; \}' src/crypto/x509/root_darwin_test.go 114 + 115 + sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/aif true \{ return\; \}' src/cmd/go/go_test.go 116 + sed -i '/TestBuildDashIInstallsDependencies/aif true \{ return\; \}' src/cmd/go/go_test.go 117 + 118 + sed -i '/TestDisasmExtld/aif true \{ return\; \}' src/cmd/objdump/objdump_test.go 119 + 120 + sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go 121 + 122 + # TestCurrent fails because Current is not implemented on Darwin 123 + sed -i 's/TestCurrent/testCurrent/g' src/os/user/user_test.go 124 + sed -i 's/TestLookup/testLookup/g' src/os/user/user_test.go 125 + 126 + touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd 127 + ''; 128 + 129 + patches = [ 130 + ./remove-tools-1.11.patch 131 + ./ssl-cert-file-1.13.patch 132 + ./remove-test-pie-1.13.patch 133 + ./creds-test.patch 134 + ./go-1.9-skip-flaky-19608.patch 135 + ./go-1.9-skip-flaky-20072.patch 136 + ./skip-external-network-tests.patch 137 + ./skip-nohup-tests.patch 138 + # breaks under load: https://github.com/golang/go/issues/25628 139 + ./skip-test-extra-files-on-386.patch 140 + ]; 141 + 142 + postPatch = '' 143 + find . -name '*.orig' -exec rm {} ';' 144 + ''; 145 + 146 + GOOS = stdenv.targetPlatform.parsed.kernel.name; 147 + GOARCH = goarch stdenv.targetPlatform; 148 + # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. 149 + # Go will nevertheless build a for host system that we will copy over in 150 + # the install phase. 151 + GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; 152 + GOHOSTARCH = goarch stdenv.buildPlatform; 153 + 154 + # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those 155 + # to be different from CC/CXX 156 + CC_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then 157 + "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc" 158 + else 159 + null; 160 + CXX_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then 161 + "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++" 162 + else 163 + null; 164 + 165 + GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]); 166 + GO386 = 387; # from Arch: don't assume sse2 on i686 167 + CGO_ENABLED = 1; 168 + # Hopefully avoids test timeouts on Hydra 169 + GO_TEST_TIMEOUT_SCALE = 3; 170 + 171 + # Indicate that we are running on build infrastructure 172 + # Some tests assume things like home directories and users exists 173 + GO_BUILDER_NAME = "nix"; 174 + 175 + GOROOT_BOOTSTRAP="${goBootstrap}/share/go"; 176 + 177 + postConfigure = '' 178 + export GOCACHE=$TMPDIR/go-cache 179 + # this is compiled into the binary 180 + export GOROOT_FINAL=$out/share/go 181 + 182 + export PATH=$(pwd)/bin:$PATH 183 + 184 + # Independent from host/target, CC should produce code for the building system. 185 + export CC=${buildPackages.stdenv.cc}/bin/cc 186 + ulimit -a 187 + ''; 188 + 189 + postBuild = '' 190 + (cd src && ./make.bash) 191 + ''; 192 + 193 + doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin; 194 + 195 + checkPhase = '' 196 + runHook preCheck 197 + (cd src && HOME=$TMPDIR GOCACHE=$TMPDIR/go-cache ./run.bash --no-rebuild) 198 + runHook postCheck 199 + ''; 200 + 201 + preInstall = '' 202 + rm -r pkg/obj 203 + # Contains the wrong perl shebang when cross compiling, 204 + # since it is not used for anything we can deleted as well. 205 + rm src/regexp/syntax/make_perl_groups.pl 206 + '' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then '' 207 + mv bin/*_*/* bin 208 + rmdir bin/*_* 209 + ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' 210 + rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH} 211 + ''} 212 + '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then '' 213 + rm -rf bin/*_* 214 + ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' 215 + rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH} 216 + ''} 217 + '' else ""); 218 + 219 + installPhase = '' 220 + runHook preInstall 221 + mkdir -p $GOROOT_FINAL 222 + cp -a bin pkg src lib misc api doc $GOROOT_FINAL 223 + ln -s $GOROOT_FINAL/bin $out/bin 224 + runHook postInstall 225 + ''; 226 + 227 + setupHook = ./setup-hook.sh; 228 + 229 + disallowedReferences = [ goBootstrap ]; 230 + 231 + meta = with stdenv.lib; { 232 + branch = "1.13"; 233 + homepage = http://golang.org/; 234 + description = "The Go Programming language"; 235 + license = licenses.bsd3; 236 + maintainers = with maintainers; [ cstrahan orivej velovix mic92 rvolosatovs kalbasit ]; 237 + platforms = platforms.linux ++ platforms.darwin; 238 + }; 239 + }
+34
pkgs/development/compilers/go/remove-test-pie-1.13.patch
··· 1 + diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go 2 + index f63c94697c..f02eff7064 100644 3 + --- a/src/cmd/dist/test.go 4 + +++ b/src/cmd/dist/test.go 5 + @@ -574,29 +574,6 @@ func (t *tester) registerTests() { 6 + }) 7 + } 8 + 9 + - // Test internal linking of PIE binaries where it is supported. 10 + - if goos == "linux" && (goarch == "amd64" || goarch == "arm64") { 11 + - t.tests = append(t.tests, distTest{ 12 + - name: "pie_internal", 13 + - heading: "internal linking of -buildmode=pie", 14 + - fn: func(dt *distTest) error { 15 + - t.addCmd(dt, "src", t.goTest(), "reflect", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60)) 16 + - return nil 17 + - }, 18 + - }) 19 + - // Also test a cgo package. 20 + - if t.cgoEnabled { 21 + - t.tests = append(t.tests, distTest{ 22 + - name: "pie_internal_cgo", 23 + - heading: "internal linking of -buildmode=pie", 24 + - fn: func(dt *distTest) error { 25 + - t.addCmd(dt, "src", t.goTest(), "os/user", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60)) 26 + - return nil 27 + - }, 28 + - }) 29 + - } 30 + - } 31 + - 32 + // sync tests 33 + if goos != "js" { // js doesn't support -cpu=10 34 + t.tests = append(t.tests, distTest{
+64
pkgs/development/compilers/go/ssl-cert-file-1.13.patch
··· 1 + diff --git a/src/crypto/x509/root_cgo_darwin.go b/src/crypto/x509/root_cgo_darwin.go 2 + index 255a8d3525..a467255a54 100644 3 + --- a/src/crypto/x509/root_cgo_darwin.go 4 + +++ b/src/crypto/x509/root_cgo_darwin.go 5 + @@ -280,6 +280,8 @@ int CopyPEMRoots(CFDataRef *pemRoots, CFDataRef *untrustedPemRoots, bool debugDa 6 + import "C" 7 + import ( 8 + "errors" 9 + + "io/ioutil" 10 + + "os" 11 + "unsafe" 12 + ) 13 + 14 + @@ -295,6 +297,13 @@ func loadSystemRoots() (*CertPool, error) { 15 + buf := C.GoBytes(unsafe.Pointer(C.CFDataGetBytePtr(data)), C.int(C.CFDataGetLength(data))) 16 + roots := NewCertPool() 17 + roots.AppendCertsFromPEM(buf) 18 + + if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { 19 + + data, err := ioutil.ReadFile(file) 20 + + if err == nil { 21 + + roots.AppendCertsFromPEM(data) 22 + + return roots, nil 23 + + } 24 + + } 25 + 26 + if C.CFDataGetLength(untrustedData) == 0 { 27 + return roots, nil 28 + diff --git a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go 29 + index 2f6a8b8d60..b81889fe69 100644 30 + --- a/src/crypto/x509/root_darwin.go 31 + +++ b/src/crypto/x509/root_darwin.go 32 + @@ -92,6 +92,14 @@ func execSecurityRoots() (*CertPool, error) { 33 + verifyCh = make(chan rootCandidate) 34 + ) 35 + 36 + + if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { 37 + + data, err := ioutil.ReadFile(file) 38 + + if err == nil { 39 + + roots.AppendCertsFromPEM(data) 40 + + return roots, nil 41 + + } 42 + + } 43 + + 44 + // Using 4 goroutines to pipe into verify-cert seems to be 45 + // about the best we can do. The verify-cert binary seems to 46 + // just RPC to another server with coarse locking anyway, so 47 + diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go 48 + index 48de50b4ea..750e12c6b4 100644 49 + --- a/src/crypto/x509/root_unix.go 50 + +++ b/src/crypto/x509/root_unix.go 51 + @@ -38,6 +38,13 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate 52 + 53 + func loadSystemRoots() (*CertPool, error) { 54 + roots := NewCertPool() 55 + + if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { 56 + + data, err := ioutil.ReadFile(file) 57 + + if err == nil { 58 + + roots.AppendCertsFromPEM(data) 59 + + return roots, nil 60 + + } 61 + + } 62 + 63 + files := certFiles 64 + if f := os.Getenv(certFileEnv); f != "" {
+2 -2
pkgs/development/compilers/ponyc/default.nix
··· 3 3 4 4 stdenv.mkDerivation ( rec { 5 5 pname = "ponyc"; 6 - version = "0.31.0"; 6 + version = "0.32.0"; 7 7 8 8 src = fetchFromGitHub { 9 9 owner = "ponylang"; 10 10 repo = pname; 11 11 rev = version; 12 - sha256 = "0cchikwga59b3p7ip9d6kxz50w5yvk1dh1dcmbix4fwfwc3zdm75"; 12 + sha256 = "07ai5lr0zdrcdmfjxsypp33fpj8lnak7y5177s7qd19163z0ia20"; 13 13 }; 14 14 15 15 buildInputs = [ llvm makeWrapper which ];
+1 -1
pkgs/development/compilers/tinycc/default.nix
··· 41 41 Libs: -L$out/lib -Wl,--rpath $out/lib -ltcc -ldl 42 42 Cflags: -I$out/include 43 43 EOF 44 - install -Dt $out/lib/pkgconfig libtcc.pc 44 + install -Dt $out/lib/pkgconfig libtcc.pc -m 444 45 45 ''; 46 46 47 47 doCheck = true;
+2 -2
pkgs/development/libraries/alkimia/default.nix
··· 5 5 6 6 mkDerivation rec { 7 7 pname = "alkimia"; 8 - version = "8.0.1"; 8 + version = "8.0.2"; 9 9 10 10 src = fetchurl { 11 11 url = "mirror://kde/stable/alkimia/${version}/${pname}-${version}.tar.xz"; 12 - sha256 = "059i6vn36sdq5zn2vqzh4asvvgdgs7n478nk9phvb5gdys01fq7m"; 12 + sha256 = "0al5k9irmg9gsjc234qxjsqfzgzsavl18pspqk78mkp8zlv7fvv1"; 13 13 }; 14 14 15 15 nativeBuildInputs = [ extra-cmake-modules doxygen graphviz ];
+2 -2
pkgs/development/libraries/amtk/default.nix
··· 1 1 { stdenv, fetchurl, gtk3 2 2 , pkgconfig, gnome3, dbus, xvfb_run }: 3 3 let 4 - version = "5.0.0"; 4 + version = "5.0.1"; 5 5 pname = "amtk"; 6 6 in stdenv.mkDerivation { 7 7 name = "${pname}-${version}"; 8 8 9 9 src = fetchurl { 10 10 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 11 - sha256 = "1zriix7bdwcg0868mfc7jy6zbwjwdmjwbh0ah6dbddrhiabrda8j"; 11 + sha256 = "09yy95w1s83c43mh9vha1jbb780yighf5pd2j0ygjmc68sjg871d"; 12 12 }; 13 13 14 14 nativeBuildInputs = [
-1
pkgs/development/libraries/aws-sdk-cpp/default.nix
··· 21 21 # FIXME: might be nice to put different APIs in different outputs 22 22 # (e.g. libaws-cpp-sdk-s3.so in output "s3"). 23 23 outputs = [ "out" "dev" ]; 24 - separateDebugInfo = stdenv.isLinux; 25 24 26 25 nativeBuildInputs = [ cmake curl ]; 27 26
+2 -2
pkgs/development/libraries/caf/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "actor-framework"; 5 - version = "0.17.0"; 5 + version = "0.17.1"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "actor-framework"; 9 9 repo = "actor-framework"; 10 10 rev = version; 11 - sha256 = "10dcpmdsfq6r7hpvg413pqi1q3rjvgn7f87c17ghyz30x6rjhaic"; 11 + sha256 = "1xbq591m3v6pkz4z3dg2lsxr6bxv1lpz4yhdci3vi55y6x9pwyfw"; 12 12 }; 13 13 14 14 nativeBuildInputs = [ cmake ];
+3 -3
pkgs/development/libraries/catch2/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "catch2"; 5 - version = "2.8.0"; 5 + version = "2.9.2"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "catchorg"; 9 9 repo = "Catch2"; 10 10 rev = "v${version}"; 11 - sha256="1i7nz29gcsy9cnljb0sb1fw8fg9p1gdh2pdhrgj3kcrsnxgbyhrq"; 11 + sha256="0wn0vm9mdl4iv3scihdwfbg40appnllzbq4ik3jpr1jdf6ik7par"; 12 12 }; 13 13 14 14 nativeBuildInputs = [ cmake ]; ··· 17 17 18 18 meta = with stdenv.lib; { 19 19 description = "A multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)"; 20 - homepage = http://catch-lib.net; 20 + homepage = "http://catch-lib.net"; 21 21 license = licenses.boost; 22 22 maintainers = with maintainers; [ edwtjo knedlsepp ]; 23 23 platforms = with platforms; unix;
+2 -2
pkgs/development/libraries/drumstick/default.nix
··· 4 4 5 5 stdenv.mkDerivation rec { 6 6 pname = "drumstick"; 7 - version = "1.1.2"; 7 + version = "1.1.3"; 8 8 9 9 src = fetchurl { 10 10 url = "mirror://sourceforge/drumstick/${version}/${pname}-${version}.tar.bz2"; 11 - sha256 = "0kljqyqj7s1i2z52i24x7ail1bywn6dcxxfbad5c59drm8wv94bp"; 11 + sha256 = "1n9wvg79yvkygrkc8xd8pgrd3d7hqmr7gh24dccf0px23lla9b3m"; 12 12 }; 13 13 14 14 outputs = [ "out" "dev" "man" ];
+27
pkgs/development/libraries/faudio/default.nix
··· 1 + { stdenv, fetchFromGitHub, cmake, SDL2}: 2 + 3 + #TODO: tests 4 + 5 + stdenv.mkDerivation rec { 6 + pname = "faudio"; 7 + version = "19.10"; 8 + 9 + src = fetchFromGitHub { 10 + owner = "FNA-XNA"; 11 + repo = "FAudio"; 12 + rev = version; 13 + sha256 = "1z7j803nxhgvjwpxr1m5d490yji727v7pn0ghhipbrfxlwzkw1sz"; 14 + }; 15 + 16 + nativeBuildInputs = [cmake]; 17 + 18 + buildInputs = [ SDL2 ]; 19 + 20 + meta = with stdenv.lib; { 21 + description = "XAudio reimplementation focusing to develop a fully accurate DirectX audio library"; 22 + homepage = "https://github.com/FNA-XNA/FAudio"; 23 + license = licenses.zlib; 24 + platforms = platforms.linux; 25 + maintainers = [ maintainers.marius851000 ]; 26 + }; 27 + }
+85 -53
pkgs/development/libraries/gtkd/default.nix
··· 1 - { stdenv, fetchzip, atk, cairo, dmd, gdk-pixbuf, gnome3, gst_all_1, librsvg 2 - , glib, gtk3, gtksourceview, libgda, libpeas, pango, pkgconfig, which, vte }: 1 + { stdenv, fetchzip, fetchpatch, atk, cairo, dmd, gdk-pixbuf, gnome3, gst_all_1, librsvg 2 + , glib, gtk3, gtksourceview4, libgda, libpeas, pango, pkgconfig, which, vte }: 3 3 4 4 let 5 - inherit (gst_all_1) gstreamer gst-plugins-base; 5 + inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad; 6 6 in stdenv.mkDerivation rec { 7 7 pname = "gtkd"; 8 - version = "3.8.5"; 8 + version = "3.9.0"; 9 9 10 10 src = fetchzip { 11 11 url = "https://gtkd.org/Downloads/sources/GtkD-${version}.zip"; 12 - sha256 = "12n2njsaplra7x15nqwrj2hrf8a27pfjj2mck4mkzxv03qk6mqky"; 12 + sha256 = "12kc4s5gp6gn456d8pzhww1ggi9qbxldmcpp6855297g2x8xxy5p"; 13 13 stripRoot = false; 14 14 }; 15 15 16 16 nativeBuildInputs = [ dmd pkgconfig which ]; 17 17 propagatedBuildInputs = [ 18 - atk cairo gdk-pixbuf glib gstreamer gst-plugins-base gtk3 gtksourceview 18 + atk cairo gdk-pixbuf glib gstreamer gst-plugins-base gtk3 gtksourceview4 19 19 libgda libpeas librsvg pango vte 20 + ]; 21 + 22 + patches = [ 23 + # Fix makefile not installing .pc's 24 + (fetchpatch { 25 + url = "https://github.com/gtkd-developers/GtkD/commit/a9db09117ab27127ca4c3b8d2f308fae483a9199.patch"; 26 + sha256 = "0ngyqifw1kandc1vk01kms3z65pcisfd75q7z09rml96glhfzjd6"; 27 + }) 20 28 ]; 21 29 22 30 prePatch = '' 23 31 substituteAll ${./paths.d} generated/gtkd/gtkd/paths.d 24 - substituteInPlace src/cairo/c/functions-compiletime.d \ 25 - --replace libcairo.so.2 ${cairo}/lib/libcairo.so.2 \ 26 - --replace libcairo.dylib ${cairo}/lib/libcairo.dylib 27 - substituteInPlace src/cairo/c/functions-runtime.d \ 28 - --replace libcairo.so.2 ${cairo}/lib/libcairo.so.2 \ 29 - --replace libcairo.dylib ${cairo}/lib/libcairo.dylib 30 - substituteInPlace generated/gtkd/gdkpixbuf/c/functions.d \ 31 - --replace libgdk_pixbuf-2.0.so.0 ${gdk-pixbuf}/lib/libgdk_pixbuf-2.0.so.0 \ 32 - --replace libgdk_pixbuf-2.0.0.dylib ${gdk-pixbuf}/lib/libgdk_pixbuf-2.0.0.dylib 33 - substituteInPlace generated/gtkd/atk/c/functions.d \ 34 - --replace libatk-1.0.so.0 ${atk}/lib/libatk-1.0.so.0 \ 35 - --replace libatk-1.0.0.dylib ${atk}/lib/libatk-1.0.0.dylib 36 - substituteInPlace generated/gtkd/pango/c/functions.d \ 37 - --replace libpango-1.0.so.0 ${pango.out}/lib/libpango-1.0.so.0 \ 38 - --replace libpangocairo-1.0.so.0 ${pango.out}/lib/libpangocairo-1.0.so.0 \ 39 - --replace libpango-1.0.0.dylib ${pango.out}/lib/libpango-1.0.0.dylib \ 40 - --replace libpangocairo-1.0.0.dylib ${pango.out}/lib/libpangocairo-1.0.0.dylib 41 - substituteInPlace generated/gtkd/gobject/c/functions.d \ 42 - --replace libgobject-2.0.so.0 ${glib.out}/lib/libgobject-2.0.so.0 \ 43 - --replace libgobject-2.0.0.dylib ${glib.out}/lib/libgobject-2.0.0.dylib 44 - substituteInPlace generated/gtkd/rsvg/c/functions.d \ 45 - --replace librsvg-2.so.2 ${librsvg}/lib/librsvg-2.so.2 \ 46 - --replace librsvg-2.2.dylib ${librsvg}/lib/librsvg-2.2.dylib 47 - substituteInPlace generated/gtkd/cairo/c/functions.d \ 48 - --replace libcairo.so.2 ${cairo}/lib/libcairo.so.2 \ 49 - --replace libcairo.dylib ${cairo}/lib/libcairo.dylib 50 - substituteInPlace generated/gtkd/gdk/c/functions.d \ 51 - --replace libgdk-3.so.0 ${gtk3}/lib/libgdk-3.so.0 \ 52 - --replace libgdk-3.0.dylib ${gtk3}/lib/libgdk-3.0.dylib 53 - substituteInPlace generated/peas/peas/c/functions.d \ 54 - --replace libpeas-1.0.so.0 ${libpeas}/lib/libpeas-1.0.so.0 \ 55 - --replace libpeas-gtk-1.0.so.0 ${libpeas}/lib/libpeas-gtk-1.0.so.0 \ 56 - --replace libpeas-1.0.0.dylib ${libpeas}/lib/libpeas-1.0.0.dylib \ 57 - --replace gtk-1.0.0.dylib ${libpeas}/lib/gtk-1.0.0.dylib 58 - substituteInPlace generated/vte/vte/c/functions.d \ 59 - --replace libvte-2.91.so.0 ${vte}/lib/libvte-2.91.so.0 \ 60 - --replace libvte-2.91.0.dylib ${vte}/lib/libvte-2.91.0.dylib 32 + 33 + substituteInPlace generated/gstreamer/gst/app/c/functions.d \ 34 + --replace libgstapp-1.0.so.0 ${gst-plugins-base}/lib/libgstapp-1.0.so.0 \ 35 + --replace libgstapp-1.0.0.dylib ${gst-plugins-base}/lib/libgstapp-1.0.0.dylib 36 + 37 + substituteInPlace generated/gstreamer/gst/base/c/functions.d \ 38 + --replace libgstbase-1.0.so.0 ${gstreamer.out}/lib/libgstbase-1.0.so.0 \ 39 + --replace libgstbase-1.0.0.dylib ${gstreamer.out}/lib/libgstbase-1.0.0.dylib 40 + 41 + substituteInPlace generated/gstreamer/gst/mpegts/c/functions.d \ 42 + --replace libgstmpegts-1.0.so.0 ${gst-plugins-bad.out}/lib/libgstmpegts-1.0.so.0 \ 43 + --replace libgstmpegts-1.0.0.dylib ${gst-plugins-bad.out}/lib/libgstmpegts-1.0.0.dylib 44 + 61 45 substituteInPlace generated/gstreamer/gstinterfaces/c/functions.d \ 62 46 --replace libgstvideo-1.0.so.0 ${gst-plugins-base}/lib/libgstvideo-1.0.so.0 \ 63 47 --replace libgstvideo-1.0.0.dylib ${gst-plugins-base}/lib/libgstvideo-1.0.0.dylib 64 - substituteInPlace generated/sourceview/gsv/c/functions.d \ 65 - --replace libgtksourceview-3.0.so.1 ${gtksourceview}/lib/libgtksourceview-3.0.so.1 \ 66 - --replace libgtksourceview-3.0.1.dylib ${gtksourceview}/lib/libgtksourceview-3.0.1.dylib 48 + 49 + substituteInPlace generated/gstreamer/gstreamer/c/functions.d \ 50 + --replace libgstreamer-1.0.so.0 ${gstreamer}/lib/libgstreamer-1.0.so.0 \ 51 + --replace libgstreamer-1.0.0.dylib ${gstreamer}/lib/libgstreamer-1.0.0.dylib 52 + 53 + substituteInPlace generated/gtkd/atk/c/functions.d \ 54 + --replace libatk-1.0.so.0 ${atk}/lib/libatk-1.0.so.0 \ 55 + --replace libatk-1.0.0.dylib ${atk}/lib/libatk-1.0.0.dylib 56 + 57 + substituteInPlace generated/gtkd/cairo/c/functions.d \ 58 + --replace libcairo.so.2 ${cairo}/lib/libcairo.so.2 \ 59 + --replace libcairo.dylib ${cairo}/lib/libcairo.dylib 60 + 61 + substituteInPlace generated/gtkd/gdk/c/functions.d \ 62 + --replace libgdk-3.so.0 ${gtk3}/lib/libgdk-3.so.0 \ 63 + --replace libgdk-3.0.dylib ${gtk3}/lib/libgdk-3.0.dylib 64 + 65 + substituteInPlace generated/gtkd/gdkpixbuf/c/functions.d \ 66 + --replace libgdk_pixbuf-2.0.so.0 ${gdk-pixbuf}/lib/libgdk_pixbuf-2.0.so.0 \ 67 + --replace libgdk_pixbuf-2.0.0.dylib ${gdk-pixbuf}/lib/libgdk_pixbuf-2.0.0.dylib 68 + 69 + substituteInPlace generated/gtkd/gio/c/functions.d \ 70 + --replace libgio-2.0.so.0 ${glib.out}/lib/libgio-2.0.so.0 \ 71 + --replace libgio-2.0.0.dylib ${glib.out}/lib/libgio-2.0.0.dylib 72 + 67 73 substituteInPlace generated/gtkd/glib/c/functions.d \ 68 74 --replace libglib-2.0.so.0 ${glib.out}/lib/libglib-2.0.so.0 \ 69 75 --replace libgmodule-2.0.so.0 ${glib.out}/lib/libgmodule-2.0.so.0 \ ··· 77 71 --replace libglib-2.0.0.dylib ${glib.out}/lib/libglib-2.0.0.dylib \ 78 72 --replace libgmodule-2.0.0.dylib ${glib.out}/lib/libgmodule-2.0.0.dylib \ 79 73 --replace libgobject-2.0.0.dylib ${glib.out}/lib/libgobject-2.0.0.dylib 80 - substituteInPlace generated/gtkd/gio/c/functions.d \ 81 - --replace libgio-2.0.so.0 ${glib.out}/lib/libgio-2.0.so.0 \ 82 - --replace libgio-2.0.0.dylib ${glib.out}/lib/libgio-2.0.0.dylib 83 - substituteInPlace generated/gstreamer/gstreamer/c/functions.d \ 84 - --replace libgstreamer-1.0.so.0 ${gstreamer}/lib/libgstreamer-1.0.so.0 \ 85 - --replace libgstreamer-1.0.0.dylib ${gstreamer}/lib/libgstreamer-1.0.0.dylib 74 + 75 + substituteInPlace generated/gtkd/gobject/c/functions.d \ 76 + --replace libgobject-2.0.so.0 ${glib.out}/lib/libgobject-2.0.so.0 \ 77 + --replace libgobject-2.0.0.dylib ${glib.out}/lib/libgobject-2.0.0.dylib 78 + 86 79 substituteInPlace generated/gtkd/gtk/c/functions.d \ 87 80 --replace libgdk-3.so.0 ${gtk3}/lib/libgdk-3.so.0 \ 88 81 --replace libgtk-3.so.0 ${gtk3}/lib/libgtk-3.so.0 \ 89 82 --replace libgdk-3.0.dylib ${gtk3}/lib/libgdk-3.0.dylib \ 90 83 --replace libgtk-3.0.dylib ${gtk3}/lib/libgtk-3.0.dylib 84 + 85 + substituteInPlace generated/gtkd/pango/c/functions.d \ 86 + --replace libpango-1.0.so.0 ${pango.out}/lib/libpango-1.0.so.0 \ 87 + --replace libpangocairo-1.0.so.0 ${pango.out}/lib/libpangocairo-1.0.so.0 \ 88 + --replace libpango-1.0.0.dylib ${pango.out}/lib/libpango-1.0.0.dylib \ 89 + --replace libpangocairo-1.0.0.dylib ${pango.out}/lib/libpangocairo-1.0.0.dylib 90 + 91 + substituteInPlace generated/gtkd/rsvg/c/functions.d \ 92 + --replace librsvg-2.so.2 ${librsvg}/lib/librsvg-2.so.2 \ 93 + --replace librsvg-2.2.dylib ${librsvg}/lib/librsvg-2.2.dylib 94 + 95 + substituteInPlace generated/peas/peas/c/functions.d \ 96 + --replace libpeas-1.0.so.0 ${libpeas}/lib/libpeas-1.0.so.0 \ 97 + --replace libpeas-gtk-1.0.so.0 ${libpeas}/lib/libpeas-gtk-1.0.so.0 \ 98 + --replace libpeas-1.0.0.dylib ${libpeas}/lib/libpeas-1.0.0.dylib \ 99 + --replace gtk-1.0.0.dylib ${libpeas}/lib/gtk-1.0.0.dylib 100 + 101 + substituteInPlace generated/sourceview/gsv/c/functions.d \ 102 + --replace libgtksourceview-4.so.0 ${gtksourceview4}/lib/libgtksourceview-4.so.0 \ 103 + --replace libgtksourceview-4.0.dylib ${gtksourceview4}/lib/libgtksourceview-4.0.dylib 104 + 105 + substituteInPlace generated/vte/vte/c/functions.d \ 106 + --replace libvte-2.91.so.0 ${vte}/lib/libvte-2.91.so.0 \ 107 + --replace libvte-2.91.0.dylib ${vte}/lib/libvte-2.91.0.dylib 91 108 ''; 92 109 93 - installFlags = "prefix=$(out)"; 110 + makeFlags = [ 111 + "prefix=${placeholder "out"}" 112 + "PKG_CONFIG=${pkgconfig}/bin/pkg-config" 113 + ]; 94 114 95 115 meta = with stdenv.lib; { 96 116 description = "D binding and OO wrapper for GTK";
+4 -4
pkgs/development/libraries/gtkd/paths.d
··· 103 103 LIBRARY.GLGDK: "libgdkglext-3.0.dylib", 104 104 LIBRARY.GLGTK: "libgtkglext-3.0.dylib", 105 105 LIBRARY.GDA: "@libgda@/lib/libgda-2.dylib", 106 - LIBRARY.GSV: "@gtksourceview@/lib/libgtksourceview-3.0.dylib", 107 - LIBRARY.GSV1: "@gtksourceview@/lib/libgtksourceview-3.0.dylib", 106 + LIBRARY.GSV: "@gtksourceview4@/lib/libgtksourceview-4.0.dylib", 107 + LIBRARY.GSV1: "@gtksourceview4@/lib/libgtksourceview-4.0.dylib", 108 108 LIBRARY.GSTREAMER: "@gstreamer@/lib/libgstreamer-1.0.dylib", 109 109 LIBRARY.GSTINTERFACES: "@gst_plugins_base@/lib/libgstvideo-1.0.dylib", 110 110 LIBRARY.VTE: "@vte@/lib/libvte-2.91.dylib", ··· 131 131 LIBRARY.GLGDK: "libgdkglext-3.0.so.0", 132 132 LIBRARY.GLGTK: "libgtkglext-3.0.so.0", 133 133 LIBRARY.GDA: "@libgda@/lib/libgda-4.0.so.4", 134 - LIBRARY.GSV: "@gtksourceview@/lib/libgtksourceview-3.0.so.0", 135 - LIBRARY.GSV1: "@gtksourceview@/lib/libgtksourceview-3.0.so.1", 134 + LIBRARY.GSV: "@gtksourceview4@/lib/libgtksourceview-4.so.0", 135 + LIBRARY.GSV1: "@gtksourceview4@/lib/libgtksourceview-4.so.0", 136 136 LIBRARY.GSTREAMER: "@gstreamer@/lib/libgstreamer-1.0.so.0", 137 137 LIBRARY.GSTINTERFACES: "@gst_plugins_base@/lib/libgstvideo-1.0.so.0", 138 138 LIBRARY.VTE: "@vte@/lib/libvte-2.91.so.0",
+2 -2
pkgs/development/libraries/libite/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "libite"; 5 - version = "2.0.2"; 5 + version = "2.1.0"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "troglobit"; 9 9 repo = "libite"; 10 10 rev = "v${version}"; 11 - sha256 = "0qk7231c1xwvjhkc9w7hasvafvgns10cx9kdhfdbc4r1hsh6d1ca"; 11 + sha256 = "0fi3j3y37id24cgy3868pyvxkd6mvbbraalvpm99f5dhrxdlv961"; 12 12 }; 13 13 14 14 nativeBuildInputs = [ autoreconfHook pkgconfig ];
+2 -2
pkgs/development/libraries/libsvm/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "libsvm"; 5 - version = "3.23"; 5 + version = "3.24"; 6 6 7 7 src = fetchurl { 8 8 url = "https://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-${version}.tar.gz"; 9 - sha256 = "0jpaq0rr92x38p4nk3gjan79ip67m6p80anb28z1d8601miysyi5"; 9 + sha256 = "15l69y23fxslrap415dvqb383x5fxvbffp9giszjfqjf38h1m26m"; 10 10 }; 11 11 12 12 buildPhase = ''
+8 -7
pkgs/development/libraries/libui/default.nix
··· 1 - { stdenv, fetchgit, cmake, pkgconfig, gtk3, Cocoa }: 1 + { stdenv, fetchFromGitHub, cmake, pkgconfig, gtk3, Cocoa }: 2 2 3 3 let 4 4 shortName = "libui"; 5 - version = "3.1a"; 5 + version = "4.1a"; 6 6 backend = if stdenv.isDarwin then "darwin" else "unix"; 7 7 in 8 8 9 9 stdenv.mkDerivation { 10 10 name = "${shortName}-${version}"; 11 - src = fetchgit { 12 - url = "https://github.com/andlabs/libui.git"; 13 - rev = "6ebdc96b93273c3cedf81159e7843025caa83058"; 14 - sha256 = "1lpbfa298c61aarlzgp7vghrmxg1274pzxh1j9isv8x758gk6mfn"; 11 + src = fetchFromGitHub { 12 + owner = "andlabs"; 13 + repo = "libui"; 14 + rev = "alpha4.1"; 15 + sha256 = "0bm6xvqk4drg2kw6d304x6mlfal7gh8mbl5a9f0509smmdzgdkwm"; 15 16 }; 16 17 17 18 nativeBuildInputs = [ cmake pkgconfig ]; 18 - buildInputs = stdenv.lib.optional stdenv.isLinux gtk3 19 + propagatedBuildInputs = stdenv.lib.optional stdenv.isLinux gtk3 19 20 ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; 20 21 21 22 preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+2 -2
pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "qtstyleplugin-kvantum-qt4"; 5 - version = "0.11.0"; 5 + version = "0.11.2"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "tsujan"; 9 9 repo = "Kvantum"; 10 10 rev = "V${version}"; 11 - sha256 = "0aqlv7mj7r9vjm6pvb8pv3cyx35lgz8rjjas3k8wfdr3sqyyy25g"; 11 + sha256 = "1jcfv96ws6sm3kc2q8zriwqhry24qbq3zbp8gkqw75wssbv82rmc"; 12 12 }; 13 13 14 14 nativeBuildInputs = [ qmake4Hook ];
+11 -5
pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
··· 1 - { stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, qtx11extras, kwindowsystem, libX11, libXext, qttools }: 1 + { stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, qtx11extras, kwindowsystem 2 + , libX11, libXext, qttools, wrapQtAppsHook 3 + }: 2 4 3 5 stdenv.mkDerivation rec { 4 6 pname = "qtstyleplugin-kvantum"; 5 - version = "0.11.0"; 7 + version = "0.11.2"; 6 8 7 9 src = fetchFromGitHub { 8 10 owner = "tsujan"; 9 11 repo = "Kvantum"; 10 12 rev = "V${version}"; 11 - sha256 = "0aqlv7mj7r9vjm6pvb8pv3cyx35lgz8rjjas3k8wfdr3sqyyy25g"; 13 + sha256 = "1jcfv96ws6sm3kc2q8zriwqhry24qbq3zbp8gkqw75wssbv82rmc"; 12 14 }; 13 15 14 - nativeBuildInputs = [ qmake qttools ]; 15 - buildInputs = [ qtbase qtsvg qtx11extras kwindowsystem libX11 libXext ]; 16 + nativeBuildInputs = [ 17 + qmake qttools wrapQtAppsHook 18 + ]; 19 + buildInputs = [ 20 + qtbase qtsvg qtx11extras kwindowsystem libX11 libXext 21 + ]; 16 22 17 23 sourceRoot = "source/Kvantum"; 18 24
+4
pkgs/development/libraries/v8/default.nix
··· 97 97 ''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"'' 98 98 ] ++ stdenv.lib.optional stdenv.cc.isClang ''clang_base_path="${stdenv.cc}"''; 99 99 100 + # with gcc8, -Wclass-memaccess became part of -Wall and causes logging limit 101 + # to be exceeded 102 + NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isGNU "-Wno-class-memaccess"; 103 + 100 104 nativeBuildInputs = [ gn ninja pkgconfig python ] 101 105 ++ stdenv.lib.optionals stdenv.isDarwin [ xcbuild darwin.DarwinTools ]; 102 106 buildInputs = [ glib icu ];
+25 -13
pkgs/development/ocaml-modules/labltk/default.nix
··· 1 - { stdenv, fetchurl, ocaml, findlib, tcl, tk }: 1 + { stdenv, fetchurl, fetchzip, ocaml, findlib, tcl, tk }: 2 2 3 - if !stdenv.lib.versionAtLeast ocaml.version "4.04" 3 + let OCamlVersionAtLeast = stdenv.lib.versionAtLeast ocaml.version; in 4 + 5 + if !OCamlVersionAtLeast "4.04" 4 6 then throw "labltk is not available for OCaml ${ocaml.version}" 5 7 else 6 8 7 - let param = { 8 - "4.04" = { 9 + let param = 10 + if OCamlVersionAtLeast "4.08" then rec { 11 + version = "8.06.7"; 12 + src = fetchzip { 13 + url = "https://github.com/garrigue/labltk/archive/${version}.tar.gz"; 14 + sha256 = "1cqnxjv2dvw9csiz4iqqyx6rck04jgylpglk8f69kgybf7k7xk2h"; 15 + }; 16 + } else 17 + let mkOldParam = { version, key, sha256 }: { 18 + src = fetchurl { 19 + url = "https://forge.ocamlcore.org/frs/download.php/${key}/labltk-${version}.tar.gz"; 20 + inherit sha256; 21 + }; 22 + inherit version; 23 + }; in 24 + { 25 + "4.04" = mkOldParam { 9 26 version = "8.06.2"; 10 27 key = "1628"; 11 28 sha256 = "1p97j9s33axkb4yyl0byhmhlyczqarb886ajpyggizy2br3a0bmk"; 12 29 }; 13 - "4.05" = { 30 + "4.05" = mkOldParam { 14 31 version = "8.06.3"; 15 32 key = "1701"; 16 33 sha256 = "1rka9jpg3kxqn7dmgfsa7pmsdwm16x7cn4sh15ijyyrad9phgdxn"; 17 34 }; 18 - "4.06" = { 35 + "4.06" = mkOldParam { 19 36 version = "8.06.4"; 20 37 key = "1727"; 21 38 sha256 = "0j3rz0zz4r993wa3ssnk5s416b1jhj58l6z2jk8238a86y7xqcii"; 22 39 }; 23 - "4.07" = { 40 + "4.07" = mkOldParam { 24 41 version = "8.06.5"; 25 42 key = "1764"; 26 43 sha256 = "0wgx65y1wkgf22ihpqmspqfp95fqbj3pldhp1p3b1mi8rmc37zwj"; ··· 46 29 in 47 30 48 31 stdenv.mkDerivation rec { 49 - inherit (param) version; 32 + inherit (param) version src; 50 33 name = "ocaml${ocaml.version}-labltk-${version}"; 51 - 52 - src = fetchurl { 53 - url = "https://forge.ocamlcore.org/frs/download.php/${param.key}/labltk-${param.version}.tar.gz"; 54 - inherit (param) sha256; 55 - }; 56 34 57 35 buildInputs = [ ocaml findlib tcl tk ]; 58 36
+25
pkgs/development/ocaml-modules/ocaml-monadic/default.nix
··· 1 + { lib, fetchFromGitHub, buildDunePackage 2 + , ocaml-migrate-parsetree, ppx_tools_versioned 3 + }: 4 + 5 + buildDunePackage rec { 6 + pname = "ocaml-monadic"; 7 + version = "0.4.1"; 8 + 9 + src = fetchFromGitHub { 10 + owner = "zepalmer"; 11 + repo = pname; 12 + rev = version; 13 + sha256 = "1zcwydypk5vwfn1g7srnl5076scwwq5a5y8xwcjl70pc4cpzszll"; 14 + }; 15 + 16 + buildInputs = [ ppx_tools_versioned ]; 17 + propagatedBuildInputs = [ ocaml-migrate-parsetree ]; 18 + 19 + meta = { 20 + inherit (src.meta) homepage; 21 + description = "A PPX extension to provide an OCaml-friendly monadic syntax"; 22 + license = lib.licenses.bsd3; 23 + maintainers = [ lib.maintainers.vbgl ]; 24 + }; 25 + }
+2 -2
pkgs/development/ocaml-modules/ocsigen-server/default.nix
··· 13 13 in 14 14 15 15 stdenv.mkDerivation rec { 16 - version = "2.11.0"; 16 + version = "2.15.0"; 17 17 pname = "ocsigenserver"; 18 18 19 19 src = fetchFromGitHub { 20 20 owner = "ocsigen"; 21 21 repo = "ocsigenserver"; 22 22 rev = version; 23 - sha256 = "0y1ngki7w9s10ip7nj9qb7254bd5sp01xxz16sxyj7l7qz603hy2"; 23 + sha256 = "15qdkxcbl9c1bbn0fh9awjw0hjn7r6awcn288a9vyxln7icdbifw"; 24 24 }; 25 25 26 26 buildInputs = [ which makeWrapper ocaml findlib
+11 -15
pkgs/development/ocaml-modules/ssl/default.nix
··· 1 - { stdenv, fetchzip, which, openssl, ocaml, findlib }: 1 + { lib, buildDunePackage, fetchFromGitHub, pkg-config, openssl }: 2 2 3 - stdenv.mkDerivation rec { 4 - name = "ocaml${ocaml.version}-ssl-${version}"; 5 - version = "0.5.5"; 3 + buildDunePackage rec { 4 + pname = "ssl"; 5 + version = "0.5.9"; 6 6 7 - src = fetchzip { 8 - url = "https://github.com/savonet/ocaml-ssl/releases/download/${version}/ocaml-ssl-${version}.tar.gz"; 9 - sha256 = "0j5zvsx51dg5r7sli7bakv7gfd29z890h0xzi876pg9vywwz9w7l"; 7 + src = fetchFromGitHub { 8 + owner = "savonet"; 9 + repo = "ocaml-ssl"; 10 + rev = version; 11 + sha256 = "04h02rvzrwp886n5hsx84rnc9b150iggy38g5v1x1rwz3pkdnmf0"; 10 12 }; 11 13 12 - buildInputs = [which ocaml findlib]; 13 - 14 + nativeBuildInputs = [ pkg-config ]; 14 15 propagatedBuildInputs = [openssl]; 15 - 16 - dontAddPrefix = true; 17 - 18 - createFindlibDestdir = true; 19 16 20 17 meta = { 21 18 homepage = http://savonet.rastageeks.org/; 22 19 description = "OCaml bindings for libssl "; 23 20 license = "LGPL+link exception"; 24 - platforms = ocaml.meta.platforms or []; 25 21 maintainers = [ 26 - stdenv.lib.maintainers.z77z 22 + lib.maintainers.z77z 27 23 ]; 28 24 }; 29 25 }
+2
pkgs/development/python-modules/bokeh/default.nix
··· 8 8 , mock 9 9 , numpy 10 10 , nodejs 11 + , packaging 11 12 , pillow 12 13 , pytest 13 14 , python ··· 49 48 pyyaml 50 49 tornado 51 50 numpy 51 + packaging 52 52 ] 53 53 ++ lib.optionals ( !isPy3k ) [ futures ]; 54 54
+2 -2
pkgs/development/python-modules/credstash/default.nix
··· 2 2 3 3 buildPythonPackage rec { 4 4 pname = "credstash"; 5 - version = "1.15.0"; 5 + version = "1.16.1"; 6 6 7 7 src = fetchPypi { 8 8 inherit pname version; 9 - sha256 = "814560f99ae2409e2c6d906d878f9dadada5d1d0a950aafb6b2c0d535291bdfb"; 9 + sha256 = "019wviz3hx0pkh3mgqr3prg55njyhzvhjqcpndgrfmkykjkcj435"; 10 10 }; 11 11 12 12 # The install phase puts an executable and a copy of the library it imports in
+2 -2
pkgs/development/python-modules/ed25519/default.nix
··· 2 2 3 3 buildPythonPackage rec { 4 4 pname = "ed25519"; 5 - version = "1.4"; 5 + version = "1.5"; 6 6 7 7 src = fetchPypi { 8 8 inherit pname version; 9 - sha256 = "0ahx1nkxa0xis3cw0h5c4fpgv8mq4znkq7kajly33lc3317bk499"; 9 + sha256 = "0n1k83ww0pr4q6z0h7p8hvy21hcgb96jvgllfbwhvvyf37h3w182"; 10 10 }; 11 11 12 12 meta = with stdenv.lib; {
+9 -4
pkgs/development/python-modules/glances/default.nix
··· 1 - { buildPythonPackage, fetchFromGitHub, isPyPy, lib 1 + { buildPythonPackage, fetchFromGitHub, fetchpatch, isPyPy, lib 2 2 , psutil, setuptools, bottle, batinfo, pysnmp 3 3 , hddtemp, future 4 4 # Optional dependencies: ··· 9 9 10 10 buildPythonPackage rec { 11 11 pname = "glances"; 12 - version = "3.1.2"; 12 + version = "3.1.3"; 13 13 disabled = isPyPy; 14 14 15 15 src = fetchFromGitHub { 16 16 owner = "nicolargo"; 17 17 repo = "glances"; 18 18 rev = "v${version}"; 19 - sha256 = "1z9sq0chhm8m4gq98yfknxj408cj017h7j375blngjk2zvhw39qd"; 19 + sha256 = "15yz8sbw3k3n0729g2zcwsxc5iyhkyrhqza6fnipxxpsskwgqbwp"; 20 20 }; 21 21 22 22 # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply): 23 - patches = lib.optional doCheck ./skip-failing-tests.patch; 23 + patches = lib.optional doCheck ./skip-failing-tests.patch 24 + ++ [ (fetchpatch { 25 + # Correct unitest 26 + url = "https://github.com/nicolargo/glances/commit/abf64ffde31113f5f46ef286703ff061fc57395f.patch"; 27 + sha256 = "00krahqq89jvbgrqx2359cndmvq5maffhpj163z10s1n7q80kxp1"; 28 + }) ]; 24 29 25 30 doCheck = true; 26 31 checkInputs = [ unittest2 ];
+1 -1
pkgs/development/python-modules/misaka/default.nix
··· 15 15 16 16 meta = with lib; { 17 17 description = "A CFFI binding for Hoedown, a markdown parsing library"; 18 - homepage = "http://misaka.61924.nl/"; 18 + homepage = "https://misaka.61924.nl"; 19 19 license = licenses.mit; 20 20 maintainers = with maintainers; [ fgaz ]; 21 21 };
-1
pkgs/development/python-modules/poetry/default.nix
··· 87 87 description = "Python dependency management and packaging made easy"; 88 88 license = licenses.mit; 89 89 maintainers = with maintainers; [ jakewaksbaum ]; 90 - broken = true; 91 90 }; 92 91 }
+37
pkgs/development/python-modules/solo-python/default.nix
··· 1 + { lib, buildPythonPackage, fetchFromGitHub 2 + , click, ecdsa, fido2, intelhex, pyserial, pyusb, requests}: 3 + 4 + buildPythonPackage rec { 5 + pname = "solo-python"; 6 + version = "0.0.15"; 7 + format = "flit"; 8 + 9 + src = fetchFromGitHub { 10 + owner = "solokeys"; 11 + repo = pname; 12 + rev = version; 13 + sha256 = "14na9s65hxzx141bdv0j7rx1wi3cv85jzpdivsq1rwp6hdhiazr1"; 14 + }; 15 + 16 + # TODO: remove ASAP 17 + patchPhase = '' 18 + substituteInPlace pyproject.toml --replace "fido2 == 0.7.0" "fido2 >= 0.7.0" 19 + ''; 20 + 21 + propagatedBuildInputs = [ 22 + click 23 + ecdsa 24 + fido2 25 + intelhex 26 + pyserial 27 + pyusb 28 + requests 29 + ]; 30 + 31 + meta = with lib; { 32 + description = "Python tool and library for SoloKeys"; 33 + homepage = "https://github.com/solokeys/solo-python"; 34 + maintainers = with maintainers; [ wucke13 ]; 35 + license = with licenses; [ asl20 mit ]; 36 + }; 37 + }
+13 -8
pkgs/development/tools/conftest/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "conftest"; 5 - version = "0.12.0"; 5 + version = "0.14.0"; 6 + 7 + # Something subtle in the go sum db is causing every download to 8 + # get a new sum (and thus breaking the hash). This disables the 9 + # fetching of the sum from the go sum database. 10 + modBuildPhase = '' 11 + runHook preBuild 12 + GONOSUMDB=* go mod download 13 + runHook postBuild 14 + ''; 6 15 7 16 src = fetchFromGitHub { 8 17 owner = "instrumenta"; 9 18 repo = "conftest"; 10 19 rev = "v${version}"; 11 - sha256 = "0blrbbnvnnxyw0idhglqdz16i7g6g86a6kw2iw707bg0yfdl1ncq"; 20 + sha256 = "0fjz6ad8rnznlp1kiyb3c6anhjs6v6acgziw4hmyz0xva4jnspsh"; 12 21 }; 13 22 14 - patches = [ 15 - # Version 0.12.0 does not build with go 1.13. See https://github.com/instrumenta/conftest/pull/85. 16 - # TODO: Remove once https://github.com/instrumenta/conftest/pull/85 is merged and lands in a release. 17 - ./go-1.13-deps.patch 18 - ]; 23 + modSha256 = "1xwqlqx5794hsi14h5gqg69gjcqcma24ha0fxn0vffqgqs2cz1d1"; 19 24 20 25 buildFlagsArray = '' 21 26 -ldflags= 22 27 -X main.version=${version} 23 28 ''; 24 29 25 - modSha256 = "11999ywy73ng45gl1qypky8342jvishcp11bdxbigvqhwl2zbpav"; 30 + subPackages = [ "cmd" ]; 26 31 27 32 meta = with lib; { 28 33 description = "Write tests against structured configuration data";
-99
pkgs/development/tools/conftest/go-1.13-deps.patch
··· 1 - diff --git a/go.mod b/go.mod 2 - index a552a6b..a39703d 100644 3 - --- a/go.mod 4 - +++ b/go.mod 5 - @@ -1,6 +1,6 @@ 6 - module github.com/instrumenta/conftest 7 - 8 - -go 1.12 9 - +go 1.13 10 - 11 - require ( 12 - cloud.google.com/go v0.39.0 // indirect 13 - @@ -43,12 +43,16 @@ require ( 14 - golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f // indirect 15 - golang.org/x/oauth2 v0.0.0-20190523182746-aaccbc9213b0 // indirect 16 - golang.org/x/sys v0.0.0-20190526052359-791d8a0f4d09 // indirect 17 - + golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 // indirect 18 - google.golang.org/appengine v1.6.0 // indirect 19 - google.golang.org/genproto v0.0.0-20190620144150-6af8c5fc6601 // indirect 20 - ) 21 - 22 - replace ( 23 - + git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999 24 - github.com/containerd/containerd => github.com/containerd/containerd v1.2.6 25 - github.com/docker/docker => github.com/docker/docker v0.0.0-20190131205458-8a43b7bb99cd 26 - github.com/golang/lint => golang.org/x/lint v0.0.0-20190409202823-959b441ac422 27 - + github.com/opencontainers/runc v1.0.1-0.20190307181833-2b18fe1d885e => github.com/opencontainers/runc v1.0.0-rc6.0.20190307181833-2b18fe1d885e 28 - + golang.org/x/crypto v0.0.0-20190129210102-0709b304e793 => golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 29 - ) 30 - diff --git a/go.sum b/go.sum 31 - index 2441c4e..212ac69 100644 32 - --- a/go.sum 33 - +++ b/go.sum 34 - @@ -10,7 +10,6 @@ dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod h1:Yl 35 - dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU= 36 - dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4= 37 - dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU= 38 - -git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= 39 - github.com/Azure/azure-sdk-for-go v21.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= 40 - github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8= 41 - github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= 42 - @@ -43,6 +42,7 @@ github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYU 43 - github.com/antchfx/xpath v0.0.0-20190129040759-c8489ed3251e/go.mod h1:Yee4kTMuNiPYJ7nSNorELQMr1J33uOpXDMByNYhvtNk= 44 - github.com/antchfx/xquery v0.0.0-20180515051857-ad5b8c7a47b0/go.mod h1:LzD22aAzDP8/dyiCKFp31He4m2GPjl0AFyzDtZzUu9M= 45 - github.com/apache/thrift v0.0.0-20161221203622-b2a4d4ae21c7/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= 46 - +github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= 47 - github.com/apparentlymart/go-cidr v1.0.0 h1:lGDvXx8Lv9QHjrAVP7jyzleG4F9+FkRhJcEsDFxeb8w= 48 - github.com/apparentlymart/go-cidr v1.0.0/go.mod h1:EBcsNrHc3zQeuaeCeCtQruQm+n9/YjEn/vI25Lg7Gwc= 49 - github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM= 50 - @@ -132,13 +132,8 @@ github.com/docker/cli v0.0.0-20190511004558-53fc257292ad/go.mod h1:JLrzqnKDaYBop 51 - github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= 52 - github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug= 53 - github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= 54 - -github.com/docker/docker v0.0.0-20180531152204-71cd53e4a197/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= 55 - github.com/docker/docker v0.0.0-20190131205458-8a43b7bb99cd h1:h98Vus5/NAC3I4k243/B/KgCdpjCUK4lfxNEw2p/HAc= 56 - github.com/docker/docker v0.0.0-20190131205458-8a43b7bb99cd/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= 57 - -github.com/docker/docker v1.14.0-0.20190131205458-8a43b7bb99cd h1:adRHD5aU4yFK0L4yZwjY3SyWapVmPdq1h19eJdgYUfs= 58 - -github.com/docker/docker v1.14.0-0.20190131205458-8a43b7bb99cd/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= 59 - -github.com/docker/docker v1.14.0-0.20190319215453-e7b5f7dbe98c h1:rZ+3jNsgjvYgdZ0Nrd4Udrv8rneDbWBohAPuXsTsvGU= 60 - -github.com/docker/docker v1.14.0-0.20190319215453-e7b5f7dbe98c/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= 61 - github.com/docker/docker-credential-helpers v0.6.0/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= 62 - github.com/docker/docker-credential-helpers v0.6.1/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= 63 - github.com/docker/docker-credential-helpers v0.6.2 h1:CrW9H1VMf3a4GrtyAi7IUJjkJVpwBBpX0+mvkvYJaus= 64 - @@ -214,6 +209,7 @@ github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPg 65 - github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= 66 - github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= 67 - github.com/google/shlex v0.0.0-20150127133951-6f45313302b9/go.mod h1:RpwtwJQFrIEPstU94h88MWPXP2ektJZ8cZ0YntAmXiE= 68 - +github.com/googleapis/gax-go v2.0.0+incompatible h1:j0GKcs05QVmm7yesiZq2+9cxHkNK9YM6zKx4D2qucQU= 69 - github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= 70 - github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg= 71 - github.com/googleapis/gax-go/v2 v2.0.4 h1:hU4mGcQI4DaAYW+IbTun+2qEZVFxK0ySjQLTbS0VQKc= 72 - @@ -407,8 +403,8 @@ github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zM 73 - github.com/opencontainers/runc v0.1.1 h1:GlxAyO6x8rfZYN9Tt0Kti5a/cP41iuiO2yYT0IJGY8Y= 74 - github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= 75 - github.com/opencontainers/runc v1.0.0-rc6/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= 76 - -github.com/opencontainers/runc v1.0.1-0.20190307181833-2b18fe1d885e h1:+uPGJuuDl61O9GKN/rLHkUCf597mpxmJI06RqMQX81A= 77 - -github.com/opencontainers/runc v1.0.1-0.20190307181833-2b18fe1d885e/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= 78 - +github.com/opencontainers/runc v1.0.0-rc6.0.20190307181833-2b18fe1d885e h1:9wcty7nGPPNkY8/VsiZkjmMB8x7SydrklJE+vCr4uDg= 79 - +github.com/opencontainers/runc v1.0.0-rc6.0.20190307181833-2b18fe1d885e/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= 80 - github.com/opencontainers/runtime-spec v0.0.0-20180909173843-eba862dc2470/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= 81 - github.com/opentracing-contrib/go-stdlib v0.0.0-20171029140428-b1a47cfbdd75/go.mod h1:PLldrQSroqzH70Xl+1DQcGnefIbqsKR7UDaiux3zV+w= 82 - github.com/opentracing/opentracing-go v0.0.0-20171003133519-1361b9cd60be/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= 83 - @@ -587,7 +583,6 @@ golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnf 84 - golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= 85 - golang.org/x/crypto v0.0.0-20181112202954-3d3f9f413869/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= 86 - golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= 87 - -golang.org/x/crypto v0.0.0-20190129210102-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= 88 - golang.org/x/crypto v0.0.0-20190129210102-ccddf3741a0c/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= 89 - golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= 90 - golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= 91 - @@ -679,6 +674,8 @@ golang.org/x/tools v0.0.0-20190425150028-36563e24a262 h1:qsl9y/CJx34tuA7QCPNp86J 92 - golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= 93 - golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373 h1:PPwnA7z1Pjf7XYaBP9GL1VAMZmcIWyFz7QCMSIIa3Bg= 94 - golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= 95 - +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc= 96 - +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= 97 - google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= 98 - google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= 99 - google.golang.org/api v0.1.0/go.mod h1:UGEZY7KEX120AnNLIHFMKIo4obdJhkp2tPbaPlQx13Y=
+1 -1
pkgs/development/tools/java/visualvm/default.nix
··· 47 47 capability of monitoring and performance analysis for the Java 48 48 SE platform. 49 49 ''; 50 - homepage = https://visualvm.java.net/; 50 + homepage = "https://visualvm.github.io"; 51 51 license = licenses.gpl2ClasspathPlus; 52 52 platforms = platforms.all; 53 53 maintainers = with maintainers; [ michalrus moaxcp ];
+3 -3
pkgs/development/tools/rust/cargo-bloat/default.nix
··· 2 2 3 3 rustPlatform.buildRustPackage rec { 4 4 pname = "cargo-bloat"; 5 - version = "0.8.3"; 5 + version = "0.9.0"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "RazrFalcon"; 9 9 repo = pname; 10 10 rev = "v${version}"; 11 - sha256 = "088px2kdcfjdb8zfmk7g409h7ij9dngywz336hj2ny82lrdjzazc"; 11 + sha256 = "03pzp5d9kzbx62jpjzgww0x3qv9f08blvl8f4yg5hrlyaaa06xsd"; 12 12 }; 13 13 14 - cargoSha256 = "11q8j8y7m59gc8047qhz6pp2825qjcpg9xwgj09l8a5aijf25avb"; 14 + cargoSha256 = "1jc1lx0yk8galkyc4a67d39ywsfrgc2sjjsz08p47gpz7228d64w"; 15 15 16 16 meta = with lib; { 17 17 description = "A tool and Cargo subcommand that helps you find out what takes most of the space in your executable";
+46
pkgs/development/tools/spring-boot/default.nix
··· 1 + { stdenv, fetchzip, jdk, makeWrapper, installShellFiles }: 2 + 3 + stdenv.mkDerivation rec { 4 + pname = "spring-boot"; 5 + version = "2.1.9"; 6 + 7 + src = fetchzip { 8 + url = "https://repo.spring.io/release/org/springframework/boot/${pname}-cli/${version}.RELEASE/${pname}-cli-${version}.RELEASE-bin.zip"; 9 + sha256 = "03iphh5l9w9sizksidkv217qnqx3nh1zpw6kdjnn40j3mlabfb7j"; 10 + }; 11 + 12 + nativeBuildInputs = [ makeWrapper installShellFiles ]; 13 + 14 + installPhase = '' 15 + runHook preInstall 16 + rm bin/spring.bat 17 + installShellCompletion --bash shell-completion/bash/spring 18 + installShellCompletion --zsh shell-completion/zsh/_spring 19 + rm -r shell-completion 20 + cp -r . $out 21 + wrapProgram $out/bin/spring \ 22 + --prefix JAVA_HOME : ${jdk} 23 + runHook postInstall 24 + ''; 25 + 26 + meta = with stdenv.lib; { 27 + description = '' 28 + CLI which makes it easy to create spring-based applications 29 + ''; 30 + longDescription = '' 31 + Spring Boot makes it easy to create stand-alone, production-grade 32 + Spring-based Applications that you can run. We take an opinionated view 33 + of the Spring platform and third-party libraries, so that you can get 34 + started with minimum fuss. Most Spring Boot applications need very 35 + little Spring configuration. 36 + 37 + You can use Spring Boot to create Java applications that can be started 38 + by using java -jar or more traditional war deployments. We also provide 39 + a command line tool that runs “spring scripts”. 40 + ''; 41 + homepage = https://spring.io/projects/spring-boot; 42 + license = licenses.asl20; 43 + platforms = platforms.all; 44 + maintainers = with maintainers; [ moaxcp ]; 45 + }; 46 + }
+18 -10
pkgs/games/crispy-doom/default.nix
··· 1 - { stdenv, autoreconfHook, pkgconfig, SDL2, SDL2_mixer, SDL2_net, fetchurl }: 1 + { stdenv, autoreconfHook, pkgconfig, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "crispy-doom-5.6"; 5 - src = fetchurl { 6 - url = "https://github.com/fabiangreffrath/crispy-doom/archive/${name}.tar.gz"; 7 - sha256 = "1icz3ivd7v3mvwlslwwd7s3bpjzr54x4lslihyjg1ckq23sl830j"; 4 + pname = "crispy-doom"; 5 + version = "5.6.3"; 6 + 7 + src = fetchFromGitHub { 8 + owner = "fabiangreffrath"; 9 + repo = pname; 10 + rev = "${pname}-${version}"; 11 + sha256 = "0f319979wqfgm4pvsa6y5clg30p55l441kmrr8db0p5smyv3x2s4"; 8 12 }; 9 - nativeBuildInputs = [ autoreconfHook pkgconfig ]; 10 - buildInputs = [ SDL2 SDL2_mixer SDL2_net ]; 11 - patchPhase = '' 13 + 14 + postPatch = '' 12 15 sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am 13 16 ''; 14 17 18 + nativeBuildInputs = [ autoreconfHook pkgconfig ]; 19 + buildInputs = [ SDL2 SDL2_mixer SDL2_net ]; 15 20 enableParallelBuilding = true; 16 21 17 22 meta = { 18 - homepage = http://fabiangreffrath.github.io/crispy-doom; 23 + homepage = "http://fabiangreffrath.github.io/crispy-doom"; 19 24 description = "A limit-removing enhanced-resolution Doom source port based on Chocolate Doom"; 20 - longDescription = "Crispy Doom is a limit-removing enhanced-resolution Doom source port based on Chocolate Doom. Its name means that 640x400 looks \"crisp\" and is also a slight reference to its origin."; 25 + longDescription = '' 26 + Crispy Doom is a limit-removing enhanced-resolution Doom source port based on Chocolate Doom. 27 + Its name means that 640x400 looks \"crisp\" and is also a slight reference to its origin. 28 + ''; 21 29 license = stdenv.lib.licenses.gpl2Plus; 22 30 platforms = stdenv.lib.platforms.unix; 23 31 maintainers = with stdenv.lib.maintainers; [ neonfuz ];
+6 -6
pkgs/games/sauerbraten/default.nix
··· 1 - { stdenv, fetchsvn, libGLU_combined, SDL, SDL_image, SDL_mixer 2 - , libpng, zlib, libjpeg, imagemagick, libX11, runtimeShell 1 + { stdenv, fetchsvn, SDL2, SDL2_image, SDL2_mixer 2 + , zlib, runtimeShell 3 3 }: 4 4 5 5 stdenv.mkDerivation rec { 6 6 name = "sauerbraten-r${version}"; 7 - version = "5000"; 7 + version = "5492"; 8 8 9 9 src = fetchsvn { 10 10 url = "https://svn.code.sf.net/p/sauerbraten/code"; 11 - sha256 = "17libj7dslprlwppdk3vyxdcigbsa4czln8gdyz9j264m11z1cbh"; 11 + sha256 = "0pin7ggy84fadjvran18db5v0l81qfv42faknpfaxx47xqz00l5s"; 12 12 rev = version; 13 13 }; 14 14 15 15 buildInputs = [ 16 - libGLU_combined SDL SDL_image SDL_mixer libpng zlib libjpeg imagemagick 17 - libX11 16 + SDL2 SDL2_mixer SDL2_image 17 + zlib 18 18 ]; 19 19 20 20 preBuild = ''
+96 -109
pkgs/misc/drivers/utsushi/default.nix
··· 1 - { stdenv, fetchurl, autoreconfHook, boost, gtkmm2 2 - , pkg-config, libtool, udev, libjpeg, file, texlive 3 - , libusb, libtiff, imagemagick, sane-backends, tesseract }: 4 - 5 - /* 6 - Alternatively, this package could use the "community source" at 7 - https://gitlab.com/utsushi/utsushi/ 8 - Epson provides proprietary plugins for networking, ocr and some more 9 - scanner models. Those are not (yet ?) packaged here. 10 - */ 1 + { stdenv, fetchFromGitLab, autoreconfHook, pkg-config, boost, gtkmm2 2 + , imagemagick, sane-backends, tesseract4, udev, libusb}: 11 3 12 4 stdenv.mkDerivation rec { 13 5 pname = "utsushi"; 14 - version = "3.57.0"; 6 + version = "3.59.2"; 15 7 16 - src = fetchurl { 17 - url = "http://support.epson.net/linux/src/scanner/imagescanv3/common/imagescan_${version}.orig.tar.gz"; 18 - sha256 = "0qy6n6nbisbvy0q3idj7hpmj9i85cd0a18klfd8nsqsa2nkg57ny"; 8 + src = fetchFromGitLab{ 9 + owner = pname; 10 + repo = "imagescan"; 11 + rev = version; 12 + sha256 = "06gp97dfnf43l6kb988scmm66q9n5rc7ndwv3rykrdpyhy8rbi05"; 19 13 }; 20 14 21 15 nativeBuildInputs = [ 22 - pkg-config 23 16 autoreconfHook 24 - libtool 17 + pkg-config 25 18 ]; 26 19 27 20 buildInputs = [ 28 - boost 29 - libusb 30 - libtiff 31 - libjpeg 32 - udev 21 + boost.dev 22 + gtkmm2.dev 33 23 imagemagick 34 24 sane-backends 35 - gtkmm2 36 - file 37 - tesseract 25 + udev.dev 26 + libusb.dev 38 27 ]; 39 28 40 - patches = [ 41 - ./patches/absolute-path-to-convert.patch 42 - ./patches/print-errors.patch 43 - ./patches/absolute_path_for_tesseract.patch 29 + NIX_CFLAGS_COMPILE = [ 30 + "-Wno-error=deprecated-declarations" 31 + "-Wno-error=parentheses" 32 + "-Wno-error=unused-variable" 44 33 ]; 45 34 46 35 postPatch = '' 47 36 # remove vendored dependencies 48 37 rm -r upstream/boost 38 + 49 39 # create fake udev and sane config 50 40 mkdir -p $out/etc/{sane.d,udev/rules.d} 51 41 touch $out/etc/sane.d/dll.conf 42 + 43 + # absolute paths to conver & tesseract 44 + substituteInPlace filters/magick.cpp \ 45 + --replace '"convert' '"${imagemagick}/bin/convert' 46 + substituteInPlace filters/reorient.cpp \ 47 + --replace '"tesseract' '"${tesseract4}/bin/tesseract' 48 + substituteInPlace filters/get-text-orientation \ 49 + --replace '=tesseract' '=${tesseract4}/bin/tesseract' 52 50 ''; 53 51 54 52 configureFlags = [ 55 53 "--with-boost-libdir=${boost}/lib" 56 54 "--with-sane-confdir=${placeholder "out"}/etc/sane.d" 57 55 "--with-udev-confdir=${placeholder "out"}/etc/udev" 58 - "--with-sane" 59 56 "--with-gtkmm" 60 57 "--with-jpeg" 61 58 "--with-magick" 59 + "--with-magick-pp" 62 60 "--with-sane" 63 61 "--with-tiff" 64 62 ]; ··· 65 67 66 68 enableParallelBuilding = true; 67 69 68 - meta = { 70 + doInstallCheck = true; 71 + 72 + meta = with stdenv.lib; { 69 73 description = "SANE utsushi backend for some Epson scanners"; 70 74 longDescription = '' 71 - ImageScanV3 (aka utsushi) scanner driver. 72 - Non-free plugins are not included so no network support. 73 - To use the SANE backend, in /etc/nixos/configuration.nix: 75 + ImageScanV3 (aka utsushi) scanner driver. Non-free plugins are not 76 + included, so no network support. To use the SANE backend, in 77 + <literal>/etc/nixos/configuration.nix</literal>: 74 78 75 - hardware.sane = { 76 - enable = true; 77 - extraBackends = [ pkgs.utsushi ]; 78 - }; 79 - services.udev.packages = [ pkgs.utsushi ]; 79 + <literal> 80 + hardware.sane = { 81 + enable = true; 82 + extraBackends = [ pkgs.utsushi ]; 83 + }; 84 + services.udev.packages = [ pkgs.utsushi ]; 85 + </literal> 80 86 81 - Supported hardware: 82 - - DS-40 83 - - DS-70 84 - - DS-80W 85 - - DS-410 86 - - DS-510 87 - - DS-520 88 - - DS-530 89 - - DS-535 90 - - DS-535H 91 - - DS-560 92 - - DS-575W 93 - - DS-760 94 - - DS-775 95 - - DS-780N 96 - - DS-860 97 - - DS-1630 98 - - DS-5500 99 - - DS-6500 100 - - DS-7500 101 - - DS-50000 102 - - DS-60000 103 - - DS-70000 104 - - EP-10VA Series 105 - - EP-808A Series 106 - - EP-978A3 Series 107 - - ES-50 108 - - ES-55R 109 - - ES-60W 110 - - ES-65WR 111 - - ES-300WR 112 - - ES-400 113 - - ES-500WR 114 - - ES-8500 115 - - ET-2500 Series 116 - - ET-2550 Series 117 - - ET-4500 Series 118 - - ET-4550 Series 119 - - Expression 1640XL 120 - - FF-680W 121 - - L220/L360 Series 122 - - L365/L366 Series 123 - - L380 Series 124 - - L455 Series 125 - - L565/L566 Series 126 - - L655 Series 127 - - PX-M840FX 128 - - PX-M860F 129 - - PX-M884F 130 - - PX-M7050 Series 131 - - PX-M7050FX Series 132 - - WF-4720 133 - - WF-6530 Series 134 - - WF-6590 Series 135 - - WF-8510/8590 Series 136 - - WF-R8590 Series 137 - - XP-220 Series 138 - - XP-230 Series 139 - - XP-235 Series 140 - - XP-332 335 Series 141 - - XP-430 Series 142 - - XP-432 435 Series 143 - - XP-530 Series 144 - - XP-540 145 - - XP-630 Series 146 - - XP-640 147 - - XP-830 Series 148 - - XP-960 Series 149 - ''; 150 - license = stdenv.lib.licenses.gpl3Plus; 151 - broken = true; 87 + Supported hardware: 88 + DS-1610, DS-1630, DS-1660W, DS-310, DS-320, DS-360W, DS-40, DS-410, 89 + DS-50000, DS-510, DS-520, DS-530, DS-535, DS-535H, DS-5500, DS-560, 90 + DS-570W, DS-575W, DS-60000, DS-6500, DS-70, DS-70000, DS-7500, DS-760, 91 + DS-770, DS-775, DS-780N, DS-80W, DS-860, EC-4020 Series, EC-4030 Series, 92 + EC-4040 Series, EP-10VA Series, EP-30VA Series, EP-708A Series, EP-709A 93 + Series, EP-710A Series, EP-711A Series, EP-712A Series, EP-808A Series, 94 + EP-810A Series, EP-811A Series, EP-812A Series, EP-879A Series, EP-880A 95 + Series, EP-881A Series, EP-882A Series, EP-978A3 Series, EP-979A3 Series, 96 + EP-982A3 Series, EP-M570T Series, ES-200, ES-300W, ES-300WR, ES-400, 97 + ES-50, ES-50, ES-500W, ES-500WR, ES-55R, ES-60W, ES-60WB, ES-60WW, 98 + ES-65WR, ET-16500 Series, ET-2500 Series, ET-2550 Series, ET-2600 Series, 99 + ET-2610 Series, ET-2650 Series, ET-2700 Series, ET-2710 Series, ET-2720 100 + Series, ET-2750 Series, ET-2760 Series, ET-3600 Series, ET-3700 Series, 101 + ET-3710 Series, ET-3750 Series, ET-3760 Series, ET-4500 Series, ET-4550 102 + Series, ET-4700 Series, ET-4750 Series, ET-4760 Series, ET-7700 Series, 103 + ET-7750 Series, ET-8700 Series, ET-M2140 Series, ET-M2170 Series, 104 + ET-M3140 Series, ET-M3170 Series, ET-M3180 Series, EW-052A Series, 105 + EW-452A Series, EW-M5071FT Series, EW-M571T Series, EW-M630T Series, 106 + EW-M660FT Series, EW-M670FT Series, EW-M770T Series, EW-M970A3T Series, 107 + FF-640, FF-680W, GT-S650, L1455 Series, L220 Series, L222 Series, L3050 108 + Series, L3060 Series, L3070 Series, L3100 Series, L3110 Series, L3150 109 + Series, L3160 Series, L360 Series, L362 Series, L364 Series, L365 Series, 110 + L366 Series, L375 Series, L380 Series, L382 Series, L385 Series, L386 111 + Series, L395 Series, L396 Series, L405 Series, L4150 Series, L4160 112 + Series, L455 Series, L475 Series, L485 Series, L486 Series, L495 Series, 113 + L5190 Series, L565 Series, L566 Series, L575 Series, L605 Series, L6160 114 + Series, L6170 Series, L6190 Series, L655 Series, L7160 Series, L7180 115 + Series, LX-10000F, LX-10000FK, LX-10010MF, LX-7000F, M2140 Series, M2170 116 + Series, M3140 Series, M3170 Series, M3180 Series, PX-048A Series, PX-049A 117 + Series, PX-M160T Series, PX-M270FT Series, PX-M270T Series, PX-M380F, 118 + PX-M381FL, PX-M5080F Series, PX-M5081F Series, PX-M680F Series, PX-M7050 119 + Series, PX-M7050FP, PX-M7050FX, PX-M7070FX, PX-M7110F, PX-M7110FP, 120 + PX-M780F Series, PX-M781F Series, PX-M840FX, PX-M860F, PX-M880FX, 121 + PX-M884F, PX-M885F, PX-M886FL, Perfection V19, Perfection V39, ST-2000 122 + Series, ST-3000 Series, ST-4000 Series, ST-M3000 Series, WF-2750 Series, 123 + WF-2760 Series, WF-2810 Series, WF-2830 Series, WF-2850 Series, WF-2860 124 + Series, WF-3720 Series, WF-3730 Series, WF-4720 Series, WF-4730 Series, 125 + WF-4740 Series, WF-6530 Series, WF-6590 Series, WF-7710 Series, WF-7720 126 + Series, WF-8510 Series, WF-8590 Series, WF-C17590 Series, WF-C20590 127 + Series, WF-C5710 Series, WF-C5790 Series, WF-C5790BA, WF-C579R Series, 128 + WF-C579RB, WF-C8610 Series, WF-C8690 Series, WF-C8690B, WF-C869R Series, 129 + WF-M20590 Series, WF-M5799 Series, WF-R8590 Series, XP-2100 Series, 130 + XP-220 Series, XP-230 Series, XP-235 Series, XP-240 Series, XP-243 245 131 + 247 Series, XP-255 257 Series, XP-3100 Series, XP-332 335 Series, XP-340 132 + Series, XP-342 343 345 Series, XP-352 355 Series, XP-4100 Series, XP-430 133 + Series, XP-432 435 Series, XP-440 Series, XP-442 445 Series, XP-452 455 134 + Series, XP-5100 Series, XP-530 Series, XP-540 Series, XP-6000 Series, 135 + XP-6100 Series, XP-630 Series, XP-640 Series, XP-7100 Series, XP-830 136 + Series, XP-8500 Series, XP-8600 Series, XP-900 Series, XP-960 Series, 137 + XP-970 Series 138 + ''; 139 + homepage = "https://gitlab.com/utsushi/imagescan"; 140 + license = licenses.gpl3Plus; 141 + maintainers = with maintainers; [ wucke13 ]; 142 + platforms = platforms.linux; 152 143 }; 153 144 }
-166
pkgs/misc/drivers/utsushi/patches/absolute-path-to-convert.patch
··· 1 - Index: utsushi-0.57.0/configure.ac 2 - =================================================================== 3 - --- utsushi-0.57.0.orig/configure.ac 4 - +++ utsushi-0.57.0/configure.ac 5 - @@ -221,6 +221,9 @@ AS_IF([test xno != x$enable_code_coverag 6 - [AC_MSG_ERROR([code coverage support requires a GNU C/C++ compiler])]) 7 - ]) 8 - AM_PROG_AR 9 - +AC_PATH_PROG([AWK],[awk]) 10 - +AC_DEFINE_UNQUOTED([AWK], ["$AWK"], 11 - + [Path to awk.]) 12 - 13 - PKG_PROG_PKG_CONFIG 14 - 15 - @@ -379,27 +382,31 @@ AM_CONDITIONAL([have_libmagick_pp], [tes 16 - AS_IF([test xno != "x$with_magick"], 17 - AS_CASE("x$with_magick", 18 - [xGraphicsMagick], 19 - - [AC_CHECK_PROGS([MAGICK_CONVERT], [gm]) 20 - - AS_IF([test xgm != x$MAGICK_CONVERT], 21 - + [[AC_PATH_PROG(MAGICK_CONVERT, gm)] 22 - + AS_IF([test x == x$MAGICK_CONVERT], 23 - [AC_MSG_ERROR([$with_magick requested but not found])]) 24 - AC_DEFINE([HAVE_GRAPHICS_MAGICK], [1]) 25 - - MAGICK_CONVERT="gm convert" 26 - + HAVE_MAGICK=1 27 - + MAGICK_CONVERT="$MAGICK_CONVERT convert" 28 - ], 29 - [xImageMagick], 30 - - [AC_CHECK_PROGS([MAGICK_CONVERT], [convert]) 31 - - AS_IF([test xconvert != x$MAGICK_CONVERT], 32 - + [[AC_PATH_PROG(MAGICK_CONVERT, convert)] 33 - + AS_IF([test x == x$MAGICK_CONVERT], 34 - [AC_MSG_ERROR([$with_magick requested but not found])]) 35 - AC_DEFINE([HAVE_IMAGE_MAGICK], [1]) 36 - + HAVE_MAGICK=1 37 - ], 38 - [xyes|xcheck], 39 - - [AC_CHECK_PROGS([MAGICK_CONVERT], [gm convert]) 40 - + [[AC_PATH_PROGS([MAGICK_CONVERT], [gm convert])] 41 - AS_CASE(x$MAGICK_CONVERT, 42 - - [xgm], 43 - + [x*gm], 44 - [AC_DEFINE([HAVE_GRAPHICS_MAGICK], [1]) 45 - - MAGICK_CONVERT="gm convert" 46 - + HAVE_MAGICK=1 47 - + MAGICK_CONVERT="$MAGICK_CONVERT convert" 48 - ], 49 - - [xconvert], 50 - + [x*convert], 51 - [AC_DEFINE([HAVE_IMAGE_MAGICK], [1]) 52 - + HAVE_MAGICK=1 53 - ], 54 - [dnl default case 55 - AS_IF([test xcheck != "x$with_magick"], 56 - @@ -410,7 +417,7 @@ AS_IF([test xno != "x$with_magick"], 57 - AC_MSG_ERROR([unknown value: --with-magick=$with_magick]) 58 - ])) 59 - AC_DEFINE_UNQUOTED([MAGICK_CONVERT], ["$MAGICK_CONVERT"]) 60 - -AM_CONDITIONAL([have_magick], [test x != "x$MAGICK_CONVERT"]) 61 - +AM_CONDITIONAL([have_magick], [test x != "x$HAVE_MAGICK"]) 62 - 63 - AS_IF([test xno != "x$with_gtkmm"], 64 - [PKG_CHECK_MODULES([LIBGTKMM], [gtkmm-2.4 >= 2.20], 65 - Index: utsushi-0.57.0/filters/magick.cpp 66 - =================================================================== 67 - --- utsushi-0.57.0.orig/filters/magick.cpp 68 - +++ utsushi-0.57.0/filters/magick.cpp 69 - @@ -81,19 +81,18 @@ chomp (char *str) 70 - } 71 - 72 - bool 73 - -magick_version_before_(const char *magick, const char *cutoff) 74 - +magick_version_before_(const char *cutoff) 75 - { 76 - FILE *fp = NULL; 77 - int errc = 0; 78 - 79 - - if (0 == strcmp ("GraphicsMagick", magick)) 80 - - fp = popen ("gm convert -version" 81 - - "| awk '/^GraphicsMagick/{print $2}'", "r"); 82 - - if (fp) errc = errno; 83 - - 84 - - if (0 == strcmp ("ImageMagick", magick)) 85 - - fp = popen ("convert -version" 86 - - "| awk '/^Version:/{print $3}'", "r"); 87 - +#if HAVE_GRAPHICS_MAGICK 88 - + fp = popen (MAGICK_CONVERT " -version" 89 - + "| " AWK " '/^GraphicsMagick/{print $2}'", "r"); 90 - +#elif HAVE_IMAGE_MAGICK 91 - + fp = popen (MAGICK_CONVERT " -version" 92 - + "| " AWK " '/^Version:/{print $3}'", "r"); 93 - +#endif 94 - if (fp) errc = errno; 95 - 96 - if (fp) 97 - @@ -106,42 +105,32 @@ magick_version_before_(const char *magic 98 - 99 - if (version) 100 - { 101 - - log::debug ("found %1%-%2%") % magick % version; 102 - + log::debug ("found " MAGICK_CONVERT "version %1%") % version; 103 - return (0 > strverscmp (version, cutoff)); 104 - } 105 - } 106 - 107 - if (errc) 108 - - log::alert ("failure checking %1% version: %2%") 109 - - % magick 110 - + log::alert ("failure checking " MAGICK_CONVERT " version: %1%") 111 - % strerror (errc); 112 - 113 - return false; 114 - } 115 - 116 - bool 117 - -graphics_magick_version_before_(const char *cutoff) 118 - -{ 119 - - return magick_version_before_("GraphicsMagick", cutoff); 120 - -} 121 - - 122 - -bool 123 - -image_magick_version_before_(const char *cutoff) 124 - -{ 125 - - return magick_version_before_("ImageMagick", cutoff); 126 - -} 127 - - 128 - -bool 129 - auto_orient_is_usable () 130 - { 131 - static int usable = -1; 132 - 133 - if (-1 == usable) 134 - { 135 - - if (HAVE_GRAPHICS_MAGICK) // version -auto-orient was added 136 - - usable = !graphics_magick_version_before_("1.3.18"); 137 - - if (HAVE_IMAGE_MAGICK) // version known to work 138 - - usable = !image_magick_version_before_("6.7.8-9"); 139 - +#if HAVE_GRAPHICS_MAGICK 140 - + // version -auto-orient was added 141 - + usable = !magick_version_before_("1.3.18"); 142 - +#elif HAVE_IMAGE_MAGICK 143 - + // version known to work 144 - + usable = !magick_version_before_("6.7.8-9"); 145 - +#endif 146 - if (-1 == usable) 147 - usable = false; 148 - usable = (usable ? 1 : 0); 149 - @@ -392,7 +381,7 @@ magick::arguments (const context& ctx) 150 - if (color_correction_) 151 - { 152 - if (HAVE_IMAGE_MAGICK 153 - - && !image_magick_version_before_("6.6.1-0")) 154 - + && !magick_version_before_("6.6.1-0")) 155 - argv += " -color-matrix"; 156 - else 157 - argv += " -recolor"; 158 - @@ -416,7 +405,7 @@ magick::arguments (const context& ctx) 159 - size_t mat_size = ((HAVE_IMAGE_MAGICK) ? 6 : 5); 160 - 161 - if (HAVE_IMAGE_MAGICK 162 - - && !image_magick_version_before_("6.6.1-0")) 163 - + && !magick_version_before_("6.6.1-0")) 164 - argv += " -color-matrix"; 165 - else 166 - argv += " -recolor";
-56
pkgs/misc/drivers/utsushi/patches/absolute_path_for_tesseract.patch
··· 1 - Index: utsushi-0.57.0/filters/reorient.cpp 2 - =================================================================== 3 - --- utsushi-0.57.0.orig/filters/reorient.cpp 4 - +++ utsushi-0.57.0/filters/reorient.cpp 5 - @@ -96,8 +96,8 @@ chomp (char *str) 6 - bool 7 - tesseract_version_before_(const char *cutoff) 8 - { 9 - - FILE *fp = popen ("tesseract --version 2>&1" 10 - - "| awk '/^tesseract/{ print $2 }'", "r"); 11 - + FILE *fp = popen (TESSERACT " --version 2>&1" 12 - + "| " AWK " '/^tesseract/{ print $2 }'", "r"); 13 - int errc = errno; 14 - 15 - if (fp) 16 - @@ -126,7 +126,7 @@ tesseract_version_before_(const char *cu 17 - bool 18 - have_tesseract_language_pack_(const char *lang) 19 - { 20 - - std::string cmd("tesseract --list-langs 2>&1" 21 - + std::string cmd(TESSERACT " --list-langs 2>&1" 22 - "| sed -n '/^"); 23 - cmd += lang; 24 - cmd += "$/p'"; 25 - @@ -291,7 +291,7 @@ reorient::reorient () 26 - 27 - if (found) 28 - { 29 - - if (have_tesseract_()) engine_ = "tesseract"; 30 - + if (have_tesseract_()) engine_ = TESSERACT; 31 - if (have_ocr_engine_()) engine_ = abs_path_name; 32 - } 33 - freeze_options (); // initializes option tracking member variables 34 - Index: utsushi-0.57.0/configure.ac 35 - =================================================================== 36 - --- utsushi-0.57.0.orig/configure.ac 37 - +++ utsushi-0.57.0/configure.ac 38 - @@ -196,6 +196,8 @@ AC_DEFINE([HAVE_IMAGE_MAGICK_PP], 39 - [0], [Define to 1 if ImageMagick's C++ API is usable]) 40 - AC_DEFINE([MAGICK_CONVERT], 41 - [], [Define to an appropriate command-line invocation for convert]) 42 - +AC_DEFINE([TESSERACT], 43 - + [], [Define to an appropriate command-line invocation for tesseract]) 44 - AC_DEFINE([WITH_INCLUDED_BOOST], 45 - [0], [Define to 1 if using the included Boost sources]) 46 - 47 - @@ -419,6 +421,9 @@ AS_IF([test xno != "x$with_magick"], 48 - AC_DEFINE_UNQUOTED([MAGICK_CONVERT], ["$MAGICK_CONVERT"]) 49 - AM_CONDITIONAL([have_magick], [test x != "x$HAVE_MAGICK"]) 50 - 51 - +AC_PATH_PROG([TESSERACT], [tesseract], [tesseract]) 52 - +AC_DEFINE_UNQUOTED([TESSERACT], ["$TESSERACT"]) 53 - + 54 - AS_IF([test xno != "x$with_gtkmm"], 55 - [PKG_CHECK_MODULES([LIBGTKMM], [gtkmm-2.4 >= 2.20], 56 - [AC_DEFINE([HAVE_LIBGTKMM], [1])],
-15
pkgs/misc/drivers/utsushi/patches/print-errors.patch
··· 1 - Index: utsushi-0.57.0/lib/log.cpp 2 - =================================================================== 3 - --- utsushi-0.57.0.orig/lib/log.cpp 4 - +++ utsushi-0.57.0/lib/log.cpp 5 - @@ -26,8 +26,8 @@ 6 - 7 - namespace utsushi { 8 - 9 - -log::priority log::threshold = log::FATAL; 10 - -log::category log::matching = log::NOTHING; 11 - +log::priority log::threshold = log::ERROR; 12 - +log::category log::matching = log::ALL; 13 - 14 - template<> 15 - std::basic_ostream< char >&
-3
pkgs/misc/drivers/utsushi/patches/series
··· 1 - absolute-path-to-convert.patch 2 - print-errors.patch 3 - absolute_path_for_tesseract.patch
+2 -2
pkgs/misc/emulators/libdsk/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "libdsk"; 5 - version = "1.5.10"; 5 + version = "1.5.12"; 6 6 7 7 src = fetchurl { 8 8 url = "https://www.seasip.info/Unix/LibDsk/${pname}-${version}.tar.gz"; 9 - sha256 = "0ndkwyf8dp252v4yhqphvi32gmz9m5kkdqwv0aw92cz7mfbnp36g"; 9 + sha256 = "0s2k9vkrf95pf4ydc6vazb29ysrnhdpcfjnf17lpk4nmlv1j3vyv"; 10 10 }; 11 11 12 12 meta = with stdenv.lib; {
+7 -2
pkgs/misc/emulators/wine/base.nix
··· 1 - { stdenv, lib, pkgArches, 1 + { stdenv, lib, pkgArches, callPackage, 2 2 name, version, src, monos, geckos, platforms, 3 3 pkgconfig, fontforge, makeWrapper, flex, bison, 4 4 supportFlags, ··· 7 7 8 8 with import ./util.nix { inherit lib; }; 9 9 10 + let 11 + vkd3d = callPackage ./vkd3d.nix {}; 12 + in 10 13 stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { 11 14 builder = buildScript; 12 15 }) // rec { ··· 49 46 ++ lib.optional udevSupport pkgs.udev 50 47 ++ lib.optional vulkanSupport pkgs.vulkan-loader 51 48 ++ lib.optional sdlSupport pkgs.SDL2 49 + ++ lib.optional faudioSupport pkgs.faudio 50 + ++ lib.optional vkd3dSupport vkd3d 52 51 ++ lib.optionals gstreamerSupport (with pkgs.gst_all_1; 53 - [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav 52 + [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav 54 53 (gst-plugins-bad.override { enableZbar = false; }) ]) 55 54 ++ lib.optionals gtkSupport [ pkgs.gtk3 pkgs.glib ] 56 55 ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ]
+4 -1
pkgs/misc/emulators/wine/default.nix
··· 43 43 xmlSupport ? false, 44 44 vulkanSupport ? false, 45 45 sdlSupport ? false, 46 + faudioSupport ? false, 47 + vkd3dSupport ? false, 46 48 }: 47 49 48 50 let wine-build = build: release: ··· 56 54 netapiSupport cursesSupport vaSupport pcapSupport v4lSupport saneSupport 57 55 gsmSupport gphoto2Support ldapSupport fontconfigSupport alsaSupport 58 56 pulseaudioSupport xineramaSupport gtkSupport openclSupport xmlSupport tlsSupport 59 - openglSupport gstreamerSupport udevSupport vulkanSupport sdlSupport; 57 + openglSupport gstreamerSupport udevSupport vulkanSupport sdlSupport faudioSupport 58 + vkd3dSupport; 60 59 }; 61 60 }); 62 61
+5 -5
pkgs/misc/emulators/wine/sources.nix
··· 31 31 32 32 ## see http://wiki.winehq.org/Mono 33 33 mono = fetchurl rec { 34 - version = "4.9.2"; 34 + version = "4.9.3"; 35 35 url = "http://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}.msi"; 36 - sha256 = "0x7z0216j21bzc9v1q283qlsvbfzn92yiaf26ilh6bd7zib4c7xr"; 36 + sha256 = "0va7nbhvfb52g78s9k3zc6xxwsn5whfyn333s6fdxycp8rkvgxkw"; 37 37 }; 38 38 }; 39 39 40 40 unstable = fetchurl rec { 41 41 # NOTE: Don't forget to change the SHA256 for staging as well. 42 - version = "4.16"; 42 + version = "4.17"; 43 43 url = "https://dl.winehq.org/wine/source/4.x/wine-${version}.tar.xz"; 44 - sha256 = "17qxbddv23ibbayw1ai984m0dlq63cgplms2jhsc09incjhafywd"; 44 + sha256 = "1bmj4l84q29h4km5ab5zzypns3mpf7pizybcpab6jj47cr1s303l"; 45 45 inherit (stable) mono gecko32 gecko64; 46 46 }; 47 47 48 48 staging = fetchFromGitHub rec { 49 49 # https://github.com/wine-staging/wine-staging/releases 50 50 inherit (unstable) version; 51 - sha256 = "0zkvwl6rxr6xcqk4a3h43cak67w6bcyqqnajz6azif07ir3z1c61"; 51 + sha256 = "0cb0w6jwqs70854g1ixfj8r53raln0spyy1l96qv72ymbhzc353h"; 52 52 owner = "wine-staging"; 53 53 repo = "wine-staging"; 54 54 rev = "v${version}";
+26
pkgs/misc/emulators/wine/vkd3d.nix
··· 1 + { stdenv, fetchurl, vulkan-headers, spirv-headers, vulkan-loader }: 2 + 3 + #TODO: MoltenVK 4 + #TODO: unstable 5 + 6 + stdenv.mkDerivation rec { 7 + pname = "vkd3d"; 8 + version = "1.1"; 9 + 10 + src = fetchurl { 11 + url = "https://dl.winehq.org/vkd3d/source/vkd3d-${version}.tar.xz"; 12 + sha256 = "1dkayp95g1691w7n2yn1q9y7klq5xa921dgmn9a5vil0rihxqnj9"; 13 + }; 14 + 15 + buildInputs = [ vulkan-headers spirv-headers vulkan-loader ]; 16 + 17 + enableParallelBuilding = true; 18 + 19 + meta = with stdenv.lib; { 20 + description = "A 3d library build on top on Vulkan with a similar api to DirectX 12"; 21 + homepage = "https://source.winehq.org/git/vkd3d.git"; 22 + license = licenses.lgpl21; 23 + platforms = platforms.linux; 24 + maintainers = [ maintainers.marius851000 ]; 25 + }; 26 + }
+230 -120
pkgs/misc/vim-plugins/generated.nix
··· 61 61 62 62 ale = buildVimPluginFrom2Nix { 63 63 pname = "ale"; 64 - version = "2019-09-25"; 64 + version = "2019-10-09"; 65 65 src = fetchFromGitHub { 66 66 owner = "w0rp"; 67 67 repo = "ale"; 68 - rev = "41ff80dc9ec2cc834cc8c4aaa753e308223d48b8"; 69 - sha256 = "1bfylcp9490cd2yz00nq6ky1w55dkvldrdjxip36ahci4cpfn0xw"; 68 + rev = "3fe2223a48465c58c48a5a6a30ecf13ab92f7b97"; 69 + sha256 = "1nzh34n1kix1fzfz3vnk5pajajj10k449m6wn3458d5mpyp7lrsh"; 70 70 }; 71 71 }; 72 72 ··· 270 270 271 271 coc-denite = buildVimPluginFrom2Nix { 272 272 pname = "coc-denite"; 273 - version = "2019-01-26"; 273 + version = "2019-10-09"; 274 274 src = fetchFromGitHub { 275 275 owner = "neoclide"; 276 276 repo = "coc-denite"; 277 - rev = "ec7dfd56612664c20bb0f6a19c524100cd2047ed"; 278 - sha256 = "0fc03ndq7ys4lvqgfbh314fsvbcjf3nm4spfklsmz2c587qbvv1l"; 277 + rev = "7da99cf5eb5cbf9f7eb6c6b8450764afbb9c20f1"; 278 + sha256 = "1qj4xr9vy2s3hr5hqjfdq46x5lszqsp4z1dggfk6gpzwln4k5ql0"; 279 279 }; 280 280 }; 281 281 ··· 303 303 304 304 coc-git = buildVimPluginFrom2Nix { 305 305 pname = "coc-git"; 306 - version = "2019-09-29"; 306 + version = "2019-10-05"; 307 307 src = fetchFromGitHub { 308 308 owner = "neoclide"; 309 309 repo = "coc-git"; 310 - rev = "50508a69a02e3598ad1208d4f2f7be9df555892b"; 311 - sha256 = "18id9gbpx15acyrg695434cjk5ni543y265xjp0jc3jwayl3rwfq"; 310 + rev = "fea9b887936590e58f179d38e88005454e150673"; 311 + sha256 = "19vhlhrzzijxkxn1c6azp8s2khdckxgp0vk4rdlhjhc6j14110p5"; 312 312 }; 313 313 }; 314 314 ··· 391 391 392 392 coc-lists = buildVimPluginFrom2Nix { 393 393 pname = "coc-lists"; 394 - version = "2019-10-02"; 394 + version = "2019-10-04"; 395 395 src = fetchFromGitHub { 396 396 owner = "neoclide"; 397 397 repo = "coc-lists"; 398 - rev = "5711bf2eedb7de2757b1650603736886a810388d"; 399 - sha256 = "0k0lgdvxlpv6hg09xhwkim9654sgzw2ivhp1saiab1dy0klp4iqv"; 398 + rev = "3c117046b54130157006f8ddf048304507499260"; 399 + sha256 = "1wv3ryih2f3hdcb78yy0r20wzlpqf4jv3j4mllb9vay0lcgyx90b"; 400 400 }; 401 401 }; 402 402 ··· 424 424 425 425 coc-prettier = buildVimPluginFrom2Nix { 426 426 pname = "coc-prettier"; 427 - version = "2019-10-01"; 427 + version = "2019-10-06"; 428 428 src = fetchFromGitHub { 429 429 owner = "neoclide"; 430 430 repo = "coc-prettier"; 431 - rev = "dbe8d23a4397daba8211192c57117ea0f900fbf6"; 432 - sha256 = "1p7ypmy5x7d1skrfqgl52vrx0y5z8q66fk9zyj4y349n4kgx9i85"; 431 + rev = "198fff4227cbc2742ed6167c1f097826e867d66d"; 432 + sha256 = "1ylwcr8l3bhgxb2zkqskkq97757di6vq7acxw6dd1hb5hk5a17kc"; 433 433 }; 434 434 }; 435 435 ··· 545 545 546 546 coc-tsserver = buildVimPluginFrom2Nix { 547 547 pname = "coc-tsserver"; 548 - version = "2019-10-02"; 548 + version = "2019-10-06"; 549 549 src = fetchFromGitHub { 550 550 owner = "neoclide"; 551 551 repo = "coc-tsserver"; 552 - rev = "d64d956388d85b53dceca6eb526b032c96912672"; 553 - sha256 = "137bfdnywx44vl8b50vxbi7k8g622yhpsavvlqxc8cllmjamp96f"; 552 + rev = "a22270bede3ebab2f51c9a4bfd91305c5d5b7fcb"; 553 + sha256 = "1nd2hk0zdgys7gzmfzkyzsxdcc2dbw573g7wxwxsa9fsk733fydf"; 554 554 }; 555 555 }; 556 556 557 557 coc-vetur = buildVimPluginFrom2Nix { 558 558 pname = "coc-vetur"; 559 - version = "2019-08-22"; 559 + version = "2019-10-12"; 560 560 src = fetchFromGitHub { 561 561 owner = "neoclide"; 562 562 repo = "coc-vetur"; 563 - rev = "444c297e2a418d816b6094446b57f2333ef9047a"; 564 - sha256 = "01d51z6iyl2p5lhkr86a3gri0d8g7ydb8qvlp0xqrr2fy97xdx9v"; 563 + rev = "b26cda8472205bf28522f06f16a39166a0b78d2a"; 564 + sha256 = "0d8x4l5jk1na0a08xxq65drhcisxm5s8llsymiv9mgnqv3w43yyj"; 565 565 }; 566 566 }; 567 567 ··· 777 777 778 778 defx-nvim = buildVimPluginFrom2Nix { 779 779 pname = "defx-nvim"; 780 - version = "2019-09-29"; 780 + version = "2019-10-04"; 781 781 src = fetchFromGitHub { 782 782 owner = "Shougo"; 783 783 repo = "defx.nvim"; 784 - rev = "9423625ec729fceed640337012a8a64264f47654"; 785 - sha256 = "11gwdqyayi9pznkw75z27k7r42bl5dh9l3d79ashfv70z578sp1j"; 784 + rev = "442fda4ab39a340052c173e414e03e10eb0c8244"; 785 + sha256 = "1h8h97hvj5bjdwh5ixj6cpdc1xjnvnrwnykfpz460vqzn2wkcfj9"; 786 786 }; 787 787 }; 788 788 ··· 821 821 822 822 denite-nvim = buildVimPluginFrom2Nix { 823 823 pname = "denite-nvim"; 824 - version = "2019-09-28"; 824 + version = "2019-10-04"; 825 825 src = fetchFromGitHub { 826 826 owner = "Shougo"; 827 827 repo = "denite.nvim"; 828 - rev = "2de8a3dfd7a104ce6e661c672d58f90ffa90dc35"; 829 - sha256 = "1bnlr0lrkl8djhji0vaplx73vw4yq82nx90lzd9jch1fm4d5mdq0"; 828 + rev = "7e15b1ffed251ef68ec3796676fe37ee57c786ca"; 829 + sha256 = "08c0m8jkdi21r2wxqqkar411ydvmfpwqdmnklpzzs4hznxfqxpf3"; 830 830 }; 831 831 }; 832 832 ··· 945 945 946 946 deoplete-nvim = buildVimPluginFrom2Nix { 947 947 pname = "deoplete-nvim"; 948 - version = "2019-09-26"; 948 + version = "2019-10-07"; 949 949 src = fetchFromGitHub { 950 950 owner = "Shougo"; 951 951 repo = "deoplete.nvim"; 952 - rev = "503c42d17deb812ee5363e271cca0e68856a289d"; 953 - sha256 = "1b4hd4g3s96gbq3bi4jbry02jhbzvhx09jss574krhp771mrkzl2"; 952 + rev = "70a11ee67f3c4353e48aad69812c34b5c8489f07"; 953 + sha256 = "1zwhsk30nq5p82px2z4gri8pxgkri26x488fi20pdkpabgg5dh8g"; 954 954 }; 955 955 }; 956 956 ··· 1023 1023 1024 1024 emmet-vim = buildVimPluginFrom2Nix { 1025 1025 pname = "emmet-vim"; 1026 - version = "2019-08-27"; 1026 + version = "2019-10-08"; 1027 1027 src = fetchFromGitHub { 1028 1028 owner = "mattn"; 1029 1029 repo = "emmet-vim"; 1030 - rev = "10b3746ecb52064d44bbcb1fdf6b21cca551f30c"; 1031 - sha256 = "1crm0qj8wwizgvzn4jlwbpnjbddp08fs9i46nr56q38hc6mgir4x"; 1030 + rev = "5f559fae12a8babf414376906197dbd751e11380"; 1031 + sha256 = "0z9lny12hckc635zafh1mdh58pikz5k19kkhxj1m77h15rwwms7f"; 1032 1032 fetchSubmodules = true; 1033 1033 }; 1034 1034 }; ··· 1179 1179 1180 1180 ghcid = buildVimPluginFrom2Nix { 1181 1181 pname = "ghcid"; 1182 - version = "2019-10-02"; 1182 + version = "2019-10-04"; 1183 1183 src = fetchFromGitHub { 1184 1184 owner = "ndmitchell"; 1185 1185 repo = "ghcid"; 1186 - rev = "840d9a7f4c707b3369f2a4b6aac89dcbc45950dc"; 1187 - sha256 = "19bncad9k4mc2zsiw3r6qrf1mscjzimivzpq4d1yp4ciswvmqx4a"; 1186 + rev = "8b7ee2a596aa33dec51246a4670eb20e337caaa2"; 1187 + sha256 = "19magq7d0yi2jklm9zn7da2xk1lm21hlcscl1x3i0ma6all5y06s"; 1188 1188 }; 1189 1189 }; 1190 1190 ··· 1488 1488 1489 1489 lean-vim = buildVimPluginFrom2Nix { 1490 1490 pname = "lean-vim"; 1491 - version = "2017-05-03"; 1491 + version = "2019-10-04"; 1492 1492 src = fetchFromGitHub { 1493 1493 owner = "leanprover"; 1494 1494 repo = "lean.vim"; 1495 - rev = "2ebb71d95c072f8604385dab58398b2107337e63"; 1496 - sha256 = "0rvvicw8ldaskwar5219aag93xa3qp3nqld5ddb70c6hq3bmwrnz"; 1495 + rev = "2ace010eb32603a65af7921954a0594a02523c6b"; 1496 + sha256 = "0wq2lw4xx2qhz1xii9g7i6wz0y43b2icqrm6ypr9jmaac1rhiq7c"; 1497 + }; 1498 + }; 1499 + 1500 + lessspace-vim = buildVimPluginFrom2Nix { 1501 + pname = "lessspace-vim"; 1502 + version = "2019-09-12"; 1503 + src = fetchFromGitHub { 1504 + owner = "thirtythreeforty"; 1505 + repo = "lessspace.vim"; 1506 + rev = "dc05cf6c3b67e3f8c87da2e565c5524872526316"; 1507 + sha256 = "154x6i2ncmcbc3snkzdcggq5m5zvlbjyry5lvr6n4qcvf65z5z44"; 1497 1508 }; 1498 1509 }; 1499 1510 ··· 1741 1730 1742 1731 neoformat = buildVimPluginFrom2Nix { 1743 1732 pname = "neoformat"; 1744 - version = "2019-09-26"; 1733 + version = "2019-10-07"; 1745 1734 src = fetchFromGitHub { 1746 1735 owner = "sbdchd"; 1747 1736 repo = "neoformat"; 1748 - rev = "6b66c20fadd489460422104a62279a0cd8b35eda"; 1749 - sha256 = "1kfhirlxq90vbqzg0wwa69aya0k89icxbw8qdinfrsfng1f3yliq"; 1737 + rev = "ec512eb8d8d66fa15bb7f5df2f500d117aa3ee0d"; 1738 + sha256 = "0v2i0wwiyc5x9s3ff7qpddicf9i18hhmzffgkm0hfmnspln04vml"; 1750 1739 }; 1751 1740 }; 1752 1741 ··· 1763 1752 1764 1753 neomake = buildVimPluginFrom2Nix { 1765 1754 pname = "neomake"; 1766 - version = "2019-09-19"; 1755 + version = "2019-10-09"; 1767 1756 src = fetchFromGitHub { 1768 1757 owner = "neomake"; 1769 1758 repo = "neomake"; 1770 - rev = "ba38b8786ce68c36fc3cd2139a7820b25bea378a"; 1771 - sha256 = "187zj4ircbbhn7gp3gabzrcnld3mz5g76ibp4wbcxngml60hhk9r"; 1759 + rev = "eefad2c87845b141a269e0ed64c23eeb64319506"; 1760 + sha256 = "0b74ga7wvd3fs2hrdjjal3ihacl81fyld01jn8chm255px1kajkv"; 1772 1761 }; 1773 1762 }; 1774 1763 ··· 1827 1816 }; 1828 1817 }; 1829 1818 1819 + neovim-fuzzy = buildVimPluginFrom2Nix { 1820 + pname = "neovim-fuzzy"; 1821 + version = "2018-11-15"; 1822 + src = fetchFromGitHub { 1823 + owner = "cloudhead"; 1824 + repo = "neovim-fuzzy"; 1825 + rev = "c177209678477d091ee4576e231c5b80b44514d0"; 1826 + sha256 = "069phpy1p8dindi6whddsb9x5zyw1adzsnv7br7q955hf6x9bxxj"; 1827 + }; 1828 + }; 1829 + 1830 1830 neovim-sensible = buildVimPluginFrom2Nix { 1831 1831 pname = "neovim-sensible"; 1832 1832 version = "2017-09-20"; ··· 1862 1840 1863 1841 nerdcommenter = buildVimPluginFrom2Nix { 1864 1842 pname = "nerdcommenter"; 1865 - version = "2019-09-26"; 1843 + version = "2019-10-05"; 1866 1844 src = fetchFromGitHub { 1867 1845 owner = "scrooloose"; 1868 1846 repo = "nerdcommenter"; 1869 - rev = "a4b7c046b3d3e170c6f62a6209abfa0760d6694a"; 1870 - sha256 = "0qz5b00rv59b3ng8wzf69lgbabqxfwzxbcj2595hmyf6pi0k0swz"; 1847 + rev = "92082862364cf5ec3eec79a025bbc7bc5165e05f"; 1848 + sha256 = "0aqjc26l1m62jgj34difkkbbd0kam1sa6ldfwf2fbkxs3f5y63q8"; 1871 1849 }; 1872 1850 }; 1873 1851 1874 1852 nerdtree = buildVimPluginFrom2Nix { 1875 1853 pname = "nerdtree"; 1876 - version = "2019-10-01"; 1854 + version = "2019-10-11"; 1877 1855 src = fetchFromGitHub { 1878 1856 owner = "scrooloose"; 1879 1857 repo = "nerdtree"; 1880 - rev = "2d639b70e73ecf3f62884a578fe5e5937e6d8a92"; 1881 - sha256 = "0ahfdbg26yn4phwkbkx29m8z8dabx5qa7zahsab0pd3pvgipjxzj"; 1858 + rev = "926ff0ec038d2be0bf4ff3412d3c7144b5f82498"; 1859 + sha256 = "12znr5q2p41yq4av27a49ciisdlv3ajh9qrfgbkvc581l2pbq0yz"; 1882 1860 }; 1883 1861 }; 1884 1862 ··· 1961 1939 1962 1940 nvimdev-nvim = buildVimPluginFrom2Nix { 1963 1941 pname = "nvimdev-nvim"; 1964 - version = "2019-09-27"; 1942 + version = "2019-10-09"; 1965 1943 src = fetchFromGitHub { 1966 1944 owner = "neovim"; 1967 1945 repo = "nvimdev.nvim"; 1968 - rev = "c405a548d489e3bb93784ecf5f6fa25109305ac1"; 1969 - sha256 = "17n9adnhhc6hnvrw98i54f8jb1510bfzgciwf436l5xgcjgvqvk0"; 1946 + rev = "994ff5daf571ad02cc96436002411b4fb235c91f"; 1947 + sha256 = "07dx6qkxqpakl1hrqwhfjgdzcnl4j3j9qih0l20qn8p6askj3b2j"; 1970 1948 }; 1971 1949 }; 1972 1950 ··· 1978 1956 repo = "onehalf"; 1979 1957 rev = "fdcbffe3175c29bb78d19dcaf9b2a456482fcf1e"; 1980 1958 sha256 = "0zbmh3cf2lnn3mcqbz4s992v6kaddq9nj4xb1wxvgyqp7kjkpwql"; 1959 + }; 1960 + }; 1961 + 1962 + open-browser-github-vim = buildVimPluginFrom2Nix { 1963 + pname = "open-browser-github-vim"; 1964 + version = "2018-03-14"; 1965 + src = fetchFromGitHub { 1966 + owner = "tyru"; 1967 + repo = "open-browser-github.vim"; 1968 + rev = "6f63e9c8b9482858af12c2dc60f6df2854e57f28"; 1969 + sha256 = "06wvj6sqqzf52ng0k0p9g8wnlrljnia6h4d65681plqyxakbvi2w"; 1981 1970 }; 1982 1971 }; 1983 1972 ··· 2038 2005 2039 2006 plantuml-syntax = buildVimPluginFrom2Nix { 2040 2007 pname = "plantuml-syntax"; 2041 - version = "2019-07-18"; 2008 + version = "2019-10-12"; 2042 2009 src = fetchFromGitHub { 2043 2010 owner = "aklt"; 2044 2011 repo = "plantuml-syntax"; 2045 - rev = "0024021f01c349c2828aeb50a1e131997adea066"; 2046 - sha256 = "1abqpbgz0d0ik4w5frha62i0s3f2w5xsgfa34c0jbwzzq0fkvkk7"; 2012 + rev = "ea0d44c725b3bed5dc37ab88d62279c6066add06"; 2013 + sha256 = "1f5dljfqk69f77r94kxaz8pi35n7hc53h5gfcs3ba0jsjz19mpnv"; 2047 2014 }; 2048 2015 }; 2049 2016 ··· 2066 2033 repo = "PreserveNoEOL"; 2067 2034 rev = "940e3ce90e54d8680bec1135a21dcfbd6c9bfb62"; 2068 2035 sha256 = "1726jpr2zf6jrb00pp082ikbx4mll3a877pnzs6i18f9fgpaqqgd"; 2036 + }; 2037 + }; 2038 + 2039 + prev_indent = buildVimPluginFrom2Nix { 2040 + pname = "prev_indent"; 2041 + version = "2014-03-08"; 2042 + src = fetchFromGitHub { 2043 + owner = "vim-scripts"; 2044 + repo = "prev_indent"; 2045 + rev = "79e9b1b9a6895bfd15463c45595ca599987a4b23"; 2046 + sha256 = "03xqdwfkc7a84742ldsggi7ix99c7dhpmg6j13gkasyfk487ryh6"; 2069 2047 }; 2070 2048 }; 2071 2049 ··· 2137 2093 2138 2094 rainbow = buildVimPluginFrom2Nix { 2139 2095 pname = "rainbow"; 2140 - version = "2019-05-08"; 2096 + version = "2019-10-09"; 2141 2097 src = fetchFromGitHub { 2142 2098 owner = "luochen1990"; 2143 2099 repo = "rainbow"; 2144 - rev = "04b7723b810f24152865af656c46e8513489b77a"; 2145 - sha256 = "08qzcy06kr96dj91cdqzp5yn3zjpfcv9miywa6zxvir8vbfkv21d"; 2100 + rev = "c876f4bc6e737241d53669415f88cb5f2afd8ad9"; 2101 + sha256 = "1kmgm91q507qv9bvg37dn0lddzb8gwkmslajampnfjyfhbs0shgz"; 2146 2102 }; 2147 2103 }; 2148 2104 ··· 2258 2214 2259 2215 rust-vim = buildVimPluginFrom2Nix { 2260 2216 pname = "rust-vim"; 2261 - version = "2019-10-01"; 2217 + version = "2019-10-08"; 2262 2218 src = fetchFromGitHub { 2263 2219 owner = "rust-lang"; 2264 2220 repo = "rust.vim"; 2265 - rev = "0dabf6a2ecfe671e0cab945ba980ad19bbcfa8ca"; 2266 - sha256 = "193z9np3gbjbrgsak60bxq8sga74l3g7bfbcsqmjbw888bmaipm6"; 2221 + rev = "7959279612914eeaa584f5ce719fc71cd967e384"; 2222 + sha256 = "0glmnj3ra4m9hi0qrvdi8g2h29vzjw9biwq1l2sjx4hmv6smnri5"; 2267 2223 }; 2268 2224 }; 2269 2225 ··· 2346 2302 2347 2303 SpaceCamp = buildVimPluginFrom2Nix { 2348 2304 pname = "SpaceCamp"; 2349 - version = "2019-10-02"; 2305 + version = "2019-10-09"; 2350 2306 src = fetchFromGitHub { 2351 2307 owner = "jaredgorski"; 2352 2308 repo = "SpaceCamp"; 2353 - rev = "52f9db92514ee2d2b9907bff31e8b16267cc9a91"; 2354 - sha256 = "066z9zypgmcs9jzxfqhh4m7ppjcgw36bmhs799198qj740whlqd9"; 2309 + rev = "ed1e2b20a6c2c4945b529799f2cdb0409f6a10d2"; 2310 + sha256 = "0yl82pp23nfg4ckrq33a3flisp7all6gs3aza7z9swv966y1qhwx"; 2355 2311 }; 2356 2312 }; 2357 2313 ··· 2600 2556 2601 2557 traces-vim = buildVimPluginFrom2Nix { 2602 2558 pname = "traces-vim"; 2603 - version = "2019-09-30"; 2559 + version = "2019-10-09"; 2604 2560 src = fetchFromGitHub { 2605 2561 owner = "markonm"; 2606 2562 repo = "traces.vim"; 2607 - rev = "47a9452038d6aba1b653de21bc6e6bc303f1ae5f"; 2608 - sha256 = "129rism5mj91nmrsrmh2qksw74byfm346d5hizz4c40g87gs72x0"; 2563 + rev = "6863fcdce850673b4468c43244d189ade3f99a8f"; 2564 + sha256 = "0sq5cmsng2lid3dlfhcyagpzsjw1abp43wl3clm3bc5f3944lx5r"; 2609 2565 }; 2610 2566 }; 2611 2567 ··· 2710 2666 2711 2667 vim = buildVimPluginFrom2Nix { 2712 2668 pname = "vim"; 2713 - version = "2019-07-10"; 2669 + version = "2019-10-06"; 2714 2670 src = fetchFromGitHub { 2715 2671 owner = "dracula"; 2716 2672 repo = "vim"; 2717 - rev = "86712dc2de083e91a78bddddbb7fe7defe818c79"; 2718 - sha256 = "171fyxv09nikb5w2bmy3j5fmhb7mmqgsmjp9v3mc03hdxbf68kfk"; 2673 + rev = "f6dd7c17f71d2b6a1fad1e84e6cb28861af0e978"; 2674 + sha256 = "1407gl1rki5nj7rwiab61j579cih6shkgl02z4cmrvyb0dcq0vq8"; 2719 2675 }; 2720 2676 }; 2721 2677 ··· 2941 2897 2942 2898 vim-airline = buildVimPluginFrom2Nix { 2943 2899 pname = "vim-airline"; 2944 - version = "2019-10-02"; 2900 + version = "2019-10-11"; 2945 2901 src = fetchFromGitHub { 2946 2902 owner = "vim-airline"; 2947 2903 repo = "vim-airline"; 2948 - rev = "62f2dc02f01da7cfa16e45a9f8ce7036a03c3420"; 2949 - sha256 = "13ngk5riqjacn6k9l7bn4llsdld3235bda1cl3ambmv8qbwn5mk5"; 2904 + rev = "297ca3d00406064004be5f2a9923fe8c2406e6e9"; 2905 + sha256 = "1fmd0rjgrhsngpml885lybzibrpsszcc80iwm6qvydddhcp35jdi"; 2950 2906 }; 2951 2907 }; 2952 2908 ··· 3007 2963 3008 2964 vim-autoformat = buildVimPluginFrom2Nix { 3009 2965 pname = "vim-autoformat"; 3010 - version = "2019-10-01"; 2966 + version = "2019-10-09"; 3011 2967 src = fetchFromGitHub { 3012 2968 owner = "Chiel92"; 3013 2969 repo = "vim-autoformat"; 3014 - rev = "7d8d3979182eaee65299690b971f785fa0e1f422"; 3015 - sha256 = "1z60mvj93krhp5cdn8ip26v3qkc9nmv5a8jf5kwkscfsfxsriqvr"; 2970 + rev = "a350538f8a5a8f08cf64a520d456282080c3968f"; 2971 + sha256 = "0abz5asjgawz7zx5gy7q5nnrkmzijwpn0ay93913l78dnsal0408"; 3016 2972 }; 3017 2973 }; 3018 2974 ··· 3244 3200 repo = "vim-devicons"; 3245 3201 rev = "fae1550b95f537b879da7ebb7bfaa0ac65859271"; 3246 3202 sha256 = "1h0x6wck52ga8qq2phk718yn30yniljbhgrvp59qi5fskx8hsjd4"; 3203 + }; 3204 + }; 3205 + 3206 + vim-diminactive = buildVimPluginFrom2Nix { 3207 + pname = "vim-diminactive"; 3208 + version = "2017-08-27"; 3209 + src = fetchFromGitHub { 3210 + owner = "blueyed"; 3211 + repo = "vim-diminactive"; 3212 + rev = "6f2e14e6ff6a038285937c378ec3685e6ff7ee36"; 3213 + sha256 = "14jf5hh3v2f5wb10v09ygx15pxbwziv20pwv0fqkakxwf0vqwd50"; 3247 3214 }; 3248 3215 }; 3249 3216 ··· 3502 3447 3503 3448 vim-fugitive = buildVimPluginFrom2Nix { 3504 3449 pname = "vim-fugitive"; 3505 - version = "2019-10-02"; 3450 + version = "2019-10-11"; 3506 3451 src = fetchFromGitHub { 3507 3452 owner = "tpope"; 3508 3453 repo = "vim-fugitive"; 3509 - rev = "80aa8a9aea72f2054fb2ad8582461f60b0db9757"; 3510 - sha256 = "0pbrx477hg5kwb6smja6lijkavrfz5jjxj843pa6vv2lf8xvrddf"; 3454 + rev = "06e34204af04643d96d30132de6ba9066368de15"; 3455 + sha256 = "1322pr6zv2yv1y9gvwb8d7an4iyvi4yxbbivy1y8hl9pcy8ni989"; 3511 3456 }; 3512 3457 }; 3513 3458 ··· 3579 3524 3580 3525 vim-go = buildVimPluginFrom2Nix { 3581 3526 pname = "vim-go"; 3582 - version = "2019-10-02"; 3527 + version = "2019-10-11"; 3583 3528 src = fetchFromGitHub { 3584 3529 owner = "fatih"; 3585 3530 repo = "vim-go"; 3586 - rev = "1df81617fbda56bf3cb2dfc289fe1f3713bdfddb"; 3587 - sha256 = "0w6mi2fph6c1skqz4j7q30k130p30nqyylbphzjaqa32xxsq2psd"; 3531 + rev = "51940d350f87611d6128e641766dcab73003a6fa"; 3532 + sha256 = "0ajzb64z12c51c7k8zbj34i2mali289q0gyj2qpmi4ganfq4zdg8"; 3588 3533 }; 3589 3534 }; 3590 3535 ··· 3601 3546 3602 3547 vim-grepper = buildVimPluginFrom2Nix { 3603 3548 pname = "vim-grepper"; 3604 - version = "2019-10-01"; 3549 + version = "2019-10-09"; 3605 3550 src = fetchFromGitHub { 3606 3551 owner = "mhinz"; 3607 3552 repo = "vim-grepper"; 3608 - rev = "e550eadf37ed7529fbc103c6153ceaa0ab1e5a62"; 3609 - sha256 = "0zp3q1qd2zwlr0x7ij5gyfpg7kkyws090pamv60ni0ij2y7xjl8n"; 3553 + rev = "8b783474b64fa01b813f9c4a24f240c7c3378726"; 3554 + sha256 = "1mrqdg0hq4gvzng959dk6hbgh19sxzgg959i6k39c7phdd1f1fm9"; 3610 3555 }; 3611 3556 }; 3612 3557 ··· 4009 3954 4010 3955 vim-ledger = buildVimPluginFrom2Nix { 4011 3956 pname = "vim-ledger"; 4012 - version = "2019-07-03"; 3957 + version = "2019-10-08"; 4013 3958 src = fetchFromGitHub { 4014 3959 owner = "ledger"; 4015 3960 repo = "vim-ledger"; 4016 - rev = "3d76cee270b1a9583d535737ac2e63166335d45c"; 4017 - sha256 = "1kjbw98gvjsx4mydndkv0hjsczafq8sgb38j0bb0jbynqbbplsv9"; 3961 + rev = "4a8ee53029afa755f76b9e953ce3ca6beabdb63f"; 3962 + sha256 = "0vjk2knvpx79qa27k9zgc5s9pw3r96ylydhimsf9wxsgz7ihfr4r"; 4018 3963 }; 4019 3964 }; 4020 3965 ··· 4119 4064 4120 4065 vim-monokai-pro = buildVimPluginFrom2Nix { 4121 4066 pname = "vim-monokai-pro"; 4122 - version = "2018-12-27"; 4067 + version = "2019-10-12"; 4123 4068 src = fetchFromGitHub { 4124 4069 owner = "phanviet"; 4125 4070 repo = "vim-monokai-pro"; 4126 - rev = "39fcf3b418fc3a01e604cbb5f9c08d79d7d957c0"; 4127 - sha256 = "1k0n9chmilppsiyxhz1ig0ywimbnl4qpzib6ris1cy6kjnl4mdyq"; 4071 + rev = "d99c93733f3461466773b52b26392cf9b35717c0"; 4072 + sha256 = "05vk9hgdldgmijawblslf4sly67lqxljx1y9qs4dl2cbvz8gw882"; 4128 4073 }; 4129 4074 }; 4130 4075 ··· 4251 4196 4252 4197 vim-orgmode = buildVimPluginFrom2Nix { 4253 4198 pname = "vim-orgmode"; 4254 - version = "2019-10-03"; 4199 + version = "2019-10-12"; 4255 4200 src = fetchFromGitHub { 4256 4201 owner = "jceb"; 4257 4202 repo = "vim-orgmode"; 4258 - rev = "5012b8ffaaf18803d2e52e8ba4609a3ed1828653"; 4259 - sha256 = "1liw4ixljkzbkzmjz4n0cygv8wylrw0bxiv98z9lindbm3pa0n9l"; 4203 + rev = "5099025d0b632a5e56fa457f826153cd37c48d3c"; 4204 + sha256 = "145x60yxzxga92ix4pp0rac5r9r61jgqr8s0l991zz30jxcv1qy2"; 4260 4205 }; 4261 4206 }; 4262 4207 ··· 4306 4251 4307 4252 vim-parinfer = buildVimPluginFrom2Nix { 4308 4253 pname = "vim-parinfer"; 4309 - version = "2019-09-19"; 4254 + version = "2019-10-06"; 4310 4255 src = fetchFromGitHub { 4311 4256 owner = "bhurlow"; 4312 4257 repo = "vim-parinfer"; 4313 - rev = "eba349553e2438dcc9d37f3a6aff2807af731c3f"; 4314 - sha256 = "07cppsywz60ss0af86z4ia9kbixnwf9bl437fxq7hwhx6wig0njq"; 4258 + rev = "ceb429049458d168a56ca9c6e30a3f3f305dee75"; 4259 + sha256 = "0a667ph1xlf7fblk2c54ff2pvsc3zfxzz85g778jrq0569zvm3fd"; 4315 4260 }; 4316 4261 }; 4317 4262 ··· 4361 4306 4362 4307 vim-plug = buildVimPluginFrom2Nix { 4363 4308 pname = "vim-plug"; 4364 - version = "2019-09-29"; 4309 + version = "2019-10-04"; 4365 4310 src = fetchFromGitHub { 4366 4311 owner = "junegunn"; 4367 4312 repo = "vim-plug"; 4368 - rev = "ff97806e50196d56b2858cd56bada9d48cada2aa"; 4369 - sha256 = "0n1j35h09hbwinfbk3a276vjv0bv9f73q8prckkpxdnzzcyrs0yl"; 4313 + rev = "849b76be90a2c5a13fd9943b2b76d77a9b6ebc0f"; 4314 + sha256 = "16s6fcb9cx6lib0vh30whbrqs9j6j2wjc0cykd80vjdhi4rv1r55"; 4370 4315 }; 4371 4316 }; 4372 4317 ··· 4592 4537 4593 4538 vim-signify = buildVimPluginFrom2Nix { 4594 4539 pname = "vim-signify"; 4595 - version = "2019-10-02"; 4540 + version = "2019-10-07"; 4596 4541 src = fetchFromGitHub { 4597 4542 owner = "mhinz"; 4598 4543 repo = "vim-signify"; 4599 - rev = "ab60166512f7ea2d361243fbf8b1593721a043a2"; 4600 - sha256 = "037nhry4k6cmjvdmvmbfh48y56kvpygvqs714j05mijfkprj802y"; 4544 + rev = "80f64eace5694413f9dfd8e70e4a7018b56c42b6"; 4545 + sha256 = "1v8zhs240d4z87sryn14dn29i9a2aigwz197c5ag8l4zg4b466z0"; 4601 4546 }; 4602 4547 }; 4603 4548 ··· 4658 4603 4659 4604 vim-snippets = buildVimPluginFrom2Nix { 4660 4605 pname = "vim-snippets"; 4661 - version = "2019-10-02"; 4606 + version = "2019-10-12"; 4662 4607 src = fetchFromGitHub { 4663 4608 owner = "honza"; 4664 4609 repo = "vim-snippets"; 4665 - rev = "eb76bee6e7b610298dfccb9653b1e6dbb571b0c8"; 4666 - sha256 = "0r136z0arw36gbjkxhn7fajyf91fv4qlz8zf17npbks8x7zgcszx"; 4610 + rev = "5ee6d319bb895bb6672f253798263f53a93c2a06"; 4611 + sha256 = "1id8vghf09ahpv0kkvvg9v498i4xvv499z0b3ynjjqgpda44fh2i"; 4667 4612 }; 4668 4613 }; 4669 4614 ··· 4713 4658 4714 4659 vim-startify = buildVimPluginFrom2Nix { 4715 4660 pname = "vim-startify"; 4716 - version = "2019-10-01"; 4661 + version = "2019-10-06"; 4717 4662 src = fetchFromGitHub { 4718 4663 owner = "mhinz"; 4719 4664 repo = "vim-startify"; 4720 - rev = "af03e075a3c0dfe5ca17fd49c59a3f4c30a4b342"; 4721 - sha256 = "1dd2vhszck76mpxz2m9qlmyvsravx9xslh4j68y8ygap97y2ykzi"; 4665 + rev = "520f27769573582db9b40ae14ae86ac1f6a60c97"; 4666 + sha256 = "11w28f038cw937wp5p3cykvab4xyhksvf158r2hgqd1i11qvq8ks"; 4722 4667 }; 4723 4668 }; 4724 4669 ··· 4812 4757 4813 4758 vim-terraform = buildVimPluginFrom2Nix { 4814 4759 pname = "vim-terraform"; 4815 - version = "2019-09-26"; 4760 + version = "2019-10-07"; 4816 4761 src = fetchFromGitHub { 4817 4762 owner = "hashivim"; 4818 4763 repo = "vim-terraform"; 4819 - rev = "a9925ccef810d01e3a21295d4dba97532d14f2ee"; 4820 - sha256 = "0il49wyidin463x16b2lcf7cb5rqidqqwv56vxv9znrg6wqn94wp"; 4764 + rev = "ffdf2dc17aaef733164a7079f95dd74f6cda9241"; 4765 + sha256 = "1y4v2hn44rjyfh18ninzyb37xxc47fl20wzhnvs5gnnhjfsyfbqj"; 4821 4766 }; 4822 4767 }; 4823 4768 4824 4769 vim-test = buildVimPluginFrom2Nix { 4825 4770 pname = "vim-test"; 4826 - version = "2019-09-27"; 4771 + version = "2019-10-12"; 4827 4772 src = fetchFromGitHub { 4828 4773 owner = "janko-m"; 4829 4774 repo = "vim-test"; 4830 - rev = "3c2cc7c87882c4034f4ce0a9b71980b127a680a3"; 4831 - sha256 = "0jac3cf7cidwqf0lvlkdkg6m2r0xng3xyzsh0iyn1dw6qg3wzi2y"; 4775 + rev = "7e0269621f8e408a75a548171445a5612a7a2094"; 4776 + sha256 = "1w7b9dp6a3h2iqlxp12bfyq6q4hximagcgllq7j06h2wnp7jbkw2"; 4832 4777 }; 4833 4778 }; 4834 4779 ··· 4851 4796 repo = "vim-textobj-function"; 4852 4797 rev = "adb50f38499b1f558cbd58845e3e91117e4538cf"; 4853 4798 sha256 = "0cwl102si9zhhhpg6c0fjnyq35v6bl5f34p2s7b47isxdn0qvris"; 4799 + }; 4800 + }; 4801 + 4802 + vim-textobj-haskell = buildVimPluginFrom2Nix { 4803 + pname = "vim-textobj-haskell"; 4804 + version = "2014-10-27"; 4805 + src = fetchFromGitHub { 4806 + owner = "gibiansky"; 4807 + repo = "vim-textobj-haskell"; 4808 + rev = "ca656e98ea31e201f5bc543909398a6c8bb5d537"; 4809 + sha256 = "096pjjl3ngw0hsh59j2x6pdrpqvp657rcxfyl9kw13ndqyd867xs"; 4854 4810 }; 4855 4811 }; 4856 4812 ··· 4920 4854 }; 4921 4855 }; 4922 4856 4857 + vim-tmux-focus-events = buildVimPluginFrom2Nix { 4858 + pname = "vim-tmux-focus-events"; 4859 + version = "2019-04-19"; 4860 + src = fetchFromGitHub { 4861 + owner = "tmux-plugins"; 4862 + repo = "vim-tmux-focus-events"; 4863 + rev = "0f89b1ada151e22882a5a47a1ee2b6d6135bc5c1"; 4864 + sha256 = "0rx1615wlsl62y62l217vgjd5vjfzf3zjwq43fflpc6bixikqc6j"; 4865 + }; 4866 + }; 4867 + 4923 4868 vim-tmux-navigator = buildVimPluginFrom2Nix { 4924 4869 pname = "vim-tmux-navigator"; 4925 4870 version = "2019-01-29"; ··· 4939 4862 repo = "vim-tmux-navigator"; 4940 4863 rev = "4e1a877f51a17a961b8c2a285ee80aebf05ccf42"; 4941 4864 sha256 = "1b8sgbzl4pcpaabqk254n97mjz767ganrmqbsr6rqzz3j9a3s1fv"; 4865 + }; 4866 + }; 4867 + 4868 + vim-togglelist = buildVimPluginFrom2Nix { 4869 + pname = "vim-togglelist"; 4870 + version = "2013-04-07"; 4871 + src = fetchFromGitHub { 4872 + owner = "milkypostman"; 4873 + repo = "vim-togglelist"; 4874 + rev = "cafedc49860950200f28f2e1d95ab6a87b79d113"; 4875 + sha256 = "17y4ply2irz81gjv5hb51dy7wzv3l3sq6qaska31lswd5dgh1ifg"; 4942 4876 }; 4943 4877 }; 4944 4878 ··· 5016 4928 repo = "vim-vinegar"; 5017 4929 rev = "09ac84c4d152a944caa341e913220087211c72ef"; 5018 4930 sha256 = "18ki85s1l4f0q40k26jvcdcbq6a73x870dnxkw20ji3pfwdaa5v3"; 4931 + }; 4932 + }; 4933 + 4934 + vim-visual-increment = buildVimPluginFrom2Nix { 4935 + pname = "vim-visual-increment"; 4936 + version = "2015-07-02"; 4937 + src = fetchFromGitHub { 4938 + owner = "triglav"; 4939 + repo = "vim-visual-increment"; 4940 + rev = "e50e8f7c062cec759f665278eb58535df1611a23"; 4941 + sha256 = "1gd6mxp9y80wf7nxcm02104l54gqz5k3dgv1h98jl9a7q9swb8y6"; 5019 4942 }; 5020 4943 }; 5021 4944 ··· 5118 5019 }; 5119 5020 }; 5120 5021 5022 + vim-yaml = buildVimPluginFrom2Nix { 5023 + pname = "vim-yaml"; 5024 + version = "2019-01-07"; 5025 + src = fetchFromGitHub { 5026 + owner = "stephpy"; 5027 + repo = "vim-yaml"; 5028 + rev = "0da1975ec394154349db744c1996fe2ef8fa5ed0"; 5029 + sha256 = "0kvsy6k4snwykpxk49x06jizxqrjjmbhhdcwiyiqy0029n05322l"; 5030 + }; 5031 + }; 5032 + 5121 5033 vim-yapf = buildVimPluginFrom2Nix { 5122 5034 pname = "vim-yapf"; 5123 5035 version = "2018-10-04"; ··· 5197 5087 5198 5088 vimtex = buildVimPluginFrom2Nix { 5199 5089 pname = "vimtex"; 5200 - version = "2019-10-01"; 5090 + version = "2019-10-10"; 5201 5091 src = fetchFromGitHub { 5202 5092 owner = "lervag"; 5203 5093 repo = "vimtex"; 5204 - rev = "e323c55e9669c1adb205295b06ec4463bae5b637"; 5205 - sha256 = "0wcpdmblb38ym08b7k4iy1l279zcvmpnzygp5m946sija6nc34v9"; 5094 + rev = "7fc7a1b37514716bf9ae685024fa5009085f8d17"; 5095 + sha256 = "1z6js7przlncfdriyds89am3hk4yc0bmj6qg7cn89kfgh85zg6vs"; 5206 5096 }; 5207 5097 }; 5208 5098
+12 -2
pkgs/misc/vim-plugins/vim-plugin-names
··· 23 23 bitc/vim-hdevtools 24 24 bkad/camelcasemotion 25 25 bling/vim-bufferline 26 + blueyed/vim-diminactive 26 27 bogado/file-line 27 28 brennanfee/vim-gui-position 28 29 bronson/vim-trailing-whitespace ··· 44 43 chriskempson/base16-vim 45 44 christoomey/vim-sort-motion 46 45 christoomey/vim-tmux-navigator 46 + cloudhead/neovim-fuzzy 47 47 CoatiSoftware/vim-sourcetrail 48 48 cocopon/iceberg.vim 49 49 ctjhoa/spacevim ··· 91 89 frigoeu/psc-ide-vim 92 90 fsharp/vim-fsharp 93 91 garbas/vim-snipmate 92 + gibiansky/vim-textobj-haskell 94 93 glts/vim-textobj-comment 95 94 gmarik/vundle 96 95 godlygeek/csapprox ··· 217 214 MarcWeber/vim-addon-syntax-checker 218 215 MarcWeber/vim-addon-toggle-buffer 219 216 MarcWeber/vim-addon-xdebug 220 - MaxMEllon/vim-jsx-pretty 221 217 markonm/traces.vim 222 218 martinda/Jenkinsfile-vim-syntax 223 219 mattn/emmet-vim 224 220 mattn/gist-vim 225 221 mattn/webapi-vim 226 222 maximbaz/lightline-ale 223 + MaxMEllon/vim-jsx-pretty 227 224 mbbill/undotree 228 225 megaannum/forms 229 226 megaannum/self ··· 236 233 mhinz/vim-startify 237 234 michaeljsmith/vim-indent-object 238 235 mileszs/ack.vim 236 + milkypostman/vim-togglelist 239 237 mindriot101/vim-yapf 240 238 mk12/vim-lean 241 239 mkasa/lushtags ··· 350 346 sebastianmarkow/deoplete-rust 351 347 sheerun/vim-polyglot 352 348 Shougo/context_filetype.vim 353 - Shougo/denite.nvim 354 349 Shougo/defx.nvim 350 + Shougo/denite.nvim 355 351 Shougo/deol.nvim 356 352 Shougo/deoplete-lsp 357 353 Shougo/deoplete.nvim ··· 377 373 slashmili/alchemist.vim 378 374 sonph/onehalf 379 375 stefandtw/quickfix-reflector.vim 376 + stephpy/vim-yaml 380 377 t9md/vim-choosewin 381 378 t9md/vim-smalls 382 379 takac/vim-hardtime ··· 391 386 thinca/vim-scouter 392 387 thinca/vim-themis 393 388 thinca/vim-visualstar 389 + thirtythreeforty/lessspace.vim 394 390 thosakwe/vim-flutter 395 391 tikhomirov/vim-glsl 396 392 tmux-plugins/vim-tmux 393 + tmux-plugins/vim-tmux-focus-events 397 394 tomasr/molokai 398 395 tomlion/vim-solidity 399 396 tommcdo/vim-exchange ··· 426 419 tpope/vim-unimpaired 427 420 tpope/vim-vinegar 428 421 travitch/hasksyn 422 + triglav/vim-visual-increment 429 423 troydm/zoomwintab.vim 430 424 twerth/ir_black 431 425 twinside/vim-haskellconceal 432 426 Twinside/vim-hoogle 433 427 tyru/caw.vim 428 + tyru/open-browser-github.vim 434 429 tyru/open-browser.vim 435 430 ujihisa/neco-look 436 431 valloric/youcompleteme ··· 459 450 vim-scripts/matchit.zip 460 451 vim-scripts/mayansmoke 461 452 vim-scripts/PreserveNoEOL 453 + vim-scripts/prev_indent 462 454 vim-scripts/random.vim 463 455 vim-scripts/Rename 464 456 vim-scripts/ReplaceWithRegister
+6
pkgs/os-specific/linux/busybox/default.nix
··· 1 1 { stdenv, lib, buildPackages, fetchurl 2 2 , enableStatic ? false 3 3 , enableMinimal ? false 4 + # Allow forcing musl without switching stdenv itself, e.g. for our bootstrapping: 5 + # nix build -f pkgs/top-level/release.nix stdenvBootstrapTools.x86_64-linux.dist 4 6 , useMusl ? stdenv.hostPlatform.libc == "musl", musl 5 7 , extraConfig ? "" 6 8 }: ··· 88 86 make oldconfig 89 87 90 88 runHook postConfigure 89 + ''; 90 + 91 + postConfigure = lib.optionalString (useMusl && stdenv.hostPlatform.libc != "musl") '' 92 + makeFlagsArray+=("CC=${stdenv.cc.targetPrefix}cc -isystem ${musl.dev}/include -B${musl}/lib -L${musl}/lib") 91 93 ''; 92 94 93 95 depsBuildBuild = [ buildPackages.stdenv.cc ];
+8 -7
pkgs/os-specific/linux/dmtcp/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "dmtcp"; 5 - version = "2.5.2"; 5 + version = "2.6.0"; 6 6 7 7 src = fetchFromGitHub { 8 - owner = "dmtcp"; 9 - repo = "dmtcp"; 8 + owner = pname; 9 + repo = pname; 10 10 rev = version; 11 - sha256 = "1sq38in4wk855yhfnzbs9xpnps97fhja93w08xjmx7szzm33g5a8"; 11 + sha256 = "01skyhr573w1dygvkwz66lvir2jsq443fjwkysglwxvmrdfz9kwd"; 12 12 }; 13 13 14 14 dontDisableStatic = true; ··· 33 33 --replace "os.getenv('USER')" "\"nixbld1\"" 34 34 ''; 35 35 36 - meta = { 36 + meta = with stdenv.lib; { 37 37 description = "Distributed MultiThreaded Checkpointing"; 38 38 longDescription = '' 39 39 DMTCP (Distributed MultiThreaded Checkpointing) is a tool to ··· 41 41 programs spread across many machines and connected by sockets. It does 42 42 not modify the user's program or the operating system. 43 43 ''; 44 - homepage = http://dmtcp.sourceforge.net/; 45 - license = stdenv.lib.licenses.lgpl3Plus; # most files seem this or LGPL-2.1+ 44 + homepage = "http://dmtcp.sourceforge.net/"; 45 + license = licenses.lgpl3Plus; # most files seem this or LGPL-2.1+ 46 + platforms = intersectLists platforms.linux platforms.x86; # broken on ARM and Darwin 46 47 }; 47 48 }
+2 -2
pkgs/os-specific/linux/kernel/linux-4.14.nix
··· 3 3 with stdenv.lib; 4 4 5 5 buildLinux (args // rec { 6 - version = "4.14.148"; 6 + version = "4.14.149"; 7 7 8 8 # modDirVersion needs to be x.y.z, will automatically add .0 if needed 9 9 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; ··· 13 13 14 14 src = fetchurl { 15 15 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; 16 - sha256 = "1b8ggknvaidsvqnzpgbcmz3ybys9a8jm8iq6aqcnqfp10d0bglhj"; 16 + sha256 = "15pjngy3j5vnisv462ll7wsg78qv7q2cz86da0bcwh446v9ap7g6"; 17 17 }; 18 18 } // (args.argsOverride or {}))
+2 -2
pkgs/os-specific/linux/kernel/linux-4.19.nix
··· 3 3 with stdenv.lib; 4 4 5 5 buildLinux (args // rec { 6 - version = "4.19.78"; 6 + version = "4.19.79"; 7 7 8 8 # modDirVersion needs to be x.y.z, will automatically add .0 if needed 9 9 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; ··· 13 13 14 14 src = fetchurl { 15 15 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; 16 - sha256 = "0jah57k3q7b674dr544cniwhya667d8h7x9k5886d1g2qrvylqyz"; 16 + sha256 = "0d2bcg0krahia2ylgqaxdppyr9idq2pi6y1si6h8n9sg6rj3a57i"; 17 17 }; 18 18 } // (args.argsOverride or {}))
+2 -2
pkgs/os-specific/linux/kernel/linux-5.2.nix
··· 3 3 with stdenv.lib; 4 4 5 5 buildLinux (args // rec { 6 - version = "5.2.20"; 6 + version = "5.2.21"; 7 7 8 8 # modDirVersion needs to be x.y.z, will automatically add .0 if needed 9 9 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; ··· 13 13 14 14 src = fetchurl { 15 15 url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; 16 - sha256 = "0sddasxka08c1qjhbd9w4z7rzprfly2i67q4iwppbldngi4y48di"; 16 + sha256 = "0f1mick15d0m7yhhhdwai03wmczvkm9cg38w2ivgmgysfpzy73ls"; 17 17 }; 18 18 } // (args.argsOverride or {}))
+2 -2
pkgs/os-specific/linux/kernel/linux-5.3.nix
··· 3 3 with stdenv.lib; 4 4 5 5 buildLinux (args // rec { 6 - version = "5.3.5"; 6 + version = "5.3.6"; 7 7 8 8 # modDirVersion needs to be x.y.z, will automatically add .0 if needed 9 9 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; ··· 13 13 14 14 src = fetchurl { 15 15 url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; 16 - sha256 = "1w2k3q6q9cf3r27z084c9nsxh49bq4cvky39pp6dp3r9zif8rvc0"; 16 + sha256 = "07zcfpj6ras7mmazny5xjwf8v6l5hwdgnla21sqpppl48ylj2h78"; 17 17 }; 18 18 } // (args.argsOverride or {}))
+1 -1
pkgs/os-specific/linux/zfs/default.nix
··· 140 140 Copy-On-Write filesystem with data integrity detection and repair, 141 141 snapshotting, cloning, block devices, deduplication, and more. 142 142 ''; 143 - homepage = http://zfsonlinux.org/; 143 + homepage = https://zfsonlinux.org/; 144 144 license = licenses.cddl; 145 145 platforms = platforms.linux; 146 146 maintainers = with maintainers; [ jcumming wizeman fpletz globin ];
+2 -2
pkgs/servers/atlassian/confluence.nix
··· 5 5 6 6 stdenv.mkDerivation rec { 7 7 pname = "atlassian-confluence"; 8 - version = "6.15.8"; 8 + version = "7.0.2"; 9 9 10 10 src = fetchurl { 11 11 url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz"; 12 - sha256 = "17pcgjv6rj2jxzmwx82941zhrrmprkchjhnnadnxq4709zsyb4q3"; 12 + sha256 = "00ma2l6gknlpaf2k26md9fskgzcllky3vv89sb1izsrxl8la1dhq"; 13 13 }; 14 14 15 15 buildPhase = ''
+2 -4
pkgs/servers/atlassian/jira.nix
··· 5 5 6 6 stdenv.mkDerivation rec { 7 7 pname = "atlassian-jira"; 8 - version = "8.4.1"; 8 + version = "8.4.2"; 9 9 10 10 src = fetchurl { 11 11 url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; 12 - sha256 = "0dkilp5wvda29rin2wj9zs2vgwyfning7cz6dyk0kyg45dl07wky"; 12 + sha256 = "0f0l9ss8jv06iidg8jw7yk5z42r1m0cbmlgj1wgli9a21ssp65sh"; 13 13 }; 14 - 15 - phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; 16 14 17 15 buildPhase = '' 18 16 mv conf/server.xml conf/server.xml.dist
+1 -1
pkgs/servers/documize-community/default.nix
··· 19 19 runHook preBuild 20 20 21 21 pushd go/src/github.com/documize/community 22 - go build -gcflags="all=-trimpath=$GOPATH" -o bin/documize ./edition/community.go 22 + GO111MODULE=off go build -gcflags="all=-trimpath=$GOPATH" -o bin/documize ./edition/community.go 23 23 popd 24 24 25 25 runHook postBuild
+3 -3
pkgs/servers/monitoring/grafana/default.nix
··· 2 2 3 3 buildGoPackage rec { 4 4 pname = "grafana"; 5 - version = "6.4.1"; 5 + version = "6.4.2"; 6 6 7 7 goPackagePath = "github.com/grafana/grafana"; 8 8 ··· 12 12 rev = "v${version}"; 13 13 owner = "grafana"; 14 14 repo = "grafana"; 15 - sha256 = "0z615a885vh92kv9jm6ixhj0i1w0k44wl4rczvp6mcmasbvfb5fb"; 15 + sha256 = "12j0lksryggn7lg003ma2cnblclgzdw6b8rhz1wbq8d68m1mq5wv"; 16 16 }; 17 17 18 18 srcStatic = fetchurl { 19 19 url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; 20 - sha256 = "08y2h7c2zavxwmxlajg2qzfd0lhkj00i2azz5ydm184m38b98kk7"; 20 + sha256 = "0ch35h681yq5w7cpys0iiv3kva9hiqxzgk2gp0vcnadzmincwj7c"; 21 21 }; 22 22 23 23 postPatch = ''
+1
pkgs/servers/scylladb/default.nix
··· 96 96 homepage = "https://scylladb.com"; 97 97 license = licenses.agpl3; 98 98 platforms = stdenv.lib.platforms.linux; 99 + hydraPlatforms = []; # It's huge ATM, about 18 GB. 99 100 maintainers = [ stdenv.lib.maintainers.farlion ]; 100 101 }; 101 102 }
+2 -2
pkgs/servers/search/groonga/default.nix
··· 7 7 stdenv.mkDerivation rec { 8 8 9 9 pname = "groonga"; 10 - version = "9.0.6"; 10 + version = "9.0.7"; 11 11 12 12 src = fetchurl { 13 13 url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; 14 - sha256 = "0d1p8v7qd97h3znp84a1w40hbg834n3wxp6gaa8mbnff16s18kl7"; 14 + sha256 = "1j308p6l6q716qlk3azqk9v11a93cxhcppj7qh5wm2aqsngw9rfq"; 15 15 }; 16 16 17 17 buildInputs = with stdenv.lib;
+22
pkgs/servers/web-apps/shiori/default.nix
··· 1 + { stdenv, buildGoModule, fetchFromGitHub }: 2 + 3 + buildGoModule rec { 4 + pname = "shiori"; 5 + version = "1.5.0"; 6 + 7 + modSha256 = "142raxqh6mipw0dyhzgc8ha6vn74wdin25qrl1nkd68mpcvsbblg"; 8 + 9 + src = fetchFromGitHub { 10 + owner = "go-shiori"; 11 + repo = pname; 12 + rev = "v${version}"; 13 + sha256 = "13and7gh2882khqppwz3wwq44p7az4bfdfjvlnqcpqyi8xa28pmq"; 14 + }; 15 + 16 + meta = with stdenv.lib; { 17 + description = "Simple bookmark manager built with Go"; 18 + homepage = "https://github.com/go-shiori/shiori"; 19 + license = licenses.mit; 20 + maintainers = with maintainers; [ minijackson ]; 21 + }; 22 + }
+3 -3
pkgs/shells/zsh/oh-my-zsh/default.nix
··· 4 4 { stdenv, fetchgit }: 5 5 6 6 stdenv.mkDerivation rec { 7 - version = "2019-10-09"; 7 + version = "2019-10-10"; 8 8 pname = "oh-my-zsh"; 9 - rev = "710a3d5a1e2888a4dfb1769f8f1edd8a590eee22"; 9 + rev = "52f58785645c18aa88ea515d070a42bcfe97508d"; 10 10 11 11 src = fetchgit { inherit rev; 12 12 url = "https://github.com/robbyrussell/oh-my-zsh"; 13 - sha256 = "0yckzrinlggyr40qc0cib3nw631vgy8nryiazyjw1mlx8iq1dskd"; 13 + sha256 = "0sxj077g8jh9v0n3zzrkihmgx7v5dyv4h6nrpk1c5ijjk9j7x9d5"; 14 14 }; 15 15 16 16 pathsToLink = [ "/share/oh-my-zsh" ];
+5
pkgs/tools/filesystems/gcsfuse/default.nix
··· 13 13 14 14 modSha256 = "0i86xs3lq2mj22yv7jmhmb34k7lz348bakqz020xpyccllkkszy4"; 15 15 16 + patches = [ 17 + ./go.mod.patch 18 + ./go.sum.patch 19 + ]; 20 + 16 21 meta = with lib;{ 17 22 description = "A user-space file system for interacting with Google Cloud Storage"; 18 23 homepage = "https://cloud.google.com/storage/docs/gcs-fuse";
+28
pkgs/tools/filesystems/gcsfuse/go.mod.patch
··· 1 + --- a/go.mod 2019-10-09 22:35:05.777065057 -0400 2 + +++ b/go.mod 2019-10-10 21:34:15.809681738 -0400 3 + @@ -0,0 +1,25 @@ 4 + +module github.com/googlecloudplatform/gcsfuse 5 + + 6 + +go 1.12 7 + + 8 + +require ( 9 + + cloud.google.com/go v0.0.0-20170807235027-9be7f826df5c 10 + + github.com/codegangsta/cli v0.0.0-20170804093415-b99aa811b4c1 11 + + github.com/golang/protobuf v0.0.0-20170902000452-17ce1425424a 12 + + github.com/jacobsa/daemonize v0.0.0-20160101105449-e460293e890f 13 + + github.com/jacobsa/fuse v0.0.0-20170513050233-fe7f3a55dcaa 14 + + github.com/jacobsa/gcloud v0.0.0-20180124212516-9291bd1e8308 15 + + github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd 16 + + github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff 17 + + github.com/jacobsa/ogletest v0.0.0-20170503003838-80d50a735a11 18 + + github.com/jacobsa/ratelimit v0.0.0-20150904001804-f5e47030f3b0 19 + + github.com/jacobsa/reqtrace v0.0.0-20150505043853-245c9e0234cb 20 + + github.com/jacobsa/syncutil v0.0.0-20150827001642-c39ef5c1aa0b 21 + + github.com/jacobsa/timeutil v0.0.0-20170205232429-577e5acbbcf6 22 + + github.com/jacobsa/util v0.0.0-20150810040848-976a6f4de67e 23 + + github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 24 + + golang.org/x/net v0.0.0-20170809000501-1c05540f6879 25 + + golang.org/x/oauth2 v0.0.0-20170807180024-9a379c6b3e95 26 + + google.golang.org/api v0.0.0-20170807210121-5c4ffd5985e2 27 + + google.golang.org/appengine v0.0.0-20170801183137-c5a90ac045b7 28 + +)
+38
pkgs/tools/filesystems/gcsfuse/go.sum.patch
··· 1 + --- a/go.sum 2019-10-09 22:35:05.777065057 -0400 2 + +++ b/go.sum 2019-10-10 21:34:15.809681738 -0400 3 + @@ -0,0 +1,35 @@ 4 + +cloud.google.com/go v0.0.0-20170807235027-9be7f826df5c h1:pTb3uxaVLke7AQ/KUVTHWZmzKrKYrip7FimNb3ecAbo= 5 + +cloud.google.com/go v0.0.0-20170807235027-9be7f826df5c/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= 6 + +github.com/codegangsta/cli v0.0.0-20170804093415-b99aa811b4c1 h1:PTPzzngHWcTI0ph/9I92RhVtRkdOCi37wySw/ojR5Eg= 7 + +github.com/codegangsta/cli v0.0.0-20170804093415-b99aa811b4c1/go.mod h1:/qJNoX69yVSKu5o4jLyXAENLRyk1uhi7zkbQ3slBdOA= 8 + +github.com/golang/protobuf v0.0.0-20170902000452-17ce1425424a/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= 9 + +github.com/jacobsa/daemonize v0.0.0-20160101105449-e460293e890f h1:X+tnaqoCcBgAwSTJtoYW6p0qKiuPyMfofEHEFUf2kdU= 10 + +github.com/jacobsa/daemonize v0.0.0-20160101105449-e460293e890f/go.mod h1:Ip4fOwzCrnDVuluHBd7FXIMb7SHOKfkt9/UDrYSZvqI= 11 + +github.com/jacobsa/fuse v0.0.0-20170513050233-fe7f3a55dcaa h1:3420E523ahKsI3tlbO0zeLvgzuTFdJoy6JoAVuShs8U= 12 + +github.com/jacobsa/fuse v0.0.0-20170513050233-fe7f3a55dcaa/go.mod h1:9Aml1MG17JVeXrN4D2mtJvYHtHklJH5bESjCKNzVjFU= 13 + +github.com/jacobsa/gcloud v0.0.0-20180124212516-9291bd1e8308 h1:sfc1gTCrsJQJMySgDstAhwzogqQIrTxkwwScG4p2kbM= 14 + +github.com/jacobsa/gcloud v0.0.0-20180124212516-9291bd1e8308/go.mod h1:3fF6sEraNZSToePaj5q+f9KSaMpuZcwccqAQmOKDv/k= 15 + +github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd h1:9GCSedGjMcLZCrusBZuo4tyKLpKUPenUUqi34AkuFmA= 16 + +github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd/go.mod h1:TlmyIZDpGmwRoTWiakdr+HA1Tukze6C6XbRVidYq02M= 17 + +github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff h1:2xRHTvkpJ5zJmglXLRqHiZQNjUoOkhUyhTAhEQvPAWw= 18 + +github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff/go.mod h1:gJWba/XXGl0UoOmBQKRWCJdHrr3nE0T65t6ioaj3mLI= 19 + +github.com/jacobsa/ogletest v0.0.0-20170503003838-80d50a735a11/go.mod h1:+DBdDyfoO2McrOyDemRBq0q9CMEByef7sYl7JH5Q3BI= 20 + +github.com/jacobsa/ratelimit v0.0.0-20150904001804-f5e47030f3b0 h1:6GaIakaFrxn738iBykUc6fyS5sIAKRg/wafwzrzRX30= 21 + +github.com/jacobsa/ratelimit v0.0.0-20150904001804-f5e47030f3b0/go.mod h1:5/sdn6lSZE5l3rXMkJGO7Y3MHJImklO43rZx9ouOWYQ= 22 + +github.com/jacobsa/reqtrace v0.0.0-20150505043853-245c9e0234cb h1:uSWBjJdMf47kQlXMwWEfmc864bA1wAC+Kl3ApryuG9Y= 23 + +github.com/jacobsa/reqtrace v0.0.0-20150505043853-245c9e0234cb/go.mod h1:ivcmUvxXWjb27NsPEaiYK7AidlZXS7oQ5PowUS9z3I4= 24 + +github.com/jacobsa/syncutil v0.0.0-20150827001642-c39ef5c1aa0b h1:HMNP0njxow/ahg3AFKzu8HnyOUSRiVqWXm+i4VefV+Y= 25 + +github.com/jacobsa/syncutil v0.0.0-20150827001642-c39ef5c1aa0b/go.mod h1:mPvulh9VKXvo+yOlrD4VYOOYuLdZJ36wa/5QIrtXvWs= 26 + +github.com/jacobsa/timeutil v0.0.0-20170205232429-577e5acbbcf6 h1:XKHJmHcgU9glxk3eLPiRZT5VFSHJitVTnMj/EgIoXC4= 27 + +github.com/jacobsa/timeutil v0.0.0-20170205232429-577e5acbbcf6/go.mod h1:JEWKD6V8xETMW+DEv+IQVz++f8Cn8O/X0HPeDY3qNis= 28 + +github.com/jacobsa/util v0.0.0-20150810040848-976a6f4de67e h1:BegecLAVSx5IW1bOImB8Lt6+4yiWP4t+PUeckWYzIeg= 29 + +github.com/jacobsa/util v0.0.0-20150810040848-976a6f4de67e/go.mod h1:q0HiLetNeSPHjs8ddOw9U6xahog8xR7WPp6PhzJ6wmk= 30 + +github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 h1:PJPDf8OUfOK1bb/NeTKd4f1QXZItOX389VN3B6qC8ro= 31 + +github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8= 32 + +golang.org/x/net v0.0.0-20170809000501-1c05540f6879 h1:0rFa7EaCGdQPmZVbo9F7MNF65b8dyzS6EUnXjs9Cllk= 33 + +golang.org/x/net v0.0.0-20170809000501-1c05540f6879/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= 34 + +golang.org/x/oauth2 v0.0.0-20170807180024-9a379c6b3e95 h1:RS+wSrhdVci7CsPwJaMN8exaP3UTuQU0qB34R/E/JD0= 35 + +golang.org/x/oauth2 v0.0.0-20170807180024-9a379c6b3e95/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= 36 + +google.golang.org/api v0.0.0-20170807210121-5c4ffd5985e2 h1:wF/9eBxkxh3/00HWCFpF3583KFXGapuZ3EVpZIuLd4Q= 37 + +google.golang.org/api v0.0.0-20170807210121-5c4ffd5985e2/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= 38 + +google.golang.org/appengine v0.0.0-20170801183137-c5a90ac045b7/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+1 -1
pkgs/tools/graphics/scrot/default.nix
··· 16 16 buildInputs = [ giblib xlibsWrapper libXfixes libXcursor ]; 17 17 18 18 meta = with stdenv.lib; { 19 - homepage = http://linuxbrit.co.uk/scrot/; 19 + homepage = https://github.com/resurrecting-open-source-projects/scrot; 20 20 description = "A command-line screen capture utility"; 21 21 platforms = platforms.linux; 22 22 maintainers = with maintainers; [ globin ];
+1 -2
pkgs/tools/misc/bdf2psf/default.nix
··· 17 17 unpackPhase = "dpkg-deb -x $src ."; 18 18 installPhase = " 19 19 substituteInPlace usr/bin/bdf2psf --replace /usr/bin/perl ${perl}/bin/perl 20 - mv usr/bin . 21 - cp -r . $out 20 + mv usr $out 22 21 "; 23 22 24 23 meta = with stdenv.lib; {
+2 -2
pkgs/tools/misc/calamares/default.nix
··· 6 6 7 7 stdenv.mkDerivation rec { 8 8 pname = "calamares"; 9 - version = "3.2.11"; 9 + version = "3.2.15"; 10 10 11 11 # release including submodule 12 12 src = fetchurl { 13 13 url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; 14 - sha256 = "1djrc8p6kll8szycyj86v02jphiw2xwfhn563siykphfqr0jknlw"; 14 + sha256 = "0m2z34vgcqaf1yfa2919v3mz9b0q43mihz6di5kg62h6swaaanxd"; 15 15 }; 16 16 17 17 buildInputs = [
+28
pkgs/tools/networking/atinout/default.nix
··· 1 + { stdenv, fetchgit, ronn, mount }: 2 + 3 + stdenv.mkDerivation rec { 4 + name = "atinout-${version}"; 5 + version = "0.9.2-alpha"; 6 + 7 + NIX_CFLAGS_COMPILE = [ "-Werror=implicit-fallthrough=0" ]; 8 + LANG = "C.UTF-8"; 9 + nativeBuildInputs = [ ronn mount ]; 10 + 11 + src = fetchgit { 12 + url = "git://git.code.sf.net/p/atinout/code"; 13 + rev = "4976a6cb5237373b7e23cd02d7cd5517f306e3f6"; 14 + sha256 = "0bninv2bklz7ly140cxx8iyaqjlq809jjx6xqpimn34ghwsaxbpv"; 15 + }; 16 + 17 + installPhase = '' 18 + make PREFIX=$out install 19 + ''; 20 + 21 + meta = with stdenv.lib; { 22 + homepage = http://atinout.sourceforge.net; 23 + description = "Tool for talking to modems"; 24 + platforms = platforms.unix; 25 + license = licenses.gpl3; 26 + maintainers = with maintainers; [ bendlas ]; 27 + }; 28 + }
+2 -2
pkgs/tools/networking/axel/default.nix
··· 3 3 4 4 stdenv.mkDerivation rec { 5 5 pname = "axel"; 6 - version = "2.17.5"; 6 + version = "2.17.6"; 7 7 8 8 src = fetchFromGitHub { 9 9 owner = "axel-download-accelerator"; 10 10 repo = pname; 11 11 rev = "v${version}"; 12 - sha256 = "0kwfbwh9g2227icgykgwa057vll5rkgac3df0pby530bivqzzzlw"; 12 + sha256 = "011cpkf6hpia5b5wfhy84fxfqpishdkvrg0kpbfprymq9bxjp0yl"; 13 13 }; 14 14 15 15 nativeBuildInputs = [ autoreconfHook pkgconfig autoconf-archive txt2man ];
+3 -1
pkgs/tools/networking/babeld/default.nix
··· 1 - { stdenv, fetchurl }: 1 + { stdenv, fetchurl, nixosTests }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "babeld"; ··· 12 12 preBuild = '' 13 13 makeFlags="PREFIX=$out ETCDIR=$out/etc" 14 14 ''; 15 + 16 + passthru.tests.babeld = nixosTests.babeld; 15 17 16 18 meta = { 17 19 homepage = http://www.pps.univ-paris-diderot.fr/~jch/software/babel/;
+5 -4
pkgs/tools/package-management/nix-du/default.nix
··· 1 1 { stdenv, fetchFromGitHub, rustPlatform, nix, boost, graphviz, darwin }: 2 2 rustPlatform.buildRustPackage rec { 3 3 pname = "nix-du"; 4 - version = "unstable-2019-07-15"; 4 + version = "0.3.1"; 5 5 6 6 src = fetchFromGitHub { 7 7 owner = "symphorien"; 8 8 repo = "nix-du"; 9 - rev = "e6e927c15e75f7c2e63f7f3c181dc6b257f6fd9e"; 10 - sha256 = "08jyp078h9jpb9qfqg5mdbq29rl8a006n94hqk3yk6gv1s57cfic"; 9 + rev = "v${version}"; 10 + sha256 = "149d60mid29s5alv5m3d7jrhyzc6cj7b6hpiq399gsdwzgxr00wq"; 11 11 }; 12 - cargoSha256 = "071gbhxbvnwi7n3zpy7bmlprzir0sl0f0pb191xg2ynw678prd7v"; 12 + cargoSha256 = "18kb4car5nzch3vpl6z1499silhs3fyn8c6xj3rzk94mm2m9srg4"; 13 + verifyCargoDeps = true; 13 14 14 15 doCheck = true; 15 16 checkInputs = [ graphviz ];
+2 -2
pkgs/tools/system/bfs/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "bfs"; 5 - version = "1.5"; 5 + version = "1.5.1"; 6 6 7 7 src = fetchFromGitHub { 8 8 repo = "bfs"; 9 9 owner = "tavianator"; 10 10 rev = version; 11 - sha256 = "0lyrxbmfr4ckz4hx5dgz8xbq479l5rlyrqf205v6c82cap4zyv4x"; 11 + sha256 = "1yp8zaj2rqd1df20wxym1x7q5d3lxqwalazbvmfnwqn5y4m368y3"; 12 12 }; 13 13 14 14 buildInputs = stdenv.lib.optionals stdenv.isLinux [ libcap acl ];
+6
pkgs/tools/system/ctop/default.nix
··· 11 11 sha256 = "0mm6hl5qklfv0yffj6cgypsgcrk4fq6p60djycfgj20yhz9cmf9x"; 12 12 }; 13 13 14 + patches = [ 15 + # Version 0.7.2 does not build with go 1.13. 16 + # TODO: Remove once(and if) https://github.com/bcicen/ctop/pull/178 is merged and lands in a release. 17 + ./go-1.13-deps.patch 18 + ]; 19 + 14 20 modSha256 = "0ad1gvamckg94r7f68cnjdbq9nyz6c3hh339hy4hghxd3rd1qskn"; 15 21 16 22 meta = with lib; {
+90
pkgs/tools/system/ctop/go-1.13-deps.patch
··· 1 + diff --git a/go.mod b/go.mod 2 + index 4921cba..cbb4028 100644 3 + --- a/go.mod 4 + +++ b/go.mod 5 + @@ -18,9 +18,6 @@ require ( 6 + github.com/golang/protobuf v0.0.0-20170712042213-0a4f71a498b7 // indirect 7 + github.com/hashicorp/go-cleanhttp v0.0.0-20170211013415-3573b8b52aa7 // indirect 8 + github.com/jgautheron/codename-generator v0.0.0-20150829203204-16d037c7cc3c 9 + - github.com/kr/pretty v0.1.0 // indirect 10 + - github.com/maruel/panicparse v0.0.0-20170227222818-25bcac0d793c // indirect 11 + - github.com/maruel/ut v1.0.0 // indirect 12 + github.com/mattn/go-runewidth v0.0.0-20170201023540-14207d285c6c // indirect 13 + github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 // indirect 14 + github.com/nsf/termbox-go v0.0.0-20180303152453-e2050e41c884 15 + @@ -39,3 +36,5 @@ require ( 16 + ) 17 + 18 + replace github.com/gizak/termui => github.com/bcicen/termui v0.0.0-20180326052246-4eb80249d3f5 19 + + 20 + +go 1.13 21 + diff --git a/go.sum b/go.sum 22 + new file mode 100644 23 + index 0000000..5ca7d55 24 + --- /dev/null 25 + +++ b/go.sum 26 + @@ -0,0 +1,64 @@ 27 + +github.com/Azure/go-ansiterm v0.0.0-20160622173216-fa152c58bc15 h1:VtP6TygBMvrR+SMMPHj3z3jvnj4vcafMRLIw4at7xww= 28 + +github.com/Azure/go-ansiterm v0.0.0-20160622173216-fa152c58bc15/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= 29 + +github.com/BurntSushi/toml v0.3.0 h1:e1/Ivsx3Z0FVTV0NSOv/aVgbUWyQuzj7DDnFblkRvsY= 30 + +github.com/BurntSushi/toml v0.3.0/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= 31 + +github.com/Microsoft/go-winio v0.3.8 h1:dvxbxtpTIjdAbx2OtL26p4eq0iEvys/U5yrsTJb3NZI= 32 + +github.com/Microsoft/go-winio v0.3.8/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= 33 + +github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= 34 + +github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= 35 + +github.com/Sirupsen/logrus v0.0.0-20150423025312-26709e271410 h1:RxP6uUzJlS1Qa3+HYls3u+nQMKlnqC3RhL7wWC4Y4+E= 36 + +github.com/Sirupsen/logrus v0.0.0-20150423025312-26709e271410/go.mod h1:rmk17hk6i8ZSAJkSDa7nOxamrG+SP4P0mm+DAvExv4U= 37 + +github.com/bcicen/termui v0.0.0-20180326052246-4eb80249d3f5 h1:2pI3ZsoefWIi++8EqmANoC7Px/v2lRwnleVUcCuFgLg= 38 + +github.com/bcicen/termui v0.0.0-20180326052246-4eb80249d3f5/go.mod h1:yIA9ITWZD1p4/DvCQ44xvhyVb9XEUlVnY1rzGSHwbiM= 39 + +github.com/c9s/goprocinfo v0.0.0-20170609001544-b34328d6e0cd h1:xqaBnULC8wEnQpRDXAsDgXkU/STqoluz1REOoegSfNU= 40 + +github.com/c9s/goprocinfo v0.0.0-20170609001544-b34328d6e0cd/go.mod h1:uEyr4WpAH4hio6LFriaPkL938XnrvLpNPmQHBdrmbIE= 41 + +github.com/coreos/go-systemd v0.0.0-20151104194251-b4a58d95188d h1:MJ4ge3i0lehw+gE3JcGUUp8TmWjsLAlQlhmdASs/9wk= 42 + +github.com/coreos/go-systemd v0.0.0-20151104194251-b4a58d95188d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= 43 + +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= 44 + +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 45 + +github.com/docker/docker v0.0.0-20170502054910-90d35abf7b35 h1:ly3dRUfvdP5i/t9iqVHd2VQQIDtO3tpfFWPah7g4CFw= 46 + +github.com/docker/docker v0.0.0-20170502054910-90d35abf7b35/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= 47 + +github.com/docker/go-connections v0.0.0-20170301234100-a2afab980204 h1:JYhQLEn7v7EtrpA9ByRz51gwlk8qt12EGP9XlbX/qw4= 48 + +github.com/docker/go-connections v0.0.0-20170301234100-a2afab980204/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= 49 + +github.com/docker/go-units v0.3.2 h1:Kjm80apys7gTtfVmCvVY8gwu10uofaFSrmAKOVrtueE= 50 + +github.com/docker/go-units v0.3.2/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= 51 + +github.com/fsouza/go-dockerclient v0.0.0-20170307141636-318513eb1ab2 h1:JuVaWSoRMBrstn2l8cxKXjK8l/qurk5qyJ9dq7EIQmU= 52 + +github.com/fsouza/go-dockerclient v0.0.0-20170307141636-318513eb1ab2/go.mod h1:KpcjM623fQYE9MZiTGzKhjfxXAV9wbyX2C1cyRHfhl0= 53 + +github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55 h1:oIgNYSrSUbNH5DJh6DMhU1PiOKOYIHNxrV3djLsLpEI= 54 + +github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= 55 + +github.com/golang/protobuf v0.0.0-20170712042213-0a4f71a498b7 h1:ulJ2cj/xlDlrwLCvWH4UeV9vJ/jXP6wEGgTSF7EOnmQ= 56 + +github.com/golang/protobuf v0.0.0-20170712042213-0a4f71a498b7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= 57 + +github.com/hashicorp/go-cleanhttp v0.0.0-20170211013415-3573b8b52aa7 h1:67fHcS+inUoiIqWCKIqeDuq2AlPHNHPiTqp97LdQ+bc= 58 + +github.com/hashicorp/go-cleanhttp v0.0.0-20170211013415-3573b8b52aa7/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= 59 + +github.com/jgautheron/codename-generator v0.0.0-20150829203204-16d037c7cc3c h1:/hc+TxW4Q1v6aqNPHE5jiaNF2xEK0CzWTgo25RQhQ+U= 60 + +github.com/jgautheron/codename-generator v0.0.0-20150829203204-16d037c7cc3c/go.mod h1:FJRkXmPrkHw0WDjB/LXMUhjWJ112Y6JUYnIVBOy8oH8= 61 + +github.com/mattn/go-runewidth v0.0.0-20170201023540-14207d285c6c h1:eFzthqtg3W6Pihj3DMTXLAF4f+ge5r5Ie5g6HLIZAF0= 62 + +github.com/mattn/go-runewidth v0.0.0-20170201023540-14207d285c6c/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= 63 + +github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 h1:DpOJ2HYzCv8LZP15IdmG+YdwD2luVPHITV96TkirNBM= 64 + +github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= 65 + +github.com/nsf/termbox-go v0.0.0-20180303152453-e2050e41c884 h1:fcs71SMqqDhUD+PbpIv9xf3EH9F9s6HfiLwr6jKm1VA= 66 + +github.com/nsf/termbox-go v0.0.0-20180303152453-e2050e41c884/go.mod h1:IuKpRQcYE1Tfu+oAQqaLisqDeXgjyyltCfsaoYN18NQ= 67 + +github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d h1:VhgPp6v9qf9Agr/56bj7Y/xa04UccTW04VP0Qed4vnQ= 68 + +github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U= 69 + +github.com/op/go-logging v0.0.0-20160211212156-b2cb9fa56473 h1:J1QZwDXgZ4dJD2s19iqR9+U00OWM2kDzbf1O/fmvCWg= 70 + +github.com/op/go-logging v0.0.0-20160211212156-b2cb9fa56473/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= 71 + +github.com/opencontainers/runc v0.1.1 h1:GlxAyO6x8rfZYN9Tt0Kti5a/cP41iuiO2yYT0IJGY8Y= 72 + +github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= 73 + +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= 74 + +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= 75 + +github.com/seccomp/libseccomp-golang v0.0.0-20150813023252-1b506fc7c24e h1:HJbgNpzYMeTLPpkMwbPNTPlhNd9r4xQtqcZG6qoIGgs= 76 + +github.com/seccomp/libseccomp-golang v0.0.0-20150813023252-1b506fc7c24e/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo= 77 + +github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= 78 + +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= 79 + +github.com/syndtr/gocapability v0.0.0-20150716010906-2c00daeb6c3b h1:UzwAjzrPQVJoxLfb26YI2WRrhD3g09ZHt9vAQckWiPY= 80 + +github.com/syndtr/gocapability v0.0.0-20150716010906-2c00daeb6c3b/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= 81 + +github.com/vishvananda/netlink v0.0.0-20150820014904-1e2e08e8a2dc h1:0HAHLwEY4k1VqaO1SzBi4XxT0KA06Cv+QW2LXknBk9g= 82 + +github.com/vishvananda/netlink v0.0.0-20150820014904-1e2e08e8a2dc/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk= 83 + +github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc h1:R83G5ikgLMxrBvLh22JhdfI8K6YXEPHx5P03Uu3DRs4= 84 + +github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI= 85 + +golang.org/x/net v0.0.0-20170308210134-a6577fac2d73 h1:5kGFsglTK4KqaHYb/WCmYmj+Gm1+dzbilbtzruHj6dw= 86 + +golang.org/x/net v0.0.0-20170308210134-a6577fac2d73/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= 87 + +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ= 88 + +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 89 + +golang.org/x/sys v0.0.0-20170308153327-99f16d856c98 h1:U3NsAsR1IG0Aet3Z+IToBDWbPoJ7hjwgDpqqch4APkU= 90 + +golang.org/x/sys v0.0.0-20170308153327-99f16d856c98/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+2 -2
pkgs/tools/system/netdata/default.nix
··· 12 12 with stdenv.lib; 13 13 14 14 stdenv.mkDerivation rec { 15 - version = "1.17.1"; 15 + version = "1.18.0"; 16 16 pname = "netdata"; 17 17 18 18 src = fetchurl { 19 19 url = "https://github.com/netdata/netdata/releases/download/v${version}/netdata-v${version}.tar.gz"; 20 - sha256 = "0k49ms295b9icccvknyqyqlsy911h06c7h7aql5havcx5m5jxq7w"; 20 + sha256 = "1ay22x3ydmfh7649scampr0xvgzb32rvbs6fk57xx64sav8vx607"; 21 21 }; 22 22 23 23 nativeBuildInputs = [ autoreconfHook pkgconfig ];
+33
pkgs/tools/text/lv/default.nix
··· 1 + { stdenv, fetchurl, ncurses }: 2 + 3 + stdenv.mkDerivation rec { 4 + pname = "lv"; 5 + version = "4.51"; 6 + 7 + src = fetchurl { 8 + url = "mirror://debian/pool/main/l/${pname}/${pname}_${version}.orig.tar.gz"; 9 + sha256 = "0yf3idz1qspyff1if41xjpqqcaqa8q8icslqlnz0p9dj36gmm5l3"; 10 + }; 11 + 12 + makeFlags = [ "prefix=${placeholder "out"}" ]; 13 + 14 + buildInputs = [ ncurses ]; 15 + 16 + configurePhase = '' 17 + mkdir -p build 18 + cd build 19 + ../src/configure 20 + ''; 21 + 22 + preInstall = '' 23 + mkdir -p $out/bin 24 + ''; 25 + 26 + meta = with stdenv.lib; { 27 + description = "Powerful multi-lingual file viewer / grep"; 28 + homepage = "https://web.archive.org/web/20160310122517/www.ff.iij4u.or.jp/~nrt/lv/"; 29 + license = licenses.gpl2; 30 + platforms = with platforms; linux ++ darwin; 31 + maintainers = with maintainers; [ kayhide ]; 32 + }; 33 + }
+1 -1
pkgs/top-level/aliases.nix
··· 162 162 infiniband-diags = rdma-core; # added 2019-08-09 163 163 inotifyTools = inotify-tools; 164 164 jbuilder = dune; # added 2018-09-09 165 - jikes = throw "deprecated in 2019-10-07: abandoned by upstream"; 165 + jikes = throw "deprecated in 2019-10-07: jikes was abandoned by upstream"; 166 166 joseki = apache-jena-fuseki; # added 2016-02-28 167 167 json_glib = json-glib; # added 2018-02-25 168 168 kdiff3-qt5 = kdiff3; # added 2017-02-18
+132 -30
pkgs/top-level/all-packages.nix
··· 159 159 160 160 cm256cc = callPackage ../development/libraries/cm256cc { }; 161 161 162 - conftest = callPackage ../development/tools/conftest {}; 162 + conftest = callPackage ../development/tools/conftest { }; 163 163 164 164 corgi = callPackage ../development/tools/corgi { }; 165 165 ··· 260 260 261 261 packer = callPackage ../development/tools/packer { }; 262 262 263 - packr = callPackage ../development/libraries/packr { }; 263 + packr = callPackage ../development/libraries/packr { 264 + # Version 2.6.0 fails to build with go 1.13 due to nested modules: 265 + # go: directory v2/packr2 is outside main module 266 + buildGoModule = buildGo112Module; 267 + }; 264 268 265 269 pet = callPackage ../development/tools/pet { }; 266 270 ··· 659 655 texLive = texlive.combine { inherit (texlive) scheme-small epsf cm-super; }; 660 656 gsl = gsl_1; 661 657 }; 658 + 659 + atinout = callPackage ../tools/networking/atinout { }; 662 660 663 661 atomicparsley = callPackage ../tools/video/atomicparsley { 664 662 inherit (darwin.apple_sdk.frameworks) Cocoa; ··· 1379 1373 1380 1374 compactor = callPackage ../applications/networking/compactor { }; 1381 1375 1382 - consul = callPackage ../servers/consul { }; 1376 + consul = callPackage ../servers/consul { 1377 + # Version 1.6.0 fails to build with go 1.13 due to broken dependency: 1378 + # go/src/github.com/hashicorp/consul/vendor/github.com/envoyproxy/go-control-plane/envoy/type/http_status.pb.go:11:2: code in directory /build/go/src/github.com/hashicorp/consul/vendor/github.com/envoyproxy/protoc-gen-validate/validate expects import "github.com/lyft/protoc-gen-validate/validate" 1379 + buildGoPackage = buildGo112Package; 1380 + }; 1383 1381 1384 1382 consul-alerts = callPackage ../servers/monitoring/consul-alerts { }; 1385 1383 ··· 1630 1620 fastJson = callPackage ../development/libraries/fastjson { }; 1631 1621 1632 1622 fast-cli = nodePackages.fast-cli; 1623 + 1624 + faudio = callPackage ../development/libraries/faudio { }; 1633 1625 1634 1626 fd = callPackage ../tools/misc/fd { }; 1635 1627 ··· 2247 2235 2248 2236 ciopfs = callPackage ../tools/filesystems/ciopfs { }; 2249 2237 2250 - circleci-cli = callPackage ../development/tools/misc/circleci-cli { }; 2238 + circleci-cli = callPackage ../development/tools/misc/circleci-cli { 2239 + # Version 0.1.5879 fails to build with go 1.13 due to: 2240 + # build github.com/CircleCI-Public/circleci-cli: cannot load github.com/gobuffalo/packr/v2: github.com/gobuffalo/packr@v1.21.0: reading file:///nix/store/hh9hrfdg3gbqz37sa3hx44mkzkxpkkyw-circleci-cli-0.1.5879-go-modules/github.com/gobuffalo/packr/@v/v1.21.0.zip: Not Found 2241 + buildGoModule = buildGo112Module; 2242 + }; 2251 2243 2252 2244 # Cleanup before 20.03: 2253 2245 citrix_receiver = throw "citrix_receiver has been discontinued by Citrix (https://docs.citrix.com/en-us/citrix-workspace-app.html). Please use citrix_workspace."; ··· 2543 2527 2544 2528 curl_unix_socket = callPackage ../tools/networking/curl-unix-socket { }; 2545 2529 2546 - curlie = callPackage ../tools/networking/curlie { }; 2530 + curlie = callPackage ../tools/networking/curlie { 2531 + # Version 1.2.0 fails to build with go 1.13 due to: 2532 + # verifying golang.org/x/crypto@v0.0.0-20180524125353-159ae71589f3: golang.org/x/crypto@v0.0.0-20180524125353-159ae71589f3: Get https://sum.golang.org/lookup/golang.org/x/crypto@v0.0.0-20180524125353-159ae71589f3: dial tcp: lookup sum.golang.org on [::1]:53: read udp [::1]:49088->[::1]:53: read: connection refused 2533 + buildGoModule = buildGo112Module; 2534 + }; 2547 2535 2548 2536 cunit = callPackage ../tools/misc/cunit { }; 2549 2537 bcunit = callPackage ../tools/misc/bcunit { }; ··· 3398 3378 3399 3379 git-crecord = callPackage ../applications/version-management/git-crecord { }; 3400 3380 3401 - git-lfs = lowPrio (callPackage ../applications/version-management/git-lfs { }); 3381 + git-lfs = lowPrio (callPackage ../applications/version-management/git-lfs { 3382 + # Version 2.8.0 fails with go1.13 3383 + # go: github.com/alexbrainman/sspi@v0.0.0-20180125232955-4729b3d4d858: Get https://proxy.golang.org/github.com/alexbrainman/sspi/@v/v0.0.0-20180125232955-4729b3d4d858.mod: dial tcp: lookup proxy.golang.org on [::1]:53: read udp [::1]:32932->[::1]:53: read: connection refused 3384 + buildGoPackage = buildGo112Package; 3385 + }); 3402 3386 3403 3387 git-lfs1 = callPackage ../applications/version-management/git-lfs/1.nix { }; 3404 3388 ··· 3638 3614 3639 3615 grpcurl = callPackage ../tools/networking/grpcurl { }; 3640 3616 3641 - grpcui = callPackage ../tools/networking/grpcui { }; 3617 + grpcui = callPackage ../tools/networking/grpcui { 3618 + buildGoModule = buildGo112Module; 3619 + }; 3642 3620 3643 3621 grub = pkgsi686Linux.callPackage ../tools/misc/grub ({ 3644 3622 stdenv = overrideCC stdenv buildPackages.pkgsi686Linux.gcc6; ··· 4688 4662 lshw = callPackage ../tools/system/lshw { }; 4689 4663 4690 4664 ltris = callPackage ../games/ltris { }; 4665 + 4666 + lv = callPackage ../tools/text/lv { }; 4691 4667 4692 4668 lxc = callPackage ../os-specific/linux/lxc { }; 4693 4669 lxcfs = callPackage ../os-specific/linux/lxcfs { }; ··· 7987 7959 inherit (darwin.apple_sdk.frameworks) Security Foundation; 7988 7960 }; 7989 7961 7990 - go = go_1_12; 7962 + go_1_13 = callPackage ../development/compilers/go/1.13.nix { 7963 + inherit (darwin.apple_sdk.frameworks) Security Foundation; 7964 + }; 7965 + 7966 + go = go_1_13; 7991 7967 7992 7968 go-repo-root = callPackage ../development/tools/go-repo-root { }; 7993 7969 ··· 9315 9283 9316 9284 bazel-remote = callPackage ../development/tools/build-managers/bazel/bazel-remote { }; 9317 9285 9318 - bazel-watcher = callPackage ../development/tools/bazel-watcher { }; 9286 + bazel-watcher = callPackage ../development/tools/bazel-watcher { 9287 + go = go_1_12; 9288 + }; 9319 9289 9320 9290 bazelisk = callPackage ../development/tools/bazelisk { }; 9321 9291 ··· 10213 10179 10214 10180 terracognita = callPackage ../development/tools/misc/terracognita { }; 10215 10181 10216 - terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { }; 10182 + terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { 10183 + # Version 0.0.5 fails to build with go 1.13 due to dependency: 10184 + # build github.com/juliosueiras/terraform-lsp: cannot load github.com/googleapis/gax-go/v2: github.com/googleapis/gax-go@v2.0.0+incompatible: reading file:///nix/store/ihiyd3mqa5gvfm2k2716hpl16knak798-terraform-lsp-0.0.5-go-modules/github.com/googleapis/gax-go/@v/v2.0.0+incompatible.zip: Not Found 10185 + buildGoModule = buildGo112Module; 10186 + }; 10217 10187 10218 10188 texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; 10219 10189 texinfo4 = texinfo413; ··· 14477 14439 buildGo112Package = callPackage ../development/go-packages/generic { 14478 14440 go = buildPackages.go_1_12; 14479 14441 }; 14442 + buildGo113Package = callPackage ../development/go-packages/generic { 14443 + go = buildPackages.go_1_13; 14444 + }; 14480 14445 14481 - buildGoPackage = buildGo112Package; 14446 + buildGoPackage = buildGo113Package; 14482 14447 14483 14448 buildGo112Module = callPackage ../development/go-modules/generic { 14484 14449 go = buildPackages.go_1_12; 14485 14450 }; 14486 14451 14487 - buildGoModule = buildGo112Module; 14452 + buildGo113Module = callPackage ../development/go-modules/generic { 14453 + go = buildPackages.go_1_13; 14454 + }; 14455 + 14456 + buildGoModule = buildGo113Module; 14488 14457 14489 14458 go2nix = callPackage ../development/tools/go2nix { }; 14490 14459 ··· 14790 14745 14791 14746 gofish = callPackage ../servers/gopher/gofish { }; 14792 14747 14793 - grafana = callPackage ../servers/monitoring/grafana { }; 14748 + grafana = callPackage ../servers/monitoring/grafana { 14749 + buildGoPackage = buildGo112Package; 14750 + }; 14794 14751 14795 14752 grafana-loki = callPackage ../servers/monitoring/loki { }; 14796 14753 ··· 15158 15111 postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; 15159 15112 15160 15113 prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { }; 15161 - prometheus = callPackage ../servers/monitoring/prometheus { }; 15114 + prometheus = callPackage ../servers/monitoring/prometheus { 15115 + # Version 2.12.0 fails to build with go 1.13 due to an incorrect module file 15116 + # compilation error :go: cloud.google.com/go@v0.44.1: Get https://proxy.golang.org/cloud.google.com/go/@v/v0.44.1.mod: dial tcp: lookup proxy.golang.org on [::1]:53: read udp [::1]:58980->[::1]:53: read: connection refused 15117 + buildGoPackage = buildGo112Package; 15118 + }; 15162 15119 prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { }; 15163 15120 prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { }; 15164 15121 prometheus-aws-s3-exporter = callPackage ../servers/monitoring/prometheus/aws-s3-exporter.nix { }; ··· 15194 15143 prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-exporter.nix { }; 15195 15144 prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { }; 15196 15145 prometheus-unifi-exporter = callPackage ../servers/monitoring/prometheus/unifi-exporter { }; 15197 - prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { }; 15146 + prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { 15147 + # Version 1.5.1 fails to build with go 1.13 due to test failure 15148 + # FAIL github.com/jonnenauha/prometheus_varnish_exporter 0.041s 15149 + buildGoModule = buildGo112Module; 15150 + }; 15198 15151 prometheus-jmx-httpserver = callPackage ../servers/monitoring/prometheus/jmx-httpserver.nix { }; 15199 15152 prometheus-wireguard-exporter = callPackage ../servers/monitoring/prometheus/wireguard-exporter.nix { 15200 15153 inherit (darwin.apple_sdk.frameworks) Security; ··· 15240 15185 15241 15186 redstore = callPackage ../servers/http/redstore { }; 15242 15187 15243 - restic = callPackage ../tools/backup/restic { }; 15188 + restic = callPackage ../tools/backup/restic { 15189 + # Version 0.9.5 fails to build with go 1.13 due to dependency: 15190 + # go: bazil.org/fuse@v0.0.0-20180421153158-65cc252bf669: Get https://proxy.golang.org/bazil.org/fuse/@v/v0.0.0-20180421153158-65cc252bf669.mod: dial tcp: lookup proxy.golang.org on [::1]:53: read udp [::1]:56450->[::1]:53: read: connection refused 15191 + buildGoPackage = buildGo112Package; 15192 + }; 15244 15193 15245 15194 restic-rest-server = callPackage ../tools/backup/restic/rest-server.nix { }; 15246 15195 ··· 15354 15295 15355 15296 spawn_fcgi = callPackage ../servers/http/spawn-fcgi { }; 15356 15297 15298 + spring-boot = callPackage ../development/tools/spring-boot { }; 15299 + 15357 15300 squid = callPackage ../servers/squid { }; 15358 15301 15359 15302 sslh = callPackage ../servers/sslh { }; ··· 15397 15336 shaarli = callPackage ../servers/web-apps/shaarli { }; 15398 15337 15399 15338 shaarli-material = callPackage ../servers/web-apps/shaarli/material-theme.nix { }; 15339 + 15340 + shiori = callPackage ../servers/web-apps/shiori { }; 15400 15341 15401 15342 matomo = callPackage ../servers/web-apps/matomo { }; 15402 15343 ··· 15599 15536 15600 15537 cpustat = callPackage ../os-specific/linux/cpustat { }; 15601 15538 15602 - cockroachdb = callPackage ../servers/sql/cockroachdb { }; 15539 + cockroachdb = callPackage ../servers/sql/cockroachdb { 15540 + buildGoPackage = buildGo112Package; 15541 + }; 15603 15542 15604 15543 conky = callPackage ../os-specific/linux/conky ({ 15605 15544 lua = lua5_3_compat; ··· 16404 16339 16405 16340 gotests = callPackage ../development/tools/gotests { }; 16406 16341 16407 - gotestsum = callPackage ../development/tools/gotestsum { }; 16342 + gotestsum = callPackage ../development/tools/gotestsum { 16343 + # Version 0.3.5 fails to build with go 1.13: 16344 + # build ./testjson/internal/badmain: cannot find module for path ./testjson/internal/badmain 16345 + buildGoModule = buildGo112Module; 16346 + }; 16408 16347 16409 16348 impl = callPackage ../development/tools/impl { }; 16410 16349 ··· 17769 17700 poppler = poppler_0_61; 17770 17701 }; 17771 17702 17772 - perkeep = callPackage ../applications/misc/perkeep { }; 17703 + perkeep = callPackage ../applications/misc/perkeep { 17704 + # Revision c9f78d02adf9740f3b8d403a1418554293cc9f41 fails to build with go 1.13 due to a dependency: 17705 + # go: bazil.org/fuse@v0.0.0-20160811212531-371fbbdaa898: Get https://proxy.golang.org/bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod: dial tcp: lookup proxy.golang.org on [::1]:53: read udp [::1]:36526->[::1]:53: read: connection refused 17706 + buildGoPackage = buildGo112Package; 17707 + }; 17773 17708 17774 17709 canto-curses = callPackage ../applications/networking/feedreaders/canto-curses { }; 17775 17710 ··· 18233 18160 inherit (gnome3) empathy; 18234 18161 18235 18162 enhanced-ctorrent = callPackage ../applications/networking/enhanced-ctorrent { }; 18163 + 18164 + envelope = callPackage ../applications/office/envelope { }; 18236 18165 18237 18166 eolie = callPackage ../applications/networking/browsers/eolie { }; 18238 18167 ··· 19309 19234 19310 19235 kubeval = callPackage ../applications/networking/cluster/kubeval { }; 19311 19236 19312 - kubernetes = callPackage ../applications/networking/cluster/kubernetes { }; 19237 + kubernetes = callPackage ../applications/networking/cluster/kubernetes { 19238 + go = buildPackages.go_1_12; 19239 + }; 19313 19240 19314 19241 kubectl = callPackage ../applications/networking/cluster/kubectl { }; 19315 19242 ··· 19543 19466 19544 19467 marp = callPackage ../applications/office/marp { }; 19545 19468 19546 - magnetico = callPackage ../applications/networking/p2p/magnetico { }; 19469 + magnetico = callPackage ../applications/networking/p2p/magnetico { 19470 + # Version 2019-08-14 fails to build with go 1.13 due to missing go.sum 19471 + buildGoModule = buildGo112Module; 19472 + }; 19547 19473 19548 19474 matchbox = callPackage ../applications/window-managers/matchbox { }; 19549 19475 ··· 19826 19746 19827 19747 notion = callPackage ../applications/window-managers/notion { }; 19828 19748 19829 - openshift = callPackage ../applications/networking/cluster/openshift { }; 19749 + openshift = callPackage ../applications/networking/cluster/openshift { 19750 + buildGoPackage = buildGo112Package; 19751 + }; 19830 19752 19831 19753 oroborus = callPackage ../applications/window-managers/oroborus {}; 19832 19754 ··· 20692 20610 20693 20611 split2flac = callPackage ../applications/audio/split2flac { }; 20694 20612 20613 + spotify-tui = callPackage ../applications/audio/spotify-tui { 20614 + inherit (darwin.apple_sdk.frameworks) Security; 20615 + }; 20616 + 20695 20617 squishyball = callPackage ../applications/audio/squishyball { 20696 20618 ncurses = ncurses5; 20697 20619 }; ··· 21017 20931 21018 20932 telepathy-idle = callPackage ../applications/networking/instant-messengers/telepathy/idle {}; 21019 20933 21020 - tendermint = callPackage ../tools/networking/tendermint {}; 20934 + tendermint = callPackage ../tools/networking/tendermint { 20935 + buildGoModule = buildGo112Module; 20936 + }; 21021 20937 21022 20938 termdown = (newScope pythonPackages) ../applications/misc/termdown { }; 21023 20939 ··· 21985 21897 }; 21986 21898 litecoind = litecoin.override { withGui = false; }; 21987 21899 21988 - lnd = callPackage ../applications/blockchains/lnd.nix { }; 21900 + lnd = callPackage ../applications/blockchains/lnd.nix { 21901 + buildGoModule = buildGo112Module; 21902 + }; 21989 21903 21990 21904 monero = callPackage ../applications/blockchains/monero { 21991 21905 inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; ··· 22006 21916 namecoin = callPackage ../applications/blockchains/namecoin.nix { withGui = true; }; 22007 21917 namecoind = callPackage ../applications/blockchains/namecoin.nix { withGui = false; }; 22008 21918 22009 - pivx = libsForQt59.callPackage ../applications/blockchains/pivx.nix { withGui = true; }; 21919 + pivx = libsForQt5.callPackage ../applications/blockchains/pivx.nix { withGui = true; }; 22010 21920 pivxd = callPackage ../applications/blockchains/pivx.nix { withGui = false; }; 22011 21921 22012 21922 ethabi = callPackage ../applications/blockchains/ethabi.nix { }; ··· 22136 22046 22137 22047 crispyDoom = callPackage ../games/crispy-doom { }; 22138 22048 22139 - cri-o = callPackage ../applications/virtualization/cri-o {}; 22049 + cri-o = callPackage ../applications/virtualization/cri-o { 22050 + buildGoPackage = buildGo112Package; 22051 + }; 22140 22052 22141 22053 ckan = callPackage ../games/ckan { }; 22142 22054 ··· 22596 22504 22597 22505 sauerbraten = callPackage ../games/sauerbraten {}; 22598 22506 22599 - scaleway-cli = callPackage ../tools/admin/scaleway-cli { }; 22507 + scaleway-cli = callPackage ../tools/admin/scaleway-cli { 22508 + buildGoPackage = buildGo112Package; 22509 + }; 22600 22510 22601 22511 scid = callPackage ../games/scid { 22602 22512 tcl = tcl-8_5; ··· 24652 24558 24653 24559 jx = callPackage ../applications/networking/cluster/jx {}; 24654 24560 24655 - prow = callPackage ../applications/networking/cluster/prow {}; 24561 + prow = callPackage ../applications/networking/cluster/prow { 24562 + # Version 2019-08-14 fails to build with go 1.13 due to dependencies: 24563 + # go: golang.org/x/lint@v0.0.0-20190301231843-5614ed5bae6f used for two different module paths (github.com/golang/lint and golang.org/x/lint) 24564 + buildGoModule = buildGo112Module; 24565 + }; 24656 24566 24657 24567 inherit (callPackage ../applications/networking/cluster/terraform {}) 24658 24568 terraform_0_11 ··· 24670 24572 terraform-full = terraform.full; 24671 24573 24672 24574 terraform-providers = recurseIntoAttrs ( 24673 - callPackage ../applications/networking/cluster/terraform-providers {} 24575 + callPackage ../applications/networking/cluster/terraform-providers { 24576 + inherit buildGo112Module; 24577 + } 24674 24578 ); 24675 24579 24676 24580 terraform-docs = callPackage ../applications/networking/cluster/terraform-docs {}; ··· 25014 24914 25015 24915 zimg = callPackage ../development/libraries/zimg { }; 25016 24916 25017 - wtf = callPackage ../applications/misc/wtf { }; 24917 + wtf = callPackage ../applications/misc/wtf { 24918 + buildGoModule = buildGo112Module; 24919 + }; 25018 24920 25019 24921 zk-shell = callPackage ../applications/misc/zk-shell { }; 25020 24922
+2
pkgs/top-level/ocaml-packages.nix
··· 519 519 520 520 ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { }; 521 521 522 + ocaml-monadic = callPackage ../development/ocaml-modules/ocaml-monadic { }; 523 + 522 524 ocaml_mysql = callPackage ../development/ocaml-modules/mysql { }; 523 525 524 526 ocamlnet = callPackage ../development/ocaml-modules/ocamlnet { };
+2
pkgs/top-level/python-packages.nix
··· 6033 6033 6034 6034 yarl = callPackage ../development/python-modules/yarl { }; 6035 6035 6036 + solo-python = disabledIf (! pythonAtLeast "3.6") (callPackage ../development/python-modules/solo-python { }); 6037 + 6036 6038 suseapi = callPackage ../development/python-modules/suseapi { }; 6037 6039 6038 6040 typed-ast = callPackage ../development/python-modules/typed-ast { };
+2
pkgs/top-level/wine-packages.nix
··· 44 44 gsmSupport = true; 45 45 gphoto2Support = true; 46 46 ldapSupport = true; 47 + faudioSupport = true; 48 + vkd3dSupport = true; 47 49 }; 48 50 49 51 stable = base.override { wineRelease = "stable"; };