diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index fdf5f7dedd5..9679b4b3646 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1747,6 +1747,11 @@
github = "freepotion";
name = "Free Potion";
};
+ freezeboy = {
+ email = "freezeboy@users.noreply.github.com";
+ github = "freezeboy";
+ name = "freezeboy";
+ };
Fresheyeball = {
email = "fresheyeball@gmail.com";
github = "fresheyeball";
@@ -3208,6 +3213,11 @@
github = "mimadrid";
name = "Miguel Madrid";
};
+ minijackson = {
+ email = "minijackson@riseup.net";
+ github = "minijackson";
+ name = "Rémi Nicole";
+ };
mirdhyn = {
email = "mirdhyn@gmail.com";
github = "mirdhyn";
@@ -3338,6 +3348,11 @@
github = "fstamour";
name = "Francis St-Amour";
};
+ mredaelli = {
+ email = "massimo@typish.io";
+ github = "mredaelli";
+ name = "Massimo Redaelli";
+ };
mrkkrp = {
email = "markkarpov92@gmail.com";
github = "mrkkrp";
@@ -4474,6 +4489,11 @@
github = "shawndellysse";
name = "Shawn Dellysse";
};
+ shazow = {
+ email = "andrey.petrov@shazow.net";
+ github = "shazow";
+ name = "Andrey Petrov";
+ };
sheenobu = {
email = "sheena.artrip@gmail.com";
github = "sheenobu";
@@ -4494,6 +4514,11 @@
github = "shlevy";
name = "Shea Levy";
};
+ shmish111 = {
+ email = "shmish111@gmail.com";
+ github = "shmish111";
+ name = "David Smith";
+ };
shou = {
email = "x+g@shou.io";
github = "Shou";
@@ -4659,6 +4684,11 @@
github = "srghma";
name = "Sergei Khoma";
};
+ srgom = {
+ email = "srgom@users.noreply.github.com";
+ github = "srgom";
+ name = "SRGOM";
+ };
srhb = {
email = "sbrofeldt@gmail.com";
github = "srhb";
@@ -4883,6 +4913,11 @@
github = "terlar";
name = "Terje Larsen";
};
+ tesq0 = {
+ email = "mikolaj.galkowski@gmail.com";
+ github = "tesq0";
+ name = "Mikolaj Galkowski";
+ };
teto = {
email = "mcoudron@hotmail.com";
github = "teto";
@@ -5366,6 +5401,11 @@
github = "xaverdh";
name = "Dominik Xaver Hörl";
};
+ xbreak = {
+ email = "xbreak@alphaware.se";
+ github = "xbreak";
+ name = "Calle Rosenquist";
+ };
xeji = {
email = "xeji@cat3.de";
github = "xeji";
@@ -5550,34 +5590,4 @@
github = "zzamboni";
name = "Diego Zamboni";
};
- mredaelli = {
- email = "massimo@typish.io";
- github = "mredaelli";
- name = "Massimo Redaelli";
- };
- shmish111 = {
- email = "shmish111@gmail.com";
- github = "shmish111";
- name = "David Smith";
- };
- minijackson = {
- email = "minijackson@riseup.net";
- github = "minijackson";
- name = "Rémi Nicole";
- };
- shazow = {
- email = "andrey.petrov@shazow.net";
- github = "shazow";
- name = "Andrey Petrov";
- };
- freezeboy = {
- email = "freezeboy@users.noreply.github.com";
- github = "freezeboy";
- name = "freezeboy";
- };
- tesq0 = {
- email = "mikolaj.galkowski@gmail.com";
- github = "tesq0";
- name = "Mikolaj Galkowski";
- };
}
diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index 7074a650e06..a7989c74b21 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -2,8 +2,10 @@
ansicolors,
argparse,
basexx,
+binaryheap,
dkjson
fifo
+http
inspect
ldoc
lgi
diff --git a/nixos/modules/config/malloc.nix b/nixos/modules/config/malloc.nix
new file mode 100644
index 00000000000..7a42b0803be
--- /dev/null
+++ b/nixos/modules/config/malloc.nix
@@ -0,0 +1,91 @@
+{ config, lib, pkgs, ... }:
+with lib;
+
+let
+ cfg = config.environment.memoryAllocator;
+
+ # The set of alternative malloc(3) providers.
+ providers = {
+ "graphene-hardened" = rec {
+ libPath = "${pkgs.graphene-hardened-malloc}/lib/libhardened_malloc.so";
+ description = ''
+ An allocator designed to mitigate memory corruption attacks, such as
+ those caused by use-after-free bugs.
+ '';
+ };
+
+ "jemalloc" = {
+ libPath = "${pkgs.jemalloc}/lib/libjemalloc.so";
+ description = ''
+ A general purpose allocator that emphasizes fragmentation avoidance
+ and scalable concurrency support.
+ '';
+ };
+ };
+
+ providerConf = providers."${cfg.provider}";
+
+ # An output that contains only the shared library, to avoid
+ # needlessly bloating the system closure
+ mallocLib = pkgs.runCommand "malloc-provider-${cfg.provider}"
+ rec {
+ preferLocalBuild = true;
+ allowSubstitutes = false;
+ origLibPath = providerConf.libPath;
+ libName = baseNameOf origLibPath;
+ }
+ ''
+ mkdir -p $out/lib
+ cp -L $origLibPath $out/lib/$libName
+ '';
+
+ # The full path to the selected provider shlib.
+ providerLibPath = "${mallocLib}/lib/${mallocLib.libName}";
+in
+
+{
+ meta = {
+ maintainers = [ maintainers.joachifm ];
+ };
+
+ options = {
+ environment.memoryAllocator.provider = mkOption {
+ type = types.enum ([ "libc" ] ++ attrNames providers);
+ default = "libc";
+ description = ''
+ The system-wide memory allocator.
+
+
+
+ Briefly, the system-wide memory allocator providers are:
+
+ libc: the standard allocator provided by libc
+ ${toString (mapAttrsToList
+ (name: value: "${name}: ${value.description}")
+ providers)}
+
+
+
+
+
+ Selecting an alternative allocator (i.e., anything other than
+ libc) may result in instability, data loss,
+ and/or service failure.
+
+
+
+
+
+ Changing this option does not affect the current session.
+
+
+
+
+ '';
+ };
+ };
+
+ config = mkIf (cfg.provider != "libc") {
+ environment.variables.LD_PRELOAD = providerLibPath;
+ };
+}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index dee850f47f2..a66747f0384 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -19,6 +19,7 @@
./config/iproute2.nix
./config/krb5/default.nix
./config/ldap.nix
+ ./config/malloc.nix
./config/networking.nix
./config/no-x-libs.nix
./config/nsswitch.nix
diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix
index 9ab2ee87a19..87bf66333c6 100644
--- a/nixos/modules/profiles/hardened.nix
+++ b/nixos/modules/profiles/hardened.nix
@@ -14,6 +14,8 @@ with lib;
nix.allowedUsers = mkDefault [ "@users" ];
+ environment.memoryAllocator.provider = mkDefault "graphene-hardened";
+
security.hideProcessInformation = mkDefault true;
security.lockKernelModules = mkDefault true;
diff --git a/nixos/modules/programs/xss-lock.nix b/nixos/modules/programs/xss-lock.nix
index c290df01b96..070463311db 100644
--- a/nixos/modules/programs/xss-lock.nix
+++ b/nixos/modules/programs/xss-lock.nix
@@ -8,12 +8,23 @@ in
{
options.programs.xss-lock = {
enable = mkEnableOption "xss-lock";
+
lockerCommand = mkOption {
default = "${pkgs.i3lock}/bin/i3lock";
example = literalExample ''''${pkgs.i3lock-fancy}/bin/i3lock-fancy'';
type = types.string;
description = "Locker to be used with xsslock";
};
+
+ extraOptions = mkOption {
+ default = [ ];
+ example = [ "--ignore-sleep" ];
+ type = types.listOf types.str;
+ description = ''
+ Additional command-line arguments to pass to
+ xss-lock.
+ '';
+ };
};
config = mkIf cfg.enable {
@@ -21,7 +32,13 @@ in
description = "XSS Lock Daemon";
wantedBy = [ "graphical-session.target" ];
partOf = [ "graphical-session.target" ];
- serviceConfig.ExecStart = "${pkgs.xss-lock}/bin/xss-lock ${cfg.lockerCommand}";
+ serviceConfig.ExecStart = with lib;
+ strings.concatStringsSep " " ([
+ "${pkgs.xss-lock}/bin/xss-lock"
+ ] ++ (map escapeShellArg cfg.extraOptions) ++ [
+ "--"
+ cfg.lockerCommand
+ ]);
};
};
}
diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix
index 4512a7a80f6..cfc65b347bc 100644
--- a/nixos/modules/security/apparmor.nix
+++ b/nixos/modules/security/apparmor.nix
@@ -29,6 +29,8 @@ in
config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.apparmor-utils ];
+ boot.kernelParams = [ "apparmor=1" "security=apparmor" ];
+
systemd.services.apparmor = let
paths = concatMapStrings (s: " -I ${s}/etc/apparmor.d")
([ pkgs.apparmor-profiles ] ++ cfg.packages);
diff --git a/nixos/modules/security/rngd.nix b/nixos/modules/security/rngd.nix
index 60361d9960e..d9d6d9c9f25 100644
--- a/nixos/modules/security/rngd.nix
+++ b/nixos/modules/security/rngd.nix
@@ -42,6 +42,11 @@ in
serviceConfig = {
ExecStart = "${pkgs.rng-tools}/sbin/rngd -f"
+ optionalString cfg.debug " -d";
+ NoNewPrivileges = true;
+ PrivateNetwork = true;
+ PrivateTmp = true;
+ ProtectSystem = "full";
+ ProtectHome = true;
};
};
};
diff --git a/nixos/tests/hardened.nix b/nixos/tests/hardened.nix
index 07bd10963ba..1ff329bd98d 100644
--- a/nixos/tests/hardened.nix
+++ b/nixos/tests/hardened.nix
@@ -27,9 +27,33 @@ import ./make-test.nix ({ pkgs, ...} : {
};
testScript =
+ let
+ hardened-malloc-tests = pkgs.stdenv.mkDerivation rec {
+ name = "hardened-malloc-tests-${pkgs.graphene-hardened-malloc.version}";
+ src = pkgs.graphene-hardened-malloc.src;
+ buildPhase = ''
+ cd test/simple-memory-corruption
+ make -j4
+ '';
+
+ installPhase = ''
+ find . -type f -executable -exec install -Dt $out/bin '{}' +
+ '';
+ };
+ in
''
$machine->waitForUnit("multi-user.target");
+ subtest "apparmor-loaded", sub {
+ $machine->succeed("systemctl status apparmor.service");
+ };
+
+ # AppArmor securityfs
+ subtest "apparmor-securityfs", sub {
+ $machine->succeed("mountpoint -q /sys/kernel/security");
+ $machine->succeed("cat /sys/kernel/security/apparmor/profiles");
+ };
+
# Test loading out-of-tree modules
subtest "extra-module-packages", sub {
$machine->succeed("grep -Fq wireguard /proc/modules");
@@ -83,5 +107,18 @@ import ./make-test.nix ({ pkgs, ...} : {
$machine->fail("systemctl hibernate");
$machine->fail("systemctl kexec");
};
+
+ # Test hardened memory allocator
+ sub runMallocTestProg {
+ my ($progName, $errorText) = @_;
+ my $text = "fatal allocator error: " . $errorText;
+ $machine->fail("${hardened-malloc-tests}/bin/" . $progName) =~ $text;
+ };
+
+ subtest "hardenedmalloc", sub {
+ runMallocTestProg("double_free_large", "invalid free");
+ runMallocTestProg("unaligned_free_small", "invalid unaligned free");
+ runMallocTestProg("write_after_free_small", "detected write after free");
+ };
'';
})
diff --git a/nixos/tests/xss-lock.nix b/nixos/tests/xss-lock.nix
index b46bb1a8f6e..0d757e8cef3 100644
--- a/nixos/tests/xss-lock.nix
+++ b/nixos/tests/xss-lock.nix
@@ -6,19 +6,35 @@ with lib;
name = "xss-lock";
meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ma27 ];
- machine = {
- imports = [ ./common/x11.nix ./common/user-account.nix ];
- programs.xss-lock.enable = true;
- services.xserver.displayManager.auto.user = "alice";
+ nodes = {
+ simple = {
+ imports = [ ./common/x11.nix ./common/user-account.nix ];
+ programs.xss-lock.enable = true;
+ services.xserver.displayManager.auto.user = "alice";
+ };
+
+ custom_lockcmd = { pkgs, ... }: {
+ imports = [ ./common/x11.nix ./common/user-account.nix ];
+ services.xserver.displayManager.auto.user = "alice";
+
+ programs.xss-lock = {
+ enable = true;
+ extraOptions = [ "-n" "${pkgs.libnotify}/bin/notify-send 'About to sleep!'"];
+ lockerCommand = "${pkgs.xlockmore}/bin/xlock -mode ant";
+ };
+ };
};
testScript = ''
- $machine->start;
- $machine->waitForX;
- $machine->waitForUnit("xss-lock.service", "alice");
+ startAll;
- $machine->fail("pgrep xlock");
- $machine->succeed("su -l alice -c 'xset dpms force standby'");
- $machine->waitUntilSucceeds("pgrep i3lock");
+ ${concatStringsSep "\n" (mapAttrsToList (name: lockCmd: ''
+ ${"$"+name}->start;
+ ${"$"+name}->waitForX;
+ ${"$"+name}->waitForUnit("xss-lock.service", "alice");
+ ${"$"+name}->fail("pgrep ${lockCmd}");
+ ${"$"+name}->succeed("su -l alice -c 'xset dpms force standby'");
+ ${"$"+name}->waitUntilSucceeds("pgrep ${lockCmd}");
+ '') { simple = "i3lock"; custom_lockcmd = "xlock"; })}
'';
})
diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix
index 0673eec8c86..d4a7e396cb0 100644
--- a/pkgs/applications/graphics/ipe/default.nix
+++ b/pkgs/applications/graphics/ipe/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "ipe-7.2.11";
+ name = "ipe-7.2.12";
src = fetchurl {
url = "https://dl.bintray.com/otfried/generic/ipe/7.2/${name}-src.tar.gz";
- sha256 = "09d71fdpiz359mcnb57460w2mcfizvlnidd6g1k4c3v6rglwlbd2";
+ sha256 = "1qw1cmwzi3wxk4x916i9y4prhi9brnwl14i9a1cbw23x1sr7i6kw";
};
sourceRoot = "${name}/src";
diff --git a/pkgs/applications/misc/calcurse/default.nix b/pkgs/applications/misc/calcurse/default.nix
index e6dafe4d08a..dc0460c2a23 100644
--- a/pkgs/applications/misc/calcurse/default.nix
+++ b/pkgs/applications/misc/calcurse/default.nix
@@ -9,17 +9,13 @@ stdenv.mkDerivation rec {
sha256 = "0vw2xi6a2lrhrb8n55zq9lv4mzxhby4xdf3hmi1vlfpyrpdwkjzd";
};
- buildInputs = [ ncurses gettext python3 ];
+ buildInputs = [ ncurses gettext python3 python3Packages.wrapPython ];
nativeBuildInputs = [ makeWrapper ];
- # Build Python environment with httplib2 for calcurse-caldav
- pythonEnv = python3Packages.python.buildEnv.override {
- extraLibs = [ python3Packages.httplib2 ];
- };
- propagatedBuildInputs = [ pythonEnv ];
-
postInstall = ''
- substituteInPlace $out/bin/calcurse-caldav --replace /usr/bin/python3 ${pythonEnv}/bin/python3
+ patchShebangs .
+ buildPythonPath ${python3Packages.httplib2}
+ patchPythonScript $out/bin/calcurse-caldav
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 5f252d97d86..6185b7d228f 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -1,6 +1,8 @@
-{ stdenv, fetchFromGitHub, python3, python3Packages, zbar, secp256k1 }:
+{ stdenv, fetchurl, fetchFromGitHub, python3, python3Packages, zbar, secp256k1 }:
let
+ version = "3.3.5";
+
qdarkstyle = python3Packages.buildPythonPackage rec {
pname = "QDarkStyle";
version = "2.5.4";
@@ -10,19 +12,35 @@ let
};
doCheck = false; # no tests
};
+
+ # Not provided in official source releases, which are what upstream signs.
+ tests = fetchFromGitHub {
+ owner = "spesmilo";
+ repo = "electrum";
+ rev = version;
+ sha256 = "11rzzrv5xxqazcb7q1ig93d6cisqmd1x0jrgvfgzysbzvi51gg11";
+
+ extraPostFetch = ''
+ mv $out ./all
+ mv ./all/electrum/tests $out
+ '';
+ };
in
python3Packages.buildPythonApplication rec {
pname = "electrum";
- version = "3.3.4";
+ inherit version;
- src = fetchFromGitHub {
- owner = "spesmilo";
- repo = "electrum";
- rev = version;
- sha256 = "0yxdpc602jnd14xz3px85ka0b6db98zwbgfi9a3vj8p1k3mmiwaj";
+ src = fetchurl {
+ url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
+ sha256 = "1csj0n96zlajnrs39wsazfj5lmy7v7n77cdz56lr8nkmchh6k9z1";
};
+ postUnpack = ''
+ # can't symlink, tests get confused
+ cp -ar ${tests} $sourceRoot/electrum/tests
+ '';
+
propagatedBuildInputs = with python3Packages; [
aiorpcx
aiohttp
@@ -64,7 +82,10 @@ python3Packages.buildPythonApplication rec {
rm -rf $out/${python3.sitePackages}/nix
substituteInPlace $out/share/applications/electrum.desktop \
- --replace "Exec=electrum %u" "Exec=$out/bin/electrum %u"
+ --replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum %u"' \
+ "Exec=$out/bin/electrum %u" \
+ --replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum --testnet %u"' \
+ "Exec=$out/bin/electrum --testnet %u"
'';
checkInputs = with python3Packages; [ pytest ];
diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index 22a1a4ba2ad..bfc4ac79615 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "josm-${version}";
- version = "14945";
+ version = "15031";
src = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
- sha256 = "0kdfdn0i7gjfkkllb93598ywf0qlllzsia5q14szc5b5assl8qpb";
+ sha256 = "19qw1s5v0dha329a7rfnhby0rq5d109b3f1ln2w1dfkmirbl75ir";
};
buildInputs = [ jdk11 makeWrapper ];
diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix
index 76c2ba69d35..5f314d19dda 100644
--- a/pkgs/applications/misc/moonlight-embedded/default.nix
+++ b/pkgs/applications/misc/moonlight-embedded/default.nix
@@ -1,18 +1,18 @@
{ stdenv, fetchFromGitHub, cmake, perl
, alsaLib, libevdev, libopus, udev, SDL2
, ffmpeg, pkgconfig, xorg, libvdpau, libpulseaudio, libcec
-, curl, expat, avahi, enet, libuuid
+, curl, expat, avahi, enet, libuuid, libva
}:
stdenv.mkDerivation rec {
name = "moonlight-embedded-${version}";
- version = "2.4.7";
+ version = "2.4.9";
src = fetchFromGitHub {
owner = "irtimmer";
repo = "moonlight-embedded";
rev = "v${version}";
- sha256 = "0ihgb0kh4rhbgn55s25rfbs8063zqvcyqn137jn3nsc0is1595a9";
+ sha256 = "1mzs0dr6bg57kjyxjh48hfmlsil7fvgqf9lhjzxxj3llvpxwws86";
fetchSubmodules = true;
};
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [
alsaLib libevdev libopus udev SDL2
ffmpeg pkgconfig xorg.libxcb libvdpau libpulseaudio libcec
- xorg.libpthreadstubs curl expat avahi enet libuuid
+ xorg.libpthreadstubs curl expat avahi enet libuuid libva
];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index 4263abf0771..5ce4ab7b906 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -14,9 +14,9 @@ let
in buildGoPackage rec {
pname = "minikube";
name = "${pname}-${version}";
- version = "1.0.0";
+ version = "1.0.1";
- kubernetesVersion = "1.14.0";
+ kubernetesVersion = "1.14.1";
goPackagePath = "k8s.io/minikube";
@@ -24,7 +24,7 @@ in buildGoPackage rec {
owner = "kubernetes";
repo = "minikube";
rev = "v${version}";
- sha256 = "170iy0h27gkz2hg485rnawdw069gxwgkwsjmfj5yag2kkgl7gxa3";
+ sha256 = "1fgyaq8789wc3h6xmn4iw6if2jxdv5my35yn6ipx3q6i4hagxl4b";
};
buildInputs = [ go-bindata makeWrapper gpgme ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin vmnet;
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
index f195a0cb955..e4c024bbc70 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
@@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "src/electron-main.js",
- "version": "1.0.8",
+ "version": "1.1.0",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"dependencies": {
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
index 6209dc4b0bf..3d9bf85829a 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
@@ -7,12 +7,12 @@ with (import ./yarn2nix.nix { inherit pkgs; });
let
executableName = "riot-desktop";
- version = "1.0.8";
+ version = "1.1.0";
riot-web-src = fetchFromGitHub {
owner = "vector-im";
repo = "riot-web";
rev = "v${version}";
- sha256 = "1krp608wxff1siih8zknc425n0qb6qjzf854fnp7qyjp1cnfc9sb";
+ sha256 = "0h1rr70jg64v824k31mvb93nfssr572xlyicc8yh91bl7hdh342x";
};
in mkYarnPackage rec {
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index d46c886a156..7d19f8f6600 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -6,11 +6,11 @@
let configFile = writeText "riot-config.json" conf; in
stdenv.mkDerivation rec {
name= "riot-web-${version}";
- version = "1.0.8";
+ version = "1.1.0";
src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
- sha256 = "010m8b4lfnfi70d4v205wk3i4xhnsz7zkrdqrvw3si14xqy6192r";
+ sha256 = "14ap57hv1c5nh17771l39inpa5yacpyckzqcmjlbrb57illakwrd";
};
installPhase = ''
diff --git a/pkgs/applications/science/biology/minimap2/default.nix b/pkgs/applications/science/biology/minimap2/default.nix
index 85c2b99b3a7..84c65feb093 100644
--- a/pkgs/applications/science/biology/minimap2/default.nix
+++ b/pkgs/applications/science/biology/minimap2/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "minimap2";
- version = "2.16";
+ version = "2.17";
src = fetchFromGitHub {
repo = pname;
owner = "lh3";
rev = "v${version}";
- sha256 = "1ggm5psv3gwsz627ik9kl6ry9gzgmfsvya6ni0gv6ahwlrhdim73";
+ sha256 = "0qdwlkib3aa6112372hdgvnvk86hsjjkhjar0p53pq4ajrr2cdlb";
};
buildInputs = [ zlib ];
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index cea2586179e..56d8082d2f5 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -141,6 +141,14 @@ stdenv.mkDerivation rec {
url = "https://git.sagemath.org/sage.git/patch/?h=8b7dbd0805d02d0e8674a272e161ceb24a637966";
sha256 = "1c81f13z1w62s06yvp43gz6vkp8mxcs289n6l4gj9xj10slimzff";
})
+
+ # https://trac.sagemath.org/ticket/26932
+ (fetchSageDiff {
+ name = "givaro-4.1.0_fflas-ffpack-2.4.0_linbox-1.6.0.patch";
+ base = "8.8.beta4";
+ rev = "c11d9cfa23ff9f77681a8f12742f68143eed4504";
+ sha256 = "0xzra7mbgqvahk9v45bjwir2mqz73hrhhy314jq5nxrb35ysdxyi";
+ })
];
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;
diff --git a/pkgs/applications/science/robotics/apmplanner2/default.nix b/pkgs/applications/science/robotics/apmplanner2/default.nix
index 761766ffdf0..69f355c7b84 100644
--- a/pkgs/applications/science/robotics/apmplanner2/default.nix
+++ b/pkgs/applications/science/robotics/apmplanner2/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "apmplanner2-${version}";
- # TODO revert Qt59 to Qt5 in pkgs/top-level/all-packages.nix on next release
- version = "2.0.26";
+ # TODO revert Qt511 to Qt5 in pkgs/top-level/all-packages.nix on next release
+ version = "2.0.27-rc1";
src = fetchFromGitHub {
owner = "ArduPilot";
repo = "apm_planner";
rev = "${version}";
- sha256 = "0bnyi1r8k8ij5sq2zqv7mfbrxm0xdw97qrx3sk4rinqv2g6h6di4";
+ sha256 = "1k0786mjzi49nb6yw4chh9l4dmkf9gybpxg9zqkr5yg019nyzcvd";
};
qtInputs = [
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index 58b80aae0cf..25438c81605 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -6,8 +6,12 @@
, libxkbcommon, xcbutilxrm, hicolor-icon-theme
, asciidoctor
, fontsConf
+, gtk3Support ? false, gtk3 ? null
}:
+# needed for beautiful.gtk to work
+assert gtk3Support -> gtk3 != null;
+
with luaPackages; stdenv.mkDerivation rec {
name = "awesome-${version}";
version = "4.3";
@@ -42,7 +46,8 @@ with luaPackages; stdenv.mkDerivation rec {
xorg.libXau xorg.libXdmcp xorg.libxcb xorg.libxshmfence
xorg.xcbutil xorg.xcbutilimage xorg.xcbutilkeysyms
xorg.xcbutilrenderutil xorg.xcbutilwm libxkbcommon
- xcbutilxrm ];
+ xcbutilxrm ]
+ ++ stdenv.lib.optional gtk3Support gtk3;
#cmakeFlags = "-DGENERATE_MANPAGES=ON";
cmakeFlags = "-DOVERRIDE_VERSION=${version}";
@@ -54,7 +59,7 @@ with luaPackages; stdenv.mkDerivation rec {
LUA_PATH = "${lgi}/share/lua/${lua.luaversion}/?.lua;;";
postInstall = ''
- # Don't use wrapProgram or or the wrapper will duplicate the --search
+ # Don't use wrapProgram or the wrapper will duplicate the --search
# arguments every restart
mv "$out/bin/awesome" "$out/bin/.awesome-wrapped"
makeWrapper "$out/bin/.awesome-wrapped" "$out/bin/awesome" \
diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix
index 89d72f512f7..2fb32b2324f 100644
--- a/pkgs/build-support/fetchpatch/default.nix
+++ b/pkgs/build-support/fetchpatch/default.nix
@@ -5,6 +5,10 @@
# stripLen acts as the -p parameter when applying a patch.
{ lib, fetchurl, buildPackages }:
+let
+ # 0.3.4 would change hashes: https://github.com/NixOS/nixpkgs/issues/25154
+ patchutils = buildPackages.patchutils_0_3_3;
+in
{ stripLen ? 0, extraPrefix ? null, excludes ? [], includes ? [], revert ? false, ... }@args:
fetchurl ({
@@ -14,10 +18,10 @@ fetchurl ({
echo "error: Fetched patch file '$out' is empty!" 1>&2
exit 1
fi
- "${buildPackages.patchutils}/bin/lsdiff" "$out" \
+ "${patchutils}/bin/lsdiff" "$out" \
| sort -u | sed -e 's/[*?]/\\&/g' \
| xargs -I{} \
- "${buildPackages.patchutils}/bin/filterdiff" \
+ "${patchutils}/bin/filterdiff" \
--include={} \
--strip=${toString stripLen} \
${lib.optionalString (extraPrefix != null) ''
@@ -32,7 +36,7 @@ fetchurl ({
cat "$out" 1>&2
exit 1
fi
- ${buildPackages.patchutils}/bin/filterdiff \
+ ${patchutils}/bin/filterdiff \
-p1 \
${builtins.toString (builtins.map (x: "-x ${lib.escapeShellArg x}") excludes)} \
${builtins.toString (builtins.map (x: "-i ${lib.escapeShellArg x}") includes)} \
@@ -46,7 +50,7 @@ fetchurl ({
exit 1
fi
'' + lib.optionalString revert ''
- ${buildPackages.patchutils}/bin/interdiff "$out" /dev/null > "$tmpfile"
+ ${patchutils}/bin/interdiff "$out" /dev/null > "$tmpfile"
mv "$tmpfile" "$out"
'' + (args.postFetch or "");
meta.broken = excludes != [] && includes != [];
diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index e498417adf0..f56ce7bb87d 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -79,7 +79,6 @@ rec {
(test -n "$executable" && chmod +x "$n") || true
'';
-
/*
* Writes a text file to nix store with no optional parameters available.
*
@@ -92,6 +91,7 @@ rec {
*
*/
writeText = name: text: writeTextFile {inherit name text;};
+
/*
* Writes a text file to nix store in a specific directory with no
* optional parameters available. Name passed is the destination.
@@ -105,6 +105,7 @@ rec {
*
*/
writeTextDir = name: text: writeTextFile {inherit name text; destination = "/${name}";};
+
/*
* Writes a text file to /nix/store/ and marks the file as executable.
*
@@ -117,13 +118,14 @@ rec {
*
*/
writeScript = name: text: writeTextFile {inherit name text; executable = true;};
+
/*
* Writes a text file to /nix/store//bin/ and
* marks the file as executable.
*
* Example:
* # Writes my-file to /nix/store//bin/my-file and makes executable.
- * writeScript "my-file"
+ * writeScriptBin "my-file"
* ''
* Contents of File
* '';
@@ -132,12 +134,38 @@ rec {
writeScriptBin = name: text: writeTextFile {inherit name text; executable = true; destination = "/bin/${name}";};
/*
- * Writes a Shell script and check its syntax. Automatically includes interpreter
- * above the contents passed.
+ * Similar to writeScript. Writes a Shell script and checks its syntax.
+ * Automatically includes interpreter above the contents passed.
+ *
+ * Example:
+ * # Writes my-file to /nix/store//my-file and makes executable.
+ * writeShellScript "my-file"
+ * ''
+ * Contents of File
+ * '';
+ *
+ */
+ writeShellScript = name: text:
+ writeTextFile {
+ inherit name;
+ executable = true;
+ text = ''
+ #!${runtimeShell}
+ ${text}
+ '';
+ checkPhase = ''
+ ${stdenv.shell} -n $out
+ '';
+ };
+
+ /*
+ * Similar to writeShellScript and writeScriptBin.
+ * Writes an executable Shell script to /nix/store//bin/ and checks its syntax.
+ * Automatically includes interpreter above the contents passed.
*
* Example:
* # Writes my-file to /nix/store//bin/my-file and makes executable.
- * writeScript "my-file"
+ * writeShellScriptBin "my-file"
* ''
* Contents of File
* '';
diff --git a/pkgs/desktops/deepin/dde-polkit-agent/dde-polkit-agent.plugins-dir.patch b/pkgs/desktops/deepin/dde-polkit-agent/dde-polkit-agent.plugins-dir.patch
new file mode 100644
index 00000000000..a6941e975eb
--- /dev/null
+++ b/pkgs/desktops/deepin/dde-polkit-agent/dde-polkit-agent.plugins-dir.patch
@@ -0,0 +1,42 @@
+From 4f457d38e9e75bc97ee7dba633bf0cdd61b8cd5b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?=
+Date: Fri, 19 Apr 2019 22:01:16 -0300
+Subject: [PATCH] Use an environment variable to find plugins
+
+---
+ pluginmanager.cpp | 18 ++++++++++++------
+ 1 file changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/pluginmanager.cpp b/pluginmanager.cpp
+index 0c03237..79bdf86 100644
+--- a/pluginmanager.cpp
++++ b/pluginmanager.cpp
+@@ -34,13 +34,19 @@ QList PluginManager::reduceGetOptions(const QString &actionID)
+ void PluginManager::load()
+ {
+
+- QDir dir("/usr/lib/polkit-1-dde/plugins/");
+- QFileInfoList pluginFiles = dir.entryInfoList((QStringList("*.so")));
++ QStringList pluginsDirs = QProcessEnvironment::systemEnvironment().value("DDE_POLKIT_PLUGINS_DIRS").split(QDir::listSeparator(), QString::SkipEmptyParts);
++ pluginsDirs.append("/usr/lib/polkit-1-dde/plugins/");
+
+- for (const QFileInfo &pluginFile : pluginFiles) {
+- AgentExtension *plugin = loadFile(pluginFile.absoluteFilePath());
+- if (plugin)
+- m_plugins << plugin;
++ for (const QString &dirName : pluginsDirs) {
++ QDir dir(dirName);
++
++ QFileInfoList pluginFiles = dir.entryInfoList((QStringList("*.so")));
++
++ for (const QFileInfo &pluginFile : pluginFiles) {
++ AgentExtension *plugin = loadFile(pluginFile.absoluteFilePath());
++ if (plugin)
++ m_plugins << plugin;
++ }
+ }
+ }
+
+--
+2.21.0
+
diff --git a/pkgs/desktops/deepin/dde-polkit-agent/default.nix b/pkgs/desktops/deepin/dde-polkit-agent/default.nix
index 2c5dfa33053..da54fcdb64d 100644
--- a/pkgs/desktops/deepin/dde-polkit-agent/default.nix
+++ b/pkgs/desktops/deepin/dde-polkit-agent/default.nix
@@ -27,6 +27,10 @@ stdenv.mkDerivation rec {
polkit-qt
];
+ patches = [
+ ./dde-polkit-agent.plugins-dir.patch
+ ];
+
postPatch = ''
searchHardCodedPaths
patchShebangs translate_generation.sh
diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix
index 8c4f69f3fb5..85631f03e1d 100644
--- a/pkgs/desktops/mate/mate-calc/default.nix
+++ b/pkgs/desktops/mate/mate-calc/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "mate-calc-${version}";
- version = "1.22.0";
+ version = "1.22.1";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1njk6v7z3969ikvcrabr1lw5f5572vb14w064zm3mydj8cc5inlr";
+ sha256 = "0zin3w03zrkpb12rvay23bfk9fnjpybkr5mqzkpn9xfnqamhk8ld";
};
nativeBuildInputs = [
diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix
index b15e1a9aa30..5c4e570fcb8 100644
--- a/pkgs/development/compilers/dmd/default.nix
+++ b/pkgs/development/compilers/dmd/default.nix
@@ -103,8 +103,7 @@ stdenv.mkDerivation rec {
checkPhase = ''
cd dmd
- # https://github.com/NixOS/nixpkgs/pull/55998#issuecomment-465871846
- #make -j$NIX_BUILD_CORES -C test -f Makefile PIC=1 CC=$CXX DMD=${pathToDmd} BUILD=release SHELL=$SHELL
+ make -j$NIX_BUILD_CORES -C test -f Makefile PIC=1 CC=$CXX DMD=${pathToDmd} BUILD=release SHELL=$SHELL
cd ../druntime
make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=1 DMD=${pathToDmd} BUILD=release
cd ../phobos
diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix
index 96a7f74f265..3cb0d7430ab 100644
--- a/pkgs/development/compilers/graalvm/default.nix
+++ b/pkgs/development/compilers/graalvm/default.nix
@@ -270,7 +270,7 @@ in rec {
'';
dontFixup = true; # do not nuke path of ffmpeg etc
dontStrip = true; # why? see in oraclejdk derivation
- inherit (openjdk) meta;
+ meta = openjdk.meta // { inherit (graalvm8.meta) platforms; };
inherit (openjdk) postFixup;
};
diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix
index 043347889c8..b3cf84fdd0f 100644
--- a/pkgs/development/compilers/ldc/default.nix
+++ b/pkgs/development/compilers/ldc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, ninja, llvm, llvm_8, curl, tzdata
+{ stdenv, fetchurl, cmake, ninja, llvm_5, llvm_8, curl, tzdata
, python, libconfig, lit, gdb, unzip, darwin, bash
, callPackage, makeWrapper, targetPackages
, bootstrapVersion ? false
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional (!bootstrapVersion && stdenv.hostPlatform.isDarwin) [
# https://github.com/NixOS/nixpkgs/issues/57120
# https://github.com/NixOS/nixpkgs/pull/59197#issuecomment-481972515
- llvm
+ llvm_5
]
++ stdenv.lib.optional (!bootstrapVersion && !stdenv.hostPlatform.isDarwin) [
@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
]
++ stdenv.lib.optional (bootstrapVersion) [
- libconfig llvm
+ libconfig llvm_5
]
++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [
@@ -150,7 +150,7 @@ stdenv.mkDerivation rec {
else
"";
- doCheck = !bootstrapVersion && !stdenv.isDarwin;
+ doCheck = !bootstrapVersion;
checkPhase = stdenv.lib.optionalString doCheck ''
# Build default lib test runners
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 474b5f54d92..abf2760075b 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -54,11 +54,12 @@ self: super: {
hashable-time = doJailbreak super.hashable-time;
integer-logarithms = doJailbreak super.integer-logarithms;
lucid = doJailbreak super.lucid;
+ parallel = doJailbreak super.parallel;
quickcheck-instances = doJailbreak super.quickcheck-instances;
split = doJailbreak super.split;
tasty-expected-failure = doJailbreak super.tasty-expected-failure;
test-framework = doJailbreak super.test-framework;
- th-lift = doJailbreak super.th-lift_0_8;
+ th-lift = self.th-lift_0_8_0_1;
# These packages don't work and need patching and/or an update.
primitive = overrideSrc (doJailbreak super.primitive) {
@@ -93,7 +94,7 @@ self: super: {
buildTools = with pkgs; [autoconf];
preConfigure = "autoreconf --install";
});
- dlist = appendPatch super.dlist (pkgs.fetchpatch {
+ dlist = appendPatch (doJailbreak super.dlist) (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/dlist-0.8.0.6.patch";
sha256 = "0lkhibfxfk6mi796mrjgmbb50hbyjgc7xdinci64dahj8325jlpc";
});
@@ -129,7 +130,7 @@ self: super: {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/haskell-src-exts-1.21.0.patch";
sha256 = "0alb28hcsp774c9s73dgrajcb44vgv1xqfg2n5a9y2bpyngqscs3";
});
- optparse-applicative = appendPatch super.optparse-applicative (pkgs.fetchpatch {
+ optparse-applicative = appendPatch (doJailbreak super.optparse-applicative) (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/optparse-applicative-0.14.3.0.patch";
sha256 = "068sjj98jqiq3h8h03mg4w2pa11q8lxkx2i4lmxivq77xyhlwq3y";
});
@@ -159,5 +160,9 @@ self: super: {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/attoparsec-0.13.2.2.patch";
sha256 = "13i1p5g0xzxnv966nlyb77mfmxvg9jzbym1d36h1ajn045yf4igl";
});
+ aeson = appendPatch super.aeson (pkgs.fetchpatch {
+ url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/aeson-1.4.3.0.patch";
+ sha256 = "1z6wmsmc682qs3y768r0zx493dxardwbsp0wdc4dsx83c0m5x66f";
+ });
}
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index b61d13f37c2..99967aa6724 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -6849,7 +6849,6 @@ broken-packages:
- median-stream
- mediawiki
- medium-sdk-haskell
- - megaparsec-tests
- mellon-core
- mellon-gpio
- mellon-web
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 2e27285c2e2..41d94bd5309 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -9354,8 +9354,8 @@ self: {
}:
mkDerivation {
pname = "HaTeX";
- version = "3.20.0.0";
- sha256 = "0rfrmv14kcgsanpsa6wzl445jmirwbd4l3if1kl1j81mqil5z58l";
+ version = "3.20.0.1";
+ sha256 = "02v4fqrrx5fw3ggrgvanfhaawnci8c7zw9q282bmy19p5sqpj88n";
libraryHaskellDepends = [
base bytestring containers hashable matrix parsec QuickCheck text
transformers wl-pprint-extras
@@ -23215,19 +23215,22 @@ self: {
}) {};
"aeson-gadt-th" = callPackage
- ({ mkDerivation, aeson, aeson-qq, base, dependent-sum, hspec, HUnit
- , markdown-unlit, template-haskell, transformers
+ ({ mkDerivation, aeson, aeson-qq, base, containers, dependent-map
+ , dependent-sum, hspec, HUnit, markdown-unlit, template-haskell
+ , transformers
}:
mkDerivation {
pname = "aeson-gadt-th";
- version = "0.2.0.0";
- sha256 = "111bx44s451qmnk70bvmf4f1z3wmi2pnwxqmmarvaz8zl4sw91c5";
+ version = "0.2.1.0";
+ sha256 = "09529lpjmm7hpqwrs3w8z1d6zzy4dw5wyqyx88ra68wf2a5nlwsh";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson base dependent-sum template-haskell transformers
+ aeson base containers dependent-sum template-haskell transformers
+ ];
+ executableHaskellDepends = [
+ aeson base dependent-map dependent-sum
];
- executableHaskellDepends = [ aeson base dependent-sum ];
executableToolDepends = [ markdown-unlit ];
testHaskellDepends = [
aeson aeson-qq base dependent-sum hspec HUnit
@@ -28373,8 +28376,8 @@ self: {
pname = "ansi-wl-pprint";
version = "0.6.8.2";
sha256 = "0gnb4mkqryv08vncxnj0bzwcnd749613yw3cxfzw6y3nsldp4c56";
- revision = "1";
- editedCabalFile = "00b704rygy4ap540jj3ry7cgiqwwi5zx9nhj7c3905m6n6v3in88";
+ revision = "2";
+ editedCabalFile = "0xq83bwya8mfijp3dn9zfsqbbkl1wpzfjcmnkw8a06icjh9vg458";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ ansi-terminal base ];
@@ -32058,8 +32061,8 @@ self: {
}:
mkDerivation {
pname = "atlassian-connect-core";
- version = "0.8.0.0";
- sha256 = "1gja0q9bxr86wd4cwi6w4iv5bimb37jk7gy5bzc727fp2k75ja42";
+ version = "0.8.0.1";
+ sha256 = "1h2702rkygjjjni9qfxhmnk49g2182s0js5dx8j0hvdpkg9w4q0l";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson atlassian-connect-descriptor base base64-bytestring
@@ -32559,8 +32562,8 @@ self: {
pname = "attoparsec";
version = "0.13.2.2";
sha256 = "0j6qcwd146yzlkc9mcvzvnixsyl65n2a68l28322q5v9p4g4g4yx";
- revision = "2";
- editedCabalFile = "1j06na26rsahrbkzrs71nl7ym8fk390pnvh577wlxs4ik6hsn2va";
+ revision = "3";
+ editedCabalFile = "1birva836xdp92lf1v5yrs8lj3bgj9vnarrfh2ssfxxacqj1gjji";
libraryHaskellDepends = [
array base bytestring containers deepseq scientific text
transformers
@@ -32982,8 +32985,8 @@ self: {
}:
mkDerivation {
pname = "aur";
- version = "6.1.0";
- sha256 = "1wgff9vbp8sxqa0hyd6ifkld6yly20qijm15dfk72wpcsia86jx6";
+ version = "6.1.0.1";
+ sha256 = "02qr5jmp2i1dn1wx9nsflrp81gnx32yvsvmbzxany5ab78g52gsz";
libraryHaskellDepends = [
aeson base errors http-client servant servant-client text
];
@@ -33396,8 +33399,8 @@ self: {
pname = "avers";
version = "0.0.17.1";
sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v";
- revision = "30";
- editedCabalFile = "0z7awvdz7447gjgg98z8682d7q1gqn85qcm0dsdgrhv67rkfnadz";
+ revision = "31";
+ editedCabalFile = "03nzgni96r6yfmn196iya6akrzh46njqzd2873aj341ynfaqjyy1";
libraryHaskellDepends = [
aeson attoparsec base bytestring clock containers cryptonite
filepath inflections memory MonadRandom mtl network network-uri
@@ -35166,6 +35169,8 @@ self: {
pname = "base-compat-batteries";
version = "0.10.5";
sha256 = "1vkhc639vqiv5p39jn1v312z32i7yk5q2lf0ap4jxl1v8p8wyp8p";
+ revision = "1";
+ editedCabalFile = "15sn2qc8k0hxbb2nai341kkrci98hlhzcj2ci087m0zxcg5jcdbp";
libraryHaskellDepends = [ base base-compat ];
testHaskellDepends = [ base hspec QuickCheck ];
testToolDepends = [ hspec-discover ];
@@ -35641,10 +35646,8 @@ self: {
({ mkDerivation, base, deepseq, generics-sop, QuickCheck, text }:
mkDerivation {
pname = "basic-sop";
- version = "0.2.0.2";
- sha256 = "0cd5zlv3w3r99ck5cz43kppand0n9vx26g4d4fqqcmvjxk8zwhy7";
- revision = "1";
- editedCabalFile = "0rvhcbywgpidnq1vg79a9scq6hraqdyv67j63vyidm0q20ml5mpv";
+ version = "0.2.0.3";
+ sha256 = "1aa3iwfbhqczmnnribz79nns5ppc397pwv4hx277jbfdxx0m8ks8";
libraryHaskellDepends = [
base deepseq generics-sop QuickCheck text
];
@@ -37566,6 +37569,38 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "binary-tagged_0_1_5_2" = callPackage
+ ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors
+ , binary, binary-orphans, bytestring, containers, criterion
+ , deepseq, generics-sop, hashable, nats, quickcheck-instances
+ , scientific, semigroups, SHA, tagged, tasty, tasty-quickcheck
+ , text, time, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "binary-tagged";
+ version = "0.1.5.2";
+ sha256 = "04yy7af7iv6i4wbv69j9vldk8c2xaxd9vz3cg0j1dn7h4dmwwbsz";
+ libraryHaskellDepends = [
+ aeson array base base16-bytestring binary bytestring containers
+ generics-sop hashable scientific SHA tagged text time
+ unordered-containers vector
+ ];
+ testHaskellDepends = [
+ aeson array base base16-bytestring bifunctors binary binary-orphans
+ bytestring containers generics-sop hashable quickcheck-instances
+ scientific SHA tagged tasty tasty-quickcheck text time
+ unordered-containers vector
+ ];
+ benchmarkHaskellDepends = [
+ aeson array base base16-bytestring binary binary-orphans bytestring
+ containers criterion deepseq generics-sop hashable nats scientific
+ semigroups SHA tagged text time unordered-containers vector
+ ];
+ description = "Tagged binary serialisation";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"binary-tree" = callPackage
({ mkDerivation, base, ChasingBottoms, checkers, criterion, deepseq
, doctest, ghc-prim, HUnit, QuickCheck, random, test-framework
@@ -38794,8 +38829,8 @@ self: {
}:
mkDerivation {
pname = "birch-beer";
- version = "0.1.1.1";
- sha256 = "0gr7hqjdv9c5adghzf6jakwkhhpmza9a28bdcgrll02lsz8yb44g";
+ version = "0.1.2.0";
+ sha256 = "0xqx7y0nv80wywp6ybcb23z77plizfvv6rk04gkykcpfjna6ijai";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -41377,8 +41412,8 @@ self: {
pname = "bound";
version = "2.0.1";
sha256 = "0xmvkwambzmji1czxipl9cms5l3v98765b9spmb3wn5n6dpj0ji9";
- revision = "6";
- editedCabalFile = "18fqzxy3f8r09jwcsfzjlrpvnlz711jq5gcjp4dal1pvsbbw6i09";
+ revision = "7";
+ editedCabalFile = "0amr5rpq8andqq3z2dsh8hn67g3x7ykcmqq899vbkxwnpvg60h5r";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
base bifunctors binary bytes cereal comonad deepseq hashable mmorph
@@ -43613,6 +43648,28 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "bytestring-strict-builder_0_4_5_2" = callPackage
+ ({ mkDerivation, base, base-prelude, bytestring, criterion
+ , QuickCheck, quickcheck-instances, rerebase, semigroups, tasty
+ , tasty-hunit, tasty-quickcheck
+ }:
+ mkDerivation {
+ pname = "bytestring-strict-builder";
+ version = "0.4.5.2";
+ sha256 = "14l5q4wgx3fpysindlapf2binhy6svsc904c8x052v095p6gn9c2";
+ libraryHaskellDepends = [
+ base base-prelude bytestring semigroups
+ ];
+ testHaskellDepends = [
+ QuickCheck quickcheck-instances rerebase tasty tasty-hunit
+ tasty-quickcheck
+ ];
+ benchmarkHaskellDepends = [ criterion rerebase ];
+ description = "An efficient strict bytestring builder";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"bytestring-substring" = callPackage
({ mkDerivation, base, bytestring, pipes, primitive }:
mkDerivation {
@@ -43679,6 +43736,30 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "bytestring-tree-builder_0_2_7_3" = callPackage
+ ({ mkDerivation, base, base-prelude, bytestring, criterion, deepseq
+ , QuickCheck, quickcheck-instances, semigroups, tasty, tasty-hunit
+ , tasty-quickcheck, text
+ }:
+ mkDerivation {
+ pname = "bytestring-tree-builder";
+ version = "0.2.7.3";
+ sha256 = "0v78jwzmpipw4iyr0i9klxhcfxf98vljxz3had1xklslhzsabk16";
+ libraryHaskellDepends = [
+ base base-prelude bytestring semigroups text
+ ];
+ testHaskellDepends = [
+ base-prelude bytestring QuickCheck quickcheck-instances tasty
+ tasty-hunit tasty-quickcheck
+ ];
+ benchmarkHaskellDepends = [
+ base-prelude bytestring criterion deepseq
+ ];
+ description = "A very efficient ByteString builder implementation based on the binary tree";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"bytestring-trie" = callPackage
({ mkDerivation, base, binary, bytestring }:
mkDerivation {
@@ -44127,8 +44208,8 @@ self: {
}:
mkDerivation {
pname = "cabal-cache";
- version = "1.0.0.3";
- sha256 = "0gp81yd418chcy06dhp24vh54ji509k3jriks4xyc9dp4vblsnss";
+ version = "1.0.0.7";
+ sha256 = "1r1qz3nrh2k4gx6j6iiw3gvcflkl9l5yk81nj0c2snrz8wgsq28b";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -44142,8 +44223,8 @@ self: {
executableHaskellDepends = [ base optparse-applicative ];
testHaskellDepends = [
aeson antiope-core antiope-s3 base bytestring containers filepath
- generic-lens hedgehog hspec hw-hedgehog hw-hspec-hedgehog lens
- raw-strings-qq text
+ generic-lens hedgehog hspec http-types hw-hedgehog
+ hw-hspec-hedgehog lens raw-strings-qq text
];
testToolDepends = [ hspec-discover ];
description = "CI Assistant for Haskell projects";
@@ -44446,8 +44527,8 @@ self: {
pname = "cabal-install";
version = "2.4.1.0";
sha256 = "1b91rcs00wr5mf55c6xl8hrxmymlq72w71qm5r0q4j869asv5g39";
- revision = "2";
- editedCabalFile = "18llmvfaf8gcz2dvhhs3j0a6kzzisajh1bms7wwnrl0hi4xyx012";
+ revision = "3";
+ editedCabalFile = "1mnm6mfrgavq3blvkm3wz45pqrj10apjihg1g9cds58qp19m9r1h";
isLibrary = false;
isExecutable = true;
setupHaskellDepends = [ base Cabal filepath process ];
@@ -44716,15 +44797,15 @@ self: {
license = stdenv.lib.licenses.gpl3;
}) {};
- "cabal-rpm_0_13_2" = callPackage
+ "cabal-rpm_0_13_3" = callPackage
({ mkDerivation, base, bytestring, Cabal, directory, filepath
, http-client, http-client-tls, http-conduit, process, simple-cmd
, time, unix
}:
mkDerivation {
pname = "cabal-rpm";
- version = "0.13.2";
- sha256 = "1q4nqmxd0cn023nm8dnlh40wqk3n7cd5v873bawhv6gmysgyxhn7";
+ version = "0.13.3";
+ sha256 = "04d5m74i0r6livhkhmccrwhshpa2aizyb77i2qcqhxradw0lkvl4";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -49241,6 +49322,8 @@ self: {
pname = "chronos";
version = "1.0.5";
sha256 = "0274b5qv1wf52vsdjm1siksh07qgdgid0a9316b7nab2gc7jgpdz";
+ revision = "2";
+ editedCabalFile = "02szph6d6x1s866p0qzq0by68r4vpxcwmk1l3pfmpqrxl9c038yz";
libraryHaskellDepends = [
aeson attoparsec base bytestring clock hashable primitive
semigroups text torsor vector
@@ -55800,6 +55883,42 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "configuration-tools_0_4_1" = callPackage
+ ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
+ , base-unicode-symbols, base64-bytestring, bytestring, Cabal
+ , case-insensitive, connection, data-default, deepseq, directory
+ , dlist, enclosed-exceptions, filepath, http-client
+ , http-client-tls, http-types, monad-control, mtl, network-uri
+ , optparse-applicative, process, profunctors, semigroupoids
+ , semigroups, text, tls, transformers, unordered-containers, wai
+ , warp, warp-tls, x509, x509-system, x509-validation, yaml
+ }:
+ mkDerivation {
+ pname = "configuration-tools";
+ version = "0.4.1";
+ sha256 = "1c6yk6516v4ld8rmhwg4s4f3s6k40gx3dsqfrl2y9lcx3477nlj8";
+ setupHaskellDepends = [
+ base bytestring Cabal directory filepath process
+ ];
+ libraryHaskellDepends = [
+ aeson ansi-wl-pprint attoparsec base base-unicode-symbols
+ base64-bytestring bytestring Cabal case-insensitive connection
+ data-default deepseq directory dlist enclosed-exceptions filepath
+ http-client http-client-tls http-types monad-control mtl
+ network-uri optparse-applicative process profunctors semigroupoids
+ semigroups text tls transformers unordered-containers x509
+ x509-system x509-validation yaml
+ ];
+ testHaskellDepends = [
+ base base-unicode-symbols bytestring Cabal enclosed-exceptions
+ http-types monad-control mtl text transformers unordered-containers
+ wai warp warp-tls yaml
+ ];
+ description = "Tools for specifying and parsing configurations";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"configurator" = callPackage
({ mkDerivation, attoparsec, base, bytestring, directory, filepath
, hashable, HUnit, test-framework, test-framework-hunit, text
@@ -56263,6 +56382,8 @@ self: {
pname = "constraints";
version = "0.10.1";
sha256 = "1xy3vv78jxc17hm0z7qqspxjwv7l2jbcbj670yrl2f053qkfr02q";
+ revision = "1";
+ editedCabalFile = "1i2rd805mjz5q7s98ryy1m91zd4b9hx92gw1rwr6kpibqqw9smcb";
libraryHaskellDepends = [
base binary deepseq ghc-prim hashable mtl semigroups transformers
transformers-compat
@@ -56273,6 +56394,26 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
+ "constraints_0_11" = callPackage
+ ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, hspec
+ , hspec-discover, mtl, semigroups, transformers
+ , transformers-compat
+ }:
+ mkDerivation {
+ pname = "constraints";
+ version = "0.11";
+ sha256 = "1ik97w6ci9kw5ppw9nmh65j6ldqq2az8c37jlg3h5x3prn2cds1d";
+ libraryHaskellDepends = [
+ base binary deepseq ghc-prim hashable mtl semigroups transformers
+ transformers-compat
+ ];
+ testHaskellDepends = [ base hspec ];
+ testToolDepends = [ hspec-discover ];
+ description = "Constraint manipulation";
+ license = stdenv.lib.licenses.bsd2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"constraints-deriving" = callPackage
({ mkDerivation, base, bytestring, Cabal, filepath, ghc, ghc-paths
, path, path-io
@@ -57778,8 +57919,8 @@ self: {
pname = "country";
version = "0.1.6";
sha256 = "0a4r2jnp15xy18s6xpd4p10cgq3hd8qqzhy5lakmzymivwq6xcq9";
- revision = "1";
- editedCabalFile = "04a2s0zlm4garihnm3xl9avf88vjnbvpsyb2ckk3z7ydjq0y3938";
+ revision = "2";
+ editedCabalFile = "0721d9nc2snr6046ybmdj80xas7627lwd1ym6h1n8lclihw7ll6d";
libraryHaskellDepends = [
aeson attoparsec base bytestring deepseq ghc-prim hashable
primitive scientific text unordered-containers
@@ -57930,10 +58071,8 @@ self: {
}:
mkDerivation {
pname = "cpkg";
- version = "0.1.3.1";
- sha256 = "1myivznx5p2c8zw5frvp9drj7gidanq39r7lh11xyxg4rsw1y89n";
- revision = "1";
- editedCabalFile = "1ww05lik01k44xfrmjjs542qd66afisx6gglwqsylil86hjbs6gp";
+ version = "0.2.0.0";
+ sha256 = "1ip6wm76v39zj5r07y74d9ddrzxiyrl3fnlm3z464brgydsd8iby";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -59732,8 +59871,8 @@ self: {
pname = "cryptoids-types";
version = "1.0.0";
sha256 = "0dhv92hdydhhgwgdihl3wpiyxl10szrgfnb68ygn07xxhmmfc3hf";
- revision = "1";
- editedCabalFile = "0fy6fxzaimgi0nrplzdgi0s26cjz2nrv7y5gdnk0z6k3jd1x5qgb";
+ revision = "2";
+ editedCabalFile = "0nszxjdf9zd7dh4ar2vbnjs8a5awbqh2m3p0pvsypgiflcrlp9wn";
libraryHaskellDepends = [
aeson base binary deepseq hashable http-api-data path-pieces
];
@@ -66415,7 +66554,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "dhall_1_22_0" = callPackage
+ "dhall_1_23_0" = callPackage
({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base
, bytestring, case-insensitive, cborg, cborg-json, containers
, contravariant, criterion, cryptonite, deepseq, Diff, directory
@@ -66425,12 +66564,13 @@ self: {
, prettyprinter, prettyprinter-ansi-terminal, QuickCheck
, quickcheck-instances, repline, scientific, serialise, tasty
, tasty-hunit, tasty-quickcheck, template-haskell, text
- , transformers, turtle, unordered-containers, uri-encode, vector
+ , transformers, transformers-compat, turtle, unordered-containers
+ , uri-encode, vector
}:
mkDerivation {
pname = "dhall";
- version = "1.22.0";
- sha256 = "0f80vxry3vns6kyviradvpn32nkcl51lva5j2naakdg9kgcq4xxz";
+ version = "1.23.0";
+ sha256 = "074xpiag5csg08s9g9lcymi2mhvlwgjpqzmg7bw190mdpb8vk9zd";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -66440,8 +66580,8 @@ self: {
http-types lens-family-core megaparsec memory mtl
optparse-applicative parsers prettyprinter
prettyprinter-ansi-terminal repline scientific serialise
- template-haskell text transformers unordered-containers uri-encode
- vector
+ template-haskell text transformers transformers-compat
+ unordered-containers uri-encode vector
];
executableHaskellDepends = [ base ];
testHaskellDepends = [
@@ -69728,6 +69868,8 @@ self: {
pname = "dlist";
version = "0.8.0.6";
sha256 = "0gy70df86pfmqwbmnafdw2w5jnflvn5mca8npxzfg23f3p4ll2vq";
+ revision = "1";
+ editedCabalFile = "0f3r78gjdrhg5zg693dgdfx78ds6vbp5bg1sws1y1vbamraa65sf";
libraryHaskellDepends = [ base deepseq ];
testHaskellDepends = [ base Cabal QuickCheck ];
description = "Difference lists";
@@ -69754,8 +69896,8 @@ self: {
pname = "dlist-nonempty";
version = "0.1.1";
sha256 = "0csbspdy43pzvasb5mhs5pz2f49ws78pi253cx7pp84wjx6ads20";
- revision = "4";
- editedCabalFile = "10kkj4sf1bn87z6744p9gn6mkciqri2d3l9vmg9ylpi8g7priil2";
+ revision = "5";
+ editedCabalFile = "01x05d62y8f3kippxawra3fdr7jdms3zcgd7c4n8wf39np9wy556";
libraryHaskellDepends = [
base base-compat deepseq dlist semigroupoids
];
@@ -83243,6 +83385,8 @@ self: {
pname = "foldl";
version = "1.4.5";
sha256 = "19qjmzc7gaxfwgqbgy0kq4vhbxvh3qjnwsxnc7pzwws2if5bv80b";
+ revision = "2";
+ editedCabalFile = "080v2qwck5k9jfix55bv04h9m9ci14kgdrjbrssab2wgraxpyjvz";
libraryHaskellDepends = [
base bytestring comonad containers contravariant hashable
mwc-random primitive profunctors semigroupoids semigroups text
@@ -88058,6 +88202,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "generics-sop_0_5_0_0" = callPackage
+ ({ mkDerivation, base, criterion, deepseq, ghc-prim, sop-core
+ , template-haskell
+ }:
+ mkDerivation {
+ pname = "generics-sop";
+ version = "0.5.0.0";
+ sha256 = "18dkdain2g46b1637f3pbv0fkzg4b1a8frm16hfqvhpfk46i7rzc";
+ libraryHaskellDepends = [
+ base ghc-prim sop-core template-haskell
+ ];
+ testHaskellDepends = [ base ];
+ benchmarkHaskellDepends = [
+ base criterion deepseq template-haskell
+ ];
+ description = "Generic Programming using True Sums of Products";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"generics-sop-lens" = callPackage
({ mkDerivation, base, generics-sop, lens }:
mkDerivation {
@@ -88071,6 +88235,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "generics-sop-lens_0_1_3" = callPackage
+ ({ mkDerivation, base, generics-sop, lens }:
+ mkDerivation {
+ pname = "generics-sop-lens";
+ version = "0.1.3";
+ sha256 = "1dk2v2ax2cryxpmgdv0bbawdfd30is3b5vzylhy9rr7bb5727vay";
+ libraryHaskellDepends = [ base generics-sop lens ];
+ description = "Lenses for types in generics-sop";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"genericserialize" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -88606,6 +88782,28 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "genvalidity-hspec-hashable_0_2_0_4" = callPackage
+ ({ mkDerivation, base, doctest, genvalidity, genvalidity-hspec
+ , genvalidity-property, hashable, hspec, hspec-core, QuickCheck
+ , validity
+ }:
+ mkDerivation {
+ pname = "genvalidity-hspec-hashable";
+ version = "0.2.0.4";
+ sha256 = "1vyd14cmsj54kbfbidgsy8r695zza635bxwg2i95gl1i314dzy1n";
+ libraryHaskellDepends = [
+ base genvalidity genvalidity-hspec genvalidity-property hashable
+ hspec QuickCheck validity
+ ];
+ testHaskellDepends = [
+ base doctest genvalidity genvalidity-hspec genvalidity-property
+ hashable hspec hspec-core QuickCheck validity
+ ];
+ description = "Standard spec's for Hashable instances";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"genvalidity-hspec-optics" = callPackage
({ mkDerivation, base, doctest, genvalidity, genvalidity-hspec
, genvalidity-property, hspec, microlens, QuickCheck, validity
@@ -90181,6 +90379,21 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "ghc-syntax-highlighter_0_0_4_0" = callPackage
+ ({ mkDerivation, base, ghc, hspec, hspec-discover, text }:
+ mkDerivation {
+ pname = "ghc-syntax-highlighter";
+ version = "0.0.4.0";
+ sha256 = "1kw1h7n4ydn1klzll24nwwg405j23wry9hg8g96vba51vah0wc47";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [ base ghc text ];
+ testHaskellDepends = [ base hspec text ];
+ testToolDepends = [ hspec-discover ];
+ description = "Syntax highlighter for Haskell using lexer of GHC itself";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ghc-tcplugins-extra" = callPackage
({ mkDerivation, base, ghc }:
mkDerivation {
@@ -98734,8 +98947,8 @@ self: {
}:
mkDerivation {
pname = "grouped-list";
- version = "0.2.2.0";
- sha256 = "0733wmdflxpd2ryrdx4ygizyclxmbd8xmkdfs7d7s4x8hffk0k5x";
+ version = "0.2.2.1";
+ sha256 = "1bs8rkdrg82v3k08icl6fsgdyfz8m0vkvsbxpm3iym01xcfmzzal";
libraryHaskellDepends = [ base binary containers deepseq pointed ];
testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
benchmarkHaskellDepends = [ base criterion ];
@@ -101999,8 +102212,8 @@ self: {
}:
mkDerivation {
pname = "hakyll";
- version = "4.12.5.1";
- sha256 = "0zxl99qrzzngc6z08hpl4rxssb7djqdbccjay76sgq8akw40x720";
+ version = "4.12.5.2";
+ sha256 = "13dc8hj3xnnpyb395pbplwxb4pj4gzckdd8r5wcwg1ln0gd6w7d5";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -103843,6 +104056,24 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
+ "happy_1_19_10" = callPackage
+ ({ mkDerivation, array, base, Cabal, containers, directory
+ , filepath, mtl, process
+ }:
+ mkDerivation {
+ pname = "happy";
+ version = "1.19.10";
+ sha256 = "1vfaa8x6asmyabmd4i1ygyl2a8501h97xhkx3ip3jnqhjxn61sr2";
+ isLibrary = false;
+ isExecutable = true;
+ setupHaskellDepends = [ base Cabal directory filepath ];
+ executableHaskellDepends = [ array base containers mtl ];
+ testHaskellDepends = [ base process ];
+ description = "Happy is a parser generator for Haskell";
+ license = stdenv.lib.licenses.bsd2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"happy-meta" = callPackage
({ mkDerivation, array, base, containers, happy, haskell-src-meta
, mtl, template-haskell
@@ -104457,6 +104688,32 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hashable_1_3_0_0" = callPackage
+ ({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim
+ , HUnit, integer-gmp, QuickCheck, random, siphash, test-framework
+ , test-framework-hunit, test-framework-quickcheck2, text, unix
+ }:
+ mkDerivation {
+ pname = "hashable";
+ version = "1.3.0.0";
+ sha256 = "1d4sn4xjf0swrfg8pl93ipavbj12ch3a9aykhkl6mjnczc9m8bl2";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring deepseq ghc-prim integer-gmp text
+ ];
+ testHaskellDepends = [
+ base bytestring ghc-prim HUnit QuickCheck random test-framework
+ test-framework-hunit test-framework-quickcheck2 text unix
+ ];
+ benchmarkHaskellDepends = [
+ base bytestring criterion ghc-prim integer-gmp siphash text
+ ];
+ description = "A class for types that can be converted to a hash value";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hashable-extras" = callPackage
({ mkDerivation, base, bifunctors, bytestring, directory, doctest
, filepath, hashable, transformers, transformers-compat
@@ -104517,6 +104774,8 @@ self: {
pname = "hashable-time";
version = "0.2.0.2";
sha256 = "1q7y4plqqwy5286hhx2fygn12h8lqk0y047b597sbdckskxzfqgs";
+ revision = "1";
+ editedCabalFile = "1d43ia3cg9j9k1yam0w2a8b60df7xw4zydrdvk1m868ara3nlr58";
libraryHaskellDepends = [ base hashable time ];
description = "Hashable instances for Data.Time";
license = stdenv.lib.licenses.bsd3;
@@ -107890,8 +108149,8 @@ self: {
}:
mkDerivation {
pname = "haskoin-store";
- version = "0.14.5";
- sha256 = "1l1rh9xjzyj6vg9v00fz38l66f1gxfys6l34f9b0wa5534dmg1nr";
+ version = "0.14.7";
+ sha256 = "0dn0d71jdpa4dmrwmpqipkdbl2cb8w8i2p18fly3b1xhpqra20il";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -116041,6 +116300,8 @@ self: {
pname = "hmm-lapack";
version = "0.3.0.3";
sha256 = "0ng5nayyqcjd10ai1bgksavsy2ndmr3qyv32qpvz9yslds8d73xk";
+ revision = "1";
+ editedCabalFile = "02m92qv8jg9xl489x177l9bnrz3nqxbcv4936xa4xhgmfgyfs7fg";
libraryHaskellDepends = [
base boxes comfort-array containers deepseq explicit-exception
fixed-length lapack lazy-csv netlib-ffi non-empty prelude-compat
@@ -117263,8 +117524,8 @@ self: {
}:
mkDerivation {
pname = "hoogle";
- version = "5.0.17.6";
- sha256 = "0kgcgadrp02pcwp0pp56p09kvw3k9i6n4r7qsms3lagq1wcar4dv";
+ version = "5.0.17.7";
+ sha256 = "1nk255n7lwar9l70pz3z48c4fsp3a07gqhpci37iya1mw6kdnbbp";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -128048,6 +128309,8 @@ self: {
pname = "hyperloglog";
version = "0.4.2";
sha256 = "0j0hbzpap3f92kvywsxjahxmqrdj51275jdv0h7f9lf9qby3rf7m";
+ revision = "1";
+ editedCabalFile = "1zh47rrwih6933hhq9vd0ly5s42w0bn196znkg9l8q6r6drl7xsf";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
approximate base binary bits bytes cereal cereal-vector comonad
@@ -128116,8 +128379,8 @@ self: {
pname = "hyphenation";
version = "0.7.1";
sha256 = "1h5i07v2zlka29dj4zysc47p747j88x6z4zm3zwcr5i8yirm0p52";
- revision = "4";
- editedCabalFile = "0pp7qm40alsfd9z5dvp6l2c7dp9zp0skl9g0iib3jahxs3n8qcrr";
+ revision = "5";
+ editedCabalFile = "00wsp69aqi5i906liqa4sfs0p2yclhr1ihz8y1700b3ymb70lzql";
enableSeparateDataOutput = true;
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
@@ -131547,6 +131810,8 @@ self: {
pname = "intern";
version = "0.9.2";
sha256 = "081fyiq00cvx4nyagr34kwnag9njv65wdps5j4ydin6sjq7b58wk";
+ revision = "1";
+ editedCabalFile = "1mav591qx20p9dx4rg4xwpavqw8rciva82n7q0icdgvc1ayy7sl5";
libraryHaskellDepends = [
array base bytestring hashable text unordered-containers
];
@@ -131884,6 +132149,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "intervals_0_9" = callPackage
+ ({ mkDerivation, array, base, Cabal, cabal-doctest, directory
+ , distributive, doctest, filepath, ghc-prim, QuickCheck
+ , template-haskell
+ }:
+ mkDerivation {
+ pname = "intervals";
+ version = "0.9";
+ sha256 = "0v5z5h0lcsfxiz5m876b1pwygxic5l5p0ijnhzibbpzpqg1lahs4";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [ array base distributive ghc-prim ];
+ testHaskellDepends = [
+ base directory doctest filepath QuickCheck template-haskell
+ ];
+ description = "Interval Arithmetic";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"intricacy" = callPackage
({ mkDerivation, array, base, binary, bytestring, containers
, crypto-api, crypto-pubkey-types, cryptohash, directory, filepath
@@ -131931,6 +132215,8 @@ self: {
pname = "intro";
version = "0.5.2.1";
sha256 = "0i5cpa5jx82nb1gi1wdhgnbmxlb7s4nbya46k6byajf7g50i5qp8";
+ revision = "1";
+ editedCabalFile = "19zndrl4rgzjrg97cbc2cyiqih15gaijgibz0vppphcbmn7v9fl8";
libraryHaskellDepends = [
base bytestring containers deepseq dlist extra hashable mtl safe
text transformers unordered-containers writer-cps-mtl
@@ -135862,10 +136148,8 @@ self: {
}:
mkDerivation {
pname = "json-sop";
- version = "0.2.0.3";
- sha256 = "0ay2cymy4aar23cixcyqam91bs9x4z0vqiw2k0nvgy9nyqfz2r9h";
- revision = "2";
- editedCabalFile = "1lclvvcfvicr05v2nf1xkf21qry2g2bqjhd7gfhza89d571aq3gp";
+ version = "0.2.0.4";
+ sha256 = "0q1p15whyyzpggfnqm4vy9p8l12xlxmnc4d82ykxl8rxzhbjkh0i";
libraryHaskellDepends = [
aeson base generics-sop lens-sop tagged text time transformers
unordered-containers vector
@@ -136858,6 +137142,34 @@ self: {
broken = true;
}) {};
+ "kanji_3_4_0_2" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, base, containers, criterion
+ , deepseq, hashable, HUnit-approx, microlens, microlens-aeson
+ , optparse-applicative, tasty, tasty-hunit, text, transformers
+ }:
+ mkDerivation {
+ pname = "kanji";
+ version = "3.4.0.2";
+ sha256 = "017j8nwmwfbkxyaxjfp75js578kv6g5k7szsc46kidbw4l68dwmy";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base containers deepseq hashable text
+ ];
+ executableHaskellDepends = [
+ aeson aeson-pretty base containers microlens microlens-aeson
+ optparse-applicative text transformers
+ ];
+ testHaskellDepends = [
+ aeson base containers HUnit-approx tasty tasty-hunit text
+ ];
+ benchmarkHaskellDepends = [ aeson base containers criterion text ];
+ description = "Perform 漢字検定 (Japan Kanji Aptitude Test) level analysis on Japanese Kanji";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"kansas-comet" = callPackage
({ mkDerivation, aeson, base, containers, data-default-class
, scotty, stm, text, time, transformers, unordered-containers
@@ -138035,6 +138347,8 @@ self: {
pname = "keys";
version = "3.12.2";
sha256 = "1mw4c0dd21hmzhidf84p6fxrin7k05l2iz8iar3m7k5vbxihlldj";
+ revision = "1";
+ editedCabalFile = "1cx5bwd32mpqdgllrkld254a8ydks196m3j9dvm3razg8mxnz2x6";
libraryHaskellDepends = [
array base comonad containers free hashable semigroupoids
semigroups tagged transformers transformers-compat
@@ -140196,6 +140510,20 @@ self: {
broken = true;
}) {};
+ "language-csharp" = callPackage
+ ({ mkDerivation, alex, array, base, parsec, pretty, text }:
+ mkDerivation {
+ pname = "language-csharp";
+ version = "0.0.1";
+ sha256 = "1sg7i0mpq98nfwnq3rfmhd9y1lvjff99843fprif3r3ww62clp2c";
+ revision = "1";
+ editedCabalFile = "1x5pn0zr2wzhmcfs2rcdy5wjjwp2xhfg4fjs4zhglfh3svvlwpqx";
+ libraryHaskellDepends = [ array base parsec pretty text ];
+ libraryToolDepends = [ alex ];
+ description = "C# source code manipulation";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"language-css" = callPackage
({ mkDerivation, base, pretty }:
mkDerivation {
@@ -141149,6 +141477,8 @@ self: {
pname = "lapack";
version = "0.2.4";
sha256 = "16rgcxinkrkv1h35pfyrgg9xihkhpk3i2xd5f3xw29b1hahsb9hv";
+ revision = "1";
+ editedCabalFile = "0lcbih8i8rl6y9raxm77wfjb3lymivf3xicg1bslr6b5mrkyqqqh";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -142151,8 +142481,8 @@ self: {
}:
mkDerivation {
pname = "learn-physics";
- version = "0.6.3";
- sha256 = "0nhc53l963fsviw3yqz7yxwbjwxsrp8s4jckffbg6hl8npakhirh";
+ version = "0.6.4";
+ sha256 = "06f1p3rcb37lh0miih2c697w8jiciby3qgjcbjagmf91svx25mm0";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -142435,6 +142765,8 @@ self: {
pname = "lens";
version = "4.17.1";
sha256 = "1gpkc53l2cggnfrgg5k4ih82rycjbdvpj9pnbi5cq8ms0dbvs4a7";
+ revision = "1";
+ editedCabalFile = "1zknh9h72qzszwrz9h25c5ssdr2pv5z67w6kv526sk1y8rnrbxk1";
setupHaskellDepends = [ base Cabal cabal-doctest filepath ];
libraryHaskellDepends = [
array base base-orphans bifunctors bytestring call-stack comonad
@@ -142681,10 +143013,8 @@ self: {
({ mkDerivation, base, fclabels, generics-sop, transformers }:
mkDerivation {
pname = "lens-sop";
- version = "0.2.0.2";
- sha256 = "16bd95cwqiprz55s5272mv6wiw5pmv6mvihviiwbdbilhq400s3z";
- revision = "1";
- editedCabalFile = "0k7xdwj64kd56kjh7ghjwm79rjwjqxlw5nwzwj0cq5q56vb340jm";
+ version = "0.2.0.3";
+ sha256 = "0vgh6bj43qmhca6ij4b0bxqirhhfvxqd7xx5pryfs79fjghc47vv";
libraryHaskellDepends = [
base fclabels generics-sop transformers
];
@@ -142816,25 +143146,25 @@ self: {
"lentil" = callPackage
({ mkDerivation, ansi-wl-pprint, base, csv, directory, filemanip
- , filepath, hspec, natural-sort, optparse-applicative, parsec
- , pipes, regex-tdfa, semigroups, terminal-progress-bar, text
- , transformers
+ , filepath, hspec, megaparsec, mtl, natural-sort
+ , optparse-applicative, pipes, regex-tdfa, semigroups
+ , terminal-progress-bar, text
}:
mkDerivation {
pname = "lentil";
- version = "1.1.2.0";
- sha256 = "1zhn8wpm1hd50j0nc776d9f3jq46lk5d62srrd66abfkvqxfxw6b";
+ version = "1.2.2.0";
+ sha256 = "0xm3nvh5irw3nw4cn94xh8i6z63mgkiymgf99yh582rbf047dfms";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- ansi-wl-pprint base csv directory filemanip filepath natural-sort
- optparse-applicative parsec pipes regex-tdfa semigroups
- terminal-progress-bar text transformers
+ ansi-wl-pprint base csv directory filemanip filepath megaparsec mtl
+ natural-sort optparse-applicative pipes regex-tdfa semigroups
+ terminal-progress-bar text
];
testHaskellDepends = [
ansi-wl-pprint base csv directory filemanip filepath hspec
- natural-sort optparse-applicative parsec pipes regex-tdfa
- semigroups terminal-progress-bar text transformers
+ megaparsec mtl natural-sort optparse-applicative pipes regex-tdfa
+ semigroups terminal-progress-bar text
];
description = "frugal issue tracker";
license = stdenv.lib.licenses.gpl3;
@@ -144643,6 +144973,8 @@ self: {
pname = "linear";
version = "1.20.9";
sha256 = "0h7yqigq593n7wsl7nz6a5f137wznm7y679wsii0ph0zsc4v5af5";
+ revision = "1";
+ editedCabalFile = "13ff7xvw25fpsikcvf0nly2ca614wzv10qyg4sh378p5r8rvfgka";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
adjunctions base base-orphans binary bytes cereal containers
@@ -146934,8 +147266,8 @@ self: {
pname = "log-domain";
version = "0.12";
sha256 = "0zin3zgxrx8v69blqzkd5gjk0nmpmg58caqz2xa8qd4v1fjcp4bi";
- revision = "3";
- editedCabalFile = "19xc24jwfhzy3v26689sc4ma50w4ylqd378dpxphl0nrxili645z";
+ revision = "4";
+ editedCabalFile = "1z7p87dl1rj0v2gnfwfa7zmgaxccd093hvjkijc56whyg4b4az4y";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
base binary bytes cereal comonad deepseq distributive hashable
@@ -148046,8 +148378,8 @@ self: {
pname = "lrucaching";
version = "0.3.3";
sha256 = "192a2zap1bmxa2y48n48rmngf18fr8k0az4a230hziv3g795yzma";
- revision = "7";
- editedCabalFile = "0bwl2hpj0w1wg86az52iwz0afs1h99b599vdn0fgygw2ivhbvqjv";
+ revision = "8";
+ editedCabalFile = "11ad87kg09s9md9lqzhbcw19kmzvii4v97nw49q0wb0rs0qizpki";
libraryHaskellDepends = [
base base-compat deepseq hashable psqueues vector
];
@@ -148124,7 +148456,7 @@ self: {
broken = true;
}) {};
- "lsp-test_0_5_2_1" = callPackage
+ "lsp-test_0_5_2_2" = callPackage
({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base
, bytestring, conduit, conduit-parse, containers, data-default
, Diff, directory, filepath, haskell-lsp, hspec, lens, mtl
@@ -148133,8 +148465,8 @@ self: {
}:
mkDerivation {
pname = "lsp-test";
- version = "0.5.2.1";
- sha256 = "1yrcs6wln4sf8rns46q84rxhdd8la3mjpmmazp6yyhm0i288bifq";
+ version = "0.5.2.2";
+ sha256 = "0hld5xmv781nm0ix1mngjgch11bany0px923bgngp0nf6jgfz5yc";
libraryHaskellDepends = [
aeson aeson-pretty ansi-terminal base bytestring conduit
conduit-parse containers data-default Diff directory filepath
@@ -149027,6 +149359,31 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "machines_0_7" = callPackage
+ ({ mkDerivation, adjunctions, base, Cabal, cabal-doctest, comonad
+ , conduit, containers, criterion, distributive, doctest, mtl, pipes
+ , pointed, profunctors, semigroupoids, semigroups, streaming
+ , transformers, transformers-compat, void
+ }:
+ mkDerivation {
+ pname = "machines";
+ version = "0.7";
+ sha256 = "1zipij9y913j5s6pyhycv0srias9fqyvnbky3a432qb5p9sgmh0b";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ adjunctions base comonad containers distributive mtl pointed
+ profunctors semigroupoids semigroups transformers
+ transformers-compat void
+ ];
+ testHaskellDepends = [ base doctest ];
+ benchmarkHaskellDepends = [
+ base conduit criterion mtl pipes streaming
+ ];
+ description = "Networked stream transducers";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"machines-amazonka" = callPackage
({ mkDerivation, amazonka, amazonka-autoscaling, amazonka-core
, amazonka-ec2, amazonka-s3, amazonka-sts, base
@@ -152338,6 +152695,8 @@ self: {
pname = "megaparsec-tests";
version = "7.0.5";
sha256 = "11kwf122bq38qvkpvhb1pkqzbv7yk9wi7klmg9yvls29x66shiyq";
+ revision = "1";
+ editedCabalFile = "1mayv955ipg94hbsix3dvpp1c2aay860h9zpg38qjmfiaks4zpjj";
libraryHaskellDepends = [
base bytestring containers hspec hspec-expectations
hspec-megaparsec megaparsec mtl QuickCheck text transformers
@@ -152350,8 +152709,6 @@ self: {
testToolDepends = [ hspec-discover ];
description = "Test utilities and the test suite of Megaparsec";
license = stdenv.lib.licenses.bsd2;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"meldable-heap" = callPackage
@@ -152805,8 +153162,8 @@ self: {
pname = "mercury-api";
version = "0.1.0.2";
sha256 = "0ybpc1kai85rflgdr80jd8cvwxaxmbphv82nz2p17502jrmdfkhg";
- revision = "1";
- editedCabalFile = "00qvar25y8fkr5vgavjkpy24nck8njy92fiq9fxfzl0yk2c1dr0g";
+ revision = "2";
+ editedCabalFile = "02sbbiznppvdmpb373xyh8i84sywlzzvhhx5nd9ix5lmx50813qw";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -153465,6 +153822,28 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "microlens-aeson_2_3_0_4" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq
+ , hashable, microlens, scientific, tasty, tasty-hunit, text
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "microlens-aeson";
+ version = "2.3.0.4";
+ sha256 = "0w630kk5bnily1qh41081gqgbwmslrh5ad21899gwnb2r3jripyw";
+ libraryHaskellDepends = [
+ aeson attoparsec base bytestring deepseq hashable microlens
+ scientific text unordered-containers vector
+ ];
+ testHaskellDepends = [
+ aeson base bytestring deepseq hashable microlens tasty tasty-hunit
+ text unordered-containers vector
+ ];
+ description = "Law-abiding lenses for Aeson, using microlens";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"microlens-contra" = callPackage
({ mkDerivation, base, microlens }:
mkDerivation {
@@ -153527,6 +153906,8 @@ self: {
pname = "microlens-platform";
version = "0.3.11";
sha256 = "18950lxgmsg5ksvyyi3zs1smjmb1qf1q73a3p3g44bh21miz0xwb";
+ revision = "1";
+ editedCabalFile = "14v7ffibzsa1fhf4pwvpw9ia67kgmk8wmxwibj7vr9rayrxy1ffv";
libraryHaskellDepends = [
base hashable microlens microlens-ghc microlens-mtl microlens-th
text unordered-containers vector
@@ -154331,6 +154712,43 @@ self: {
broken = true;
}) {};
+ "minio-hs_1_3_0" = callPackage
+ ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring
+ , case-insensitive, conduit, conduit-extra, containers, cryptonite
+ , cryptonite-conduit, digest, directory, exceptions, filepath
+ , http-client, http-conduit, http-types, ini, memory, protolude
+ , QuickCheck, raw-strings-qq, resourcet, retry, tasty, tasty-hunit
+ , tasty-quickcheck, tasty-smallcheck, temporary, text, time
+ , transformers, unliftio, unliftio-core, unordered-containers
+ , xml-conduit
+ }:
+ mkDerivation {
+ pname = "minio-hs";
+ version = "1.3.0";
+ sha256 = "1caia9dyxirxl7qy7ijhk1s4hp56m0f901ik34nbf5aizhl0qx94";
+ libraryHaskellDepends = [
+ aeson base base64-bytestring binary bytestring case-insensitive
+ conduit conduit-extra containers cryptonite cryptonite-conduit
+ digest directory exceptions filepath http-client http-conduit
+ http-types ini memory protolude raw-strings-qq resourcet retry text
+ time transformers unliftio unliftio-core unordered-containers
+ xml-conduit
+ ];
+ testHaskellDepends = [
+ aeson base base64-bytestring binary bytestring case-insensitive
+ conduit conduit-extra containers cryptonite cryptonite-conduit
+ digest directory exceptions filepath http-client http-conduit
+ http-types ini memory protolude QuickCheck raw-strings-qq resourcet
+ retry tasty tasty-hunit tasty-quickcheck tasty-smallcheck temporary
+ text time transformers unliftio unliftio-core unordered-containers
+ xml-conduit
+ ];
+ description = "A MinIO Haskell Library for Amazon S3 compatible cloud storage";
+ license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"minions" = callPackage
({ mkDerivation, ansi-terminal, base, MissingH, process, time }:
mkDerivation {
@@ -155038,6 +155456,8 @@ self: {
pname = "mmark";
version = "0.0.7.0";
sha256 = "0g7mx3xvvj8vgcids231zlz9kp7z3zjrq4xfhdm0wk0v1k51dflx";
+ revision = "1";
+ editedCabalFile = "1mj781f8b0hc57lw2zp1qag4sdxn0bkyzm5m321xagwk32iwz9qc";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base case-insensitive containers deepseq dlist email-validate
@@ -156188,8 +156608,8 @@ self: {
}:
mkDerivation {
pname = "monad-metrics";
- version = "0.2.1.3";
- sha256 = "0ryazqrn7s2pzgzgvzp4paibylbvl54p52gc70n3alwzz8x1b7bd";
+ version = "0.2.1.4";
+ sha256 = "0h83kh1qc3wf9i0l8k998zib6fvf8fpwzn3qiz0d6z7az0i947cf";
libraryHaskellDepends = [
base clock ekg-core exceptions hashable microlens mtl text
transformers unordered-containers
@@ -161276,8 +161696,8 @@ self: {
pname = "nats";
version = "1.1.2";
sha256 = "1v40drmhixck3pz3mdfghamh73l4rp71mzcviipv1y8jhrfxilmr";
- revision = "1";
- editedCabalFile = "1jzyysf758lfindlclqpzqcd0lrgrdv0rnz2lg8g1rvv07x2n7zh";
+ revision = "2";
+ editedCabalFile = "1654j2zngjzp71hra6s980hd9xgx0xlk6rvqm504n7h9vmyycrjx";
doHaddock = false;
description = "Natural numbers";
license = stdenv.lib.licenses.bsd3;
@@ -166899,8 +167319,8 @@ self: {
}:
mkDerivation {
pname = "om-elm";
- version = "1.0.0.3";
- sha256 = "0i674vjbp03nkr76fdi7bjylv264nxwnxw0ija11fkpd1rdg045g";
+ version = "2.0.0.0";
+ sha256 = "0xg9wcmgsxc0rn9fvdma8zs3a588qsppcrxbvpnaa5j1h70nh2qb";
libraryHaskellDepends = [
base bytestring Cabal containers directory http-types safe
safe-exceptions template-haskell text unix wai
@@ -167257,8 +167677,8 @@ self: {
pname = "opaleye";
version = "0.6.7003.1";
sha256 = "1lj4vz1526l11b0mc5y7j9sxf7v6kkzl8c1jymvb1vrqj2qkgxsx";
- revision = "1";
- editedCabalFile = "0nwyz9s81hfziwy7a18gpi0663xy6cfc6fl4vx8a1vkwdyfcjjli";
+ revision = "2";
+ editedCabalFile = "1iq2szdw6xajljrmmz373j0wvsnkgg20gpvfiqyrzknpraq3xvj8";
libraryHaskellDepends = [
aeson base base16-bytestring bytestring case-insensitive
contravariant postgresql-simple pretty product-profunctors
@@ -168562,6 +168982,8 @@ self: {
pname = "optparse-applicative";
version = "0.14.3.0";
sha256 = "0qvn1s7jwrabbpmqmh6d6iafln3v3h9ddmxj2y4m0njmzq166ivj";
+ revision = "1";
+ editedCabalFile = "0ij9kphryag2j9p561mac3jqhhmmlpd3w38vjw8nk3x5vbwidlzs";
libraryHaskellDepends = [
ansi-wl-pprint base process transformers transformers-compat
];
@@ -168607,6 +169029,8 @@ self: {
pname = "optparse-generic";
version = "1.3.0";
sha256 = "13rr3hq26dpmbami8vb6d1ig9ywk6jia22sp5dkp6jkfc1c9k4l0";
+ revision = "1";
+ editedCabalFile = "1fnbgrdzfbw5fhncqv9jl8k752b1rna6nir92k646p8k5zq9hr1d";
libraryHaskellDepends = [
base bytestring Only optparse-applicative semigroups
system-filepath text time transformers void
@@ -170040,6 +170464,8 @@ self: {
pname = "pandoc-citeproc";
version = "0.16.2";
sha256 = "15mm17awgi1b5yazwhr5nh8b59qml1qk6pz6gpyijks70fq2arsv";
+ revision = "1";
+ editedCabalFile = "06g80bigzlnh5s569s2f1f0ds49cbsh0l69n3phr281x597x021j";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -171685,6 +172111,40 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "parser-combinators_1_0_3" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "parser-combinators";
+ version = "1.0.3";
+ sha256 = "0cqic88xwi60x5x6pli0r8401yljvg2cis8a67766zypfg0il3bp";
+ libraryHaskellDepends = [ base ];
+ description = "Lightweight package providing commonly useful parser combinators";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "parser-combinators-tests" = callPackage
+ ({ mkDerivation, base, hspec, hspec-discover, hspec-expectations
+ , hspec-megaparsec, megaparsec, megaparsec-tests
+ , parser-combinators, QuickCheck
+ }:
+ mkDerivation {
+ pname = "parser-combinators-tests";
+ version = "1.0.3";
+ sha256 = "0xnmf5sfr9qg2jdcvgjsfvv5b8rd4z06vgk75lsbrwv019srpamm";
+ revision = "1";
+ editedCabalFile = "08hns8ycdlvqvi0il8077c4mbzf2npvaglzd89979wqpki8jm7l2";
+ isLibrary = false;
+ isExecutable = false;
+ testHaskellDepends = [
+ base hspec hspec-expectations hspec-megaparsec megaparsec
+ megaparsec-tests parser-combinators QuickCheck
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Test suite of parser-combinators";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"parser-helper" = callPackage
({ mkDerivation, aeson, base, bytestring, haskell-src-exts, text }:
mkDerivation {
@@ -175450,6 +175910,8 @@ self: {
pname = "pi-lcd";
version = "0.1.1.0";
sha256 = "0120zkza698ww8ng6svp54qywkrvn35pylvcgplfldw4ajln00vn";
+ revision = "1";
+ editedCabalFile = "0gkpx56dq7lqhlw9iq8zv1kqhpwpd7hkpvld2k86v0zyal526jms";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -175941,8 +176403,8 @@ self: {
pname = "pipes";
version = "4.3.9";
sha256 = "1jqs4x3xw2ya3834p36p1ycx8nxjgn2ypaibhdv97xcw3wsxlk2w";
- revision = "1";
- editedCabalFile = "0mkwbbn8vlrsvm3pl2cyaw1qr9hbjqfm831naj7cbrmiksf2l5aa";
+ revision = "2";
+ editedCabalFile = "0pw4i3pdg3i98a9mbps0ycgb70vf4p7dqv08xf365iy4dzdm3a1i";
libraryHaskellDepends = [
base exceptions mmorph mtl semigroups transformers void
];
@@ -176263,8 +176725,8 @@ self: {
pname = "pipes-concurrency";
version = "2.0.12";
sha256 = "17aqh6p1az09n6b6vs06pxcha5aq6dvqjwskgjcdiz7221vwchs3";
- revision = "1";
- editedCabalFile = "1c1rys2pp7a2z6si925ps610q8a38a6m26s182phwa5nfhyggpaw";
+ revision = "2";
+ editedCabalFile = "1c06nypirrd76jg5y508517smxh3izy98y6kj89k79kbpi5rncbj";
libraryHaskellDepends = [
async base contravariant pipes semigroups stm void
];
@@ -176801,10 +177263,8 @@ self: {
({ mkDerivation, base, mwc-random, pipes, vector }:
mkDerivation {
pname = "pipes-random";
- version = "1.0.0.4";
- sha256 = "17k510v2f5ziysqh7sknyw3rgxf8iblw800z3hh8gymaszkhfajl";
- revision = "2";
- editedCabalFile = "0czw2qfi05d5kbnwzhzr75j1ag6hfbn9nvbjyifdjradfzjxl2s9";
+ version = "1.0.0.5";
+ sha256 = "1xsb0cxksrrkv81yk9qb7b3g7niz3sc7sz0960hxn16hwjymkv5k";
libraryHaskellDepends = [ base mwc-random pipes vector ];
description = "Producers for handling randomness";
license = stdenv.lib.licenses.bsd3;
@@ -178103,8 +178563,8 @@ self: {
pname = "pointed";
version = "5.0.1";
sha256 = "1p91a762xglckscnhpflxzav8byf49a02mli3983i4kpr2jkaimr";
- revision = "1";
- editedCabalFile = "1ccjmzz3jf5ybrzv7qdwm3qb8rz0yskvi4ackrixyhdk8bg5f3nc";
+ revision = "2";
+ editedCabalFile = "00m4f6rgxa3qa72j3jzpg6rrd9k9n4ll2idxlyybil3lxd63r80w";
libraryHaskellDepends = [
base comonad containers data-default-class hashable kan-extensions
semigroupoids semigroups stm tagged transformers
@@ -180070,8 +180530,8 @@ self: {
}:
mkDerivation {
pname = "postmark-streams";
- version = "0.1.0.2";
- sha256 = "00d6rnijlr2095nd1d0vqgbsy5k8w6admi2bn69vdmj39cahgca2";
+ version = "0.1.0.3";
+ sha256 = "1qcyh34rjfgjxi6cs7jrfhr1qdp2chngga1p71jxisbgfd7rk2b4";
libraryHaskellDepends = [
aeson attoparsec base base64-bytestring binary bytestring
http-streams io-streams text time
@@ -181238,6 +181698,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "pretty-sop_0_2_0_3" = callPackage
+ ({ mkDerivation, base, generics-sop, markdown-unlit, pretty-show }:
+ mkDerivation {
+ pname = "pretty-sop";
+ version = "0.2.0.3";
+ sha256 = "10vybwbkqgr3fi13c5qwwhrwns9sdj7zvlkz6vag966pk238gnxy";
+ libraryHaskellDepends = [ base generics-sop pretty-show ];
+ testHaskellDepends = [ base generics-sop pretty-show ];
+ testToolDepends = [ markdown-unlit ];
+ description = "A generic pretty-printer using generics-sop";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"pretty-terminal" = callPackage
({ mkDerivation, base, text }:
mkDerivation {
@@ -181598,8 +182072,8 @@ self: {
({ mkDerivation, base, primitive }:
mkDerivation {
pname = "primitive-checked";
- version = "0.6.4.1";
- sha256 = "02jac6ra9qws5lp2zwqhz87zqy5j9vhs2hinwp43nnpjd4kngms1";
+ version = "0.6.4.2";
+ sha256 = "0x659bq4pqlk8i9af98bjv7639819fdm4r0by55zhxjgm5vr179q";
libraryHaskellDepends = [ base primitive ];
description = "primitive functions with bounds-checking";
license = stdenv.lib.licenses.bsd3;
@@ -182491,6 +182965,8 @@ self: {
pname = "profunctors";
version = "5.3";
sha256 = "1dx3nkc27yxsrbrhh3iwhq7dl1xn6bj7n62yx6nh8vmpbg62lqvl";
+ revision = "1";
+ editedCabalFile = "1ynskm55fynsli6lpz6v5py344yhf1mq5xz2b1p7arvf2xqrx4kv";
libraryHaskellDepends = [
base base-orphans bifunctors comonad contravariant distributive
semigroups tagged transformers
@@ -182499,6 +182975,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "profunctors_5_4" = callPackage
+ ({ mkDerivation, base, base-orphans, bifunctors, comonad
+ , contravariant, distributive, tagged, transformers
+ }:
+ mkDerivation {
+ pname = "profunctors";
+ version = "5.4";
+ sha256 = "1b5hidvd3rd8ilzr5ipzw0mg0a2x0ldrrcx6bacalafg7407bfhh";
+ libraryHaskellDepends = [
+ base base-orphans bifunctors comonad contravariant distributive
+ tagged transformers
+ ];
+ description = "Profunctors";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"progress" = callPackage
({ mkDerivation, base, time }:
mkDerivation {
@@ -184946,6 +185439,31 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "pusher-http-haskell_1_5_1_8" = callPackage
+ ({ mkDerivation, aeson, base, base16-bytestring, bytestring
+ , cryptonite, hashable, hspec, http-client, http-types, memory
+ , QuickCheck, scientific, text, time, transformers
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "pusher-http-haskell";
+ version = "1.5.1.8";
+ sha256 = "1dvhpr99rfmnjf1vzxnlc2psmjazisxs9cjvfr83wiywaddqk67f";
+ libraryHaskellDepends = [
+ aeson base base16-bytestring bytestring cryptonite hashable
+ http-client http-types memory text time transformers
+ unordered-containers vector
+ ];
+ testHaskellDepends = [
+ aeson base base16-bytestring bytestring cryptonite hspec
+ http-client http-types QuickCheck scientific text time transformers
+ unordered-containers vector
+ ];
+ description = "Haskell client library for the Pusher HTTP API";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"pusher-ws" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, deepseq
, hashable, http-conduit, lens, lens-aeson, network, scientific
@@ -188510,16 +189028,15 @@ self: {
broken = true;
}) {};
- "rattletrap_6_3_0" = callPackage
+ "rattletrap_6_3_1" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits
- , bytestring, clock, containers, filepath, http-client
- , http-client-tls, HUnit, template-haskell, temporary, text
- , transformers
+ , bytestring, containers, filepath, http-client, http-client-tls
+ , HUnit, template-haskell, temporary, text, transformers
}:
mkDerivation {
pname = "rattletrap";
- version = "6.3.0";
- sha256 = "0b20ih5b1g74zpdyhlpi9j98zjimad1b6lwmxqqdcviw2wwih28p";
+ version = "6.3.1";
+ sha256 = "07v1cd4x9hxfnz0fm1prpgs0zms3b4wi7miw4q5n2zxcc22bdcc6";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -188533,9 +189050,9 @@ self: {
transformers
];
testHaskellDepends = [
- aeson aeson-pretty base binary binary-bits bytestring clock
- containers filepath http-client http-client-tls HUnit
- template-haskell temporary text transformers
+ aeson aeson-pretty base binary binary-bits bytestring containers
+ filepath http-client http-client-tls HUnit template-haskell
+ temporary text transformers
];
description = "Parse and generate Rocket League replays";
license = stdenv.lib.licenses.mit;
@@ -189621,6 +190138,28 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "rebase_1_3_1_1" = callPackage
+ ({ mkDerivation, base, base-prelude, bifunctors, bytestring
+ , containers, contravariant, contravariant-extras, deepseq, dlist
+ , either, fail, hashable, mtl, profunctors, scientific
+ , semigroupoids, semigroups, stm, text, time, transformers
+ , unordered-containers, uuid, vector, void
+ }:
+ mkDerivation {
+ pname = "rebase";
+ version = "1.3.1.1";
+ sha256 = "0q4m2fa7wkgxs0grir8rlqwibasmi3s1x7c107ynndwfm62nzv0a";
+ libraryHaskellDepends = [
+ base base-prelude bifunctors bytestring containers contravariant
+ contravariant-extras deepseq dlist either fail hashable mtl
+ profunctors scientific semigroupoids semigroups stm text time
+ transformers unordered-containers uuid vector void
+ ];
+ description = "A more progressive alternative to the \"base\" package";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"rebindable" = callPackage
({ mkDerivation, base, data-default-class, indexed }:
mkDerivation {
@@ -189857,6 +190396,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "records-sop_0_1_0_3" = callPackage
+ ({ mkDerivation, base, deepseq, generics-sop, ghc-prim, hspec
+ , should-not-typecheck
+ }:
+ mkDerivation {
+ pname = "records-sop";
+ version = "0.1.0.3";
+ sha256 = "120kb6z4si5wqkahbqxqhm3qb8xpc9ivwg293ymz8a4ri1hdr0a5";
+ libraryHaskellDepends = [ base deepseq generics-sop ghc-prim ];
+ testHaskellDepends = [
+ base deepseq generics-sop hspec should-not-typecheck
+ ];
+ description = "Record subtyping and record utilities with generics-sop";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"records-th" = callPackage
({ mkDerivation, aeson, base, data-default, kinds, records
, template-haskell, text, type-functions, unordered-containers
@@ -190193,6 +190749,8 @@ self: {
pname = "reducers";
version = "3.12.3";
sha256 = "09wf8pl9ycglcv6qj5ba26gkg2s5iy81hsx9xp0q8na0cwvp71ki";
+ revision = "1";
+ editedCabalFile = "1v0r75wkaahxdv4y0sqgcikvgwymiz12fa8nkk59n1g4x9nng9wb";
libraryHaskellDepends = [
array base bytestring containers fingertree hashable semigroupoids
semigroups text transformers unordered-containers
@@ -190417,6 +190975,8 @@ self: {
pname = "reflection";
version = "2.1.4";
sha256 = "0kf4a5ijw6jfnfibjcrpdy9vzh1n6v2pxia8dhyyqdissiwc8bzj";
+ revision = "1";
+ editedCabalFile = "05ibi4ivvh87d96xl09yh0day08p5www5vp568mvn2dp37rxyngc";
libraryHaskellDepends = [ base template-haskell ];
description = "Reifies arbitrary terms into types that can be reflected back into terms";
license = stdenv.lib.licenses.bsd3;
@@ -191292,6 +191852,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "regex-tdfa_1_2_3_2" = callPackage
+ ({ mkDerivation, array, base, bytestring, containers, ghc-prim, mtl
+ , parsec, regex-base
+ }:
+ mkDerivation {
+ pname = "regex-tdfa";
+ version = "1.2.3.2";
+ sha256 = "03yhpqrqz977nwlnhnyz9dacnbzw8xb6j18h365rkgmbc05sb3hf";
+ libraryHaskellDepends = [
+ array base bytestring containers ghc-prim mtl parsec regex-base
+ ];
+ description = "Replaces/Enhances Text.Regex";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"regex-tdfa-pipes" = callPackage
({ mkDerivation, array, base, lens, monads-tf, pipes, regex-base
, regex-tdfa
@@ -191664,6 +192240,35 @@ self: {
broken = true;
}) {};
+ "registry_0_1_4_2" = callPackage
+ ({ mkDerivation, async, base, containers, exceptions, generic-lens
+ , hashable, hedgehog, hedgehog-corpus, io-memoize, mmorph
+ , MonadRandom, mtl, multimap, protolude, random, resourcet
+ , semigroupoids, semigroups, tasty, tasty-discover, tasty-hedgehog
+ , tasty-th, template-haskell, text, transformers-base, universum
+ }:
+ mkDerivation {
+ pname = "registry";
+ version = "0.1.4.2";
+ sha256 = "0jfwxpf4w4laj0allbalkb0haircf0w33j0h2c2b5dzrhmmsg2gp";
+ libraryHaskellDepends = [
+ base containers exceptions hashable mmorph mtl protolude resourcet
+ semigroupoids semigroups template-haskell text transformers-base
+ ];
+ testHaskellDepends = [
+ async base containers exceptions generic-lens hashable hedgehog
+ hedgehog-corpus io-memoize mmorph MonadRandom mtl multimap
+ protolude random resourcet semigroupoids semigroups tasty
+ tasty-discover tasty-hedgehog tasty-th template-haskell text
+ transformers-base universum
+ ];
+ testToolDepends = [ tasty-discover ];
+ description = "data structure for assembling components";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"regress" = callPackage
({ mkDerivation, ad, base, vector }:
mkDerivation {
@@ -192013,8 +192618,8 @@ self: {
({ mkDerivation, aeson, base, chronos, text, torsor }:
mkDerivation {
pname = "relevant-time";
- version = "0.1.0.0";
- sha256 = "0i9g6rqq31y6y9jnc9bi0vfrpxmjr3vqfjz2w4q7jc87dplyd2qk";
+ version = "0.1.1.0";
+ sha256 = "0978g03dlkgx45hxzk3lwl68iln8jnf0hldchac4yqp4c9rsxf22";
libraryHaskellDepends = [ aeson base chronos text torsor ];
description = "humanised relevant time";
license = stdenv.lib.licenses.bsd3;
@@ -192100,6 +192705,8 @@ self: {
pname = "relude";
version = "0.5.0";
sha256 = "108xd4ybfj7v0cc0h71cym0z31fzsi17aad2l3s17j11h6ainhbm";
+ revision = "1";
+ editedCabalFile = "0qw27rmf14dn44lics58mqdf4wfcnx5z5zrwi13bsbf8qicmd7cb";
libraryHaskellDepends = [
base bytestring containers deepseq ghc-prim hashable mtl stm text
transformers unordered-containers
@@ -200405,6 +201012,8 @@ self: {
pname = "semigroupoids";
version = "5.3.2";
sha256 = "01cxdcflfzx674bhdclf6c7lwgjpbj5yqv8w1fi9dvipyhyj3a31";
+ revision = "1";
+ editedCabalFile = "1r88pi1bvc1w0nys810p3drra6na02zhbaf257dl4lyxl8iv5466";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
base base-orphans bifunctors comonad containers contravariant
@@ -200449,6 +201058,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "semigroups_0_19" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "semigroups";
+ version = "0.19";
+ sha256 = "1ficdd32y0v6bi0dxzjn9fph03ql0nmyjy0x3ahr8c4508xh779r";
+ libraryHaskellDepends = [ base ];
+ description = "Anything that associates";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"semigroups-actions" = callPackage
({ mkDerivation, base, containers, semigroups }:
mkDerivation {
@@ -200560,6 +201181,8 @@ self: {
pname = "semirings";
version = "0.4.1";
sha256 = "1zzq4x1x7fxj3zrzys1zbqidwmm7wh7ykxgr5f8bxysxbs98qjdp";
+ revision = "1";
+ editedCabalFile = "1d1p06clz9k35slzvj93r3q46lzanxkdxrx2ac1nrgd5khibq3wk";
libraryHaskellDepends = [
base containers hashable integer-gmp unordered-containers
];
@@ -202956,8 +203579,8 @@ self: {
}:
mkDerivation {
pname = "servant-purescript";
- version = "0.9.0.2";
- sha256 = "1axj4rar4ncy20xiwa231hc67vpz6yi2vzddq8m6nswmdg6kja7p";
+ version = "0.9.0.3";
+ sha256 = "16ygfj1h9wrxxv5wcxh8rqn9icgx7xxy0yrgfdv5k6pmpxmgmi84";
libraryHaskellDepends = [
aeson base bytestring containers directory filepath http-types lens
mainland-pretty purescript-bridge servant servant-foreign
@@ -203704,8 +204327,8 @@ self: {
}:
mkDerivation {
pname = "servant-xml";
- version = "1.0.1.3";
- sha256 = "0f033s1nmhw5xsmnvj3rqmrw6zd0ywbr7v6v9dxlx9daim4jps1v";
+ version = "1.0.1.4";
+ sha256 = "0jzzw4bwjcnax53xx8yjfldd21zgbvynpagf1ikxpzq3sgqhdl2x";
libraryHaskellDepends = [
base bytestring http-media servant xmlbf xmlbf-xeno
];
@@ -208341,8 +208964,8 @@ self: {
}:
mkDerivation {
pname = "slate";
- version = "0.13.0.0";
- sha256 = "0b1mk6d79h4mkh71kgg208i15bik97a29hzs1j57qxipici680rj";
+ version = "0.13.1.0";
+ sha256 = "08d6i7dacfcgsc4iijhs4sbkfhy720hk3m0v9d1gwg5ycjys1qdr";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -209145,6 +209768,8 @@ self: {
pname = "smuggler";
version = "0.1.0";
sha256 = "0iyisn5s39haik3g1wld67pdpnl8h3zafxhkgyd3ajx9lg9nf741";
+ revision = "1";
+ editedCabalFile = "1lbkir8l81f6dq3d2q9h6a1bpi03cq69qg3xr6h9ppx8ksswsw1d";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -211330,6 +211955,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "sop-core_0_5_0_0" = callPackage
+ ({ mkDerivation, base, deepseq }:
+ mkDerivation {
+ pname = "sop-core";
+ version = "0.5.0.0";
+ sha256 = "12zqdr0g4s3fr6710ngph0fr06lbc12c849izcl4cjj4g9w3v3zz";
+ libraryHaskellDepends = [ base deepseq ];
+ description = "True Sums of Products";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"sophia" = callPackage
({ mkDerivation, base, binary, bindings-sophia, bytestring
, criterion, directory, tasty, tasty-hunit
@@ -216293,6 +216930,8 @@ self: {
pname = "streaming";
version = "0.2.2.0";
sha256 = "04fdw4f51yb16bv3b7z97vqxbns8rv2ag2aphglm29jsd527fsss";
+ revision = "1";
+ editedCabalFile = "1sq8blxh4s1lsvxkc64x7drxwn75kszxicjhvw4cg505fp9bfc7y";
libraryHaskellDepends = [
base containers ghc-prim mmorph mtl semigroups transformers
transformers-base
@@ -216322,6 +216961,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "streaming-attoparsec_1_0_0_1" = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, streaming
+ , streaming-bytestring, tasty, tasty-hunit
+ }:
+ mkDerivation {
+ pname = "streaming-attoparsec";
+ version = "1.0.0.1";
+ sha256 = "151gjivqbadh1wfbj53d0ahw4cjax4nnhg1v0l1piqnp1mbz7j8y";
+ libraryHaskellDepends = [
+ attoparsec base bytestring streaming streaming-bytestring
+ ];
+ testHaskellDepends = [
+ attoparsec base bytestring streaming streaming-bytestring tasty
+ tasty-hunit
+ ];
+ description = "Attoparsec integration for the streaming ecosystem";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"streaming-base64" = callPackage
({ mkDerivation, base, base-compat-batteries, filepath
, safe-exceptions, streaming, streaming-bytestring, streaming-with
@@ -216614,22 +217273,21 @@ self: {
"streaming-osm" = callPackage
({ mkDerivation, attoparsec, base, bytestring, containers
- , criterion, streaming, streaming-bytestring, streaming-utils
+ , resourcet, streaming, streaming-attoparsec, streaming-bytestring
, tasty, tasty-hunit, text, transformers, vector, zlib
}:
mkDerivation {
pname = "streaming-osm";
- version = "1.0.0";
- sha256 = "1z1wpwmsgc4viy0w3zcmf5d88nylyynb359r1p2naajg65kbb46h";
+ version = "1.0.0.1";
+ sha256 = "0zf9f079ssmm1gy1ngcqz1faxyardv91ynv5lc5xfh8fhgk9a65c";
libraryHaskellDepends = [
- attoparsec base bytestring containers streaming
- streaming-bytestring streaming-utils text transformers vector zlib
+ attoparsec base bytestring containers resourcet streaming
+ streaming-attoparsec streaming-bytestring text transformers vector
+ zlib
];
testHaskellDepends = [
- attoparsec base bytestring streaming tasty tasty-hunit vector zlib
- ];
- benchmarkHaskellDepends = [
- attoparsec base bytestring criterion streaming vector zlib
+ attoparsec base bytestring resourcet streaming tasty tasty-hunit
+ vector zlib
];
description = "A hand-written streaming byte parser for OpenStreetMap Protobuf data";
license = stdenv.lib.licenses.bsd3;
@@ -216638,25 +217296,21 @@ self: {
}) {};
"streaming-pcap" = callPackage
- ({ mkDerivation, attoparsec, base, bytestring, criterion, pcap
- , streaming, streaming-bytestring, streaming-utils, tasty
+ ({ mkDerivation, attoparsec, base, bytestring, pcap, resourcet
+ , streaming, streaming-attoparsec, streaming-bytestring, tasty
, tasty-hunit
}:
mkDerivation {
pname = "streaming-pcap";
- version = "1.1.1";
- sha256 = "1riw6n3n5rbzfqlm0z6qbznlx2lc8bk2s1qjy8a9zx90wbys0xp1";
+ version = "1.1.1.1";
+ sha256 = "1qzll7n2h9jgwhnx0gvrxzi19dkhqxy0fymbc414hwsn27f8sh8b";
libraryHaskellDepends = [
- attoparsec base bytestring pcap streaming streaming-bytestring
- streaming-utils
+ attoparsec base bytestring pcap resourcet streaming
+ streaming-attoparsec streaming-bytestring
];
testHaskellDepends = [
- attoparsec base bytestring pcap streaming streaming-bytestring
- streaming-utils tasty tasty-hunit
- ];
- benchmarkHaskellDepends = [
- attoparsec base bytestring criterion pcap streaming
- streaming-bytestring streaming-utils
+ attoparsec base bytestring pcap resourcet streaming
+ streaming-attoparsec streaming-bytestring tasty tasty-hunit
];
description = "Stream packets via libpcap";
license = stdenv.lib.licenses.bsd3;
@@ -224958,6 +225612,30 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "text-builder_0_6_5_1" = callPackage
+ ({ mkDerivation, base, base-prelude, bytestring, criterion
+ , deferred-folds, QuickCheck, quickcheck-instances, rerebase
+ , semigroups, tasty, tasty-hunit, tasty-quickcheck, text
+ , transformers
+ }:
+ mkDerivation {
+ pname = "text-builder";
+ version = "0.6.5.1";
+ sha256 = "0g40s5md7kfmhqsxxrfliwb3p4whg3m2wp31bai051nx1ddkkvay";
+ libraryHaskellDepends = [
+ base base-prelude bytestring deferred-folds semigroups text
+ transformers
+ ];
+ testHaskellDepends = [
+ QuickCheck quickcheck-instances rerebase tasty tasty-hunit
+ tasty-quickcheck
+ ];
+ benchmarkHaskellDepends = [ criterion rerebase ];
+ description = "An efficient strict text builder";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"text-containers" = callPackage
({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim
, hashable, QuickCheck, quickcheck-instances, tasty
@@ -226260,13 +226938,13 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "th-lift_0_8" = callPackage
+ "th-lift_0_8_0_1" = callPackage
({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction
}:
mkDerivation {
pname = "th-lift";
- version = "0.8";
- sha256 = "1594v53fqah949nazqrjhy17gxhvc43v2ffrk93bfhdy07wgikia";
+ version = "0.8.0.1";
+ sha256 = "1a6qlbdg15cfr5rvl9g3blgwx4v1p0xic0pzv13zx165xbc36ld0";
libraryHaskellDepends = [
base ghc-prim template-haskell th-abstraction
];
@@ -228877,6 +229555,30 @@ self: {
broken = true;
}) {};
+ "tmp-postgres_0_2_0_0" = callPackage
+ ({ mkDerivation, async, base, bytestring, directory, hspec
+ , hspec-discover, network, port-utils, postgresql-simple, process
+ , temporary, unix
+ }:
+ mkDerivation {
+ pname = "tmp-postgres";
+ version = "0.2.0.0";
+ sha256 = "08w88rh8yap7dmh2jn3x8rd918jxscw46jzljfbdyda9rzfz7kq4";
+ libraryHaskellDepends = [
+ async base bytestring directory network port-utils
+ postgresql-simple process temporary unix
+ ];
+ testHaskellDepends = [
+ base bytestring directory hspec hspec-discover postgresql-simple
+ process temporary
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Start and stop a temporary postgres for testing";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"tmpl" = callPackage
({ mkDerivation, base, bytestring, directory, template, text }:
mkDerivation {
@@ -228996,8 +229698,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "todo";
- version = "0.2.0.1";
- sha256 = "0paxykbni3gwxgs25lkjsb8jfk4bc5gwnrfp16v189smqj1slc3g";
+ version = "0.2.0.2";
+ sha256 = "1gh2jdrxph0x9cc03kk8xxjyicivwcqfs9qv2nfr7mn570cmjrmw";
libraryHaskellDepends = [ base ];
description = "A todo bottom";
license = stdenv.lib.licenses.bsd3;
@@ -229501,8 +230203,8 @@ self: {
}:
mkDerivation {
pname = "too-many-cells";
- version = "0.1.5.0";
- sha256 = "0896l7zk6avkcxi2s3q2bch0bjclk4lafbm2vzmpygkscz7kqv9b";
+ version = "0.1.6.0";
+ sha256 = "1nwjf5qmvshgcg2zf0mqav5kz19rj0a4vd7w6x1zbalysj9v5nb7";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -229539,8 +230241,8 @@ self: {
}:
mkDerivation {
pname = "toodles";
- version = "1.1.1";
- sha256 = "0n1z99f2zr2xj55y90ll9dvqq51sv4r4zyhjx7qilqw34djzfn88";
+ version = "1.2.1";
+ sha256 = "19z8xx8pw66m9q9xq0qldpzhmjwfsln4hn8smmz2pjk2x713883c";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -230375,6 +231077,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "transformers-compat_0_6_5" = callPackage
+ ({ mkDerivation, base, ghc-prim, transformers }:
+ mkDerivation {
+ pname = "transformers-compat";
+ version = "0.6.5";
+ sha256 = "02v2fjbvcrlpvhcsssap8dy8y9pp95jykrlc5arm39sxa48wyrys";
+ libraryHaskellDepends = [ base ghc-prim transformers ];
+ description = "A small compatibility shim for the transformers library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"transformers-compose" = callPackage
({ mkDerivation, base, transformers }:
mkDerivation {
@@ -230885,6 +231599,32 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "tree-diff_0_0_2_1" = callPackage
+ ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base
+ , base-compat, bytestring, containers, generics-sop, hashable
+ , MemoTrie, parsec, parsers, pretty, QuickCheck, scientific, tagged
+ , tasty, tasty-golden, tasty-quickcheck, text, time, trifecta
+ , unordered-containers, uuid-types, vector
+ }:
+ mkDerivation {
+ pname = "tree-diff";
+ version = "0.0.2.1";
+ sha256 = "0hz7jklzb4cc63l68jxc58ik0ybgim9niwq2gfi0cskv5g2yr3ym";
+ libraryHaskellDepends = [
+ aeson ansi-terminal ansi-wl-pprint base base-compat bytestring
+ containers generics-sop hashable MemoTrie parsec parsers pretty
+ QuickCheck scientific tagged text time unordered-containers
+ uuid-types vector
+ ];
+ testHaskellDepends = [
+ ansi-terminal ansi-wl-pprint base base-compat parsec QuickCheck
+ tasty tasty-golden tasty-quickcheck trifecta
+ ];
+ description = "Diffing of (expression) trees";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"tree-fun" = callPackage
({ mkDerivation, base, containers, mtl }:
mkDerivation {
@@ -231151,8 +231891,8 @@ self: {
pname = "trifecta";
version = "2";
sha256 = "0hznd8i65s81xy13i2qc7cvipw3lfb2yhkv53apbdsh6sbljz5sk";
- revision = "1";
- editedCabalFile = "1qqkiwy0yvnj4yszsw9jrv83qf5hw87jdqdb34401dskaf81gwrm";
+ revision = "2";
+ editedCabalFile = "1ihw0dm0sjn7cql6rb3y0gb5kxy1ca3ggflm4lxlmhm3gfrj2sxc";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html
@@ -232009,8 +232749,8 @@ self: {
pname = "turtle";
version = "1.5.14";
sha256 = "10sxbmis82z5r2ksfkik5kryz5i0xwihz9drc1dzz4fb76kkb67z";
- revision = "1";
- editedCabalFile = "0jfa861ch7cibalcqszywjiyqa95xs7k1dqjjkqqx6fih9y13n0l";
+ revision = "2";
+ editedCabalFile = "0inmpmcagv6kqhq4bqrpmygv5an8cqna0p14x3jggw8vz3a741xp";
libraryHaskellDepends = [
ansi-wl-pprint async base bytestring clock containers directory
exceptions foldl hostname managed optional-args
@@ -235496,6 +236236,8 @@ self: {
pname = "universe-base";
version = "1.1";
sha256 = "1alr2gbmdp9lsarnhfl72zkcqrfwxwvmlq3nyb9ilmwinahlzf0n";
+ revision = "1";
+ editedCabalFile = "1bjri6v54iy54rn972lj7hdw1bndcria23g90ikk4ni2gp65v5i0";
libraryHaskellDepends = [ base containers tagged transformers ];
testHaskellDepends = [ base containers QuickCheck ];
description = "A class for finite and recursively enumerable types";
@@ -237635,8 +238377,8 @@ self: {
pname = "uuid-types";
version = "1.0.3";
sha256 = "1zdka5jnm1h6k36w3nr647yf3b5lqb336g3fkprhd6san9x52xlj";
- revision = "1";
- editedCabalFile = "0iwwj07gp28g357hv76k4h8pvlzamvchnw003cv3qk778pcpx201";
+ revision = "2";
+ editedCabalFile = "1lmlmng4lph57cljga3r9jy2axdls5mllsb2xzcwy2a34wgidarc";
libraryHaskellDepends = [
base binary bytestring deepseq hashable random text
];
@@ -240121,6 +240863,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "void_0_7_3" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "void";
+ version = "0.7.3";
+ sha256 = "05vk3x1r9a2pqnzfji475m5gdih2im1h7rbi2sc67p1pvj6pbbsk";
+ libraryHaskellDepends = [ base ];
+ description = "A Haskell 98 logically uninhabited data type";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"vorbiscomment" = callPackage
({ mkDerivation, base, binary-strict, bytestring, mtl, utf8-string
}:
@@ -244304,6 +245058,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "wild-bind_0_1_2_4" = callPackage
+ ({ mkDerivation, base, containers, hspec, microlens, QuickCheck
+ , semigroups, stm, text, transformers
+ }:
+ mkDerivation {
+ pname = "wild-bind";
+ version = "0.1.2.4";
+ sha256 = "14cl18vfna21mq3ln9y3s6x7yvp13hynqfmjjv192z928wabyxqz";
+ libraryHaskellDepends = [
+ base containers semigroups text transformers
+ ];
+ testHaskellDepends = [
+ base hspec microlens QuickCheck stm transformers
+ ];
+ description = "Dynamic key binding framework";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"wild-bind-indicator" = callPackage
({ mkDerivation, base, containers, gtk, text, transformers
, wild-bind
@@ -244359,6 +245132,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "wild-bind-x11_0_2_0_7" = callPackage
+ ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl
+ , semigroups, stm, text, time, transformers, wild-bind, X11
+ }:
+ mkDerivation {
+ pname = "wild-bind-x11";
+ version = "0.2.0.7";
+ sha256 = "00lpx5lqahd5wx3f2rp0glhi9m5k0miys39fpq7p57iwvdzjhgxa";
+ libraryHaskellDepends = [
+ base containers fold-debounce mtl semigroups stm text transformers
+ wild-bind X11
+ ];
+ testHaskellDepends = [
+ async base hspec text time transformers wild-bind X11
+ ];
+ description = "X11-specific implementation for WildBind";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"wilton-ffi" = callPackage
({ mkDerivation, aeson, base, bytestring, utf8-string }:
mkDerivation {
@@ -244737,8 +245530,8 @@ self: {
}:
mkDerivation {
pname = "wkt-geom";
- version = "0.0.8";
- sha256 = "123y2xl22gmg28dcj244gk9bsbw0chz32gim48dz4bmqnkmvl7wl";
+ version = "0.0.10";
+ sha256 = "10hzfa063sp2f4v3ki7322x74iqn8wan0klalhddqfr554j3b1g5";
libraryHaskellDepends = [
base base16-bytestring binary bytestring containers geojson
scientific trifecta utf8-string vector
@@ -253727,6 +254520,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "zippers_0_3" = callPackage
+ ({ mkDerivation, base, Cabal, cabal-doctest, criterion, doctest
+ , fail, lens, profunctors, semigroupoids, semigroups
+ }:
+ mkDerivation {
+ pname = "zippers";
+ version = "0.3";
+ sha256 = "0hrsgk8sh9g3438kl79131s6vjydhivgya04yxv3h70m7pky1dpm";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ base fail lens profunctors semigroupoids semigroups
+ ];
+ testHaskellDepends = [ base doctest ];
+ benchmarkHaskellDepends = [ base criterion lens ];
+ description = "Traversal based zippers";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"zippo" = callPackage
({ mkDerivation, base, mtl, yall }:
mkDerivation {
diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix
index dc04e72c741..efbd72dcefa 100644
--- a/pkgs/development/interpreters/groovy/default.nix
+++ b/pkgs/development/interpreters/groovy/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "groovy-${version}";
- version = "2.5.6";
+ version = "2.5.7";
src = fetchurl {
url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip";
- sha256 = "14lfxnc03hmakwagvl3sb6c0b298v3awcdr1gafwnmsqv03hhkdn";
+ sha256 = "1q69xg7p790dfk09wyijpx8y85n8g9lfd0fikl6qr73k9zz5v41x";
};
buildInputs = [ unzip makeWrapper ];
diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix
index 22ccdec8a10..2fa8b50f017 100644
--- a/pkgs/development/interpreters/janet/default.nix
+++ b/pkgs/development/interpreters/janet/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "janet";
- version = "0.4.1";
+ version = "0.5.0";
src = fetchFromGitHub {
owner = "janet-lang";
repo = "janet";
rev = "v${version}";
- sha256 = "06iq2y7c9i4pcmmgc8x2fklqkj2i3jrvmq694djiiyd4x81kzcj5";
+ sha256 = "00lrj21k85sqyn4hv2rc5sny9vxghafjxyvs0dq4zp68461s3l7c";
};
JANET_BUILD=''\"release\"'';
diff --git a/pkgs/development/libraries/cfitsio/default.nix b/pkgs/development/libraries/cfitsio/default.nix
index a21158723be..32308c34ead 100644
--- a/pkgs/development/libraries/cfitsio/default.nix
+++ b/pkgs/development/libraries/cfitsio/default.nix
@@ -1,15 +1,23 @@
-{ fetchurl, stdenv }:
+{ fetchurl, stdenv
- stdenv.mkDerivation {
- name = "cfitsio-3.430";
+# Optional dependencies
+, bzip2 ? null }:
+
+stdenv.mkDerivation rec {
+ name = "cfitsio-${version}";
+ version = "3.450";
src = fetchurl {
- url = "ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3430.tar.gz";
- sha256 = "07fghxh5fl8nqk3q0dh8rvc83npnm0hisxzcj16a6r7gj5pmp40l";
+ url = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio${builtins.replaceStrings ["."] [""] version}.tar.gz";
+ sha256 = "0bmrkw6w65zb0k3mszaaqy1f4zjm2hl7njww74nb5v38wvdi4q5z";
};
+ buildInputs = [ bzip2 ];
+
patches = [ ./darwin-curl-config.patch ./darwin-rpath-universal.patch ];
+ configureFlags = stdenv.lib.optional (bzip2 != null) "--with-bzip2=${bzip2.out}";
+
# Shared-only build
buildFlags = "shared";
postPatch = '' sed -e '/^install:/s/libcfitsio.a //' -e 's@/bin/@@g' -i Makefile.in
@@ -27,8 +35,8 @@
advanced features for manipulating and filtering the information in
FITS files.
'';
- # Permissive BSD-style license.
- license = "permissive";
+ license = licenses.mit;
+ maintainers = [ maintainers.xbreak ];
platforms = with platforms; linux ++ darwin;
};
}
diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix
index 49536687a93..157a6a21f3d 100644
--- a/pkgs/development/libraries/dav1d/default.nix
+++ b/pkgs/development/libraries/dav1d/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "dav1d";
- version = "0.3.0";
+ version = "0.3.1";
src = fetchFromGitLab {
domain = "code.videolan.org";
owner = "videolan";
repo = pname;
rev = version;
- sha256 = "08vysa3naqjfvld9w1k6l6hby4xfn4l2gvnfnan498g5nss4050h";
+ sha256 = "1m5vdg64iqxpi37l84mcfiq313g9z55zf66s85j2rqik6asmxbqg";
};
nativeBuildInputs = [ meson ninja nasm ];
diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix
index 4eaded81436..78f80d2baf4 100644
--- a/pkgs/development/libraries/eccodes/default.nix
+++ b/pkgs/development/libraries/eccodes/default.nix
@@ -6,11 +6,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
name = "eccodes-${version}";
- version = "2.12.0";
+ version = "2.12.5";
src = fetchurl {
url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz";
- sha256 = "0rqkx6p85b0v6zdkm4q2r516b7ldkxhkfc0cwkl24djlkv7fanpp";
+ sha256 = "0576fccng4nvmq5gma1nb1v00if5cwl81w4nv5zkb80q5wicn50c";
};
postPatch = ''
diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix
index a37a11f5cb0..a67210e860c 100644
--- a/pkgs/development/libraries/fflas-ffpack/default.nix
+++ b/pkgs/development/libraries/fflas-ffpack/default.nix
@@ -1,28 +1,18 @@
{ stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, blas
-, fetchpatch
, gmpxx
}:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "fflas-ffpack";
- version = "2.3.2";
+ version = "2.4.0";
src = fetchFromGitHub {
owner = "linbox-team";
repo = "${pname}";
rev = "v${version}";
- sha256 = "1cqhassj2dny3gx0iywvmnpq8ca0d6m82xl5rz4mb8gaxr2kwddl";
+ sha256 = "1q1ala88ysz14pb5cn2kskv829nc1qif7zfzjwzhd5nnzwyivmc4";
};
- patches = [
- # https://github.com/linbox-team/fflas-ffpack/issues/146
- (fetchpatch {
- name = "fix-flaky-test-fgemm-check.patch";
- url = "https://github.com/linbox-team/fflas-ffpack/commit/d8cd67d91a9535417a5cb193cf1540ad6758a3db.patch";
- sha256 = "1gnfc616fvnlr0smvz6lb2d445vn8fgv6vqcr6pwm3dj4wa6v3b3";
- })
- ];
-
checkInputs = [
gmpxx
];
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index 306b4e22cfc..db606cc02d6 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -97,8 +97,7 @@
, libXv ? null # Xlib support
, libXext ? null # Xlib support
, lzma ? null # xz-utils
-, nvenc ? false, nvidia-video-sdk ? null, nv-codec-headers ? null # NVIDIA NVENC support
-, callPackage # needed for NVENC to access external ffmpeg nvidia headers
+, nvenc ? true, nv-codec-headers ? null # NVIDIA NVENC support
, openal ? null # OpenAL 1.1 capture support
#, opencl ? null # OpenCL code
, opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder
@@ -228,15 +227,14 @@ assert libxcbxfixesExtlib -> libxcb != null;
assert libxcbshapeExtlib -> libxcb != null;
assert openglExtlib -> libGLU_combined != null;
assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing;
-assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing;
stdenv.mkDerivation rec {
name = "ffmpeg-full-${version}";
- version = "4.1.2";
+ version = "4.1.3";
src = fetchurl {
url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz";
- sha256 = "0yrl6nij4b1pk1c4nbi80857dsd760gziiss2ls19awq8zj0lpxr";
+ sha256 = "0gdnprc7gk4b7ckq8wbxbrj7i00r76r9a5g9mj7iln40512j0c0c";
};
prePatch = ''
@@ -418,13 +416,13 @@ stdenv.mkDerivation rec {
++ optional ((isLinux || isFreeBSD) && libva != null) libva
++ optionals isLinux [ alsaLib libraw1394 libv4l ]
++ optional (isLinux && libmfx != null) libmfx
- ++ optionals nvenc [ nvidia-video-sdk nv-codec-headers ]
+ ++ optional nvenc nv-codec-headers
++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation
MediaToolbox VideoDecodeAcceleration
libiconv cf-private /* For _OBJC_EHTYPE_$_NSException */ ];
- # Build qt-faststart executable
- buildPhase = optional qtFaststartProgram ''make tools/qt-faststart'';
+ buildFlags = [ "all" ]
+ ++ optional qtFaststartProgram "tools/qt-faststart"; # Build qt-faststart executable
# Hacky framework patching technique borrowed from the phantomjs2 package
postInstall = optionalString qtFaststartProgram ''
diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix
index 7e2507d5afd..3066e0b12e5 100644
--- a/pkgs/development/libraries/ffmpeg/4.nix
+++ b/pkgs/development/libraries/ffmpeg/4.nix
@@ -6,7 +6,7 @@
callPackage ./generic.nix (args // rec {
version = "${branch}";
- branch = "4.1.2";
- sha256 = "00yzwc2g97h8ws0haz1p0ahaavhgrbha6xjdc53a5vyfy3zyy3i0";
+ branch = "4.1.3";
+ sha256 = "0aka5pibjhpks1wrsvqpy98v8cbvyvnngwqhh4ajkg6pbdl7k9i9";
darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];
})
diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix
index bfbce57b0a6..0221b9c7013 100644
--- a/pkgs/development/libraries/givaro/default.nix
+++ b/pkgs/development/libraries/givaro/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "givaro";
- version = "4.0.4";
+ version = "4.1.0";
src = fetchFromGitHub {
owner = "linbox-team";
repo = "${pname}";
rev = "v${version}";
- sha256 = "199p8wyj5i63jbnk7j8qbdbfp5rm2lpmcxyk3mdjy9bz7ygx3hhy";
+ sha256 = "1l1172c964hni66mjdmhr7766l5k7y63zs3hgcpr10a8f1nx3iwp";
};
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/hyperscan/default.nix b/pkgs/development/libraries/hyperscan/default.nix
index 53a3210caca..bc0ce15a083 100644
--- a/pkgs/development/libraries/hyperscan/default.nix
+++ b/pkgs/development/libraries/hyperscan/default.nix
@@ -1,5 +1,7 @@
-{ lib, stdenv, fetchFromGitHub, cmake, ragel, python27
+{ stdenv, fetchFromGitHub, cmake, ragel, python3
+, coreutils, gnused, utillinux
, boost
+, withStatic ? false # build only shared libs by default, build static+shared if true
}:
# NOTICE: pkgconfig, pcap and pcre intentionally omitted from build inputs
@@ -8,45 +10,41 @@
# I not see any reason (for now) to backport 8.41.
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "hyperscan";
- version = "5.1.0";
+ version = "5.1.1";
src = fetchFromGitHub {
owner = "intel";
- repo = "hyperscan";
- sha256 = "0r2c7s7alnq14yhbfhpkq6m28a3pyfqd427115k0754afxi82vbq";
+ repo = pname;
+ sha256 = "11adkz5ln2d2jywwlmixfnwqp5wxskq1104hmmcpws590lhkjv6j";
rev = "v${version}";
};
outputs = [ "out" "dev" ];
buildInputs = [ boost ];
- nativeBuildInputs = [ cmake ragel python27 ];
+ nativeBuildInputs = [
+ cmake ragel python3
+ # Consider simply using busybox for these
+ # Need at least: rev, sed, cut, nm
+ coreutils gnused utillinux
+ ];
cmakeFlags = [
"-DFAT_RUNTIME=ON"
"-DBUILD_AVX512=ON"
- "-DBUILD_STATIC_AND_SHARED=ON"
- ];
+ ]
+ ++ stdenv.lib.optional (withStatic) "-DBUILD_STATIC_AND_SHARED=ON"
+ ++ stdenv.lib.optional (!withStatic) "-DBUILD_SHARED_LIBS=ON";
- prePatch = ''
+ postPatch = ''
sed -i '/examples/d' CMakeLists.txt
+ substituteInPlace libhs.pc.in \
+ --replace "libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@" "libdir=@CMAKE_INSTALL_LIBDIR@" \
+ --replace "includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@" "includedir=@CMAKE_INSTALL_INCLUDEDIR@"
'';
- postInstall = ''
- mkdir -p $dev/lib
- mv $out/lib/*.a $dev/lib/
- ln -sf $out/lib/libhs.so $dev/lib/
- ln -sf $out/lib/libhs_runtime.so $dev/lib/
- '';
-
- postFixup = ''
- sed -i "s,$out/include,$dev/include," $dev/lib/pkgconfig/libhs.pc
- sed -i "s,$out/lib,$dev/lib," $dev/lib/pkgconfig/libhs.pc
- '';
-
- meta = {
+ meta = with stdenv.lib; {
description = "High-performance multiple regex matching library";
longDescription = ''
Hyperscan is a high-performance multiple regex matching library.
@@ -61,9 +59,9 @@ stdenv.mkDerivation rec {
Hyperscan is typically used in a DPI library stack.
'';
- homepage = https://www.hyperscan.io/;
- maintainers = with lib.maintainers; [ avnik ];
- platforms = [ "x86_64-linux" "x86_64-darwin" ];
- license = lib.licenses.bsd3;
+ homepage = "https://www.hyperscan.io/";
+ maintainers = with maintainers; [ avnik ];
+ platforms = [ "x86_64-linux" ]; # can't find nm on darwin ; might build on aarch64 but untested
+ license = licenses.bsd3;
};
}
diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix
index 0bb3b1f492d..52d835d7a20 100644
--- a/pkgs/development/libraries/leptonica/default.nix
+++ b/pkgs/development/libraries/leptonica/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
checkInputs = [ which gnuplot ];
- doCheck = true;
+ doCheck = !stdenv.isDarwin;
meta = {
description = "Image processing and analysis library";
diff --git a/pkgs/development/libraries/libnsl/cdefs.patch b/pkgs/development/libraries/libnsl/cdefs.patch
deleted file mode 100644
index dbbe800a347..00000000000
--- a/pkgs/development/libraries/libnsl/cdefs.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/src/rpcsvc/nislib.h
-+++ b/src/rpcsvc/nislib.h
-@@ -19,6 +19,7 @@
- #ifndef __RPCSVC_NISLIB_H__
- #define __RPCSVC_NISLIB_H__
-
-+#include
- #include
-
- __BEGIN_DECLS
---- a/src/rpcsvc/ypclnt.h
-+++ b/src/rpcsvc/ypclnt.h
-@@ -20,6 +20,7 @@
- #ifndef __RPCSVC_YPCLNT_H__
- #define __RPCSVC_YPCLNT_H__
-
-+#include
- #include
-
- /* Some defines */
---- a/src/rpcsvc/ypupd.h
-+++ b/src/rpcsvc/ypupd.h
-@@ -33,6 +33,7 @@
- #ifndef __RPCSVC_YPUPD_H__
- #define __RPCSVC_YPUPD_H__
-
-+#include
- #include
-
- #include
diff --git a/pkgs/development/libraries/libnsl/default.nix b/pkgs/development/libraries/libnsl/default.nix
index 9e8a46b2e6b..79006484743 100644
--- a/pkgs/development/libraries/libnsl/default.nix
+++ b/pkgs/development/libraries/libnsl/default.nix
@@ -1,21 +1,19 @@
{ stdenv, fetchFromGitHub, autoreconfHook, libtirpc, pkgconfig }:
stdenv.mkDerivation rec {
- name = "libnsl-${version}";
- version = "1.1.0";
+ pname = "libnsl";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "thkukuk";
- repo = "libnsl";
- rev = "libnsl-${version}";
- sha256 = "0h8br0gmgw3fp5fmy6bfbj1qlk9hry1ssg25ssjgxbd8spczpscs";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1chzqhcgh0yia9js8mh92cmhyka7rh32ql6b3mgdk26n94dqzs8b";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ libtirpc ];
- patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ ./cdefs.patch ./nis_h.patch ];
-
meta = with stdenv.lib; {
description = "Client interface library for NIS(YP) and NIS+";
homepage = https://github.com/thkukuk/libnsl;
diff --git a/pkgs/development/libraries/libnsl/nis_h.patch b/pkgs/development/libraries/libnsl/nis_h.patch
deleted file mode 100644
index 199259df2e8..00000000000
--- a/pkgs/development/libraries/libnsl/nis_h.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/src/rpcsvc/nis.h
-+++ b/src/rpcsvc/nis.h
-@@ -32,6 +32,7 @@
- #ifndef _RPCSVC_NIS_H
- #define _RPCSVC_NIS_H 1
-
-+#include
- #include
- #include
- #include
-@@ -56,6 +57,34 @@
- *
- */
-
-+#ifndef rawmemchr
-+#define rawmemchr(s,c) memchr((s),(size_t)-1,(c))
-+#endif
-+
-+#ifndef __asprintf
-+#define __asprintf asprintf
-+#endif
-+
-+#ifndef __mempcpy
-+#define __mempcpy mempcpy
-+#endif
-+
-+#ifndef __strtok_r
-+#define __strtok_r strtok_r
-+#endif
-+
-+#ifndef __always_inline
-+#define __always_inline __attribute__((__always_inline__))
-+#endif
-+
-+#ifndef TEMP_FAILURE_RETRY
-+#define TEMP_FAILURE_RETRY(exp) ({ \
-+typeof (exp) _rc; \
-+ do { \
-+ _rc = (exp); \
-+ } while (_rc == -1 && errno == EINTR); \
-+ _rc; })
-+#endif
-
- #ifndef __nis_object_h
- #define __nis_object_h
diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix
index 257ac8e277d..c5ff7c11713 100644
--- a/pkgs/development/libraries/libxmlb/default.nix
+++ b/pkgs/development/libraries/libxmlb/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
name = "libxmlb-${version}";
- version = "0.1.8";
+ version = "0.1.9";
outputs = [ "out" "lib" "dev" "devdoc" ];
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "hughsie";
repo = "libxmlb";
rev = version;
- sha256 = "0nry2a4vskfklykd20smp4maqpzibc65rzyv4i71nrc55dyjpy7x";
+ sha256 = "1rdpsssrwpx24snqb82hisjybnpz9fq91wbmxfi2s63xllzi14b6";
};
nativeBuildInputs = [ meson ninja python3 pkgconfig gobject-introspection gtk-doc shared-mime-info docbook_xsl docbook_xml_dtd_43 ];
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
homepage = https://github.com/hughsie/libxmlb;
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ jtojnar ];
- platforms = platforms.unix;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix
index ef2dbb10fba..8389ba7e3e0 100644
--- a/pkgs/development/libraries/linbox/default.nix
+++ b/pkgs/development/libraries/linbox/default.nix
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "linbox";
- version = "1.5.2";
+ version = "1.6.0";
src = fetchFromGitHub {
owner = "linbox-team";
repo = "${pname}";
rev = "v${version}";
- sha256 = "1wfivlwp30mzdy1697w7rzb8caajim50mc8h27k82yipn2qc5n4i";
+ sha256 = "0rmk474hvgkggmhxwa5i52wdnbvipx9n8mpsc41j1c96q4v8fl22";
};
nativeBuildInputs = [
@@ -51,16 +51,6 @@ stdenv.mkDerivation rec {
"--enable-sage"
];
- patches = stdenv.lib.optionals withSage [
- # https://trac.sagemath.org/ticket/24214#comment:39
- # Will be resolved by
- # https://github.com/linbox-team/linbox/issues/69
- (fetchpatch {
- url = "https://raw.githubusercontent.com/sagemath/sage/a843f48b7a4267e44895a3dfa892c89c85b85611/build/pkgs/linbox/patches/linbox_charpoly_fullCRA.patch";
- sha256 = "16nxfzfknra3k2yk3xy0k8cq9rmnmsch3dnkb03kx15h0y0jmibk";
- })
- ];
-
doCheck = true;
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/nv-codec-headers/default.nix b/pkgs/development/libraries/nv-codec-headers/default.nix
index 07ec502cd12..73ed932afb6 100644
--- a/pkgs/development/libraries/nv-codec-headers/default.nix
+++ b/pkgs/development/libraries/nv-codec-headers/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
meta = {
description = "FFmpeg version of headers for NVENC";
homepage = http://ffmpeg.org/;
- license = stdenv.lib.licenses.gpl3Plus;
+ license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.MP2E ];
platforms = stdenv.lib.platforms.all;
};
diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix
index 2c63f893a2c..43f0e431bb1 100644
--- a/pkgs/development/libraries/qscintilla/default.nix
+++ b/pkgs/development/libraries/qscintilla/default.nix
@@ -20,8 +20,10 @@ stdenv.mkDerivation rec {
sha256 = "04678skipydx68zf52vznsfmll2v9aahr66g50lcqbr6xsmgr1yi";
};
- buildInputs = [ (if withQt5 then qtbase else qt4) ]
- ++ lib.optional (withQt5 && stdenv.isDarwin) qtmacextras;
+ buildInputs = [ (if withQt5 then qtbase else qt4) ];
+
+ propagatedBuildInputs = lib.optional (withQt5 && stdenv.isDarwin) qtmacextras;
+
nativeBuildInputs = [ unzip ]
++ (if withQt5 then [ qmake ] else [ qmake4Hook ])
++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index a1f7a2096e5..e13f6a4d96e 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -76,6 +76,26 @@ basexx = buildLuarocksPackage {
};
};
};
+binaryheap = buildLuarocksPackage {
+ pname = "binaryheap";
+ version = "0.4-1";
+
+ src = fetchurl {
+ url = https://luarocks.org/binaryheap-0.4-1.src.rock;
+ sha256 = "11rd8r3bpinfla2965jgjdv1hilqdc1q6g1qla5978d7vzg19kpc";
+ };
+ disabled = ( luaOlder "5.1");
+ propagatedBuildInputs = [ lua ];
+ buildType = "builtin";
+
+ meta = {
+ homepage = "https://github.com/Tieske/binaryheap.lua";
+ description="Binary heap implementation in pure Lua";
+ license = {
+ fullName = "MIT/X11";
+ };
+ };
+};
dkjson = buildLuarocksPackage {
pname = "dkjson";
version = "2.5-2";
@@ -116,6 +136,26 @@ fifo = buildLuarocksPackage {
};
};
};
+http = buildLuarocksPackage {
+ pname = "http";
+ version = "0.3-0";
+
+ src = fetchurl {
+ url = https://luarocks.org/http-0.3-0.src.rock;
+ sha256 = "0vvl687bh3cvjjwbyp9cphqqccm3slv4g7y3h03scp3vpq9q4ccq";
+ };
+ disabled = ( luaOlder "5.1");
+ propagatedBuildInputs = [ lua compat53 bit32 cqueues luaossl basexx lpeg lpeg_patterns binaryheap fifo ];
+ buildType = "builtin";
+
+ meta = {
+ homepage = "https://github.com/daurnimator/lua-http";
+ description="HTTP library for Lua";
+ license = {
+ fullName = "MIT";
+ };
+ };
+};
inspect = buildLuarocksPackage {
pname = "inspect";
version = "3.1.1-0";
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index 0cf0c70faa1..c88f5f9f57c 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -56,7 +56,7 @@ with super;
'';
});
- luuid = super.luuid.override({
+ luuid = super.luuid.override(oa: {
buildInputs = [ pkgs.libuuid ];
extraConfig = ''
variables = {
@@ -64,7 +64,7 @@ with super;
LIBUUID_LIBDIR="${pkgs.lib.getLib pkgs.libuuid}/lib";
}
'';
- meta = {
+ meta = oa.meta // {
platforms = pkgs.lib.platforms.linux;
};
});
@@ -75,4 +75,27 @@ with super;
sed -i '/set(CMAKE_C_FLAGS/d' CMakeLists.txt
'';
});
- }
+
+ binaryheap = super.binaryheap.overrideAttrs(oa: {
+ meta = oa.meta // {
+ maintainers = with pkgs.lib.maintainers; oa.meta.maintainers ++ [ vcunat ];
+ };
+ });
+
+ http = super.http.overrideAttrs(oa: {
+ patches = oa.patches or [] ++ [
+ (pkgs.fetchpatch {
+ name = "invalid-state-progression.patch";
+ url = "https://github.com/daurnimator/lua-http/commit/cb7b59474a.diff";
+ sha256 = "1vmx039n3nqfx50faqhs3wgiw28ws416rhw6vh6srmh9i826dac7";
+ })
+ ];
+ /* TODO: separate docs derivation? (pandoc is heavy)
+ nativeBuildInputs = [ pandoc ];
+ makeFlags = [ "-C doc" "lua-http.html" "lua-http.3" ];
+ */
+ meta = oa.meta // {
+ maintainers = with pkgs.lib.maintainers; oa.meta.maintainers ++ [ vcunat ];
+ };
+ });
+}
diff --git a/pkgs/development/ocaml-modules/cairo2/default.nix b/pkgs/development/ocaml-modules/cairo2/default.nix
index 1213120ce1c..22d000a5fd3 100644
--- a/pkgs/development/ocaml-modules/cairo2/default.nix
+++ b/pkgs/development/ocaml-modules/cairo2/default.nix
@@ -4,11 +4,11 @@
buildDunePackage rec {
pname = "cairo2";
- version = "0.6";
+ version = "0.6.1";
src = fetchurl {
url = "https://github.com/Chris00/ocaml-cairo/releases/download/${version}/cairo2-${version}.tbz";
- sha256 = "1k2q7ipmddqnd2clybj4qb5xwzzrnl2fxnd6kv60dlzgya18lchs";
+ sha256 = "1ik4qf4b9443sliq2z7x9acd40rmzvyzjh3bh98wvjklxbb84a9i";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix
index fd42cbe20c7..c3e5a272f74 100644
--- a/pkgs/development/ocaml-modules/elpi/default.nix
+++ b/pkgs/development/ocaml-modules/elpi/default.nix
@@ -2,14 +2,18 @@
, ppx_tools_versioned, ppx_deriving, re
}:
+if !stdenv.lib.versionAtLeast ocaml.version "4.03"
+then throw "elpi is not available for OCaml ${ocaml.version}"
+else
+
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-elpi-${version}";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "LPCIC";
repo = "elpi";
rev = "v${version}";
- sha256 = "1fd4mqggdcnbhqwrg8r0ikb1j2lv0fc9hv9xfbyjzbzxbjggf5zc";
+ sha256 = "1n4jpidx0vk4y66bhd704ajn8n6f1fd5wsi1shj6wijfmjl14h7s";
};
buildInputs = [ ocaml findlib ppx_tools_versioned ];
diff --git a/pkgs/development/ocaml-modules/lablgtk3/default.nix b/pkgs/development/ocaml-modules/lablgtk3/default.nix
index 7c6198add62..8ba27248db6 100644
--- a/pkgs/development/ocaml-modules/lablgtk3/default.nix
+++ b/pkgs/development/ocaml-modules/lablgtk3/default.nix
@@ -1,16 +1,14 @@
-{ lib, fetchFromGitHub, pkgconfig, buildDunePackage, gtk3, cairo2 }:
+{ lib, fetchurl, pkgconfig, buildDunePackage, gtk3, cairo2 }:
buildDunePackage rec {
- version = "3.0.beta5";
+ version = "3.0.beta6";
pname = "lablgtk3";
minimumOCamlVersion = "4.05";
- src = fetchFromGitHub {
- owner = "garrigue";
- repo = "lablgtk";
- rev = version;
- sha256 = "05n3pjy4496gbgxwbypfm2462njv6dgmvkcv26az53ianpwa4vzz";
+ src = fetchurl {
+ url = "https://github.com/garrigue/lablgtk/releases/download/${version}/lablgtk3-${version}.tbz";
+ sha256 = "1jni5cbp54qs7y0dc5zkm28v2brpfwy5miighv7cy0nmmxrsq520";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/python-modules/aiorpcx/default.nix b/pkgs/development/python-modules/aiorpcx/default.nix
index fd853e631a7..a5f54d8e96c 100644
--- a/pkgs/development/python-modules/aiorpcx/default.nix
+++ b/pkgs/development/python-modules/aiorpcx/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "aiorpcx";
- version = "0.10.5";
+ version = "0.17.0";
src = fetchPypi {
inherit version;
pname = "aiorpcX";
- sha256 = "0c4kan020s09ap5qai7p1syxjz2wk6g9ydhxj6fc35s4103x7b91";
+ sha256 = "14np5r75rs0v45vsv20vbzmnv3qisvm9mdllj1j9s1633cvcik0k";
};
propagatedBuildInputs = [ attrs ];
diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix
index 155ddf8c9f8..a07d370761a 100644
--- a/pkgs/development/python-modules/asgiref/default.nix
+++ b/pkgs/development/python-modules/asgiref/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, async-timeout, pytest, pytest-asyncio }:
buildPythonPackage rec {
- version = "2.3.2";
+ version = "3.1.2";
pname = "asgiref";
disabled = pythonOlder "3.5";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
owner = "django";
repo = pname;
rev = version;
- sha256 = "1ljymmcscyp3bz33kjbhf99k04fbama87vg4069gbgj6lnxjpzav";
+ sha256 = "1y32ys1q07nyri0b053mx24qvkw305iwvqvqgi2fdhx0va8d7qfy";
};
propagatedBuildInputs = [ async-timeout ];
diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix
index 224e39736a8..a9734745f21 100644
--- a/pkgs/development/python-modules/aws-sam-translator/default.nix
+++ b/pkgs/development/python-modules/aws-sam-translator/default.nix
@@ -1,7 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
-, isPy3k
+, pythonOlder
, boto3
, enum34
, jsonschema
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "aws-sam-translator";
- version = "1.10.0";
+ version = "1.11.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0axr4598b1h9kyb5mv104cpn5q667s0g1wkkbqzj66vrqsaa07qf";
+ sha256 = "db872c43bdfbbae9fc8c9201e6a7aeb9a661cda116a94708ab0577b46a38b962";
};
# Tests are not included in the PyPI package
@@ -22,10 +22,9 @@ buildPythonPackage rec {
propagatedBuildInputs = [
boto3
- enum34
jsonschema
six
- ];
+ ] ++ lib.optionals (pythonOlder "3.4") [ enum34 ];
meta = {
homepage = https://github.com/awslabs/serverless-application-model;
diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix
index a40238412c6..dbf5a8686cd 100644
--- a/pkgs/development/python-modules/cassandra-driver/default.nix
+++ b/pkgs/development/python-modules/cassandra-driver/default.nix
@@ -21,11 +21,11 @@
buildPythonPackage rec {
pname = "cassandra-driver";
- version = "3.17.0";
+ version = "3.17.1";
src = fetchPypi {
inherit pname version;
- sha256 = "1z49z6f9rj9kp1v03s1hs1rg8cj49rh0yk0fc2qi57w7slgy2hkd";
+ sha256 = "1y6pnm7vzg9ip1nbly3i8mmwqmcy8g38ix74vdzvvaxwxil9bmvi";
};
buildInputs = [
diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix
index ef8456d376c..a3b7e54c57a 100644
--- a/pkgs/development/python-modules/channels/default.nix
+++ b/pkgs/development/python-modules/channels/default.nix
@@ -3,11 +3,11 @@
}:
buildPythonPackage rec {
pname = "channels";
- version = "2.1.7";
+ version = "2.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "e13ba874d854ac493ece329dcd9947e82357c15437ac1a90ed1040d0e5b87aad";
+ sha256 = "af7cdba9efb3f55b939917d1b15defb5d40259936013e60660e5e9aff98db4c5";
};
# Files are missing in the distribution
diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix
index 65f6cb291b2..4f9794b034e 100644
--- a/pkgs/development/python-modules/confluent-kafka/default.nix
+++ b/pkgs/development/python-modules/confluent-kafka/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro, futures}:
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro, futures, enum34 }:
buildPythonPackage rec {
- version = "0.11.6";
+ version = "1.0.0";
pname = "confluent-kafka";
src = fetchPypi {
inherit pname version;
- sha256 = "1dvzlafgr4g0n7382s5bgbls3f9wrgr0yxd70yyxl59wddwzfii7";
+ sha256 = "a7427944af963410479c2aaae27cc9d28db39c9a93299f14dcf16df80092c63a";
};
- buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ avro futures ]) ;
+ buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ enum34 avro futures ]) ;
- # Tests fail for python3 under this pypi release
- doCheck = if isPy3k then false else true;
+ # No tests in PyPi Tarball
+ doCheck = false;
meta = with stdenv.lib; {
description = "Confluent's Apache Kafka client for Python";
diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix
index da85fbb1d9b..e577617c478 100644
--- a/pkgs/development/python-modules/daphne/default.nix
+++ b/pkgs/development/python-modules/daphne/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub
+{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch
, asgiref, autobahn, twisted, pytestrunner
, hypothesis, pytest, pytest-asyncio
}:
buildPythonPackage rec {
pname = "daphne";
- version = "2.2.5";
+ version = "2.3.0";
disabled = !isPy3k;
@@ -12,9 +12,17 @@ buildPythonPackage rec {
owner = "django";
repo = pname;
rev = version;
- sha256 = "0ixgq1rr3s60bmrwx8qwvlvs3lag1c2nrmg4iy7wcmb8i1ddylqr";
+ sha256 = "020afrvbnid13gkgjpqznl025zpynisa96kybmf8q7m3wp1iq1nl";
};
+ patches = [
+ # Fix compatibility with Hypothesis 4. See: https://github.com/django/daphne/pull/261
+ (fetchpatch {
+ url = "https://github.com/django/daphne/commit/2df5096c5b63a791c209e12198ad89c998869efd.patch";
+ sha256 = "0046krzcn02mihqmsjd80kk5h5flv44nqxpapa17g6dvq3jnb97n";
+ })
+ ];
+
nativeBuildInputs = [ pytestrunner ];
propagatedBuildInputs = [ asgiref autobahn twisted ];
diff --git a/pkgs/development/python-modules/django_guardian/default.nix b/pkgs/development/python-modules/django_guardian/default.nix
index 90b81c8379e..11ad13cb4a1 100644
--- a/pkgs/development/python-modules/django_guardian/default.nix
+++ b/pkgs/development/python-modules/django_guardian/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k
+{ stdenv, buildPythonPackage, fetchPypi
, django_environ, mock, django, six
, pytest, pytestrunner, pytest-django
}:
buildPythonPackage rec {
pname = "django-guardian";
- version = "1.5.0";
+ version = "1.5.1";
src = fetchPypi {
inherit pname version;
- sha256 = "9e144bbdfa67f523dc6f70768653a19c0aac29394f947a80dcb8eb7900840637";
+ sha256 = "0fixr2g5amdgqzh0rvfvd7hbxyfd5ra3y3s0fsmp8i1b68p97930";
};
checkInputs = [ pytest pytestrunner pytest-django django_environ mock ];
@@ -18,6 +18,5 @@ buildPythonPackage rec {
description = "Per object permissions for Django";
homepage = https://github.com/django-guardian/django-guardian;
license = [ licenses.mit licenses.bsd2 ];
- broken = !isPy3k; # https://github.com/django-guardian/django-guardian/pull/605
};
}
diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix
index d53556f0d07..89e7647aa04 100644
--- a/pkgs/development/python-modules/fs/default.nix
+++ b/pkgs/development/python-modules/fs/default.nix
@@ -19,11 +19,11 @@
buildPythonPackage rec {
pname = "fs";
- version = "2.4.4";
+ version = "2.4.5";
src = fetchPypi {
inherit pname version;
- sha256 = "0krf632nz24v2da7g9xivq6l2w9za3vph4vix7mm1k3byzwjnawk";
+ sha256 = "1gv23ns9szdh1dgqzvc0r94qrv8fpjqj0xv99sniy2x3rxs2n0j2";
};
buildInputs = [ glibcLocales ];
diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix
index 2bd1bfce6f9..93e52c51dda 100644
--- a/pkgs/development/python-modules/gensim/default.nix
+++ b/pkgs/development/python-modules/gensim/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "gensim";
- version = "3.7.2";
+ version = "3.7.3";
src = fetchPypi {
inherit pname version;
- sha256 = "1la4y935sdah8ywa7krwy80hcl4n2k8cdx4ncy3dg3y2mdg3vq24";
+ sha256 = "0mp1hbj7ciwpair7z445zj1grfv8c75gby9lih01c3mvw4pff7v2";
};
propagatedBuildInputs = [ smart_open numpy six scipy ];
diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix
index 38a3724f00a..25a5e7e3ed5 100644
--- a/pkgs/development/python-modules/geopandas/default.nix
+++ b/pkgs/development/python-modules/geopandas/default.nix
@@ -4,14 +4,14 @@
buildPythonPackage rec {
pname = "geopandas";
- version = "0.4.1";
+ version = "0.5.0";
name = pname + "-" + version;
src = fetchFromGitHub {
owner = "geopandas";
repo = "geopandas";
rev = "v${version}";
- sha256 = "02v3lszxvhpsb0qrqk0kcnf9jss9gdj8az2r97aqx7ya8cwaccxa";
+ sha256 = "0gmqksjgxrng52jvjk0ylkpsg0qriygb10b7n80l28kdz6c0givj";
};
checkInputs = [ pytest Rtree ];
diff --git a/pkgs/development/python-modules/google_cloud_speech/default.nix b/pkgs/development/python-modules/google_cloud_speech/default.nix
index 81576ad8cc1..5fb1cb65320 100644
--- a/pkgs/development/python-modules/google_cloud_speech/default.nix
+++ b/pkgs/development/python-modules/google_cloud_speech/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "google-cloud-speech";
- version = "0.36.3";
+ version = "1.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "3d77da6086c01375908c8b800808ff83748a34b98313f885bd86df95448304fc";
+ sha256 = "1d0ysapqrcwcyiil7nyh8vbj4i6hk9v23rrm4rdhgm0lwax7i0aj";
};
propagatedBuildInputs = [ google_api_core ];
diff --git a/pkgs/development/python-modules/j2cli/default.nix b/pkgs/development/python-modules/j2cli/default.nix
index 2f8ab29d432..0b3d1981dc6 100644
--- a/pkgs/development/python-modules/j2cli/default.nix
+++ b/pkgs/development/python-modules/j2cli/default.nix
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "j2cli";
- version = "0.3.7";
+ version = "0.3.8";
disabled = isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "a7b0bdb02a3afb6d2eff40228b2216306332ace4341372310dafd15f938e1afa";
+ sha256 = "1f1a5fzap4ji5l7x8bprrgcpy1071lpa9g5h8jz7iqzgqynkaygi";
};
buildInputs = [ nose ];
diff --git a/pkgs/development/python-modules/lark-parser/default.nix b/pkgs/development/python-modules/lark-parser/default.nix
index 5d114fcab9c..33965221cec 100644
--- a/pkgs/development/python-modules/lark-parser/default.nix
+++ b/pkgs/development/python-modules/lark-parser/default.nix
@@ -15,12 +15,11 @@ buildPythonPackage rec {
sha256 = "1zynj09w361yvbxr4hir681dfnlq1hzniws9dzgmlkvd6jnhjgx3";
};
- checkPhase = ''
- ${python.interpreter} -m unittest
+ # tests of Nearley support require js2py
+ preCheck = ''
+ rm -r tests/test_nearley
'';
- doCheck = false; # Requires js2py
-
meta = {
description = "A modern parsing library for Python, implementing Earley & LALR(1) and an easy interface";
homepage = https://github.com/lark-parser/lark;
diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix
index d8131ffc3bd..ee5110995b0 100644
--- a/pkgs/development/python-modules/netcdf4/default.nix
+++ b/pkgs/development/python-modules/netcdf4/default.nix
@@ -3,13 +3,13 @@
}:
buildPythonPackage rec {
pname = "netCDF4";
- version = "1.5.0.1";
+ version = "1.5.1.2";
disabled = isPyPy;
src = fetchPypi {
inherit pname version;
- sha256 = "db24f7ca724e791574774b2a1e323ce0dfb544957fc6fbdb5d4c368f382b2de9";
+ sha256 = "161pqb7xc9nj0dlnp6ply8c6zv68y1frq619xqfrpmc9s1932jzk";
};
checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/pyaxmlparser/default.nix b/pkgs/development/python-modules/pyaxmlparser/default.nix
index c5be26bd9b7..1034c9d844d 100644
--- a/pkgs/development/python-modules/pyaxmlparser/default.nix
+++ b/pkgs/development/python-modules/pyaxmlparser/default.nix
@@ -1,7 +1,7 @@
{ buildPythonPackage, stdenv, lxml, click, fetchFromGitHub, pytest, isPy3k }:
buildPythonPackage rec {
- version = "0.3.13";
+ version = "0.3.15";
pname = "pyaxmlparser";
# the PyPI tarball doesn't ship tests.
@@ -9,7 +9,7 @@ buildPythonPackage rec {
owner = "appknox";
repo = pname;
rev = "v${version}";
- sha256 = "0jfjhxc6b57npsidknxmhj1x813scg47aaw90ybyr90fpdz5rlwk";
+ sha256 = "0p4x21rg8h7alrg2zk6rbgc3fj77fiyky4zzvziz2bp5jpx1pvzp";
};
disabled = !isPy3k;
diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix
index 08c8547edbd..7b07bf3ff05 100644
--- a/pkgs/development/python-modules/ropper/default.nix
+++ b/pkgs/development/python-modules/ropper/default.nix
@@ -8,11 +8,11 @@
buildPythonApplication rec {
pname = "ropper";
- version = "1.11.13";
+ version = "1.12.1";
src = fetchPypi {
inherit pname version;
- sha256 = "245c6a1c8b294209bed039cd6a389f1e298d3fe6783d48ad9c6b2df3a41f51ee";
+ sha256 = "1aignpxz6rcbf6yxy1gjr708p56i6nqrbgblq24nanssz9rhkyzg";
};
# XXX tests rely on user-writeable /dev/shm to obtain process locks and return PermissionError otherwise
# workaround: sudo chmod 777 /dev/shm
@@ -25,7 +25,7 @@ buildPythonApplication rec {
propagatedBuildInputs = [ capstone filebytes ];
meta = with stdenv.lib; {
homepage = https://scoding.de/ropper/;
- license = licenses.gpl2;
+ license = licenses.bsd3;
description = "Show information about files in different file formats";
maintainers = with maintainers; [ bennofs ];
};
diff --git a/pkgs/development/python-modules/streamz/default.nix b/pkgs/development/python-modules/streamz/default.nix
index f779862dc61..87de719025d 100644
--- a/pkgs/development/python-modules/streamz/default.nix
+++ b/pkgs/development/python-modules/streamz/default.nix
@@ -14,19 +14,13 @@
buildPythonPackage rec {
pname = "streamz";
- version = "0.5.0";
+ version = "0.5.1";
src = fetchPypi {
inherit pname version;
- sha256 = "cfdd42aa62df299f550768de5002ec83112136a34b44441db9d633b2df802fb4";
+ sha256 = "80c9ded1d6e68d3b78339deb6e9baf93a633d84b4a8875221e337ac06890103f";
};
- # Pytest 4.x fails to collect streamz-dataframe tests.
- # Removing them in v0.5.0. TODO: re-enable in a future release
- postPatch = ''
- rm -rf streamz/dataframe/tests/*.py
- '';
-
checkInputs = [ pytest networkx distributed confluent-kafka graphviz ];
propagatedBuildInputs = [
tornado
@@ -35,8 +29,9 @@ buildPythonPackage rec {
six
];
+ # Disable test_tcp_async because fails on sandbox build
checkPhase = ''
- pytest
+ pytest --deselect=streamz/tests/test_sources.py::test_tcp_async
'';
meta = with lib; {
diff --git a/pkgs/development/python-modules/zstd/default.nix b/pkgs/development/python-modules/zstd/default.nix
index 54eb4c43ec4..3706fd06a15 100644
--- a/pkgs/development/python-modules/zstd/default.nix
+++ b/pkgs/development/python-modules/zstd/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "zstd";
- version = "1.3.8.1";
+ version = "1.4.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "d89e884da59c35e480439f1663cb3cb4cf372e42ba0eb0bdf22b9625414702a3";
+ sha256 = "01prq9rwz1gh42idnj2162w79dzs8gf3ac8pn12lz347w280kjbk";
};
postPatch = ''
diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index 89df5c1241b..babc46115e8 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "jenkins-${version}";
- version = "2.164.2";
+ version = "2.164.3";
src = fetchurl {
url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
- sha256 = "1pmya8g3gs5f9ibbgacdh5f6828jcrydw7v7xmg2j86kwc1vclf8";
+ sha256 = "03m5ykl6kqih9li2fhyq9rf8x8djaj2rgjd2p897zzw5j0grkbx8";
};
buildCommand = ''
diff --git a/pkgs/development/tools/icr/default.nix b/pkgs/development/tools/icr/default.nix
index 8fb79a9eabe..668fb2204d6 100644
--- a/pkgs/development/tools/icr/default.nix
+++ b/pkgs/development/tools/icr/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchFromGitHub, crystal, shards, which
-, openssl, readline }:
+{ stdenv, fetchFromGitHub, crystal, shards, which, makeWrapper
+, openssl, readline, libyaml }:
stdenv.mkDerivation rec {
pname = "icr";
- version = "0.5.0";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "crystal-community";
- repo = "icr";
+ repo = pname;
rev = "v${version}";
- sha256 = "1vavdzgm06ssnxm6mylki6xma0mfsj63n5kivhk1v4pg4xj966w5";
+ sha256 = "0kkdqrxk4f4bqbb84mgjrk9r0fz1hsz95apvjsc49gav4c8xx3mb";
};
postPatch = ''
@@ -17,17 +17,20 @@ stdenv.mkDerivation rec {
--replace /usr/local $out
'';
- buildInputs = [ openssl readline ];
+ buildInputs = [ crystal libyaml openssl readline ];
- nativeBuildInputs = [ crystal shards which ];
+ nativeBuildInputs = [ makeWrapper shards which ];
doCheck = true;
-
checkTarget = "test";
+ postInstall = ''
+ wrapProgram $out/bin/icr --prefix PATH : "${stdenv.lib.makeBinPath [ crystal ]}"
+ '';
+
meta = with stdenv.lib; {
description = "Interactive console for the Crystal programming language";
- homepage = https://github.com/crystal-community/icr;
+ homepage = "https://github.com/crystal-community/icr";
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg ];
};
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 0bead8d65f7..1edd2944eab 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -3,7 +3,9 @@
# Enabling all targets increases output size to a multiple.
, withAllTargets ? false, libbfd, libopcodes
, enableShared ? true
-, noSysDirs, gold ? true, bison ? null
+, noSysDirs
+, gold ? !stdenv.buildPlatform.isDarwin || stdenv.hostPlatform == stdenv.targetPlatform
+, bison ? null
, fetchpatch
}:
@@ -61,14 +63,7 @@ stdenv.mkDerivation rec {
./0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch
./0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch
./0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch
- ] ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch
- ++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.targetPlatform != stdenv.hostPlatform) [
- (fetchpatch {
- url = "https://sourceware.org/bugzilla/attachment.cgi?id=11141";
- name = "gold-threads.patch";
- sha256 = "0p26dxpba8n7z3pwjg7qf94f0gzbvwkjq0j9ng1w3sljj0gyaf1j";
- })
- ];
+ ] ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch;
outputs = [ "out" "info" "man" ];
diff --git a/pkgs/development/tools/proto-contrib/default.nix b/pkgs/development/tools/proto-contrib/default.nix
new file mode 100644
index 00000000000..83668389556
--- /dev/null
+++ b/pkgs/development/tools/proto-contrib/default.nix
@@ -0,0 +1,23 @@
+{ buildGoModule, fetchFromGitHub, lib }:
+
+buildGoModule rec {
+ pname = "proto-contrib";
+ version = "0.9.0";
+
+ src = fetchFromGitHub {
+ owner = "emicklei";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0ksxic7cypv9gg8q5lkl5bla1n9i65z7b03cx9lwq6252glmf2jk";
+ };
+
+ modSha256 = "19cqz13jd95d5vibd10420gg69ldgf6afc51mkglhafgmmif56b0";
+
+ meta = with lib; {
+ description = "Contributed tools and other packages on top of the Go proto package";
+ homepage = https://github.com/emicklei/proto-contrib;
+ license = licenses.mit;
+ maintainers = with maintainers; [ kalbasit ];
+ platforms = platforms.linux ++ platforms.darwin;
+ };
+}
diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix
index a3756d27e46..38620863ebf 100644
--- a/pkgs/development/tools/yarn/default.nix
+++ b/pkgs/development/tools/yarn/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "yarn";
- version = "1.15.2";
+ version = "1.16.0";
src = fetchzip {
url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz";
- sha256 = "0gvg6m0mdppgjp5lg3mz1w19c1zsflhgldzx4hgm3rlrbx3rzmvr";
+ sha256 = "1ki518ppw7bka4bfgvsv9s8x785vy23nvi7ihsw6ivisrg5v0w7w";
};
buildInputs = [ nodejs ];
diff --git a/pkgs/development/web/twitter-bootstrap/3.nix b/pkgs/development/web/twitter-bootstrap/3.nix
new file mode 100644
index 00000000000..71cda3d3d9f
--- /dev/null
+++ b/pkgs/development/web/twitter-bootstrap/3.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+ name = "bootstrap-${version}";
+ version = "3.4.1";
+
+ src = fetchurl {
+ url = "https://github.com/twbs/bootstrap/releases/download/v${version}/bootstrap-${version}-dist.zip";
+ sha256 = "0bnrxyryl4kyq250k4n2lxgkddfs9lxhqd6gq8x3kg9wfz7r75yl";
+ };
+
+ buildInputs = [ unzip ];
+
+ dontBuild = true;
+ installPhase = ''
+ mkdir $out
+ cp -r * $out/
+ '';
+
+ meta = {
+ description = "Front-end framework for faster and easier web development";
+ homepage = https://getbootstrap.com/;
+ license = stdenv.lib.licenses.mit;
+ };
+
+}
diff --git a/pkgs/development/web/twitter-bootstrap/default.nix b/pkgs/development/web/twitter-bootstrap/default.nix
index 7537c2795d2..61e7947a479 100644
--- a/pkgs/development/web/twitter-bootstrap/default.nix
+++ b/pkgs/development/web/twitter-bootstrap/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec {
- name = "bootstrap-${version}";
- version = "3.3.7";
+ pname = "bootstrap";
+ version = "4.3.1";
src = fetchurl {
- url = "https://github.com/twbs/bootstrap/releases/download/v${version}/bootstrap-${version}-dist.zip";
- sha256 = "0yqvg72knl7a0rlszbpk7xf7f0cs3aqf9xbl42ff41yh5pzsi67l";
+ url = "https://github.com/twbs/bootstrap/releases/download/v${version}/${pname}-${version}-dist.zip";
+ sha256 = "08rkg4q8x36k03g1d81brhncrzb98sh8r53a5wg3i4p1nwqgv3w8";
};
buildInputs = [ unzip ];
diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix
index e4ec4dffa1d..5800f8026ac 100644
--- a/pkgs/games/chessx/default.nix
+++ b/pkgs/games/chessx/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "chessx-${version}";
- version = "1.4.6";
+ version = "1.5.0";
src = fetchurl {
url = "mirror://sourceforge/chessx/chessx-${version}.tgz";
- sha256 = "1vb838byzmnyglm9mq3khh3kddb9g4g111cybxjzalxxlc81k5dd";
+ sha256 = "09rqyra28w3z9ldw8sx07k5ap3sjlli848p737maj7c240rasc6i";
};
buildInputs = [
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index f984c791811..8cf9fa199d9 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.14.117";
+ version = "4.14.118";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0gzjp731fgasi3nq39zz27h1x6mkvc0hbwjhmn9gyzd7wwsa2md8";
+ sha256 = "05csfas10b3kfj6pn72skxpk211y36bdzk5x63n6dbxrsjmp6zb8";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index 826a0c09e2f..08009fe8799 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.19.41";
+ version = "4.19.42";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "10j7f78220rswdvng2fpmsvri2pqx2hm7q3z2k2cnr2ca2b65plh";
+ sha256 = "09ns4qskl2drg0p9fajy7nbh55anj0qxl7smca9rfxfm21hdf2gq";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 77de1524435..d6afc0f54d3 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.9.174";
+ version = "4.9.175";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0n2qhvvphv45fckrhvcf58va8mv2j7pg7yvr2yxmbzvz0xlgv17w";
+ sha256 = "032h0zd3rxg34vyp642978pbx66gnx3sfv49qwvbzwlx3zwk916r";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.0.nix b/pkgs/os-specific/linux/kernel/linux-5.0.nix
index 48e72632498..d48b4da3371 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.0.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.0.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "5.0.14";
+ version = "5.0.15";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "0qbcczrrg3v7gm5x534h8fzasp53kimca3x3dzwc084arxv60drf";
+ sha256 = "01zb8lz1lxcff2j8yxzm0ayfazi07c2n7v1i3v8wbq8k9r2vhgjw";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.1.nix b/pkgs/os-specific/linux/kernel/linux-5.1.nix
index 648be21f4cd..235848bb876 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.1.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "5.1";
+ version = "5.1.1";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "0hghjkxgf1p8mfm04a9ckjvyrnp71jp3pbbp0qsx35rzwzk7nsnh";
+ sha256 = "1pcd0npnrjbc01rzmm58gh135w9nm5mf649asqlw50772qa9jkd0";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index bf435cc862c..4e49256be9f 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -21,6 +21,11 @@ stdenv.mkDerivation rec {
patches = [ ./install_prefix.patch ];
+ # Backported fix for 0.7.13 to build with 5.1, please remove when updating to 0.7.14
+ postPatch = optionalString (versionAtLeast kernel.version "5.1") ''
+ sed -i 's/get_ds()/KERNEL_DS/g' module/spl/spl-vnode.c
+ '';
+
nativeBuildInputs = [ autoreconfHook ] ++ kernel.moduleBuildDependencies;
hardeningDisable = [ "fortify" "stackprotector" "pic" ];
diff --git a/pkgs/servers/demoit/default.nix b/pkgs/servers/demoit/default.nix
index 24eafb98747..93db472270e 100644
--- a/pkgs/servers/demoit/default.nix
+++ b/pkgs/servers/demoit/default.nix
@@ -5,14 +5,14 @@
buildGoPackage rec {
pname = "demoit";
- version = "unstable-2019-03-29";
+ version = "unstable-2019-05-10";
goPackagePath = "github.com/dgageot/demoit";
src = fetchFromGitHub {
owner = "dgageot";
repo = "demoit";
- rev = "ec70fbdf5a5e92fa1c06d8f039f7d388e0237ba2";
- sha256 = "01584cxlnrc928sw7ldmi0sm7gixmwnawy3c5hd79rqkw8r0gbk0";
+ rev = "c1d4780620ebf083cb4a81b83c80e7547ff7bc23";
+ sha256 = "0l0pw0kzgnrk6a6f4ls3s82icjp7q9djbaxwfpjswbcfdzrsk4p2";
};
meta = with stdenv.lib; {
diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index 3882db1124a..15f6be1fa59 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -75,26 +75,24 @@ unwrapped = stdenv.mkDerivation rec {
};
};
-wrapped-full = with luajitPackages; let
- luaPkgs = [
- luasec luasocket # trust anchor bootstrap, prefill module
- lfs # prefill module
- # Almost all is for the 'http' module:
- http cqueues fifo lpeg lpeg_patterns luaossl compat53 basexx
- ];
- in runCommand unwrapped.name
+wrapped-full = runCommand unwrapped.name
{
nativeBuildInputs = [ makeWrapper ];
+ buildInputs = with luajitPackages; [
+ luasec luasocket # trust anchor bootstrap, prefill module
+ lfs # prefill module
+ http # for http module; brings lots of deps; some are useful elsewhere
+ ];
preferLocalBuild = true;
allowSubstitutes = false;
}
''
- mkdir -p "$out/sbin" "$out/share"
- makeWrapper '${unwrapped}/sbin/kresd' "$out"/sbin/kresd \
- --set LUA_PATH '${concatStringsSep ";" (map getLuaPath luaPkgs)}' \
- --set LUA_CPATH '${concatStringsSep ";" (map getLuaCPath luaPkgs)}'
+ mkdir -p "$out"/{bin,share}
+ makeWrapper '${unwrapped}/bin/kresd' "$out"/bin/kresd \
+ --set LUA_PATH "$LUA_PATH" \
+ --set LUA_CPATH "$LUA_CPATH"
ln -sr '${unwrapped}/share/man' "$out"/share/
- ln -sr "$out"/{sbin,bin}
+ ln -sr "$out"/{bin,sbin}
'';
in result
diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix
index d165a34d5f6..be7c51a7ef5 100644
--- a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix
+++ b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix
@@ -3,10 +3,10 @@ let
s = # Generated upstream information
rec {
baseName="apache-jena-fuseki";
- version = "3.10.0";
+ version = "3.11.0";
name="${baseName}-${version}";
url="http://archive.apache.org/dist/jena/binaries/apache-jena-fuseki-${version}.tar.gz";
- sha256 = "0v7srssivhx0bswvbr8ifaahcknlajwqqhr449v5zzi6nbyc613a";
+ sha256 = "05krsd0arhcl2yqmdp3iq2gwl1sc2adv44xpq9w06cps8bxj6yrb";
};
buildInputs = [
makeWrapper
diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix
index 38305a11bcc..1c8fd508a5a 100644
--- a/pkgs/servers/openafs/1.8/module.nix
+++ b/pkgs/servers/openafs/1.8/module.nix
@@ -11,36 +11,6 @@ in stdenv.mkDerivation rec {
name = "openafs-${version}-${kernel.modDirVersion}";
inherit version src;
- patches = [
- # Linux 4.20
- (fetchpatch {
- name = "openafs_1_8-do_settimeofday.patch";
- url = "http://git.openafs.org/?p=openafs.git;a=patch;h=aa80f892ec39e2984818090a6bb2047430836ee2";
- sha256 = "11zw676zqi9sj3vhp7n7ndxcxhp17cq9g2g41n030mcd3ap4g53h";
- })
- (fetchpatch {
- name = "openafs_1_8-current_kernel_time.patch";
- url = "http://git.openafs.org/?p=openafs.git;a=patch;h=3c454b39d04f4886536267c211171dae30dc0344";
- sha256 = "16fl9kp0l95dqm166jx3x4ijbzhf2bc9ilnipn3k1j00mfy4lnia";
- })
- # Linux 5.0
- (fetchpatch {
- name = "openafs_1_8-ktime_get_coarse_real_ts64.patch";
- url = "http://git.openafs.org/?p=openafs.git;a=patch;h=21ad6a0c826c150c4227ece50554101641ab4626";
- sha256 = "0cd2bzfn4gkb68qf27wpgcg9kvaky7kll22b8p2vmw5x4xkckq2y";
- })
- (fetchpatch {
- name = "openafs_1_8-ktime_get_real_ts64.patch";
- url = "http://git.openafs.org/?p=openafs.git;a=patch;h=b892fb127815bdf72103ae41ee70aadd87931b0c";
- sha256 = "1xmf2l4g5nb9rhca7zn0swynvq8f9pd0k9drsx9bpnwp662y9l8m";
- })
- (fetchpatch {
- name = "openafs_1_8-super_block.patch";
- url = "http://git.openafs.org/?p=openafs.git;a=patch;h=3969bbca6017eb0ce6e1c3099b135f210403f661";
- sha256 = "0cdd76s1h1bhxj0hl7r6mcha1jcy5vhlvc5dc8m2i83a6281yjsa";
- })
- ];
-
nativeBuildInputs = [ autoconf automake flex libtool_2 perl which yacc ]
++ kernel.moduleBuildDependencies;
diff --git a/pkgs/servers/openafs/1.8/srcs.nix b/pkgs/servers/openafs/1.8/srcs.nix
index ffdbe47220d..d1b23d8bcae 100644
--- a/pkgs/servers/openafs/1.8/srcs.nix
+++ b/pkgs/servers/openafs/1.8/srcs.nix
@@ -1,14 +1,14 @@
{ fetchurl }:
rec {
- version = "1.8.2";
+ version = "1.8.3";
src = fetchurl {
url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2";
- sha256 = "13hksffp7k5f89c9lc5g5b1q0pc9h7wyarq3sjyjqam7c513xz95";
+ sha256 = "19ffchxwgqg4wl98l456jdpgq2w8b5izn8hxdsq9hjs0a1nc3nga";
};
srcs = [ src
(fetchurl {
url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2";
- sha256 = "09n8nymrhpyb0fhahpln2spzhy9pn48hvry35ccqif2jd4wsxdmr";
+ sha256 = "14smdhn1f6f3cbvvwxgjjld0m4b17vqh3rzkxf5apmjsdda21njq";
})];
}
diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix
index 2b4c64365ca..f45b948a6f7 100644
--- a/pkgs/servers/search/elasticsearch/plugins.nix
+++ b/pkgs/servers/search/elasticsearch/plugins.nix
@@ -1,12 +1,18 @@
-{ pkgs, stdenv, fetchurl, unzip, elasticsearch-oss, javaPackages, elk6Version }:
+{ pkgs, lib, stdenv, fetchurl, unzip, javaPackages, elasticsearch }:
let
+ esVersion = elasticsearch.version;
+
+ majorVersion = lib.head (builtins.splitVersion esVersion);
+
esPlugin = a@{
pluginName,
installPhase ? ''
mkdir -p $out/config
mkdir -p $out/plugins
- ES_HOME=$out ${elasticsearch-oss}/bin/elasticsearch-plugin install --batch -v file://$src
+ ln -s ${elasticsearch}/lib $out/lib
+ ES_HOME=$out ${elasticsearch}/bin/elasticsearch-plugin install --batch -v file://$src
+ rm $out/lib
'',
...
}:
@@ -15,37 +21,41 @@ let
unpackPhase = "true";
buildInputs = [ unzip ];
meta = a.meta // {
- platforms = elasticsearch-oss.meta.platforms;
+ platforms = elasticsearch.meta.platforms;
maintainers = (a.meta.maintainers or []) ++ (with stdenv.lib.maintainers; [ offline ]);
};
});
in {
- elasticsearch_analysis_lemmagen = esPlugin rec {
+ analysis-lemmagen = esPlugin rec {
name = "elasticsearch-analysis-lemmagen-${version}";
pluginName = "elasticsearch-analysis-lemmagen";
- version = "6.7.1"; # elk6Version;
+ version = esVersion;
src = fetchurl {
- url = "https://github.com/vhyza/elasticsearch-analysis-lemmagen/releases/download/v${version}/${name}-plugin.zip";
- sha256 = "0mf8lpf40bjpzfj9lkhrg7c3xinzvg7aby3vd6h92g9i676xs8ri";
+ url = "https://github.com/vhyza/${pluginName}/releases/download/v${version}/${name}-plugin.zip";
+ sha256 =
+ if version == "7.0.1" then "155zj9zw81msx976c952nk926ndav1zqhmy2xih6nr82qf0p71hm"
+ else if version == "6.7.2" then "1r176ncjbilkmri2c5rdxh5xqsrn77m1f0p98zs47czwlqh230iq"
+ else throw "unsupported version ${version} for plugin ${pluginName}";
};
meta = with stdenv.lib; {
homepage = https://github.com/vhyza/elasticsearch-analysis-lemmagen;
description = "LemmaGen Analysis plugin provides jLemmaGen lemmatizer as Elasticsearch token filter";
license = licenses.asl20;
- # TODO: remove the following when there's a release compatible with elasticsearch-6.7.2.
- # See: https://github.com/vhyza/elasticsearch-analysis-lemmagen/issues/14
- broken = true;
};
};
discovery-ec2 = esPlugin rec {
name = "elasticsearch-discovery-ec2-${version}";
pluginName = "discovery-ec2";
- version = "${elk6Version}";
+ version = esVersion;
src = pkgs.fetchurl {
- url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/discovery-ec2/discovery-ec2-${elk6Version}.zip";
- sha256 = "1p0cdz3lfksfd2kvlcj0syxhbx27mimsaw8q4kgjpjjjwqayg523";
+ url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip";
+ sha256 =
+ if version == "7.0.1" then "0nrvralh4fygs0ys2ikg3x08jdyh9276d5w7yfncbbi0xrg9hk6g"
+ else if version == "6.7.2" then "1p0cdz3lfksfd2kvlcj0syxhbx27mimsaw8q4kgjpjjjwqayg523"
+ else if version == "5.6.16" then "1300pfmnlpfm1hh2jgas8j2kqjqiqkxhr8czshj9lx0wl4ciknin"
+ else throw "unsupported version ${version} for plugin ${pluginName}";
};
meta = with stdenv.lib; {
homepage = https://github.com/elastic/elasticsearch/tree/master/plugins/discovery-ec2;
@@ -54,17 +64,65 @@ in {
};
};
- search_guard = esPlugin rec {
- name = "elastic-search-guard-${version}";
+ repository-s3 = esPlugin rec {
+ name = "elasticsearch-repository-s3-${version}";
+ pluginName = "repository-s3";
+ version = esVersion;
+ src = pkgs.fetchurl {
+ url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip";
+ sha256 =
+ if version == "7.0.1" then "17bf8m1q92j5yhgldckl4hlsfv6qgwwqdc1da9kzgidgky7jwkbc"
+ else if version == "6.7.2" then "1l353zfyv3qziz8xkann9cbzx4wj5s14wnknfw351j6vgdq26l12"
+ else if version == "5.6.16" then "0k3li5xv1270ygb9lqk6ji3nngngl2im3z38k08nd627vxdrzij2"
+ else throw "unsupported version ${version} for plugin ${pluginName}";
+ };
+ meta = with stdenv.lib; {
+ homepage = https://github.com/elastic/elasticsearch/tree/master/plugins/repository-s3;
+ description = "The S3 repository plugin adds support for using AWS S3 as a repository for Snapshot/Restore.";
+ license = licenses.asl20;
+ };
+ };
+
+ repository-gcs = esPlugin rec {
+ name = "elasticsearch-repository-gcs-${version}";
+ pluginName = "repository-gcs";
+ version = esVersion;
+ src = pkgs.fetchurl {
+ url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip";
+ sha256 =
+ if version == "7.0.1" then "0a3rc2gggsj7xfncil1s53dmq799lcm82h0yncs94jnb182sbmzc"
+ else if version == "6.7.2" then "0afccbvb7x6y3nrwmal09vpgxyz4lar6lffw4mngalcppsk8irvv"
+ else if version == "5.6.16" then "0hwqx4yhdn4c0ccdpvgrg30ag8hy3mgxgk7h7pibdmzvy7qw7501"
+ else throw "unsupported version ${version} for plugin ${pluginName}";
+ };
+ meta = with stdenv.lib; {
+ homepage = https://github.com/elastic/elasticsearch/tree/master/plugins/repository-gcs;
+ description = "The GCS repository plugin adds support for using Google Cloud Storage as a repository for Snapshot/Restore.";
+ license = licenses.asl20;
+ };
+ };
+
+ search-guard = let
+ majorVersion = lib.head (builtins.splitVersion esVersion);
+ in esPlugin rec {
+ name = "elasticsearch-search-guard-${version}";
pluginName = "search-guard";
- version = "${elk6Version}-25.1";
- src = fetchurl rec {
- url = "mirror://maven/com/floragunn/search-guard-6/${version}/search-guard-6-${version}.zip";
- sha256 = "119r1zibi0z40mfxrpkx0zzay0yz6c7syqmmw8i2681wmz4nksda";
+ version =
+ if esVersion == "7.0.1" then "${esVersion}-35.0.0"
+ else if esVersion == "6.7.2" then "${esVersion}-25.1"
+ else if esVersion == "5.6.16" then "${esVersion}-19.3"
+ else throw "unsupported version ${esVersion} for plugin ${pluginName}";
+ src = fetchurl {
+ url = "mirror://maven/com/floragunn/${pluginName}-${majorVersion}/${version}/${pluginName}-${majorVersion}-${version}.zip";
+ sha256 =
+ if version == "7.0.1-35.0.0" then "0wsiqq7j7ph9g2vhhvjmwrh5a2q1wzlysgr75gc35zcvqz6cq8ha"
+ else if version == "6.7.2-25.1" then "119r1zibi0z40mfxrpkx0zzay0yz6c7syqmmw8i2681wmz4nksda"
+ else if version == "5.6.16-19.3" then "1q70anihh89c53fnk8wlq9z5dx094j0f9a0y0v2zsqx18lz9ikmx"
+ else throw "unsupported version ${version} for plugin ${pluginName}";
};
meta = with stdenv.lib; {
homepage = https://github.com/floragunncom/search-guard;
- description = "Plugin to fetch data from JDBC sources for indexing into Elasticsearch";
+ description = "Elasticsearch plugin that offers encryption, authentication, and authorisation. ";
license = licenses.asl20;
};
};
diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index d3fdda82f13..9a2e71e5a40 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
{ stdenv, fetchgit }:
stdenv.mkDerivation rec {
- version = "2019-05-09";
+ version = "2019-05-11";
name = "oh-my-zsh-${version}";
- rev = "f5f630ff342571097fd92f069ea5fe006599703d";
+ rev = "486fa1010df847bfd8823b4492623afc7c935709";
src = fetchgit { inherit rev;
url = "https://github.com/robbyrussell/oh-my-zsh";
- sha256 = "1ndrampjzkrd4myc1gv733zvgag25zgby9mxny9jzj99mlqajzac";
+ sha256 = "097n64xzdqgqdbgcqnzsk0s9r9yn8ncqbixbsxgpcj29x9hi1dkn";
};
pathsToLink = [ "/share/oh-my-zsh" ];
diff --git a/pkgs/tools/audio/mp3cat/default.nix b/pkgs/tools/audio/mp3cat/default.nix
new file mode 100644
index 00000000000..19f670793ba
--- /dev/null
+++ b/pkgs/tools/audio/mp3cat/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ pname = "mp3cat";
+ version = "0.5";
+
+ src = fetchFromGitHub {
+ owner = "tomclegg";
+ repo = pname;
+ rev = version;
+ sha256 = "0n6hjg2wgd06m561zc3ib5w2m3pwpf74njv2b2w4sqqh5md2ymfr";
+ };
+
+ makeFlags = [
+ "PREFIX=${placeholder ''out''}"
+ ];
+
+ installTargets = [
+ "install_bin"
+ ];
+
+ meta = with stdenv.lib; {
+ description = "A command line program which concatenates MP3 files";
+ longDescription = ''
+ A command line program which concatenates MP3 files, mp3cat
+ only outputs MP3 frames with valid headers, even if there is extra garbage
+ in its input stream
+ '';
+ homepage = https://github.com/tomclegg/mp3cat;
+ license = licenses.gpl2;
+ maintainers = [ maintainers.omnipotententity ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
index 6d6c6d5d576..c762334c1b7 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
@@ -13,13 +13,13 @@ in
stdenv.mkDerivation rec {
name = "ibus-typing-booster-${version}";
- version = "2.6.0";
+ version = "2.6.1";
src = fetchFromGitHub {
owner = "mike-fabian";
repo = "ibus-typing-booster";
rev = version;
- sha256 = "1d32p9k9vp64rpmj2cs3552ak9jn54vyi2hqdpzag33v16cydsl4";
+ sha256 = "09zlrkbv1bh6h08an5wihbsl8qqawxhdp2vcbjqrx2v8gqm1zidm";
};
patches = [ ./hunspell-dirs.patch ];
diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index fa1729b929c..ec1c5897ed7 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, flex, bison, python
+{ stdenv, fetchgit, flex, bison, python, autoconf, automake, gnulib, libtool
, gettext, ncurses, libusb, freetype, qemu, lvm2, unifont, pkgconfig
, fuse # only needed for grub-mount
, zfs ? null
@@ -31,7 +31,7 @@ let
canEfi = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) efiSystemsBuild);
inPCSystems = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) pcSystems);
- version = "2.02";
+ version = "2.04-rc1";
in (
@@ -42,28 +42,18 @@ assert !(efiSupport && xenSupport);
stdenv.mkDerivation rec {
name = "grub-${version}";
- src = fetchurl {
- url = "mirror://gnu/grub/${name}.tar.xz";
- sha256 = "03vvdfhdmf16121v7xs8is2krwnv15wpkhkf16a4yf8nsfc3f2w1";
+ src = fetchgit {
+ url = "git://git.savannah.gnu.org/grub.git";
+ rev = name;
+ sha256 = "0xkcfxs0hbzvi33kg4abkayl8b7gym9sv8ljbwlh2kpz8i4kmnk0";
};
patches = [
./fix-bash-completion.patch
- # This patch makes grub compatible with the XFS sparse inode
- # feature introduced by xfsprogs-4.16.
- # to be removed in grub-2.03
- (fetchpatch {
- url = https://git.savannah.gnu.org/cgit/grub.git/patch/?id=cda0a857dd7a27cd5d621747464bfe71e8727fff;
- sha256 = "0k9qrkdxwdqk6sz05q9smqwjr6pvgc9adx1mlf0807g4im91xnm0";
- })
- ./relocation-not-implemented.diff
];
- postPatch = ''
- substituteInPlace ./configure --replace '/usr/share/fonts/unifont' '${unifont}/share/fonts'
- '';
- nativeBuildInputs = [ bison flex python pkgconfig ];
- buildInputs = [ ncurses libusb freetype gettext lvm2 fuse ]
+ nativeBuildInputs = [ bison flex python pkgconfig autoconf automake ];
+ buildInputs = [ ncurses libusb freetype gettext lvm2 fuse libtool ]
++ optional doCheck qemu
++ optional zfsSupport zfs;
@@ -91,6 +81,15 @@ stdenv.mkDerivation rec {
-e's/qemu-system-i386/qemu-system-x86_64 -nodefaults/g'
unset CPP # setting CPP intereferes with dependency calculation
+
+ cp -r ${gnulib} $PWD/gnulib
+ chmod u+w -R $PWD/gnulib
+
+ patchShebangs .
+
+ ./bootstrap --no-git --gnulib-srcdir=$PWD/gnulib
+
+ substituteInPlace ./configure --replace '/usr/share/fonts/unifont' '${unifont}/share/fonts'
'';
configureFlags = [ "--enable-grub-mount" ] # dep of os-prober
diff --git a/pkgs/tools/misc/grub/relocation-not-implemented.diff b/pkgs/tools/misc/grub/relocation-not-implemented.diff
deleted file mode 100644
index 0b7bf947d14..00000000000
--- a/pkgs/tools/misc/grub/relocation-not-implemented.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-https://git.savannah.gnu.org/cgit/grub.git/commit/util?id=842c390469e2c2e10b5
-diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c
-index a2bb054..39d7efb 100644
---- a/util/grub-mkimagexx.c
-+++ b/util/grub-mkimagexx.c
-@@ -841,6 +841,7 @@ SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr *sections,
- break;
-
- case R_X86_64_PC32:
-+ case R_X86_64_PLT32:
- {
- grub_uint32_t *t32 = (grub_uint32_t *) target;
- *t32 = grub_host_to_target64 (grub_target_to_host32 (*t32)
-diff --git a/util/grub-module-verifier.c b/util/grub-module-verifier.c
-index 9179285..a79271f 100644
---- a/util/grub-module-verifier.c
-+++ b/util/grub-module-verifier.c
-@@ -19,6 +19,7 @@ struct grub_module_verifier_arch archs[] = {
- -1
- }, (int[]){
- R_X86_64_PC32,
-+ R_X86_64_PLT32,
- -1
- }
- },
diff --git a/pkgs/tools/misc/hackertyper/default.nix b/pkgs/tools/misc/hackertyper/default.nix
new file mode 100644
index 00000000000..dc3cd68fac6
--- /dev/null
+++ b/pkgs/tools/misc/hackertyper/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, ncurses }:
+
+stdenv.mkDerivation rec {
+ pname = "hackertyper";
+ version = "20190226";
+
+ src = fetchFromGitHub {
+ owner = "Hurricane996";
+ repo = "Hackertyper";
+ rev = "dc017270777f12086271bb5a1162d0f3613903c4";
+ sha256 = "0szkkkxspmfq1z2n4nldj2c9jn6jgiqik085rx1wkks0zgcdcgy1";
+ };
+
+
+ makeFlags = [ "PREFIX=$(out)" ];
+ buildInputs = [ ncurses ];
+
+ preInstall = ''
+ mkdir -p $out/bin
+ mkdir -p $out/share/man/man1
+ '';
+
+
+
+ doInstallCheck = true;
+ installCheckPhase = ''
+ $out/bin/hackertyper -v
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A C rewrite of hackertyper.net";
+ homepage = "https://github.com/Hurricane996/Hackertyper";
+ license = licenses.gpl3;
+ maintainers = [ maintainers.marius851000 ];
+ };
+}
diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix
index eb57cc45f6a..bd3bebc881e 100644
--- a/pkgs/tools/misc/hdf4/default.nix
+++ b/pkgs/tools/misc/hdf4/default.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
export DYLD_LIBRARY_PATH=$(pwd)/bin
'';
- excludedTests = [
+ excludedTests = stdenv.lib.optionals stdenv.isDarwin [
"MFHDF_TEST-hdftest"
"MFHDF_TEST-hdftest-shared"
"HDP-dumpsds-18"
diff --git a/pkgs/tools/misc/up/default.nix b/pkgs/tools/misc/up/default.nix
index c09c5ad12f0..01b62eed56c 100644
--- a/pkgs/tools/misc/up/default.nix
+++ b/pkgs/tools/misc/up/default.nix
@@ -1,18 +1,17 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoModule rec {
name = "up-${version}";
- version = "0.3.1";
+ version = "0.3.2";
src = fetchFromGitHub {
owner = "akavel";
repo = "up";
rev = "v${version}";
- sha256 = "171bwbk2c7jbi51xdawzv7qy71492mfs9z5j0a5j52qmnr4vjjgs";
+ sha256 = "1psixyymk98z52yy92lwb75yfins45dw6rif9cxwd7yiascwg2if";
};
- goPackagePath = "github.com/akavel/up";
- goDeps = ./deps.nix;
+ modSha256 = "0nfs190rzabphhhyacypz3ic5c4ajlqpx9jiiincs0vxfkmfwnjd";
meta = with lib; {
description = "Ultimate Plumber is a tool for writing Linux pipes with instant live preview";
diff --git a/pkgs/tools/misc/up/deps.nix b/pkgs/tools/misc/up/deps.nix
deleted file mode 100644
index 439dc5df9d4..00000000000
--- a/pkgs/tools/misc/up/deps.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
-[
- {
- goPackagePath = "github.com/gdamore/encoding";
- fetch = {
- type = "git";
- url = "https://github.com/gdamore/encoding";
- rev = "b23993cbb6353f0e6aa98d0ee318a34728f628b9";
- sha256 = "0d7irqpx2fa9vkxgkhf04yiwazsm10fxh0yk86x5crflhph5fv8a";
- };
- }
- {
- goPackagePath = "github.com/gdamore/tcell";
- fetch = {
- type = "git";
- url = "https://github.com/gdamore/tcell";
- rev = "017915a4d77dabd7af10ab539e618a735d4b9c0a";
- sha256 = "19ymkgcvcp9sz2jrfi7h6l720w5yw9hy3wnw975w2ih45j1ypqdh";
- };
- }
- {
- goPackagePath = "github.com/lucasb-eyer/go-colorful";
- fetch = {
- type = "git";
- url = "https://github.com/lucasb-eyer/go-colorful";
- rev = "12d3b2882a08d1abc9488e34f3e1ae35165f2d07";
- sha256 = "1w95axfn1a6rz31xrks77ingr9mdkqyr7mh0glv664kz1wg2h0gw";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-isatty";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-isatty";
- rev = "3fb116b820352b7f0c281308a4d6250c22d94e27";
- sha256 = "084hplr4n4g5nvp70clljk428hc963460xz0ggcj3xdi4w7hhsvv";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-runewidth";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-runewidth";
- rev = "b20a3daf6a39840c202fd42cc23d53607162b045";
- sha256 = "0crivpncmh22696d5cy7k15ll5yqfjcigk0xy73wb6g1q6vnfxs7";
- };
- }
- {
- goPackagePath = "github.com/spf13/pflag";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/pflag";
- rev = "aea12ed6721610dc6ed40141676d7ab0a1dac9e9";
- sha256 = "17p5k37bnzj6wfh000y7xpvxyv2wsfa3db9sm8da2frjvn7jgbp2";
- };
- }
- {
- goPackagePath = "golang.org/x/text";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/text";
- rev = "6f44c5a2ea40ee3593d98cdcc905cc1fdaa660e2";
- sha256 = "00mwzxly5isgf0glz7k3k2dkyqkjfc4z55qxajx4lgcp3h8xn9xj";
- };
- }
-]
diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix
index f031cf09884..586961c0df7 100644
--- a/pkgs/tools/networking/amass/default.nix
+++ b/pkgs/tools/networking/amass/default.nix
@@ -1,25 +1,23 @@
-{ buildGoPackage
+{ buildGoModule
, fetchFromGitHub
, fetchpatch
, lib
}:
-buildGoPackage rec {
- name = "amass-${version}";
- version = "2.9.1";
-
- goPackagePath = "github.com/OWASP/Amass";
+buildGoModule rec {
+ pname = "amass";
+ version = "2.9.11";
src = fetchFromGitHub {
owner = "OWASP";
repo = "Amass";
rev = version;
- sha256 = "07vs741vmhi735ba26wscldwdx0i2yamr2g8bq7jr3sjik8ncd29";
+ sha256 = "1mbxxj7cjypxdn80svgmq9yvzaj2x0y1lcbglzzmlqj3r0j265mr";
};
- outputs = [ "bin" "out" "wordlists" ];
+ modSha256 = "028ln760xaxlsk074x1i5fqi1334rw2bpz7fg520q6m13d9w86hw";
- goDeps = ./deps.nix;
+ outputs = [ "out" "wordlists" ];
postInstall = ''
mkdir -p $wordlists
diff --git a/pkgs/tools/networking/amass/deps.nix b/pkgs/tools/networking/amass/deps.nix
deleted file mode 100644
index c81a603e39c..00000000000
--- a/pkgs/tools/networking/amass/deps.nix
+++ /dev/null
@@ -1,343 +0,0 @@
-# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
-[
-
- {
- goPackagePath = "cloud.google.com/go";
- fetch = {
- type = "git";
- url = "https://code.googlesource.com/gocloud";
- rev = "v0.34.0";
- sha256 = "1kclgclwar3r37zbvb9gg3qxbgzkb50zk3s9778zlh2773qikmai";
- };
- }
-
- {
- goPackagePath = "github.com/PuerkitoBio/fetchbot";
- fetch = {
- type = "git";
- url = "https://github.com/PuerkitoBio/fetchbot";
- rev = "v1.1.2";
- sha256 = "1xw8jszjmhf8wsyc02wfplyvvcaq3wjwbzr131afcsvc4i4nlrqq";
- };
- }
-
- {
- goPackagePath = "github.com/PuerkitoBio/goquery";
- fetch = {
- type = "git";
- url = "https://github.com/PuerkitoBio/goquery";
- rev = "v1.4.1";
- sha256 = "11010z9ask21r0dskvm2pbh3z8951bnpcqg8aqa213if4h34gaa2";
- };
- }
-
- {
- goPackagePath = "github.com/andybalholm/cascadia";
- fetch = {
- type = "git";
- url = "https://github.com/andybalholm/cascadia";
- rev = "v1.0.0";
- sha256 = "09j8cavbhqqdxjqrkwbc40g8p0i49zf3184rpjm5p2rjbprcghcc";
- };
- }
-
- {
- goPackagePath = "github.com/asaskevich/EventBus";
- fetch = {
- type = "git";
- url = "https://github.com/asaskevich/EventBus";
- rev = "d46933a94f05";
- sha256 = "130mjlsc6jf17zdx8ymhxis70a13l2zbjmjzgvjdr6pb0jzxsqha";
- };
- }
-
- {
- goPackagePath = "github.com/caffix/cloudflare-roundtripper";
- fetch = {
- type = "git";
- url = "https://github.com/caffix/cloudflare-roundtripper";
- rev = "4c29d231c9cb";
- sha256 = "0i8z9p8wfvjphsgj88jcgpbyyb10hq24a72df4kdw7xl6189chra";
- };
- }
-
- {
- goPackagePath = "github.com/cenkalti/backoff";
- fetch = {
- type = "git";
- url = "https://github.com/cenkalti/backoff";
- rev = "v2.1.1";
- sha256 = "1mf4lsl3rbb8kk42x0mrhzzy4ikqy0jf6nxpzhkr02rdgwh6rjk8";
- };
- }
-
- {
- goPackagePath = "github.com/dghubble/go-twitter";
- fetch = {
- type = "git";
- url = "https://github.com/dghubble/go-twitter";
- rev = "7fd79e2bcc65";
- sha256 = "0vk66ndhwvqq23v5xfla9npcrrxgphp318n7hn8vaw7zayznmfy7";
- };
- }
-
- {
- goPackagePath = "github.com/dghubble/sling";
- fetch = {
- type = "git";
- url = "https://github.com/dghubble/sling";
- rev = "v1.2.0";
- sha256 = "0ns17xy7xig3zdcjqkxn33nzar1ybqpw2arc016i5vv09b1yypj6";
- };
- }
-
- {
- goPackagePath = "github.com/fatih/color";
- fetch = {
- type = "git";
- url = "https://github.com/fatih/color";
- rev = "v1.7.0";
- sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv";
- };
- }
-
- {
- goPackagePath = "github.com/go-ini/ini";
- fetch = {
- type = "git";
- url = "https://github.com/go-ini/ini";
- rev = "v1.41.0";
- sha256 = "1pm4s8j5azafvminc7ll0ncvfznwn9cvq2zhmxri5waffwr1sdxg";
- };
- }
-
- {
- goPackagePath = "github.com/golang/protobuf";
- fetch = {
- type = "git";
- url = "https://github.com/golang/protobuf";
- rev = "v1.2.0";
- sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab";
- };
- }
-
- {
- goPackagePath = "github.com/google/go-querystring";
- fetch = {
- type = "git";
- url = "https://github.com/google/go-querystring";
- rev = "v1.0.0";
- sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz";
- };
- }
-
- {
- goPackagePath = "github.com/google/uuid";
- fetch = {
- type = "git";
- url = "https://github.com/google/uuid";
- rev = "v1.1.0";
- sha256 = "0yx4kiafyshdshrmrqcf2say5mzsviz7r94a0y1l6xfbkkyvnc86";
- };
- }
-
- {
- goPackagePath = "github.com/gorilla/websocket";
- fetch = {
- type = "git";
- url = "https://github.com/gorilla/websocket";
- rev = "v1.4.0";
- sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk";
- };
- }
-
- {
- goPackagePath = "github.com/irfansharif/cfilter";
- fetch = {
- type = "git";
- url = "https://github.com/irfansharif/cfilter";
- rev = "v0.1.1";
- sha256 = "0hfxp57m37wygqy3y72fm9ydvfymkmqnif48spssc3zqaqvhcgkz";
- };
- }
-
- {
- goPackagePath = "github.com/johnnadratowski/golang-neo4j-bolt-driver";
- fetch = {
- type = "git";
- url = "https://github.com/johnnadratowski/golang-neo4j-bolt-driver";
- rev = "c68f22031e42";
- sha256 = "0v9cxzmj5r0zkh8p61rbknrw17zbciy3fvmg9d6srg1hb7wizp5c";
- };
- }
-
- {
- goPackagePath = "github.com/mattn/go-colorable";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-colorable";
- rev = "v0.1.0";
- sha256 = "0kshi4hvm0ayrsxqxy0599iv81kryhd2fn9lwjyczpj593cq069r";
- };
- }
-
- {
- goPackagePath = "github.com/mattn/go-isatty";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-isatty";
- rev = "v0.0.4";
- sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w";
- };
- }
-
- {
- goPackagePath = "github.com/miekg/dns";
- fetch = {
- type = "git";
- url = "https://github.com/miekg/dns";
- rev = "v1.0.8";
- sha256 = "1vmgkpmwlqg6pwrpvjbn4h4al6af5fjvwwnacyv18hvlfd3fyfmx";
- };
- }
-
- {
- goPackagePath = "github.com/qasaur/gremgo";
- fetch = {
- type = "git";
- url = "https://github.com/qasaur/gremgo";
- rev = "fa23ada7c5da";
- sha256 = "1cqz1zqwvcgnq3dfv9zcyjgmla8d9vbh0s31x8iv2r8jdzfgqik4";
- };
- }
-
- {
- goPackagePath = "github.com/robertkrimen/otto";
- fetch = {
- type = "git";
- url = "https://github.com/robertkrimen/otto";
- rev = "15f95af6e78d";
- sha256 = "07j7l340lmqwpfscwyb8llk3k37flvs20a4a8vzc85f16xyd9npf";
- };
- }
-
- {
- goPackagePath = "github.com/satori/go.uuid";
- fetch = {
- type = "git";
- url = "https://github.com/satori/go.uuid";
- rev = "v1.2.0";
- sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb";
- };
- }
-
- {
- goPackagePath = "github.com/temoto/robotstxt";
- fetch = {
- type = "git";
- url = "https://github.com/temoto/robotstxt";
- rev = "9e4646fa7053";
- sha256 = "0hv3c8kbsqdbqwmkb5f2gllzxiqzld09fwmk2ljr3ikh4irqazx0";
- };
- }
-
- {
- goPackagePath = "github.com/temoto/robotstxt-go";
- fetch = {
- type = "git";
- url = "https://github.com/temoto/robotstxt-go";
- rev = "9e4646fa7053";
- sha256 = "0hv3c8kbsqdbqwmkb5f2gllzxiqzld09fwmk2ljr3ikh4irqazx0";
- };
- }
-
- {
- goPackagePath = "golang.org/x/crypto";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/crypto";
- rev = "c126467f60eb";
- sha256 = "0xvvzwxqi1dbrnsvq00klx4bnjalf90haf1slnxzrdmbadyp992q";
- };
- }
-
- {
- goPackagePath = "golang.org/x/net";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/net";
- rev = "1e06a53dbb7e";
- sha256 = "0lpqqvdccby48nixihvmn8ig1z48b950m1bxfqxn78air308qc3j";
- };
- }
-
- {
- goPackagePath = "golang.org/x/oauth2";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/oauth2";
- rev = "99b60b757ec1";
- sha256 = "119py9nia7957kf51gg9qvh34d18jb1a293zwfgvdf5inl1ja6y6";
- };
- }
-
- {
- goPackagePath = "golang.org/x/sync";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sync";
- rev = "37e7f081c4d4";
- sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm";
- };
- }
-
- {
- goPackagePath = "golang.org/x/sys";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sys";
- rev = "e072cadbbdc8";
- sha256 = "17l1diq0526zpdpwfmjs7w9w8sg6prv6sjnvmg869yrj26b1xdcc";
- };
- }
-
- {
- goPackagePath = "golang.org/x/text";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/text";
- rev = "v0.3.0";
- sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
- };
- }
-
- {
- goPackagePath = "golang.org/x/tools";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/tools";
- rev = "4d8a0ac9f66c";
- sha256 = "12cyxcijjsdg4wxl8hvxfbwdkqapvl1f7994963i6rf0qvh41qym";
- };
- }
-
- {
- goPackagePath = "google.golang.org/appengine";
- fetch = {
- type = "git";
- url = "https://github.com/golang/appengine";
- rev = "v1.4.0";
- sha256 = "06zl7w4sxgdq2pl94wy9ncii6h0z3szl4xpqds0sv3b3wbdlhbnn";
- };
- }
-
- {
- goPackagePath = "gopkg.in/sourcemap.v1";
- fetch = {
- type = "git";
- url = "https://gopkg.in/sourcemap.v1";
- rev = "v1.0.5";
- sha256 = "08rf2dl13hbnm3fq2cm0nnsspy9fhf922ln23cz5463cv7h62as4";
- };
- }
-]
diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix
index 74aa30bb95e..e69e012f644 100644
--- a/pkgs/tools/networking/davix/default.nix
+++ b/pkgs/tools/networking/davix/default.nix
@@ -1,17 +1,17 @@
{ stdenv, fetchurl, cmake, pkgconfig, openssl, libxml2, boost, python3, libuuid }:
stdenv.mkDerivation rec {
- version = "0.7.2";
+ version = "0.7.3";
name = "davix-${version}";
nativeBuildInputs = [ cmake pkgconfig python3 ];
buildInputs = [ openssl libxml2 boost libuuid ];
- # using the url below since the 0.7.2 release did carry a broken CMake file,
+ # using the url below since the 0.7.3 release did carry a broken CMake file,
# supposedly fixed in the next release
# https://github.com/cern-fts/davix/issues/40
src = fetchurl {
url = "http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/${version}/davix-${version}.tar.gz";
- sha256 = "1w1q7r6r5j5f23ra4qhx3x29w9z9xal23c2azazpfmcz88hkkmhz";
+ sha256 = "12ij7p1ahgvicqmccrvpd0iw1909qmpbc3nk58gdm866f9p2find";
};
diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix
index 8bebe973522..062d6e2d0a9 100644
--- a/pkgs/tools/networking/netsniff-ng/default.nix
+++ b/pkgs/tools/networking/netsniff-ng/default.nix
@@ -1,24 +1,24 @@
{ stdenv, fetchFromGitHub, makeWrapper, bison, flex, geoip, geolite-legacy
, libcli, libnet, libnetfilter_conntrack, libnl, libpcap, libsodium
-, liburcu, ncurses, perl, pkgconfig, zlib }:
+, liburcu, ncurses, pkgconfig, zlib }:
stdenv.mkDerivation rec {
- name = "netsniff-ng-${version}";
- version = "0.6.5";
+ pname = "netsniff-ng";
+ version = "0.6.6";
# Upstream recommends and supports git
src = fetchFromGitHub rec {
- repo = "netsniff-ng";
- owner = repo;
+ repo = pname;
+ owner = pname;
rev = "v${version}";
- sha256 = "0bcbdiik69g6jnravkkid8gxw2akg01i372msc5x1w9fh9wh2phw";
+ sha256 = "0spp8dl4i5xcqfbqxxcpdf3gwcmyf4ywl1dd79w6gzbr07p894p5";
};
- patches = [ ./glibc-2.26.patch ];
-
- buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl
- libnetfilter_conntrack libpcap libsodium liburcu ncurses perl
- pkgconfig zlib makeWrapper ];
+ nativeBuildInputs = [ pkgconfig makeWrapper bison flex ];
+ buildInputs = [
+ geoip geolite-legacy libcli libnet libnl
+ libnetfilter_conntrack libpcap libsodium liburcu ncurses zlib
+ ];
# ./configure is not autoGNU but some home-brewn magic
configurePhase = ''
diff --git a/pkgs/tools/networking/netsniff-ng/glibc-2.26.patch b/pkgs/tools/networking/netsniff-ng/glibc-2.26.patch
deleted file mode 100644
index 2ee7b478e9b..00000000000
--- a/pkgs/tools/networking/netsniff-ng/glibc-2.26.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/built_in.h b/built_in.h
-index da04dbd..7acc183 100644
---- a/built_in.h
-+++ b/built_in.h
-@@ -10,6 +10,7 @@
- #include
- #include
- #include
-+#include
-
- typedef uint64_t u64;
- typedef uint32_t u32;
-diff --git a/staging/tools.c b/staging/tools.c
-index 9d2d1be..909b059 100644
---- a/staging/tools.c
-+++ b/staging/tools.c
-@@ -55,6 +55,7 @@
- ////////////////////////////////////////////////////////////////////////////////////////////
-
- #include "mz.h"
-+#include
-
- #define CMP_INT(a, b) ((a) < (b) ? -1 : (a) > (b))
- #define IPV6_MAX_RANGE_LEN strlen("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff-ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/128")
diff --git a/pkgs/tools/security/bitwarden_rs/default.nix b/pkgs/tools/security/bitwarden_rs/default.nix
index 2dbbd93e13b..d22a2773fd9 100644
--- a/pkgs/tools/security/bitwarden_rs/default.nix
+++ b/pkgs/tools/security/bitwarden_rs/default.nix
@@ -1,23 +1,24 @@
-{ lib, rustPlatform, fetchFromGitHub, pkgconfig, openssl }:
+{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, openssl, Security, CoreServices }:
rustPlatform.buildRustPackage rec {
pname = "bitwarden_rs";
- version = "1.8.0";
+ version = "1.9.0";
src = fetchFromGitHub {
owner = "dani-garcia";
repo = pname;
rev = version;
- sha256 = "0jz9r6ck6sfz4ig95x0ja6g5ikyq6z0xw1zn9zf4kxha4klqqbkx";
+ sha256 = "14c2blzkmdd9s0gpf6b7y141yx9s2v2gmwy5l1lgqjhi3h6jpcqr";
};
- buildInputs = [ pkgconfig openssl ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security CoreServices ];
RUSTC_BOOTSTRAP = 1;
- cargoSha256 = "02xrz7vq8nan70f07xyf335blfmdc6gaz9sbfjipsi1drgfccf09";
+ cargoSha256 = "038l6alcdc0g4avpbzxgd2k09nr3wrsbry763bq2c77qqgwldj8r";
- meta = with lib; {
+ meta = with stdenv.lib; {
description = "An unofficial lightweight implementation of the Bitwarden server API using Rust and SQLite";
homepage = https://github.com/dani-garcia/bitwarden_rs;
license = licenses.gpl3;
diff --git a/pkgs/tools/system/acpica-tools/default.nix b/pkgs/tools/system/acpica-tools/default.nix
index e19d5fba99f..662b87f3e85 100644
--- a/pkgs/tools/system/acpica-tools/default.nix
+++ b/pkgs/tools/system/acpica-tools/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "acpica-tools-${version}";
- version = "20190405";
+ version = "20190509";
src = fetchurl {
url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
- sha256 = "0d4hajb3d82laf74m2xa91kqkjwmym08r25jf0hly1jbbh7cl0fy";
+ sha256 = "06k22kfnjzf3mpvrb7xl2pfnh28q3n8wcgdjchl1j2hik5pan97i";
};
NIX_CFLAGS_COMPILE = "-O3";
diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix
index c3cbaf98a87..a0575067482 100644
--- a/pkgs/tools/system/bfs/default.nix
+++ b/pkgs/tools/system/bfs/default.nix
@@ -2,17 +2,22 @@
stdenv.mkDerivation rec {
name = "bfs-${version}";
- version = "1.3.3";
+ version = "1.4.1";
src = fetchFromGitHub {
repo = "bfs";
owner = "tavianator";
rev = version;
- sha256 = "0yjbv6j5sn2yq57rx50h284krxyx5gcviwv8ac7zxwr2qggn8lqy";
+ sha256 = "1y5w8gws4j1i334ap4rsl64scr0hlyrdkdl7ffaghs8fqa6mjmsb";
};
buildInputs = stdenv.lib.optionals stdenv.isLinux [ libcap acl ];
+ # Disable LTO on darwin. See https://github.com/NixOS/nixpkgs/issues/19098
+ preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+ substituteInPlace Makefile --replace "-flto -DNDEBUG" "-DNDEBUG"
+ '';
+
makeFlags = [ "PREFIX=$(out)" ];
buildFlags = [ "release" ]; # "release" enables compiler optimizations
diff --git a/pkgs/tools/text/patchutils/0.3.3.nix b/pkgs/tools/text/patchutils/0.3.3.nix
new file mode 100644
index 00000000000..b324137be6a
--- /dev/null
+++ b/pkgs/tools/text/patchutils/0.3.3.nix
@@ -0,0 +1,7 @@
+{ callPackage, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+ version = "0.3.3";
+ sha256 = "0g5df00cj4nczrmr4k791l7la0sq2wnf8rn981fsrz1f3d2yix4i";
+ patches = [ ./drop-comments.patch ]; # we would get into a cycle when using fetchpatch on this one
+})
diff --git a/pkgs/tools/text/patchutils/default.nix b/pkgs/tools/text/patchutils/default.nix
index 238676020e8..eab0e98f95c 100644
--- a/pkgs/tools/text/patchutils/default.nix
+++ b/pkgs/tools/text/patchutils/default.nix
@@ -1,26 +1,6 @@
-{ stdenv, fetchurl }:
+{ callPackage, ... } @ args:
-stdenv.mkDerivation rec {
- name = "patchutils-0.3.3";
-
- src = fetchurl {
- url = "http://cyberelk.net/tim/data/patchutils/stable/${name}.tar.xz";
- sha256 = "0g5df00cj4nczrmr4k791l7la0sq2wnf8rn981fsrz1f3d2yix4i";
- };
-
- patches = [ ./drop-comments.patch ]; # we would get into a cycle when using fetchpatch on this one
-
- hardeningDisable = [ "format" ];
-
- doCheck = false; # fails
-
- meta = with stdenv.lib; {
- description = "Tools to manipulate patch files";
- homepage = http://cyberelk.net/tim/software/patchutils;
- license = licenses.gpl2Plus;
- platforms = platforms.all;
- executables = [ "combinediff" "dehtmldiff" "editdiff" "espdiff"
- "filterdiff" "fixcvsdiff" "flipdiff" "grepdiff" "interdiff" "lsdiff"
- "recountdiff" "rediff" "splitdiff" "unwrapdiff" ];
- };
-}
+callPackage ./generic.nix (args // rec {
+ version = "0.3.4";
+ sha256 = "0xp8mcfyi5nmb5a2zi5ibmyshxkb1zv1dgmnyn413m7ahgdx8mfg";
+})
diff --git a/pkgs/tools/text/patchutils/generic.nix b/pkgs/tools/text/patchutils/generic.nix
new file mode 100644
index 00000000000..87d925e333f
--- /dev/null
+++ b/pkgs/tools/text/patchutils/generic.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl
+, version, sha256, patches ? []
+, ...
+}:
+stdenv.mkDerivation rec {
+ pname = "patchutils";
+ inherit version patches;
+
+ src = fetchurl {
+ url = "http://cyberelk.net/tim/data/patchutils/stable/${pname}-${version}.tar.xz";
+ inherit sha256;
+ };
+
+ hardeningDisable = [ "format" ];
+
+ doCheck = false; # fails
+
+ meta = with stdenv.lib; {
+ description = "Tools to manipulate patch files";
+ homepage = http://cyberelk.net/tim/software/patchutils;
+ license = licenses.gpl2Plus;
+ platforms = platforms.all;
+ executables = [ "combinediff" "dehtmldiff" "editdiff" "espdiff"
+ "filterdiff" "fixcvsdiff" "flipdiff" "grepdiff" "interdiff" "lsdiff"
+ "recountdiff" "rediff" "splitdiff" "unwrapdiff" ];
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a05aa2a2f86..adca2983fe5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -157,6 +157,8 @@ in
deadcode = callPackage ../development/tools/deadcode { };
+ proto-contrib = callPackage ../development/tools/proto-contrib {};
+
demoit = callPackage ../servers/demoit { };
diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins;
@@ -672,7 +674,9 @@ in
bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { };
- bitwarden_rs = callPackage ../tools/security/bitwarden_rs { };
+ bitwarden_rs = callPackage ../tools/security/bitwarden_rs {
+ inherit (darwin.apple_sdk.frameworks) Security CoreServices;
+ };
bitwarden_rs-vault = callPackage ../tools/security/bitwarden_rs/vault.nix { };
@@ -1687,6 +1691,8 @@ in
mp3blaster = callPackage ../applications/audio/mp3blaster { };
+ mp3cat = callPackage ../tools/audio/mp3cat {};
+
mp3fs = callPackage ../tools/filesystems/mp3fs { };
mpdas = callPackage ../tools/audio/mpdas { };
@@ -2665,8 +2671,19 @@ in
elasticsearch-oss = elasticsearch6-oss;
elasticsearchPlugins = recurseIntoAttrs (
- callPackage ../servers/search/elasticsearch/plugins.nix { }
+ callPackage ../servers/search/elasticsearch/plugins.nix {
+ elasticsearch = elasticsearch-oss;
+ }
);
+ elasticsearch5Plugins = elasticsearchPlugins.override {
+ elasticsearch = elasticsearch5;
+ };
+ elasticsearch6Plugins = elasticsearchPlugins.override {
+ elasticsearch = elasticsearch6-oss;
+ };
+ elasticsearch7Plugins = elasticsearchPlugins.override {
+ elasticsearch = elasticsearch7-oss;
+ };
elasticsearch-curator = with (python3.override {
packageOverrides = self: super: {
@@ -3431,6 +3448,8 @@ in
stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
};
+ hackertyper = callPackage ../tools/misc/hackertyper { };
+
haveged = callPackage ../tools/security/haveged { };
habitat = callPackage ../applications/networking/cluster/habitat { };
@@ -5013,6 +5032,8 @@ in
patchutils = callPackage ../tools/text/patchutils { };
+ patchutils_0_3_3 = callPackage ../tools/text/patchutils/0.3.3.nix { };
+
parted = callPackage ../tools/misc/parted { };
paulstretch = callPackage ../applications/audio/paulstretch { };
@@ -6228,7 +6249,8 @@ in
libX11 = xorg.libX11;
};
- twitterBootstrap3 = callPackage ../development/web/twitter-bootstrap {};
+ twitterBootstrap3 = callPackage ../development/web/twitter-bootstrap/3.nix {};
+ twitterBootstrap4 = callPackage ../development/web/twitter-bootstrap {};
twitterBootstrap = twitterBootstrap3;
txr = callPackage ../tools/misc/txr { stdenv = clangStdenv; };
@@ -8226,7 +8248,7 @@ in
mesos = callPackage ../applications/networking/cluster/mesos {
sasl = cyrus_sasl;
inherit (pythonPackages) python boto setuptools wrapPython;
- pythonProtobuf = pythonPackages.protobuf;
+ pythonProtobuf = pythonPackages.protobuf.override { protobuf = protobuf3_6; };
perf = linuxPackages.perf;
};
@@ -22833,7 +22855,7 @@ in
### SCIENCE/ROBOTICS
- apmplanner2 = libsForQt59.callPackage ../applications/science/robotics/apmplanner2 { };
+ apmplanner2 = libsForQt511.callPackage ../applications/science/robotics/apmplanner2 { };
### MISC
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index b51af519f93..c26f031a089 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -151,10 +151,11 @@ with self; {
cc lutf8lib.c $CFLAGS -o utf8.so
'';
- # There's no need to separate *.lua and *.so, I guess? TODO: conventions?
+ # The hook in ../development/lua-modules/generic/default.nix
+ # is strict about share vs. lib for _PATH and _CPATH.
installPhase = ''
- install -Dt "$out/lib/lua/${lua.luaversion}/compat53" \
- compat53/*.lua *.so
+ install -Dt "$out/share/lua/${lua.luaversion}/compat53" compat53/*.lua
+ install -Dt "$out/lib/lua/${lua.luaversion}/compat53" *.so
'';
meta = with stdenv.lib; {
@@ -192,38 +193,6 @@ with self; {
};
};
- http = buildLuaPackage rec {
- version = "0.2";
- name = "http-${version}";
-
- src = fetchFromGitHub {
- owner = "daurnimator";
- repo = "lua-http";
- rev = "v${version}";
- sha256 = "0a8vsj49alaf1fkhv51n5mgpjq8izfff3shcjs8xk7p2bc46vd7i";
- };
-
- /* TODO: separate docs derivation? (pandoc is heavy)
- nativeBuildInputs = [ pandoc ];
- makeFlags = [ "-C doc" "lua-http.html" "lua-http.3" ];
- */
-
- buildPhase = ":";
- installPhase = ''
- install -Dt "$out/lib/lua/${lua.luaversion}/http" \
- http/*.lua
- install -Dt "$out/lib/lua/${lua.luaversion}/http/compat" \
- http/compat/*.lua
- '';
-
- meta = with stdenv.lib; {
- description = "HTTP library for lua";
- homepage = "https://daurnimator.github.io/lua-http/${version}/";
- license = licenses.mit;
- maintainers = with maintainers; [ vcunat ];
- };
- };
-
luacyrussasl = buildLuaPackage rec {
version = "1.1.0";
name = "lua-cyrussasl-${version}";
@@ -419,12 +388,13 @@ with self; {
sha256 = "0wv8l7f7na7kw5xn8mjik2wpxbizl7zvvp5s7fcwvz9kl5jdpk5b";
};
+ propagatedBuildInputs = [ luasocket ];
buildInputs = [ openssl ];
preBuild = ''
makeFlagsArray=(
${platformString}
- LUAPATH="$out/lib/lua/${lua.luaversion}"
+ LUAPATH="$out/share/lua/${lua.luaversion}"
LUACPATH="$out/lib/lua/${lua.luaversion}"
INC_PATH="-I${lua}/include"
LIB_PATH="-L$out/lib");