Merge master into staging-next
This commit is contained in:
commit
5b77726783
@ -6,11 +6,11 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "reaper";
|
pname = "reaper";
|
||||||
version = "6.19";
|
version = "6.20";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz";
|
url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz";
|
||||||
sha256 = "1cdy5ilpfidz7xyqn2i41szr24ilcmpl35aw1vbashf0b6dg48la";
|
sha256 = "194xglhk74ks534r3d00v84s26s4yybxkhb4h8k5rqp76g0jv635";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
|
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
|
||||||
@ -55,6 +55,6 @@ stdenv.mkDerivation rec {
|
|||||||
homepage = "https://www.reaper.fm/";
|
homepage = "https://www.reaper.fm/";
|
||||||
license = licenses.unfree;
|
license = licenses.unfree;
|
||||||
platforms = [ "x86_64-linux" ];
|
platforms = [ "x86_64-linux" ];
|
||||||
maintainers = with maintainers; [ jfrankenau ];
|
maintainers = with maintainers; [ jfrankenau ilian ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -7,11 +7,11 @@ with lib;
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "feh";
|
pname = "feh";
|
||||||
version = "3.6.1";
|
version = "3.6.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2";
|
url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2";
|
||||||
sha256 = "1a0ygdpyvpcsr0hdi9ai7ycbkgvacq8dpd8cacbppsds5k2xw7lv";
|
sha256 = "0d66qz9h37pk8h10bc918hbv3j364vyni934rlw2j951s5wznj8n";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "out" "man" "doc" ];
|
outputs = [ "out" "man" "doc" ];
|
||||||
|
@ -27,11 +27,11 @@ with lib;
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mutt";
|
pname = "mutt";
|
||||||
version = "2.0.4";
|
version = "2.0.5";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
|
url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
|
||||||
sha256 = "1m4ig69qw4g3lhm4351snmy5i0ch65fqc9vqqdybr6jy21w7w225";
|
sha256 = "0k80s27sf7djb7zxj81ihksr8jkr71mfaa8976fzh41i1pn5l7g2";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = optional smimeSupport (fetchpatch {
|
patches = optional smimeSupport (fetchpatch {
|
||||||
|
@ -8,12 +8,12 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonApplication rec {
|
buildPythonApplication rec {
|
||||||
version = "1.27.4";
|
version = "1.28.0";
|
||||||
pname = "docker-compose";
|
pname = "docker-compose";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "5a5690f24c27d4b43dcbe6b3fae91ba680713208e99ee863352b3bae37bcaa83";
|
sha256 = "947888fe9377b48c260d59b6511ba205655c6beb45a4b70fbce28f753aacf75a";
|
||||||
};
|
};
|
||||||
|
|
||||||
# lots of networking and other fails
|
# lots of networking and other fails
|
||||||
|
@ -1,43 +0,0 @@
|
|||||||
From 6d19c0cc6c5a9bba308fc29d7c0edc2dc372c41b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Prasad J Pandit <pjp@fedoraproject.org>
|
|
||||||
Date: Wed, 21 Oct 2020 11:35:50 +0530
|
|
||||||
Subject: [PATCH] net: remove an assert call in eth_get_gso_type
|
|
||||||
|
|
||||||
eth_get_gso_type() routine returns segmentation offload type based on
|
|
||||||
L3 protocol type. It calls g_assert_not_reached if L3 protocol is
|
|
||||||
unknown, making the following return statement unreachable. Remove the
|
|
||||||
g_assert call, it maybe triggered by a guest user.
|
|
||||||
|
|
||||||
Reported-by: Gaoning Pan <pgn@zju.edu.cn>
|
|
||||||
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
|
|
||||||
---
|
|
||||||
net/eth.c | 6 +++---
|
|
||||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/net/eth.c b/net/eth.c
|
|
||||||
index 0c1d413ee2..eee77071f9 100644
|
|
||||||
--- a/net/eth.c
|
|
||||||
+++ b/net/eth.c
|
|
||||||
@@ -16,6 +16,7 @@
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "qemu/osdep.h"
|
|
||||||
+#include "qemu/log.h"
|
|
||||||
#include "net/eth.h"
|
|
||||||
#include "net/checksum.h"
|
|
||||||
#include "net/tap.h"
|
|
||||||
@@ -71,9 +72,8 @@ eth_get_gso_type(uint16_t l3_proto, uint8_t *l3_hdr, uint8_t l4proto)
|
|
||||||
return VIRTIO_NET_HDR_GSO_TCPV6 | ecn_state;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-
|
|
||||||
- /* Unsupported offload */
|
|
||||||
- g_assert_not_reached();
|
|
||||||
+ qemu_log_mask(LOG_GUEST_ERROR, "%s: probably not GSO frame, "
|
|
||||||
+ "unknown L3 protocol: 0x%04"PRIx16"\n", __func__, l3_proto);
|
|
||||||
|
|
||||||
return VIRTIO_NET_HDR_GSO_NONE | ecn_state;
|
|
||||||
}
|
|
||||||
--
|
|
||||||
2.28.0
|
|
||||||
|
|
@ -1,14 +1,14 @@
|
|||||||
{ lib, stdenv, fetchurl, fetchpatch, python, zlib, pkg-config, glib
|
{ lib, stdenv, fetchurl, fetchpatch, python, zlib, pkg-config, glib
|
||||||
, perl, pixman, vde2, alsaLib, texinfo, flex
|
, perl, pixman, vde2, alsaLib, texinfo, flex
|
||||||
, bison, lzo, snappy, libaio, gnutls, nettle, curl
|
, bison, lzo, snappy, libaio, gnutls, nettle, curl, ninja, meson
|
||||||
, makeWrapper
|
, makeWrapper, autoPatchelfHook
|
||||||
, attr, libcap, libcap_ng
|
, attr, libcap, libcap_ng
|
||||||
, CoreServices, Cocoa, Hypervisor, rez, setfile
|
, CoreServices, Cocoa, Hypervisor, rez, setfile
|
||||||
, numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl
|
, numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl
|
||||||
, seccompSupport ? stdenv.isLinux, libseccomp
|
, seccompSupport ? stdenv.isLinux, libseccomp
|
||||||
, alsaSupport ? lib.hasSuffix "linux" stdenv.hostPlatform.system && !nixosTestRunner
|
, alsaSupport ? lib.hasSuffix "linux" stdenv.hostPlatform.system && !nixosTestRunner
|
||||||
, pulseSupport ? !stdenv.isDarwin && !nixosTestRunner, libpulseaudio
|
, pulseSupport ? !stdenv.isDarwin && !nixosTestRunner, libpulseaudio
|
||||||
, sdlSupport ? !stdenv.isDarwin && !nixosTestRunner, SDL2
|
, sdlSupport ? !stdenv.isDarwin && !nixosTestRunner, SDL2, SDL2_image
|
||||||
, gtkSupport ? !stdenv.isDarwin && !xenSupport && !nixosTestRunner, gtk3, gettext, vte, wrapGAppsHook
|
, gtkSupport ? !stdenv.isDarwin && !xenSupport && !nixosTestRunner, gtk3, gettext, vte, wrapGAppsHook
|
||||||
, vncSupport ? !nixosTestRunner, libjpeg, libpng
|
, vncSupport ? !nixosTestRunner, libjpeg, libpng
|
||||||
, smartcardSupport ? !nixosTestRunner, libcacard
|
, smartcardSupport ? !nixosTestRunner, libcacard
|
||||||
@ -39,7 +39,7 @@ let
|
|||||||
in
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "5.1.0";
|
version = "5.2.0";
|
||||||
pname = "qemu"
|
pname = "qemu"
|
||||||
+ lib.optionalString xenSupport "-xen"
|
+ lib.optionalString xenSupport "-xen"
|
||||||
+ lib.optionalString hostCpuOnly "-host-cpu-only"
|
+ lib.optionalString hostCpuOnly "-host-cpu-only"
|
||||||
@ -47,10 +47,10 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url= "https://download.qemu.org/qemu-${version}.tar.xz";
|
url= "https://download.qemu.org/qemu-${version}.tar.xz";
|
||||||
sha256 = "1rd41wwlvp0vpialjp2czs6i3lsc338xc72l3zkbb7ixjfslw5y9";
|
sha256 = "1g0pvx4qbirpcn9mni704y03n3lvkmw2c0rbcwvydyr8ns4xh66b";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ python python.pkgs.sphinx pkg-config flex bison ]
|
nativeBuildInputs = [ python python.pkgs.sphinx pkg-config flex bison meson ninja autoPatchelfHook ]
|
||||||
++ optionals gtkSupport [ wrapGAppsHook ];
|
++ optionals gtkSupport [ wrapGAppsHook ];
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ zlib glib perl pixman
|
[ zlib glib perl pixman
|
||||||
@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
|
|||||||
++ optionals seccompSupport [ libseccomp ]
|
++ optionals seccompSupport [ libseccomp ]
|
||||||
++ optionals numaSupport [ numactl ]
|
++ optionals numaSupport [ numactl ]
|
||||||
++ optionals pulseSupport [ libpulseaudio ]
|
++ optionals pulseSupport [ libpulseaudio ]
|
||||||
++ optionals sdlSupport [ SDL2 ]
|
++ optionals sdlSupport [ SDL2 SDL2_image ]
|
||||||
++ optionals gtkSupport [ gtk3 gettext vte ]
|
++ optionals gtkSupport [ gtk3 gettext vte ]
|
||||||
++ optionals vncSupport [ libjpeg libpng ]
|
++ optionals vncSupport [ libjpeg libpng ]
|
||||||
++ optionals smartcardSupport [ libcacard ]
|
++ optionals smartcardSupport [ libcacard ]
|
||||||
@ -77,20 +77,13 @@ stdenv.mkDerivation rec {
|
|||||||
++ optionals smbdSupport [ samba ];
|
++ optionals smbdSupport [ samba ];
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
dontUseMesonConfigure = true; # meson's configurePhase isn't compatible with qemu build
|
||||||
|
|
||||||
outputs = [ "out" "ga" ];
|
outputs = [ "out" "ga" ];
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./no-etc-install.patch
|
|
||||||
./fix-qemu-ga.patch
|
./fix-qemu-ga.patch
|
||||||
./9p-ignore-noatime.patch
|
./9p-ignore-noatime.patch
|
||||||
./CVE-2020-27617.patch
|
|
||||||
(fetchpatch {
|
|
||||||
# e1000e: infinite loop scenario in case of null packet descriptor, remove for QEMU >= 5.2.0-rc3
|
|
||||||
name = "CVE-2020-28916.patch";
|
|
||||||
url = "https://git.qemu.org/?p=qemu.git;a=patch;h=c2cb511634012344e3d0fe49a037a33b12d8a98a";
|
|
||||||
sha256 = "1kvm6wl4vry0npiisxsn76h8nf1iv5fmqsyjvb46203f1yyg5pis";
|
|
||||||
})
|
|
||||||
] ++ optional nixosTestRunner ./force-uid0-on-9p.patch
|
] ++ optional nixosTestRunner ./force-uid0-on-9p.patch
|
||||||
++ optionals stdenv.hostPlatform.isMusl [
|
++ optionals stdenv.hostPlatform.isMusl [
|
||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
@ -108,27 +101,19 @@ stdenv.mkDerivation rec {
|
|||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
# Remove CVE-2020-{29129,29130} for QEMU >5.1.0
|
|
||||||
postPatch = ''
|
|
||||||
(cd slirp && patch -p1 < ${fetchpatch {
|
|
||||||
name = "CVE-2020-29129_CVE-2020-29130.patch";
|
|
||||||
url = "https://gitlab.freedesktop.org/slirp/libslirp/-/commit/2e1dcbc0c2af64fcb17009eaf2ceedd81be2b27f.patch";
|
|
||||||
sha256 = "01vbjqgnc0kp881l5p6b31cyyirhwhavm6x36hlgkymswvl3wh9w";
|
|
||||||
}})
|
|
||||||
'';
|
|
||||||
|
|
||||||
hardeningDisable = [ "stackprotector" ];
|
hardeningDisable = [ "stackprotector" ];
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
unset CPP # intereferes with dependency calculation
|
unset CPP # intereferes with dependency calculation
|
||||||
|
# this script isn't marked as executable b/c it's indirectly used by meson. Needed to patch its shebang
|
||||||
|
chmod +x ./scripts/shaderinclude.pl
|
||||||
|
patchShebangs .
|
||||||
'' + optionalString stdenv.hostPlatform.isMusl ''
|
'' + optionalString stdenv.hostPlatform.isMusl ''
|
||||||
NIX_CFLAGS_COMPILE+=" -D_LINUX_SYSINFO_H"
|
NIX_CFLAGS_COMPILE+=" -D_LINUX_SYSINFO_H"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
configureFlags =
|
configureFlags =
|
||||||
[ "--audio-drv-list=${audio}"
|
[ "--audio-drv-list=${audio}"
|
||||||
"--sysconfdir=/etc"
|
|
||||||
"--localstatedir=/var"
|
|
||||||
"--enable-docs"
|
"--enable-docs"
|
||||||
"--enable-tools"
|
"--enable-tools"
|
||||||
"--enable-guest-agent"
|
"--enable-guest-agent"
|
||||||
@ -169,6 +154,7 @@ stdenv.mkDerivation rec {
|
|||||||
wrapGApp $f
|
wrapGApp $f
|
||||||
done
|
done
|
||||||
'';
|
'';
|
||||||
|
preBuild = "cd build";
|
||||||
|
|
||||||
# Add a ‘qemu-kvm’ wrapper for compatibility/convenience.
|
# Add a ‘qemu-kvm’ wrapper for compatibility/convenience.
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
|
@ -1,12 +0,0 @@
|
|||||||
diff --git a/Makefile b/Makefile
|
|
||||||
--- a/Makefile
|
|
||||||
+++ b/Makefile
|
|
||||||
@@ -867,7 +867,7 @@ install-includedir:
|
|
||||||
$(INSTALL_DIR) "$(DESTDIR)$(includedir)"
|
|
||||||
|
|
||||||
install: all $(if $(BUILD_DOCS),install-doc) \
|
|
||||||
- install-datadir install-localstatedir install-includedir \
|
|
||||||
+ install-datadir install-includedir \
|
|
||||||
$(if $(INSTALL_BLOBS),$(edk2-decompressed)) \
|
|
||||||
recurse-install
|
|
||||||
ifneq ($(TOOLS),)
|
|
@ -1,6 +1,6 @@
|
|||||||
{ fetchurl }:
|
{ fetchurl }:
|
||||||
|
|
||||||
fetchurl {
|
fetchurl {
|
||||||
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/545d5cafa765c97ad6026ac96f42a246fea7675b.tar.gz";
|
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/214ceb3bed92d49a0dffc6c2d8d21b1d0bcc7c25.tar.gz";
|
||||||
sha256 = "0v35kbbhmyc5yn1k4v9j32d2bj7zwlwfrwf1cppifdvwdhfs25vv";
|
sha256 = "1m8rm46w9xc8z8dvjg3i0bqpx9630i6ff681dp445q8wv7ji9y2v";
|
||||||
}
|
}
|
||||||
|
@ -2,13 +2,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mlkit";
|
pname = "mlkit";
|
||||||
version = "4.5.2";
|
version = "4.5.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "melsman";
|
owner = "melsman";
|
||||||
repo = "mlkit";
|
repo = "mlkit";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1yk7phxnwkm94qs1gbxsr6sr11a0sgpcyjymmqwf0fsl5njgyb98";
|
sha256 = "sha256-aa6dRcGTXGakJsHCvHXRKs5BHtIZi6V2r8348epzpVc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ autoreconfHook mlton ];
|
nativeBuildInputs = [ autoreconfHook mlton ];
|
||||||
|
@ -223,7 +223,7 @@ self: super: {
|
|||||||
# https://github.com/haskell-nix/hnix-store/issues/104
|
# https://github.com/haskell-nix/hnix-store/issues/104
|
||||||
# Until unpin, which may hold off in time due to Stackage maintenence bottleneck
|
# Until unpin, which may hold off in time due to Stackage maintenence bottleneck
|
||||||
# the 0_4_0_0 is used
|
# the 0_4_0_0 is used
|
||||||
hnix-store-core = self.hnix-store-core_0_4_0_0; # at least 1.7
|
hnix-store-core = self.hnix-store-core_0_4_1_0; # at least 1.7
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -232,9 +232,11 @@ self: super: {
|
|||||||
# Until unpin, which may hold off in time due to Stackage maintenence bottleneck
|
# Until unpin, which may hold off in time due to Stackage maintenence bottleneck
|
||||||
# the 0_4_0_0 is used
|
# the 0_4_0_0 is used
|
||||||
hnix-store-remote = (super.hnix-store-remote.override {
|
hnix-store-remote = (super.hnix-store-remote.override {
|
||||||
hnix-store-core = self.hnix-store-core_0_4_0_0; # at least 1.7
|
hnix-store-core = self.hnix-store-core_0_4_1_0; # at least 1.7
|
||||||
});
|
});
|
||||||
|
|
||||||
|
# https://github.com/haskell-nix/hnix-store/issues/127
|
||||||
|
hnix-store-core_0_4_1_0 = addTestToolDepend super.hnix-store-core_0_4_1_0 self.tasty-discover;
|
||||||
|
|
||||||
# Fails for non-obvious reasons while attempting to use doctest.
|
# Fails for non-obvious reasons while attempting to use doctest.
|
||||||
search = dontCheck super.search;
|
search = dontCheck super.search;
|
||||||
@ -1375,6 +1377,11 @@ self: super: {
|
|||||||
# jailbreaking pandoc-citeproc because it has not bumped upper bound on pandoc
|
# jailbreaking pandoc-citeproc because it has not bumped upper bound on pandoc
|
||||||
pandoc-citeproc = doJailbreak super.pandoc-citeproc;
|
pandoc-citeproc = doJailbreak super.pandoc-citeproc;
|
||||||
|
|
||||||
|
# 2021-01-17: Tests are broken because of a version mismatch.
|
||||||
|
# See here: https://github.com/jgm/pandoc/issues/7035
|
||||||
|
# This problem is fixed on master. Remove override when this assert fails.
|
||||||
|
pandoc = assert super.pandoc.version == "2.11.3.2"; dontCheck super.pandoc;
|
||||||
|
|
||||||
# The test suite attempts to read `/etc/resolv.conf`, which doesn't work in the sandbox.
|
# The test suite attempts to read `/etc/resolv.conf`, which doesn't work in the sandbox.
|
||||||
domain-auth = dontCheck super.domain-auth;
|
domain-auth = dontCheck super.domain-auth;
|
||||||
|
|
||||||
@ -1413,6 +1420,10 @@ self: super: {
|
|||||||
lsp-test = dontCheck self.lsp-test_0_11_0_7;
|
lsp-test = dontCheck self.lsp-test_0_11_0_7;
|
||||||
fourmolu = self.fourmolu_0_3_0_0;
|
fourmolu = self.fourmolu_0_3_0_0;
|
||||||
});
|
});
|
||||||
|
# 2021-01-20
|
||||||
|
# apply-refact 0.9.0.0 get's a build error with hls-hlint-plugin 0.8.0
|
||||||
|
# https://github.com/haskell/haskell-language-server/issues/1240
|
||||||
|
apply-refact = super.apply-refact_0_8_2_1;
|
||||||
|
|
||||||
fourmolu = dontCheck super.fourmolu;
|
fourmolu = dontCheck super.fourmolu;
|
||||||
# 1. test requires internet
|
# 1. test requires internet
|
||||||
|
@ -76,7 +76,7 @@ default-package-overrides:
|
|||||||
# haskell-language-server 0.5.0.0 doesn't accept newer versions
|
# haskell-language-server 0.5.0.0 doesn't accept newer versions
|
||||||
- fourmolu ==0.2.*
|
- fourmolu ==0.2.*
|
||||||
- refinery ==0.2.*
|
- refinery ==0.2.*
|
||||||
# Stackage Nightly 2021-01-14
|
# Stackage Nightly 2021-01-20
|
||||||
- abstract-deque ==0.3
|
- abstract-deque ==0.3
|
||||||
- abstract-par ==0.3.3
|
- abstract-par ==0.3.3
|
||||||
- AC-Angle ==1.0
|
- AC-Angle ==1.0
|
||||||
@ -209,7 +209,7 @@ default-package-overrides:
|
|||||||
- amazonka-waf ==1.6.1
|
- amazonka-waf ==1.6.1
|
||||||
- amazonka-workspaces ==1.6.1
|
- amazonka-workspaces ==1.6.1
|
||||||
- amazonka-xray ==1.6.1
|
- amazonka-xray ==1.6.1
|
||||||
- amqp ==0.20.0
|
- amqp ==0.20.0.1
|
||||||
- amqp-utils ==0.4.4.1
|
- amqp-utils ==0.4.4.1
|
||||||
- annotated-wl-pprint ==0.7.0
|
- annotated-wl-pprint ==0.7.0
|
||||||
- ansi-terminal ==0.10.3
|
- ansi-terminal ==0.10.3
|
||||||
@ -223,7 +223,7 @@ default-package-overrides:
|
|||||||
- ap-normalize ==0.1.0.0
|
- ap-normalize ==0.1.0.0
|
||||||
- appar ==0.1.8
|
- appar ==0.1.8
|
||||||
- appendmap ==0.1.5
|
- appendmap ==0.1.5
|
||||||
- apply-refact ==0.8.2.1
|
- apply-refact ==0.9.0.0
|
||||||
- apportionment ==0.0.0.3
|
- apportionment ==0.0.0.3
|
||||||
- approximate ==0.3.2
|
- approximate ==0.3.2
|
||||||
- approximate-equality ==1.1.0.2
|
- approximate-equality ==1.1.0.2
|
||||||
@ -340,7 +340,7 @@ default-package-overrides:
|
|||||||
- blas-comfort-array ==0.0.0.2
|
- blas-comfort-array ==0.0.0.2
|
||||||
- blas-ffi ==0.1
|
- blas-ffi ==0.1
|
||||||
- blaze-bootstrap ==0.1.0.1
|
- blaze-bootstrap ==0.1.0.1
|
||||||
- blaze-builder ==0.4.1.0
|
- blaze-builder ==0.4.2.1
|
||||||
- blaze-html ==0.9.1.2
|
- blaze-html ==0.9.1.2
|
||||||
- blaze-markup ==0.8.2.7
|
- blaze-markup ==0.8.2.7
|
||||||
- blaze-svg ==0.3.6.1
|
- blaze-svg ==0.3.6.1
|
||||||
@ -519,7 +519,7 @@ default-package-overrides:
|
|||||||
- conduit-extra ==1.3.5
|
- conduit-extra ==1.3.5
|
||||||
- conduit-parse ==0.2.1.0
|
- conduit-parse ==0.2.1.0
|
||||||
- conduit-zstd ==0.0.2.0
|
- conduit-zstd ==0.0.2.0
|
||||||
- conferer ==1.0.0.0
|
- conferer ==1.0.0.1
|
||||||
- conferer-aeson ==1.0.0.0
|
- conferer-aeson ==1.0.0.0
|
||||||
- conferer-hspec ==1.0.0.0
|
- conferer-hspec ==1.0.0.0
|
||||||
- conferer-warp ==1.0.0.0
|
- conferer-warp ==1.0.0.0
|
||||||
@ -635,6 +635,7 @@ default-package-overrides:
|
|||||||
- DBFunctor ==0.1.1.1
|
- DBFunctor ==0.1.1.1
|
||||||
- dbus ==1.2.17
|
- dbus ==1.2.17
|
||||||
- dbus-hslogger ==0.1.0.1
|
- dbus-hslogger ==0.1.0.1
|
||||||
|
- debian ==4.0.2
|
||||||
- debian-build ==0.10.2.0
|
- debian-build ==0.10.2.0
|
||||||
- debug-trace-var ==0.2.0
|
- debug-trace-var ==0.2.0
|
||||||
- dec ==0.0.3
|
- dec ==0.0.3
|
||||||
@ -706,6 +707,7 @@ default-package-overrides:
|
|||||||
- dyre ==0.8.12
|
- dyre ==0.8.12
|
||||||
- eap ==0.9.0.2
|
- eap ==0.9.0.2
|
||||||
- earcut ==0.1.0.4
|
- earcut ==0.1.0.4
|
||||||
|
- Earley ==0.13.0.1
|
||||||
- easy-file ==0.2.2
|
- easy-file ==0.2.2
|
||||||
- Ebnf2ps ==1.0.15
|
- Ebnf2ps ==1.0.15
|
||||||
- echo ==0.1.3
|
- echo ==0.1.3
|
||||||
@ -751,7 +753,7 @@ default-package-overrides:
|
|||||||
- epub-metadata ==4.5
|
- epub-metadata ==4.5
|
||||||
- eq ==4.2.1
|
- eq ==4.2.1
|
||||||
- equal-files ==0.0.5.3
|
- equal-files ==0.0.5.3
|
||||||
- equational-reasoning ==0.6.0.3
|
- equational-reasoning ==0.6.0.4
|
||||||
- equivalence ==0.3.5
|
- equivalence ==0.3.5
|
||||||
- erf ==2.0.0.0
|
- erf ==2.0.0.0
|
||||||
- error-or ==0.1.2.0
|
- error-or ==0.1.2.0
|
||||||
@ -946,7 +948,7 @@ default-package-overrides:
|
|||||||
- ghc-typelits-extra ==0.4.2
|
- ghc-typelits-extra ==0.4.2
|
||||||
- ghc-typelits-knownnat ==0.7.4
|
- ghc-typelits-knownnat ==0.7.4
|
||||||
- ghc-typelits-natnormalise ==0.7.3
|
- ghc-typelits-natnormalise ==0.7.3
|
||||||
- ghc-typelits-presburger ==0.3.0.1
|
- ghc-typelits-presburger ==0.5.0.0
|
||||||
- ghost-buster ==0.1.1.0
|
- ghost-buster ==0.1.1.0
|
||||||
- gi-atk ==2.0.22
|
- gi-atk ==2.0.22
|
||||||
- gi-cairo ==1.0.24
|
- gi-cairo ==1.0.24
|
||||||
@ -973,7 +975,7 @@ default-package-overrides:
|
|||||||
- github-rest ==1.0.3
|
- github-rest ==1.0.3
|
||||||
- github-types ==0.2.1
|
- github-types ==0.2.1
|
||||||
- github-webhooks ==0.15.0
|
- github-webhooks ==0.15.0
|
||||||
- gitlab-haskell ==0.2.4
|
- gitlab-haskell ==0.2.5
|
||||||
- gitrev ==1.3.1
|
- gitrev ==1.3.1
|
||||||
- gi-xlib ==2.0.9
|
- gi-xlib ==2.0.9
|
||||||
- gl ==0.9
|
- gl ==0.9
|
||||||
@ -983,7 +985,7 @@ default-package-overrides:
|
|||||||
- gloss ==1.13.2.1
|
- gloss ==1.13.2.1
|
||||||
- gloss-rendering ==1.13.1.1
|
- gloss-rendering ==1.13.1.1
|
||||||
- GLURaw ==2.0.0.4
|
- GLURaw ==2.0.0.4
|
||||||
- GLUT ==2.7.0.15
|
- GLUT ==2.7.0.16
|
||||||
- gluturtle ==0.0.58.1
|
- gluturtle ==0.0.58.1
|
||||||
- gnuplot ==0.5.6.1
|
- gnuplot ==0.5.6.1
|
||||||
- google-isbn ==1.0.3
|
- google-isbn ==1.0.3
|
||||||
@ -1138,12 +1140,12 @@ default-package-overrides:
|
|||||||
- HsOpenSSL ==0.11.5.1
|
- HsOpenSSL ==0.11.5.1
|
||||||
- HsOpenSSL-x509-system ==0.1.0.4
|
- HsOpenSSL-x509-system ==0.1.0.4
|
||||||
- hsp ==0.10.0
|
- hsp ==0.10.0
|
||||||
- hspec ==2.7.6
|
- hspec ==2.7.8
|
||||||
- hspec-attoparsec ==0.1.0.2
|
- hspec-attoparsec ==0.1.0.2
|
||||||
- hspec-checkers ==0.1.0.2
|
- hspec-checkers ==0.1.0.2
|
||||||
- hspec-contrib ==0.5.1
|
- hspec-contrib ==0.5.1
|
||||||
- hspec-core ==2.7.6
|
- hspec-core ==2.7.8
|
||||||
- hspec-discover ==2.7.6
|
- hspec-discover ==2.7.8
|
||||||
- hspec-expectations ==0.8.2
|
- hspec-expectations ==0.8.2
|
||||||
- hspec-expectations-lifted ==0.10.0
|
- hspec-expectations-lifted ==0.10.0
|
||||||
- hspec-expectations-pretty-diff ==0.7.2.5
|
- hspec-expectations-pretty-diff ==0.7.2.5
|
||||||
@ -1268,7 +1270,7 @@ default-package-overrides:
|
|||||||
- ini ==0.4.1
|
- ini ==0.4.1
|
||||||
- inj ==1.0
|
- inj ==1.0
|
||||||
- inline-c ==0.9.1.4
|
- inline-c ==0.9.1.4
|
||||||
- inline-c-cpp ==0.4.0.2
|
- inline-c-cpp ==0.4.0.3
|
||||||
- inline-r ==0.10.4
|
- inline-r ==0.10.4
|
||||||
- inliterate ==0.1.0
|
- inliterate ==0.1.0
|
||||||
- input-parsers ==0.1.0.1
|
- input-parsers ==0.1.0.1
|
||||||
@ -1420,6 +1422,7 @@ default-package-overrides:
|
|||||||
- linux-namespaces ==0.1.3.0
|
- linux-namespaces ==0.1.3.0
|
||||||
- liquid-fixpoint ==0.8.10.2
|
- liquid-fixpoint ==0.8.10.2
|
||||||
- List ==0.6.2
|
- List ==0.6.2
|
||||||
|
- ListLike ==4.7.4
|
||||||
- list-predicate ==0.1.0.1
|
- list-predicate ==0.1.0.1
|
||||||
- listsafe ==0.1.0.1
|
- listsafe ==0.1.0.1
|
||||||
- list-singleton ==1.0.0.4
|
- list-singleton ==1.0.0.4
|
||||||
@ -1440,7 +1443,7 @@ default-package-overrides:
|
|||||||
- logging ==3.0.5
|
- logging ==3.0.5
|
||||||
- logging-facade ==0.3.0
|
- logging-facade ==0.3.0
|
||||||
- logging-facade-syslog ==1
|
- logging-facade-syslog ==1
|
||||||
- logict ==0.7.0.3
|
- logict ==0.7.1.0
|
||||||
- logstash ==0.1.0.1
|
- logstash ==0.1.0.1
|
||||||
- loop ==0.3.0
|
- loop ==0.3.0
|
||||||
- lrucache ==1.2.0.1
|
- lrucache ==1.2.0.1
|
||||||
@ -1750,6 +1753,7 @@ default-package-overrides:
|
|||||||
- pcre-heavy ==1.0.0.2
|
- pcre-heavy ==1.0.0.2
|
||||||
- pcre-light ==0.4.1.0
|
- pcre-light ==0.4.1.0
|
||||||
- pcre-utils ==0.1.8.1.1
|
- pcre-utils ==0.1.8.1.1
|
||||||
|
- pdfinfo ==1.5.4
|
||||||
- peano ==0.1.0.1
|
- peano ==0.1.0.1
|
||||||
- pem ==0.2.4
|
- pem ==0.2.4
|
||||||
- percent-format ==0.0.1
|
- percent-format ==0.0.1
|
||||||
@ -1848,6 +1852,7 @@ default-package-overrides:
|
|||||||
- primitive-unlifted ==0.1.3.0
|
- primitive-unlifted ==0.1.3.0
|
||||||
- print-console-colors ==0.1.0.0
|
- print-console-colors ==0.1.0.0
|
||||||
- probability ==0.2.7
|
- probability ==0.2.7
|
||||||
|
- process-extras ==0.7.4
|
||||||
- product-isomorphic ==0.0.3.3
|
- product-isomorphic ==0.0.3.3
|
||||||
- product-profunctors ==0.11.0.1
|
- product-profunctors ==0.11.0.1
|
||||||
- profiterole ==0.1
|
- profiterole ==0.1
|
||||||
@ -1939,7 +1944,7 @@ default-package-overrides:
|
|||||||
- readable ==0.3.1
|
- readable ==0.3.1
|
||||||
- read-editor ==0.1.0.2
|
- read-editor ==0.1.0.2
|
||||||
- read-env-var ==1.0.0.0
|
- read-env-var ==1.0.0.0
|
||||||
- reanimate ==1.1.3.1
|
- reanimate ==1.1.3.2
|
||||||
- reanimate-svg ==0.13.0.0
|
- reanimate-svg ==0.13.0.0
|
||||||
- rebase ==1.6.1
|
- rebase ==1.6.1
|
||||||
- record-dot-preprocessor ==0.2.7
|
- record-dot-preprocessor ==0.2.7
|
||||||
@ -2026,7 +2031,7 @@ default-package-overrides:
|
|||||||
- safe-tensor ==0.2.1.0
|
- safe-tensor ==0.2.1.0
|
||||||
- salak ==0.3.6
|
- salak ==0.3.6
|
||||||
- salak-yaml ==0.3.5.3
|
- salak-yaml ==0.3.5.3
|
||||||
- saltine ==0.1.1.0
|
- saltine ==0.1.1.1
|
||||||
- salve ==1.0.10
|
- salve ==1.0.10
|
||||||
- sample-frame ==0.0.3
|
- sample-frame ==0.0.3
|
||||||
- sample-frame-np ==0.0.4.1
|
- sample-frame-np ==0.0.4.1
|
||||||
@ -2132,10 +2137,10 @@ default-package-overrides:
|
|||||||
- singleton-bool ==0.1.5
|
- singleton-bool ==0.1.5
|
||||||
- singleton-nats ==0.4.5
|
- singleton-nats ==0.4.5
|
||||||
- singletons ==2.7
|
- singletons ==2.7
|
||||||
- singletons-presburger ==0.3.0.1
|
- singletons-presburger ==0.5.0.0
|
||||||
- siphash ==1.0.3
|
- siphash ==1.0.3
|
||||||
- sitemap-gen ==0.1.0.0
|
- sitemap-gen ==0.1.0.0
|
||||||
- sized ==0.8.0.0
|
- sized ==1.0.0.0
|
||||||
- skein ==1.0.9.4
|
- skein ==1.0.9.4
|
||||||
- skews ==0.1.0.3
|
- skews ==0.1.0.3
|
||||||
- skip-var ==0.1.1.0
|
- skip-var ==0.1.1.0
|
||||||
@ -2145,7 +2150,7 @@ default-package-overrides:
|
|||||||
- slack-progressbar ==0.1.0.1
|
- slack-progressbar ==0.1.0.1
|
||||||
- slist ==0.1.1.0
|
- slist ==0.1.1.0
|
||||||
- slynx ==0.5.0.1
|
- slynx ==0.5.0.1
|
||||||
- smallcheck ==1.2.0
|
- smallcheck ==1.2.1
|
||||||
- smash ==0.1.1.0
|
- smash ==0.1.1.0
|
||||||
- smash-aeson ==0.1.0.0
|
- smash-aeson ==0.1.0.0
|
||||||
- smash-lens ==0.1.0.1
|
- smash-lens ==0.1.0.1
|
||||||
@ -2436,7 +2441,7 @@ default-package-overrides:
|
|||||||
- type-level-natural-number ==2.0
|
- type-level-natural-number ==2.0
|
||||||
- type-level-numbers ==0.1.1.1
|
- type-level-numbers ==0.1.1.1
|
||||||
- type-map ==0.1.6.0
|
- type-map ==0.1.6.0
|
||||||
- type-natural ==0.9.0.0
|
- type-natural ==1.0.0.0
|
||||||
- type-of-html ==1.6.1.2
|
- type-of-html ==1.6.1.2
|
||||||
- type-of-html-static ==0.1.0.2
|
- type-of-html-static ==0.1.0.2
|
||||||
- type-operators ==0.2.0.0
|
- type-operators ==0.2.0.0
|
||||||
@ -2458,7 +2463,6 @@ default-package-overrides:
|
|||||||
- unicode ==0.0.1.1
|
- unicode ==0.0.1.1
|
||||||
- unicode-show ==0.1.0.4
|
- unicode-show ==0.1.0.4
|
||||||
- unicode-transforms ==0.3.7.1
|
- unicode-transforms ==0.3.7.1
|
||||||
- unification-fd ==0.10.0.1
|
|
||||||
- union-find ==0.2
|
- union-find ==0.2
|
||||||
- unipatterns ==0.0.0.0
|
- unipatterns ==0.0.0.0
|
||||||
- uniplate ==1.6.13
|
- uniplate ==1.6.13
|
||||||
@ -2537,13 +2541,13 @@ default-package-overrides:
|
|||||||
- vinyl ==0.13.0
|
- vinyl ==0.13.0
|
||||||
- void ==0.7.3
|
- void ==0.7.3
|
||||||
- vty ==5.32
|
- vty ==5.32
|
||||||
- wai ==3.2.2.1
|
- wai ==3.2.3
|
||||||
- wai-app-static ==3.1.7.2
|
- wai-app-static ==3.1.7.2
|
||||||
- wai-conduit ==3.0.0.4
|
- wai-conduit ==3.0.0.4
|
||||||
- wai-cors ==0.2.7
|
- wai-cors ==0.2.7
|
||||||
- wai-enforce-https ==0.0.2.1
|
- wai-enforce-https ==0.0.2.1
|
||||||
- wai-eventsource ==3.0.0
|
- wai-eventsource ==3.0.0
|
||||||
- wai-extra ==3.1.5
|
- wai-extra ==3.1.6
|
||||||
- wai-feature-flags ==0.1.0.1
|
- wai-feature-flags ==0.1.0.1
|
||||||
- wai-handler-launch ==3.0.3.1
|
- wai-handler-launch ==3.0.3.1
|
||||||
- wai-logger ==2.3.6
|
- wai-logger ==2.3.6
|
||||||
@ -2666,7 +2670,7 @@ default-package-overrides:
|
|||||||
- zeromq4-patterns ==0.3.1.0
|
- zeromq4-patterns ==0.3.1.0
|
||||||
- zim-parser ==0.2.1.0
|
- zim-parser ==0.2.1.0
|
||||||
- zio ==0.1.0.2
|
- zio ==0.1.0.2
|
||||||
- zip ==1.6.0
|
- zip ==1.7.0
|
||||||
- zip-archive ==0.4.1
|
- zip-archive ==0.4.1
|
||||||
- zipper-extra ==0.1.3.2
|
- zipper-extra ==0.1.3.2
|
||||||
- zippers ==0.3
|
- zippers ==0.3
|
||||||
@ -2696,6 +2700,7 @@ extra-packages:
|
|||||||
- dependent-sum == 0.4 # required by Hasura 1.3.1, 2020-08-20
|
- dependent-sum == 0.4 # required by Hasura 1.3.1, 2020-08-20
|
||||||
- network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15
|
- network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15
|
||||||
- ghcide == 0.7.0.0 # Needed for hls 0.8.0
|
- ghcide == 0.7.0.0 # Needed for hls 0.8.0
|
||||||
|
- apply-refact == 0.8.2.1 # Needed for hls 0.8.0
|
||||||
|
|
||||||
package-maintainers:
|
package-maintainers:
|
||||||
peti:
|
peti:
|
||||||
@ -3914,6 +3919,7 @@ broken-packages:
|
|||||||
- cgi-utils
|
- cgi-utils
|
||||||
- cgrep
|
- cgrep
|
||||||
- chainweb-mining-client
|
- chainweb-mining-client
|
||||||
|
- chakra
|
||||||
- chalkboard
|
- chalkboard
|
||||||
- chalkboard-viewer
|
- chalkboard-viewer
|
||||||
- character-cases
|
- character-cases
|
||||||
@ -5611,7 +5617,6 @@ broken-packages:
|
|||||||
- GLFW-OGL
|
- GLFW-OGL
|
||||||
- GLFW-task
|
- GLFW-task
|
||||||
- gli
|
- gli
|
||||||
- glicko
|
|
||||||
- glider-nlp
|
- glider-nlp
|
||||||
- GLMatrix
|
- GLMatrix
|
||||||
- glob-posix
|
- glob-posix
|
||||||
@ -11009,13 +11014,10 @@ broken-packages:
|
|||||||
- unitym-yesod
|
- unitym-yesod
|
||||||
- universal-binary
|
- universal-binary
|
||||||
- universe
|
- universe
|
||||||
- universe-base
|
|
||||||
- universe-dependent-sum
|
|
||||||
- universe-instances-base
|
- universe-instances-base
|
||||||
- universe-instances-extended
|
- universe-instances-extended
|
||||||
- universe-instances-trans
|
- universe-instances-trans
|
||||||
- universe-reverse-instances
|
- universe-reverse-instances
|
||||||
- universe-some
|
|
||||||
- universe-th
|
- universe-th
|
||||||
- unix-fcntl
|
- unix-fcntl
|
||||||
- unix-handle
|
- unix-handle
|
||||||
|
49467
pkgs/development/haskell-modules/hackage-packages.nix
generated
49467
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -1,2 +1,2 @@
|
|||||||
args@{ pkgs, stdenv, callPackage }: self:
|
args@{ pkgs, lib, callPackage }: self:
|
||||||
(import ./hackage-packages.nix args self)
|
(import ./hackage-packages.nix args self)
|
||||||
|
@ -11,9 +11,13 @@
|
|||||||
, # package-set used for non-haskell dependencies (all of nixpkgs)
|
, # package-set used for non-haskell dependencies (all of nixpkgs)
|
||||||
pkgs
|
pkgs
|
||||||
|
|
||||||
, # stdenv to use for building haskell packages
|
, # stdenv provides our build and host platforms
|
||||||
stdenv
|
stdenv
|
||||||
|
|
||||||
|
, # this module provides the list of known licenses and maintainers
|
||||||
|
lib
|
||||||
|
|
||||||
|
# needed for overrideCabal & packageSourceOverrides
|
||||||
, haskellLib
|
, haskellLib
|
||||||
|
|
||||||
, # hashes for downloading Hackage packages
|
, # hashes for downloading Hackage packages
|
||||||
@ -22,7 +26,7 @@
|
|||||||
, # compiler to use
|
, # compiler to use
|
||||||
ghc
|
ghc
|
||||||
|
|
||||||
, # A function that takes `{ pkgs, stdenv, callPackage }` as the first arg and
|
, # A function that takes `{ pkgs, lib, callPackage }` as the first arg and
|
||||||
# `self` as second, and returns a set of haskell packages
|
# `self` as second, and returns a set of haskell packages
|
||||||
package-set
|
package-set
|
||||||
|
|
||||||
@ -169,7 +173,7 @@ let
|
|||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
in package-set { inherit pkgs stdenv callPackage; } self // {
|
in package-set { inherit pkgs lib callPackage; } self // {
|
||||||
|
|
||||||
inherit mkDerivation callPackage haskellSrc2nix hackage2nix buildHaskellPackages;
|
inherit mkDerivation callPackage haskellSrc2nix hackage2nix buildHaskellPackages;
|
||||||
|
|
||||||
|
@ -125,9 +125,15 @@ let
|
|||||||
if parsed.cpu.significantByte.name == "littleEndian" then "arm" else "armeb"
|
if parsed.cpu.significantByte.name == "littleEndian" then "arm" else "armeb"
|
||||||
else if isx86_32 then "i386"
|
else if isx86_32 then "i386"
|
||||||
else parsed.cpu.name;
|
else parsed.cpu.name;
|
||||||
|
pythonAbiName =
|
||||||
|
# python's build doesn't differentiate between musl and glibc in its
|
||||||
|
# abi detection, our wrapper should match.
|
||||||
|
if stdenv.hostPlatform.isMusl then
|
||||||
|
replaceStrings [ "musl" ] [ "gnu" ] parsed.abi.name
|
||||||
|
else parsed.abi.name;
|
||||||
multiarch =
|
multiarch =
|
||||||
if isDarwin then "darwin"
|
if isDarwin then "darwin"
|
||||||
else "${multiarchCpu}-${parsed.kernel.name}-${parsed.abi.name}";
|
else "${multiarchCpu}-${parsed.kernel.name}-${pythonAbiName}";
|
||||||
|
|
||||||
abiFlags = optionalString (isPy36 || isPy37) "m";
|
abiFlags = optionalString (isPy36 || isPy37) "m";
|
||||||
|
|
||||||
|
@ -11,11 +11,11 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "libfilezilla";
|
pname = "libfilezilla";
|
||||||
version = "0.25.0";
|
version = "0.26.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2";
|
url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2";
|
||||||
sha256 = "0akvki7n5rwmc52wss25i3h4nwl935flhjypf8dx3lvf4jszxxiv";
|
sha256 = "sha256-F+0iZZPo5GbOPD+M5YOzbHnxYxierVTWMWE8w9pcgL0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||||
|
@ -1,11 +1,12 @@
|
|||||||
{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, setuptools
|
{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, pythonAtLeast, setuptools
|
||||||
, transitions, websockets, passlib, docopt, pyyaml, nose }:
|
, transitions, websockets, passlib, docopt, pyyaml, nose }:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "hbmqtt";
|
pname = "hbmqtt";
|
||||||
version = "0.9.6";
|
version = "0.9.6";
|
||||||
|
|
||||||
disabled = !isPy3k;
|
# https://github.com/beerfactory/hbmqtt/issues/223
|
||||||
|
disabled = !isPy3k || pythonAtLeast "3.9";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
|
@ -8,13 +8,13 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "python-mpd2";
|
pname = "python-mpd2";
|
||||||
version = "3.0.2";
|
version = "3.0.3";
|
||||||
|
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "0ibl2xyj4380ai60i2bfhm8qn1sjyjbwwjmgzfcqa12wlnhck7ki";
|
sha256 = "1ikvn2qv6cnbjscpbk6hhsqg34h832mxgg6hp1mf4d8d6nwdx4sn";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ mock ];
|
buildInputs = [ mock ];
|
||||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||||||
description = "A Python client module for the Music Player Daemon";
|
description = "A Python client module for the Music Player Daemon";
|
||||||
homepage = "https://github.com/Mic92/python-mpd2";
|
homepage = "https://github.com/Mic92/python-mpd2";
|
||||||
license = licenses.lgpl3Plus;
|
license = licenses.lgpl3Plus;
|
||||||
maintainers = with maintainers; [ rvl mic92 ];
|
maintainers = with maintainers; [ rvl mic92 hexa ];
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,26 +1,21 @@
|
|||||||
{ lib, stdenv, buildPythonPackage, fetchPypi
|
{ lib, buildPythonPackage, fetchFromGitHub
|
||||||
, six, nose, mock, dill, pycodestyle }:
|
, six, pytestCheckHook, mock, dill, pycodestyle }:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "transitions";
|
pname = "transitions";
|
||||||
version = "0.8.5";
|
version = "0.8.6";
|
||||||
|
|
||||||
src = fetchPypi {
|
# test_codestyle.py fails in PyPI sdist
|
||||||
inherit pname version;
|
src = fetchFromGitHub {
|
||||||
sha256 = "e441c66a0c753d56c01c3e5e547f21dbe4a5569c939f12477475c5e81d79769b";
|
owner = "pytransitions";
|
||||||
|
repo = "transitions";
|
||||||
|
rev = version;
|
||||||
|
sha256 = "1d913hzzyqhdhhbkbvjw65dqkajrw50a4sxhyxk0jlg8pcs7bs7v";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
substituteInPlace setup.py --replace "dill<0.2.7" dill
|
|
||||||
'';
|
|
||||||
|
|
||||||
propagatedBuildInputs = [ six ];
|
propagatedBuildInputs = [ six ];
|
||||||
|
|
||||||
checkInputs = [ nose mock dill pycodestyle ];
|
checkInputs = [ pytestCheckHook mock dill pycodestyle ];
|
||||||
|
|
||||||
checkPhase = ''
|
|
||||||
nosetests
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://github.com/pytransitions/transitions";
|
homepage = "https://github.com/pytransitions/transitions";
|
||||||
|
@ -2,16 +2,16 @@
|
|||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "bingrep";
|
pname = "bingrep";
|
||||||
version = "0.8.2";
|
version = "0.8.5";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "m4b";
|
owner = "m4b";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1qv41g7mblnq07145m03s2fhbrjfsc0924zb9z4cp159ygkggxcy";
|
sha256 = "sha256-ayA3aEidZPa5GJgbbm5K3X2Xgd5Eb6TgUU80Gw/p07w=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "1z53408mcmy698xb2sxj1s1p9xc9srlkj0v8wswhdp7nq27vwkdj";
|
cargoSha256 = "sha256-3eGYU5O7HSpawIL/8OVmROCzXfdnoMAnIujjrIp00xg=";
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "Greps through binaries from various OSs and architectures, and colors them";
|
description = "Greps through binaries from various OSs and architectures, and colors them";
|
||||||
|
@ -2,20 +2,20 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "matrix-corporal";
|
pname = "matrix-corporal";
|
||||||
version = "2.0.1";
|
version = "2.1.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "devture";
|
owner = "devture";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "1n8yjmy3j0spgwpxgc26adhpl52fm3d2xbmkf5n9dwzw29grv68r";
|
sha256 = "sha256-u1ppwy+t2ewAH0/+R6e0Ja5A3PQG/lUy2b6kgcMVj8E=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildFlagsArray = [
|
buildFlagsArray = [
|
||||||
"-ldflags=-s -w -X main.GitCommit=${version} -X main.GitBranch=${version} -X main.GitState=nixpkgs -X main.GitSummary=${version} -X main.Version=${version}"
|
"-ldflags=-s -w -X main.GitCommit=${version} -X main.GitBranch=${version} -X main.GitState=nixpkgs -X main.GitSummary=${version} -X main.Version=${version}"
|
||||||
];
|
];
|
||||||
|
|
||||||
vendorSha256 = "1gi6mff6h0fkgfq5yybd1qcy2qwrvc4kzi11x7arfl9nr0d24rb2";
|
vendorSha256 = "sha256-YmUiGsg2UZfV6SHEPwnbmWPhGQ5teV+we9MBaJyrJr4=";
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://github.com/devture/matrix-corporal";
|
homepage = "https://github.com/devture/matrix-corporal";
|
||||||
|
@ -2,16 +2,16 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "pg_tileserv";
|
pname = "pg_tileserv";
|
||||||
version = "1.0.4";
|
version = "1.0.5";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "CrunchyData";
|
owner = "CrunchyData";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1vdxnh1s8r8ydsjnj70s69nifhpyicb4jmgd5j7i49cr096jg526";
|
sha256 = "sha256-62cJ0j/UfPW/ujKr0iA7Be8wZYlZ68mpJX8v1tAVREc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "1wbv1wh3phd9p2hfnffsjv6f8hf9fgkwg88k9w56rx1pgps63nd9";
|
vendorSha256 = "sha256-qdlh9H039GwKTxOhx+dzyUHkzJbaOeuguKnBOyAPe/E=";
|
||||||
|
|
||||||
buildFlagsArray = [ "-ldflags=-s -w -X main.programVersion=${version}" ];
|
buildFlagsArray = [ "-ldflags=-s -w -X main.programVersion=${version}" ];
|
||||||
|
|
||||||
|
@ -2,13 +2,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "nix-direnv";
|
pname = "nix-direnv";
|
||||||
version = "1.2";
|
version = "1.2.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "nix-community";
|
owner = "nix-community";
|
||||||
repo = "nix-direnv";
|
repo = "nix-direnv";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-/mlM1EeUlr1nTUJ5rB41idzk3Mfy/htjjPUARYDFpb0=";
|
sha256 = "sha256-D31ORVdS8P1OkPShsfjEFLVCcv8Bff9OyexUKKHdguQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Substitute instead of wrapping because the resulting file is
|
# Substitute instead of wrapping because the resulting file is
|
||||||
|
@ -2,16 +2,16 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "pgmetrics";
|
pname = "pgmetrics";
|
||||||
version = "1.10.3";
|
version = "1.10.5";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "rapidloop";
|
owner = "rapidloop";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1acdak3m9782hr5bn26ck3dnnv1jxwz5yrkyv8kivavjww88m9h2";
|
sha256 = "sha256-rqaK94Rw0K1+r7+7jHI2bzBupCGTkokeC4heJ3Yu6pQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "16x33fmh4q993rw0jr65337yimska4fwgyyw3kmq84q0x28a3zg5";
|
vendorSha256 = "sha256-5f2hkOgAE4TrHNz7xx1RU9fozxjFZAl4HilhAqsbo5s=";
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
@ -30,6 +30,6 @@ rustPlatform.buildRustPackage rec {
|
|||||||
description = "A basic http server for hosting a folder fast and simply";
|
description = "A basic http server for hosting a folder fast and simply";
|
||||||
homepage = "https://github.com/thecoshman/http";
|
homepage = "https://github.com/thecoshman/http";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ bbigras ];
|
maintainers = with maintainers; [ ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -2,16 +2,16 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "nfpm";
|
pname = "nfpm";
|
||||||
version = "2.2.2";
|
version = "2.2.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "goreleaser";
|
owner = "goreleaser";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0qv7xw74hf4fzi7v40fpgjyf01dyz6665dmd2pacpd9n6klnr1h3";
|
sha256 = "sha256-F3SDcO5E0d5/aEJLdy0fJqB6brwf4C9Imtk1R5zOT5A=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "0mdh4qrafdxlqqh0kl7wil7w3g5p499qi3yiw8znjkd49g85ws3w";
|
vendorSha256 = "sha256-fGhe0EukTWk/4tGPiFMit7zBD4380AkgxrQ3pzImsFU=";
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
@ -2,16 +2,16 @@
|
|||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "mdbook";
|
pname = "mdbook";
|
||||||
version = "0.4.5";
|
version = "0.4.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "rust-lang-nursery";
|
owner = "rust-lang-nursery";
|
||||||
repo = "mdBook";
|
repo = "mdBook";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "11v2x0q8pn7hbmznqy872ksr7szyiki9cfhapymjhkf5nwfvcdbb";
|
sha256 = "sha256-cS2fME3X8bFmEz6czoL+2ZFbflJP58+lIeC5SVleCNg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "1psgqj04hzv7p18h4phsahxg4rj9yz38b8mh111k6l8m4r83kd75";
|
cargoSha256 = "sha256-iuJyprLp6HofcdH0NgNK2Vl+1FtdAvZPcltPUb5B2XU=";
|
||||||
|
|
||||||
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
|
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
|
||||||
|
|
||||||
|
@ -10149,10 +10149,10 @@ let
|
|||||||
|
|
||||||
IOAsync = buildPerlModule {
|
IOAsync = buildPerlModule {
|
||||||
pname = "IO-Async";
|
pname = "IO-Async";
|
||||||
version = "0.77";
|
version = "0.78";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-0.77.tar.gz";
|
url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-0.78.tar.gz";
|
||||||
sha256 = "153rfnbs2xwvx559h0ilfr0g9pg30avjad3cad659is9bdmfipri";
|
sha256 = "sha256-P7UYhZd7hiGKiepC84yvvOWCO/SPqqLRhaGGwqNYNmw=";
|
||||||
};
|
};
|
||||||
preCheck = "rm t/50resolver.t"; # this test fails with "Temporary failure in name resolution" in sandbox
|
preCheck = "rm t/50resolver.t"; # this test fails with "Temporary failure in name resolution" in sandbox
|
||||||
propagatedBuildInputs = [ Future StructDumb ];
|
propagatedBuildInputs = [ Future StructDumb ];
|
||||||
|
Loading…
Reference in New Issue
Block a user